Update fcitx and friends:

 - fcitx to 4.2.0, always depend on dbus
 - fcitx-cloudpinyin to 0.2.0
 - fcitx-configtool to 0.4.0
 - fcitx-googlepinyin to 0.1.4
 - fcitx-sunpinyin to 0.3.3
 - fcitx-ui-light to 0.1.3
 - libgooglepinyin to 0.1.2

PR:		ports/164820
Submitted by:	maintainer (Zhihao Yuan <lichray gmail com>

8 files changed, 91 insertions, 75 deletions

diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
index fd6bec77e1f8..ee2a2c71356c 100644
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fcitx
-PORTVERSION=	4.1.2
+PORTVERSION=	4.2.0
 CATEGORIES=	chinese x11
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} pinyin.tar.gz table.tar.gz
@@ -18,7 +18,8 @@ COMMENT=	A simple and fast GBK Chinese XIM server
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo \
+		dbus-1.3:${PORTSDIR}/devel/dbus
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 
 MAN1=	createPYMB.1 fcitx-remote.1 fcitx.1 mb2org.1 mb2txt.1 \
@@ -35,7 +36,8 @@ INSTALLS_ICONS=	yes
 OPTIONS=	GTK2		"Enable Gtk2 IM module" off \
 		GTK3		"Enable Gtk3 IM module" off \
 		QT4		"Enable Qt4 IM module" off \
-		DBUS		"Enable D-Bus for KIMPanel support" off
+		OPENCC		"Enable OpenCC for Chinese Transform" off \
+		TPUNC		"Use traditional quotation marks" off
 
 .include <bsd.port.options.mk>
 
@@ -57,12 +59,14 @@ QT_COMPONENTS=	gui
 CMAKE_ARGS+=	-DENABLE_QT_IM_MODULE=ON
 .endif
 
-.if defined(WITH_DBUS)
-LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
-PLIST_SUB+=	DBUS=""
+.if defined(WITH_OPENCC)
+LIB_DEPENDS+=	opencc.1:${PORTSDIR}/chinese/opencc
 .else
-CMAKE_ARGS+=	-DENABLE_DBUS=OFF
-PLIST_SUB+=	DBUS="@comment "
+CMAKE_ARGS+=	-DENABLE_OPENCC=OFF
+.endif
+
+.if defined(WITH_TPUNC)
+EXTRA_PATCHES+=	${FILESDIR}/tpunc-data_punc.mb.zh_CN
 .endif
 
 .if defined(WITH_DEBUG)
diff --git a/chinese/fcitx/distinfo b/chinese/fcitx/distinfo
index 403ed8c250de..c3c371ae2707 100644
--- a/chinese/fcitx/distinfo
+++ b/chinese/fcitx/distinfo
@@ -1,5 +1,5 @@
-SHA256 (fcitx/fcitx-4.1.2.tar.bz2) = cf61355fcd8457df9bac7c1f88dff6781eeba5f9466905c2d8d3b872133c99ae
-SIZE (fcitx/fcitx-4.1.2.tar.bz2) = 764998
+SHA256 (fcitx/fcitx-4.2.0.tar.bz2) = 1410141f91321ec0c2514b8a9b3ff13ce3af82841036264f5a8b7ad005b139e5
+SIZE (fcitx/fcitx-4.2.0.tar.bz2) = 785160
 SHA256 (fcitx/pinyin.tar.gz) = bf8c581450f9fac0eab0498927d1d5e5c1cd465ed9937e4d9362ca9d67920fa4
 SIZE (fcitx/pinyin.tar.gz) = 1613447
 SHA256 (fcitx/table.tar.gz) = 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7
diff --git a/chinese/fcitx/files/patch-data_script_fcitx-configtool b/chinese/fcitx/files/patch-data_script_fcitx-configtool
deleted file mode 100644
index f805c706eb11..000000000000
--- a/chinese/fcitx/files/patch-data_script_fcitx-configtool
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./data/script/fcitx-configtool~	2011-10-02 05:43:11.000000000 -0500
-+++ ./data/script/fcitx-configtool	2011-11-09 21:18:23.600500583 -0600
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #--------------------------------------
- # fcitx-config
- #
-@@ -61,4 +61,4 @@ case "$DE" in
-     *)
-         run_gtk
-         ;;
--esac
-\ No newline at end of file
-+esac
diff --git a/chinese/fcitx/files/patch-src_lib_fcitx-config_CMakeLists.txt b/chinese/fcitx/files/patch-src_lib_fcitx-config_CMakeLists.txt
index cf509d11eaae..e944723c786d 100644
--- a/chinese/fcitx/files/patch-src_lib_fcitx-config_CMakeLists.txt
+++ b/chinese/fcitx/files/patch-src_lib_fcitx-config_CMakeLists.txt
@@ -1,14 +1,5 @@
 --- 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
