uim: Drop kde/qt4 build options (both were disabled by default)

3 files changed, 7 insertions, 34 deletions

diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile
index 0e6ddb596d6..d1366037c1e 100644
--- a/inputmethod/uim/Makefile
+++ b/inputmethod/uim/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.152 2019/08/22 12:23:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.153 2019/10/27 17:31:35 kamil Exp $
 #
 
 .include "../../inputmethod/uim/Makefile.common"
 
-PKGREVISION=		64
+PKGREVISION=		65
 COMMENT=		Multilingual input method library
 #LICENSE=		See ${WRKSRC}/COPYING
 
@@ -16,6 +16,7 @@ USE_LANGUAGES=		c99 c++03
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/uim.pc.in
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--disable-emacs
+CONFIGURE_ARGS+=	--disable-kde4-applet
 CONFIGURE_ARGS+=	--with-libgcroots=installed
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
 
diff --git a/inputmethod/uim/PLIST b/inputmethod/uim/PLIST
index 311c3125875..7bc53672d39 100644
--- a/inputmethod/uim/PLIST
+++ b/inputmethod/uim/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2018/01/01 22:29:39 rillig Exp $
-${PLIST.qt}bin/uim-chardict-qt4
+@comment $NetBSD: PLIST,v 1.26 2019/10/27 17:31:35 kamil Exp $
 ${PLIST.uim-dict-gtk}bin/uim-dict-gtk
 ${PLIST.uim-dict-gtk3}bin/uim-dict-gtk3
 ${PLIST.fep}bin/uim-fep
@@ -7,20 +6,17 @@ ${PLIST.fep}bin/uim-fep-tick
 bin/uim-help
 ${PLIST.gtk}bin/uim-im-switcher-gtk
 ${PLIST.gtk3}bin/uim-im-switcher-gtk3
-${PLIST.qt}bin/uim-im-switcher-qt4
 ${PLIST.gtk}bin/uim-input-pad-ja
 ${PLIST.gtk3}bin/uim-input-pad-ja-gtk3
 ${PLIST.m17nlib}bin/uim-m17nlib-relink-icons
 bin/uim-module-manager
 ${PLIST.gtk}bin/uim-pref-gtk
 ${PLIST.gtk3}bin/uim-pref-gtk3
-${PLIST.qt}bin/uim-pref-qt4
 bin/uim-sh
 ${PLIST.gtk}bin/uim-toolbar-gtk
 ${PLIST.gtk}bin/uim-toolbar-gtk-systray
 ${PLIST.gtk3}bin/uim-toolbar-gtk3
 ${PLIST.gtk3}bin/uim-toolbar-gtk3-systray
-${PLIST.qt}bin/uim-toolbar-qt4
 ${PLIST.xim}bin/uim-xim
 include/uim/dynlib.h
 include/uim/uim-custom.h
@@ -36,7 +32,6 @@ include/uim/version.h
 ${PLIST.gnome}lib/bonobo/servers/GNOME_UimApplet.server
 ${PLIST.gtk}lib/gtk-2.0/2.10.0/immodules/im-uim.la
 ${PLIST.gtk3}lib/gtk-3.0/3.0.0/immodules/im-uim.la
-${PLIST.kde}lib/kde4/plasma_applet_uim.so
 lib/libuim-custom.la
 lib/libuim-scm.la
 lib/libuim.la
@@ -63,14 +58,12 @@ ${PLIST.gtk}libexec/uim-candwin-gtk
 ${PLIST.gtk3}libexec/uim-candwin-gtk3
 ${PLIST.gtk}libexec/uim-candwin-horizontal-gtk
 ${PLIST.gtk3}libexec/uim-candwin-horizontal-gtk3
-${PLIST.qt}libexec/uim-candwin-qt4
 ${PLIST.gtk}libexec/uim-candwin-tbl-gtk
 ${PLIST.gtk3}libexec/uim-candwin-tbl-gtk3
 libexec/uim-helper-server
 ${PLIST.gnome}libexec/uim-toolbar-applet
 ${PLIST.gnome3}libexec/uim-toolbar-applet-gnome3
 ${PLIST.xim}man/man1/uim-xim.1
