- Update to 4.0.0

PR:		ports/152615
Submitted by:	Denise H. G. <darcsis@gmail.com> (maintainer)

11 files changed, 300 insertions, 71 deletions

diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
index ec9cde4c1d5b..cd398b9e1edc 100644
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -6,23 +6,28 @@
 #
 
 PORTNAME=	fcitx
-PORTVERSION=	3.6.3
+PORTVERSION=	4.0.0
 CATEGORIES=	chinese x11
-MASTER_SITES=	http://www.fcitx.org/download/ \
-		ftp://mirrors.redv.com/pub/fcitx/
+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} pinyin.tar.gz table.tar.gz
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	darcsis@gmail.com
 COMMENT=	A simple and fast GBK Chinese XIM server
 
+LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo
+
 LICENSE=	GPLv2
 
-USE_BZIP2=	yes
+DIST_SUBDIR=	fcitx
+USE_GNOME=	pango intltool
 USE_XORG=	xpm x11 xtst
-USE_ICONV=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
 OPTIONS=	XFT		"Use Xft for Freetype font support" on \
+		TRAY		"Enable system tray support" on \
 		DBUS		"Enable D-Bus for KIMPanel support" off \
 		RECORDING	"Enable recording of user input"    off \
 		DEBUG		"Enable debug build with logging"   off \
@@ -35,6 +40,10 @@ LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 CONFIGURE_ARGS+=	--disable-xft
 .endif
 
+.if defined(WITHOUT_TRAY)
+CONFIGURE_ARGS+=	--disable-tray
+.endif
+
 .if defined(WITH_DBUS)
 LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
 .else
@@ -50,10 +59,8 @@ CONFIGURE_ARGS+=	--enable-debug --enable-log
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's#zh_CN.GB2312#zh_CN.eucCN#g' \
-		${WRKSRC}/src/xim.c
-	@${REINPLACE_CMD} -e 's#zh_CN.gb2312#zh_CN.eucCN#g' \
-		${WRKSRC}/src/ui.c ${WRKSRC}/src/tools.c
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/pinyin.tar.gz ${WRKSRC}/data
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/table.tar.gz ${WRKSRC}/data/table
 
 pre-install:
 	@${CHMOD} +x ${WRKSRC}/install-sh
