im-ja: Disable GNOME 2 panel applet support.

inspired by FreeBSD Ports - gnome2 is dead, long live mate.

bump PKGREVISION

4 files changed, 9 insertions, 28 deletions

diff --git a/inputmethod/im-ja/DESCR b/inputmethod/im-ja/DESCR
index 9dbd8fa5192..f98ef775781 100644
--- a/inputmethod/im-ja/DESCR
+++ b/inputmethod/im-ja/DESCR
@@ -2,5 +2,4 @@ im-ja is a Japanese input module for GTK2 and also has a XIM server.
 Currently supports hiragana, katakana, half-width katakana, zenkaku, canna, wnn,
 anthy, skk and kanji character recognition inputs.
 Conversion hotkeys, status window, preedit text colors, etc. can be customized
-through a GUI. An optional applet is also included for the gnome-panel which
-can be used to display and change the input method.
+through a GUI.
diff --git a/inputmethod/im-ja/Makefile b/inputmethod/im-ja/Makefile
index b379400cc47..fbeb819da1e 100644
--- a/inputmethod/im-ja/Makefile
+++ b/inputmethod/im-ja/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.69 2019/07/21 22:25:10 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2020/01/01 14:16:41 nia Exp $
 #
 
 DISTNAME=	im-ja-1.5
-PKGREVISION=	66
+PKGREVISION=	67
 CATEGORIES=	inputmethod japanese
 MASTER_SITES=	http://im-ja.sourceforge.net/
 
@@ -20,14 +20,9 @@ GCONF_SCHEMAS+=	im-ja.schemas
 GTK2_IMMODULES=	yes
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--disable-gnome
 
 .include "options.mk"
-
-SUBST_CLASSES+=		fixpkgcfg
-SUBST_STAGE.fixpkgcfg=	pre-configure
-SUBST_FILES.fixpkgcfg=	configure
-SUBST_SED.fixpkgcfg=	-e 's|libpanelapplet-2.0|libgnomeui-2.0 libpanelapplet-2.0|g'
-
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/inputmethod/im-ja/PLIST b/inputmethod/im-ja/PLIST
index bcbc31a0a69..1bd57df3de7 100644
--- a/inputmethod/im-ja/PLIST
+++ b/inputmethod/im-ja/PLIST
@@ -1,16 +1,13 @@
-@comment $NetBSD: PLIST,v 1.2 2018/01/01 22:29:39 rillig Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/01/01 14:16:41 nia Exp $
 bin/im-ja-conf
 ${PLIST.xim}bin/im-ja-xim-server
-${PLIST.gnome}lib/bonobo/servers/GNOME_ImJaApplet.server
 lib/gtk-2.0/2.10.0/immodules/im-ja.la
-${PLIST.gnome}libexec/im-ja/im-ja-applet
 libexec/im-ja/im-ja-helper
 libexec/im-ja/kpengine
 man/man1/im-ja-conf.1
 ${PLIST.xim}man/man1/im-ja-xim-server.1
 share/applications/im-ja.desktop
 share/gconf/schemas/im-ja.schemas
-${PLIST.gnome}share/gnome-2.0/ui/GNOME_ImJaApplet.xml
 share/im-ja/01.unistrok
 share/im-ja/02.unistrok
 share/im-ja/03.unistrok
diff --git a/inputmethod/im-ja/options.mk b/inputmethod/im-ja/options.mk
index 046a3948360..01ee497a027 100644
--- a/inputmethod/im-ja/options.mk
+++ b/inputmethod/im-ja/options.mk
@@ -1,13 +1,13 @@
-# $NetBSD: options.mk,v 1.2 2012/03/10 15:24:50 obache Exp $
+# $NetBSD: options.mk,v 1.3 2020/01/01 14:16:41 nia Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.im-ja
-PKG_SUPPORTED_OPTIONS=	anthy canna wnn4 skk gnome xim
-PKG_SUGGESTED_OPTIONS=	anthy canna skk gnome xim
+PKG_SUPPORTED_OPTIONS=	anthy canna wnn4 skk xim
+PKG_SUGGESTED_OPTIONS=	anthy canna skk xim
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		gnome xim
+PLIST_VARS+=		xim
 
 #
 # Canna support
@@ -44,16 +44,6 @@ CONFIGURE_ARGS+=	--disable-skk
 .endif
 
 #
-# Gnome applet
-#
-.if !empty(PKG_OPTIONS:Mgnome)
-.include "../../x11/gnome-panel/buildlink3.mk"
-PLIST.gnome=	yes
-.else
-CONFIGURE_ARGS+=	--disable-gnome
-.endif
-
-#
 # XIM support
 #
 .if !empty(PKG_OPTIONS:Mxim)