2 files changed, 3 insertions, 34 deletions

diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
index 45c66808a404..62f580e8fc6c 100644
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fcitx
 PORTVERSION=	4.2.9.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	chinese x11
 MASTER_SITES=	http://download.fcitx-im.org/fcitx/:fcitx \
 		http://download.fcitx-im.org/data/:data
@@ -48,7 +48,7 @@ USES=		compiler:c++11-lang gnome qt:4 tar:xz cmake:noninja desktop-file-utils \
 		kde:5 pkgconfig shared-mime-info compiler:c++14-lang
 INSTALLS_ICONS=	yes
 
-OPTIONS_DEFINE=	GTK2 GTK3 QT4 OPENCC TPUNC DOCS
+OPTIONS_DEFINE=	GTK2 GTK3 OPENCC TPUNC DOCS
 OPTIONS_DEFAULT=GTK2 GTK3
 OPTIONS_SUB=	yes
 
@@ -60,7 +60,6 @@ GTK3_DESC=	Enable Gtk3 IM module
 GTK3_USE=	GNOME=gtk30
 GTK3_CMAKE_ON=	-DENABLE_GTK3_IM_MODULE=ON
 
-QT4_DESC=	Enable Qt4 IM module
 OPENCC_DESC=	Enable OpenCC for Chinese Transform
 TPUNC_DESC=	Use traditional quotation marks
 
@@ -74,7 +73,7 @@ CMAKE_ARGS+=	-DENABLE_XDGAUTOSTART=OFF -DFORCE_ENCHANT=ON \
 		-DGOBJECT_INTROSPECTION_TYPELIBDIR=${PREFIX}/lib/girepository-1.0 \
 		-DMANPREFIX=${MANPREFIX} \
 		-DPREFIX=${PREFIX} \
-		-DQT_PLUGINS_DIR=${PREFIX}/lib/qt4/plugins
+		-DENABLE_QT=OFF -DENABLE_QT_IM_MODULE=OFF -DENABLE_QT_GUI=OFF
 
 .if ${PORT_OPTIONS:MGTK2}
 SUB_LIST+=	GTK2_IM=fcitx
@@ -90,18 +89,6 @@ PLIST_SUB+=	GTK3="@comment "
 SUB_LIST+=	GTK3_IM=xim
 .endif
 
-.if ${PORT_OPTIONS:MQT4}
-DEPRECATED=		Qt4 has been EOL since december 2015
-EXPIRATION_DATE=	2019-03-15
-USES+=		qt:4
-USE_QT+=		qmake_build moc_build rcc_build uic_build dbus gui inputmethods corelib
-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
-
 .if ${PORT_OPTIONS:MOPENCC}
 LIB_DEPENDS+=	libopencc.so:chinese/opencc
 .else
diff --git a/chinese/fcitx/pkg-plist b/chinese/fcitx/pkg-plist
index 24340373fc6b..62e69814a2ba 100644
--- a/chinese/fcitx/pkg-plist
+++ b/chinese/fcitx/pkg-plist
@@ -19,18 +19,6 @@ include/fcitx-gclient/fcitxclient.h
 include/fcitx-gclient/fcitxconnection.h
 include/fcitx-gclient/fcitxinputmethod.h
 include/fcitx-gclient/fcitxkbd.h
-%%QT4%%include/fcitx-qt/fcitxqt_export.h
-%%QT4%%include/fcitx-qt/fcitxqtconfiguifactory.h
-%%QT4%%include/fcitx-qt/fcitxqtconfiguiplugin.h
-%%QT4%%include/fcitx-qt/fcitxqtconfiguiwidget.h
-%%QT4%%include/fcitx-qt/fcitxqtconnection.h
-%%QT4%%include/fcitx-qt/fcitxqtformattedpreedit.h
-%%QT4%%include/fcitx-qt/fcitxqtinputcontextproxy.h
-%%QT4%%include/fcitx-qt/fcitxqtinputmethoditem.h
-%%QT4%%include/fcitx-qt/fcitxqtinputmethodproxy.h
-%%QT4%%include/fcitx-qt/fcitxqtkeyboardlayout.h
-%%QT4%%include/fcitx-qt/fcitxqtkeyboardproxy.h
-%%QT4%%include/fcitx-qt/fcitxqtkeysequencewidget.h
 include/fcitx-utils/bitset.h
 include/fcitx-utils/desktop-parse.h
 include/fcitx-utils/handler-table.h
@@ -114,7 +102,6 @@ lib/fcitx/fcitx-xkb.so
 lib/fcitx/fcitx-xkbdbus.so
 lib/fcitx/libexec/comp-spell-dict
 lib/fcitx/libexec/fcitx-po-parser
-%%QT4%%lib/fcitx/libexec/fcitx-qt-gui-wrapper
 lib/fcitx/libexec/fcitx-scanner
 lib/girepository-1.0/Fcitx-1.0.typelib
 %%GTK2%%lib/gtk-2.0/%%GTK2_VERSION%%/immodules/im-fcitx.so
@@ -123,7 +110,6 @@ lib/girepository-1.0/Fcitx-1.0.typelib
 %%GTK3%%lib/gtk-3.0/%%GTK3_VERSION%%/immodules/im-fcitx.so
 %%GTK3%%@postexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache
 %%GTK3%%@postunexec %%LOCALBASE%%/bin/gtk-query-immodules-3.0 --update-cache
-%%QT4%%lib/qt4/plugins/inputmethods/qtim-fcitx.so
 lib/libfcitx-config.so
 lib/libfcitx-config.so.4
 lib/libfcitx-config.so.4.1
@@ -133,15 +119,11 @@ lib/libfcitx-core.so.0.3
 lib/libfcitx-gclient.so
 lib/libfcitx-gclient.so.1
 lib/libfcitx-gclient.so.0.2
-%%QT4%%lib/libfcitx-qt.so
-%%QT4%%lib/libfcitx-qt.so.0
-%%QT4%%lib/libfcitx-qt.so.0.1
 lib/libfcitx-utils.so
 lib/libfcitx-utils.so.0
 lib/libfcitx-utils.so.0.1
 libdata/pkgconfig/fcitx-config.pc
 libdata/pkgconfig/fcitx-gclient.pc
-%%QT4%%libdata/pkgconfig/fcitx-qt.pc
 libdata/pkgconfig/fcitx-utils.pc
 libdata/pkgconfig/fcitx.pc
 man/man1/createPYMB.1.gz