From owner-svn-ports-head@freebsd.org Sat Aug 11 08:30:57 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BE4D81062D15; Sat, 11 Aug 2018 08:30:56 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 73ECC715A2; Sat, 11 Aug 2018 08:30:56 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5529B1498F; Sat, 11 Aug 2018 08:30:56 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7B8Uuuh067030; Sat, 11 Aug 2018 08:30:56 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7B8UthO067023; Sat, 11 Aug 2018 08:30:55 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201808110830.w7B8UthO067023@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Sat, 11 Aug 2018 08:30:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r476861 - in head/chinese/pcmanx: . files X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: in head/chinese/pcmanx: . files X-SVN-Commit-Revision: 476861 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Aug 2018 08:30:57 -0000 Author: lwhsu Date: Sat Aug 11 08:30:55 2018 New Revision: 476861 URL: https://svnweb.freebsd.org/changeset/ports/476861 Log: - Added a patch in upstream but not release yet to fix the code that incorrectly trim URL [1] - Sort patches - Pet portlint PR: 230020 [1] Submitted by: holishing Added: head/chinese/pcmanx/files/patch-src-mainframe.cpp (contents, props changed) Modified: head/chinese/pcmanx/Makefile head/chinese/pcmanx/files/patch-configure head/chinese/pcmanx/files/patch-src-pcmanx_gtk2.cpp head/chinese/pcmanx/files/patch-src-view-telnetcon.cpp Modified: head/chinese/pcmanx/Makefile ============================================================================== --- head/chinese/pcmanx/Makefile Sat Aug 11 06:30:44 2018 (r476860) +++ head/chinese/pcmanx/Makefile Sat Aug 11 08:30:55 2018 (r476861) @@ -3,6 +3,7 @@ PORTNAME= pcmanx PORTVERSION= 1.3 +PORTREVISION= 1 CATEGORIES= chinese net gnome MASTER_SITES= https://github.com/pcman-bbs/${PORTNAME}/releases/download/${PORTVERSION}/ DISTNAME= ${PORTNAME}-gtk2-${PORTVERSION} @@ -13,9 +14,10 @@ COMMENT= BBS client using GTK+ 2.x LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USE_GNOME= gtk20 intlhack USES= gmake iconv pkgconfig tar:xz + GNU_CONFIGURE= yes +USE_GNOME= gtk20 intlhack OPTIONS_DEFINE= NLS DEBUG DOCKLET NOTIFIER LIBNOTIFY NANCY MOUSE EXTERNAL IPLOOKUP PROXY OPTIONS_DEFAULT= DOCKLET NOTIFIER NANCY MOUSE EXTERNAL Modified: head/chinese/pcmanx/files/patch-configure ============================================================================== --- head/chinese/pcmanx/files/patch-configure Sat Aug 11 06:30:44 2018 (r476860) +++ head/chinese/pcmanx/files/patch-configure Sat Aug 11 08:30:55 2018 (r476861) @@ -1,6 +1,6 @@ ---- configure.orig 2013-02-23 12:34:26.239318500 +0800 -+++ configure 2013-02-23 12:34:47.839542597 +0800 -@@ -17189,7 +17189,6 @@ +--- configure.orig 2018-08-11 08:08:31 UTC ++++ configure +@@ -17297,7 +17297,6 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >> fi fi Added: head/chinese/pcmanx/files/patch-src-mainframe.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/pcmanx/files/patch-src-mainframe.cpp Sat Aug 11 08:30:55 2018 (r476861) @@ -0,0 +1,42 @@ +--- src/mainframe.cpp.orig 2016-02-16 12:31:52 UTC ++++ src/mainframe.cpp +@@ -187,7 +187,7 @@ CMainFrame::CMainFrame() + LoadIcons(); + + +- gtk_window_set_title (GTK_WINDOW (m_Widget), "PCManX "VERSION ); ++ gtk_window_set_title (GTK_WINDOW (m_Widget), "PCManX " VERSION ); + + m_pNotebook = new CNotebook(); + gtk_notebook_set_scrollable(GTK_NOTEBOOK(m_pNotebook->m_Widget), TRUE); +@@ -285,9 +285,9 @@ CTelnetCon* CMainFrame::NewCon(string ti + url = url.substr(first, last - first + 1); + + /* Remove telnet:// from url */ +- first = url.find_first_not_of("telnet://"); +- if (first != string::npos) +- url.erase(0, first); ++ const string telnetPrefix = "telnet://"; ++ if(url.substr(0, telnetPrefix.size()) == telnetPrefix) ++ url.erase(0, telnetPrefix.size()); + + if ( site == NULL ) + site = &AppConfig.m_DefaultSite; +@@ -1677,7 +1677,7 @@ void CMainFrame::SetCurView(CTelnetView* + m_pView = view; + if( !m_pView || !m_pView->GetCon() ) + { +- gtk_window_set_title (GTK_WINDOW (m_Widget), "PCManX "VERSION ); ++ gtk_window_set_title (GTK_WINDOW (m_Widget), "PCManX " VERSION ); + gtk_entry_set_text( GTK_ENTRY(m_URLEntry), ""); + return; + } +@@ -1690,7 +1690,7 @@ void CMainFrame::SetCurView(CTelnetView* + if( ! con->IsClosed() ) + m_pNotebook->SetPageTitle( m_pView, title ); + +- title += " - PCManX "VERSION; ++ title += " - PCManX " VERSION; + gtk_window_set_title (GTK_WINDOW (m_Widget), title.c_str() ); + + char time_str[100]; Modified: head/chinese/pcmanx/files/patch-src-pcmanx_gtk2.cpp ============================================================================== --- head/chinese/pcmanx/files/patch-src-pcmanx_gtk2.cpp Sat Aug 11 06:30:44 2018 (r476860) +++ head/chinese/pcmanx/files/patch-src-pcmanx_gtk2.cpp Sat Aug 11 08:30:55 2018 (r476861) @@ -1,5 +1,5 @@ ---- src/pcmanx_gtk2.cpp.orig 2012-01-26 22:31:52.000000000 +0800 -+++ src/pcmanx_gtk2.cpp 2012-05-01 00:36:00.000000000 +0800 +--- src/pcmanx_gtk2.cpp.orig 2016-02-16 12:31:46 UTC ++++ src/pcmanx_gtk2.cpp @@ -35,6 +35,8 @@ #include #include Modified: head/chinese/pcmanx/files/patch-src-view-telnetcon.cpp ============================================================================== --- head/chinese/pcmanx/files/patch-src-view-telnetcon.cpp Sat Aug 11 06:30:44 2018 (r476860) +++ head/chinese/pcmanx/files/patch-src-view-telnetcon.cpp Sat Aug 11 08:30:55 2018 (r476861) @@ -1,5 +1,5 @@ ---- src/view/telnetcon.cpp.orig 2010-10-12 21:12:03.000000000 +0800 -+++ src/view/telnetcon.cpp 2010-10-12 21:12:09.000000000 +0800 +--- src/view/telnetcon.cpp.orig 2016-02-16 12:31:46 UTC ++++ src/view/telnetcon.cpp @@ -77,7 +77,6 @@ #ifdef USING_LINUX #include