6 files changed, 52 insertions, 59 deletions

diff --git a/chinese/xcin25/Makefile b/chinese/xcin25/Makefile
index d153295cae79..5e69e55ec8fd 100644
--- a/chinese/xcin25/Makefile
+++ b/chinese/xcin25/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	xcin
-PORTVERSION=	2.5.2p3
+PORTVERSION=	2.5.2p4
 CATEGORIES=	chinese x11
 MASTER_SITES=	ftp://xcin.linux.org.tw/pub/xcin/xcin/devel/
-DISTNAME=	xcin-2.5.2-pre3
+DISTNAME=	xcin-2.5.2-pre4
 
 MAINTAINER=	keith@freebsd.sinica.edu.tw
 
@@ -18,7 +18,7 @@ LIB_DEPENDS=	tabe.0:${PORTSDIR}/chinese/libtabe \
 		db2.0:${PORTSDIR}/databases/db
 RUN_DEPENDS=	${X11BASE}/lib/X11/locale/zh_TW.Big5/XLC_LOCALE:${PORTSDIR}/x11/XFree86 \
 		${X11BASE}/lib/X11/fonts/local/kc15f.pcf.gz:${PORTSDIR}/chinese/kcfonts \
-		${LOCALBASE}/share/tabe/libtabe-0.1-5:${PORTSDIR}/chinese/libtabe
+		${LOCALBASE}/share/tabe/libtabe-0.1-6:${PORTSDIR}/chinese/libtabe
 
 WRKSRC=		${WRKDIR}/xcin-2.5
 USE_X_PREFIX=	yes
diff --git a/chinese/xcin25/distinfo b/chinese/xcin25/distinfo
index e2939418d981..0b59459a4e14 100644
--- a/chinese/xcin25/distinfo
+++ b/chinese/xcin25/distinfo
@@ -1 +1 @@
-MD5 (xcin-2.5.2-pre3.tar.gz) = f6bdbf762bba8c7efe1efe02acf8db45
+MD5 (xcin-2.5.2-pre4.tar.gz) = 6625f2553e0e323641257c04997d3c48
diff --git a/chinese/xcin25/files/patch-aa b/chinese/xcin25/files/patch-aa
index 21adbc068993..a9aad077e129 100644
--- a/chinese/xcin25/files/patch-aa
+++ b/chinese/xcin25/files/patch-aa
@@ -1,6 +1,6 @@
---- src/util/cin2tab/Makefile.in.orig	Sun Aug 15 00:03:26 1999
-+++ src/util/cin2tab/Makefile.in	Sun Aug 15 00:13:01 1999
-@@ -58,7 +58,8 @@
+--- src/util/cin2tab/Makefile.in.orig	Thu Jul 20 09:46:36 2000
++++ src/util/cin2tab/Makefile.in	Sat Aug 12 15:13:28 2000
+@@ -72,6 +72,7 @@
  distclean: clean
  	rm -f Makefile .depend
  install: $(BIN)
@@ -10,4 +10,3 @@
 +	if [ -f $(xcin_libp)/bin/$(BIN) ]; then mv $(xcin_libp)/bin/$(BIN) $(xcin_libp)/bin/$(BIN).old; fi
 +	$(INSTALL_PROGRAM) $(BIN) $(xcin_libp)/bin
  
