17 files changed, 82 insertions, 80 deletions

diff --git a/chinese/aterm/Makefile b/chinese/aterm/Makefile
index a154718a8993..d0ab8383c1bb 100644
--- a/chinese/aterm/Makefile
+++ b/chinese/aterm/Makefile
@@ -13,11 +13,9 @@ USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-xim --enable-big5
 
-NO_STAGE=	yes
 post-install:
-	@${CHMOD} 4711 ${PREFIX}/bin/aterm
+	@${CHMOD} 4711 ${STAGEDIR}${PREFIX}/bin/aterm
 
-MAN1=		aterm.1
-PLIST_FILES=	bin/aterm
+PLIST_FILES=	bin/aterm man/man1/aterm.1.gz
 
 .include <bsd.port.mk>
diff --git a/chinese/bsdconv-opencc/Makefile b/chinese/bsdconv-opencc/Makefile
index 33e33d3f60f1..ee307f94adbe 100644
--- a/chinese/bsdconv-opencc/Makefile
+++ b/chinese/bsdconv-opencc/Makefile
@@ -21,7 +21,6 @@ GH_ACCOUNT=	buganini
 GH_PROJECT=	${PKGNAMEPREFIX}${PORTNAME}
 GH_COMMIT=	c48c74c
 
-MAKE_ARGS=	PREFIX=${PREFIX}
 NO_STAGE=	yes
 
 .include <bsd.port.mk>
diff --git a/chinese/bsdconv-opencc/files/patch-Makefile b/chinese/bsdconv-opencc/files/patch-Makefile
new file mode 100644
index 000000000000..230cd899ec1a
--- /dev/null
+++ b/chinese/bsdconv-opencc/files/patch-Makefile
@@ -0,0 +1,17 @@
+--- Makefile.orig	2013-09-20 02:35:00.000000000 +0800
++++ Makefile	2014-01-07 14:26:54.000000000 +0800
+@@ -35,9 +35,10 @@ clean:
+ 	rm -rf OPENCC OPENCC.so OPENCC-*
+ 
+ install:
++	mkdir -p $(DESTDIR)${PREFIX}/share/bsdconv/inter
+ 	for item in ${CONFIGS} ; do \
+-		install -m 444 OPENCC ${PREFIX}/share/bsdconv/inter/OPENCC-$${item} ; \
+-		install -m 444 OPENCC-$${item}.so ${PREFIX}/share/bsdconv/inter/OPENCC-$${item}.so ; \
++		install -m 444 OPENCC $(DESTDIR)${PREFIX}/share/bsdconv/inter/OPENCC-$${item} ; \
++		install -m 444 OPENCC-$${item}.so $(DESTDIR)${PREFIX}/share/bsdconv/inter/OPENCC-$${item}.so ; \
+ 	done
+-	install -m 444 OPENCC ${PREFIX}/share/bsdconv/inter/OPENCC
+-	install -m 444 OPENCC.so ${PREFIX}/share/bsdconv/inter/OPENCC.so
++	install -m 444 OPENCC $(DESTDIR)${PREFIX}/share/bsdconv/inter/OPENCC
++	install -m 444 OPENCC.so $(DESTDIR)${PREFIX}/share/bsdconv/inter/OPENCC.so
diff --git a/chinese/bsdconv-opencc/pkg-plist b/chinese/bsdconv-opencc/pkg-plist
index b56b4ec790d1..affb3e152d87 100644
--- a/chinese/bsdconv-opencc/pkg-plist
+++ b/chinese/bsdconv-opencc/pkg-plist
@@ -1,5 +1,4 @@
 share/bsdconv/inter/OPENCC
-share/bsdconv/inter/OPENCC.so
 share/bsdconv/inter/OPENCC-MIX2ZHS
 share/bsdconv/inter/OPENCC-MIX2ZHS.so
 share/bsdconv/inter/OPENCC-MIX2ZHT
@@ -9,17 +8,17 @@ share/bsdconv/inter/OPENCC-ZHS2ZHT.so
 share/bsdconv/inter/OPENCC-ZHS2ZHTW_P
 share/bsdconv/inter/OPENCC-ZHS2ZHTW_P.so
 share/bsdconv/inter/OPENCC-ZHS2ZHTW_V
