aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chinese/Makefile1
-rw-r--r--chinese/brise/Makefile20
-rw-r--r--chinese/brise/distinfo2
-rw-r--r--chinese/brise/pkg-descr3
-rw-r--r--chinese/brise/pkg-plist55
-rw-r--r--chinese/fcitx-chewing/Makefile10
-rw-r--r--chinese/fcitx-chewing/distinfo4
-rw-r--r--chinese/fcitx-chewing/files/patch-data__CMakeLists.txt12
-rw-r--r--chinese/fcitx-chewing/pkg-descr2
-rw-r--r--chinese/fcitx-chewing/pkg-plist4
-rw-r--r--chinese/fcitx-cloudpinyin/Makefile10
-rw-r--r--chinese/fcitx-cloudpinyin/distinfo4
-rw-r--r--chinese/fcitx-cloudpinyin/files/patch-CMakeLists.txt3
-rw-r--r--chinese/fcitx-cloudpinyin/pkg-descr2
-rw-r--r--chinese/fcitx-cloudpinyin/pkg-plist2
-rw-r--r--chinese/fcitx-configtool/Makefile8
-rw-r--r--chinese/fcitx-configtool/distinfo4
-rw-r--r--chinese/fcitx-configtool/files/patch-CMakeLists.txt13
-rw-r--r--chinese/fcitx-configtool/files/patch-gtk3_CMakeLists.txt9
-rw-r--r--chinese/fcitx-configtool/files/patch-gtk_CMakeLists.txt15
-rw-r--r--chinese/fcitx-configtool/pkg-descr2
-rw-r--r--chinese/fcitx-configtool/pkg-plist2
-rw-r--r--chinese/fcitx-googlepinyin/Makefile3
-rw-r--r--chinese/fcitx-googlepinyin/pkg-descr2
-rw-r--r--chinese/fcitx-libpinyin/Makefile38
-rw-r--r--chinese/fcitx-libpinyin/distinfo8
-rw-r--r--chinese/fcitx-libpinyin/files/patch-CMakeLists.txt10
-rw-r--r--chinese/fcitx-libpinyin/files/patch-dictmanager__CMakeLists.txt11
-rw-r--r--chinese/fcitx-libpinyin/files/patch-src__CMakeLists.txt10
-rw-r--r--chinese/fcitx-libpinyin/pkg-descr2
-rw-r--r--chinese/fcitx-libpinyin/pkg-plist20
-rw-r--r--chinese/fcitx-rime/Makefile12
-rw-r--r--chinese/fcitx-rime/distinfo4
-rw-r--r--chinese/fcitx-rime/files/patch-data_CMakeLists.txt7
-rw-r--r--chinese/fcitx-rime/files/patch-data__CMakeLists.txt20
-rw-r--r--chinese/fcitx-rime/pkg-descr2
-rw-r--r--chinese/fcitx-rime/pkg-plist27
-rw-r--r--chinese/fcitx-sunpinyin/Makefile16
-rw-r--r--chinese/fcitx-sunpinyin/distinfo4
-rw-r--r--chinese/fcitx-sunpinyin/pkg-descr2
-rw-r--r--chinese/fcitx-sunpinyin/pkg-plist2
-rw-r--r--chinese/fcitx-table-extra/Makefile9
-rw-r--r--chinese/fcitx-table-extra/distinfo4
-rw-r--r--chinese/fcitx-table-extra/files/patch-tables__CMakeLists.txt10
-rw-r--r--chinese/fcitx-table-extra/pkg-descr2
-rw-r--r--chinese/fcitx-table-extra/pkg-plist12
-rw-r--r--chinese/fcitx-ui-light/Makefile6
-rw-r--r--chinese/fcitx-ui-light/pkg-descr2
-rw-r--r--chinese/fcitx/Makefile50
-rw-r--r--chinese/fcitx/distinfo12
-rw-r--r--chinese/fcitx/files/patch-CMakeLists.txt51
-rw-r--r--chinese/fcitx/files/patch-cmake__FcitxConfig.cmake16
-rw-r--r--chinese/fcitx/files/patch-cmake__FcitxMacro.cmake51
-rw-r--r--chinese/fcitx/files/patch-cmake_modules_FindLibkvm.cmake34
-rw-r--r--chinese/fcitx/files/patch-data__script__fcitx4-config.in78
-rw-r--r--chinese/fcitx/files/patch-doc_man_CMakeLists.txt9
-rw-r--r--chinese/fcitx/files/patch-src_lib_fcitx-config_CMakeLists.txt11
-rw-r--r--chinese/fcitx/files/patch-src_lib_fcitx-gclient_CMakeLists.txt18
-rw-r--r--chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxclient.c17
-rw-r--r--chinese/fcitx/files/patch-src_lib_fcitx-utils_CMakeLists.txt11
-rw-r--r--chinese/fcitx/files/patch-src_lib_fcitx_CMakeLists.txt11
-rw-r--r--chinese/fcitx/files/patch-tools__cli__CMakeLists.txt10
-rw-r--r--chinese/fcitx/files/patch-tools__gui__quickphrase-editor__CMakeLists.txt10
-rw-r--r--chinese/fcitx/files/patch-tools__gui__wrapper__CMakeLists.txt10
-rw-r--r--chinese/fcitx/pkg-descr2
-rw-r--r--chinese/fcitx/pkg-plist222
-rw-r--r--chinese/libgooglepinyin/Makefile2
-rw-r--r--chinese/libgooglepinyin/pkg-descr2
-rw-r--r--chinese/libpinyin/Makefile15
-rw-r--r--chinese/libpinyin/distinfo4
-rw-r--r--chinese/libpinyin/files/patch-configure16
-rw-r--r--chinese/libpinyin/files/patch-data_Makefile.in11
-rw-r--r--chinese/libpinyin/files/patch-libpinyin.pc.in11
-rw-r--r--chinese/libpinyin/files/patch-src_pinyin_internal.h10
-rw-r--r--chinese/libpinyin/pkg-descr2
-rw-r--r--chinese/libpinyin/pkg-plist21
-rw-r--r--chinese/librime/Makefile36
-rw-r--r--chinese/librime/distinfo6
-rw-r--r--chinese/librime/files/patch-CMakeLists.txt66
-rw-r--r--chinese/librime/pkg-descr2
-rw-r--r--chinese/librime/pkg-plist11
-rw-r--r--chinese/opencc/Makefile2
-rw-r--r--chinese/opencc/distinfo4
-rw-r--r--chinese/opencc/files/patch-src_utils.c46
-rw-r--r--chinese/opencc/pkg-descr2
-rw-r--r--japanese/Makefile1
-rw-r--r--japanese/fcitx-anthy/Makefile13
-rw-r--r--japanese/fcitx-anthy/distinfo4
-rw-r--r--japanese/fcitx-anthy/pkg-descr2
-rw-r--r--japanese/fcitx-anthy/pkg-plist1
-rw-r--r--japanese/fcitx-skk/Makefile37
-rw-r--r--japanese/fcitx-skk/distinfo2
-rw-r--r--japanese/fcitx-skk/files/patch-gui__CMakeLists.txt8
-rw-r--r--japanese/fcitx-skk/files/patch-src__CMakeLists.txt8
-rw-r--r--japanese/fcitx-skk/pkg-descr3
-rw-r--r--japanese/fcitx-skk/pkg-plist13
-rw-r--r--korean/fcitx-hangul/Makefile6
-rw-r--r--korean/fcitx-hangul/distinfo4
-rw-r--r--korean/fcitx-hangul/files/patch-data__CMakeLists.txt10
-rw-r--r--korean/fcitx-hangul/pkg-descr2
-rw-r--r--korean/fcitx-hangul/pkg-plist8
-rw-r--r--textproc/fcitx-m17n/Makefile9
-rw-r--r--textproc/fcitx-m17n/distinfo4
-rw-r--r--textproc/fcitx-m17n/files/patch-im__CMakeLists.txt8
-rw-r--r--textproc/fcitx-m17n/pkg-descr2
-rw-r--r--textproc/fcitx-m17n/pkg-plist2
106 files changed, 1012 insertions, 459 deletions
diff --git a/chinese/Makefile b/chinese/Makefile
index a2a373458323..b0fe1c27c4ab 100644
--- a/chinese/Makefile
+++ b/chinese/Makefile
@@ -16,6 +16,7 @@
SUBDIR += bg5ps
SUBDIR += big5width
SUBDIR += bitchx
+ SUBDIR += brise
SUBDIR += bsdconv-opencc
SUBDIR += bug5
SUBDIR += c2t
diff --git a/chinese/brise/Makefile b/chinese/brise/Makefile
new file mode 100644
index 000000000000..c4ead7dd36e5
--- /dev/null
+++ b/chinese/brise/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+PORTNAME= brise
+PORTVERSION= 0.32
+CATEGORIES= chinese textproc
+MASTER_SITES= http://github.com/lotem/brise/archive/brise-${DISTVERSION}.tar.gz?dummy=/
+DISTNAME= ${PORTNAME}-brise-${DISTVERSION}
+
+MAINTAINER= hiroto.kagotani@gmail.com
+COMMENT= Rime Schema Repository
+
+LICENSE= GPLv3
+
+BUILD_DEPENDS= rime_deployer:${PORTSDIR}/chinese/librime
+
+USES= gmake
+
+MAKE_ARGS+= RIME_DATA_DIR=${DATADIR}
+
+.include <bsd.port.mk>
diff --git a/chinese/brise/distinfo b/chinese/brise/distinfo
new file mode 100644
index 000000000000..06b0db693de7
--- /dev/null
+++ b/chinese/brise/distinfo
@@ -0,0 +1,2 @@
+SHA256 (brise-brise-0.32.tar.gz) = b1e9fc2a5967d7994ccca1b0aaeee7f1fe0ab5f9c16325c0650a610df5ce93c0
+SIZE (brise-brise-0.32.tar.gz) = 6695914
diff --git a/chinese/brise/pkg-descr b/chinese/brise/pkg-descr
new file mode 100644
index 000000000000..dc1da2cbbb9c
--- /dev/null
+++ b/chinese/brise/pkg-descr
@@ -0,0 +1,3 @@
+Rime Schema Repository.
+
+WWW: https://rime.github.io/
diff --git a/chinese/brise/pkg-plist b/chinese/brise/pkg-plist
new file mode 100644
index 000000000000..5a8447c2f0cf
--- /dev/null
+++ b/chinese/brise/pkg-plist
@@ -0,0 +1,55 @@
+%%DATADIR%%/bopomofo.schema.yaml
+%%DATADIR%%/bopomofo_tw.schema.yaml
+%%DATADIR%%/cangjie5.dict.yaml
+%%DATADIR%%/cangjie5.prism.bin
+%%DATADIR%%/cangjie5.reverse.bin
+%%DATADIR%%/cangjie5.schema.yaml
+%%DATADIR%%/cangjie5.table.bin
+%%DATADIR%%/cangjie5_express.schema.yaml
+%%DATADIR%%/combo_pinyin.schema.yaml
+%%DATADIR%%/default.yaml
+%%DATADIR%%/double_pinyin.schema.yaml
+%%DATADIR%%/double_pinyin_abc.schema.yaml
+%%DATADIR%%/double_pinyin_flypy.schema.yaml
+%%DATADIR%%/double_pinyin_mspy.schema.yaml
+%%DATADIR%%/emoji.dict.yaml
+%%DATADIR%%/emoji.schema.yaml
+%%DATADIR%%/essay.kct
+%%DATADIR%%/ipa_xsampa.dict.yaml
+%%DATADIR%%/ipa_xsampa.schema.yaml
+%%DATADIR%%/jyutping.dict.yaml
+%%DATADIR%%/jyutping.schema.yaml
+%%DATADIR%%/luna_pinyin.dict.yaml
+%%DATADIR%%/luna_pinyin.prism.bin
+%%DATADIR%%/luna_pinyin.reverse.bin
+%%DATADIR%%/luna_pinyin.schema.yaml
+%%DATADIR%%/luna_pinyin.table.bin
+%%DATADIR%%/luna_pinyin_fluency.prism.bin
+%%DATADIR%%/luna_pinyin_fluency.schema.yaml
+%%DATADIR%%/luna_pinyin_simp.prism.bin
+%%DATADIR%%/luna_pinyin_simp.schema.yaml
+%%DATADIR%%/luna_pinyin_tw.prism.bin
+%%DATADIR%%/luna_pinyin_tw.schema.yaml
+%%DATADIR%%/pinyin_simp.dict.yaml
+%%DATADIR%%/pinyin_simp.schema.yaml
+%%DATADIR%%/quick5.dict.yaml
+%%DATADIR%%/quick5.schema.yaml
+%%DATADIR%%/sampheng.schema.yaml
+%%DATADIR%%/soutzoe.dict.yaml
+%%DATADIR%%/soutzoe.schema.yaml
+%%DATADIR%%/stroke.dict.yaml
+%%DATADIR%%/stroke.prism.bin
+%%DATADIR%%/stroke.reverse.bin
+%%DATADIR%%/stroke.schema.yaml
+%%DATADIR%%/stroke.table.bin
+%%DATADIR%%/symbols.yaml
+%%DATADIR%%/terra_pinyin.dict.yaml
+%%DATADIR%%/terra_pinyin.schema.yaml
+%%DATADIR%%/wubi86.dict.yaml
+%%DATADIR%%/wubi86.schema.yaml
+%%DATADIR%%/wubi_pinyin.schema.yaml
+%%DATADIR%%/wugniu.schema.yaml
+%%DATADIR%%/wugniu_lopha.dict.yaml
+%%DATADIR%%/wugniu_lopha.schema.yaml
+%%DATADIR%%/zyenpheng.dict.yaml
+%%DATADIR%%/zyenpheng.schema.yaml
diff --git a/chinese/fcitx-chewing/Makefile b/chinese/fcitx-chewing/Makefile
index 8c96499c4677..b61d1ab03f89 100644
--- a/chinese/fcitx-chewing/Makefile
+++ b/chinese/fcitx-chewing/Makefile
@@ -2,20 +2,20 @@
# $FreeBSD$
PORTNAME= fcitx-chewing
-PORTVERSION= 0.1.3
-PORTREVISION= 1
+PORTVERSION= 0.2.2
CATEGORIES= chinese
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
-PROJECTHOST= fcitx
+MASTER_SITES= http://download.fcitx-im.org/${PORTNAME}/
DIST_SUBDIR= fcitx
MAINTAINER= lichray@gmail.com
COMMENT= Chewing support for Fcitx
+LICENSE= GPLv2
+
LIB_DEPENDS= libfcitx-config.so:${PORTSDIR}/chinese/fcitx \
libchewing.so:${PORTSDIR}/chinese/libchewing
USES= tar:xz cmake gettext pkgconfig
-USE_GNOME= intltool
+INSTALLS_ICONS= yes
.include <bsd.port.mk>
diff --git a/chinese/fcitx-chewing/distinfo b/chinese/fcitx-chewing/distinfo
index a5b41197a4c3..408955892d2a 100644
--- a/chinese/fcitx-chewing/distinfo
+++ b/chinese/fcitx-chewing/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx-chewing-0.1.3.tar.xz) = d9cdac1469ffe7e60f1d13f11257708361fdc4bfea487a8162b5a22aa23d775c
-SIZE (fcitx/fcitx-chewing-0.1.3.tar.xz) = 15160
+SHA256 (fcitx/fcitx-chewing-0.2.2.tar.xz) = fa278ee9d2c20f7ae0a3093a3e490553798186bd67dc1e83f2723bd15b47a450
+SIZE (fcitx/fcitx-chewing-0.2.2.tar.xz) = 19684
diff --git a/chinese/fcitx-chewing/files/patch-data__CMakeLists.txt b/chinese/fcitx-chewing/files/patch-data__CMakeLists.txt
new file mode 100644
index 000000000000..a356db7fbd41
--- /dev/null
+++ b/chinese/fcitx-chewing/files/patch-data__CMakeLists.txt
@@ -0,0 +1,12 @@
+--- ./data/CMakeLists.txt.orig 2013-06-04 03:02:38.000000000 +0900
++++ ./data/CMakeLists.txt 2014-03-19 14:07:16.000000000 +0900
+@@ -1,5 +1,5 @@
+-install(FILES chewing.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/imicon/)
++install(FILES chewing.png DESTINATION share/fcitx/imicon/)
+ install(FILES chewing.png DESTINATION share/icons/hicolor/48x48/apps/ RENAME fcitx-chewing.png)
+-install(FILES default/chewing.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/skin/default)
+-install(FILES dark/chewing.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/skin/dark)
+-install(FILES classic/chewing.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/skin/classic)
++install(FILES default/chewing.png DESTINATION share/fcitx/skin/default)
++install(FILES dark/chewing.png DESTINATION share/fcitx/skin/dark)
++install(FILES classic/chewing.png DESTINATION share/fcitx/skin/classic)
diff --git a/chinese/fcitx-chewing/pkg-descr b/chinese/fcitx-chewing/pkg-descr
index b9e8d109156d..d78c3344b07a 100644
--- a/chinese/fcitx-chewing/pkg-descr
+++ b/chinese/fcitx-chewing/pkg-descr
@@ -1,4 +1,4 @@
fcitx-chewing provides Chewing, an intelligent phonetic input method
engine, as a back-end to the Fcitx IM framework.
-WWW: http://code.google.com/p/fcitx/
+WWW: https://fcitx-im.org/wiki/Fcitx
diff --git a/chinese/fcitx-chewing/pkg-plist b/chinese/fcitx-chewing/pkg-plist
index bf229478d14e..d66454a97444 100644
--- a/chinese/fcitx-chewing/pkg-plist
+++ b/chinese/fcitx-chewing/pkg-plist
@@ -1,9 +1,13 @@
lib/fcitx/fcitx-chewing.so
share/fcitx/addon/fcitx-chewing.conf
share/fcitx/configdesc/fcitx-chewing.desc
+share/fcitx/imicon/chewing.png
share/fcitx/inputmethod/chewing.conf
share/fcitx/skin/classic/chewing.png
share/fcitx/skin/dark/chewing.png
share/fcitx/skin/default/chewing.png
+share/icons/hicolor/48x48/apps/fcitx-chewing.png
+share/locale/de/LC_MESSAGES/fcitx-chewing.mo
+share/locale/ja/LC_MESSAGES/fcitx-chewing.mo
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 1cf6f126117b..5a5fe10a9c49 100644
--- a/chinese/fcitx-cloudpinyin/Makefile
+++ b/chinese/fcitx-cloudpinyin/Makefile
@@ -2,21 +2,19 @@
# $FreeBSD$
PORTNAME= fcitx-cloudpinyin
-PORTVERSION= 0.3.0
-PORTREVISION= 1
+PORTVERSION= 0.3.4
CATEGORIES= chinese
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= http://download.fcitx-im.org/${PORTNAME}/
DIST_SUBDIR= fcitx
MAINTAINER= lichray@gmail.com
COMMENT= Cloud-based Pinyin module for Fcitx
+LICENSE= GPLv2
+
LIB_DEPENDS= libfcitx-config.so:${PORTSDIR}/chinese/fcitx \
libcurl.so:${PORTSDIR}/ftp/curl
USES= tar:xz cmake gettext pkgconfig
-USE_GNOME= intltool
-
-PROJECTHOST= fcitx
.include <bsd.port.mk>
diff --git a/chinese/fcitx-cloudpinyin/distinfo b/chinese/fcitx-cloudpinyin/distinfo
index ede38536ce6f..9e7c49364b03 100644
--- a/chinese/fcitx-cloudpinyin/distinfo
+++ b/chinese/fcitx-cloudpinyin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx-cloudpinyin-0.3.0.tar.xz) = a68f27d9785bb1e31610424acb81faa933bfe9b7e93140c9895cd34987547b84
-SIZE (fcitx/fcitx-cloudpinyin-0.3.0.tar.xz) = 19344
+SHA256 (fcitx/fcitx-cloudpinyin-0.3.4.tar.xz) = c131e8cfd4d171f7749c2934f13092dcdffcf3d4ff1cefde7ed67daed74b7d90
+SIZE (fcitx/fcitx-cloudpinyin-0.3.4.tar.xz) = 20796
diff --git a/chinese/fcitx-cloudpinyin/files/patch-CMakeLists.txt b/chinese/fcitx-cloudpinyin/files/patch-CMakeLists.txt
index 7242457163a5..96b5026d228e 100644
--- a/chinese/fcitx-cloudpinyin/files/patch-CMakeLists.txt
+++ b/chinese/fcitx-cloudpinyin/files/patch-CMakeLists.txt
@@ -2,7 +2,6 @@
+++ CMakeLists.txt 2012-09-19 15:10:32.000000000 +0800
@@ -33,4 +33,3 @@
- add_subdirectory(src)
add_subdirectory(po)
+ add_subdirectory(src)
-add_subdirectory(test)
-\ No newline at end of file
diff --git a/chinese/fcitx-cloudpinyin/pkg-descr b/chinese/fcitx-cloudpinyin/pkg-descr
index 8784ae88eaeb..e980bfebdf5f 100644
--- a/chinese/fcitx-cloudpinyin/pkg-descr
+++ b/chinese/fcitx-cloudpinyin/pkg-descr
@@ -2,4 +2,4 @@ fcitx-cloudpinyin is not an input method engine. It adds candidates
from the cloud-based Pinyin services (Sogou, QQ, Baidu, Google) to any
Pinyin IMEs in Fcitx.
-WWW: http://code.google.com/p/fcitx/
+WWW: https://fcitx-im.org/wiki/Fcitx
diff --git a/chinese/fcitx-cloudpinyin/pkg-plist b/chinese/fcitx-cloudpinyin/pkg-plist
index 3519c9b78398..ce2a6e5dd194 100644
--- a/chinese/fcitx-cloudpinyin/pkg-plist
+++ b/chinese/fcitx-cloudpinyin/pkg-plist
@@ -1,5 +1,7 @@
lib/fcitx/fcitx-cloudpinyin.so
share/fcitx/addon/fcitx-cloudpinyin.conf
share/fcitx/configdesc/fcitx-cloudpinyin.desc
+share/locale/de/LC_MESSAGES/fcitx-cloudpinyin.mo
+share/locale/ja/LC_MESSAGES/fcitx-cloudpinyin.mo
share/locale/zh_CN/LC_MESSAGES/fcitx-cloudpinyin.mo
share/locale/zh_TW/LC_MESSAGES/fcitx-cloudpinyin.mo
diff --git a/chinese/fcitx-configtool/Makefile b/chinese/fcitx-configtool/Makefile
index ab257be293dd..b6b4a4aea390 100644
--- a/chinese/fcitx-configtool/Makefile
+++ b/chinese/fcitx-configtool/Makefile
@@ -2,21 +2,23 @@
# $FreeBSD$
PORTNAME= fcitx-configtool
-PORTVERSION= 0.4.5.2
+PORTVERSION= 0.4.8
CATEGORIES= chinese x11
-MASTER_SITES= GOOGLE_CODE
-PROJECTHOST= fcitx
+MASTER_SITES= http://download.fcitx-im.org/${PORTNAME}/
DIST_SUBDIR= fcitx
MAINTAINER= lichray@gmail.com
COMMENT= Fcitx IM framework configuration tool
+LICENSE= GPLv2
+
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib
LIB_DEPENDS= libfcitx-config.so:${PORTSDIR}/chinese/fcitx
USE_GNOME= intltool
USES= cmake gettext pkgconfig tar:xz
+LDFLAGS+= -lintl
OPTIONS_SINGLE= UI
UI_DESC= Gtk version to use
diff --git a/chinese/fcitx-configtool/distinfo b/chinese/fcitx-configtool/distinfo
index bce14e064d67..73285906f825 100644
--- a/chinese/fcitx-configtool/distinfo
+++ b/chinese/fcitx-configtool/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx-configtool-0.4.5.2.tar.xz) = 3882ad86e7e5651dd6661dc19ecd24fa9e07a9a2c6a3d00a9184d71c87347f34
-SIZE (fcitx/fcitx-configtool-0.4.5.2.tar.xz) = 42560
+SHA256 (fcitx/fcitx-configtool-0.4.8.tar.xz) = 0ebc06d9d325fed096e9cb61fe53b82000d2de0e9aefe5945ba8f0aa2ca851ed
+SIZE (fcitx/fcitx-configtool-0.4.8.tar.xz) = 47196
diff --git a/chinese/fcitx-configtool/files/patch-CMakeLists.txt b/chinese/fcitx-configtool/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..56211ba80e38
--- /dev/null
+++ b/chinese/fcitx-configtool/files/patch-CMakeLists.txt
@@ -0,0 +1,13 @@
+--- ./CMakeLists.txt.orig 2013-10-27 08:45:38.000000000 +0900
++++ ./CMakeLists.txt 2014-03-18 14:40:07.000000000 +0900
+@@ -27,8 +27,8 @@
+ "${PROJECT_SOURCE_DIR}/cmake/fcitx-extract-glade.sh" glade)
+
+ add_definitions("-D_GNU_SOURCE")
+-set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-local-typedefs -Wno-unused-parameter -fvisibility=hidden ${CMAKE_C_FLAGS}")
+-set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-local-typedefs -Wno-unused-parameter -fvisibility=hidden ${CMAKE_CXX_FLAGS}")
++set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden ${CMAKE_C_FLAGS}")
++set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -fvisibility=hidden ${CMAKE_CXX_FLAGS}")
+ set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined,--as-needed ${CMAKE_SHARED_LINKER_FLAGS}")
+ set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined,--as-needed ${CMAKE_MODULE_LINKER_FLAGS}")
+
diff --git a/chinese/fcitx-configtool/files/patch-gtk3_CMakeLists.txt b/chinese/fcitx-configtool/files/patch-gtk3_CMakeLists.txt
deleted file mode 100644
index f6bd6b8a683b..000000000000
--- a/chinese/fcitx-configtool/files/patch-gtk3_CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- gtk3/CMakeLists.txt~ 2012-05-03 01:21:57.000000000 -0500
-+++ gtk3/CMakeLists.txt 2012-05-14 01:55:09.806098826 -0500
-@@ -42,5 +42,6 @@ target_link_libraries (fcitx-config-gtk3
- ${FCITX4_FCITX_LIBRARIES}
- ${GLIB2_LIBRARIES}
- ${GIO2_LIBRARIES}
-+ -lintl
- )
-
diff --git a/chinese/fcitx-configtool/files/patch-gtk_CMakeLists.txt b/chinese/fcitx-configtool/files/patch-gtk_CMakeLists.txt
deleted file mode 100644
index c607574e386e..000000000000
--- a/chinese/fcitx-configtool/files/patch-gtk_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- gtk/CMakeLists.txt.orig 2012-06-02 11:14:45.000000000 -0500
-+++ gtk/CMakeLists.txt 2012-07-18 02:00:53.555897529 -0500
-@@ -1,3 +1,4 @@
-+PKG_CHECK_MODULES (GTK2 "gtk+-2.0 >= 2.22" REQUIRED)
- PKG_CHECK_MODULES (DBUS_GLIB "dbus-glib-1" REQUIRED)
- PKG_CHECK_MODULES (UNIQUE "unique-1.0")
-
-@@ -49,6 +50,7 @@ target_link_libraries (fcitx-config-gtk
- ${FCITX4_FCITX_LIBRARIES}
- ${GLIB2_LIBRARIES}
- ${DBUS_GLIB_LIBRARIES}
-+ -lintl
- )
-
- if (UNIQUE_FOUND)
diff --git a/chinese/fcitx-configtool/pkg-descr b/chinese/fcitx-configtool/pkg-descr
index 1c9537e783d1..a73ec5ab5432 100644
--- a/chinese/fcitx-configtool/pkg-descr
+++ b/chinese/fcitx-configtool/pkg-descr
@@ -1,4 +1,4 @@
Fcitx is a flexible input method framework. It comes with a script,
fcitx-configtool, which looks for this configure tool and invokes it.
-WWW: http://code.google.com/p/fcitx/
+WWW: https://fcitx-im.org/wiki/Fcitx
diff --git a/chinese/fcitx-configtool/pkg-plist b/chinese/fcitx-configtool/pkg-plist
index 66d82622282c..207fd12b90fa 100644
--- a/chinese/fcitx-configtool/pkg-plist
+++ b/chinese/fcitx-configtool/pkg-plist
@@ -1,4 +1,6 @@
%%GTK2%%bin/fcitx-config-gtk
%%GTK3%%bin/fcitx-config-gtk3
+share/locale/de/LC_MESSAGES/fcitx-configtool.mo
+share/locale/ja/LC_MESSAGES/fcitx-configtool.mo
share/locale/zh_CN/LC_MESSAGES/fcitx-configtool.mo
share/locale/zh_TW/LC_MESSAGES/fcitx-configtool.mo
diff --git a/chinese/fcitx-googlepinyin/Makefile b/chinese/fcitx-googlepinyin/Makefile
index 64d51f78f200..9e77d06112db 100644
--- a/chinese/fcitx-googlepinyin/Makefile
+++ b/chinese/fcitx-googlepinyin/Makefile
@@ -10,11 +10,14 @@ DIST_SUBDIR= fcitx
MAINTAINER= lichray@gmail.com
COMMENT= Libgooglepinyin support for Fcitx
+LICENSE= GPLv3
+
LIB_DEPENDS= libfcitx-config.so:${PORTSDIR}/chinese/fcitx \
libgooglepinyin.so:${PORTSDIR}/chinese/libgooglepinyin
USES= tar:xz cmake gettext pkgconfig iconv
USE_GNOME= intltool
+INSTALLS_ICONS= yes
PROJECTHOST= fcitx
diff --git a/chinese/fcitx-googlepinyin/pkg-descr b/chinese/fcitx-googlepinyin/pkg-descr
index 761995106cad..cdafcecbab21 100644
--- a/chinese/fcitx-googlepinyin/pkg-descr
+++ b/chinese/fcitx-googlepinyin/pkg-descr
@@ -1,4 +1,4 @@
fcitx-googlepinyin provides libgooglepinyin, a fork of Google Pinyin IME
on Android, as a back-end to the Fcitx IM framework.
-WWW: http://code.google.com/p/fcitx/
+WWW: https://fcitx-im.org/wiki/Fcitx
diff --git a/chinese/fcitx-libpinyin/Makefile b/chinese/fcitx-libpinyin/Makefile
index 13d4da3d2f81..75d46bcf2797 100644
--- a/chinese/fcitx-libpinyin/Makefile
+++ b/chinese/fcitx-libpinyin/Makefile
@@ -2,29 +2,45 @@
# $FreeBSD$
PORTNAME= fcitx-libpinyin
-PORTVERSION= 0.2.1
+PORTVERSION= 0.3.1
CATEGORIES= chinese
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
- http://cloud.github.com/downloads/fcitx/fcitx-libpinyin/:libpinyin
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} model.text.${MDVER}.tar.gz:libpinyin
+MASTER_SITES= http://download.fcitx-im.org/${PORTNAME}/:body \
+ http://download.fcitx-im.org/data/:data
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:body \
+ model.text.${_MODEL_VER}.tar.gz:data
DIST_SUBDIR= fcitx
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= lichray@gmail.com
-COMMENT= The libpinyin support for Fcitx
+COMMENT= Libpinyin support for Fcitx
+
+LICENSE= GPLv2
LIB_DEPENDS= libfcitx-config.so:${PORTSDIR}/chinese/fcitx \
libpinyin.so:${PORTSDIR}/chinese/libpinyin
-USE_LDCONFIG= ${PREFIX}/lib/fcitx/
USES= tar:xz cmake gettext pkgconfig
-USE_GNOME= intltool
INSTALLS_ICONS= yes
-post-patch:
- @${LN} -s ${_DISTDIR}/model.text.${MDVER}.tar.gz ${WRKSRC}/data
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+_MODEL_VER= 20130308
+
+OPTIONS_DEFINE= QT4
+OPTIONS_DEFAULT=QT4
+QT4_DESC= Enable Qt4 for dictmanager
-PROJECTHOST= fcitx
-MDVER= 20120921
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MQT4}
+USE_QT4= qmake_build moc_build rcc_build uic_build gui webkit
+USE_LDCONFIG= ${PREFIX}/lib/fcitx/qt
+PLIST_SUB+= QT4=""
+.else
+CMAKE_ARGS+= -DENABLE_QT=OFF
+PLIST_SUB+= QT4="@comment "
+.endif
+
+post-patch:
+ @${CP} ${_DISTDIR}/model.text.${_MODEL_VER}.tar.gz ${WRKSRC}/data/.
.include <bsd.port.mk>
diff --git a/chinese/fcitx-libpinyin/distinfo b/chinese/fcitx-libpinyin/distinfo
index 3b54d009ff38..e535172c4bfa 100644
--- a/chinese/fcitx-libpinyin/distinfo
+++ b/chinese/fcitx-libpinyin/distinfo
@@ -1,4 +1,4 @@
-SHA256 (fcitx/fcitx-libpinyin-0.2.1.tar.xz) = 6a5c9f7c7009a893b4beba85d6ee361253ca1211ce954da0e752c01a528c8c09
-SIZE (fcitx/fcitx-libpinyin-0.2.1.tar.xz) = 24468
-SHA256 (fcitx/model.text.20120921.tar.gz) = 84f086a8eb56a4a8ddab7d95ce1b386dfe292561a3271132e3aa6e85ba4ed339
-SIZE (fcitx/model.text.20120921.tar.gz) = 9980454
+SHA256 (fcitx/fcitx-libpinyin-0.3.1.tar.xz) = 11112c29579af01c38b5af6069c6433c22ee538ebaad55577e5737d3e4fa9158
+SIZE (fcitx/fcitx-libpinyin-0.3.1.tar.xz) = 41520
+SHA256 (fcitx/model.text.20130308.tar.gz) = 4595b5832ec1f81e93a37ec5841a57898c68f6024ef0593b8de127d1e3571a69
+SIZE (fcitx/model.text.20130308.tar.gz) = 15100062
diff --git a/chinese/fcitx-libpinyin/files/patch-CMakeLists.txt b/chinese/fcitx-libpinyin/files/patch-CMakeLists.txt
deleted file mode 100644
index 24ef080cbe95..000000000000
--- a/chinese/fcitx-libpinyin/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- CMakeLists.txt~ 2012-07-05 04:14:59.000000000 -0500
-+++ CMakeLists.txt 2012-09-04 16:36:28.118990420 -0500
-@@ -9,7 +9,6 @@ FIND_PACKAGE(Gettext REQUIRED)
- FIND_PACKAGE(Fcitx 4.2.0 REQUIRED)
- find_package(GLIB2 REQUIRED)
- find_package(Libpinyin REQUIRED)
--find_program(WGET wget REQUIRED)
- find_program(TAR tar REQUIRED)
-
- # uninstall target
diff --git a/chinese/fcitx-libpinyin/files/patch-dictmanager__CMakeLists.txt b/chinese/fcitx-libpinyin/files/patch-dictmanager__CMakeLists.txt
new file mode 100644
index 000000000000..deb57f9f5940
--- /dev/null
+++ b/chinese/fcitx-libpinyin/files/patch-dictmanager__CMakeLists.txt
@@ -0,0 +1,11 @@
+--- ./dictmanager/CMakeLists.txt.orig 2013-07-16 05:34:05.000000000 +0900
++++ ./dictmanager/CMakeLists.txt 2014-03-19 15:52:24.000000000 +0900
+@@ -60,6 +60,7 @@
+ ${FCITX_QT_LIBRARIES}
+ ${FCITX4_FCITX_UTILS_LIBRARIES}
+ ${FCITX4_FCITX_CONFIG_LIBRARIES}
++${LIBINTL_LIBRARIES}
+ )
+
+-install(TARGETS fcitx-libpinyin-dictmanager DESTINATION ${FCITX4_ADDON_INSTALL_DIR}/qt)
++install(TARGETS fcitx-libpinyin-dictmanager DESTINATION ${FCITX4_ADDON_INSTALL_DESTDIR}/qt)
diff --git a/chinese/fcitx-libpinyin/files/patch-src__CMakeLists.txt b/chinese/fcitx-libpinyin/files/patch-src__CMakeLists.txt
new file mode 100644
index 000000000000..5a1d19c76611
--- /dev/null
+++ b/chinese/fcitx-libpinyin/files/patch-src__CMakeLists.txt
@@ -0,0 +1,10 @@
+--- ./src/CMakeLists.txt.orig 2013-07-16 05:34:05.000000000 +0900
++++ ./src/CMakeLists.txt 2014-03-19 15:51:24.000000000 +0900
+@@ -22,6 +22,7 @@
+ )
+
+ add_definitions( -DLOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/share/locale\" )
++add_definitions( -D_WITH_GETLINE )
+
+ fcitx_add_addon_full(libpinyin DESC
+ SOURCES ${fcitx_libpinyin_sources}
diff --git a/chinese/fcitx-libpinyin/pkg-descr b/chinese/fcitx-libpinyin/pkg-descr
index 877472a5e6fa..ba2dc2c0f935 100644
--- a/chinese/fcitx-libpinyin/pkg-descr
+++ b/chinese/fcitx-libpinyin/pkg-descr
@@ -1,4 +1,4 @@
fcitx-libpinyin provides libpinyin, a Chinese pinyin input method algorithm
collection, as a back-end to the Fcitx IM framework.
-WWW: http://code.google.com/p/fcitx/
+WWW: https://fcitx-im.org/wiki/Fcitx
diff --git a/chinese/fcitx-libpinyin/pkg-plist b/chinese/fcitx-libpinyin/pkg-plist
index 718b286689a4..7d92023a47c0 100644
--- a/chinese/fcitx-libpinyin/pkg-plist
+++ b/chinese/fcitx-libpinyin/pkg-plist
@@ -1,14 +1,34 @@
lib/fcitx/fcitx-libpinyin.so
+%%QT4%%lib/fcitx/qt/libfcitx-libpinyin-dictmanager.so
share/fcitx/addon/fcitx-libpinyin.conf
share/fcitx/configdesc/fcitx-libpinyin.desc
+share/fcitx/imicon/bopomofo.png
+share/fcitx/imicon/pinyin-libpinyin.png
+share/fcitx/imicon/shuangpin-libpinyin.png
share/fcitx/inputmethod/pinyin-libpinyin.conf
share/fcitx/inputmethod/shuangpin-libpinyin.conf
share/fcitx/inputmethod/zhuyin-libpinyin.conf
+share/fcitx/libpinyin/zhuyin_data/art.bin
share/fcitx/libpinyin/zhuyin_data/bigram.db
+share/fcitx/libpinyin/zhuyin_data/culture.bin
+share/fcitx/libpinyin/zhuyin_data/economy.bin
share/fcitx/libpinyin/zhuyin_data/gb_char.bin
share/fcitx/libpinyin/zhuyin_data/gbk_char.bin
+share/fcitx/libpinyin/zhuyin_data/geology.bin
+share/fcitx/libpinyin/zhuyin_data/history.bin
+share/fcitx/libpinyin/zhuyin_data/life.bin
+share/fcitx/libpinyin/zhuyin_data/merged.bin
+share/fcitx/libpinyin/zhuyin_data/nature.bin
share/fcitx/libpinyin/zhuyin_data/phrase_index.bin
share/fcitx/libpinyin/zhuyin_data/pinyin_index.bin
+share/fcitx/libpinyin/zhuyin_data/scitech.bin
+share/fcitx/libpinyin/zhuyin_data/society.bin
+share/fcitx/libpinyin/zhuyin_data/sport.bin
+share/fcitx/libpinyin/zhuyin_data/table.conf
share/icons/hicolor/48x48/status/fcitx-bopomofo.png
+share/icons/hicolor/48x48/status/fcitx-pinyin-libpinyin.png
+share/icons/hicolor/48x48/status/fcitx-shuangpin-libpinyin.png
+share/locale/de/LC_MESSAGES/fcitx-libpinyin.mo
+share/locale/ja/LC_MESSAGES/fcitx-libpinyin.mo
share/locale/zh_CN/LC_MESSAGES/fcitx-libpinyin.mo
share/locale/zh_TW/LC_MESSAGES/fcitx-libpinyin.mo
diff --git a/chinese/fcitx-rime/Makefile b/chinese/fcitx-rime/Makefile
index ecdd2845bfda..4dac0230eee1 100644
--- a/chinese/fcitx-rime/Makefile
+++ b/chinese/fcitx-rime/Makefile
@@ -2,23 +2,23 @@
# $FreeBSD$
PORTNAME= fcitx-rime
-PORTVERSION= 0.1.2
-PORTREVISION= 1
+PORTVERSION= 0.3.1
CATEGORIES= chinese
-MASTER_SITES= GOOGLE_CODE
+MASTER_SITES= http://download.fcitx-im.org/${PORTNAME}/
DIST_SUBDIR= fcitx
MAINTAINER= lichray@gmail.com
COMMENT= RIME support for Fcitx
+LICENSE= GPLv2
+
LIB_DEPENDS= libfcitx-config.so:${PORTSDIR}/chinese/fcitx \
librime.so:${PORTSDIR}/chinese/librime
+RUN_DEPENDS= ${LOCALBASE}/share/brise/default.yaml:${PORTSDIR}/chinese/brise
-USE_LDCONFIG= ${PREFIX}/lib/fcitx/
USES= tar:xz cmake gettext
-USE_GNOME= intltool
INSTALLS_ICONS= yes
-PROJECTHOST= fcitx
+CMAKE_ARGS+= -DBRISE_DIR=${LOCALBASE}/share/brise
.include <bsd.port.mk>
diff --git a/chinese/fcitx-rime/distinfo b/chinese/fcitx-rime/distinfo
index dc2d3a017522..d8cc0de40912 100644
--- a/chinese/fcitx-rime/distinfo
+++ b/chinese/fcitx-rime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx-rime-0.1.2.tar.xz) = 528472c13adb050543ba0402077d2e2b37258cb494f7d7900411cfd8c1ad9048
-SIZE (fcitx/fcitx-rime-0.1.2.tar.xz) = 7356
+SHA256 (fcitx/fcitx-rime-0.3.1.tar.xz) = 3ca74de4d20e8fd0e67eb4ccae8af3790bb1f557f183c2af32cb45f371e8521d
+SIZE (fcitx/fcitx-rime-0.3.1.tar.xz) = 39648
diff --git a/chinese/fcitx-rime/files/patch-data_CMakeLists.txt b/chinese/fcitx-rime/files/patch-data_CMakeLists.txt
deleted file mode 100644
index 9a301db24a0e..000000000000
--- a/chinese/fcitx-rime/files/patch-data_CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
---- data/CMakeLists.txt~ 2012-10-04 07:34:39.000000000 -0500
-+++ data/CMakeLists.txt 2012-10-15 21:46:56.932232905 -0500
-@@ -2,3 +2,4 @@ install(FILES zhung.png RENAME rime.png
- install(FILES zhung.png RENAME rime.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/skin/dark)
- install(FILES zhung.png RENAME rime.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/skin/classic)
- install(FILES zhung.png RENAME fcitx-rime.png DESTINATION share/icons/hicolor/48x48/apps)
-+install(FILES zhung.png RENAME rime.png DESTINATION share/fcitx/imicon)
diff --git a/chinese/fcitx-rime/files/patch-data__CMakeLists.txt b/chinese/fcitx-rime/files/patch-data__CMakeLists.txt
new file mode 100644
index 000000000000..6ad8aec87c7c
--- /dev/null
+++ b/chinese/fcitx-rime/files/patch-data__CMakeLists.txt
@@ -0,0 +1,20 @@
+--- ./data/CMakeLists.txt.orig 2013-11-10 22:11:24.000000000 +0900
++++ ./data/CMakeLists.txt 2014-03-20 00:20:01.000000000 +0900
+@@ -1,8 +1,8 @@
+ # for im icon
+-install(FILES rime.png RENAME rime.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/imicon)
++install(FILES rime.png RENAME rime.png DESTINATION share/fcitx/imicon)
+
+ # for skin
+-install(DIRECTORY default DESTINATION ${FCITX4_PREFIX}/share/fcitx/skin)
++install(DIRECTORY default DESTINATION share/fcitx/skin)
+
+ # with prefix
+ foreach(svg rime rime-deploy rime-sync)
+@@ -14,4 +14,4 @@
+ foreach(svg rime-im rime-latin rime-disable)
+ install(FILES ${svg}.png DESTINATION share/icons/hicolor/48x48/apps)
+ install(FILES ${svg}.svg DESTINATION share/icons/hicolor/scalable/status)
+-endforeach()
+\ No newline at end of file
++endforeach()
diff --git a/chinese/fcitx-rime/pkg-descr b/chinese/fcitx-rime/pkg-descr
index ed0d753cf62b..445be166ff5c 100644
--- a/chinese/fcitx-rime/pkg-descr
+++ b/chinese/fcitx-rime/pkg-descr
@@ -1,4 +1,4 @@
fcitx-rime provides RIME, a dialect-friendly intelligent Chinese input method
engine, as a back-end to the Fcitx IM framework.
-WWW: http://code.google.com/p/fcitx/
+WWW: https://fcitx-im.org/wiki/Fcitx
diff --git a/chinese/fcitx-rime/pkg-plist b/chinese/fcitx-rime/pkg-plist
index 2369b44b5560..5e90add8b05a 100644
--- a/chinese/fcitx-rime/pkg-plist
+++ b/chinese/fcitx-rime/pkg-plist
@@ -2,7 +2,28 @@ lib/fcitx/fcitx-rime.so
share/fcitx/addon/fcitx-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
+share/fcitx/skin/default/rime-deploy.png
+share/fcitx/skin/default/rime-disable.png
+share/fcitx/skin/default/rime-im-cangjie5.png
+share/fcitx/skin/default/rime-im-luna_pinyin.png
+share/fcitx/skin/default/rime-im-luna_pinyin_simp.png
+share/fcitx/skin/default/rime-im.png
+share/fcitx/skin/default/rime-latin.png
+share/fcitx/skin/default/rime-sync.png
+share/icons/hicolor/48x48/apps/fcitx-rime-deploy.png
+share/icons/hicolor/48x48/apps/fcitx-rime-sync.png
share/icons/hicolor/48x48/apps/fcitx-rime.png
+share/icons/hicolor/48x48/apps/rime-disable.png
+share/icons/hicolor/48x48/apps/rime-im.png
+share/icons/hicolor/48x48/apps/rime-latin.png
+share/icons/hicolor/scalable/status/fcitx-rime-deploy.svg
+share/icons/hicolor/scalable/status/fcitx-rime-sync.svg
+share/icons/hicolor/scalable/status/fcitx-rime.svg
+share/icons/hicolor/scalable/status/rime-disable.svg
+share/icons/hicolor/scalable/status/rime-im.svg
+share/icons/hicolor/scalable/status/rime-latin.svg
+share/locale/de/LC_MESSAGES/fcitx-rime.mo
+share/locale/ja/LC_MESSAGES/fcitx-rime.mo
+share/locale/vi/LC_MESSAGES/fcitx-rime.mo
+share/locale/zh_CN/LC_MESSAGES/fcitx-rime.mo
+share/locale/zh_TW/LC_MESSAGES/fcitx-rime.mo
diff --git a/chinese/fcitx-sunpinyin/Makefile b/chinese/fcitx-sunpinyin/Makefile
index c539e6e77117..93cf6c6b9050 100644
--- a/chinese/fcitx-sunpinyin/Makefile
+++ b/chinese/fcitx-sunpinyin/Makefile
@@ -2,22 +2,20 @@
# $FreeBSD$
PORTNAME= fcitx-sunpinyin
-PORTVERSION= 0.3.9
+PORTVERSION= 0.4.1
CATEGORIES= chinese
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= http://download.fcitx-im.org/${PORTNAME}/
DIST_SUBDIR= fcitx
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= lichray@gmail.com
COMMENT= SunPinyin support for Fcitx
-LIB_DEPENDS= libfcitx-config.so:${PORTSDIR}/chinese/fcitx
-BUILD_DEPENDS= zh-sunpinyin>=2.0.4.r2:${PORTSDIR}/chinese/sunpinyin
-RUN_DEPENDS= zh-sunpinyin>=2.0.4.r2:${PORTSDIR}/chinese/sunpinyin
+LICENSE= GPLv2
+
+LIB_DEPENDS= libfcitx-config.so:${PORTSDIR}/chinese/fcitx \
+ libsunpinyin.so:${PORTSDIR}/chinese/sunpinyin
USES= cmake gettext pkgconfig tar:xz
-USE_GNOME= intltool
INSTALLS_ICONS= yes
-PROJECTHOST= fcitx
-
.include <bsd.port.mk>
diff --git a/chinese/fcitx-sunpinyin/distinfo b/chinese/fcitx-sunpinyin/distinfo
index b394e269b829..01fb3bee56ab 100644
--- a/chinese/fcitx-sunpinyin/distinfo
+++ b/chinese/fcitx-sunpinyin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx-sunpinyin-0.3.9.tar.xz) = 7bf5f70c3653b5aebbbde96fd731ecbbce74cfd4d211620a5156b2700a63e47e
-SIZE (fcitx/fcitx-sunpinyin-0.3.9.tar.xz) = 41268
+SHA256 (fcitx/fcitx-sunpinyin-0.4.1.tar.xz) = 7bd0c61a3c821719760bff72c3c114b28e277b87f54dcb61d83e3548b1eb6777
+SIZE (fcitx/fcitx-sunpinyin-0.4.1.tar.xz) = 41076
diff --git a/chinese/fcitx-sunpinyin/pkg-descr b/chinese/fcitx-sunpinyin/pkg-descr
index 9c3e53e49091..ffa06da488f3 100644
--- a/chinese/fcitx-sunpinyin/pkg-descr
+++ b/chinese/fcitx-sunpinyin/pkg-descr
@@ -1,4 +1,4 @@
fcitx-sunpinyin provides SunPinyin, a statistical language model based
input method engine, as a back-end to the Fcitx IM framework.
-WWW: http://code.google.com/p/fcitx/
+WWW: https://fcitx-im.org/wiki/Fcitx
diff --git a/chinese/fcitx-sunpinyin/pkg-plist b/chinese/fcitx-sunpinyin/pkg-plist
index e15936380cc3..122c8d384eed 100644
--- a/chinese/fcitx-sunpinyin/pkg-plist
+++ b/chinese/fcitx-sunpinyin/pkg-plist
@@ -12,5 +12,7 @@ share/icons/hicolor/22x22/apps/fcitx-sunpinyin.png
share/icons/hicolor/24x24/apps/fcitx-sunpinyin.png
share/icons/hicolor/32x32/apps/fcitx-sunpinyin.png
share/icons/hicolor/48x48/apps/fcitx-sunpinyin.png
+share/locale/de/LC_MESSAGES/fcitx-sunpinyin.mo
+share/locale/ja/LC_MESSAGES/fcitx-sunpinyin.mo
share/locale/zh_CN/LC_MESSAGES/fcitx-sunpinyin.mo
share/locale/zh_TW/LC_MESSAGES/fcitx-sunpinyin.mo
diff --git a/chinese/fcitx-table-extra/Makefile b/chinese/fcitx-table-extra/Makefile
index dde2da73f559..3b365410c26b 100644
--- a/chinese/fcitx-table-extra/Makefile
+++ b/chinese/fcitx-table-extra/Makefile
@@ -2,21 +2,20 @@
# $FreeBSD$
PORTNAME= fcitx-table-extra
-PORTVERSION= 0.3.3
+PORTVERSION= 0.3.7
CATEGORIES= chinese
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= http://download.fcitx-im.org/${PORTNAME}/
DIST_SUBDIR= fcitx
MAINTAINER= lichray@gmail.com
COMMENT= Table-based input methods for Fcitx
+LICENSE= GPLv2
+
LIB_DEPENDS= libfcitx-config.so:${PORTSDIR}/chinese/fcitx
USES= tar:xz cmake gettext
-USE_GNOME= intltool
INSTALLS_ICONS= yes
STRIP=
-PROJECTHOST= fcitx
-
.include <bsd.port.mk>
diff --git a/chinese/fcitx-table-extra/distinfo b/chinese/fcitx-table-extra/distinfo
index 3d5340c539d4..c1c117efd432 100644
--- a/chinese/fcitx-table-extra/distinfo
+++ b/chinese/fcitx-table-extra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx-table-extra-0.3.3.tar.xz) = ae2bbf9146dfdeafb6220c9a738ddc1f0437da2c5f2da0d578ba4970bc74767d
-SIZE (fcitx/fcitx-table-extra-0.3.3.tar.xz) = 3350592
+SHA256 (fcitx/fcitx-table-extra-0.3.7.tar.xz) = 8933570ecd803a4f4fe932c983004e669d81b2f08c3bcaa532151545a42e659e
+SIZE (fcitx/fcitx-table-extra-0.3.7.tar.xz) = 3704164
diff --git a/chinese/fcitx-table-extra/files/patch-tables__CMakeLists.txt b/chinese/fcitx-table-extra/files/patch-tables__CMakeLists.txt
new file mode 100644
index 000000000000..134fd3a79ffd
--- /dev/null
+++ b/chinese/fcitx-table-extra/files/patch-tables__CMakeLists.txt
@@ -0,0 +1,10 @@
+--- ./tables/CMakeLists.txt.orig 2013-09-02 08:32:18.000000000 +0900
++++ ./tables/CMakeLists.txt 2014-03-20 12:40:01.000000000 +0900
+@@ -22,5 +22,5 @@
+ endforeach()
+ add_custom_target(table_data ALL DEPENDS ${MB_FILE})
+
+-install(FILES ${CONF_FILE} DESTINATION ${FCITX4_PREFIX}/share/fcitx/table)
+-install(FILES ${MB_FILE} DESTINATION ${FCITX4_PREFIX}/share/fcitx/table)
++install(FILES ${CONF_FILE} DESTINATION share/fcitx/table)
++install(FILES ${MB_FILE} DESTINATION share/fcitx/table)
diff --git a/chinese/fcitx-table-extra/pkg-descr b/chinese/fcitx-table-extra/pkg-descr
index 69e4698ef194..adf6756594d8 100644
--- a/chinese/fcitx-table-extra/pkg-descr
+++ b/chinese/fcitx-table-extra/pkg-descr
@@ -1,4 +1,4 @@
fcitx-table-extra provides Boshiamy, Zhengma, Cangjie, and Quick input
methods driven by the fcitx-table IM engine.
-WWW: http://code.google.com/p/fcitx/
+WWW: https://fcitx-im.org/wiki/Fcitx
diff --git a/chinese/fcitx-table-extra/pkg-plist b/chinese/fcitx-table-extra/pkg-plist
index 4fa8a51e9963..f1b5a5f19e9f 100644
--- a/chinese/fcitx-table-extra/pkg-plist
+++ b/chinese/fcitx-table-extra/pkg-plist
@@ -10,6 +10,7 @@ share/fcitx/imicon/quick3.png
share/fcitx/imicon/quick5.png
share/fcitx/imicon/scj6.png
share/fcitx/imicon/stroke5.png
+share/fcitx/imicon/t9.png
share/fcitx/imicon/wu.png
share/fcitx/imicon/zhengma.png
share/fcitx/table/array30-big.conf
@@ -42,6 +43,8 @@ share/fcitx/table/scj6.conf
share/fcitx/table/scj6.mb
share/fcitx/table/stroke5.conf
share/fcitx/table/stroke5.mb
+share/fcitx/table/t9.conf
+share/fcitx/table/t9.mb
share/fcitx/table/wu.conf
share/fcitx/table/wu.mb
share/fcitx/table/wubi-large.conf
@@ -50,19 +53,22 @@ 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-cantonese.png
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
share/icons/hicolor/48x48/apps/fcitx-quick3.png
share/icons/hicolor/48x48/apps/fcitx-quick5.png
share/icons/hicolor/48x48/apps/fcitx-scj6.png
+share/icons/hicolor/48x48/apps/fcitx-stroke5.png
share/icons/hicolor/48x48/apps/fcitx-wu.png
-share/icons/hicolor/48x48/apps/fcitx-zhengma.png
share/icons/hicolor/64x64/apps/fcitx-array30-big.png
share/icons/hicolor/64x64/apps/fcitx-array30.png
share/icons/hicolor/64x64/apps/fcitx-boshiamy.png
-share/icons/hicolor/64x64/apps/fcitx-cantonese.png
share/icons/hicolor/64x64/apps/fcitx-easy-big.png
-share/icons/hicolor/64x64/apps/fcitx-stroke5.png
+share/icons/hicolor/64x64/apps/fcitx-t9.png
+share/icons/hicolor/64x64/apps/fcitx-zhengma.png
+share/locale/de/LC_MESSAGES/fcitx-table-extra.mo
+share/locale/ja/LC_MESSAGES/fcitx-table-extra.mo
share/locale/zh_CN/LC_MESSAGES/fcitx-table-extra.mo
share/locale/zh_TW/LC_MESSAGES/fcitx-table-extra.mo
diff --git a/chinese/fcitx-ui-light/Makefile b/chinese/fcitx-ui-light/Makefile
index 084c6a63c122..d2ef93f663d5 100644
--- a/chinese/fcitx-ui-light/Makefile
+++ b/chinese/fcitx-ui-light/Makefile
@@ -5,12 +5,14 @@ PORTNAME= fcitx-ui-light
PORTVERSION= 0.1.3
PORTREVISION= 1
CATEGORIES= chinese
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= http://download.fcitx-im.org/${PORTNAME}/
DIST_SUBDIR= fcitx
MAINTAINER= lichray@gmail.com
COMMENT= Alternative light weight UI for Fcitx
+LICENSE= GPLv2
+
LIB_DEPENDS= libfcitx-config.so:${PORTSDIR}/chinese/fcitx \
libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
@@ -18,6 +20,4 @@ USE_XORG= x11 xft xpm
USES= tar:bzip2 cmake gettext pkgconfig
USE_GNOME= intltool
-PROJECTHOST= fcitx
-
.include <bsd.port.mk>
diff --git a/chinese/fcitx-ui-light/pkg-descr b/chinese/fcitx-ui-light/pkg-descr
index 82df135c5bbd..6315a01ca9a0 100644
--- a/chinese/fcitx-ui-light/pkg-descr
+++ b/chinese/fcitx-ui-light/pkg-descr
@@ -1,4 +1,4 @@
fcitx-ui-light is a very light weight UI for Fcitx, only using Xpm
and Xft, like go back to 3.6.x times.
-WWW: http://code.google.com/p/fcitx/
+WWW: https://fcitx-im.org/wiki/Fcitx
diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
index b43d71369895..f2afe6648176 100644
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -2,12 +2,16 @@
# $FreeBSD$
PORTNAME= fcitx
-PORTVERSION= 4.2.6.1
-PORTREVISION= 5
+PORTVERSION= 4.2.8.5
CATEGORIES= chinese x11
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- pinyin.tar.gz table.tar.gz en_dict-${_DICT_VER}.tar.gz
+MASTER_SITES= http://download.fcitx-im.org/fcitx/:fcitx \
+ http://download.fcitx-im.org/data/:data
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:fcitx \
+ en_dict-${_DICT_VER}.tar.gz:data \
+ pinyin.tar.gz:data \
+ py_stroke-${_PYSTROKE_VER}.tar.gz:data \
+ py_table-${_PYTABLE_VER}.tar.gz:data \
+ table.tar.gz:data
DIST_SUBDIR= ${PORTNAME}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
@@ -17,8 +21,7 @@ COMMENT= Flexible Input Method Framework
LICENSE= GPLv2
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
- libdbus-1.so:${PORTSDIR}/devel/dbus \
+LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \
libicuuc.so:${PORTSDIR}/devel/icu
RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils
@@ -30,12 +33,13 @@ CONFLICTS= zh-scim-fcitx-3.*
USE_GNOME= pango intltool libxml2 introspection
USE_XORG= x11 xext xkbfile
USE_LDCONFIG= yes
-USES= tar:xz cmake desktop-file-utils gettext iconv pathfix pkgconfig shared-mime-info
+USES= tar:xz cmake desktop-file-utils execinfo gettext iconv \
+ pathfix pkgconfig shared-mime-info
INSTALLS_ICONS= yes
LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB}
OPTIONS_DEFINE= GTK2 GTK3 QT4 OPENCC TPUNC DOCS
-OPTIONS_DEFAULT=GTK2
+OPTIONS_DEFAULT=GTK2 QT4
GTK2_DESC= Enable Gtk2 IM module
GTK3_DESC= Enable Gtk3 IM module
@@ -45,7 +49,14 @@ TPUNC_DESC= Use traditional quotation marks
.include <bsd.port.options.mk>
-CMAKE_ARGS+= -DENABLE_XDGAUTOSTART=OFF -DFORCE_ENCHANT=ON
+CMAKE_ARGS+= -DENABLE_XDGAUTOSTART=OFF -DFORCE_ENCHANT=ON \
+ -DDATADIR=${DATADIR} \
+ -DDOCSDIR=${DOCSDIR} \
+ -DGOBJECT_INTROSPECTION_GIRDIR=${PREFIX}/share/gir-1.0 \
+ -DGOBJECT_INTROSPECTION_TYPELIBDIR=${PREFIX}/lib/girepository-1.0 \
+ -DMANPREFIX=${MANPREFIX} \
+ -DPREFIX=${PREFIX} \
+ -DQT_PLUGINS_DIR=${PREFIX}/lib/qt4/plugins
.if ${PORT_OPTIONS:MGTK2}
USE_GNOME+= gtk20
@@ -68,10 +79,11 @@ SUB_LIST+= GTK3_IM=xim
.endif
.if ${PORT_OPTIONS:MQT4}
-USE_QT4= qmake_build moc_build rcc_build uic_build dbus gui inputmethods
-CMAKE_ARGS+= -DENABLE_QT_IM_MODULE=ON
+USE_QT4+= qmake_build moc_build rcc_build uic_build dbus gui inputmethods
+USE_LDCONFIG+= ${PREFIX}/lib/fcitx/qt
PLIST_SUB+= QT4=""
.else
+CMAKE_ARGS+= -DENABLE_QT=OFF -DENABLE_QT_IM_MODULE=OFF -DENABLE_QT_GUI=OFF
PLIST_SUB+= QT4="@comment "
.endif
@@ -89,14 +101,18 @@ EXTRA_PATCHES+= ${FILESDIR}/tpunc-data_punc.mb.zh_CN
CMAKE_ARGS+= -DENABLE_DEBUG=ON
.endif
-DOCS_EXTRA_PATCHES= ${FILESDIR}/nodocs-doc_CMakeLists.txt
+DOCS_EXTRA_PATCHES_OFF= ${FILESDIR}/nodocs-doc_CMakeLists.txt
-_DICT_VER= 20120815
+_DICT_VER= 20121020
+_PYSTROKE_VER= 20121124
+_PYTABLE_VER= 20121124
post-patch:
- @${CP} ${_DISTDIR}/pinyin.tar.gz ${WRKSRC}/data
- @${CP} ${_DISTDIR}/table.tar.gz ${WRKSRC}/data/table
- @${CP} ${_DISTDIR}/en_dict-${_DICT_VER}.tar.gz ${WRKSRC}/data
+ @${CP} ${_DISTDIR}/en_dict-${_DICT_VER}.tar.gz ${WRKSRC}/src/module/spell/dict/.
+ @${CP} ${_DISTDIR}/pinyin.tar.gz ${WRKSRC}/src/im/pinyin/data/.
+ @${CP} ${_DISTDIR}/py_stroke-${_PYSTROKE_VER}.tar.gz ${WRKSRC}/src/module/pinyin-enhance/data/.
+ @${CP} ${_DISTDIR}/py_table-${_PYTABLE_VER}.tar.gz ${WRKSRC}/src/module/pinyin-enhance/data/.
+ @${CP} ${_DISTDIR}/table.tar.gz ${WRKSRC}/src/im/table/data/.
.if ${OSVERSION} < 800067
# getline() is GNU extension which FreeBSD only recently adopted
EXTRA_PATCHES+= ${FILESDIR}/getline-src_lib_fcitx-utils_utils.c \
diff --git a/chinese/fcitx/distinfo b/chinese/fcitx/distinfo
index 0c76965c77f3..c488e16db0f3 100644
--- a/chinese/fcitx/distinfo
+++ b/chinese/fcitx/distinfo
@@ -1,8 +1,12 @@
-SHA256 (fcitx/fcitx-4.2.6.1.tar.xz) = b3b1fa548163701ca6009fa71362668eb973bffa8067f039d7cbe643e4769ab1
-SIZE (fcitx/fcitx-4.2.6.1.tar.xz) = 1442744
+SHA256 (fcitx/fcitx-4.2.8.5.tar.xz) = 6a7dda9177ec2443049f95f5db65aff34e906cb24030a973aaf9d0485833bc78
+SIZE (fcitx/fcitx-4.2.8.5.tar.xz) = 1662736
+SHA256 (fcitx/en_dict-20121020.tar.gz) = c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb
+SIZE (fcitx/en_dict-20121020.tar.gz) = 630491
SHA256 (fcitx/pinyin.tar.gz) = 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1
SIZE (fcitx/pinyin.tar.gz) = 1608886
+SHA256 (fcitx/py_stroke-20121124.tar.gz) = 8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248
+SIZE (fcitx/py_stroke-20121124.tar.gz) = 445601
+SHA256 (fcitx/py_table-20121124.tar.gz) = 42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04
+SIZE (fcitx/py_table-20121124.tar.gz) = 186822
SHA256 (fcitx/table.tar.gz) = 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7
SIZE (fcitx/table.tar.gz) = 4144686
-SHA256 (fcitx/en_dict-20120815.tar.gz) = a73c989eae586a681a0e64bd7e8a43d45fc6dfbfd45b98e4b83f715a87639945
-SIZE (fcitx/en_dict-20120815.tar.gz) = 679983
diff --git a/chinese/fcitx/files/patch-CMakeLists.txt b/chinese/fcitx/files/patch-CMakeLists.txt
index e1dc7fdab463..5d9025643c53 100644
--- a/chinese/fcitx/files/patch-CMakeLists.txt
+++ b/chinese/fcitx/files/patch-CMakeLists.txt
@@ -1,11 +1,44 @@
---- CMakeLists.txt~ 2011-10-02 05:43:11.000000000 -0500
-+++ CMakeLists.txt 2011-11-09 07:51:31.801020675 -0600
-@@ -93,7 +93,7 @@ if (ENABLE_OPENCC)
- endif (ENABLE_OPENCC)
+--- ./CMakeLists.txt.orig 2013-09-28 17:33:14.000000000 +0900
++++ ./CMakeLists.txt 2014-03-19 13:45:08.000000000 +0900
+@@ -207,16 +207,21 @@
+ set(SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc" CACHE PATH "sys config directory [default=PREFIX/etc/]")
+ endif()
- if(ENABLE_DEBUG)
-- set(_DEBUG)
-+ set(_DEBUG ON)
- endif(ENABLE_DEBUG)
+-set(includedir "${CMAKE_INSTALL_PREFIX}/include")
+-set(libdir ${LIB_INSTALL_DIR})
+-set(pkgconfdir ${LIBDATA_INSTALL_DIR}/pkgconfig)
+-set(mandir ${MAN_INSTALL_DIR})
++set(includedir "${PREFIX}/include")
++set(libdir ${PREFIX}/lib)
++set(pkgconfdir ${PREFIX}/libdata/pkgconfig)
++set(mandir ${MANPREFIX}/man)
+ set(addondir ${libdir}/${package} )
+-set(pkgdatadir ${prefix}/share/${package})
++set(addondestdir "\${PREFIX}/lib/${package}" )
++set(pkgdatadir ${DATADIR})
++set(pkgdatadestdir "\${DATADIR}")
+ set(configdescdir ${pkgdatadir}/configdesc)
++set(configdescdestdir ${pkgdatadestdir}/configdesc)
+ set(addonconfigdir ${pkgdatadir}/addon)
++set(addonconfigdestdir ${pkgdatadestdir}/addon)
+ set(imconfigdir ${pkgdatadir}/inputmethod)
+-set(localedir ${CMAKE_INSTALL_PREFIX}/share/locale)
++set(imconfigdestdir ${pkgdatadestdir}/inputmethod)
++set(localedir ${PREFIX}/share/locale)
- set(package fcitx)
+ list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemPlatformLibDir)
+ list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemCxxLibDir)
+@@ -229,9 +234,13 @@
+
+ # For FcitxMacro
+ set(FCITX4_ADDON_INSTALL_DIR ${addondir})
++set(FCITX4_ADDON_INSTALL_DESTDIR ${addondestdir})
+ set(FCITX4_CONFIGDESC_INSTALL_DIR ${configdescdir})
++set(FCITX4_CONFIGDESC_INSTALL_DESTDIR ${configdescdir})
+ set(FCITX4_ADDON_CONFIG_INSTALL_DIR ${addonconfigdir})
++set(FCITX4_ADDON_CONFIG_INSTALL_DESTDIR ${addonconfigdir})
+ set(FCITX4_INPUTMETHOD_CONFIG_INSTALL_DIR ${imconfigdir})
++set(FCITX4_INPUTMETHOD_CONFIG_INSTALL_DESTDIR ${imconfigdir})
+ set(FCITX4_PACKAGE_NAME ${package})
+
+ function(_RESOLVE_LIBRARY_PATH _FILE_NAME _LIBRARY_PATH)
diff --git a/chinese/fcitx/files/patch-cmake__FcitxConfig.cmake b/chinese/fcitx/files/patch-cmake__FcitxConfig.cmake
new file mode 100644
index 000000000000..a5258064fda7
--- /dev/null
+++ b/chinese/fcitx/files/patch-cmake__FcitxConfig.cmake
@@ -0,0 +1,16 @@
+--- ./cmake/FcitxConfig.cmake.orig 2013-09-28 17:33:14.000000000 +0900
++++ ./cmake/FcitxConfig.cmake 2014-03-19 13:45:08.000000000 +0900
+@@ -76,9 +76,13 @@
+ IF(FCITX4_FCITXCONFIG_EXECUTABLE)
+ message(STATUS "fcitx4-config found ${FCITX4_FCITXCONFIG_EXECUTABLE}")
+ EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --addondir OUTPUT_VARIABLE FCITX4_ADDON_INSTALL_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
++ EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --addondestdir OUTPUT_VARIABLE FCITX4_ADDON_INSTALL_DESTDIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+ EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --imconfigdir OUTPUT_VARIABLE FCITX4_INPUTMETHOD_CONFIG_INSTALL_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
++ EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --imconfigdestdir OUTPUT_VARIABLE FCITX4_INPUTMETHOD_CONFIG_INSTALL_DESTDIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+ EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --configdescdir OUTPUT_VARIABLE FCITX4_CONFIGDESC_INSTALL_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
++ EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --configdescdestdir OUTPUT_VARIABLE FCITX4_CONFIGDESC_INSTALL_DESTDIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+ EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --addonconfigdir OUTPUT_VARIABLE FCITX4_ADDON_CONFIG_INSTALL_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
++ EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --addonconfigdestdir OUTPUT_VARIABLE FCITX4_ADDON_CONFIG_INSTALL_DESTDIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+ EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --package OUTPUT_VARIABLE FCITX4_PACKAGE_NAME ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+ EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --version OUTPUT_VARIABLE FCITX4_VERSION ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+ EXECUTE_PROCESS(COMMAND "${FCITX4_FCITXCONFIG_EXECUTABLE}" --prefix OUTPUT_VARIABLE FCITX4_PREFIX ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/chinese/fcitx/files/patch-cmake__FcitxMacro.cmake b/chinese/fcitx/files/patch-cmake__FcitxMacro.cmake
new file mode 100644
index 000000000000..e71041bf7840
--- /dev/null
+++ b/chinese/fcitx/files/patch-cmake__FcitxMacro.cmake
@@ -0,0 +1,51 @@
+--- ./cmake/FcitxMacro.cmake.orig 2013-09-28 17:33:14.000000000 +0900
++++ ./cmake/FcitxMacro.cmake 2014-03-19 13:46:27.000000000 +0900
+@@ -366,10 +366,10 @@
+ add_custom_target("${target_name}" ALL)
+
+ __fcitx_addon_config_file("${target_name}" "${FCITX_ADDON_CONF_SRC}"
+- "${FCITX4_ADDON_CONFIG_INSTALL_DIR}")
++ "${FCITX4_ADDON_CONFIG_INSTALL_DESTDIR}")
+ foreach(im_config ${FCITX_ADDON_IM_CONFIG})
+ __fcitx_addon_config_file("${target_name}" "${im_config}"
+- "${FCITX4_INPUTMETHOD_CONFIG_INSTALL_DIR}")
++ "${FCITX4_INPUTMETHOD_CONFIG_INSTALL_DESTDIR}")
+ endforeach()
+ __fcitx_add_addon_lib("${FCITX_ADDON_LIB_NAME}" ${FCITX_ADDON_SOURCES})
+ if(FCITX_ADDON_LINK_LIBS)
+@@ -393,7 +393,7 @@
+ set_target_properties("${lib_name}" PROPERTIES PREFIX ""
+ COMPILE_FLAGS "-fvisibility=hidden")
+ add_dependencies("${lib_name}" fcitx-scan-addons.target)
+- install(TARGETS "${lib_name}" DESTINATION "${FCITX4_ADDON_INSTALL_DIR}")
++ install(TARGETS "${lib_name}" DESTINATION "${FCITX4_ADDON_INSTALL_DESTDIR}")
+ endfunction()
+
+ function(__fcitx_install_addon_desc target_name)
+@@ -402,7 +402,7 @@
+ add_custom_target("${desc_target}" DEPENDS ${descs})
+ add_dependencies("${target_name}" "${desc_target}")
+ install(FILES ${descs}
+- DESTINATION "${FCITX4_CONFIGDESC_INSTALL_DIR}")
++ DESTINATION "${FCITX4_CONFIGDESC_INSTALL_DESTDIR}")
+ endfunction()
+
+ # Add additional config-desc files, the file will be added to extracte
+@@ -893,7 +893,7 @@
+ __FCITX_CONF_FILE_GET_UNIQUE_TARGET_NAME(fcitx_addon_conf targetname)
+ add_custom_target(${targetname} ALL DEPENDS ${conffilename})
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${conffilename}"
+- DESTINATION "${FCITX4_ADDON_CONFIG_INSTALL_DIR}")
++ DESTINATION "${FCITX4_ADDON_CONFIG_INSTALL_DESTDIR}")
+ ENDMACRO(FCITX_ADD_ADDON_CONF_FILE conffilename)
+
+ MACRO(FCITX_ADD_INPUTMETHOD_CONF_FILE conffilename)
+@@ -902,7 +902,7 @@
+ __FCITX_CONF_FILE_GET_UNIQUE_TARGET_NAME(fcitx_inputmethod_conf targetname)
+ add_custom_target(${targetname} ALL DEPENDS ${conffilename})
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${conffilename}"
+- DESTINATION "${FCITX4_INPUTMETHOD_CONFIG_INSTALL_DIR}")
++ DESTINATION "${FCITX4_INPUTMETHOD_CONFIG_INSTALL_DESTDIR}")
+ ENDMACRO()
+
+ MACRO(FCITX_ADD_CONFIGDESC_FILE)
diff --git a/chinese/fcitx/files/patch-cmake_modules_FindLibkvm.cmake b/chinese/fcitx/files/patch-cmake_modules_FindLibkvm.cmake
deleted file mode 100644
index f79e91036651..000000000000
--- a/chinese/fcitx/files/patch-cmake_modules_FindLibkvm.cmake
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/cmake/FindLibkvm.cmake b/cmake/FindLibkvm.cmake
-index a66b85d..4453fd4 100644
---- cmake/FindLibkvm.cmake
-+++ cmake/FindLibkvm.cmake
-@@ -5,23 +5,11 @@
- # LIBKVM_INCLUDE_DIR - Libkvm include directory
- # LIBKVM_LIBRARIES - Libraries needed to use Libkvm
- #
--
--if(LIBKVM_INCLUDE_DIR AND LIBKVM_FOUND)
-- set(Libkvm_FIND_QUIETLY TRUE)
--endif(LIBKVM_INCLUDE_DIR AND LIBKVM_FOUND)
--
-+
- find_path(LIBKVM_INCLUDE_DIR kvm.h)
--
--set(LIBKVM_FOUND FALSE)
--
--if(LIBKVM_INCLUDE_DIR)
-- find_library(LIBKVM_LIBRARIES NAMES kvm)
-- if(LIBKVM_LIBRARIES)
-- set(LIBKVM_FOUND TRUE)
-- endif(LIBKVM_LIBRARIES)
--endif(LIBKVM_INCLUDE_DIR)
--
-+find_library(LIBKVM_LIBRARIES NAMES kvm)
-+
- include(FindPackageHandleStandardArgs)
--find_package_handle_standard_args(Libkvm DEFAULT_MSG LIBKVM_INCLUDE_DIR LIBKVM_FOUND)
--
--mark_as_advanced(LIBKVM_INCLUDE_DIR LIBKVM_LIBRARIES LIBKVM_LIBC_HAS_KVM_OPEN LIBKVM_FOUND)
-+find_package_handle_standard_args(Libkvm DEFAULT_MSG LIBKVM_INCLUDE_DIR LIBKVM_LIBRARIES)
-+
-+mark_as_advanced(LIBKVM_INCLUDE_DIR LIBKVM_LIBRARIES)
diff --git a/chinese/fcitx/files/patch-data__script__fcitx4-config.in b/chinese/fcitx/files/patch-data__script__fcitx4-config.in
new file mode 100644
index 000000000000..3da686b3351f
--- /dev/null
+++ b/chinese/fcitx/files/patch-data__script__fcitx4-config.in
@@ -0,0 +1,78 @@
+--- ./data/script/fcitx4-config.in.orig 2013-09-28 17:33:14.000000000 +0900
++++ ./data/script/fcitx4-config.in 2014-03-19 13:45:08.000000000 +0900
+@@ -1,14 +1,26 @@
+ #! /bin/sh
+
++## cmake does not handle \$\{.PREFIX\:\-\@prefix\@\} syntax (even in comments).
++if [ -z "$PREFIX" ]; then
++ PREFIX=@prefix@
++fi
++if [ -z "$DATADIR" ]; then
++ DATADIR=$PREFIX/share/fcitx
++fi
++
+ package=@package@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ includedir=@includedir@
+ libdir=@libdir@
+ addondir=@addondir@
++addondestdir=@addondestdir@
+ imconfigdir=@imconfigdir@
++imconfigdestdir=@imconfigdestdir@
+ configdescdir=@configdescdir@
++configdescdestdir=@configdescdestdir@
+ addonconfigdir=@addonconfigdir@
++addonconfigdestdir=@addonconfigdestdir@
+
+ usage()
+ {
+@@ -23,9 +35,13 @@
+ --libdir Fcitx Library Prefix
+ --includedir Fcitx Include Prefix
+ --addondir Fcitx Addon Library Dir
++ --addondestdir Fcitx Addon Library DestDir
+ --configdescdir Fcitx Configure Description File Dir
++ --configdescdestdir Fcitx Configure Description File DestDir
+ --addonconfigdir Fcitx Addon Config File Dir
++ --addonconfigdestdir Fcitx Addon Config File DestDir
+ --imconfigdir Fcitx Input Method Config File Dir
++ --imconfigdestdir Fcitx Input Method Config File DestDir
+ --help display this help and exit
+ --version output version information
+ EOF
+@@ -72,18 +88,34 @@
+ echo $addondir
+ ;;
+
++ --addondestdir)
++ echo $addondestdir
++ ;;
++
+ --configdescdir)
+ echo $configdescdir
+ ;;
+
++ --configdescdestdir)
++ echo $configdescdestdir
++ ;;
++
+ --addonconfigdir)
+ echo $addonconfigdir
+ ;;
+
++ --addonconfigdestdir)
++ echo $addonconfigdestdir
++ ;;
++
+ --imconfigdir)
+ echo $imconfigdir
+ ;;
+
++ --imconfigdestdir)
++ echo $imconfigdestdir
++ ;;
++
+ --version)
+ echo @version@
+ exit 0
diff --git a/chinese/fcitx/files/patch-doc_man_CMakeLists.txt b/chinese/fcitx/files/patch-doc_man_CMakeLists.txt
deleted file mode 100644
index bdb4c8cd8b09..000000000000
--- a/chinese/fcitx/files/patch-doc_man_CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- doc/man/CMakeLists.txt~ 2011-10-02 05:43:11.000000000 -0500
-+++ doc/man/CMakeLists.txt 2011-11-09 05:30:55.468797225 -0600
-@@ -2,4 +2,4 @@ set(FCITX_MANS
- fcitx.1 createPYMB.1 readPYBase.1 readPYMB.1 mb2org.1 scel2org.1 mb2txt.1 txt2mb.1 fcitx-remote.1
- )
-
--install(FILES ${FCITX_MANS} DESTINATION share/man/man1)
-\ No newline at end of file
-+install(FILES ${FCITX_MANS} DESTINATION man/man1)
diff --git a/chinese/fcitx/files/patch-src_lib_fcitx-config_CMakeLists.txt b/chinese/fcitx/files/patch-src_lib_fcitx-config_CMakeLists.txt
deleted file mode 100644
index e944723c786d..000000000000
--- a/chinese/fcitx/files/patch-src_lib_fcitx-config_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/fcitx-config/CMakeLists.txt.orig 2011-10-02 05:43:11.000000000 -0500
-+++ src/lib/fcitx-config/CMakeLists.txt 2011-11-13 16:02:26.681232301 -0600
-@@ -23,7 +23,7 @@ set_target_properties(fcitx-config
- configure_file(fcitx-config.pc.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx-config.pc)
-
- install(TARGETS fcitx-config DESTINATION ${libdir})
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-config.pc DESTINATION "${libdir}/pkgconfig")
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-config.pc DESTINATION "libdata/pkgconfig")
- install(FILES ${FCITX_CONFIG_HEADERS} DESTINATION "${includedir}/fcitx-config")
-
- if (ENABLE_STATIC)
diff --git a/chinese/fcitx/files/patch-src_lib_fcitx-gclient_CMakeLists.txt b/chinese/fcitx/files/patch-src_lib_fcitx-gclient_CMakeLists.txt
deleted file mode 100644
index c76228b80ae3..000000000000
--- a/chinese/fcitx/files/patch-src_lib_fcitx-gclient_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/lib/fcitx-gclient/CMakeLists.txt~ 2012-07-17 15:21:04.000000000 -0500
-+++ src/lib/fcitx-gclient/CMakeLists.txt 2012-07-18 00:46:13.209418264 -0500
-@@ -46,7 +46,7 @@ target_link_libraries(fcitx-gclient ${GI
- configure_file(fcitx-gclient.pc.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx-gclient.pc)
-
- install(TARGETS fcitx-gclient LIBRARY DESTINATION "${libdir}")
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-gclient.pc DESTINATION "${libdir}/pkgconfig")
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-gclient.pc DESTINATION "libdata/pkgconfig")
- install(FILES ${FCITX_GCLIENT_HEADERS} DESTINATION "${includedir}/fcitx-gclient")
-
- if (ENABLE_GIR)
-@@ -86,4 +86,4 @@ install(TARGETS fcitx-gclient-static
- )
- endif (ENABLE_STATIC)
-
--add_subdirectory(test)
-\ No newline at end of file
-+add_subdirectory(test)
diff --git a/chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxclient.c b/chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxclient.c
deleted file mode 100644
index 58826bbda24a..000000000000
--- a/chinese/fcitx/files/patch-src_lib_fcitx-gclient_fcitxclient.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/lib/fcitx-gclient/fcitxclient.c.orig 2012-09-19 14:25:18.000000000 +0800
-+++ src/lib/fcitx-gclient/fcitxclient.c 2012-09-19 14:29:55.000000000 +0800
-@@ -26,10 +26,14 @@
- #include "fcitxclient.h"
- #include "marshall.h"
-
-+#ifdef _DEBUG
- #define fcitx_gclient_debug(...) g_log ("fcitx-client", \
- G_LOG_LEVEL_DEBUG, \
- __VA_ARGS__)
-
-+#else
-+#define fcitx_gclient_debug(...)
-+#endif
- typedef struct _ProcessKeyStruct ProcessKeyStruct;
-
- struct _ProcessKeyStruct {
diff --git a/chinese/fcitx/files/patch-src_lib_fcitx-utils_CMakeLists.txt b/chinese/fcitx/files/patch-src_lib_fcitx-utils_CMakeLists.txt
deleted file mode 100644
index c2855c686453..000000000000
--- a/chinese/fcitx/files/patch-src_lib_fcitx-utils_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/fcitx-utils/CMakeLists.txt.orig 2011-10-02 05:43:11.000000000 -0500
-+++ src/lib/fcitx-utils/CMakeLists.txt 2011-11-13 16:02:51.201489333 -0600
-@@ -34,7 +34,7 @@ endif (LIBKVM_FOUND)
- configure_file(fcitx-utils.pc.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx-utils.pc)
-
- install(TARGETS fcitx-utils LIBRARY DESTINATION "${libdir}")
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-utils.pc DESTINATION "${libdir}/pkgconfig")
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx-utils.pc DESTINATION "libdata/pkgconfig")
- install(FILES ${FCITX_UTILS_HEADERS} DESTINATION "${includedir}/fcitx-utils")
-
- if (ENABLE_STATIC)
diff --git a/chinese/fcitx/files/patch-src_lib_fcitx_CMakeLists.txt b/chinese/fcitx/files/patch-src_lib_fcitx_CMakeLists.txt
deleted file mode 100644
index 24826ca7f76c..000000000000
--- a/chinese/fcitx/files/patch-src_lib_fcitx_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/fcitx/CMakeLists.txt.orig 2011-10-02 05:43:11.000000000 -0500
-+++ src/lib/fcitx/CMakeLists.txt 2011-11-13 16:01:32.246665458 -0600
-@@ -41,7 +41,7 @@ configure_file(fcitx.pc.in ${CMAKE_CURRE
-
- target_link_libraries(fcitx-core fcitx-config fcitx-utils ${DL_LIBRARIES} ${PTHREAD_LIBRARIES})
- install(TARGETS fcitx-core LIBRARY DESTINATION "${libdir}")
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx.pc DESTINATION "${libdir}/pkgconfig")
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fcitx.pc DESTINATION "libdata/pkgconfig")
- install(FILES ${FCITX_HEADERS} DESTINATION "${includedir}/fcitx")
-
- if (ENABLE_STATIC)
diff --git a/chinese/fcitx/files/patch-tools__cli__CMakeLists.txt b/chinese/fcitx/files/patch-tools__cli__CMakeLists.txt
new file mode 100644
index 000000000000..eaad7bbd2805
--- /dev/null
+++ b/chinese/fcitx/files/patch-tools__cli__CMakeLists.txt
@@ -0,0 +1,10 @@
+--- ./tools/cli/CMakeLists.txt.orig 2013-09-28 17:33:14.000000000 +0900
++++ ./tools/cli/CMakeLists.txt 2014-03-19 13:45:08.000000000 +0900
+@@ -1,3 +1,7 @@
++include_directories (
++ ${LIBICONV_INCLUDE_DIR}
++ )
++
+ set(createPYMB_SOURCES
+ createPYMB.c
+ ${PROJECT_SOURCE_DIR}/src/im/pinyin/pyParser.c
diff --git a/chinese/fcitx/files/patch-tools__gui__quickphrase-editor__CMakeLists.txt b/chinese/fcitx/files/patch-tools__gui__quickphrase-editor__CMakeLists.txt
new file mode 100644
index 000000000000..ca57467e012e
--- /dev/null
+++ b/chinese/fcitx/files/patch-tools__gui__quickphrase-editor__CMakeLists.txt
@@ -0,0 +1,10 @@
+--- ./tools/gui/quickphrase-editor/CMakeLists.txt.orig 2013-09-28 17:33:14.000000000 +0900
++++ ./tools/gui/quickphrase-editor/CMakeLists.txt 2014-03-19 13:45:08.000000000 +0900
+@@ -17,6 +17,7 @@
+ ${QT_QTCORE_INCLUDE_DIR}
+ ${QT_QTGUI_INCLUDE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
++ ${LIBINTL_INCLUDE_DIR}
+ )
+ qt4_wrap_ui(QUICKPHRASE_EDITOR_SRCS editordialog.ui batchdialog.ui editor.ui)
+ add_library(fcitx-quickphrase-editor
diff --git a/chinese/fcitx/files/patch-tools__gui__wrapper__CMakeLists.txt b/chinese/fcitx/files/patch-tools__gui__wrapper__CMakeLists.txt
new file mode 100644
index 000000000000..100a305f2a5e
--- /dev/null
+++ b/chinese/fcitx/files/patch-tools__gui__wrapper__CMakeLists.txt
@@ -0,0 +1,10 @@
+--- ./tools/gui/wrapper/CMakeLists.txt.orig 2013-09-28 17:33:14.000000000 +0900
++++ ./tools/gui/wrapper/CMakeLists.txt 2014-03-19 13:45:08.000000000 +0900
+@@ -14,6 +14,7 @@
+ ${QT_QTCORE_INCLUDE_DIR}
+ ${QT_QTGUI_INCLUDE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
++ ${LIBINTL_INCLUDE_DIR}
+ )
+
+ qt4_wrap_ui(QT_WRAPPER_SRCS mainwindow.ui)
diff --git a/chinese/fcitx/pkg-descr b/chinese/fcitx/pkg-descr
index 4bec106ce790..e058fcce5cff 100644
--- a/chinese/fcitx/pkg-descr
+++ b/chinese/fcitx/pkg-descr
@@ -1,4 +1,4 @@
Fcitx (Free Chinese Input Toy for X) is an input method framework,
which aims to provide a flexible IM solution for the desktop environments.
-WWW: http://code.google.com/p/fcitx/
+WWW: https://fcitx-im.org/wiki/Fcitx
diff --git a/chinese/fcitx/pkg-plist b/chinese/fcitx/pkg-plist
index 738812638503..a0dbb46ce7b3 100644
--- a/chinese/fcitx/pkg-plist
+++ b/chinese/fcitx/pkg-plist
@@ -2,6 +2,7 @@ bin/createPYMB
bin/fcitx
bin/fcitx-configtool
bin/fcitx-dbus-watcher
+bin/fcitx-diagnose
bin/fcitx-remote
bin/fcitx-skin-installer
bin/fcitx4-config
@@ -15,13 +16,30 @@ include/fcitx-config/fcitx-config.h
include/fcitx-config/hotkey.h
include/fcitx-config/xdg.h
include/fcitx-gclient/fcitxclient.h
+include/fcitx-gclient/fcitxconnection.h
include/fcitx-gclient/fcitxinputmethod.h
include/fcitx-gclient/fcitxkbd.h
+%%QT4%%include/fcitx-qt/fcitxqt_export.h
+%%QT4%%include/fcitx-qt/fcitxqtconfiguifactory.h
+%%QT4%%include/fcitx-qt/fcitxqtconfiguiplugin.h
+%%QT4%%include/fcitx-qt/fcitxqtconfiguiwidget.h
+%%QT4%%include/fcitx-qt/fcitxqtconnection.h
+%%QT4%%include/fcitx-qt/fcitxqtformattedpreedit.h
+%%QT4%%include/fcitx-qt/fcitxqtinputcontextproxy.h
+%%QT4%%include/fcitx-qt/fcitxqtinputmethoditem.h
+%%QT4%%include/fcitx-qt/fcitxqtinputmethodproxy.h
+%%QT4%%include/fcitx-qt/fcitxqtkeyboardlayout.h
+%%QT4%%include/fcitx-qt/fcitxqtkeyboardproxy.h
+%%QT4%%include/fcitx-qt/fcitxqtkeysequencewidget.h
include/fcitx-utils/bitset.h
+include/fcitx-utils/desktop-parse.h
+include/fcitx-utils/handler-table.h
include/fcitx-utils/keysym.h
include/fcitx-utils/keysymgen.h
include/fcitx-utils/log.h
include/fcitx-utils/memory.h
+include/fcitx-utils/objpool.h
+include/fcitx-utils/stringmap.h
include/fcitx-utils/utarray.h
include/fcitx-utils/utf8.h
include/fcitx-utils/uthash.h
@@ -38,25 +56,46 @@ include/fcitx/instance.h
include/fcitx/keys.h
include/fcitx/module.h
include/fcitx/module/chttrans/chttrans.h
+include/fcitx/module/chttrans/fcitx-chttrans.h
include/fcitx/module/classicui/classicuiinterface.h
+include/fcitx/module/classicui/fcitx-classicui.h
+include/fcitx/module/clipboard/clipboard.h
+include/fcitx/module/clipboard/fcitx-clipboard.h
include/fcitx/module/dbus/dbusstuff.h
+include/fcitx/module/dbus/fcitx-dbus.h
+include/fcitx/module/freedesktop-notify/fcitx-freedesktop-notify.h
+include/fcitx/module/freedesktop-notify/freedesktop-notify.h
include/fcitx/module/ipc/ipc.h
+include/fcitx/module/notificationitem/fcitx-notificationitem.h
+include/fcitx/module/notificationitem/notificationitem.h
+include/fcitx/module/pinyin-enhance/fcitx-pinyin-enhance.h
+include/fcitx/module/pinyin-enhance/pinyin-enhance.h
+include/fcitx/module/pinyin/fcitx-pinyin.h
include/fcitx/module/pinyin/pydef.h
+include/fcitx/module/punc/fcitx-punc.h
include/fcitx/module/punc/punc.h
+include/fcitx/module/quickphrase/fcitx-quickphrase.h
include/fcitx/module/quickphrase/quickphrase.h
+include/fcitx/module/spell/fcitx-spell.h
include/fcitx/module/spell/spell.h
+include/fcitx/module/x11/fcitx-x11.h
include/fcitx/module/x11/x11stuff.h
+include/fcitx/module/xkb/fcitx-xkb.h
+include/fcitx/module/xkb/xkb.h
include/fcitx/profile.h
include/fcitx/ui.h
lib/fcitx/fcitx-autoeng.so
lib/fcitx/fcitx-chttrans.so
lib/fcitx/fcitx-classic-ui.so
+lib/fcitx/fcitx-clipboard.so
lib/fcitx/fcitx-dbus.so
+lib/fcitx/fcitx-freedesktop-notify.so
lib/fcitx/fcitx-fullwidth-char.so
lib/fcitx/fcitx-imselector.so
lib/fcitx/fcitx-ipc.so
lib/fcitx/fcitx-keyboard.so
lib/fcitx/fcitx-kimpanel-ui.so
+lib/fcitx/fcitx-notificationitem.so
lib/fcitx/fcitx-pinyin-enhance.so
lib/fcitx/fcitx-pinyin.so
lib/fcitx/fcitx-punc.so
@@ -71,6 +110,19 @@ lib/fcitx/fcitx-x11.so
lib/fcitx/fcitx-xim.so
lib/fcitx/fcitx-xkb.so
lib/fcitx/fcitx-xkbdbus.so
+lib/fcitx/libexec/comp-spell-dict
+lib/fcitx/libexec/fcitx-po-parser
+%%QT4%%lib/fcitx/libexec/fcitx-qt-gui-wrapper
+lib/fcitx/libexec/fcitx-scanner
+%%QT4%%lib/fcitx/qt/libfcitx-quickphrase-editor.so
+lib/girepository-1.0/Fcitx-1.0.typelib
+%%GTK2%%lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-fcitx.so
+%%GTK2%%@exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
+%%GTK2%%@unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
+%%GTK3%%lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-fcitx.so
+%%GTK3%%@exec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache
+%%GTK3%%@unexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache
+%%QT4%%lib/qt4/plugins/inputmethods/qtim-fcitx.so
lib/libfcitx-config.so
lib/libfcitx-config.so.4
lib/libfcitx-config.so.4.1
@@ -80,10 +132,17 @@ lib/libfcitx-core.so.0.3
lib/libfcitx-gclient.so
lib/libfcitx-gclient.so.0
lib/libfcitx-gclient.so.0.1
+%%QT4%%lib/libfcitx-qt.so
+%%QT4%%lib/libfcitx-qt.so.0
+%%QT4%%lib/libfcitx-qt.so.0.1
lib/libfcitx-utils.so
lib/libfcitx-utils.so.0
lib/libfcitx-utils.so.0.1
-lib/girepository-1.0/Fcitx-1.0.typelib
+libdata/pkgconfig/fcitx-config.pc
+libdata/pkgconfig/fcitx-gclient.pc
+%%QT4%%libdata/pkgconfig/fcitx-qt.pc
+libdata/pkgconfig/fcitx-utils.pc
+libdata/pkgconfig/fcitx.pc
man/man1/createPYMB.1.gz
man/man1/fcitx-remote.1.gz
man/man1/fcitx.1.gz
@@ -93,25 +152,24 @@ man/man1/readPYBase.1.gz
man/man1/readPYMB.1.gz
man/man1/scel2org.1.gz
man/man1/txt2mb.1.gz
-share/gir-1.0/Fcitx-1.0.gir
-%%GTK2%%lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-fcitx.so
-%%GTK2%%@exec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
-%%GTK2%%@unexec %%LOCALBASE%%/bin/gtk-query-immodules-2.0 --update-cache
-%%GTK3%%lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-fcitx.so
-%%GTK3%%@exec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache
-%%GTK3%%@unexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache
-%%QT4%%lib/qt4/plugins/inputmethods/libqtim-fcitx.so
-libdata/pkgconfig/fcitx-config.pc
-libdata/pkgconfig/fcitx-gclient.pc
-libdata/pkgconfig/fcitx-utils.pc
-libdata/pkgconfig/fcitx.pc
share/applications/fcitx-configtool.desktop
share/applications/fcitx-skin-installer.desktop
share/applications/fcitx.desktop
share/cmake/fcitx/FcitxConfig.cmake
share/cmake/fcitx/FcitxConfigVersion.cmake
share/cmake/fcitx/FcitxMacro.cmake
+share/cmake/fcitx/fcitx-cmake-helper.sh
+share/cmake/fcitx/fcitx-extract-confdesc.sh
+share/cmake/fcitx/fcitx-extract-desktop.sh
+share/cmake/fcitx/fcitx-extract-gettext.sh
+share/cmake/fcitx/fcitx-extract-kde.sh
+share/cmake/fcitx/fcitx-extract-po.sh
+share/cmake/fcitx/fcitx-extract-qt.sh
+share/cmake/fcitx/fcitx-merge-config.sh
+share/cmake/fcitx/fcitx-parse-po.sh
+share/cmake/fcitx/fcitx-write-po.sh
share/cmake/fcitx/getdescpo
+share/dbus-1/services/org.fcitx.Fcitx.service
%%PORTDOCS%%%%DOCSDIR%%/API.txt
%%PORTDOCS%%%%DOCSDIR%%/Develop_Readme
%%PORTDOCS%%%%DOCSDIR%%/cjkvinput.txt
@@ -120,12 +178,15 @@ share/cmake/fcitx/getdescpo
%%DATADIR%%/addon/fcitx-autoeng.conf
%%DATADIR%%/addon/fcitx-chttrans.conf
%%DATADIR%%/addon/fcitx-classic-ui.conf
+%%DATADIR%%/addon/fcitx-clipboard.conf
%%DATADIR%%/addon/fcitx-dbus.conf
+%%DATADIR%%/addon/fcitx-freedesktop-notify.conf
%%DATADIR%%/addon/fcitx-fullwidth-char.conf
%%DATADIR%%/addon/fcitx-imselector.conf
%%DATADIR%%/addon/fcitx-ipc.conf
%%DATADIR%%/addon/fcitx-keyboard.conf
%%DATADIR%%/addon/fcitx-kimpanel-ui.conf
+%%DATADIR%%/addon/fcitx-notificationitem.conf
%%DATADIR%%/addon/fcitx-pinyin-enhance.conf
%%DATADIR%%/addon/fcitx-pinyin.conf
%%DATADIR%%/addon/fcitx-punc.conf
@@ -145,6 +206,7 @@ share/cmake/fcitx/getdescpo
%%DATADIR%%/configdesc/fcitx-autoeng.desc
%%DATADIR%%/configdesc/fcitx-chttrans.desc
%%DATADIR%%/configdesc/fcitx-classic-ui.desc
+%%DATADIR%%/configdesc/fcitx-clipboard.desc
%%DATADIR%%/configdesc/fcitx-imselector.desc
%%DATADIR%%/configdesc/fcitx-keyboard.desc
%%DATADIR%%/configdesc/fcitx-pinyin-enhance.desc
@@ -161,11 +223,13 @@ share/cmake/fcitx/getdescpo
%%DATADIR%%/configdesc/table.desc
%%DATADIR%%/data/AutoEng.dat
%%DATADIR%%/data/charselectdata
-%%DATADIR%%/data/en_dict.fscd
+%%DATADIR%%/data/env_setup.sh
%%DATADIR%%/data/gbks2t.tab
%%DATADIR%%/data/punc.mb.zh_CN
%%DATADIR%%/data/punc.mb.zh_HK
%%DATADIR%%/data/punc.mb.zh_TW
+%%DATADIR%%/data/quickphrase.d/emoji.mb
+%%DATADIR%%/data/quickphrase.d/latex.mb
%%DATADIR%%/data/vk.conf
%%DATADIR%%/dbus/daemon.conf
%%DATADIR%%/imicon/cangjie.png
@@ -178,10 +242,10 @@ share/cmake/fcitx/getdescpo
%%DATADIR%%/inputmethod/pinyin.conf
%%DATADIR%%/inputmethod/qw.conf
%%DATADIR%%/inputmethod/shuangpin.conf
-%%DATADIR%%/pinyin/pySym.mb
%%DATADIR%%/pinyin/pybase.mb
%%DATADIR%%/pinyin/pyphrase.mb
-%%DATADIR%%/pinyin/sp.dat
+%%DATADIR%%/py-enhance/py_stroke.mb
+%%DATADIR%%/py-enhance/py_table.mb
%%DATADIR%%/skin/classic/active.png
%%DATADIR%%/skin/classic/bar.png
%%DATADIR%%/skin/classic/bingchan.png
@@ -197,7 +261,6 @@ share/cmake/fcitx/getdescpo
%%DATADIR%%/skin/classic/fullwidth_inactive.png
%%DATADIR%%/skin/classic/inactive.png
%%DATADIR%%/skin/classic/input.png
-%%DATADIR%%/skin/classic/kbd.png
%%DATADIR%%/skin/classic/logo.png
%%DATADIR%%/skin/classic/menu.png
%%DATADIR%%/skin/classic/next.png
@@ -230,7 +293,6 @@ share/cmake/fcitx/getdescpo
%%DATADIR%%/skin/dark/fullwidth_inactive.png
%%DATADIR%%/skin/dark/inactive.png
%%DATADIR%%/skin/dark/input.png
-%%DATADIR%%/skin/dark/kbd.png
%%DATADIR%%/skin/dark/keyboard.png
%%DATADIR%%/skin/dark/logo.png
%%DATADIR%%/skin/dark/menu.png
@@ -250,8 +312,11 @@ share/cmake/fcitx/getdescpo
%%DATADIR%%/skin/dark/wubi.png
%%DATADIR%%/skin/dark/ziranma.png
%%DATADIR%%/skin/default/active.png
+%%DATADIR%%/skin/default/anthy.png
%%DATADIR%%/skin/default/bar.png
%%DATADIR%%/skin/default/bingchan.png
+%%DATADIR%%/skin/default/bopomofo.png
+%%DATADIR%%/skin/default/boshiamy.png
%%DATADIR%%/skin/default/cangjie.png
%%DATADIR%%/skin/default/chttrans_active.png
%%DATADIR%%/skin/default/chttrans_inactive.png
@@ -262,13 +327,15 @@ share/cmake/fcitx/getdescpo
%%DATADIR%%/skin/default/fcitx_skin.conf
%%DATADIR%%/skin/default/fullwidth_active.png
%%DATADIR%%/skin/default/fullwidth_inactive.png
+%%DATADIR%%/skin/default/hangul.png
%%DATADIR%%/skin/default/inactive.png
%%DATADIR%%/skin/default/input.png
-%%DATADIR%%/skin/default/kbd.png
%%DATADIR%%/skin/default/keyboard.png
+%%DATADIR%%/skin/default/kkc.png
%%DATADIR%%/skin/default/logo.png
%%DATADIR%%/skin/default/menu.png
%%DATADIR%%/skin/default/next.png
+%%DATADIR%%/skin/default/pinyin-libpinyin.png
%%DATADIR%%/skin/default/pinyin.png
%%DATADIR%%/skin/default/prev.png
%%DATADIR%%/skin/default/punc_active.png
@@ -276,13 +343,17 @@ share/cmake/fcitx/getdescpo
%%DATADIR%%/skin/default/quwei.png
%%DATADIR%%/skin/default/remind_active.png
%%DATADIR%%/skin/default/remind_inactive.png
+%%DATADIR%%/skin/default/shuangpin-libpinyin.png
%%DATADIR%%/skin/default/shuangpin.png
+%%DATADIR%%/skin/default/sogoupinyin.png
+%%DATADIR%%/skin/default/unikey.png
%%DATADIR%%/skin/default/vk_active.png
%%DATADIR%%/skin/default/vk_inactive.png
%%DATADIR%%/skin/default/wanfeng.png
%%DATADIR%%/skin/default/wbpy.png
%%DATADIR%%/skin/default/wubi.png
%%DATADIR%%/skin/default/ziranma.png
+%%DATADIR%%/spell/en_dict.fscd
%%DATADIR%%/table/cangjie.conf
%%DATADIR%%/table/cj.mb
%%DATADIR%%/table/db.conf
@@ -299,67 +370,72 @@ share/cmake/fcitx/getdescpo
%%DATADIR%%/table/wbx.mb
%%DATADIR%%/table/zrm.conf
%%DATADIR%%/table/zrm.mb
-share/icons/gnome/scalable/status/fcitx-fullwidth-active.svg
-share/icons/gnome/scalable/status/fcitx-fullwidth-inactive.svg
-share/icons/gnome/scalable/status/fcitx-kbd.svg
-share/icons/gnome/scalable/status/fcitx-punc-active.svg
-share/icons/gnome/scalable/status/fcitx-punc-inactive.svg
-share/icons/gnome/scalable/status/fcitx-vk-active.svg
-share/icons/gnome/scalable/status/fcitx-vk-inactive.svg
+share/gir-1.0/Fcitx-1.0.gir
share/icons/hicolor/128x128/apps/fcitx.png
+share/icons/hicolor/16x16/apps/fcitx-fullwidth-active.png
+share/icons/hicolor/16x16/apps/fcitx-fullwidth-inactive.png
+share/icons/hicolor/16x16/apps/fcitx-kbd.png
+share/icons/hicolor/16x16/apps/fcitx-punc-active.png
+share/icons/hicolor/16x16/apps/fcitx-punc-inactive.png
+share/icons/hicolor/16x16/apps/fcitx-vk-active.png
+share/icons/hicolor/16x16/apps/fcitx-vk-inactive.png
share/icons/hicolor/16x16/apps/fcitx.png
-share/icons/hicolor/16x16/status/fcitx-fullwidth-active.png
-share/icons/hicolor/16x16/status/fcitx-fullwidth-inactive.png
-share/icons/hicolor/16x16/status/fcitx-kbd.png
-share/icons/hicolor/16x16/status/fcitx-punc-active.png
-share/icons/hicolor/16x16/status/fcitx-punc-inactive.png
-share/icons/hicolor/16x16/status/fcitx-vk-active.png
-share/icons/hicolor/16x16/status/fcitx-vk-inactive.png
+share/icons/hicolor/22x22/apps/fcitx-fullwidth-active.png
+share/icons/hicolor/22x22/apps/fcitx-fullwidth-inactive.png
+share/icons/hicolor/22x22/apps/fcitx-kbd.png
+share/icons/hicolor/22x22/apps/fcitx-punc-active.png
+share/icons/hicolor/22x22/apps/fcitx-punc-inactive.png
+share/icons/hicolor/22x22/apps/fcitx-vk-active.png
+share/icons/hicolor/22x22/apps/fcitx-vk-inactive.png
share/icons/hicolor/22x22/apps/fcitx.png
-share/icons/hicolor/22x22/status/fcitx-fullwidth-active.png
-share/icons/hicolor/22x22/status/fcitx-fullwidth-inactive.png
-share/icons/hicolor/22x22/status/fcitx-kbd.png
-share/icons/hicolor/22x22/status/fcitx-punc-active.png
-share/icons/hicolor/22x22/status/fcitx-punc-inactive.png
-share/icons/hicolor/22x22/status/fcitx-vk-active.png
-share/icons/hicolor/22x22/status/fcitx-vk-inactive.png
+share/icons/hicolor/24x24/apps/fcitx-fullwidth-active.png
+share/icons/hicolor/24x24/apps/fcitx-fullwidth-inactive.png
+share/icons/hicolor/24x24/apps/fcitx-kbd.png
+share/icons/hicolor/24x24/apps/fcitx-punc-active.png
+share/icons/hicolor/24x24/apps/fcitx-punc-inactive.png
+share/icons/hicolor/24x24/apps/fcitx-vk-active.png
+share/icons/hicolor/24x24/apps/fcitx-vk-inactive.png
share/icons/hicolor/24x24/apps/fcitx.png
-share/icons/hicolor/24x24/status/fcitx-fullwidth-active.png
-share/icons/hicolor/24x24/status/fcitx-fullwidth-inactive.png
-share/icons/hicolor/24x24/status/fcitx-kbd.png
-share/icons/hicolor/24x24/status/fcitx-punc-active.png
-share/icons/hicolor/24x24/status/fcitx-punc-inactive.png
-share/icons/hicolor/24x24/status/fcitx-vk-active.png
-share/icons/hicolor/24x24/status/fcitx-vk-inactive.png
share/icons/hicolor/32x32/apps/fcitx.png
+share/icons/hicolor/48x48/apps/fcitx-cangjie.png
+share/icons/hicolor/48x48/apps/fcitx-chn.png
+share/icons/hicolor/48x48/apps/fcitx-chttrans-active.png
+share/icons/hicolor/48x48/apps/fcitx-chttrans-inactive.png
+share/icons/hicolor/48x48/apps/fcitx-erbi.png
+share/icons/hicolor/48x48/apps/fcitx-fullwidth-active.png
+share/icons/hicolor/48x48/apps/fcitx-fullwidth-inactive.png
+share/icons/hicolor/48x48/apps/fcitx-kbd.png
+share/icons/hicolor/48x48/apps/fcitx-pinyin.png
+share/icons/hicolor/48x48/apps/fcitx-punc-active.png
+share/icons/hicolor/48x48/apps/fcitx-punc-inactive.png
+share/icons/hicolor/48x48/apps/fcitx-remind-active.png
+share/icons/hicolor/48x48/apps/fcitx-remind-inactive.png
+share/icons/hicolor/48x48/apps/fcitx-shuangpin.png
+share/icons/hicolor/48x48/apps/fcitx-vk-active.png
+share/icons/hicolor/48x48/apps/fcitx-vk-inactive.png
+share/icons/hicolor/48x48/apps/fcitx-wbpy.png
+share/icons/hicolor/48x48/apps/fcitx-wubi.png
+share/icons/hicolor/48x48/apps/fcitx-ziranma.png
share/icons/hicolor/48x48/apps/fcitx.png
-share/icons/hicolor/48x48/status/fcitx-cangjie.png
-share/icons/hicolor/48x48/status/fcitx-chn.png
-share/icons/hicolor/48x48/status/fcitx-chttrans-active.png
-share/icons/hicolor/48x48/status/fcitx-chttrans-inactive.png
-share/icons/hicolor/48x48/status/fcitx-erbi.png
-share/icons/hicolor/48x48/status/fcitx-fullwidth-active.png
-share/icons/hicolor/48x48/status/fcitx-fullwidth-inactive.png
-share/icons/hicolor/48x48/status/fcitx-kbd.png
-share/icons/hicolor/48x48/status/fcitx-pinyin.png
-share/icons/hicolor/48x48/status/fcitx-punc-active.png
-share/icons/hicolor/48x48/status/fcitx-punc-inactive.png
-share/icons/hicolor/48x48/status/fcitx-remind-active.png
-share/icons/hicolor/48x48/status/fcitx-remind-inactive.png
-share/icons/hicolor/48x48/status/fcitx-shuangpin.png
-share/icons/hicolor/48x48/status/fcitx-vk-active.png
-share/icons/hicolor/48x48/status/fcitx-vk-inactive.png
-share/icons/hicolor/48x48/status/fcitx-wbpy.png
-share/icons/hicolor/48x48/status/fcitx-wubi.png
-share/icons/hicolor/48x48/status/fcitx-ziranma.png
-share/icons/hicolor/scalable/status/fcitx-fullwidth-active.svg
-share/icons/hicolor/scalable/status/fcitx-fullwidth-inactive.svg
-share/icons/hicolor/scalable/status/fcitx-kbd.svg
-share/icons/hicolor/scalable/status/fcitx-punc-active.svg
-share/icons/hicolor/scalable/status/fcitx-punc-inactive.svg
-share/icons/hicolor/scalable/status/fcitx-vk-active.svg
-share/icons/hicolor/scalable/status/fcitx-vk-inactive.svg
+share/icons/hicolor/scalable/apps/fcitx-fullwidth-active-symbolic.svg
+share/icons/hicolor/scalable/apps/fcitx-fullwidth-active.svg
+share/icons/hicolor/scalable/apps/fcitx-fullwidth-inactive-symbolic.svg
+share/icons/hicolor/scalable/apps/fcitx-fullwidth-inactive.svg
+share/icons/hicolor/scalable/apps/fcitx-kbd-symbolic.svg
+share/icons/hicolor/scalable/apps/fcitx-kbd.svg
+share/icons/hicolor/scalable/apps/fcitx-punc-active-symbolic.svg
+share/icons/hicolor/scalable/apps/fcitx-punc-active.svg
+share/icons/hicolor/scalable/apps/fcitx-punc-inactive-symbolic.svg
+share/icons/hicolor/scalable/apps/fcitx-punc-inactive.svg
+share/icons/hicolor/scalable/apps/fcitx-vk-active-symbolic.svg
+share/icons/hicolor/scalable/apps/fcitx-vk-active.svg
+share/icons/hicolor/scalable/apps/fcitx-vk-inactive-symbolic.svg
+share/icons/hicolor/scalable/apps/fcitx-vk-inactive.svg
+share/icons/hicolor/scalable/apps/fcitx.svg
+share/locale/de/LC_MESSAGES/fcitx.mo
+share/locale/es/LC_MESSAGES/fcitx.mo
share/locale/ja/LC_MESSAGES/fcitx.mo
+share/locale/ko/LC_MESSAGES/fcitx.mo
share/locale/zh_CN/LC_MESSAGES/fcitx.mo
share/locale/zh_TW/LC_MESSAGES/fcitx.mo
share/mime/packages/x-fskin.xml
diff --git a/chinese/libgooglepinyin/Makefile b/chinese/libgooglepinyin/Makefile
index 302f58523d2b..6aa045c3f3ef 100644
--- a/chinese/libgooglepinyin/Makefile
+++ b/chinese/libgooglepinyin/Makefile
@@ -9,6 +9,8 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
MAINTAINER= lichray@gmail.com
COMMENT= Fork of Google Pinyin IME on Android
+LICENSE= APACHE20
+
USE_LDCONFIG= yes
USES= tar:bzip2 cmake
diff --git a/chinese/libgooglepinyin/pkg-descr b/chinese/libgooglepinyin/pkg-descr
index 68e52990ef66..80fd1a890276 100644
--- a/chinese/libgooglepinyin/pkg-descr
+++ b/chinese/libgooglepinyin/pkg-descr
@@ -1,4 +1,4 @@
libgooglepinyin is a Chinese input method engine, forked from Google
Pinyin IME on Android.
-WWW: http://code.google.com/p/libgooglepinyin/
+WWW: http://code.google.com/p/libgooglepinyin/
diff --git a/chinese/libpinyin/Makefile b/chinese/libpinyin/Makefile
index dda787eab2e4..6fc6eb34875a 100644
--- a/chinese/libpinyin/Makefile
+++ b/chinese/libpinyin/Makefile
@@ -2,14 +2,15 @@
# $FreeBSD$
PORTNAME= libpinyin
-PORTVERSION= 0.7.91
-PORTREVISION= 2
+PORTVERSION= 1.1.0
CATEGORIES= chinese textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
MAINTAINER= lichray@gmail.com
COMMENT= Library to deal with pinyin
+LICENSE= GPLv2
+
USE_BDB= yes
USE_GNOME= glib20
USES= gettext gmake libtool pathfix pkgconfig
@@ -19,13 +20,11 @@ USE_LDCONFIG= yes
CONFIGURE_ARGS+=CPPFLAGS="-I${LOCALBASE}/include \
-I${BDB_INCLUDE_DIR} -D_WITH_GETLINE" \
LDFLAGS="-L${LOCALBASE}/lib -l${BDB_LIB_NAME}"
+INSTALL_TARGET=install-strip
PLIST_SUB+= VER=${PORTVERSION}
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800107
-IGNORE= does not compile on FreeBSD 7.X
-.endif
+post-install:
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpinyin.so.5.0.0
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/chinese/libpinyin/distinfo b/chinese/libpinyin/distinfo
index 9a2493ab0c93..eff50a4dbb45 100644
--- a/chinese/libpinyin/distinfo
+++ b/chinese/libpinyin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libpinyin-0.7.91.tar.gz) = 86d370d217183ec60223e71ff43002283cd7be888ceacf51c44090397b55259b
-SIZE (libpinyin-0.7.91.tar.gz) = 10466494
+SHA256 (libpinyin-1.1.0.tar.gz) = 3f2a04f4aa39cdf0db7c098805ad02c7f66b030d14144deddd04b532f4eaa103
+SIZE (libpinyin-1.1.0.tar.gz) = 19737160
diff --git a/chinese/libpinyin/files/patch-configure b/chinese/libpinyin/files/patch-configure
deleted file mode 100644
index 451b55be1a8e..000000000000
--- a/chinese/libpinyin/files/patch-configure
+++ /dev/null
@@ -1,16 +0,0 @@
---- configure~ 2012-02-06 09:07:32.410719322 -0600
-+++ configure 2012-02-06 09:26:16.354737313 -0600
-@@ -17515,11 +17515,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
- #ifdef __cplusplus
- extern "C"
- #endif
--char db_create ();
-+#include <db.h>
- int
- main ()
- {
--return db_create ();
-+return db_create (0,0,0);
- ;
- return 0;
- }
diff --git a/chinese/libpinyin/files/patch-data_Makefile.in b/chinese/libpinyin/files/patch-data_Makefile.in
new file mode 100644
index 000000000000..6c83f868faa1
--- /dev/null
+++ b/chinese/libpinyin/files/patch-data_Makefile.in
@@ -0,0 +1,11 @@
+--- data/Makefile.in.orig 2014-06-05 14:21:55.000000000 +0800
++++ data/Makefile.in 2014-06-05 14:22:17.000000000 +0800
+@@ -288,7 +288,7 @@
+ libpinyin_db_DATA = $(binary_model_data) \
+ table.conf
+
+-libpinyin_dbdir = $(libdir)/libpinyin/data
++libpinyin_dbdir = $(datadir)/libpinyin/data
+ CLEANFILES = $(binary_model_data)
+ all: all-am
+
diff --git a/chinese/libpinyin/files/patch-libpinyin.pc.in b/chinese/libpinyin/files/patch-libpinyin.pc.in
new file mode 100644
index 000000000000..2610935b5743
--- /dev/null
+++ b/chinese/libpinyin/files/patch-libpinyin.pc.in
@@ -0,0 +1,11 @@
+--- libpinyin.pc.in.orig 2014-06-05 14:28:26.000000000 +0800
++++ libpinyin.pc.in 2014-06-05 14:28:35.000000000 +0800
+@@ -2,7 +2,7 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+-pkgdatadir=@libdir@/libpinyin
++pkgdatadir=@datadir@/libpinyin
+
+ libpinyinincludedir=${includedir}/libpinyin-@VERSION@
+ libpinyin_binary_version=@LIBPINYIN_BINARY_VERSION@
diff --git a/chinese/libpinyin/files/patch-src_pinyin_internal.h b/chinese/libpinyin/files/patch-src_pinyin_internal.h
deleted file mode 100644
index a837647d52ca..000000000000
--- a/chinese/libpinyin/files/patch-src_pinyin_internal.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/pinyin_internal.h.orig 2011-12-19 23:45:40.000000000 -0600
-+++ src/pinyin_internal.h 2012-02-06 09:53:12.804569766 -0600
-@@ -47,6 +47,7 @@
- #include "flexible_ngram.h"
-
- using namespace pinyin;
-+#define ENODATA ENOENT
-
-
- #endif
diff --git a/chinese/libpinyin/pkg-descr b/chinese/libpinyin/pkg-descr
index e0fffc72dfc8..dfc46f4cadfb 100644
--- a/chinese/libpinyin/pkg-descr
+++ b/chinese/libpinyin/pkg-descr
@@ -1,4 +1,4 @@
The libpinyin project aims to provide the algorithms core for intelligent
sentence-based Chinese pinyin input methods.
-WWW: https://github.com/libpinyin/libpinyin
+WWW: https://github.com/libpinyin/libpinyin
diff --git a/chinese/libpinyin/pkg-plist b/chinese/libpinyin/pkg-plist
index 2cc99766cb20..67eee62ee89f 100644
--- a/chinese/libpinyin/pkg-plist
+++ b/chinese/libpinyin/pkg-plist
@@ -1,22 +1,29 @@
bin/gen_binary_files
bin/gen_unigram
bin/import_interpolation
-include/libpinyin-%%VER%%/chewing_enum.h
-include/libpinyin-%%VER%%/chewing_key.h
include/libpinyin-%%VER%%/novel_types.h
include/libpinyin-%%VER%%/pinyin.h
include/libpinyin-%%VER%%/pinyin_custom2.h
lib/libpinyin.a
lib/libpinyin.so
-lib/libpinyin.so.2
-lib/libpinyin.so.2.0.0
+lib/libpinyin.so.5
+lib/libpinyin.so.5.0.0
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/art.bin
%%DATADIR%%/data/bigram.db
+%%DATADIR%%/data/culture.bin
+%%DATADIR%%/data/economy.bin
%%DATADIR%%/data/gb_char.bin
%%DATADIR%%/data/gbk_char.bin
+%%DATADIR%%/data/geology.bin
+%%DATADIR%%/data/history.bin
+%%DATADIR%%/data/life.bin
+%%DATADIR%%/data/merged.bin
+%%DATADIR%%/data/nature.bin
%%DATADIR%%/data/phrase_index.bin
%%DATADIR%%/data/pinyin_index.bin
+%%DATADIR%%/data/scitech.bin
+%%DATADIR%%/data/society.bin
+%%DATADIR%%/data/sport.bin
+%%DATADIR%%/data/table.conf
diff --git a/chinese/librime/Makefile b/chinese/librime/Makefile
index 637d444ccf3a..b76aabb88188 100644
--- a/chinese/librime/Makefile
+++ b/chinese/librime/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= librime
-PORTVERSION= 0.9.7
-PORTREVISION= 2
+PORTVERSION= 1.1
CATEGORIES= chinese textproc
-MASTER_SITES= GOOGLE_CODE
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} brise-${DATA_VER}.tar.gz
+MASTER_SITES= http://github.com/rime/${PORTNAME}/archive/rime-${PORTVERSION}.tar.gz?dummy=/
+DISTNAME= ${PORTNAME}-rime-${DISTVERSION}
MAINTAINER= lichray@gmail.com
-COMMENT= Rime Input Method Engine
+COMMENT= Rime Input Method Engine, the core library
LICENSE= GPLv3
@@ -17,37 +16,20 @@ LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \
libglog.so:${PORTSDIR}/devel/glog \
libkyotocabinet.so:${PORTSDIR}/databases/kyotocabinet \
libopencc.so:${PORTSDIR}/chinese/opencc \
- libyaml-cpp03.so:${PORTSDIR}/devel/yaml-cpp03
+ libyaml-cpp.so:${PORTSDIR}/devel/yaml-cpp
-USES= cmake pkgconfig gettext perl5
+USES= cmake compiler:c++11-lang pkgconfig gettext perl5
USE_PERL5= build patch
USE_LDCONFIG= yes
USE_XORG= xproto
LDFLAGS+= -lintl
-PLIST_SUB= VER=${PORTVERSION}
+PLIST_SUB= VER=${PORTVERSION}.0
+
+.include <bsd.port.options.mk>
post-patch: .SILENT
${FIND} ${WRKSRC} \( -name '*.cc' -or -name '*.h' \) \
-exec ${PERL} -i -pe '$$. == 1 && s/^\xef\xbb\xbf//;' '{}' \;
- ${REINPLACE_CMD} -e 's|yaml-cpp|&03|g' ${WRKSRC}/cmake/FindYamlCpp.cmake \
- ${WRKSRC}/src/config.cc ${WRKSRC}/src/dict/dict_settings.cc
-
-post-build:
- @echo "building rime data."
- @${MKDIR} ${DATASRC}
- @(cd ${WRKDIR}/brise; ${CP} \
- default.yaml essay.kct supplement/*.yaml preset/*.yaml ${DATASRC})
- ${WRKSRC}/bin/rime_deployer --build ${DATASRC}
-
-post-install:
- ${MKDIR} ${STAGEDIR}${DATADIR}/data
- ${INSTALL_DATA} ${DATASRC}/*.kct ${DATASRC}/*.bin ${STAGEDIR}${DATADIR}/data/
-
-PROJECTHOST= rimeime
-DATA_VER= 0.16
-WRKSRC= ${WRKDIR}/${PORTNAME}
-DATASRC= ${WRKDIR}/tmp
-DATADIR= ${PREFIX}/share/rime
.include <bsd.port.mk>
diff --git a/chinese/librime/distinfo b/chinese/librime/distinfo
index e8861d896364..2d2ab837a4fa 100644
--- a/chinese/librime/distinfo
+++ b/chinese/librime/distinfo
@@ -1,4 +1,2 @@
-SHA256 (librime-0.9.7.tar.gz) = 670ab6535bce9c44d2293f8b857ececbea6317b563c5686e750ffdf0532d85c2
-SIZE (librime-0.9.7.tar.gz) = 2535462
-SHA256 (brise-0.16.tar.gz) = a65693ed2bbf40ec579be8124d4cb909749a5a4dcd0e312d78891522c5eb881b
-SIZE (brise-0.16.tar.gz) = 6781320
+SHA256 (librime-rime-1.1.tar.gz) = fb42324b7fa489708a0e2ffd75e90668678bd4d0ae68f9c8ff956cd3be3c7362
+SIZE (librime-rime-1.1.tar.gz) = 2633096
diff --git a/chinese/librime/files/patch-CMakeLists.txt b/chinese/librime/files/patch-CMakeLists.txt
index 04f461c02f90..848a5176ac1c 100644
--- a/chinese/librime/files/patch-CMakeLists.txt
+++ b/chinese/librime/files/patch-CMakeLists.txt
@@ -1,5 +1,5 @@
---- CMakeLists.txt.bak 2012-09-26 00:03:24.000000000 -0500
-+++ CMakeLists.txt 2012-11-26 22:38:10.883043680 -0600
+--- ./CMakeLists.txt.orig 2013-12-26 17:37:25.000000000 +0900
++++ ./CMakeLists.txt 2014-03-26 13:02:33.000000000 +0900
@@ -1,5 +1,5 @@
-set(CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/c_flag_overrides.cmake)
-set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_flag_overrides.cmake)
@@ -8,7 +8,58 @@
project(rime)
cmake_minimum_required(VERSION 2.8)
-@@ -107,7 +107,7 @@ if(NOT BUILD_STATIC)
+@@ -21,6 +21,20 @@
+
+ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+
++include_directories(${PROJECT_SOURCE_DIR}/include)
++include_directories(${PROJECT_SOURCE_DIR}/thirdparty/include)
++link_directories(${PROJECT_SOURCE_DIR}/thirdparty/lib)
++if(MSVC)
++ if(MSVC10)
++ # stdint.h is missing from VS2010
++ include_directories(${PROJECT_SOURCE_DIR}/thirdparty/include/msvc)
++ endif(MSVC10)
++ add_definitions("/wd4244 /wd4996")
++endif(MSVC)
++if(UNIX)
++ add_definitions("-std=c++11")
++endif(UNIX)
++
+ set(Boost_USE_STATIC_LIBS ${BUILD_STATIC})
+ set(Gflags_STATIC ${BUILD_STATIC})
+ set(Glog_STATIC ${BUILD_STATIC})
+@@ -82,20 +96,6 @@
+ message(WARNING "X11/keysym.h not found.")
+ endif(X11Keysym)
+
+-include_directories(${PROJECT_SOURCE_DIR}/include)
+-include_directories(${PROJECT_SOURCE_DIR}/thirdparty/include)
+-link_directories(${PROJECT_SOURCE_DIR}/thirdparty/lib)
+-if(MSVC)
+- if(MSVC10)
+- # stdint.h is missing from VS2010
+- include_directories(${PROJECT_SOURCE_DIR}/thirdparty/include/msvc)
+- endif(MSVC10)
+- add_definitions("/wd4244 /wd4996")
+-endif(MSVC)
+-if(UNIX)
+- add_definitions("-std=c++11")
+-endif(UNIX)
+-
+ if(NOT DEFINED LIB_INSTALL_DIR)
+ set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib)
+ endif()
+@@ -104,7 +104,7 @@
+ set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin)
+ endif()
+
+-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
++if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+ # uninstall target
+ configure_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
+@@ -120,7 +120,7 @@
set(includedir "${CMAKE_INSTALL_PREFIX}/include")
configure_file(${PROJECT_SOURCE_DIR}/rime.pc.in ${PROJECT_BINARY_DIR}/rime.pc)
install(FILES include/rime_api.h DESTINATION include)
@@ -17,3 +68,12 @@
install(FILES cmake/RimeConfig.cmake DESTINATION share/cmake/rime)
if(BUILD_DATA)
install(FILES ${PROJECT_SOURCE_DIR}/data/default.yaml DESTINATION ${pkgdatadir})
+@@ -131,7 +131,7 @@
+ file(GLOB supplement_schema ${PROJECT_SOURCE_DIR}/data/supplement/*.yaml)
+ install(FILES ${supplement_schema} DESTINATION ${pkgdatadir})
+ endif(BUILD_DATA)
+-endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
++endif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+
+ if(BUILD_SHARED_LIBS)
+ set(RIME_LIBRARY rime)
diff --git a/chinese/librime/pkg-descr b/chinese/librime/pkg-descr
index 9ea8ab364400..5e126ef8ce02 100644
--- a/chinese/librime/pkg-descr
+++ b/chinese/librime/pkg-descr
@@ -1,4 +1,4 @@
Rime Input Method Engine is a customizable and dialect-friendly intelligent
Chinese input method.
-WWW: http://code.google.com/p/rimeime/
+WWW: https://rime.github.io/
diff --git a/chinese/librime/pkg-plist b/chinese/librime/pkg-plist
index 2856d5ea3432..755cc34e9886 100644
--- a/chinese/librime/pkg-plist
+++ b/chinese/librime/pkg-plist
@@ -2,16 +2,7 @@ bin/rime_deployer
bin/rime_dict_manager
include/rime_api.h
lib/librime.so
-lib/librime.so.0
lib/librime.so.%%VER%%
+lib/librime.so.1
libdata/pkgconfig/rime.pc
share/cmake/rime/RimeConfig.cmake
-%%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
diff --git a/chinese/opencc/Makefile b/chinese/opencc/Makefile
index 39d43d03d246..af2996498ed4 100644
--- a/chinese/opencc/Makefile
+++ b/chinese/opencc/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= opencc
-PORTVERSION= 0.3.0
+PORTVERSION= 0.4.3
CATEGORIES= chinese converters
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/chinese/opencc/distinfo b/chinese/opencc/distinfo
index 786603869e77..6bfc8f8be8ad 100644
--- a/chinese/opencc/distinfo
+++ b/chinese/opencc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opencc-0.3.0.tar.gz) = ce397244e698d0fd42d5e0b240a6eca2a82f29ef76f433c71ab2e5a3c54ac5be
-SIZE (opencc-0.3.0.tar.gz) = 491179
+SHA256 (opencc-0.4.3.tar.gz) = 7bdcf9e38ac05a16750d5276494d810db107c8a8b5f8b87e2357ee167a13a587
+SIZE (opencc-0.4.3.tar.gz) = 535151
diff --git a/chinese/opencc/files/patch-src_utils.c b/chinese/opencc/files/patch-src_utils.c
new file mode 100644
index 000000000000..855c3c8525f2
--- /dev/null
+++ b/chinese/opencc/files/patch-src_utils.c
@@ -0,0 +1,46 @@
+--- src/utils.c.orig 2014-04-07 11:37:35.909060780 -0400
++++ src/utils.c 2014-04-07 11:53:24.429168115 -0400
+@@ -19,6 +19,11 @@
+ #include "utils.h"
+ #include <unistd.h>
+
++#ifdef __FreeBSD__
++ #include <sys/types.h>
++ #include <sys/sysctl.h>
++#endif
++
+ #ifdef __APPLE__
+ #include "TargetConditionals.h"
+ #ifdef TARGET_OS_MAC
+@@ -95,14 +100,19 @@ const char* executable_path(void) {
+ static int calculated = 0;
+
+ if (!calculated) {
+-#ifdef __linux
++#if defined(__linux)
+ ssize_t res = readlink("/proc/self/exe", path_buffer, sizeof(path_buffer));
+ assert(res != -1);
+-#elif __APPLE__
++#elif defined(__FreeBSD__)
++ int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
++ size_t size = sizeof(path_buffer);
++ int res = sysctl(mib, 4, path_buffer, &size, NULL, 0);
++ assert(res == 0);
++#elif defined(__APPLE__)
+ uint32_t size = sizeof(path_buffer);
+ int res = _NSGetExecutablePath(path_buffer, &size);
+ assert(res == 0);
+-#elif _WIN32 || _WIN64
++#elif defined(_WIN32) || defined(_WIN64)
+ // NOTE: for "C:\\opencc.exe" on Windows, the returned path "C:" is
+ // incorrect until a '/' is appended to it later in try_open_file()
+ DWORD res = GetModuleFileNameA(NULL, path_buffer, PATH_BUFFER_SIZE);
+@@ -110,7 +120,7 @@ const char* executable_path(void) {
+ #else
+ /* Other unsupported os */
+ assert(0);
+-#endif /* ifdef __linux */
++#endif /* if defined(__linux) */
+ char* last_sep = strrchr(path_buffer, PATH_SEPARATOR);
+ assert(last_sep != NULL);
+ *last_sep = '\0';
diff --git a/chinese/opencc/pkg-descr b/chinese/opencc/pkg-descr
index b3e487df146b..18421d281d1f 100644
--- a/chinese/opencc/pkg-descr
+++ b/chinese/opencc/pkg-descr
@@ -2,4 +2,4 @@ Open Chinese Convert (OpenCC) is an open source Simplified-Traditional
Chinese conversion project, providing high quality thesaurus and libopencc,
as well as a conversion utility and a dictionary generator.
-WWW: https://code.google.com/p/opencc/
+WWW: https://github.com/BYVoid/OpenCC
diff --git a/japanese/Makefile b/japanese/Makefile
index 5f28299165b3..73a5081098eb 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -58,6 +58,7 @@
SUBDIR += eterm
SUBDIR += fcitx-anthy
SUBDIR += fcitx-mozc
+ SUBDIR += fcitx-skk
SUBDIR += flower-fpw
SUBDIR += foldoc-fpw
SUBDIR += font-ipa
diff --git a/japanese/fcitx-anthy/Makefile b/japanese/fcitx-anthy/Makefile
index 53ae3f7cbbd1..99e3b651eb16 100644
--- a/japanese/fcitx-anthy/Makefile
+++ b/japanese/fcitx-anthy/Makefile
@@ -2,21 +2,20 @@
# $FreeBSD$
PORTNAME= fcitx-anthy
-PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTVERSION= 0.2.1
CATEGORIES= japanese
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= http://download.fcitx-im.org/${PORTNAME}/
DIST_SUBDIR= fcitx
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= lichray@gmail.com
COMMENT= Anthy support for Fcitx
+LICENSE= GPLv2
+
LIB_DEPENDS= libfcitx-config.so:${PORTSDIR}/chinese/fcitx \
libanthy.so:${PORTSDIR}/japanese/anthy
USES= cmake gettext pkgconfig tar:xz
-USE_GNOME= intltool
-
-PROJECTHOST= fcitx
+INSTALLS_ICONS= yes
.include <bsd.port.mk>
diff --git a/japanese/fcitx-anthy/distinfo b/japanese/fcitx-anthy/distinfo
index cf848a76496f..1c6988c0956a 100644
--- a/japanese/fcitx-anthy/distinfo
+++ b/japanese/fcitx-anthy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx-anthy-0.1.1.tar.xz) = c508068c7c9a56c26ea44b8e6ddb90a2ea75860031f89e171dcda8ec4cd08955
-SIZE (fcitx/fcitx-anthy-0.1.1.tar.xz) = 68604
+SHA256 (fcitx/fcitx-anthy-0.2.1.tar.xz) = fd208474666f09f1c189c10c2c0fa9cfda33948b704410e02878fdd92174d78d
+SIZE (fcitx/fcitx-anthy-0.2.1.tar.xz) = 72196
diff --git a/japanese/fcitx-anthy/pkg-descr b/japanese/fcitx-anthy/pkg-descr
index 54fceb6c73b2..9b576e81bbdc 100644
--- a/japanese/fcitx-anthy/pkg-descr
+++ b/japanese/fcitx-anthy/pkg-descr
@@ -1,4 +1,4 @@
fcitx-anthy provides Anthy, the most popular Japanese input method
system, as a back-end to the Fcitx IM framework.
-WWW: http://code.google.com/p/fcitx/
+WWW: https://fcitx-im.org/wiki/Fcitx
diff --git a/japanese/fcitx-anthy/pkg-plist b/japanese/fcitx-anthy/pkg-plist
index 80ecca891fc9..136d1412e989 100644
--- a/japanese/fcitx-anthy/pkg-plist
+++ b/japanese/fcitx-anthy/pkg-plist
@@ -25,6 +25,7 @@ share/icons/hicolor/scalable/status/fcitx-anthy-period-latin.svg
share/icons/hicolor/scalable/status/fcitx-anthy-period-wide-japanese.svg
share/icons/hicolor/scalable/status/fcitx-anthy-period-wide-latin.svg
share/icons/hicolor/scalable/status/fcitx-anthy-symbol.svg
+share/locale/de/LC_MESSAGES/fcitx-anthy.mo
share/locale/ja/LC_MESSAGES/fcitx-anthy.mo
share/locale/zh_CN/LC_MESSAGES/fcitx-anthy.mo
share/locale/zh_TW/LC_MESSAGES/fcitx-anthy.mo
diff --git a/japanese/fcitx-skk/Makefile b/japanese/fcitx-skk/Makefile
new file mode 100644
index 000000000000..5f466f8a2ce8
--- /dev/null
+++ b/japanese/fcitx-skk/Makefile
@@ -0,0 +1,37 @@
+# $FreeBSD$
+
+PORTNAME= fcitx-skk
+PORTVERSION= 0.1.1
+CATEGORIES= japanese
+MASTER_SITES= http://download.fcitx-im.org/${PORTNAME}/
+DIST_SUBDIR= fcitx
+
+MAINTAINER= hiroto.kagotani@gmail.com
+COMMENT= SKK support for Fcitx
+
+LICENSE= GPLv3
+
+RUN_DEPENDS= ${LOCALBASE}/share/skk/SKK-JISYO.L:${PORTSDIR}/japanese/skk-jisyo
+LIB_DEPENDS= libfcitx-config.so:${PORTSDIR}/chinese/fcitx \
+ libskk.so:${PORTSDIR}/japanese/libskk
+
+USES= tar:xz compiler:c++11-lang cmake gettext pkgconfig
+INSTALLS_ICONS= yes
+CMAKE_ARGS+= -DSKK_DEFAULT_PATH=${LOCALBASE}/share/skk/SKK-JISYO.L
+
+OPTIONS_DEFINE= QT4
+OPTIONS_DEFAULT=QT4
+QT4_DESC= Enable Qt for GUI configuration
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MQT4}
+USE_QT4= qmake_build moc_build rcc_build uic_build gui
+USE_LDCONFIG= ${PREFIX}/lib/fcitx/qt
+PLIST_SUB+= QT4=""
+.else
+CMAKE_ARGS+= -DENABLE_QT=OFF
+PLIST_SUB+= QT4="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/japanese/fcitx-skk/distinfo b/japanese/fcitx-skk/distinfo
new file mode 100644
index 000000000000..97069bef250d
--- /dev/null
+++ b/japanese/fcitx-skk/distinfo
@@ -0,0 +1,2 @@
+SHA256 (fcitx/fcitx-skk-0.1.1.tar.xz) = 023a1d9b075c02c7e394a689e7b2452a1df1e062b2953892aed7c694fb55591c
+SIZE (fcitx/fcitx-skk-0.1.1.tar.xz) = 31136
diff --git a/japanese/fcitx-skk/files/patch-gui__CMakeLists.txt b/japanese/fcitx-skk/files/patch-gui__CMakeLists.txt
new file mode 100644
index 000000000000..66ccbef34728
--- /dev/null
+++ b/japanese/fcitx-skk/files/patch-gui__CMakeLists.txt
@@ -0,0 +1,8 @@
+--- ./gui/CMakeLists.txt.orig 2013-10-28 01:07:26.000000000 +0900
++++ ./gui/CMakeLists.txt 2014-03-20 13:44:23.000000000 +0900
+@@ -47,4 +47,4 @@
+ ${LIBSKK_LIBRARIES}
+ )
+
+-install(TARGETS fcitx-skk-config DESTINATION ${FCITX4_ADDON_INSTALL_DIR}/qt)
++install(TARGETS fcitx-skk-config DESTINATION ${FCITX4_ADDON_INSTALL_DESTDIR}/qt)
diff --git a/japanese/fcitx-skk/files/patch-src__CMakeLists.txt b/japanese/fcitx-skk/files/patch-src__CMakeLists.txt
new file mode 100644
index 000000000000..2d74a96758b7
--- /dev/null
+++ b/japanese/fcitx-skk/files/patch-src__CMakeLists.txt
@@ -0,0 +1,8 @@
+--- ./src/CMakeLists.txt.orig 2013-10-28 01:07:26.000000000 +0900
++++ ./src/CMakeLists.txt 2014-03-20 13:45:23.000000000 +0900
+@@ -15,4 +15,4 @@
+
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dictionary_list.in ${CMAKE_CURRENT_BINARY_DIR}/dictionary_list @ONLY)
+
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dictionary_list rule DESTINATION "${FCITX4_PREFIX}/share/fcitx/skk")
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dictionary_list rule DESTINATION "share/fcitx/skk")
diff --git a/japanese/fcitx-skk/pkg-descr b/japanese/fcitx-skk/pkg-descr
new file mode 100644
index 000000000000..36c6db9a5d7a
--- /dev/null
+++ b/japanese/fcitx-skk/pkg-descr
@@ -0,0 +1,3 @@
+fcitx-skk provides SKK as a back-end to the Fcitx IM framework.
+
+WWW: https://fcitx-im.org/wiki/Fcitx
diff --git a/japanese/fcitx-skk/pkg-plist b/japanese/fcitx-skk/pkg-plist
new file mode 100644
index 000000000000..64c35b3783b6
--- /dev/null
+++ b/japanese/fcitx-skk/pkg-plist
@@ -0,0 +1,13 @@
+share/fcitx/imicon/skk.png
+share/icons/hicolor/64x64/apps/fcitx-skk.png
+share/locale/de/LC_MESSAGES/fcitx-skk.mo
+share/locale/ja/LC_MESSAGES/fcitx-skk.mo
+share/locale/vi/LC_MESSAGES/fcitx-skk.mo
+share/locale/zh_CN/LC_MESSAGES/fcitx-skk.mo
+lib/fcitx/fcitx-skk.so
+%%QT4%%lib/fcitx/qt/libfcitx-skk-config.so
+share/fcitx/addon/fcitx-skk.conf
+share/fcitx/configdesc/fcitx-skk.desc
+share/fcitx/inputmethod/skk.conf
+share/fcitx/skk/dictionary_list
+share/fcitx/skk/rule
diff --git a/korean/fcitx-hangul/Makefile b/korean/fcitx-hangul/Makefile
index 332dff7f3a3d..51f3ff4a8840 100644
--- a/korean/fcitx-hangul/Makefile
+++ b/korean/fcitx-hangul/Makefile
@@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= fcitx-hangul
-PORTVERSION= 0.2.0
+PORTVERSION= 0.3.0
CATEGORIES= korean
-MASTER_SITES= GOOGLE_CODE
-PROJECTHOST= fcitx
+MASTER_SITES= http://download.fcitx-im.org/${PORTNAME}/
DIST_SUBDIR= fcitx
MAINTAINER= lichray@gmail.com
@@ -17,7 +16,6 @@ LIB_DEPENDS= libfcitx-config.so:${PORTSDIR}/chinese/fcitx \
libhangul.so:${PORTSDIR}/korean/libhangul
USES= cmake gettext pkgconfig tar:xz
-USE_GNOME= intltool
INSTALLS_ICONS= yes
CFLAGS+= -I${LOCALBASE}/include
diff --git a/korean/fcitx-hangul/distinfo b/korean/fcitx-hangul/distinfo
index d1626ec09c62..bf19abf68e9f 100644
--- a/korean/fcitx-hangul/distinfo
+++ b/korean/fcitx-hangul/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx-hangul-0.2.0.tar.xz) = 4dbb5e9de7472b5310610b15b85a3156c0f6427ef9dabfd060f230cee40e387c
-SIZE (fcitx/fcitx-hangul-0.2.0.tar.xz) = 25020
+SHA256 (fcitx/fcitx-hangul-0.3.0.tar.xz) = 978a66471eb200cc3807fe84e9b5f1392fefdcd51031e5a0bd8647fa994507cb
+SIZE (fcitx/fcitx-hangul-0.3.0.tar.xz) = 25600
diff --git a/korean/fcitx-hangul/files/patch-data__CMakeLists.txt b/korean/fcitx-hangul/files/patch-data__CMakeLists.txt
new file mode 100644
index 000000000000..3c6825fc7617
--- /dev/null
+++ b/korean/fcitx-hangul/files/patch-data__CMakeLists.txt
@@ -0,0 +1,10 @@
+--- ./data/CMakeLists.txt.orig 2013-07-01 06:07:48.000000000 +0900
++++ ./data/CMakeLists.txt 2014-03-20 13:22:18.000000000 +0900
+@@ -1,5 +1,5 @@
+-install(FILES symbol.txt DESTINATION ${FCITX4_PREFIX}/share/fcitx/hangul/)
+-install(FILES hangul.png DESTINATION ${FCITX4_PREFIX}/share/fcitx/imicon/)
++install(FILES symbol.txt DESTINATION share/fcitx/hangul/)
++install(FILES hangul.png DESTINATION share/fcitx/imicon/)
+ install(FILES hangul.png RENAME fcitx-hangul.png DESTINATION share/icons/hicolor/64x64/apps/)
+ install(FILES hanja_active.png RENAME fcitx-hanja-active.png DESTINATION share/icons/hicolor/48x48/status/)
+ install(FILES hanja_inactive.png RENAME fcitx-hanja-inactive.png DESTINATION share/icons/hicolor/48x48/status/)
diff --git a/korean/fcitx-hangul/pkg-descr b/korean/fcitx-hangul/pkg-descr
index a6cfb3f91883..341a09ac0983 100644
--- a/korean/fcitx-hangul/pkg-descr
+++ b/korean/fcitx-hangul/pkg-descr
@@ -1,3 +1,3 @@
fcitx-hangul provides Korean input back-end to the Fcitx IM framework.
-WWW: http://code.google.com/p/fcitx/
+WWW: https://fcitx-im.org/wiki/Fcitx
diff --git a/korean/fcitx-hangul/pkg-plist b/korean/fcitx-hangul/pkg-plist
index b840a3c8f1b4..a2708ef276c9 100644
--- a/korean/fcitx-hangul/pkg-plist
+++ b/korean/fcitx-hangul/pkg-plist
@@ -2,11 +2,13 @@ lib/fcitx/fcitx-hangul.so
share/fcitx/addon/fcitx-hangul.conf
share/fcitx/configdesc/fcitx-hangul.desc
share/fcitx/hangul/symbol.txt
+share/fcitx/imicon/hangul.png
share/fcitx/inputmethod/hangul.conf
-share/fcitx/skin/imicon/hangul.png
+share/icons/hicolor/48x48/status/fcitx-hanja-active.png
+share/icons/hicolor/48x48/status/fcitx-hanja-inactive.png
share/icons/hicolor/64x64/apps/fcitx-hangul.png
-share/icons/hicolor/64x64/status/fcitx-hanja-active.png
-share/icons/hicolor/64x64/status/fcitx-hanja-inactive.png
+share/locale/de/LC_MESSAGES/fcitx-hangul.mo
+share/locale/ja/LC_MESSAGES/fcitx-hangul.mo
share/locale/ko/LC_MESSAGES/fcitx-hangul.mo
share/locale/zh_CN/LC_MESSAGES/fcitx-hangul.mo
share/locale/zh_TW/LC_MESSAGES/fcitx-hangul.mo
diff --git a/textproc/fcitx-m17n/Makefile b/textproc/fcitx-m17n/Makefile
index 5a5ff9544377..deec5cc2f535 100644
--- a/textproc/fcitx-m17n/Makefile
+++ b/textproc/fcitx-m17n/Makefile
@@ -2,20 +2,19 @@
# $FreeBSD$
PORTNAME= fcitx-m17n
-PORTVERSION= 0.1.4
-PORTREVISION= 1
+PORTVERSION= 0.2.3
CATEGORIES= textproc
-MASTER_SITES= GOOGLE_CODE
-PROJECTHOST= fcitx
+MASTER_SITES= http://download.fcitx-im.org/${PORTNAME}/
DIST_SUBDIR= fcitx
MAINTAINER= lichray@gmail.com
COMMENT= Multilingualization support for Fcitx
+LICENSE= LGPL21
+
LIB_DEPENDS= libfcitx-config.so:${PORTSDIR}/chinese/fcitx \
libm17n.so:${PORTSDIR}/devel/m17n-lib
USES= cmake gettext pkgconfig tar:xz
-USE_GNOME= intltool
.include <bsd.port.mk>
diff --git a/textproc/fcitx-m17n/distinfo b/textproc/fcitx-m17n/distinfo
index 1c43bb9cbf99..354a4de18631 100644
--- a/textproc/fcitx-m17n/distinfo
+++ b/textproc/fcitx-m17n/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx-m17n-0.1.4.tar.xz) = 6e45a7659bb62b1d039ff75b011420a224a4d22be28bf1d7e787dabad3a77187
-SIZE (fcitx/fcitx-m17n-0.1.4.tar.xz) = 33176
+SHA256 (fcitx/fcitx-m17n-0.2.3.tar.xz) = 84f9a9ac9e8c94db0c124d1c9cafa352191894b4d04d926611c5b0759e86de39
+SIZE (fcitx/fcitx-m17n-0.2.3.tar.xz) = 33504
diff --git a/textproc/fcitx-m17n/files/patch-im__CMakeLists.txt b/textproc/fcitx-m17n/files/patch-im__CMakeLists.txt
new file mode 100644
index 000000000000..2389e33354ed
--- /dev/null
+++ b/textproc/fcitx-m17n/files/patch-im__CMakeLists.txt
@@ -0,0 +1,8 @@
+--- ./im/CMakeLists.txt.orig 2013-11-03 20:33:26.000000000 +0900
++++ ./im/CMakeLists.txt 2014-03-20 13:05:01.000000000 +0900
+@@ -31,4 +31,4 @@
+ LINK_LIBS ${M17N_LIBRARIES}
+ )
+
+-install(FILES default DESTINATION ${FCITX4_PREFIX}/share/fcitx/m17n)
++install(FILES default DESTINATION share/fcitx/m17n)
diff --git a/textproc/fcitx-m17n/pkg-descr b/textproc/fcitx-m17n/pkg-descr
index cfb88e069fb0..33b21d27a5a0 100644
--- a/textproc/fcitx-m17n/pkg-descr
+++ b/textproc/fcitx-m17n/pkg-descr
@@ -1,4 +1,4 @@
fcitx-m17n provides the libm17n, a multilingual input method engine,
as a back-end to the Fcitx IM framework.
-WWW: http://code.google.com/p/fcitx/
+WWW: https://fcitx-im.org/wiki/Fcitx
diff --git a/textproc/fcitx-m17n/pkg-plist b/textproc/fcitx-m17n/pkg-plist
index a3045fb97387..a7702b105b60 100644
--- a/textproc/fcitx-m17n/pkg-plist
+++ b/textproc/fcitx-m17n/pkg-plist
@@ -2,5 +2,7 @@ lib/fcitx/fcitx-m17n.so
share/fcitx/addon/fcitx-m17n.conf
share/fcitx/configdesc/fcitx-m17n.desc
share/fcitx/m17n/default
+share/locale/de/LC_MESSAGES/fcitx-m17n.mo
+share/locale/ja/LC_MESSAGES/fcitx-m17n.mo
share/locale/zh_CN/LC_MESSAGES/fcitx-m17n.mo
share/locale/zh_TW/LC_MESSAGES/fcitx-m17n.mo