- 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 <holishingtest@gmail.com>

5 files changed, 52 insertions, 8 deletions

diff --git a/chinese/pcmanx/Makefile b/chinese/pcmanx/Makefile
index 9ce23b533fa8..5a7dc57d48aa 100644
--- a/chinese/pcmanx/Makefile
+++ b/chinese/pcmanx/Makefile
@@ -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
diff --git a/chinese/pcmanx/files/patch-configure b/chinese/pcmanx/files/patch-configure
index f7e8e6275de7..db1263f53754 100644
--- a/chinese/pcmanx/files/patch-configure
+++ b/chinese/pcmanx/files/patch-configure
@@ -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
diff --git a/chinese/pcmanx/files/patch-src-mainframe.cpp b/chinese/pcmanx/files/patch-src-mainframe.cpp
new file mode 100644
index 000000000000..70135c332e17
--- /dev/null
+++ b/chinese/pcmanx/files/patch-src-mainframe.cpp
@@ -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];
diff --git a/chinese/pcmanx/files/patch-src-pcmanx_gtk2.cpp b/chinese/pcmanx/files/patch-src-pcmanx_gtk2.cpp
index 3af9ae50bdba..7cd4cc2f9c11 100644
--- a/chinese/pcmanx/files/patch-src-pcmanx_gtk2.cpp
+++ b/chinese/pcmanx/files/patch-src-pcmanx_gtk2.cpp
@@ -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 <cstring>
  #include <ltdl.h>
diff --git a/chinese/pcmanx/files/patch-src-view-telnetcon.cpp b/chinese/pcmanx/files/patch-src-view-telnetcon.cpp
index 4b1341645472..9b33250d9d35 100644
--- a/chinese/pcmanx/files/patch-src-view-telnetcon.cpp
+++ b/chinese/pcmanx/files/patch-src-view-telnetcon.cpp
@@ -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 <pty.h>