Make gtk2 an option. No default binary change, no revision bump.

4 files changed, 23 insertions, 16 deletions

diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile
index 1d44e8265ba..57b48b4e056 100644
--- a/inputmethod/uim/Makefile
+++ b/inputmethod/uim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:58 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/03 05:10:11 uebayasi Exp $
 #
 
 DISTNAME=		uim-0.4.6
@@ -38,5 +38,5 @@ post-install:
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
-.include "../../x11/gtk2/modules.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/uim/PLIST.common b/inputmethod/uim/PLIST.common
index b4da29efc37..23c866b2c05 100644
--- a/inputmethod/uim/PLIST.common
+++ b/inputmethod/uim/PLIST.common
@@ -1,17 +1,9 @@
-@comment $NetBSD: PLIST.common,v 1.1 2005/03/29 18:47:52 wiz Exp $
-bin/uim-candwin-gtk
+@comment $NetBSD: PLIST.common,v 1.2 2005/06/03 05:10:11 uebayasi Exp $
 bin/uim-fep
 bin/uim-fep-tick
-bin/uim-helper-candwin-gtk
 bin/uim-helper-server
-bin/uim-helper-toolbar-gtk
-bin/uim-helper-toolbar-gtk-systray
-bin/uim-im-switcher-gtk
 bin/uim-input-pad-ja
-bin/uim-pref-gtk
 bin/uim-sh
-bin/uim-toolbar-gtk
-bin/uim-toolbar-gtk-systray
 bin/uim-xim
 include/uim/plugin.h
 include/uim/uim-compat-scm.h
@@ -21,7 +13,6 @@ include/uim/uim-im-switcher.h
 include/uim/uim-scm.h
 include/uim/uim-util.h
 include/uim/uim.h
-lib/gtk-2.0/2.4.0/immodules/im-uim.la
 lib/libuim-custom.la
 lib/libuim.la
 lib/pkgconfig/uim.pc
@@ -114,5 +105,4 @@ share/uim/zaurus.scm
 @dirrm share/doc/uim
 @dirrm lib/uim/plugin
 @dirrm lib/uim
-@comment in gtk2: @dirrm lib/gtk-2.0/2.4.0/immodules
 @dirrm include/uim
diff --git a/inputmethod/uim/PLIST.gtk2 b/inputmethod/uim/PLIST.gtk2
new file mode 100644
index 00000000000..49a8d70b166
--- /dev/null
+++ b/inputmethod/uim/PLIST.gtk2
@@ -0,0 +1,11 @@
+@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 d307134fba7..b818ffa09d6 100644
--- a/inputmethod/uim/options.mk
+++ b/inputmethod/uim/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2005/06/01 14:05:54 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2005/06/03 05:10:11 uebayasi Exp $
 
-PKG_SUPPORTED_OPTIONS=  anthy canna eb qt
-PKG_SUGGESTED_OPTIONS=	anthy canna
+PKG_OPTIONS_VAR=	PKG_OPTIONS.uim
+PKG_SUPPORTED_OPTIONS=	anthy canna eb gtk2 qt
+PKG_SUGGESTED_OPTIONS=	anthy canna gtk2
 PKG_OPTIONS_LEGACY_VARS+=	UIM_USE_ANTHY:anthy
 PKG_OPTIONS_LEGACY_VARS+=	UIM_USE_CANNA:canna
 PKG_OPTIONS_LEGACY_VARS+=	UIM_USE_EB:eb
@@ -26,6 +27,11 @@ PLIST_SRC+=		PLIST.canna
 CONFIGURE_ARGS+=	--without-eb
 .endif
 
+.if !empty(PKG_OPTIONS:Mgtk2)
+.include "../../x11/gtk2/modules.mk"
+PLIST_SRC+=		PLIST.gtk2
+.endif
+
 .if !empty(PKG_OPTIONS:Mqt)
 .include "../../x11/qt3-libs/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-qt