2 files changed, 94 insertions, 92 deletions

diff --git a/chinese/xcin/Makefile b/chinese/xcin/Makefile
index bafd425a4b32..57999bda6280 100644
--- a/chinese/xcin/Makefile
+++ b/chinese/xcin/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	xcin25
+# New ports collection makefile for:	xcin
 # Date created:		18 Oct 1999
 # Whom:			Keith Jang <keith@FreeBSD.org>
 #
@@ -7,7 +7,7 @@
 
 PORTNAME=	xcin
 PORTVERSION=	2.5.3.p2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	chinese x11
 MASTER_SITES=	ftp://ftp.linux.org.tw/pub/xcin/xcin/ \
 		ftp://ftp.linux.org.tw/pub/xcin/xcin/devel/ \
@@ -26,12 +26,12 @@ USE_BDB=	yes
 OBSOLETE_BDB_VAR=	USE_DB2
 USE_GETTEXT=	yes
 USE_ICONV=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--x-libraries=${X11BASE}/lib \
-		--with-xcin-dir=${PREFIX}/lib/X11/xcin25 \
+		--with-xcin-dir=${PREFIX}/lib/xcin \
 		--with-db-name=${BDB_LIB_NAME} \
 		--with-db-inc=${BDB_INCLUDE_DIR} \
 		--with-db-lib=${BDB_LIB_DIR} \
@@ -68,32 +68,33 @@ post-patch:
 		${WRKSRC}/cin/gb/Makefile.in
 
 post-install:
+	${LN} -fs ${PREFIX}/bin/xcin2.5 ${PREFIX}/bin/xcin
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/lib/X11/xcin25/doc
+	${MKDIR} ${DOCSDIR}
 .for DOC in Bugs COPYING CREDITS Changes Cin CopyRight FAQ README \
 		SETUP Todo Usage UserGuide
-	${INSTALL_DATA} ${WRKSRC}/doc/${DOC} ${PREFIX}/lib/X11/xcin25/doc
+	${INSTALL_DATA} ${WRKSRC}/doc/${DOC} ${DOCSDIR}
 .endfor
-	${MKDIR} ${PREFIX}/lib/X11/xcin25/doc/En
-	${MKDIR} ${PREFIX}/lib/X11/xcin25/doc/En/internal
+	${MKDIR} ${DOCSDIR}/En
+	${MKDIR} ${DOCSDIR}/En/internal
 .for En in README.En SETUP.En Usage.En UserGuide.En
-	${INSTALL_DATA} ${WRKSRC}/doc/En/${En} ${PREFIX}/lib/X11/xcin25/doc/En
+	${INSTALL_DATA} ${WRKSRC}/doc/En/${En} ${DOCSDIR}/En
 .endfor
 .for Eninternal in module.En structer.En
-	${INSTALL_DATA} ${WRKSRC}/doc/En/internal/${Eninternal} ${PREFIX}/lib/X11/xcin25/doc/En/internal
+	${INSTALL_DATA} ${WRKSRC}/doc/En/internal/${Eninternal} ${DOCSDIR}/En/internal
 .endfor
-	${MKDIR} ${PREFIX}/lib/X11/xcin25/doc/history
+	${MKDIR} ${DOCSDIR}/history
 	${INSTALL_DATA} ${WRKSRC}/doc/history/Changes-19991011 \
-		${PREFIX}/lib/X11/xcin25/doc/history
-	${MKDIR} ${PREFIX}/lib/X11/xcin25/doc/internal
+		${DOCSDIR}/history
+	${MKDIR} ${DOCSDIR}/internal
 .for INTERNAL in IMdkit gen_inp gui_request module structer
 	${INSTALL_DATA} ${WRKSRC}/doc/internal/${INTERNAL} \
-		${PREFIX}/lib/X11/xcin25/doc/internal
+		${DOCSDIR}/internal
 .endfor
-	${MKDIR} ${PREFIX}/lib/X11/xcin25/doc/modules
+	${MKDIR} ${DOCSDIR}/modules
 .for MODULES in bimsphone gen_inp im_comm zh_hex
 	${INSTALL_DATA} ${WRKSRC}/doc/modules/${MODULES} \
-		${PREFIX}/lib/X11/xcin25/doc/modules
+		${DOCSDIR}/modules
 .endfor
 .endif
 
