15 files changed, 51 insertions, 63 deletions

diff --git a/chinese/fcitx-chewing/Makefile b/chinese/fcitx-chewing/Makefile
index 88d314925bac..25b5144b6156 100644
--- a/chinese/fcitx-chewing/Makefile
+++ b/chinese/fcitx-chewing/Makefile
@@ -19,5 +19,4 @@ USE_XZ=		yes
 USES=		cmake gettext pkgconfig
 USE_GNOME=	intltool
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/chinese/fcitx-chewing/pkg-plist b/chinese/fcitx-chewing/pkg-plist
index b0356b1825c7..bf229478d14e 100644
--- a/chinese/fcitx-chewing/pkg-plist
+++ b/chinese/fcitx-chewing/pkg-plist
@@ -2,8 +2,8 @@ lib/fcitx/fcitx-chewing.so
 share/fcitx/addon/fcitx-chewing.conf
 share/fcitx/configdesc/fcitx-chewing.desc
 share/fcitx/inputmethod/chewing.conf
-share/fcitx/skin/default/chewing.png
 share/fcitx/skin/classic/chewing.png
 share/fcitx/skin/dark/chewing.png
+share/fcitx/skin/default/chewing.png
 share/locale/zh_CN/LC_MESSAGES/fcitx-chewing.mo
 share/locale/zh_TW/LC_MESSAGES/fcitx-chewing.mo
diff --git a/chinese/fcitx-cloudpinyin/Makefile b/chinese/fcitx-cloudpinyin/Makefile
index a934f70f1354..077258bbd81d 100644
--- a/chinese/fcitx-cloudpinyin/Makefile
+++ b/chinese/fcitx-cloudpinyin/Makefile
@@ -20,5 +20,4 @@ USE_GNOME=	intltool
 
 PROJECTHOST=	fcitx
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/chinese/fcitx-configtool/Makefile b/chinese/fcitx-configtool/Makefile
index 047ee77570d1..700e4749ca76 100644
--- a/chinese/fcitx-configtool/Makefile
+++ b/chinese/fcitx-configtool/Makefile
@@ -22,7 +22,6 @@ USES=		cmake gettext pkgconfig
 OPTIONS_DEFINE=	GTK2 GTK3
 OPTIONS_DEFAULT=GTK2
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGTK2}
diff --git a/chinese/fcitx-googlepinyin/Makefile b/chinese/fcitx-googlepinyin/Makefile
index 46bde18dc621..3a47ad138b75 100644
--- a/chinese/fcitx-googlepinyin/Makefile
+++ b/chinese/fcitx-googlepinyin/Makefile
@@ -19,5 +19,4 @@ USE_GNOME=	intltool
 
 PROJECTHOST=	fcitx
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/chinese/fcitx-googlepinyin/pkg-plist b/chinese/fcitx-googlepinyin/pkg-plist
index 98c329777013..f6300c06a2d3 100644
--- a/chinese/fcitx-googlepinyin/pkg-plist
+++ b/chinese/fcitx-googlepinyin/pkg-plist
@@ -1,9 +1,9 @@
 lib/fcitx/fcitx-googlepinyin.so
 share/fcitx/addon/fcitx-googlepinyin.conf
-share/fcitx/inputmethod/googlepinyin.conf
 share/fcitx/imicon/googlepinyin.png
-share/fcitx/skin/default/googlepinyin.png
+share/fcitx/inputmethod/googlepinyin.conf
 share/fcitx/skin/classic/googlepinyin.png
+share/fcitx/skin/default/googlepinyin.png
 share/icons/hicolor/16x16/apps/fcitx-googlepinyin.png
 share/icons/hicolor/48x48/apps/fcitx-googlepinyin.png
 share/locale/zh_CN/LC_MESSAGES/fcitx-googlepinyin.mo
diff --git a/chinese/fcitx-libpinyin/Makefile b/chinese/fcitx-libpinyin/Makefile
index d0d23cb5ea17..0fb5b3fd3e84 100644
--- a/chinese/fcitx-libpinyin/Makefile
+++ b/chinese/fcitx-libpinyin/Makefile
@@ -22,7 +22,6 @@ USES=		cmake gettext pkgconfig
 USE_GNOME=	intltool
 INSTALLS_ICONS=	yes
 
-NO_STAGE=	yes
 post-patch:
 	@${LN} -s ${_DISTDIR}/model.text.${MDVER}.tar.gz ${WRKSRC}/data
 
diff --git a/chinese/fcitx-rime/Makefile b/chinese/fcitx-rime/Makefile
index f2ba1192a0e7..13a7a8ed4002 100644
--- a/chinese/fcitx-rime/Makefile
+++ b/chinese/fcitx-rime/Makefile
@@ -22,5 +22,4 @@ INSTALLS_ICONS=	yes
 
 PROJECTHOST=	fcitx
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/chinese/fcitx-rime/pkg-plist b/chinese/fcitx-rime/pkg-plist
index b3094b8e36d9..2369b44b5560 100644
--- a/chinese/fcitx-rime/pkg-plist
+++ b/chinese/fcitx-rime/pkg-plist
@@ -1,7 +1,7 @@
 lib/fcitx/fcitx-rime.so
 share/fcitx/addon/fcitx-rime.conf
