5 files changed, 60 insertions, 41 deletions

diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
index ee2a2c71356c..33e0c550a48f 100644
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fcitx
-PORTVERSION=	4.2.0
+PORTVERSION=	4.2.2
 CATEGORIES=	chinese x11
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} pinyin.tar.gz table.tar.gz
@@ -14,7 +14,7 @@ DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	lichray@gmail.com
-COMMENT=	A simple and fast GBK Chinese XIM server
+COMMENT=	A Flexible Input Method Framework
 
 LICENSE=	GPLv2
 
@@ -25,7 +25,7 @@ RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 MAN1=	createPYMB.1 fcitx-remote.1 fcitx.1 mb2org.1 mb2txt.1 \
 	readPYBase.1 readPYMB.1 scel2org.1 txt2mb.1
 
-USE_BZIP2=	yes
+USE_XZ=	yes
 USE_GNOME=	pango intltool gnomehack
 USE_GETTEXT=	yes
 USE_XORG=	x11 xext
diff --git a/chinese/fcitx/distinfo b/chinese/fcitx/distinfo
index c3c371ae2707..4b8e4ddfe548 100644
--- a/chinese/fcitx/distinfo
+++ b/chinese/fcitx/distinfo
@@ -1,6 +1,6 @@
-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/fcitx-4.2.2.tar.xz) = 1d18096232a700ddcf059e737b6acb2b292e5a4ae5d4bc2714e4f599e4e6daa6
+SIZE (fcitx/fcitx-4.2.2.tar.xz) = 585936
+SHA256 (fcitx/pinyin.tar.gz) = 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1
+SIZE (fcitx/pinyin.tar.gz) = 1608886
 SHA256 (fcitx/table.tar.gz) = 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7
 SIZE (fcitx/table.tar.gz) = 4144686
diff --git a/chinese/fcitx/files/tpunc-data_punc.mb.zh_CN b/chinese/fcitx/files/tpunc-data_punc.mb.zh_CN
index b8b2cc7ab85a..34981732bf3b 100644
--- a/chinese/fcitx/files/tpunc-data_punc.mb.zh_CN
+++ b/chinese/fcitx/files/tpunc-data_punc.mb.zh_CN
@@ -1,22 +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
+--- data/punc.mb.zh_CN.orig	2012-02-01 10:41:59.000000000 -0600
++++ data/punc.mb.zh_CN	2012-03-05 09:20:53.636598589 -0600
 @@ -1,10 +1,10 @@
- . 。
- , ，
- ? ？
--" “ ”
-+" 「 」
- : ：
- ; ；
--' ‘ ’
-+' 『 』
- < 《
- > 》
- \ 、
-@@ -17,4 +17,4 @@ _ ——
- ) ）
- [ ·
- ] ï¼» ï¼½
--~ ～
+ . 。
+ , ，
+ ? ？
+-" “ ”
++" 「 」
+ : ：
+ ; ；
+-' ‘ ’
++' 『 』
+ < 《
+ > 》
+ \ 、
+@@ -17,4 +17,4 @@ _ ——
+ ) ）
+ [ ·
+ ] ［ ］
+-~ ～
 \ No newline at end of file
-+~ ～
++~ ～
diff --git a/chinese/fcitx/pkg-descr b/chinese/fcitx/pkg-descr
index 0deaca11a74d..4bec106ce790 100644
--- a/chinese/fcitx/pkg-descr
+++ b/chinese/fcitx/pkg-descr
@@ -1,7 +1,4 @@
-Fcitx is a simple and fast GBK Chinese XIM server.  It stands for Free
-Chinese Input Toy for X, an input method for Unix-like operating systems.
-To be more precise, it is a collection of Simplified Chinese input methods
-based on XIM (X Input Method), including WuBi, PinYin, and QuWei, and is
-distributed under GPL.  It is the descendent of gWuBi.
+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/
diff --git a/chinese/fcitx/pkg-plist b/chinese/fcitx/pkg-plist
index 27bf8ba112e8..ce9fadc700f4 100644
--- a/chinese/fcitx/pkg-plist
+++ b/chinese/fcitx/pkg-plist
@@ -100,6 +100,7 @@ share/cmake/fcitx/FcitxMacro.cmake
 %%DATADIR%%/configdesc/fcitx-chttrans.desc
 %%DATADIR%%/configdesc/fcitx-classic-ui.desc
 %%DATADIR%%/configdesc/fcitx-pinyin.desc
+%%DATADIR%%/configdesc/fcitx-quickphrase.desc
 %%DATADIR%%/configdesc/fcitx-xim.desc
 %%DATADIR%%/configdesc/inputmethod.desc
 %%DATADIR%%/configdesc/profile.desc
@@ -132,6 +133,7 @@ share/cmake/fcitx/FcitxMacro.cmake
 %%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
@@ -164,6 +166,7 @@ share/cmake/fcitx/FcitxMacro.cmake
 %%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
@@ -197,6 +200,7 @@ share/cmake/fcitx/FcitxMacro.cmake
 %%DATADIR%%/skin/default/fullwidth_inactive.png
 %%DATADIR%%/skin/default/inactive.png
 %%DATADIR%%/skin/default/input.png
+%%DATADIR%%/skin/default/kbd.png
 %%DATADIR%%/skin/default/keyboard.png
 %%DATADIR%%/skin/default/logo.png
 %%DATADIR%%/skin/default/menu.png
@@ -231,6 +235,13 @@ share/cmake/fcitx/FcitxMacro.cmake
 %%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/icons/hicolor/128x128/apps/fcitx.png
 share/icons/hicolor/16x16/apps/fcitx.png
 share/icons/hicolor/16x16/status/fcitx-fullwidth-active.png
@@ -240,6 +251,14 @@ 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.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.png
 share/icons/hicolor/24x24/status/fcitx-fullwidth-active.png
 share/icons/hicolor/24x24/status/fcitx-fullwidth-inactive.png
@@ -269,19 +288,22 @@ 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/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/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
+@dirrmtry share/icons/gnome/scalable/status
+@dirrmtry share/icons/gnome/scalable
+@dirrmtry share/icons/gnome
+@dirrmtry share/icons/hicolor/scalable/status
+@dirrmtry share/icons/hicolor/scalable
 @dirrm %%DATADIR%%/table
 @dirrm %%DATADIR%%/skin/default
 @dirrm %%DATADIR%%/skin/dark