Upgrade to version 2.5.2.pre6

PR: 21832
Submitted by: MAINTAINER

6 files changed, 28 insertions, 29 deletions

diff --git a/chinese/xcin25/Makefile b/chinese/xcin25/Makefile
index b90f6d2ad31f..d8d7693b57ef 100644
--- a/chinese/xcin25/Makefile
+++ b/chinese/xcin25/Makefile
@@ -6,15 +6,10 @@
 #
 
 PORTNAME=	xcin
-PORTVERSION=	2.5.2p5
-PORTREVISION=	2
+PORTVERSION=	2.5.2p6
 CATEGORIES=	chinese x11
 MASTER_SITES=	ftp://xcin.linux.org.tw/pub/xcin/xcin/devel/
-DISTNAME=	xcin-2.5.2-pre5
-
-PATCH_SITES=   	ftp://xcin.linux.org.tw/pub/xcin/xcin/patch/
-PATCHFILES=     xcin-2.5.2.pre5.diff3.gz
-PATCH_DIST_STRIP=       -p1
+DISTNAME=	xcin-2.5.2.pre6
 
 MAINTAINER=	keith@freebsd.sinica.edu.tw
 
@@ -23,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-6:${PORTSDIR}/chinese/libtabe
+		${LOCALBASE}/share/tabe/libtabe-0.1.7:${PORTSDIR}/chinese/libtabe
 
 WRKSRC=		${WRKDIR}/xcin-2.5
 USE_X_PREFIX=	yes
diff --git a/chinese/xcin25/distinfo b/chinese/xcin25/distinfo
index 04b58c0e2f4f..f665791ae8bd 100644
--- a/chinese/xcin25/distinfo
+++ b/chinese/xcin25/distinfo
@@ -1,2 +1 @@
-MD5 (xcin-2.5.2-pre5.tar.gz) = 4fd07ab343f4027a2b3e87b277d0b451
-MD5 (xcin-2.5.2.pre5.diff3.gz) = 22eb30e0776d144e5b04b8882f56c036
+MD5 (xcin-2.5.2.pre6.tar.gz) = 23ac8b3f14d92d8c7a71498cd8be193b
diff --git a/chinese/xcin25/files/patch-aa b/chinese/xcin25/files/patch-aa
index a9aad077e129..3698060391a8 100644
--- a/chinese/xcin25/files/patch-aa
+++ b/chinese/xcin25/files/patch-aa
@@ -1,10 +1,9 @@
 --- 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 @@
+@@ -72,5 +72,7 @@
  distclean: clean
  	rm -f Makefile .depend
  install: $(BIN)
--	if [ -f $(xcin_binp)/$(BIN) ]; then mv $(xcin_binp)/$(BIN) $(xcin_binp)/$(BIN).old; fi
 -	$(INSTALL_PROGRAM) $(BIN) $(xcin_binp)
 +	if [ ! -d $(xcin_libp)/bin ]; then mkdir -p $(xcin_libp)/bin; fi
 +	if [ -f $(xcin_libp)/bin/$(BIN) ]; then mv $(xcin_libp)/bin/$(BIN) $(xcin_libp)/bin/$(BIN).old; fi
diff --git a/chinese/xcin25/files/patch-ae b/chinese/xcin25/files/patch-ae
index a2e51a603a37..0a62c9ba797b 100644
--- a/chinese/xcin25/files/patch-ae
+++ b/chinese/xcin25/files/patch-ae
@@ -1,6 +1,6 @@
---- 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 @@
+--- etc/xcinrc.FREEBSD.orig	Mon Oct  9 01:25:34 2000
++++ etc/xcinrc.FREEBSD	Mon Oct  9 01:25:47 2000
+@@ -87,8 +87,8 @@
            (PINPHO_MAP           "bims_pinyin")
          ;
          ; The following has effect only when AUTO_SELECTION is YES
diff --git a/chinese/xcin25/files/patch-ah b/chinese/xcin25/files/patch-ah
new file mode 100644
index 000000000000..b27844556b58
--- /dev/null
+++ b/chinese/xcin25/files/patch-ah
@@ -0,0 +1,11 @@
+--- po/Makefile.in.orig	Sun Oct  8 12:12:14 2000
++++ po/Makefile.in	Mon Oct  9 01:11:33 2000
+@@ -27,7 +27,7 @@
+ install: 
+ 	if [ "$(GNU_GETTEXT)" = 1 ]; then \
+ 	    for l in $(LC_MESG); do \
+-		msgpath=$(xcin_msgp)/$$l/LC_MESSAGES; \
++		msgpath=$(xcin_msgp)/zh_TW.Big5/LC_MESSAGES; \
+ 		if [ ! -d $$msgpath ]; then \
+ 	            $(INSTALL) -d $$msgpath; fi; \
+ 	        msgfmt -o $$msgpath/xcin.mo xcin-$$l.po; \
diff --git a/chinese/xcin25/pkg-plist b/chinese/xcin25/pkg-plist
index 6f576a6627b4..cf0beaf90f34 100644
--- a/chinese/xcin25/pkg-plist
+++ b/chinese/xcin25/pkg-plist
@@ -29,31 +29,26 @@ lib/X11/xcin25/tab/big5/array30.tab
 lib/X11/xcin25/tab/big5/bims_pinyin.tab
 lib/X11/xcin25/tab/big5/cj.tab
 lib/X11/xcin25/tab/big5/default.phr
+lib/X11/xcin25/tab/big5/jyutping.tab
+lib/X11/xcin25/tab/big5/jyutping0.tab
 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/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/gbk/default.phr
-lib/X11/xcin25/tab/gbk/sys.tab
+lib/X11/xcin25/tab/EUC/default.phr
+lib/X11/xcin25/tab/EUC/jtcj_gb.tab
+lib/X11/xcin25/tab/EUC/pinyin.tab
+lib/X11/xcin25/tab/EUC/shuangpin.tab
+lib/X11/xcin25/tab/EUC/sys.tab
+lib/X11/xcin25/tab/EUC/wubizixing.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/big5
-@dirrm lib/X11/xcin25/tab/big5hkscs
-@dirrm lib/X11/xcin25/tab/gb2312
-@dirrm lib/X11/xcin25/tab/gbk
+@dirrm lib/X11/xcin25/tab/EUC
 @dirrm lib/X11/xcin25/tab
 @dirrm lib/X11/xcin25