diff --git a/chinese/fcitx/distinfo b/chinese/fcitx/distinfo
index c5b309d9ff4d..f2dd8af22f80 100644
--- a/chinese/fcitx/distinfo
+++ b/chinese/fcitx/distinfo
@@ -1,3 +1,6 @@
-MD5 (fcitx-3.6.3.tar.bz2) = b1da30c72374d7b3d70738493d44d300
-SHA256 (fcitx-3.6.3.tar.bz2) = e986f1223d758d57b87e74b75dd9b635366ee4bf6ea90779f5a48e44498de5b5
-SIZE (fcitx-3.6.3.tar.bz2) = 6385159
+SHA256 (fcitx/fcitx-4.0.0.tar.gz) = 750884e992f51d8557447dc02fe6ada9758392611fc3271849ed26eba33f2d1c
+SIZE (fcitx/fcitx-4.0.0.tar.gz) = 1357079
+SHA256 (fcitx/pinyin.tar.gz) = bf8c581450f9fac0eab0498927d1d5e5c1cd465ed9937e4d9362ca9d67920fa4
+SIZE (fcitx/pinyin.tar.gz) = 1613447
+SHA256 (fcitx/table.tar.gz) = 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7
+SIZE (fcitx/table.tar.gz) = 4144686
diff --git a/chinese/fcitx/files/patch-configure b/chinese/fcitx/files/patch-configure
new file mode 100644
index 000000000000..ab2350fbfc13
--- /dev/null
+++ b/chinese/fcitx/files/patch-configure
@@ -0,0 +1,33 @@
+--- configure.orig      2010-11-17 16:45:30.000000000 +0100
++++ configure   2010-11-29 19:17:00.000000000 +0100
+@@ -12635,7 +12635,7 @@
+ case "$host" in
+     *-*-*freebsd*)
+     HOST_LIBS="-lexecinfo -pthread"
+-    md5prog=gmd5sum
++    md5prog=md5
+     ;;
+     *-*-linux*)
+     HOST_LIBS="-ldl -lpthread"
+@@ -12691,11 +12691,6 @@
+ done
+ test -n "$WGET" || WGET="no"
+ 
+-if test "x$WGET" = "xno";
+-then
+-    as_fn_error $? "You need to install wget" "$LINENO" 5
+-fi
+-
+ for ac_prog in tar
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -14550,6 +14545,9 @@
+ fi
+ 
+     ;;
++       *-*-*freebsd*)
++       DATADIRNAME=share
++       ;;
+     *)
+     DATADIRNAME=lib
+     ;;
diff --git a/chinese/fcitx/files/patch-data-Makefile.in b/chinese/fcitx/files/patch-data-Makefile.in
new file mode 100644
index 000000000000..dfa3c7235762
--- /dev/null
+++ b/chinese/fcitx/files/patch-data-Makefile.in
@@ -0,0 +1,20 @@
+--- data/Makefile.in.orig	2010-11-27 20:20:50.990507459 +0800
++++ data/Makefile.in	2010-11-27 20:21:11.099145804 +0800
+@@ -702,16 +702,9 @@
+ tools: 
+ 	$(MAKE) -C ../tools
+ 
+-$(pyorg_data): $(py_tar) md5check
++$(pyorg_data):
+ 	cd $(srcdir) && $(TAR) xzvf $(py_tar)
+ 
+-$(py_tar):
+-	$(WGET) -O $(py_tar) $(py_url)
+-	$(WGET) -O $(py_tar).md5 $(py_url).md5
+-
+-md5check: $(py_tar)
+-	cd $(srcdir) && $(MD5SUM) -c $(py_tar).md5 || ( $(RM) $(py_tar); exit 1 )
+-
+ all-local: tools  $(py_data)
+ 	rm -f pyERROR
+ 	rm -f pyPhrase.ok
diff --git a/chinese/fcitx/files/patch-data-table-Makefile.in b/chinese/fcitx/files/patch-data-table-Makefile.in
new file mode 100644
index 000000000000..4d06dd8a4cad
--- /dev/null
+++ b/chinese/fcitx/files/patch-data-table-Makefile.in
@@ -0,0 +1,20 @@
+--- data/table/Makefile.in.orig	2010-11-27 19:49:38.241629454 +0800
++++ data/table/Makefile.in	2010-11-27 19:50:12.259003812 +0800
+@@ -487,16 +487,9 @@
+ 
+ $(txt_m_data): cj.txt ;
+ 
+-cj.txt: $(table_tar) md5check
++cj.txt:
+ 	$(TAR) xzvf $(table_tar)
+ 
+-$(table_tar):
+-	$(WGET) -O $(table_tar) $(table_url)
+-	$(WGET) -O $(table_tar).md5 $(table_url).md5
+-
+-md5check: $(table_tar)
+-	cd $(srcdir) && $(MD5SUM) -c $(table_tar).md5 || ( $(RM) $(table_tar); exit 1)
+-
+ all-local: tools $(txt_data) $(mb_data)
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/chinese/fcitx/files/patch-doc-Makefile.in b/chinese/fcitx/files/patch-doc-Makefile.in
deleted file mode 100644
index c3fb7d658123..000000000000
--- a/chinese/fcitx/files/patch-doc-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	2009-10-16 20:23:38.303051048 +0800
-+++ doc/Makefile.in	2009-10-16 20:24:51.132275852 +0800
-@@ -141,7 +141,7 @@
- builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = $(pkgdatadir)/doc
-+docdir = $(datadir)/doc/@PACKAGE@
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
diff --git a/chinese/fcitx/files/patch-png-Makefile.in b/chinese/fcitx/files/patch-png-Makefile.in
new file mode 100644
index 000000000000..3453f7557557
--- /dev/null
+++ b/chinese/fcitx/files/patch-png-Makefile.in
@@ -0,0 +1,11 @@
+--- png/Makefile.in.orig	2010-11-27 21:49:04.591697974 +0800
++++ png/Makefile.in	2010-11-27 21:50:06.021645318 +0800
+@@ -228,7 +228,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-pngdir = $(datadir)/pixmaps
++pngdir = $(datadir)/pixmaps/@PACKAGE@
+ png_DATA = \
+ 		   fcitx.png \
+ 		   fcitx-cangjie.png \
diff --git a/chinese/fcitx/files/patch-src-core-Makefile.in b/chinese/fcitx/files/patch-src-core-Makefile.in
new file mode 100644
index 000000000000..1c08cf044bc3
--- /dev/null
+++ b/chinese/fcitx/files/patch-src-core-Makefile.in
@@ -0,0 +1,11 @@
+--- src/core/Makefile.in.orig	2010-11-29 23:26:13.597770436 +0800
++++ src/core/Makefile.in	2010-11-29 23:26:24.798549651 +0800
+@@ -284,7 +284,7 @@
+ fcitxinclude_HEADERS = \
+ 					  im.h
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = fcitx.pc
+ EXTRA_DIST = \
+ 	fcitx.pc.in
diff --git a/chinese/fcitx/files/patch-src-fcitx_config-Makefile.in b/chinese/fcitx/files/patch-src-fcitx_config-Makefile.in
new file mode 100644
index 000000000000..0a663bda3c79
--- /dev/null
+++ b/chinese/fcitx/files/patch-src-fcitx_config-Makefile.in
@@ -0,0 +1,11 @@
+--- src/fcitx-config/Makefile.in.orig	2010-11-29 23:24:37.995657941 +0800
++++ src/fcitx-config/Makefile.in	2010-11-29 23:25:13.265959780 +0800
+@@ -277,7 +277,7 @@
+ 								hotkey.h \
+ 								xdg.h
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = fcitx-config.pc
+ EXTRA_DIST = \
+ 	fcitx-config.pc.in
diff --git a/chinese/fcitx/files/patch-xpm-Makefile.in b/chinese/fcitx/files/patch-xpm-Makefile.in
deleted file mode 100644
index 9f03cb21a476..000000000000
--- a/chinese/fcitx/files/patch-xpm-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpm/Makefile.in.orig	2009-10-08 22:08:06.000000000 +0800
-+++ xpm/Makefile.in	2009-10-16 20:26:46.697277419 +0800
-@@ -172,7 +172,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--xpmdir = $(pkgdatadir)/xpm
-+xpmdir =
- xpm_DATA = about_icon.xpm chnPunc.xpm engPunc.xpm ft-0.xpm ft-1.xpm \
- 	fullcorner.xpm gbk-0.xpm gbk-1.xpm halfcorner.xpm lock-0.xpm \
- 	lock-1.xpm logo.xpm lx-0.xpm lx-1.xpm next.xpm prev.xpm vk-1.xpm vk.xpm
diff --git a/chinese/fcitx/pkg-plist b/chinese/fcitx/pkg-plist
index 4a27de9858c8..6c63291ff3bc 100644
--- a/chinese/fcitx/pkg-plist
+++ b/chinese/fcitx/pkg-plist
@@ -1,51 +1,186 @@
 bin/createPYMB
 bin/fcitx
