7 files changed, 44 insertions, 73 deletions

diff --git a/chinese/xcin25/Makefile b/chinese/xcin25/Makefile
index 4c35991615bf..819f0a5427f4 100644
--- a/chinese/xcin25/Makefile
+++ b/chinese/xcin25/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	xcin25
-# Version required:	xcin-2.5.2b
+# Version required:	xcin-2.5.2b4
 # Date created:		18 Oct 1999
-# Whom:			Keith Jang <jtjang@gcn.net.tw>
+# Whom:			Keith Jang <keith@freebsd.sinica.edu.tw>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xcin-2.5-19991027
-PKGNAME=	zh-xcin-2.5.2b2
+DISTNAME=	xcin-2.5-19991128
+PKGNAME=	zh-xcin-2.5.2b4
 CATEGORIES=	chinese x11
 MASTER_SITES=	ftp://xcin.linux.org.tw/pub/xcin/xcin/devel/
 
@@ -17,7 +17,7 @@ LIB_DEPENDS=	tabe.0:${PORTSDIR}/chinese/libtabe \
 		intl.1:${PORTSDIR}/devel/gettext
 BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db
 RUN_DEPENDS=	${PREFIX}/lib/X11/locale/zh_TW.Big5/XLC_LOCALE:${PORTSDIR}/x11/XFree86 \
-		${PREFIX}/lib/X11/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
+		${X11BASE}/lib/X11/fonts/local/kc15f.pcf.gz:${PORTSDIR}/chinese/kcfonts
 
 WRKSRC=		${WRKDIR}/xcin-2.5
 USE_X_PREFIX=	yes
@@ -36,39 +36,20 @@ post-install:
 	strip ${PREFIX}/lib/X11/xcin25/bin/cin2tab
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/lib/X11/xcin25/doc
-	${INSTALL_MAN} ${WRKSRC}/doc/Bugs ${PREFIX}/lib/X11/xcin25/doc
-	${INSTALL_MAN} ${WRKSRC}/doc/COPYING ${PREFIX}/lib/X11/xcin25/doc
-	${INSTALL_MAN} ${WRKSRC}/doc/CREDITS ${PREFIX}/lib/X11/xcin25/doc
-	${INSTALL_MAN} ${WRKSRC}/doc/Changes ${PREFIX}/lib/X11/xcin25/doc
-	${INSTALL_MAN} ${WRKSRC}/doc/Cin ${PREFIX}/lib/X11/xcin25/doc
-	${INSTALL_MAN} ${WRKSRC}/doc/CopyRight ${PREFIX}/lib/X11/xcin25/doc
-	${INSTALL_MAN} ${WRKSRC}/doc/FAQ ${PREFIX}/lib/X11/xcin25/doc
-	${INSTALL_MAN} ${WRKSRC}/doc/README ${PREFIX}/lib/X11/xcin25/doc
-	${INSTALL_MAN} ${WRKSRC}/doc/README.En ${PREFIX}/lib/X11/xcin25/doc
-	${INSTALL_MAN} ${WRKSRC}/doc/SETUP ${PREFIX}/lib/X11/xcin25/doc
-	${INSTALL_MAN} ${WRKSRC}/doc/Todo ${PREFIX}/lib/X11/xcin25/doc
-	${INSTALL_MAN} ${WRKSRC}/doc/Usage ${PREFIX}/lib/X11/xcin25/doc
-	${INSTALL_MAN} ${WRKSRC}/doc/UserGuide ${PREFIX}/lib/X11/xcin25/doc
+.for DOC in Bugs COPYING CREDITS Changes Cin CopyRight FAQ README README.En \
+		SETUP Todo Usage UserGuide
+	${INSTALL_MAN} ${WRKSRC}/doc/${DOC} ${PREFIX}/lib/X11/xcin25/doc
+.endfor
 	${MKDIR} ${PREFIX}/lib/X11/xcin25/doc/internal
-	${INSTALL_MAN} ${WRKSRC}/doc/internal/IMdkit \
-		${PREFIX}/lib/X11/xcin25/doc/internal
-	${INSTALL_MAN} ${WRKSRC}/doc/internal/gen_inp \
-		${PREFIX}/lib/X11/xcin25/doc/internal
-	${INSTALL_MAN} ${WRKSRC}/doc/internal/gui_request \
-		${PREFIX}/lib/X11/xcin25/doc/internal
-	${INSTALL_MAN} ${WRKSRC}/doc/internal/module \
-		${PREFIX}/lib/X11/xcin25/doc/internal
-	${INSTALL_MAN} ${WRKSRC}/doc/internal/structer \
+.for INTERNAL in IMdkit gen_inp gui_request module structer
+	${INSTALL_MAN} ${WRKSRC}/doc/internal/${INTERNAL} \
 		${PREFIX}/lib/X11/xcin25/doc/internal
+.endfor
 	${MKDIR} ${PREFIX}/lib/X11/xcin25/doc/modules
