10 files changed, 15 insertions, 101 deletions

diff --git a/chinese/zhcon/Makefile b/chinese/zhcon/Makefile
index 94e3fab52751..63cd6de04238 100644
--- a/chinese/zhcon/Makefile
+++ b/chinese/zhcon/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	zhcon
-PORTVERSION=	0.2.3
-PORTREVISION=	7
+PORTVERSION=	0.2.5
 CATEGORIES=	chinese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,21 +15,25 @@ MAINTAINER=	chinsan.tw@gmail.com
 COMMENT=	A fast Console Chinese System which supports framebuffer device
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE}
 ONLY_FOR_ARCHS=	i386
-# Don't bother to add ".if !defined(WITHOUT_NLS)", zhcon requires libintl
-USE_GETTEXT=	yes
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 MAN1=		zhcon.1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' ${WRKSRC}/doc/zhcon.1.in
+	@${REINPLACE_CMD} -e 's,/etc,${PREFIX}/etc,' ${WRKSRC}/doc/zhcon.1.in
 	@${REINPLACE_CMD} -Ee 's,/dev/vga,/dev/ttyv0,g' ${WRKSRC}/src/display/fbdev.cpp
-	@${REINPLACE_CMD} -e '5 s|#||;'  ${WRKSRC}/src/zhcon.conf
+	@${REINPLACE_CMD} -Ee 's,endian,sys/endian,g' ${WRKSRC}/src/display/fblinear4.cpp \
+		${WRKSRC}/src/display/fblinear8.cpp ${WRKSRC}/src/display/fblinear16.cpp \
+		${WRKSRC}/src/display/fblinear24.cpp
+	@${REINPLACE_CMD} -e '5 s,#,,; s,/usr/lib,${PREFIX}/lib,'  ${WRKSRC}/src/zhcon.conf
+	@${REINPLACE_CMD} -e 's,"/etc,PREFIX"/etc,'  ${WRKSRC}/src/zhcon.cpp
 	@${REINPLACE_CMD} -Ee 's,(\s*=\s*)("?)/usr/local([^"]*)("?),\1\2${PREFIX}\3\4,g' \
 		-e '/_nl_expand_alias/s,\(0\),\(\),g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+.if defined(WITH_BIG5)