+share/bsdconv/inter/OPENCC-ZHS2ZHTW_V.so
 share/bsdconv/inter/OPENCC-ZHS2ZHTW_VP
 share/bsdconv/inter/OPENCC-ZHS2ZHTW_VP.so
-share/bsdconv/inter/OPENCC-ZHS2ZHTW_V.so
 share/bsdconv/inter/OPENCC-ZHT2ZHS
 share/bsdconv/inter/OPENCC-ZHT2ZHS.so
 share/bsdconv/inter/OPENCC-ZHT2ZHTW_P
 share/bsdconv/inter/OPENCC-ZHT2ZHTW_P.so
 share/bsdconv/inter/OPENCC-ZHT2ZHTW_V
+share/bsdconv/inter/OPENCC-ZHT2ZHTW_V.so
 share/bsdconv/inter/OPENCC-ZHT2ZHTW_VP
 share/bsdconv/inter/OPENCC-ZHT2ZHTW_VP.so
-share/bsdconv/inter/OPENCC-ZHT2ZHTW_V.so
 share/bsdconv/inter/OPENCC-ZHTW2ZHCN_S
 share/bsdconv/inter/OPENCC-ZHTW2ZHCN_S.so
 share/bsdconv/inter/OPENCC-ZHTW2ZHCN_T
@@ -28,5 +27,6 @@ share/bsdconv/inter/OPENCC-ZHTW2ZHS
 share/bsdconv/inter/OPENCC-ZHTW2ZHS.so
 share/bsdconv/inter/OPENCC-ZHTW2ZHT
 share/bsdconv/inter/OPENCC-ZHTW2ZHT.so
+share/bsdconv/inter/OPENCC.so
 @dirrmtry share/bsdconv/inter
 @dirrmtry share/bsdconv
diff --git a/chinese/cless/Makefile b/chinese/cless/Makefile
index ecde71fd0f2b..ea267634915e 100644
--- a/chinese/cless/Makefile
+++ b/chinese/cless/Makefile
@@ -12,16 +12,13 @@ COMMENT=	A better pager utility (and it speaks Chinese)
 GNU_CONFIGURE=	yes
 CFLAGS+=	-DHANZI # LDFLAGS=-s datadir=/usr/local/lib/less
 CPP=		#
-MAN1=		cless.1 clesskey.1
-
-NO_STAGE=	yes
 
 .include <bsd.port.options.mk>
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${PREFIX}/share/doc/cless
-	${INSTALL_DATA} ${WRKSRC}/README.CLESS ${PREFIX}/share/doc/cless
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/cless
+	${INSTALL_DATA} ${WRKSRC}/README.CLESS ${STAGEDIR}${PREFIX}/share/doc/cless
 .endif
 
 .include <bsd.port.mk>
diff --git a/chinese/cless/files/patch-aa b/chinese/cless/files/patch-aa
index 9a51393614e6..f42322dc35ae 100644
--- a/chinese/cless/files/patch-aa
+++ b/chinese/cless/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Mon Apr 24 19:41:39 1995
-+++ Makefile.in	Sun Sep 15 22:55:52 1996
-@@ -73,24 +73,24 @@
+--- Makefile.in.orig	1995-04-25 10:41:39.000000000 +0800
++++ Makefile.in	2014-01-08 23:13:25.000000000 +0800
+@@ -73,24 +73,24 @@ lesskey: lesskey.${O} version.${O}
  ${OBJ}: less.h defines.h funcs.h
  
  filename.${O}: filename.c
@@ -15,16 +15,17 @@
 -	${INSTALL_DATA} ${srcdir}/less.gb ${datadir}/less.gb
 -	${INSTALL_DATA} ${srcdir}/less.nro ${mandir}/${manprefix}less.${manext}
 -	${INSTALL_DATA} ${srcdir}/lesskey.nro ${mandir}/${manprefix}lesskey.${manext}
