1 files changed, 33 insertions, 17 deletions

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 \