-@@ -15,7 +15,7 @@ add_library(fcitx-config SHARED ${FCITX_
- target_link_libraries(fcitx-config fcitx-utils)
- set_target_properties(fcitx-config
-                       PROPERTIES VERSION 4.1.0
--                      SOVERSION 4.1
-+                      SOVERSION 4
-                       COMPILE_FLAGS "-fvisibility=hidden"
-                       LINK_FLAGS "-Wl,--no-undefined"
- )
 @@ -23,7 +23,7 @@ set_target_properties(fcitx-config
  configure_file(fcitx-config.pc.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx-config.pc)
  
diff --git a/chinese/fcitx/files/patch-src_lib_fcitx-utils_CMakeLists.txt b/chinese/fcitx/files/patch-src_lib_fcitx-utils_CMakeLists.txt
index 48bfd69e9629..c2855c686453 100644
--- a/chinese/fcitx/files/patch-src_lib_fcitx-utils_CMakeLists.txt
+++ b/chinese/fcitx/files/patch-src_lib_fcitx-utils_CMakeLists.txt
@@ -1,14 +1,5 @@
 --- 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
-@@ -21,7 +21,7 @@ endif (LIBKVM_FOUND)
- add_library(fcitx-utils SHARED ${FCITX_UTILS_SOURCES})
- set_target_properties(fcitx-utils
-                       PROPERTIES VERSION 0.1.0
--                      SOVERSION 0.1
-+                      SOVERSION 0
-                       COMPILE_FLAGS "-fvisibility=hidden"
-                       LINK_FLAGS "-Wl,--no-undefined"
- )
 @@ -34,7 +34,7 @@ endif (LIBKVM_FOUND)
  configure_file(fcitx-utils.pc.in ${CMAKE_CURRENT_BINARY_DIR}/fcitx-utils.pc)
  
diff --git a/chinese/fcitx/files/patch-src_lib_fcitx_CMakeLists.txt b/chinese/fcitx/files/patch-src_lib_fcitx_CMakeLists.txt
index 471685706b9b..24826ca7f76c 100644
--- a/chinese/fcitx/files/patch-src_lib_fcitx_CMakeLists.txt
+++ b/chinese/fcitx/files/patch-src_lib_fcitx_CMakeLists.txt
@@ -1,14 +1,5 @@
 --- 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
-@@ -32,7 +32,7 @@ link_directories(${DL_LIBRARY_DIRS} ${PT
- add_library(fcitx-core SHARED ${LIBFCITX_SOURCES})
- set_target_properties(fcitx-core
-                       PROPERTIES VERSION 0.2.0
--                      SOVERSION 0.2
-+                      SOVERSION 0
-                       COMPILE_FLAGS "-fvisibility=hidden"
-                       LINK_FLAGS "-Wl,--no-undefined"
- )
 @@ -41,7 +41,7 @@ configure_file(fcitx.pc.in ${CMAKE_CURRE
  
  target_link_libraries(fcitx-core fcitx-config fcitx-utils ${DL_LIBRARIES} ${PTHREAD_LIBRARIES})
diff --git a/chinese/fcitx/files/tpunc-data_punc.mb.zh_CN b/chinese/fcitx/files/tpunc-data_punc.mb.zh_CN
new file mode 100644
index 000000000000..b8b2cc7ab85a
--- /dev/null
+++ b/chinese/fcitx/files/tpunc-data_punc.mb.zh_CN
@@ -0,0 +1,22 @@
+--- data/punc.mb.zh_CN~	2012-02-01 10:41:59.000000000 -0600
++++ data/punc.mb.zh_CN	2012-02-06 01:32:03.879099301 -0600
+@@ -1,10 +1,10 @@
+ . 。
+ , ，
+ ? ？
+-" “ ”
++" 「 」
+ : ：
+ ; ；
+-' ‘ ’
++' 『 』
+ < 《
+ > 》
+ \ 、
+@@ -17,4 +17,4 @@ _ ——
+ ) ）
+ [ ·
+ ] ï¼» ï¼½
+-~ ～
+\ No newline at end of file
++~ ～
diff --git a/chinese/fcitx/pkg-plist b/chinese/fcitx/pkg-plist
index 51adc81755cf..27bf8ba112e8 100644
--- a/chinese/fcitx/pkg-plist
+++ b/chinese/fcitx/pkg-plist
@@ -14,6 +14,7 @@ include/fcitx-config/fcitx-config.h
 include/fcitx-config/hotkey.h
 include/fcitx-config/xdg.h
 include/fcitx-utils/log.h
+include/fcitx-utils/memory.h
 include/fcitx-utils/utarray.h
 include/fcitx-utils/utf8.h
 include/fcitx-utils/uthash.h
@@ -21,6 +22,7 @@ include/fcitx-utils/utils.h
 include/fcitx/addon.h
 include/fcitx/candidate.h
 include/fcitx/configfile.h
+include/fcitx/context.h
 include/fcitx/fcitx.h
 include/fcitx/frontend.h
 include/fcitx/hook.h
@@ -28,9 +30,10 @@ include/fcitx/ime.h
 include/fcitx/instance.h
 include/fcitx/keys.h
 include/fcitx/module.h
+include/fcitx/module/chttrans/chttrans.h
 include/fcitx/module/classicui/classicuiinterface.h
-%%DBUS%%include/fcitx/module/dbus/dbusstuff.h
-%%DBUS%%include/fcitx/module/ipc/ipc.h
+include/fcitx/module/dbus/dbusstuff.h
+include/fcitx/module/ipc/ipc.h
 include/fcitx/module/pinyin/pydef.h
 include/fcitx/module/punc/punc.h
 include/fcitx/module/x11/x11stuff.h
@@ -39,10 +42,10 @@ include/fcitx/ui.h
 lib/fcitx/fcitx-autoeng.so
 lib/fcitx/fcitx-chttrans.so
 lib/fcitx/fcitx-classic-ui.so
-%%DBUS%%lib/fcitx/fcitx-dbus.so
+lib/fcitx/fcitx-dbus.so
 lib/fcitx/fcitx-fullwidth-char.so
-%%DBUS%%lib/fcitx/fcitx-ipc.so
-%%DBUS%%lib/fcitx/fcitx-kimpanel-ui.so
+lib/fcitx/fcitx-ipc.so
+lib/fcitx/fcitx-kimpanel-ui.so
 lib/fcitx/fcitx-pinyin.so
 lib/fcitx/fcitx-punc.so
 lib/fcitx/fcitx-quickphrase.so
@@ -54,18 +57,17 @@ lib/fcitx/fcitx-x11.so
 lib/fcitx/fcitx-xim.so
 lib/libfcitx-config.so
 lib/libfcitx-config.so.4
-lib/libfcitx-config.so.4.1.0
+lib/libfcitx-config.so.4.1
 lib/libfcitx-core.so
 lib/libfcitx-core.so.0
-lib/libfcitx-core.so.0.2.0
+lib/libfcitx-core.so.0.3
 lib/libfcitx-utils.so
 lib/libfcitx-utils.so.0
-lib/libfcitx-utils.so.0.1.0
+lib/libfcitx-utils.so.0.1
 libdata/pkgconfig/fcitx-config.pc
 libdata/pkgconfig/fcitx-utils.pc
 libdata/pkgconfig/fcitx.pc
 share/applications/fcitx-configtool.desktop
-%%DBUS%%share/applications/fcitx-kimpanel.desktop
 share/applications/fcitx-skin-installer.desktop
 share/applications/fcitx.desktop
 share/cmake/fcitx/FcitxConfig.cmake
@@ -80,10 +82,10 @@ share/cmake/fcitx/FcitxMacro.cmake
 %%DATADIR%%/addon/fcitx-autoeng.conf
 %%DATADIR%%/addon/fcitx-chttrans.conf
 %%DATADIR%%/addon/fcitx-classic-ui.conf
-%%DBUS%%%%DATADIR%%/addon/fcitx-dbus.conf
+%%DATADIR%%/addon/fcitx-dbus.conf
 %%DATADIR%%/addon/fcitx-fullwidth-char.conf
-%%DBUS%%%%DATADIR%%/addon/fcitx-ipc.conf
-%%DBUS%%%%DATADIR%%/addon/fcitx-kimpanel-ui.conf
+%%DATADIR%%/addon/fcitx-ipc.conf
+%%DATADIR%%/addon/fcitx-kimpanel-ui.conf
 %%DATADIR%%/addon/fcitx-pinyin.conf
 %%DATADIR%%/addon/fcitx-punc.conf
 %%DATADIR%%/addon/fcitx-quickphrase.conf
@@ -99,13 +101,18 @@ share/cmake/fcitx/FcitxMacro.cmake
 %%DATADIR%%/configdesc/fcitx-classic-ui.desc
 %%DATADIR%%/configdesc/fcitx-pinyin.desc
 %%DATADIR%%/configdesc/fcitx-xim.desc
+%%DATADIR%%/configdesc/inputmethod.desc
 %%DATADIR%%/configdesc/profile.desc
 %%DATADIR%%/configdesc/skin.desc
 %%DATADIR%%/configdesc/table.desc
 %%DATADIR%%/data/AutoEng.dat
 %%DATADIR%%/data/gbks2t.tab
-%%DATADIR%%/data/punc.mb
+%%DATADIR%%/data/punc.mb.zh_CN
+%%DATADIR%%/data/punc.mb.zh_TW
 %%DATADIR%%/data/vk.conf
+%%DATADIR%%/inputmethod/pinyin.conf
+%%DATADIR%%/inputmethod/qw.conf
+%%DATADIR%%/inputmethod/shuangpin.conf
 %%DATADIR%%/pinyin/pySym.mb
 %%DATADIR%%/pinyin/pybase.mb
 %%DATADIR%%/pinyin/pyphrase.mb
@@ -226,38 +233,62 @@ share/cmake/fcitx/FcitxMacro.cmake
 %%DATADIR%%/table/zrm.mb
 share/icons/hicolor/128x128/apps/fcitx.png
 share/icons/hicolor/16x16/apps/fcitx.png
-share/icons/hicolor/22x22/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/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/32x32/status/fcitx-fullwidth-active.png
-share/icons/hicolor/32x32/status/fcitx-fullwidth-inactive.png
-share/icons/hicolor/32x32/status/fcitx-punc-active.png
-share/icons/hicolor/32x32/status/fcitx-punc-inactive.png
-share/icons/hicolor/32x32/status/fcitx-vk-active.png
-share/icons/hicolor/32x32/status/fcitx-vk-inactive.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-eng.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/scabable/status/fcitx-fullwidth-active.svg
+share/icons/hicolor/scabable/status/fcitx-fullwidth-inactive.svg
+share/icons/hicolor/scabable/status/fcitx-kbd.svg
+share/icons/hicolor/scabable/status/fcitx-punc-active.svg
+share/icons/hicolor/scabable/status/fcitx-punc-inactive.svg
+share/icons/hicolor/scabable/status/fcitx-vk-active.svg
+share/icons/hicolor/scabable/status/fcitx-vk-inactive.svg
 share/locale/zh_CN/LC_MESSAGES/fcitx.mo
+share/locale/zh_TW/LC_MESSAGES/fcitx.mo
 share/mime/packages/x-fskin.xml
 @dirrmtry share/applications
+@dirrmtry share/icons/hicolor/scabable/status
+@dirrmtry share/icons/hicolor/scabable
 @dirrm %%DATADIR%%/table
 @dirrm %%DATADIR%%/skin/default
 @dirrm %%DATADIR%%/skin/dark
 @dirrm %%DATADIR%%/skin/classic
 @dirrm %%DATADIR%%/skin
 @dirrm %%DATADIR%%/pinyin
+@dirrm %%DATADIR%%/inputmethod
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%/configdesc
 @dirrm %%DATADIR%%/addon
@@ -268,9 +299,10 @@ share/mime/packages/x-fskin.xml
 @dirrm include/fcitx/module/x11
 @dirrm include/fcitx/module/punc
 @dirrm include/fcitx/module/pinyin
-%%DBUS%%@dirrm include/fcitx/module/ipc
-%%DBUS%%@dirrm include/fcitx/module/dbus
+@dirrm include/fcitx/module/ipc
+@dirrm include/fcitx/module/dbus
 @dirrm include/fcitx/module/classicui
+@dirrm include/fcitx/module/chttrans
 @dirrm include/fcitx/module
 @dirrm include/fcitx-utils
 @dirrm include/fcitx-config