6 files changed, 32 insertions, 19 deletions

diff --git a/chinese/pcmanx/Makefile b/chinese/pcmanx/Makefile
index 6179ce06cae7..2c88fa571f8a 100644
--- a/chinese/pcmanx/Makefile
+++ b/chinese/pcmanx/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	pcmanx
-PORTVERSION=	0.3.8
-PORTREVISION=	4
+PORTVERSION=	0.3.9
 CATEGORIES=	chinese net gnome
-MASTER_SITES=	http://pcmanx.csie.net/release/ \
-		LOCAL/chinsan
+MASTER_SITES=	http://pcmanx-gtk2.googlecode.com/svn/website/release/
 DISTNAME=	${PORTNAME}-gtk2-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -27,10 +25,6 @@ OPTIONS=	WGET	"enable wget support for download articles" on
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} > 900007
-BROKEN=		fails to build with new utmpx
-.endif
-
 .if !defined(WITHOUT_WGET)
 RUN_DEPENDS+=	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
 CONFIGURE_ARGS+=--enable-wget
diff --git a/chinese/pcmanx/distinfo b/chinese/pcmanx/distinfo
index 5825de09f451..90728d44a512 100644
--- a/chinese/pcmanx/distinfo
+++ b/chinese/pcmanx/distinfo
@@ -1,3 +1,2 @@
-MD5 (pcmanx-gtk2-0.3.8.tar.bz2) = 95f1d74e7cd130f4f146444ffa91d1fc
-SHA256 (pcmanx-gtk2-0.3.8.tar.bz2) = ae631081c02a1d4b9c058f55e665d4328fe38df78ad1f078c35e6d0d56f2dd75
-SIZE (pcmanx-gtk2-0.3.8.tar.bz2) = 514098
+SHA256 (pcmanx-gtk2-0.3.9.tar.bz2) = 774fb06b48ac773243ce57b87eba4429f4cb05ef1febb87ee489ea6d7c3937b3
+SIZE (pcmanx-gtk2-0.3.9.tar.bz2) = 485014
diff --git a/chinese/pcmanx/files/patch-src-core-pcmanx_utils.h b/chinese/pcmanx/files/patch-src-core-pcmanx_utils.h
new file mode 100644
index 000000000000..8425578631d4
--- /dev/null
+++ b/chinese/pcmanx/files/patch-src-core-pcmanx_utils.h
@@ -0,0 +1,10 @@
+--- src/core/pcmanx_utils.h.orig	2010-10-12 21:10:55.000000000 +0800
++++ src/core/pcmanx_utils.h	2010-10-12 21:11:00.000000000 +0800
+@@ -5,7 +5,6 @@
+ #include <config.h>
+ #endif
+ 
+-#include <bits/wordsize.h>
+ #if __WORDSIZE == 64
+ typedef unsigned long int word_t;
+ #else
diff --git a/chinese/pcmanx/files/patch-src-view-telnetcon.cpp b/chinese/pcmanx/files/patch-src-view-telnetcon.cpp
new file mode 100644
index 000000000000..09b1bdcc1c4b
--- /dev/null
+++ b/chinese/pcmanx/files/patch-src-view-telnetcon.cpp
@@ -0,0 +1,10 @@
+--- 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
+@@ -72,7 +72,6 @@
+ #ifdef USING_LINUX
+ #include <pty.h>
+ #endif
+-#include <utmp.h>
+ 
+ #include <signal.h>
+ #include <sys/wait.h>
diff --git a/chinese/pcmanx/pkg-descr b/chinese/pcmanx/pkg-descr
index df59ed86bb67..5d964de425ed 100644
--- a/chinese/pcmanx/pkg-descr
+++ b/chinese/pcmanx/pkg-descr
@@ -1,3 +1,3 @@
 PCManX is a BBS client for X Window System using GTK+ 2.x.
 
-WWW: http://pcmanx.csie.net/
+WWW: http://code.google.com/p/pcmanx-gtk2/
diff --git a/chinese/pcmanx/pkg-plist b/chinese/pcmanx/pkg-plist
index 43cab2b1ccdf..8c8ada00c24a 100644
--- a/chinese/pcmanx/pkg-plist
+++ b/chinese/pcmanx/pkg-plist
@@ -2,19 +2,19 @@ bin/pcmanx
 lib/libpcmanx_core.la
 lib/libpcmanx_core.so
 lib/libpcmanx_core.so.3
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/pcmanx.mo
+share/applications/pcmanx.desktop
+share/pixmaps/pcmanx.png
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/pcmanx.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/pcmanx.mo
 %%DATADIR%%/emoticons
-%%DATADIR%%/sitelist
 %%DATADIR%%/nancy_bot/default.conf
 %%DATADIR%%/nancy_bot/default_msg.data
 %%DATADIR%%/nancy_bot/default_usages.data
 %%DATADIR%%/nancy_bot/example.conf
 %%DATADIR%%/nancy_bot/example_msg.data
 %%DATADIR%%/nancy_bot/example_usages.data
-share/applications/pcmanx.desktop
-share/pixmaps/pcmanx.png
-@dirrmtry share/applications
-@dirrmtry %%DATADIR%%/nancy_bot
+%%DATADIR%%/sitelist
 @dirrmtry %%DATADIR%%/script
-@dirrm %%DATADIR%%
+@dirrmtry %%DATADIR%%/nancy_bot
+@dirrmtry %%DATADIR%%
+@dirrmtry share/applications