10 files changed, 37 insertions, 48 deletions

diff --git a/chinese/fcitx-configtool/Makefile b/chinese/fcitx-configtool/Makefile
index 669cae3bde5b..397ea32a76d8 100644
--- a/chinese/fcitx-configtool/Makefile
+++ b/chinese/fcitx-configtool/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	fcitx-configtool
-# Date created:				09 Nov 2011
-# Whom:			Zhihao Yuan <lichray@gmail.com>
-#
+# Created by: Zhihao Yuan <lichray@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	fcitx-configtool
-PORTVERSION=	0.4.5
+PORTVERSION=	0.4.5.1
 CATEGORIES=	chinese x11
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DIST_SUBDIR=	fcitx
@@ -23,12 +19,12 @@ USE_GNOME=	intltool gnomehack
 USE_GETTEXT=	yes
 USE_CMAKE=	yes
 
-OPTIONS=	GTK2		"Enable Gtk2 Version" on \
-		GTK3		"Enable Gtk3 Version" off
+OPTIONS_DEFINE=	GTK2 GTK3
+OPTIONS_DEFAULT=GTK2
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
 CMAKE_ARGS+=	-DENABLE_GTK2=ON
 USE_GNOME+=	gtk20
 PLIST_SUB+=	GTK2=""
@@ -36,7 +32,7 @@ PLIST_SUB+=	GTK2=""
 PLIST_SUB+=	GTK2="@comment "
 .endif
 
-.if defined(WITH_GTK3)
+.if ${PORT_OPTIONS:MGTK3}
 USE_GNOME+=	gtk30
 PLIST_SUB+=	GTK3=""
 .else
@@ -44,7 +40,7 @@ CMAKE_ARGS+=	-DENABLE_GTK3=OFF
 PLIST_SUB+=	GTK3="@comment "
 .endif
 
-.if defined(WITHOUT_GTK2) && defined(WITHOUT_GTK3)
+.if !${PORT_OPTIONS:MGTK2} && !${PORT_OPTIONS:MGTK3}
 IGNORE=		a GUI is required
 .endif
 
diff --git a/chinese/fcitx-configtool/distinfo b/chinese/fcitx-configtool/distinfo
index 30a4bf47d3a2..704c019d3ca5 100644
--- a/chinese/fcitx-configtool/distinfo
+++ b/chinese/fcitx-configtool/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx-configtool-0.4.5.tar.xz) = 474ff8635e29e29b6b6f37efe698e2b4264efaba55448a13d0b46d696887c8c1
-SIZE (fcitx/fcitx-configtool-0.4.5.tar.xz) = 42036
+SHA256 (fcitx/fcitx-configtool-0.4.5.1.tar.xz) = bde3097a073dba733633c33d9b4834acdb46295fed7fc5d95dda3a2260f91e28
+SIZE (fcitx/fcitx-configtool-0.4.5.1.tar.xz) = 42468
diff --git a/chinese/fcitx-googlepinyin/Makefile b/chinese/fcitx-googlepinyin/Makefile
index 854b9ff714b6..930cf3f418ac 100644
--- a/chinese/fcitx-googlepinyin/Makefile
+++ b/chinese/fcitx-googlepinyin/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	fcitx-googlepinyin
-# Date created:				11 Nov 2011
-# Whom:			Zhihao Yuan <lichray@gmail.com>
-#
+# Created by: Zhihao Yuan <lichray@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	fcitx-googlepinyin
-PORTVERSION=	0.1.5
-PORTREVISION=	1
+PORTVERSION=	0.1.6
 CATEGORIES=	chinese
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DIST_SUBDIR=	fcitx
@@ -15,8 +10,8 @@ DIST_SUBDIR=	fcitx
 MAINTAINER=	lichray@gmail.com
 COMMENT=	A libgooglepinyin support for Fcitx
 