-share/fcitx/inputmethod/rime.conf
 share/fcitx/imicon/rime.png
+share/fcitx/inputmethod/rime.conf
 share/fcitx/skin/classic/rime.png
 share/fcitx/skin/dark/rime.png
 share/fcitx/skin/default/rime.png
diff --git a/chinese/fcitx-table-extra/Makefile b/chinese/fcitx-table-extra/Makefile
index 50108c6c6cc8..9e0c5ed49958 100644
--- a/chinese/fcitx-table-extra/Makefile
+++ b/chinese/fcitx-table-extra/Makefile
@@ -20,5 +20,4 @@ STRIP=
 
 PROJECTHOST=	fcitx
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/chinese/fcitx-table-extra/pkg-plist b/chinese/fcitx-table-extra/pkg-plist
index 00380af3ec16..4fa8a51e9963 100644
--- a/chinese/fcitx-table-extra/pkg-plist
+++ b/chinese/fcitx-table-extra/pkg-plist
@@ -1,55 +1,55 @@
+share/fcitx/imicon/array30-big.png
+share/fcitx/imicon/array30.png
+share/fcitx/imicon/boshiamy.png
+share/fcitx/imicon/cantonese.png
 share/fcitx/imicon/cantonhk.png
+share/fcitx/imicon/easy-big.png
 share/fcitx/imicon/jyutping.png
+share/fcitx/imicon/quick-classic.png
 share/fcitx/imicon/quick3.png
 share/fcitx/imicon/quick5.png
-share/fcitx/imicon/quick-classic.png
 share/fcitx/imicon/scj6.png
+share/fcitx/imicon/stroke5.png
 share/fcitx/imicon/wu.png
 share/fcitx/imicon/zhengma.png
-share/fcitx/imicon/boshiamy.png
-share/fcitx/imicon/cantonese.png
-share/fcitx/imicon/easy-big.png
-share/fcitx/imicon/array30.png
-share/fcitx/imicon/array30-big.png
-share/fcitx/imicon/stroke5.png
+share/fcitx/table/array30-big.conf
+share/fcitx/table/array30-big.mb
+share/fcitx/table/array30.conf
+share/fcitx/table/array30.mb
 share/fcitx/table/boshiamy.conf
-share/fcitx/table/zhengma.conf
+share/fcitx/table/boshiamy.mb
+share/fcitx/table/cangjie-big.conf
+share/fcitx/table/cangjie-big.mb
 share/fcitx/table/cangjie3.conf
+share/fcitx/table/cangjie3.mb
 share/fcitx/table/cangjie5.conf
-share/fcitx/table/cangjie-big.conf
-share/fcitx/table/quick3.conf
-share/fcitx/table/quick5.conf
-share/fcitx/table/quick-classic.conf
-share/fcitx/table/scj6.conf
-share/fcitx/table/easy-big.conf
-share/fcitx/table/wu.conf
+share/fcitx/table/cangjie5.mb
 share/fcitx/table/cantonese.conf
+share/fcitx/table/cantonese.mb
 share/fcitx/table/cantonhk.conf
+share/fcitx/table/cantonhk.mb
+share/fcitx/table/easy-big.conf
+share/fcitx/table/easy-big.mb
 share/fcitx/table/jyutping.conf
-share/fcitx/table/stroke5.conf
-share/fcitx/table/array30.conf
-share/fcitx/table/array30-big.conf
-share/fcitx/table/wubi-large.conf
-share/fcitx/table/zhengma-large.conf
-share/fcitx/table/boshiamy.mb
-share/fcitx/table/zhengma.mb
-share/fcitx/table/cangjie3.mb
-share/fcitx/table/cangjie5.mb
-share/fcitx/table/cangjie-big.mb
+share/fcitx/table/jyutping.mb
+share/fcitx/table/quick-classic.conf
+share/fcitx/table/quick-classic.mb
+share/fcitx/table/quick3.conf
 share/fcitx/table/quick3.mb
+share/fcitx/table/quick5.conf
 share/fcitx/table/quick5.mb
-share/fcitx/table/quick-classic.mb
+share/fcitx/table/scj6.conf
 share/fcitx/table/scj6.mb
-share/fcitx/table/easy-big.mb
-share/fcitx/table/wu.mb
-share/fcitx/table/cantonese.mb
-share/fcitx/table/cantonhk.mb
-share/fcitx/table/jyutping.mb
+share/fcitx/table/stroke5.conf
 share/fcitx/table/stroke5.mb