+bin/fcitx-config
 bin/fcitx-remote
-bin/jd2fcitx
 bin/mb2org
 bin/mb2txt
-bin/pyjj2fcitx
 bin/readPYBase
 bin/readPYMB
+bin/scel2org
 bin/txt2mb
-bin/win2fcitx
+include/fcitx/im.h
+include/fcitx-config/fcitx-config.h
+include/fcitx-config/configfile.h
+include/fcitx-config/hotkey.h
+include/fcitx-config/profile.h
+include/fcitx-config/xdg.h
+lib/libfcitx-config.a
+lib/libfcitx-config.la
+lib/libfcitx-config.so
+lib/libfcitx-config.so.4
+libdata/pkgconfig/fcitx-config.pc
+libdata/pkgconfig/fcitx.pc
+share/pixmaps/fcitx/fcitx-wubi.png
+share/pixmaps/fcitx/fcitx-half-letter.png
+share/pixmaps/fcitx/fcitx-half-punct.png
+share/pixmaps/fcitx/fcitx-trad.png
+share/pixmaps/fcitx/fcitx-vkon.png
+share/pixmaps/fcitx/fcitx-ziranma.png
+share/pixmaps/fcitx/fcitx-vkoff.png
+share/pixmaps/fcitx/fcitx-erbi.png
+share/pixmaps/fcitx/fcitx-legend.png
+share/pixmaps/fcitx/fcitx-nolegend.png
+share/pixmaps/fcitx/fcitx.png
+share/pixmaps/fcitx/fcitx-full-punct.png
+share/pixmaps/fcitx/fcitx-cangjie.png
+share/pixmaps/fcitx/fcitx-pinyin.png
+share/pixmaps/fcitx/fcitx-full-letter.png
+share/pixmaps/fcitx/fcitx-eng.png
+share/pixmaps/fcitx/fcitx-chn.png
+share/pixmaps/fcitx/fcitx-simp.png
+share/locale/zh_CN/LC_MESSAGES/fcitx.mo
+%%DATADIR%%/doc/wb_fh.htm
+%%DATADIR%%/doc/Develop_Readme
+%%DATADIR%%/doc/cjkvinput.txt
+%%DATADIR%%/doc/pinyin.txt
+%%DATADIR%%/doc/fcitx_trunk.doxyfile
+%%DATADIR%%/doc/API.txt
+%%DATADIR%%/doc/fcitx4.pdf
+%%DATADIR%%/data/profile.desc
+%%DATADIR%%/data/addon.desc
 %%DATADIR%%/data/AutoEng.dat