- include .depend
diff --git a/chinese/xcin25/files/patch-ae b/chinese/xcin25/files/patch-ae
index 2c02feef587a..a2e51a603a37 100644
--- a/chinese/xcin25/files/patch-ae
+++ b/chinese/xcin25/files/patch-ae
@@ -1,13 +1,13 @@
---- src/xcinrc.in.orig	Sat Dec 18 15:42:02 1999
-+++ src/xcinrc.in	Sat Dec 18 15:42:58 1999
-@@ -105,8 +105,8 @@
- 	  (AUTO_SELECTION	YES)
- 	;
- 	; The following has effect only when AUTO_SELECTION is YES
--	  (TSI_FNAME		"tsi.db")
--	  (YIN_FNAME		"yin.db")
-+	  (TSI_FNAME		"/usr/local/share/tabe/tsiyin/tsi.db")
-+	  (YIN_FNAME		"/usr/local/share/tabe/tsiyin/yin.db")
- 	  (SPACE_SELECTION	NO)
- 	  (PHRASE_SELECTION	YES)
- 	  (N_SELECTION_PHR	4)))
+--- src/xcinrc.in.orig	Mon Jul 24 09:44:21 2000
++++ src/xcinrc.in	Sat Aug 12 15:15:12 2000
+@@ -86,8 +86,8 @@
+           (PINPHO_MAP           "bims_pinyin")
+         ;
+         ; The following has effect only when AUTO_SELECTION is YES
+-          (TSI_FNAME            "tsi.db")
+-          (YIN_FNAME            "yin.db")
++          (TSI_FNAME            "/usr/local/share/tabe/tsiyin/tsi.db")
++          (YIN_FNAME            "/usr/local/share/tabe/tsiyin/yin.db")
+           (SPACE_SELECTION      NO)
+           (PHRASE_SELECTION     YES)
+           (N_SELECTION_PHR      4)
diff --git a/chinese/xcin25/files/patch-af b/chinese/xcin25/files/patch-af
index 39163df0975b..d6f30c89fa2e 100644
--- a/chinese/xcin25/files/patch-af
+++ b/chinese/xcin25/files/patch-af
@@ -1,11 +1,11 @@
---- src/Cinput/bimsphone/Makefile.in.orig	Sun Jul 16 16:18:30 2000
-+++ src/Cinput/bimsphone/Makefile.in	Sun Jul 16 16:18:36 2000
-@@ -33,7 +33,7 @@
+--- src/Cinput/bimsphone/Makefile.in.orig	Thu Jul 20 09:46:35 2000
++++ src/Cinput/bimsphone/Makefile.in	Sat Aug 12 15:15:56 2000
+@@ -38,7 +38,7 @@
  xcininc = -I$(top_srcdir)/src/include
  xcinlib = -L${top_srcdir}/src/lib
  INC     = $(xcininc) $(x_includes) $(extra_inc) $(tabe_inc) $(db_inc)
 -LIB     = $(xcinlib) $(extra_lib) $(tabe_lib) $(db_lib)
 +LIB     = $(xcinlib) $(extra_lib) $(tabe_lib) $(db_lib) -lgcc
- TARGET  = bimsphone.so
+ TARGET  = bimsphone.$(slib_ext)
  
  
diff --git a/chinese/xcin25/pkg-plist b/chinese/xcin25/pkg-plist
index f1ce1752a5e3..75bd121fe8ae 100644
--- a/chinese/xcin25/pkg-plist
+++ b/chinese/xcin25/pkg-plist
@@ -26,44 +26,38 @@ lib/X11/xcin25/doc/modules/bimsphone
 lib/X11/xcin25/doc/modules/gen_inp
 lib/X11/xcin25/doc/modules/im_comm
 lib/X11/xcin25/doc/modules/zh_hex
