From ec3bbe44a754e7b7bba0ceb28a1fbd6a149bac22 Mon Sep 17 00:00:00 2001
From: uebayasi <uebayasi@pkgsrc.org>
Date: Fri, 3 Jun 2005 10:21:51 +0000
Subject: Call Gtk2 option as "gtk", not "gtk2", as other packages do. Pointed
 out by Dieter Baron.

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

(limited to 'inputmethod/uim')

diff --git a/inputmethod/uim/PLIST.gtk b/inputmethod/uim/PLIST.gtk
new file mode 100644
index 00000000000..479352fd6f2
--- /dev/null
+++ b/inputmethod/uim/PLIST.gtk
@@ -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 --git a/inputmethod/uim/PLIST.gtk2 b/inputmethod/uim/PLIST.gtk2
deleted file mode 100644
index 49a8d70b166..00000000000
--- a/inputmethod/uim/PLIST.gtk2
+++ /dev/null
@@ -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 --git a/inputmethod/uim/options.mk b/inputmethod/uim/options.mk
index b818ffa09d6..91d026fbbd4 100644
--- a/inputmethod/uim/options.mk
+++ b/inputmethod/uim/options.mk
@@ -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 @@ PLIST_SRC+=		PLIST.canna
 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)
-- 
cgit v1.2.3