diff --git a/chinese/xcin/pkg-plist b/chinese/xcin/pkg-plist
index ec66cf3fe999..5457d32c1079 100644
--- a/chinese/xcin/pkg-plist
+++ b/chinese/xcin/pkg-plist
@@ -1,83 +1,84 @@
+bin/xcin
 bin/xcin2.5
 etc/xcinrc
-lib/X11/xcin25/bimsphone.a
-lib/X11/xcin25/bimsphone.la
-lib/X11/xcin25/bimsphone.so
-lib/X11/xcin25/bin/cin2tab
-lib/X11/xcin25/chewing.a
-lib/X11/xcin25/chewing.la
-lib/X11/xcin25/chewing.so
-%%PORTDOCS%%lib/X11/xcin25/doc/Bugs
-%%PORTDOCS%%lib/X11/xcin25/doc/COPYING
-%%PORTDOCS%%lib/X11/xcin25/doc/CREDITS
-%%PORTDOCS%%lib/X11/xcin25/doc/Changes
-%%PORTDOCS%%lib/X11/xcin25/doc/Cin
-%%PORTDOCS%%lib/X11/xcin25/doc/CopyRight
-%%PORTDOCS%%lib/X11/xcin25/doc/En/README.En
-%%PORTDOCS%%lib/X11/xcin25/doc/En/SETUP.En
-%%PORTDOCS%%lib/X11/xcin25/doc/En/Usage.En
-%%PORTDOCS%%lib/X11/xcin25/doc/En/UserGuide.En
-%%PORTDOCS%%lib/X11/xcin25/doc/En/internal/module.En
-%%PORTDOCS%%lib/X11/xcin25/doc/En/internal/structer.En
-%%PORTDOCS%%lib/X11/xcin25/doc/FAQ
-%%PORTDOCS%%lib/X11/xcin25/doc/README
-%%PORTDOCS%%lib/X11/xcin25/doc/SETUP
-%%PORTDOCS%%lib/X11/xcin25/doc/Todo
-%%PORTDOCS%%lib/X11/xcin25/doc/Usage
-%%PORTDOCS%%lib/X11/xcin25/doc/UserGuide
-%%PORTDOCS%%lib/X11/xcin25/doc/history/Changes-19991011
-%%PORTDOCS%%lib/X11/xcin25/doc/internal/IMdkit
-%%PORTDOCS%%lib/X11/xcin25/doc/internal/gen_inp
-%%PORTDOCS%%lib/X11/xcin25/doc/internal/gui_request
-%%PORTDOCS%%lib/X11/xcin25/doc/internal/module
-%%PORTDOCS%%lib/X11/xcin25/doc/internal/structer
-%%PORTDOCS%%lib/X11/xcin25/doc/modules/bimsphone
-%%PORTDOCS%%lib/X11/xcin25/doc/modules/gen_inp
-%%PORTDOCS%%lib/X11/xcin25/doc/modules/im_comm
-%%PORTDOCS%%lib/X11/xcin25/doc/modules/zh_hex
-lib/X11/xcin25/gen_inp.a
-lib/X11/xcin25/gen_inp.la
-lib/X11/xcin25/gen_inp.so
-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/pinyin0.tab
-lib/X11/xcin25/tab/big5/simplex.tab
-lib/X11/xcin25/tab/big5/sys.tab
-lib/X11/xcin25/tab/big5/telecode.tab
-lib/X11/xcin25/tab/ch_index.dat
-lib/X11/xcin25/tab/dict.dat
-lib/X11/xcin25/tab/euccn/default.phr
-lib/X11/xcin25/tab/euccn/jtcj_gb.tab
-lib/X11/xcin25/tab/euccn/pinyin.tab
-lib/X11/xcin25/tab/euccn/phonegb2.tab
-lib/X11/xcin25/tab/euccn/shuangpin.tab
-lib/X11/xcin25/tab/euccn/sys.tab
-lib/X11/xcin25/tab/euccn/wubizixing.tab
-lib/X11/xcin25/tab/fonetree.dat
-lib/X11/xcin25/tab/ph_index.dat
-lib/X11/xcin25/tab/us_freq.dat
-lib/X11/xcin25/zh_hex.a
-lib/X11/xcin25/zh_hex.la
-lib/X11/xcin25/zh_hex.so
+lib/xcin/bimsphone.a
+lib/xcin/bimsphone.la
+lib/xcin/bimsphone.so
+lib/xcin/bin/cin2tab
+lib/xcin/chewing.a
+lib/xcin/chewing.la
+lib/xcin/chewing.so
+%%PORTDOCS%%%%DOCSDIR%%/Bugs
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/Changes
+%%PORTDOCS%%%%DOCSDIR%%/Cin
+%%PORTDOCS%%%%DOCSDIR%%/CopyRight
+%%PORTDOCS%%%%DOCSDIR%%/En/README.En
+%%PORTDOCS%%%%DOCSDIR%%/En/SETUP.En
+%%PORTDOCS%%%%DOCSDIR%%/En/Usage.En
+%%PORTDOCS%%%%DOCSDIR%%/En/UserGuide.En
+%%PORTDOCS%%%%DOCSDIR%%/En/internal/module.En
+%%PORTDOCS%%%%DOCSDIR%%/En/internal/structer.En
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/SETUP
+%%PORTDOCS%%%%DOCSDIR%%/Todo
+%%PORTDOCS%%%%DOCSDIR%%/Usage
+%%PORTDOCS%%%%DOCSDIR%%/UserGuide
+%%PORTDOCS%%%%DOCSDIR%%/history/Changes-19991011
+%%PORTDOCS%%%%DOCSDIR%%/internal/IMdkit
+%%PORTDOCS%%%%DOCSDIR%%/internal/gen_inp
+%%PORTDOCS%%%%DOCSDIR%%/internal/gui_request
+%%PORTDOCS%%%%DOCSDIR%%/internal/module
+%%PORTDOCS%%%%DOCSDIR%%/internal/structer
+%%PORTDOCS%%%%DOCSDIR%%/modules/bimsphone
+%%PORTDOCS%%%%DOCSDIR%%/modules/gen_inp
+%%PORTDOCS%%%%DOCSDIR%%/modules/im_comm
+%%PORTDOCS%%%%DOCSDIR%%/modules/zh_hex
+lib/xcin/gen_inp.a
+lib/xcin/gen_inp.la
+lib/xcin/gen_inp.so
+lib/xcin/tab/big5/array30.tab
+lib/xcin/tab/big5/bims_pinyin.tab
+lib/xcin/tab/big5/cj.tab
+lib/xcin/tab/big5/default.phr
+lib/xcin/tab/big5/jyutping.tab
+lib/xcin/tab/big5/jyutping0.tab
+lib/xcin/tab/big5/phone.tab
+lib/xcin/tab/big5/pinyin.tab
+lib/xcin/tab/big5/pinyin0.tab
+lib/xcin/tab/big5/simplex.tab
+lib/xcin/tab/big5/sys.tab
+lib/xcin/tab/big5/telecode.tab
+lib/xcin/tab/ch_index.dat
+lib/xcin/tab/dict.dat
+lib/xcin/tab/euccn/default.phr
+lib/xcin/tab/euccn/jtcj_gb.tab
+lib/xcin/tab/euccn/pinyin.tab
+lib/xcin/tab/euccn/phonegb2.tab
+lib/xcin/tab/euccn/shuangpin.tab
+lib/xcin/tab/euccn/sys.tab
+lib/xcin/tab/euccn/wubizixing.tab
+lib/xcin/tab/fonetree.dat
+lib/xcin/tab/ph_index.dat
+lib/xcin/tab/us_freq.dat
+lib/xcin/zh_hex.a
+lib/xcin/zh_hex.la
+lib/xcin/zh_hex.so
 lib/libxcin.a
 lib/libxcin.la
 lib/libxcin.so
 lib/libxcin.so.0
 share/locale/zh_TW.Big5/LC_MESSAGES/xcin.mo
-%%PORTDOCS%%@dirrm lib/X11/xcin25/doc/En/internal
-%%PORTDOCS%%@dirrm lib/X11/xcin25/doc/En
-%%PORTDOCS%%@dirrm lib/X11/xcin25/doc/history
-%%PORTDOCS%%@dirrm lib/X11/xcin25/doc/internal
-%%PORTDOCS%%@dirrm lib/X11/xcin25/doc/modules
-%%PORTDOCS%%@dirrm lib/X11/xcin25/doc
-@dirrm lib/X11/xcin25/bin
-@dirrm lib/X11/xcin25/tab/big5
-@dirrm lib/X11/xcin25/tab/euccn
-@dirrm lib/X11/xcin25/tab
-@dirrm lib/X11/xcin25
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/En/internal
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/En
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/history
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/internal
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/modules
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm lib/xcin/bin
+@dirrm lib/xcin/tab/big5
+@dirrm lib/xcin/tab/euccn
+@dirrm lib/xcin/tab
+@dirrm lib/xcin