+	@${REINPLACE_CMD} -e '11 s,gb2312,big5,' ${WRKSRC}/src/zhcon.conf
+.endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/chinese/zhcon/distinfo b/chinese/zhcon/distinfo
index 92bc8dc615cf..235f8d99b1e9 100644
--- a/chinese/zhcon/distinfo
+++ b/chinese/zhcon/distinfo
@@ -1,3 +1,3 @@
-MD5 (zhcon-0.2.3.tar.gz) = 64b5d6c2d7055b4e45f4eadfd1303e8f
-SHA256 (zhcon-0.2.3.tar.gz) = 60e2f7a3b2a548e043838794b7ab3cb0e84f13508d48b384e9b6598698baacbb
-SIZE (zhcon-0.2.3.tar.gz) = 5030677
+MD5 (zhcon-0.2.5.tar.gz) = 79e1c68aab8341e32129f61c1670baeb
+SHA256 (zhcon-0.2.5.tar.gz) = 4ce4dc1395b6f6a920d44aac069a284bff76df4019ac4164850d263538465d59
+SIZE (zhcon-0.2.5.tar.gz) = 5011644
diff --git a/chinese/zhcon/files/patch-src-Makefile.in b/chinese/zhcon/files/patch-src-Makefile.in
deleted file mode 100644
index 2de06833be7b..000000000000
--- a/chinese/zhcon/files/patch-src-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Thu Apr 17 19:29:48 2003
-+++ src/Makefile.in	Wed Apr 30 21:10:39 2003
-@@ -478,7 +478,7 @@
- 
- install-data-local:
- 	$(mkinstalldirs) $(DESTDIR)/etc
--	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)/etc/zhcon.conf
-+	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(PREFIX)/etc/zhcon.conf
- 
- uninstall-local:
- 	-rm -f $(DESTDIR)/etc/zhcon.conf
diff --git a/chinese/zhcon/files/patch-src-configfile.cpp b/chinese/zhcon/files/patch-src-configfile.cpp
deleted file mode 100644
index 1955508f56ee..000000000000
--- a/chinese/zhcon/files/patch-src-configfile.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/configfile.cpp.orig	Tue Jan 25 07:38:59 2005
-+++ src/configfile.cpp	Tue Jan 25 07:41:19 2005
-@@ -19,13 +19,18 @@
- #include <stdexcept>
- #include <fstream>
- #include <cstdlib>
-+#include <sys/types.h>
-+#include <unistd.h>
- #include "configfile.h"
- 
- ConfigFile::ConfigFile(const char *fn) {
-+    uid_t euid = geteuid();
-+    seteuid(getuid());
-     ifstream in(fn);
-     if (!in)
-         throw runtime_error("Could not open config file!");
-     ParseFile(in);
-+    seteuid(euid);
- }
- 
- ConfigFile::~ConfigFile() {}
diff --git a/chinese/zhcon/files/patch-src-display-fblinear24.cpp b/chinese/zhcon/files/patch-src-display-fblinear24.cpp
deleted file mode 100644
index abab0e40c044..000000000000
--- a/chinese/zhcon/files/patch-src-display-fblinear24.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/display/fblinear24.cpp~	Sun Aug  1 17:22:19 2004
-+++ src/display/fblinear24.cpp	Sun Aug  1 17:27:33 2004
-@@ -203,11 +203,11 @@
-             d1 = (-(*cdat >> 3 & 1) & eorx) ^ bgx;
-             d2 = (-(*cdat >> 2 & 1) & eorx) ^ bgx;
-             fb_writel(d1 | (d2<<24), dest32++);
--            fb_writew(d2>>8, ((__u16*)dest32)++);
-+            fb_writew(d2>>8, ((__u16*)dest32) + 1);
-         }
-         if (pFont->w & 1) {
-             d3 = (-(*cdat >> 1 & 1) & eorx) ^ bgx;
--            fb_writew(d3, ((__u16*)dest32)++);
-+            fb_writew(d3, ((__u16*)dest32) + 1);
-             fb_writeb(d3>>16, (__u8*)dest32);
-         }
-         cdat++;
diff --git a/chinese/zhcon/files/patch-src-display-fblinear8.cpp b/chinese/zhcon/files/patch-src-display-fblinear8.cpp
deleted file mode 100644
index 3cdf72ff7748..000000000000
--- a/chinese/zhcon/files/patch-src-display-fblinear8.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/display/fblinear8.cpp~	Sun Aug  1 17:29:43 2004
-+++ src/display/fblinear8.cpp	Sun Aug  1 17:39:12 2004
-@@ -102,7 +102,7 @@
-             fb_writel((nibbletab_cfb8[*cdat >> 4] & eorx) ^ bgx, dest32++);
-         }
-         if (pFont->w & 2) {
--            fb_writew((nibbletab_cfb8[*cdat & 0xc] & eorx) ^ bgx, ((__u16*)dest32)++);
-+            fb_writew((nibbletab_cfb8[*cdat & 0xc] & eorx) ^ bgx, ((__u16*)dest32) + 1);
-         }
-         if (pFont->w & 1) {
-             fb_writeb((*cdat & 2) ? fg : bg, (__u8*)dest32);
diff --git a/chinese/zhcon/files/patch-src-inputclient.h b/chinese/zhcon/files/patch-src-inputclient.h
deleted file mode 100644
index df3d1107a125..000000000000
--- a/chinese/zhcon/files/patch-src-inputclient.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/inputclient.h.orig	Sat Aug 16 16:34:06 2003
-+++ src/inputclient.h	Sat Aug 16 16:34:15 2003
-@@ -19,6 +19,7 @@
- #ifndef INPUTCLIENT_H
- #define INPUTCLIENT_H
- 
-+#include <cassert>
- #include <string>
- #include "console.h"
- 
diff --git a/chinese/zhcon/files/patch-src-zhcon.cpp b/chinese/zhcon/files/patch-src-zhcon.cpp
deleted file mode 100644
index 21df71193387..000000000000
--- a/chinese/zhcon/files/patch-src-zhcon.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/zhcon.cpp.orig	Tue Nov 26 01:35:04 2002
-+++ src/zhcon.cpp	Tue Nov 26 01:35:25 2002
-@@ -131,7 +131,7 @@
-     string cfgfile = getenv("HOME");
-     cfgfile += "/.zhconrc";
-     if (access(cfgfile.c_str(), R_OK) != 0)
--        cfgfile = "/etc/zhcon.conf";
-+        cfgfile = PREFIX"/etc/zhcon.conf";
- 
-     //for debug,a pause enable us to attach zhcon's pid in gdb
-     //char c;cin>>c;
diff --git a/chinese/zhcon/pkg-descr b/chinese/zhcon/pkg-descr
index 7af51b5c5a7b..acf4133b2bb3 100644
--- a/chinese/zhcon/pkg-descr
+++ b/chinese/zhcon/pkg-descr
@@ -1,7 +1,8 @@
 Zhcon is a fast Linux Console Chinese System which supports
 framebuffer device.It can display Chinese,Japanese or Korean
 double byte characters.Supported language encodings include:
-GB2312,GBK,BIG5,JIS and KSCM.
+GB2312,GBK,BIG5,JIS and KSC. UTF-8 is also supported.
+
 It can also use input methods(table based) from M$pwin98 and
 UCDOS for M$-DOG.
 
diff --git a/chinese/zhcon/pkg-plist b/chinese/zhcon/pkg-plist
index 8f49eea34497..1b4e6ec0e11e 100644
--- a/chinese/zhcon/pkg-plist
+++ b/chinese/zhcon/pkg-plist
@@ -34,16 +34,6 @@ lib/zhcon/input/wbh.mb
 lib/zhcon/input/winpy.mb
 lib/zhcon/input/winsp.mb
 lib/zhcon/input/winzm.mb
-share/locale/ja/LC_MESSAGES/zhcon.mo
-share/locale/ko/LC_MESSAGES/zhcon.mo
-share/locale/zh_CN.EUC/LC_MESSAGES/zhcon.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/zhcon.mo
-share/locale/zh_CN.GBK/LC_MESSAGES/zhcon.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/zhcon.mo
-@dirrmtry share/locale/zh_CN.GBK/LC_MESSAGES
-@dirrmtry share/locale/zh_CN.GBK
-@dirrmtry share/locale/zh_CN.EUC/LC_MESSAGES
-@dirrmtry share/locale/zh_CN.EUC
 @dirrm lib/zhcon/input
 @dirrm lib/zhcon/font
 @dirrm lib/zhcon