-	${INSTALL_MAN} ${WRKSRC}/doc/modules/bimsphone \
-		${PREFIX}/lib/X11/xcin25/doc/modules
-	${INSTALL_MAN} ${WRKSRC}/doc/modules/gen_inp \
-		${PREFIX}/lib/X11/xcin25/doc/modules
-	${INSTALL_MAN} ${WRKSRC}/doc/modules/im_comm \
-		${PREFIX}/lib/X11/xcin25/doc/modules
-	${INSTALL_MAN} ${WRKSRC}/doc/modules/zh_hex \
+.for MODULES in bimsphone gen_inp im_comm zh_hex
+	${INSTALL_MAN} ${WRKSRC}/doc/modules/${MODULES} \
 		${PREFIX}/lib/X11/xcin25/doc/modules
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/chinese/xcin25/distinfo b/chinese/xcin25/distinfo
index 92aae44a0959..7848f7b0aaaf 100644
--- a/chinese/xcin25/distinfo
+++ b/chinese/xcin25/distinfo
@@ -1 +1 @@
-MD5 (xcin-2.5-19991027.tar.gz) = f7413f95ca840624a9579b7e9a95c704
+MD5 (xcin-2.5-19991128.tar.gz) = 5d2d760a7261c317ded991ddb22a1106
diff --git a/chinese/xcin25/files/patch-ab b/chinese/xcin25/files/patch-ab
index eaeec777ae7a..4b6029ccebdf 100644
--- a/chinese/xcin25/files/patch-ab
+++ b/chinese/xcin25/files/patch-ab
@@ -1,8 +1,10 @@
---- src/lib/Makefile.in.orig	Sun Aug 15 00:23:04 1999
-+++ src/lib/Makefile.in	Sun Aug 15 00:23:24 1999
-@@ -30,3 +30,5 @@
- 	rm -f Makefile
- 	for d in $(SUBSYS); do ( cd $$d; $(MAKE) distclean ); done
- 	( cd IMdkit; $(MAKE) clean )
+--- src/lib/Makefile.in.orig	Sun Nov 28 14:03:20 1999
++++ src/lib/Makefile.in	Sat Dec 18 16:55:02 1999
+@@ -19,6 +19,7 @@
+ 	$(LN_S) IMdkit/IMdkit/libXimd.a .
+ 
+ .PHONY: install clean distclean depend
 +
-+install:
+ install:
+ 
+ depend:
diff --git a/chinese/xcin25/files/patch-ad b/chinese/xcin25/files/patch-ad
index b76a7a107c7e..9f4c0c5b186b 100644
--- a/chinese/xcin25/files/patch-ad
+++ b/chinese/xcin25/files/patch-ad
@@ -1,11 +1,11 @@
---- src/Makefile.in.orig	Sun Aug 15 00:34:38 1999
-+++ src/Makefile.in	Sun Aug 15 00:35:31 1999
-@@ -45,7 +45,7 @@
+--- src/Makefile.in.orig	Sat Dec 18 15:40:46 1999
++++ src/Makefile.in	Sat Dec 18 15:41:05 1999
+@@ -47,7 +47,7 @@
  LIB = -lm ${x_libraries} ${extra_lib} ${locale_lib} ${dl_lib} ${intl_lib} \
-       ${xcinlib} -lXimd -lim_comm -lxcintool -lsiod 
+       ${xcinlib} -lXimd -lim_comm -lxcintool -lsiod ${socket_lib}
  
 -BIN    = xcin
 +BIN    = xcin2.5
- SRC    = xcin_main.c module.c gui.c xim.c xim_IC.c fkey.c
- OBJ    = xcin_main.o module.o gui.o xim.o xim_IC.o fkey.o
+ SRC    = xcin_main.c module.c gui.c xim.c xim_IC.c fkey.c gui_menusel.c
+ OBJ    = xcin_main.o module.o gui.o xim.o xim_IC.o fkey.o gui_menusel.o
  SUBSYS = lib Cinput
diff --git a/chinese/xcin25/files/patch-ae b/chinese/xcin25/files/patch-ae
index f6dce37a8235..2c02feef587a 100644
--- a/chinese/xcin25/files/patch-ae
+++ b/chinese/xcin25/files/patch-ae
@@ -1,13 +1,13 @@
---- src/xcinrc.in.orig	Mon Oct 18 11:48:24 1999
-+++ src/xcinrc.in	Mon Oct 18 11:50:39 1999
-@@ -95,8 +95,8 @@
- (define bimsphone
- 	'((SETKEY	6)
- 	  (MODULE	"bimsphone")
--	  (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_SEL	NO)
- 	  (MOD_PHR	1)		; 1: shift, 2: ctrl, 4: alt
- 	  (NSELKEY	9)		; The maximun number is 10
+--- 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)))
diff --git a/chinese/xcin25/files/patch-af b/chinese/xcin25/files/patch-af
deleted file mode 100644
index 2ca0c654e88e..000000000000
--- a/chinese/xcin25/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Cinput/bimsphone/bimsphone.c.orig	Wed Oct 27 14:37:45 1999
-+++ src/Cinput/bimsphone/bimsphone.c	Sat Nov  6 16:30:39 1999
-@@ -362,7 +362,7 @@
- 	inpinfo->mcch[i].wch = (wchar_t)0;
-         strncpy(inpinfo->mcch[i].s, selection+(*base+i)*2, 2);
-     }
--    inpinfo->mcch[i].wch = (wchar_t)0;
-+    /* inpinfo->mcch[i].wch = (wchar_t)0; */
-     inpinfo->n_mcch = i;
-     iccf->mode &= ~(PHONE_MODE_COMPOSEDOK);
- 
diff --git a/chinese/xcin25/pkg-descr b/chinese/xcin25/pkg-descr
index dd126cf87476..96bf5b695a3b 100644
--- a/chinese/xcin25/pkg-descr
+++ b/chinese/xcin25/pkg-descr
@@ -9,4 +9,3 @@ WWW: http://xcin.linux.org.tw/
 
 Porting to FreeBSD by Yung-Jen Hung <winard@ms11.url.com.tw>
 & Keith Jang <jtjang@gcn.net.tw>.
-