-${PLIST.qt}qt4/plugins/inputmethods/libuiminputcontextplugin.la
 share/applications/uim.desktop
 share/doc/uim/COMPATIBILITY
 share/doc/uim/CUSTOM
@@ -86,7 +79,6 @@ ${PLIST.fep}share/doc/uim/uim-fep/README
 ${PLIST.fep}share/doc/uim/uim-fep/README.ja
 share/examples/uim/installed-modules.scm
 share/examples/uim/loader.scm
-${PLIST.kde}share/kde4/services/plasma-applet-uim.desktop
 share/locale/fr/LC_MESSAGES/uim.mo
 share/locale/ja/LC_MESSAGES/uim.mo
 share/locale/ko/LC_MESSAGES/uim.mo
diff --git a/inputmethod/uim/options.mk b/inputmethod/uim/options.mk
index 5aeaa0c4890..48e747b5428 100644
--- a/inputmethod/uim/options.mk
+++ b/inputmethod/uim/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.34 2017/09/26 09:42:26 wiz Exp $
+# $NetBSD: options.mk,v 1.35 2019/10/27 17:31:35 kamil Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.uim
 PKG_SUPPORTED_OPTIONS=	anthy canna curl eb expat ffi gnome gnome3 gtk gtk3 m17nlib openssl prime sj3 sqlite uim-fep wnn4 xim
-PKG_SUPPORTED_OPTIONS+=	editline kde qt
+PKG_SUPPORTED_OPTIONS+=	editline
 PKG_SUGGESTED_OPTIONS=	anthy expat gtk gtk3 prime uim-fep xim
 
 # Store installed modules
@@ -20,7 +20,7 @@ PKG_SUGGESTED_OPTIONS+=	editline
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=		helperdata uim-dict-gtk uim-dict-gtk3 uim-dict-helperdata fep
-PLIST_VARS+=		anthy curl eb expat ffi gnome gnome3 gtk gtk3 kde m17nlib openssl qt sqlite wnn xim
+PLIST_VARS+=		anthy curl eb expat ffi gnome gnome3 gtk gtk3 m17nlib openssl qt sqlite wnn xim
 PLIST_VARS+=		canna prime sj3
 PLIST_VARS+=		editline
 
@@ -150,16 +150,6 @@ PLIST.uim-dict-helperdata=	yes
 .  endif
 .endif
 
-
-.if !empty(PKG_OPTIONS:Mkde)
-.  include "../../x11/kdelibs4/buildlink3.mk"
-.  include "../../x11/qt4-libs/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-kde4-applet
-PLIST.kde=		yes
-.else
-CONFIGURE_ARGS+=	--disable-kde4-applet
-.endif
-
 .if !empty(PKG_OPTIONS:Mm17nlib)
 .  include "../../devel/m17n-lib/buildlink3.mk"
 DEPENDS+=		{m17n-db>=1.6.5,m17n-contrib-[0-9]*}:../../misc/m17n-db
@@ -172,14 +162,6 @@ UIM_MODULES+=		m17nlib
 CONFIGURE_ARGS+=	--without-m17nlib
 .endif
 
-.if !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde)
-.  include "../../x11/qt4-libs/buildlink3.mk"
-.  include "../../x11/qt4-tools/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-qt4 --with-qt4-immodule
-PLIST.helperdata=	yes
-PLIST.qt=		yes
-.endif
-
 .if !empty(PKG_OPTIONS:Mopenssl)
 .  include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-openssl
@@ -221,6 +203,4 @@ UIM_MODULES+=		wnn
 CONFIGURE_ARGS+=	--enable-default-toolkit=gtk
 .elif !empty(PKG_OPTIONS:Mgtk3) || !empty(PKG_OPTIONS:Mgnome3)
 CONFIGURE_ARGS+=	--enable-default-toolkit=gtk3
-.elif !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde)
-CONFIGURE_ARGS+=	--enable-default-toolkit=qt4
 .endif