-+	${INSTALL_PROGRAM} less ${bindir}/${binprefix}cless
-+	${INSTALL_PROGRAM} lesskey ${bindir}/${binprefix}clesskey
-+	${INSTALL_DATA} ${srcdir}/less.hlp ${datadir}/cless.hlp
-+	${INSTALL_DATA} ${srcdir}/less.bg5 ${datadir}/cless.bg5
-+	${INSTALL_DATA} ${srcdir}/less.gb ${datadir}/cless.gb
-+	${INSTALL_DATA} ${srcdir}/less.nro ${mandir}/${manprefix}cless.${manext}
-+	${INSTALL_DATA} ${srcdir}/lesskey.nro ${mandir}/${manprefix}clesskey.${manext}
++	${INSTALL_PROGRAM} less $(DESTDIR)${bindir}/${binprefix}cless
++	${INSTALL_PROGRAM} lesskey $(DESTDIR)${bindir}/${binprefix}clesskey
++	${INSTALL_DATA} ${srcdir}/less.hlp $(DESTDIR)${datadir}/cless.hlp
++	${INSTALL_DATA} ${srcdir}/less.bg5 $(DESTDIR)${datadir}/cless.bg5
++	${INSTALL_DATA} ${srcdir}/less.gb $(DESTDIR)${datadir}/cless.gb
++	${INSTALL_DATA} ${srcdir}/less.nro $(DESTDIR)${mandir}/${manprefix}cless.${manext}
++	${INSTALL_DATA} ${srcdir}/lesskey.nro $(DESTDIR)${mandir}/${manprefix}clesskey.${manext}
  
  installdirs: mkinstalldirs
- 	${srcdir}/mkinstalldirs ${bindir} ${datadir} ${mandir}
+-	${srcdir}/mkinstalldirs ${bindir} ${datadir} ${mandir}
++	${srcdir}/mkinstalldirs $(DESTDIR)${bindir} $(DESTDIR)${datadir} $(DESTDIR)${mandir}
  
  uninstall:
 -	rm -f ${bindir}/${binprefix}less ${bindir}/${binprefix}lesskey
diff --git a/chinese/cless/pkg-plist b/chinese/cless/pkg-plist
index 5e6644c785fb..c293e2eba53d 100644
--- a/chinese/cless/pkg-plist
+++ b/chinese/cless/pkg-plist
@@ -1,8 +1,10 @@
 @comment $FreeBSD$
 bin/cless
 bin/clesskey
-share/cless.hlp
+man/man1/cless.1.gz
+man/man1/clesskey.1.gz
 share/cless.bg5
 share/cless.gb
-%%PORTDOCS%%share/doc/cless/README.CLESS
-%%PORTDOCS%%@dirrm share/doc/cless
+share/cless.hlp
+%%PORTDOCS%%%%DOCSDIR%%/README.CLESS
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/chinese/fqterm/Makefile b/chinese/fqterm/Makefile
index ed1587f958e1..caffbb9209a3 100644
--- a/chinese/fqterm/Makefile
+++ b/chinese/fqterm/Makefile
@@ -26,8 +26,5 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 DESKTOP_ENTRIES=	"FQTerm" "BBS client" "${PREFIX}/share/FQTerm/pic/fqterm.png" \
 			"fqterm -caption \"%c\" %i %m %u" "Network;Qt;" ""
-NO_STAGE=	yes
-post-install:
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/chinese/libchewing/Makefile b/chinese/libchewing/Makefile
index b3fb6ec7b10a..2a47e543807d 100644
--- a/chinese/libchewing/Makefile
+++ b/chinese/libchewing/Makefile
@@ -9,8 +9,6 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	The Chewing intelligent phonetic input method library
 
-INFO=		libchewing
-
 USES=		gmake pkgconfig pathfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -18,8 +16,8 @@ USE_BZIP2=	yes
 
 DATADIR=	${PREFIX}/share/chewing
 PROJECTHOST=	chewing