-%%DATADIR%%/data/cj.mb
-%%DATADIR%%/data/cj.txt
-%%DATADIR%%/data/config
-%%DATADIR%%/data/db.mb
-%%DATADIR%%/data/db.txt
-%%DATADIR%%/data/erbi.mb
-%%DATADIR%%/data/erbi.txt
-%%DATADIR%%/data/gbkpy.org
-%%DATADIR%%/data/gbks2t.tab
-%%DATADIR%%/data/punc.mb
-%%DATADIR%%/data/pyPhrase.org
-%%DATADIR%%/data/pySym.mb
+%%DATADIR%%/data/vk.conf
 %%DATADIR%%/data/pybase.mb
+%%DATADIR%%/data/gbks2t.tab
 %%DATADIR%%/data/pyphrase.mb
-%%DATADIR%%/data/qxm.mb
-%%DATADIR%%/data/qxm.txt
 %%DATADIR%%/data/sp.dat
-%%DATADIR%%/data/tables.conf
-%%DATADIR%%/data/vk.conf
-%%DATADIR%%/data/wanfeng.mb
-%%DATADIR%%/data/wanfeng.txt
-%%DATADIR%%/data/wbpy.mb
-%%DATADIR%%/data/wbpy.txt
-%%DATADIR%%/data/wbx.mb
-%%DATADIR%%/data/wbx.txt
-%%DATADIR%%/data/zrm.mb
-%%DATADIR%%/data/zrm.txt
-%%DATADIR%%/tools/winmb2fcitx.py
+%%DATADIR%%/data/pySym.mb
+%%DATADIR%%/data/punc.mb
+%%DATADIR%%/data/table.desc
+%%DATADIR%%/data/table/wbpy.conf
+%%DATADIR%%/data/table/wbx.mb
+%%DATADIR%%/data/table/db.mb
+%%DATADIR%%/data/table/wbx.conf
+%%DATADIR%%/data/table/wbpy.mb
+%%DATADIR%%/data/table/qxm.conf
+%%DATADIR%%/data/table/db.conf
+%%DATADIR%%/data/table/erbi.mb
+%%DATADIR%%/data/table/wanfeng.mb
+%%DATADIR%%/data/table/qxm.mb
+%%DATADIR%%/data/table/wanfeng.conf
+%%DATADIR%%/data/table/cangjie.conf
+%%DATADIR%%/data/table/disable-table.conf.template
+%%DATADIR%%/data/table/cj.mb
+%%DATADIR%%/data/table/zrm.mb
+%%DATADIR%%/data/table/erbi.conf
+%%DATADIR%%/data/table/zrm.conf
+%%DATADIR%%/data/config.desc
+%%DATADIR%%/data/skin.desc
+%%DATADIR%%/skin/default/next.png
+%%DATADIR%%/skin/default/fan.png
+%%DATADIR%%/skin/default/shuangpin.png
+%%DATADIR%%/skin/default/jian.png
+%%DATADIR%%/skin/default/menu.png
+%%DATADIR%%/skin/default/logo.png
+%%DATADIR%%/skin/default/cn.png
+%%DATADIR%%/skin/default/legend.png
+%%DATADIR%%/skin/default/ziranma.png
+%%DATADIR%%/skin/default/active.png
+%%DATADIR%%/skin/default/pinyin.png
+%%DATADIR%%/skin/default/fcitx_skin.conf
+%%DATADIR%%/skin/default/wubi.png
+%%DATADIR%%/skin/default/quwei.png
+%%DATADIR%%/skin/default/en.png
+%%DATADIR%%/skin/default/bar.png
+%%DATADIR%%/skin/default/prev.png
+%%DATADIR%%/skin/default/input.png
+%%DATADIR%%/skin/default/half.png
+%%DATADIR%%/skin/default/wanfeng.png
+%%DATADIR%%/skin/default/cangjie.png
+%%DATADIR%%/skin/default/bingchan.png
+%%DATADIR%%/skin/default/full.png
+%%DATADIR%%/skin/default/chnpunc.png
+%%DATADIR%%/skin/default/wbpy.png
+%%DATADIR%%/skin/default/novk.png
+%%DATADIR%%/skin/default/vk.png
+%%DATADIR%%/skin/default/nolegend.png
+%%DATADIR%%/skin/default/dianbaoma.png
+%%DATADIR%%/skin/default/erbi.png
+%%DATADIR%%/skin/default/engpunc.png
+%%DATADIR%%/skin/default/inactive.png
+%%DATADIR%%/skin/default/keyboard.png
+%%DATADIR%%/skin/classic/ziranma.png
+%%DATADIR%%/skin/classic/jian.png
+%%DATADIR%%/skin/classic/next.png
+%%DATADIR%%/skin/classic/dianbaoma.png
+%%DATADIR%%/skin/classic/vk.png
+%%DATADIR%%/skin/classic/logo.png
+%%DATADIR%%/skin/classic/fcitx_skin.conf
+%%DATADIR%%/skin/classic/menu.png
+%%DATADIR%%/skin/classic/input.png
+%%DATADIR%%/skin/classic/pinyin.png
+%%DATADIR%%/skin/classic/en.png
+%%DATADIR%%/skin/classic/bar.png
+%%DATADIR%%/skin/classic/active.png
+%%DATADIR%%/skin/classic/quwei.png
+%%DATADIR%%/skin/classic/legend.png
+%%DATADIR%%/skin/classic/cn.png
+%%DATADIR%%/skin/classic/prev.png
+%%DATADIR%%/skin/classic/chnpunc.png
+%%DATADIR%%/skin/classic/nolegend.png
+%%DATADIR%%/skin/classic/wubi.png
+%%DATADIR%%/skin/classic/half.png
+%%DATADIR%%/skin/classic/full.png
+%%DATADIR%%/skin/classic/inactive.png
+%%DATADIR%%/skin/classic/engpunc.png
+%%DATADIR%%/skin/classic/novk.png
+%%DATADIR%%/skin/classic/wbpy.png
+%%DATADIR%%/skin/classic/shuangpin.png
+%%DATADIR%%/skin/classic/wanfeng.png
+%%DATADIR%%/skin/classic/cangjie.png
+%%DATADIR%%/skin/classic/erbi.png
+%%DATADIR%%/skin/classic/fan.png
+%%DATADIR%%/skin/classic/bingchan.png
+%%DATADIR%%/skin/dark/wanfeng.png
+%%DATADIR%%/skin/dark/cangjie.png
+%%DATADIR%%/skin/dark/inactive.png
+%%DATADIR%%/skin/dark/dianbaoma.png
+%%DATADIR%%/skin/dark/nolegend.png
+%%DATADIR%%/skin/dark/cn.png
+%%DATADIR%%/skin/dark/bingchan.png
+%%DATADIR%%/skin/dark/next.png
+%%DATADIR%%/skin/dark/fan.png
+%%DATADIR%%/skin/dark/engpunc.png
+%%DATADIR%%/skin/dark/jian.png
+%%DATADIR%%/skin/dark/menu.png
+%%DATADIR%%/skin/dark/logo.png
+%%DATADIR%%/skin/dark/chnpunc.png
+%%DATADIR%%/skin/dark/wbpy.png
+%%DATADIR%%/skin/dark/novk.png
+%%DATADIR%%/skin/dark/vk.png
+%%DATADIR%%/skin/dark/erbi.png
+%%DATADIR%%/skin/dark/bar.png
+%%DATADIR%%/skin/dark/wubi.png
+%%DATADIR%%/skin/dark/active.png
+%%DATADIR%%/skin/dark/prev.png
+%%DATADIR%%/skin/dark/quwei.png
+%%DATADIR%%/skin/dark/fcitx_skin.conf
+%%DATADIR%%/skin/dark/legend.png
+%%DATADIR%%/skin/dark/input.png
+%%DATADIR%%/skin/dark/shuangpin.png
+%%DATADIR%%/skin/dark/ziranma.png
+%%DATADIR%%/skin/dark/en.png
+%%DATADIR%%/skin/dark/pinyin.png
+%%DATADIR%%/skin/dark/full.png
+%%DATADIR%%/skin/dark/half.png
+@dirrm %%DATADIR%%/skin/default
+@dirrm %%DATADIR%%/skin/dark
+@dirrm %%DATADIR%%/skin/classic
+@dirrm %%DATADIR%%/data/table
+@dirrm %%DATADIR%%/skin
+@dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%/tools
 @dirrm %%DATADIR%%
-%%DOCSDIR%%/API.txt
-%%DOCSDIR%%/Develop_Readme.GBK
-%%DOCSDIR%%/cjkvinput.txt
-%%DOCSDIR%%/fcitx3.pdf
-%%DOCSDIR%%/fcitx_trunk.doxyfile
-%%DOCSDIR%%/pinyin.txt
-%%DOCSDIR%%/wb_fh.htm
-@dirrm %%DOCSDIR%%
+@dirrm include/fcitx
+@dirrm include/fcitx-config
+@dirrm share/pixmaps/fcitx