1 files changed, 36 insertions, 14 deletions

diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
index dd82efa698a0..0b363d804237 100644
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fcitx
 PORTVERSION=	4.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese x11
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} pinyin.tar.gz table.tar.gz
@@ -23,10 +23,12 @@ 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 \
-	readPYBase.1 readPYMB.1 scel2org.1 txt2mb.1
+MAN1=		createPYMB.1 fcitx-remote.1 fcitx.1 mb2org.1 mb2txt.1 \
+		readPYBase.1 readPYMB.1 scel2org.1 txt2mb.1
+SUB_FILES=	pkg-message
+SUB_LIST+=	PORTSDIR=${PORTSDIR}
 
-USE_XZ=	yes
+USE_XZ=		yes
 USE_GNOME=	pango intltool gnomehack
 USE_GETTEXT=	yes
 USE_XORG=	x11 xext
@@ -34,39 +36,53 @@ USE_LDCONFIG=	yes
 USE_CMAKE=	yes
 INSTALLS_ICONS=	yes
 
-OPTIONS=	GTK2		"Enable Gtk2 IM module" off \
-		GTK3		"Enable Gtk3 IM module" off \
-		QT4		"Enable Qt4 IM module" off \
-		OPENCC		"Enable OpenCC for Chinese Transform" off \
-		TPUNC		"Use traditional quotation marks" off
+OPTIONS_DEFINE=	GTK2 GTK3 QT4 OPENCC TPUNC
+
+GTK2_DESC=	"Enable Gtk2 IM module"
+GTK3_DESC=	"Enable Gtk3 IM module"
+QT4_DESC=	"Enable Qt4 IM module"
+OPENCC_DESC=	"Enable OpenCC for Chinese Transform"
+TPUNC_DESC=	"Use traditional quotation marks"
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
 USE_GNOME+=	gtk20
+PLIST_SUB+=	GTK2=""
+SUB_LIST+=	GTK2_IM=fcitx
 .else
 CMAKE_ARGS+=	-DENABLE_GTK2_IM_MODULE=OFF
+PLIST_SUB+=	GTK2="@comment "
+SUB_LIST+=	GTK2_IM=xim
 .endif
 
-.if defined(WITH_GTK3)
+.if ${PORT_OPTIONS:MGTK3}
 USE_GNOME+=	gtk30
 CMAKE_ARGS+=	-DENABLE_GTK3_IM_MODULE=ON
+PLIST_SUB+=	GTK3=""
+SUB_LIST+=	GTK3_IM=fcitx
+.else
+PLIST_SUB+=	GTK3="@comment "
+SUB_LIST+=	GTK3_IM=xim
 .endif
 
-.if defined(WITH_QT4)
+.if ${PORT_OPTIONS:MQT4}
 USE_QT=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	gui
 CMAKE_ARGS+=	-DENABLE_QT_IM_MODULE=ON
+PLIST_SUB+=	QT4=""
+.else
+PLIST_SUB+=	QT4="@comment "
 .endif
 
-.if defined(WITH_OPENCC)
+.if ${PORT_OPTIONS:MOPENCC}
 LIB_DEPENDS+=	opencc.1:${PORTSDIR}/chinese/opencc
 .else
 CMAKE_ARGS+=	-DENABLE_OPENCC=OFF
 .endif
 
-.if defined(WITH_TPUNC)
+.if ${PORT_OPTIONS:MTPUNC}
 EXTRA_PATCHES+=	${FILESDIR}/tpunc-data_punc.mb.zh_CN
 .endif
 
@@ -92,6 +108,12 @@ EXTRA_PATCHES+=	${FILESDIR}/getline-src_lib_fcitx-utils_utils.c \
 .endif
 
 post-install:
+.if ${PORT_OPTIONS:MGTK2}
+	-gtk-query-immodules-2.0 > ${LOCALBASE}/etc/gtk-2.0/gtk.immodules
+.endif
+.if ${PORT_OPTIONS:MGTK3}
+	-gtk-query-immodules-3.0 > ${LOCALBASE}/lib/gtk-3.0/${GTK3_VERSION}/immodules.cache
+.endif
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}