+INFO=		libchewing
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "powerpc"
diff --git a/chinese/libchewing/pkg-plist b/chinese/libchewing/pkg-plist
index 56000a532d32..4ec230fe61ad 100644
--- a/chinese/libchewing/pkg-plist
+++ b/chinese/libchewing/pkg-plist
@@ -16,5 +16,5 @@ libdata/pkgconfig/chewing.pc
 %%DATADIR%%/swkb.dat
 %%DATADIR%%/symbols.dat
 %%DATADIR%%/us_freq.dat
-@dirrm include/chewing
 @dirrm %%DATADIR%%
+@dirrm include/chewing
diff --git a/chinese/libgooglepinyin/Makefile b/chinese/libgooglepinyin/Makefile
index 53602aea9fb6..b7e647cf0983 100644
--- a/chinese/libgooglepinyin/Makefile
+++ b/chinese/libgooglepinyin/Makefile
@@ -13,5 +13,4 @@ USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 USES=		cmake
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/chinese/libpinyin/Makefile b/chinese/libpinyin/Makefile
index d91a8c00a294..524aebbee865 100644
--- a/chinese/libpinyin/Makefile
+++ b/chinese/libpinyin/Makefile
@@ -9,9 +9,6 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Library to deal with pinyin
 
-MAN1=		libpinyin.1 gen_binary_files.1 gen_unigram.1 \
-		import_interpolation.1
-
 USE_BDB=	yes
 USE_GNOME=	glib20
 USES=		gettext gmake pathfix pkgconfig
@@ -25,7 +22,6 @@ CONFIGURE_ARGS+=CPPFLAGS="-I${LOCALBASE}/include \
 
 PLIST_SUB+=	VER=${PORTVERSION}
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 800107
diff --git a/chinese/libpinyin/pkg-plist b/chinese/libpinyin/pkg-plist
index cda231dedb62..0ae36c3166f0 100644
--- a/chinese/libpinyin/pkg-plist
+++ b/chinese/libpinyin/pkg-plist
@@ -11,6 +11,10 @@ lib/libpinyin.la
 lib/libpinyin.so
 lib/libpinyin.so.2
 libdata/pkgconfig/libpinyin.pc
+man/man1/gen_binary_files.1.gz
+man/man1/gen_unigram.1.gz
+man/man1/import_interpolation.1.gz
+man/man1/libpinyin.1.gz
 %%DATADIR%%/data/bigram.db
 %%DATADIR%%/data/gb_char.bin
 %%DATADIR%%/data/gbk_char.bin
diff --git a/chinese/opencc/Makefile b/chinese/opencc/Makefile
index 25ccbd679453..ae780dcdf61d 100644
--- a/chinese/opencc/Makefile
+++ b/chinese/opencc/Makefile
@@ -11,12 +11,9 @@ COMMENT=	Open Chinese Convert library and utilities
 
 LICENSE=	APACHE20
 
-MAN1=	opencc.1 opencc_dict.1
-
 USES=		cmake
 USE_LDCONFIG=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
diff --git a/chinese/opencc/pkg-plist b/chinese/opencc/pkg-plist
index 71cec128596d..c32c4a4621f8 100644
--- a/chinese/opencc/pkg-plist
+++ b/chinese/opencc/pkg-plist
@@ -8,6 +8,8 @@ lib/libopencc.so
 lib/libopencc.so.1
 lib/libopencc.so.1.0.0
 libdata/pkgconfig/opencc.pc
+man/man1/opencc.1.gz
+man/man1/opencc_dict.1.gz
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/opencc.mo
 %%NLS%%share/locale/zh_HK/LC_MESSAGES/opencc.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/opencc.mo
@@ -34,11 +36,7 @@ libdata/pkgconfig/opencc.pc
 %%DATADIR%%/zhtw2zhcn_t.ini
 %%DATADIR%%/zhtw2zhs.ini
 %%DATADIR%%/zhtw2zht.ini
-%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_TW
+@dirrm %%DATADIR%%
 %%NLS%%@dirrmtry share/locale/zh_HK/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/zh_HK
-%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_CN
-@dirrm %%DATADIR%%
 @dirrm include/opencc
