[pkgsrc/trunk]: pkgsrc/inputmethod/uim Call Gtk2 option as "gtk", not "gtk2",...

[uebayasi <uebayasi%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2b913982e287
branches:  trunk
changeset: 495140:2b913982e287
user:      uebayasi <uebayasi%pkgsrc.org@localhost>
date:      Fri Jun 03 10:21:51 2005 +0000

description:
Call Gtk2 option as "gtk", not "gtk2", as other packages do.
Pointed out by Dieter Baron.

diffstat:

 inputmethod/uim/PLIST.gtk  |  11 +++++++++++
 inputmethod/uim/PLIST.gtk2 |  11 -----------
 inputmethod/uim/options.mk |  12 ++++++------
 3 files changed, 17 insertions(+), 17 deletions(-)

diffs (58 lines):

diff -r ae9c9340c4b8 -r 2b913982e287 inputmethod/uim/PLIST.gtk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/inputmethod/uim/PLIST.gtk Fri Jun 03 10:21:51 2005 +0000
@@ -0,0 +1,11 @@
+@comment $NetBSD: PLIST.gtk,v 1.1 2005/06/03 10:21:51 uebayasi Exp $
+bin/uim-candwin-gtk
+bin/uim-helper-candwin-gtk
+bin/uim-helper-toolbar-gtk
+bin/uim-helper-toolbar-gtk-systray
+bin/uim-im-switcher-gtk
+bin/uim-pref-gtk
+bin/uim-toolbar-gtk
+bin/uim-toolbar-gtk-systray
+lib/gtk-2.0/2.4.0/immodules/im-uim.la
+@comment in gtk2: @dirrm lib/gtk-2.0/2.4.0/immodules
diff -r ae9c9340c4b8 -r 2b913982e287 inputmethod/uim/PLIST.gtk2
--- a/inputmethod/uim/PLIST.gtk2        Fri Jun 03 10:13:29 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST.gtk2,v 1.1 2005/06/03 05:10:11 uebayasi Exp $
-bin/uim-candwin-gtk
-bin/uim-helper-candwin-gtk
-bin/uim-helper-toolbar-gtk
-bin/uim-helper-toolbar-gtk-systray
-bin/uim-im-switcher-gtk
-bin/uim-pref-gtk
-bin/uim-toolbar-gtk
-bin/uim-toolbar-gtk-systray
-lib/gtk-2.0/2.4.0/immodules/im-uim.la
-@comment in gtk2: @dirrm lib/gtk-2.0/2.4.0/immodules
diff -r ae9c9340c4b8 -r 2b913982e287 inputmethod/uim/options.mk
--- a/inputmethod/uim/options.mk        Fri Jun 03 10:13:29 2005 +0000
+++ b/inputmethod/uim/options.mk        Fri Jun 03 10:21:51 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.4 2005/06/03 05:10:11 uebayasi Exp $
+# $NetBSD: options.mk,v 1.5 2005/06/03 10:21:51 uebayasi Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.uim
-PKG_SUPPORTED_OPTIONS= anthy canna eb gtk2 qt
-PKG_SUGGESTED_OPTIONS= anthy canna gtk2
+PKG_SUPPORTED_OPTIONS= anthy canna eb gtk qt
+PKG_SUGGESTED_OPTIONS= anthy canna gtk
 PKG_OPTIONS_LEGACY_VARS+=      UIM_USE_ANTHY:anthy
 PKG_OPTIONS_LEGACY_VARS+=      UIM_USE_CANNA:canna
 PKG_OPTIONS_LEGACY_VARS+=      UIM_USE_EB:eb
@@ -27,9 +27,9 @@
 CONFIGURE_ARGS+=       --without-eb
 .endif
 
-.if !empty(PKG_OPTIONS:Mgtk2)
-.include "../../x11/gtk2/modules.mk"
-PLIST_SRC+=            PLIST.gtk2
+.if !empty(PKG_OPTIONS:Mgtk)
+.include "../../x11/gtk/modules.mk"
+PLIST_SRC+=            PLIST.gtk
 .endif
 
 .if !empty(PKG_OPTIONS:Mqt)