CVS commit: pkgsrc/inputmethod/im-ja

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Jan  1 14:16:41 UTC 2020

Modified Files:
        pkgsrc/inputmethod/im-ja: DESCR Makefile PLIST options.mk

Log Message:
im-ja: Disable GNOME 2 panel applet support.

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

bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/inputmethod/im-ja/DESCR
cvs rdiff -u -r1.69 -r1.70 pkgsrc/inputmethod/im-ja/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/inputmethod/im-ja/PLIST \
    pkgsrc/inputmethod/im-ja/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/inputmethod/im-ja/DESCR
diff -u pkgsrc/inputmethod/im-ja/DESCR:1.1.1.1 pkgsrc/inputmethod/im-ja/DESCR:1.2
--- pkgsrc/inputmethod/im-ja/DESCR:1.1.1.1      Thu May 20 08:18:00 2010
+++ pkgsrc/inputmethod/im-ja/DESCR      Wed Jan  1 14:16:41 2020
@@ -2,5 +2,4 @@ im-ja is a Japanese input module for GTK
 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.

Index: pkgsrc/inputmethod/im-ja/Makefile
diff -u pkgsrc/inputmethod/im-ja/Makefile:1.69 pkgsrc/inputmethod/im-ja/Makefile:1.70
--- pkgsrc/inputmethod/im-ja/Makefile:1.69      Sun Jul 21 22:25:10 2019
+++ pkgsrc/inputmethod/im-ja/Makefile   Wed Jan  1 14:16:41 2020
@@ -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"

Index: pkgsrc/inputmethod/im-ja/PLIST
diff -u pkgsrc/inputmethod/im-ja/PLIST:1.2 pkgsrc/inputmethod/im-ja/PLIST:1.3
--- pkgsrc/inputmethod/im-ja/PLIST:1.2  Mon Jan  1 22:29:39 2018
+++ pkgsrc/inputmethod/im-ja/PLIST      Wed Jan  1 14:16:41 2020
@@ -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
Index: pkgsrc/inputmethod/im-ja/options.mk
diff -u pkgsrc/inputmethod/im-ja/options.mk:1.2 pkgsrc/inputmethod/im-ja/options.mk:1.3
--- pkgsrc/inputmethod/im-ja/options.mk:1.2     Sat Mar 10 15:24:50 2012
+++ pkgsrc/inputmethod/im-ja/options.mk Wed Jan  1 14:16:41 2020
@@ -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)