diff --git a/chinese/qterm/Makefile b/chinese/qterm/Makefile
index 0edc5ff4a2cd..5c7ef3833708 100644
--- a/chinese/qterm/Makefile
+++ b/chinese/qterm/Makefile
@@ -27,7 +27,6 @@ PHONON_DESC=	Multimedia support via Phonon
 QTSCRIPT_DESC=	Scripting support via QtScript Bindings
 KDE_DESC=	Password management via KWallet
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENSSL}
diff --git a/chinese/qterm/pkg-plist b/chinese/qterm/pkg-plist
index a7f152db64e5..6301ec1a7da7 100644
--- a/chinese/qterm/pkg-plist
+++ b/chinese/qterm/pkg-plist
@@ -6,38 +6,38 @@ share/icons/hicolor/22x22/apps/qterm.png
 share/icons/hicolor/32x32/apps/qterm.png
 share/icons/hicolor/48x48/apps/qterm.png
 share/icons/hicolor/64x64/apps/qterm.png
-share/qterm/address.xml
-share/qterm/credits
-share/qterm/doc/qterm.qhc
-share/qterm/keyboard_profiles/default.keytab
-share/qterm/keyboard_profiles/linux.keytab
-share/qterm/keyboard_profiles/solaris.keytab
-share/qterm/keyboard_profiles/vt420pc.keytab
-share/qterm/po/qterm_chs.qm
-share/qterm/po/qterm_cht.qm
-share/qterm/qterm.cfg
-share/qterm/scheme/Linux.scheme
-share/qterm/scheme/Softness.scheme
-share/qterm/scheme/VIM.scheme
-share/qterm/scheme/XTerm.scheme
-share/qterm/scheme/default.scheme
-share/qterm/scripts/article.js
-share/qterm/scripts/console.js
-share/qterm/scripts/google.js
-share/qterm/scripts/highlight.js
-share/qterm/scripts/ptt.js
-share/qterm/scripts/senddelay.js
-share/qterm/scripts/smth.js
-share/qterm/scripts/ui/senddelay.ui
-share/qterm/scripts/utils.js
-share/qterm/scripts/websnap.js
-@dirrm share/qterm/scripts/ui
-@dirrm share/qterm/scripts
-@dirrm share/qterm/scheme
-@dirrm share/qterm/po
-@dirrm share/qterm/keyboard_profiles
-@dirrm share/qterm/doc
-@dirrm share/qterm
+%%DATADIR%%/address.xml
+%%DATADIR%%/credits
+%%DATADIR%%/doc/qterm.qhc
+%%DATADIR%%/keyboard_profiles/default.keytab
+%%DATADIR%%/keyboard_profiles/linux.keytab
+%%DATADIR%%/keyboard_profiles/solaris.keytab
+%%DATADIR%%/keyboard_profiles/vt420pc.keytab
+%%DATADIR%%/po/qterm_chs.qm
+%%DATADIR%%/po/qterm_cht.qm
+%%DATADIR%%/qterm.cfg
+%%DATADIR%%/scheme/Linux.scheme
+%%DATADIR%%/scheme/Softness.scheme
+%%DATADIR%%/scheme/VIM.scheme
+%%DATADIR%%/scheme/XTerm.scheme
+%%DATADIR%%/scheme/default.scheme
+%%DATADIR%%/scripts/article.js
+%%DATADIR%%/scripts/console.js
+%%DATADIR%%/scripts/google.js
+%%DATADIR%%/scripts/highlight.js
+%%DATADIR%%/scripts/ptt.js
+%%DATADIR%%/scripts/senddelay.js
+%%DATADIR%%/scripts/smth.js
+%%DATADIR%%/scripts/ui/senddelay.ui
+%%DATADIR%%/scripts/utils.js
+%%DATADIR%%/scripts/websnap.js
+@dirrm %%DATADIR%%/scripts/ui
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/scheme
+@dirrm %%DATADIR%%/po
+@dirrm %%DATADIR%%/keyboard_profiles
+@dirrm %%DATADIR%%/doc
+@dirrm %%DATADIR%%
 @dirrmtry share/icons/hicolor/64x64/apps
 @dirrmtry share/icons/hicolor/64x64
 @dirrmtry share/icons/hicolor/48x48/apps