-share/fcitx/table/array30.mb
-share/fcitx/table/array30-big.mb
+share/fcitx/table/wu.conf
+share/fcitx/table/wu.mb
+share/fcitx/table/wubi-large.conf
 share/fcitx/table/wubi-large.mb
+share/fcitx/table/zhengma-large.conf
 share/fcitx/table/zhengma-large.mb
+share/fcitx/table/zhengma.conf
+share/fcitx/table/zhengma.mb
 share/icons/hicolor/48x48/apps/fcitx-cantonhk.png
 share/icons/hicolor/48x48/apps/fcitx-jyutping.png
 share/icons/hicolor/48x48/apps/fcitx-quick-classic.png
diff --git a/chinese/fcitx-ui-light/Makefile b/chinese/fcitx-ui-light/Makefile
index 300c3a371405..ace5b203d23d 100644
--- a/chinese/fcitx-ui-light/Makefile
+++ b/chinese/fcitx-ui-light/Makefile
@@ -21,8 +21,4 @@ USE_GNOME=	intltool
 
 PROJECTHOST=	fcitx
 
-NO_STAGE=	yes
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/chinese/fcitx-ui-light/pkg-plist b/chinese/fcitx-ui-light/pkg-plist
index bc0dada2f6f2..c04ff8e7ed2e 100644
--- a/chinese/fcitx-ui-light/pkg-plist
+++ b/chinese/fcitx-ui-light/pkg-plist
@@ -1,6 +1,6 @@
 lib/fcitx/fcitx-light-ui.so
+share/applications/fcitx-light.desktop
 share/fcitx/addon/fcitx-light-ui.conf
 share/fcitx/configdesc/fcitx-light-ui.desc
-share/applications/fcitx-light.desktop
 share/locale/zh_CN/LC_MESSAGES/fcitx-light-ui.mo
 share/locale/zh_TW/LC_MESSAGES/fcitx-light-ui.mo
diff --git a/chinese/librime/Makefile b/chinese/librime/Makefile
index 2e0764ab80c7..112b8a6e6d5d 100644
--- a/chinese/librime/Makefile
+++ b/chinese/librime/Makefile
@@ -30,7 +30,6 @@ post-patch:     .SILENT
 	${FIND} ${WRKSRC} \( -name '*.cc' -or -name '*.h' \) \
 		-exec ${PERL} -i -pe '$$. == 1 && s/^\xef\xbb\xbf//;' '{}' \;
 
-NO_STAGE=	yes
 post-build:
 	@echo "building rime data."
 	@${MKDIR} ${DATASRC}
@@ -39,8 +38,8 @@ post-build:
 	${WRKSRC}/bin/rime_deployer --build ${DATASRC}
 
 post-install:
-	${MKDIR} ${DATADIR}/data
-	${INSTALL_DATA} ${DATASRC}/*.kct ${DATASRC}/*.bin ${DATADIR}/data/
+	${MKDIR} ${STAGEDIR}${DATADIR}/data
+	${INSTALL_DATA} ${DATASRC}/*.kct ${DATASRC}/*.bin ${STAGEDIR}${DATADIR}/data/
 
 PROJECTHOST=	rimeime
 DATA_VER=	0.16
diff --git a/chinese/librime/pkg-plist b/chinese/librime/pkg-plist
index d70e13ef5407..5f39f30bbdc0 100644
--- a/chinese/librime/pkg-plist
+++ b/chinese/librime/pkg-plist
@@ -6,15 +6,15 @@ lib/librime.so.0
 lib/librime.so.%%VER%%
 libdata/pkgconfig/rime.pc
 share/cmake/rime/RimeConfig.cmake
-share/rime/data/cangjie5.prism.bin
-share/rime/data/cangjie5.reverse.bin
-share/rime/data/cangjie5.table.bin
-share/rime/data/essay.kct
-share/rime/data/luna_pinyin.prism.bin
-share/rime/data/luna_pinyin.reverse.bin
-share/rime/data/luna_pinyin.table.bin
-share/rime/data/luna_pinyin_fluency.prism.bin
-share/rime/data/luna_pinyin_simp.prism.bin
-@dirrmtry share/rime/data
-@dirrmtry share/rime
+%%DATADIR%%/data/cangjie5.prism.bin
+%%DATADIR%%/data/cangjie5.reverse.bin
+%%DATADIR%%/data/cangjie5.table.bin
+%%DATADIR%%/data/essay.kct
+%%DATADIR%%/data/luna_pinyin.prism.bin
+%%DATADIR%%/data/luna_pinyin.reverse.bin
+%%DATADIR%%/data/luna_pinyin.table.bin
+%%DATADIR%%/data/luna_pinyin_fluency.prism.bin
+%%DATADIR%%/data/luna_pinyin_simp.prism.bin
+@dirrmtry %%DATADIR%%/data
+@dirrmtry %%DATADIR%%
 @dirrm share/cmake/rime