-lib/X11/xcin25/tab/zh_TW.Big5/array30.cin
-lib/X11/xcin25/tab/zh_TW.Big5/array30.tab
-lib/X11/xcin25/tab/zh_TW.Big5/bims_pinyin.cin
-lib/X11/xcin25/tab/zh_TW.Big5/bims_pinyin.tab
-lib/X11/xcin25/tab/zh_TW.Big5/cantonese.cin
-lib/X11/xcin25/tab/zh_TW.Big5/cantonese.tab
-lib/X11/xcin25/tab/zh_TW.Big5/cj.cin
-lib/X11/xcin25/tab/zh_TW.Big5/cj.tab
-lib/X11/xcin25/tab/zh_TW.Big5/default.phr
-lib/X11/xcin25/tab/zh_TW.Big5/phone.cin
-lib/X11/xcin25/tab/zh_TW.Big5/phone.tab
-lib/X11/xcin25/tab/zh_TW.Big5/pinyin.cin
-lib/X11/xcin25/tab/zh_TW.Big5/pinyin.tab
-lib/X11/xcin25/tab/zh_TW.Big5/simplex.cin
-lib/X11/xcin25/tab/zh_TW.Big5/simplex.tab
-lib/X11/xcin25/tab/zh_TW.Big5/sys.cin
-lib/X11/xcin25/tab/zh_TW.Big5/sys.tab
-lib/X11/xcin25/tab/zh_CN.GB2312/biaoxingma.cin
-lib/X11/xcin25/tab/zh_CN.GB2312/biaoxingma.tab
-lib/X11/xcin25/tab/zh_CN.GB2312/default.phr
-lib/X11/xcin25/tab/zh_CN.GB2312/jtcj_gb.cin
-lib/X11/xcin25/tab/zh_CN.GB2312/jtcj_gb.tab
-lib/X11/xcin25/tab/zh_CN.GB2312/pinyin.cin
-lib/X11/xcin25/tab/zh_CN.GB2312/pinyin.tab
-lib/X11/xcin25/tab/zh_CN.GB2312/shuangpin.cin
-lib/X11/xcin25/tab/zh_CN.GB2312/shuangpin.tab
-lib/X11/xcin25/tab/zh_CN.GB2312/sys.cin
-lib/X11/xcin25/tab/zh_CN.GB2312/sys.tab
-lib/X11/xcin25/tab/zh_CN.GB2312/wubizixing.cin
-lib/X11/xcin25/tab/zh_CN.GB2312/wubizixing.tab
-lib/X11/xcin25/tab/zh_CN.GB2312/zhiranma.cin
-lib/X11/xcin25/tab/zh_CN.GB2312/zhiranma.tab
+lib/X11/xcin25/tab/big5/array30.tab
+lib/X11/xcin25/tab/big5/bims_pinyin.tab
+lib/X11/xcin25/tab/big5/cantonese.tab
+lib/X11/xcin25/tab/big5/cj.tab
+lib/X11/xcin25/tab/big5/default.phr
+lib/X11/xcin25/tab/big5/phone.tab
+lib/X11/xcin25/tab/big5/pinyin.tab
+lib/X11/xcin25/tab/big5/simplex.tab
+lib/X11/xcin25/tab/big5/sys.tab
+lib/X11/xcin25/tab/big5/tsi.db
+lib/X11/xcin25/tab/big5/yin.db
+lib/X11/xcin25/tab/big5hkscs/cj.tab
+lib/X11/xcin25/tab/big5hkscs/default.phr
+lib/X11/xcin25/tab/big5hkscs/sys.tab
+lib/X11/xcin25/tab/gb2312/biaoxingma.tab
+lib/X11/xcin25/tab/gb2312/default.phr
+lib/X11/xcin25/tab/gb2312/jtcj_gb.tab
+lib/X11/xcin25/tab/gb2312/pinyin.tab
+lib/X11/xcin25/tab/gb2312/shuangpin.tab
+lib/X11/xcin25/tab/gb2312/sys.tab
+lib/X11/xcin25/tab/gb2312/wubizixing.tab
+lib/X11/xcin25/tab/gb2312/zhiranma.tab
+lib/X11/xcin25/tab/gbk/default.phr
+lib/X11/xcin25/tab/gbk/sys.tab
 share/locale/zh_TW.Big5/LC_MESSAGES/xcin.mo
 @dirrm lib/X11/xcin25/bin
 @dirrm lib/X11/xcin25/doc/internal
 @dirrm lib/X11/xcin25/doc/modules
 @dirrm lib/X11/xcin25/doc
-@dirrm lib/X11/xcin25/tab/zh_TW.Big5
-@dirrm lib/X11/xcin25/tab/zh_CN.GB2312
+@dirrm lib/X11/xcin25/tab/big5
+@dirrm lib/X11/xcin25/tab/big5hkscs
+@dirrm lib/X11/xcin25/tab/gb2312
+@dirrm lib/X11/xcin25/tab/gbk
 @dirrm lib/X11/xcin25/tab
 @dirrm lib/X11/xcin25