diff -ruN zhcon.orig/Makefile zhcon/Makefile --- zhcon.orig/Makefile Wed Apr 30 20:55:05 2003 +++ zhcon/Makefile Wed Apr 30 20:55:48 2003 @@ -6,7 +6,7 @@ # PORTNAME= zhcon -PORTVERSION= 0.2.1 +PORTVERSION= 0.2.3 CATEGORIES= chinese MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -26,15 +26,4 @@ MAN1= zhcon.1 -.include - -post-patch: -.if ${OSVERSION} > 500012 -.for i in src/main.cpp src/zhcon.cpp src/inputmanager.cpp src/display/fbdev.cpp src/mouse.h - ${REINPLACE_CMD} 's,machine/console.h>,sys/consio.h>@#include @#include ,' ${WRKSRC}/${i} | tr '@' '\n' > ${WRKSRC}/${i}.bak && \ - ${MV} ${WRKSRC}/${i}.bak ${WRKSRC}/${i} -.endfor - ${REINPLACE_CMD} -i.bak -e 's,machine/mouse.h>,sys/mouse.h>,' ${WRKSRC}/src/mouse.h -.endif - -.include +.include diff -ruN zhcon.orig/distinfo zhcon/distinfo --- zhcon.orig/distinfo Wed Apr 30 20:55:05 2003 +++ zhcon/distinfo Wed Apr 30 20:57:15 2003 @@ -1 +1 @@ -MD5 (zhcon-0.2.1.tar.gz) = 3171b538b8bb5c5eb70a8229e52bd28d +MD5 (zhcon-0.2.3.tar.gz) = 64b5d6c2d7055b4e45f4eadfd1303e8f diff -ruN zhcon.orig/files/patch-configure zhcon/files/patch-configure --- zhcon.orig/files/patch-configure Wed Apr 30 20:55:05 2003 +++ zhcon/files/patch-configure Thu Jan 1 08:00:00 1970 @@ -1,11 +0,0 @@ ---- configure.orig Mon Jun 10 10:29:34 2002 -+++ configure Wed Nov 27 20:03:03 2002 -@@ -1671,7 +1671,7 @@ - fi - - --ZHCON_LOCALE_DIR="/usr/share/locale" -+ZHCON_LOCALE_DIR="/usr/local/share/locale" - - if test "$ZHCON_ARCH" = "freebsd";then - echo $ac_n "checking for main in -lintl""... $ac_c" 1>&6 diff -ruN zhcon.orig/files/patch-intl::dcigettext.c zhcon/files/patch-intl::dcigettext.c --- zhcon.orig/files/patch-intl::dcigettext.c Wed Apr 30 20:55:05 2003 +++ zhcon/files/patch-intl::dcigettext.c Thu Jan 1 08:00:00 1970 @@ -1,15 +0,0 @@ ---- intl/dcigettext.c.orig Mon Nov 25 23:59:34 2002 -+++ intl/dcigettext.c Tue Nov 26 00:19:20 2002 -@@ -57,10 +57,12 @@ - #include - - #include -+#if 0 - #if !HAVE_STRCHR && !defined _LIBC - # ifndef strchr - # define strchr index - # endif -+#endif - #endif - - #if defined HAVE_UNISTD_H || defined _LIBC diff -ruN zhcon.orig/files/patch-src::Makefile.in zhcon/files/patch-src::Makefile.in --- zhcon.orig/files/patch-src::Makefile.in Wed Apr 30 20:55:05 2003 +++ zhcon/files/patch-src::Makefile.in Wed Apr 30 21:11:00 2003 @@ -1,29 +1,11 @@ ---- src/Makefile.in.orig Tue Jun 11 10:25:52 2002 -+++ src/Makefile.in Tue Nov 26 01:37:47 2002 -@@ -81,7 +81,7 @@ - LIB = @LIB@ - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ --LIBS = @LIBS@ -+LIBS = -lintl -lcurses @LIBS@ -I/usr/lib - LN_S = @LN_S@ - LTLIB = @LTLIB@ - LTLIBICONV = @LTLIBICONV@ -@@ -117,7 +117,7 @@ - PROGRAMS = $(bin_PROGRAMS) - - --DEFS = @DEFS@ -I. -I$(srcdir) -I.. -+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I/usr/include - CPPFLAGS = @CPPFLAGS@ - zhcon_OBJECTS = basefont.o big52gbdecoder.o big5decoder.o configfile.o \ - console.o gb2big5decoder.o gbdecoder.o gbkdecoder.o graphdev.o \ -@@ -395,7 +395,7 @@ +--- 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 - $(INSTALL_DATA) $(srcdir)/zhcon.conf $(PREFIX)/etc/zhcon.conf.sample uninstall-local: + -rm -f $(DESTDIR)/etc/zhcon.conf diff -ruN zhcon.orig/files/patch-src::graphdev.cpp zhcon/files/patch-src::graphdev.cpp --- zhcon.orig/files/patch-src::graphdev.cpp Wed Apr 30 20:55:05 2003 +++ zhcon/files/patch-src::graphdev.cpp Thu Jan 1 08:00:00 1970 @@ -1,11 +0,0 @@ ---- src/graphdev.cpp.ori Tue Apr 9 14:54:28 2002 -+++ src/graphdev.cpp Tue Apr 9 15:27:14 2002 -@@ -29,7 +29,7 @@ - - #include "display/fbdev.h" - #include "display/vgadev.h" --#if defined(linux) -+#if defined(linux) || defined(__FreeBSD__) - #ifdef HAVE_GGI_LIB - #include "display/libggi.h" - #endif diff -ruN zhcon.orig/files/patch-src::zhcon.conf zhcon/files/patch-src::zhcon.conf --- zhcon.orig/files/patch-src::zhcon.conf Wed Apr 30 20:55:05 2003 +++ zhcon/files/patch-src::zhcon.conf Thu Jan 1 08:00:00 1970 @@ -1,16 +0,0 @@ ---- src/zhcon.conf.orig Tue Nov 26 02:03:39 2002 -+++ src/zhcon.conf Tue Nov 26 02:03:50 2002 -@@ -34,10 +34,10 @@ - # FreeBSD wizard and ask him to compile a new kernel with VESA support - # for you and ... emmmm ... explain all these stuff to you ... - # --x_resolution = 800 --y_resolution = 600 -+x_resolution = 640 -+y_resolution = 480 - # 4 bits = 16 colors, 8 bits = 256 colors, 16 bits = 64K colors, and so on.. --color_depth = 8 -+color_depth = 4 - - #blanklineheight must >= 0 - blanklineheight = 1 diff -ruN zhcon.orig/files/patch-tools::Makefile.in zhcon/files/patch-tools::Makefile.in --- zhcon.orig/files/patch-tools::Makefile.in Wed Apr 30 20:55:05 2003 +++ zhcon/files/patch-tools::Makefile.in Thu Jan 1 08:00:00 1970 @@ -1,20 +0,0 @@ ---- tools/Makefile.in.orig Mon Nov 25 23:45:33 2002 -+++ tools/Makefile.in Mon Nov 25 23:49:43 2002 -@@ -107,7 +107,7 @@ - LDFLAGS = - CXXFLAGS = - CCFLAGS = --LIBS = -+LIBS = -lX11 -L/usr/X11R6/lib - - EXTRA_DIST = README getbpsf.txt gpm-1.19.6-pty.diff gpm-1.19.6-patched.tar.gz - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -116,7 +116,7 @@ - PROGRAMS = $(bin_PROGRAMS) - - --DEFS = @DEFS@ -I. -I$(srcdir) -I.. -+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I/usr/X11R6/include - CPPFLAGS = @CPPFLAGS@ - uc2win_OBJECTS = uc2win.o - uc2win_LDADD = $(LDADD) diff -ruN zhcon.orig/pkg-plist zhcon/pkg-plist --- zhcon.orig/pkg-plist Wed Apr 30 20:55:05 2003 +++ zhcon/pkg-plist Wed Apr 30 21:11:33 2003 @@ -1,9 +1,5 @@ -bin/getbpsf -bin/uc2win -bin/win2mb bin/zhcon etc/zhcon.conf -etc/zhcon.conf.sample lib/zhcon/font/asc12.bpsf lib/zhcon/font/asc12x.bpsf lib/zhcon/font/asc14.bpsf @@ -40,6 +36,7 @@ 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