update to zhcon-0.2.3

PR:		51625
Submitted by:	Statue <statue@freebsd.sinica.edu.tw>

9 files changed, 8 insertions, 113 deletions

diff --git a/chinese/zhcon/Makefile b/chinese/zhcon/Makefile
index d5ca901b8e06..ed179e15e6e2 100644
--- a/chinese/zhcon/Makefile
+++ b/chinese/zhcon/Makefile
@@ -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 @@ ONLY_FOR_ARCHS=	i386
 
 MAN1=		zhcon.1
 
-.include <bsd.port.pre.mk>
-
-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 <sys/fbio.h>@#include <sys/kbio.h>,' ${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 <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/chinese/zhcon/distinfo b/chinese/zhcon/distinfo
index 3d9eb46d7fe2..89e5a084602b 100644
--- a/chinese/zhcon/distinfo
+++ b/chinese/zhcon/distinfo
@@ -1 +1 @@
-MD5 (zhcon-0.2.1.tar.gz) = 3171b538b8bb5c5eb70a8229e52bd28d
+MD5 (zhcon-0.2.3.tar.gz) = 64b5d6c2d7055b4e45f4eadfd1303e8f
diff --git a/chinese/zhcon/files/patch-configure b/chinese/zhcon/files/patch-configure
deleted file mode 100644
index a637d5e41923..000000000000
--- a/chinese/zhcon/files/patch-configure
+++ /dev/null
@@ -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 --git a/chinese/zhcon/files/patch-intl::dcigettext.c b/chinese/zhcon/files/patch-intl::dcigettext.c
deleted file mode 100644
index 4b9abc6b574b..000000000000
--- a/chinese/zhcon/files/patch-intl::dcigettext.c
+++ /dev/null
@@ -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 <stdlib.h>
- 
- #include <string.h>
-+#if 0
- #if !HAVE_STRCHR && !defined _LIBC
- # ifndef strchr
- #  define strchr index
- # endif
-+#endif
- #endif
- 
- #if defined HAVE_UNISTD_H || defined _LIBC
diff --git a/chinese/zhcon/files/patch-src::Makefile.in b/chinese/zhcon/files/patch-src::Makefile.in
index e8f75bad3e38..2de06833be7b 100644
--- a/chinese/zhcon/files/patch-src::Makefile.in
+++ b/chinese/zhcon/files/patch-src::Makefile.in
@@ -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 --git a/chinese/zhcon/files/patch-src::graphdev.cpp b/chinese/zhcon/files/patch-src::graphdev.cpp
deleted file mode 100644
index 65e81c9c89b2..000000000000
--- a/chinese/zhcon/files/patch-src::graphdev.cpp
+++ /dev/null
@@ -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 --git a/chinese/zhcon/files/patch-src::zhcon.conf b/chinese/zhcon/files/patch-src::zhcon.conf
deleted file mode 100644
index e96b3980b367..000000000000
--- a/chinese/zhcon/files/patch-src::zhcon.conf
+++ /dev/null
@@ -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 --git a/chinese/zhcon/files/patch-tools::Makefile.in b/chinese/zhcon/files/patch-tools::Makefile.in
deleted file mode 100644
index 5b6ba4c56bb3..000000000000
--- a/chinese/zhcon/files/patch-tools::Makefile.in
+++ /dev/null
@@ -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 --git a/chinese/zhcon/pkg-plist b/chinese/zhcon/pkg-plist
index 871f6d28706d..bd80742facb2 100644
--- a/chinese/zhcon/pkg-plist
+++ b/chinese/zhcon/pkg-plist
@@ -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/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