-LIB_DEPENDS=	fcitx-config.4:${PORTSDIR}/chinese/fcitx \
-		googlepinyin.0:${PORTSDIR}/chinese/libgooglepinyin
+LIB_DEPENDS=	fcitx-config:${PORTSDIR}/chinese/fcitx \
+		googlepinyin:${PORTSDIR}/chinese/libgooglepinyin
 
 USE_XZ=		yes
 USE_GETTEXT=	yes
diff --git a/chinese/fcitx-googlepinyin/distinfo b/chinese/fcitx-googlepinyin/distinfo
index 959983df8c8b..80951f271565 100644
--- a/chinese/fcitx-googlepinyin/distinfo
+++ b/chinese/fcitx-googlepinyin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx-googlepinyin-0.1.5.tar.xz) = f74ac4b40d11002a0dfc49572475a9b9d9671755b9c77bbc7a091d6e0849ab8d
-SIZE (fcitx/fcitx-googlepinyin-0.1.5.tar.xz) = 20776
+SHA256 (fcitx/fcitx-googlepinyin-0.1.6.tar.xz) = 29a5506ed45d26534f7bcbca1c56138984dcc7e99a42652c6a49fe20ec0da781
+SIZE (fcitx/fcitx-googlepinyin-0.1.6.tar.xz) = 24080
diff --git a/chinese/fcitx-googlepinyin/pkg-plist b/chinese/fcitx-googlepinyin/pkg-plist
index 296a8b9afb2f..98c329777013 100644
--- a/chinese/fcitx-googlepinyin/pkg-plist
+++ b/chinese/fcitx-googlepinyin/pkg-plist
@@ -1,6 +1,10 @@
 lib/fcitx/fcitx-googlepinyin.so
 share/fcitx/addon/fcitx-googlepinyin.conf
-share/fcitx/configdesc/fcitx-googlepinyin.desc
 share/fcitx/inputmethod/googlepinyin.conf
+share/fcitx/imicon/googlepinyin.png
+share/fcitx/skin/default/googlepinyin.png
+share/fcitx/skin/classic/googlepinyin.png
+share/icons/hicolor/16x16/apps/fcitx-googlepinyin.png
+share/icons/hicolor/48x48/apps/fcitx-googlepinyin.png
 share/locale/zh_CN/LC_MESSAGES/fcitx-googlepinyin.mo
 share/locale/zh_TW/LC_MESSAGES/fcitx-googlepinyin.mo
diff --git a/chinese/fcitx-libpinyin/Makefile b/chinese/fcitx-libpinyin/Makefile
index 908e95980a81..bc6118139451 100644
--- a/chinese/fcitx-libpinyin/Makefile
+++ b/chinese/fcitx-libpinyin/Makefile
@@ -1,24 +1,20 @@
-# New ports collection makefile for:	fcitx-libpinyin
-# Date created:				7 Apr 2012
-# Whom:			Zhihao Yuan <lichray@gmail.com>
-#
+# Created by: Zhihao Yuan <lichray@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	fcitx-libpinyin
-PORTVERSION=	0.2.0
+PORTVERSION=	0.2.1
 CATEGORIES=	chinese
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
 		http://cloud.github.com/downloads/fcitx/fcitx-libpinyin/:libpinyin
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} model.text.tar.gz:libpinyin
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} model.text.${MDVER}.tar.gz:libpinyin
 DIST_SUBDIR=	fcitx
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	lichray@gmail.com
 COMMENT=	The libpinyin support for Fcitx
 
-LIB_DEPENDS=	fcitx-config.4:${PORTSDIR}/chinese/fcitx \
-		pinyin.2:${PORTSDIR}/chinese/libpinyin
+LIB_DEPENDS=	fcitx-config:${PORTSDIR}/chinese/fcitx \
+		pinyin:${PORTSDIR}/chinese/libpinyin
 
 USE_LDCONFIG=	${PREFIX}/lib/fcitx/
 USE_XZ=		yes
@@ -28,8 +24,9 @@ USE_GNOME=	intltool
 INSTALLS_ICONS=	yes
 
 post-patch:
-	@${LN} -s ${_DISTDIR}/model.text.tar.gz ${WRKSRC}/data
+	@${LN} -s ${_DISTDIR}/model.text.${MDVER}.tar.gz ${WRKSRC}/data
 
 PROJECTHOST=	fcitx
+MDVER=		20120921
 
 .include <bsd.port.mk>
diff --git a/chinese/fcitx-libpinyin/distinfo b/chinese/fcitx-libpinyin/distinfo
index b6ef01180bc7..3b54d009ff38 100644
--- a/chinese/fcitx-libpinyin/distinfo
+++ b/chinese/fcitx-libpinyin/distinfo
@@ -1,4 +1,4 @@
-SHA256 (fcitx/fcitx-libpinyin-0.2.0.tar.xz) = b39649d4e4ebb4b054ea520fe80efd520b273d42223d6d8c0b699b11fa4cd039
-SIZE (fcitx/fcitx-libpinyin-0.2.0.tar.xz) = 24464
-SHA256 (fcitx/model.text.tar.gz) = 8d87d9c0b622f3163976a8c8bc57ded878cf0dee63c855b8a7afd36a151114eb
-SIZE (fcitx/model.text.tar.gz) = 9991219
+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
diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
index 99f258598738..2b9a845a3c97 100644
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	Free Chinese Input Toy for X
-# Date created:				26 March 2003
-# Whom:			Shen Chuan-Hsing <statue@freebsd.sinica.edu.tw>
-#
+# Created by: Shen Chuan-Hsing <statue@freebsd.sinica.edu.tw>
 # $FreeBSD$
-#
 
 PORTNAME=	fcitx
-PORTVERSION=	4.2.6
+PORTVERSION=	4.2.6.1
 CATEGORIES=	chinese x11
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -41,6 +37,7 @@ USE_CMAKE=	yes
 INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=	GTK2 GTK3 QT4 OPENCC TPUNC
+OPTIONS_DEFAULT=GTK2
 
 GTK2_DESC=	Enable Gtk2 IM module
 GTK3_DESC=	Enable Gtk3 IM module
diff --git a/chinese/fcitx/distinfo b/chinese/fcitx/distinfo
index b14be62d7cc1..0c76965c77f3 100644
--- a/chinese/fcitx/distinfo
+++ b/chinese/fcitx/distinfo
@@ -1,5 +1,5 @@
-SHA256 (fcitx/fcitx-4.2.6.tar.xz) = 13479bca8d7f420f486f1e2ea733dc9a0060f18c0f08b415c3c56694f2fd775e
-SIZE (fcitx/fcitx-4.2.6.tar.xz) = 1439664
+SHA256 (fcitx/fcitx-4.2.6.1.tar.xz) = b3b1fa548163701ca6009fa71362668eb973bffa8067f039d7cbe643e4769ab1
+SIZE (fcitx/fcitx-4.2.6.1.tar.xz) = 1442744
 SHA256 (fcitx/pinyin.tar.gz) = 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1
 SIZE (fcitx/pinyin.tar.gz) = 1608886
 SHA256 (fcitx/table.tar.gz) = 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7
diff --git a/chinese/fcitx/pkg-plist b/chinese/fcitx/pkg-plist
index 50bd6818b5d3..8b32a2a06523 100644
--- a/chinese/fcitx/pkg-plist
+++ b/chinese/fcitx/pkg-plist
@@ -91,7 +91,7 @@ share/gir-1.0/Fcitx-1.0.gir
 %%GTK3%%lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-fcitx.so
 %%GTK3%%@exec gtk-query-immodules-3.0 > %%LOCALBASE%%/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache
 %%GTK3%%@unexec gtk-query-immodules-3.0 > %%LOCALBASE%%/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache
-%%QT4%%lib/qt4/plugins/inputmethods/qtim-fcitx.so
+%%QT4%%lib/qt4/plugins/inputmethods/libqtim-fcitx.so
 %%QT4%%@dirrmtry lib/qt4/plugins/inputmethods
 %%QT4%%@dirrmtry lib/qt4/plugins
 libdata/pkgconfig/fcitx-config.pc