Add options: curses, x11.

3 files changed, 24 insertions, 11 deletions

diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile
index 75b6abfc0e8..c97a5510f54 100644
--- a/inputmethod/uim/Makefile
+++ b/inputmethod/uim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2008/09/24 03:03:45 obache Exp $
+# $NetBSD: Makefile,v 1.35 2009/01/09 03:32:08 uebayasi Exp $
 #
 
 DISTNAME=		uim-1.5.1
@@ -26,6 +26,8 @@ CONFIGURE_ARGS+=	--with-libgcroots=installed
 
 .include "options.mk"
 
+# XXXUEBAYASI why is readline a must?
+
 PLIST_VARS+=		editline
 CHECK_BUILTIN.readline:=	yes
 .include "../../devel/readline/builtin.mk"
@@ -56,6 +58,4 @@ post-install:
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgcroots/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/uim/PLIST b/inputmethod/uim/PLIST
index 3181af8e13d..68f79bc8ecc 100644
--- a/inputmethod/uim/PLIST
+++ b/inputmethod/uim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2008/09/24 03:03:45 obache Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/01/09 03:32:08 uebayasi Exp $
 ${PLIST.qt}bin/uim-chardict-qt
 ${PLIST.uim-dict-gtk}bin/uim-dict-gtk
 bin/uim-fep
@@ -14,7 +14,7 @@ bin/uim-sh
 ${PLIST.gtk}bin/uim-toolbar-gtk
 ${PLIST.qt}bin/uim-toolbar-qt
 ${PLIST.gtk}bin/uim-toolbar-gtk-systray
-bin/uim-xim
+${PLIST.x11}bin/uim-xim
 include/uim/plugin.h
 include/uim/uim-custom.h
 include/uim/uim-helper.h
@@ -46,7 +46,7 @@ ${PLIST.gtk}libexec/uim-candwin-gtk
 ${PLIST.qt}libexec/uim-candwin-qt
 libexec/uim-helper-server
 ${PLIST.gnome}libexec/uim-toolbar-applet
-man/man1/uim-xim.1
+${PLIST.x11}man/man1/uim-xim.1
 share/applications/uim.desktop
 share/doc/uim/COMPATIBILITY
 share/doc/uim/CUSTOM
diff --git a/inputmethod/uim/options.mk b/inputmethod/uim/options.mk
index fe1c531057b..32117219964 100644
--- a/inputmethod/uim/options.mk
+++ b/inputmethod/uim/options.mk
@@ -1,14 +1,27 @@
-# $NetBSD: options.mk,v 1.13 2008/06/08 13:01:48 obache Exp $
+# $NetBSD: options.mk,v 1.14 2009/01/09 03:32:08 uebayasi Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.uim
-#PKG_SUPPORTED_OPTIONS=	anthy canna eb gnome gtk kde m17nlib qt prime sj3 wnn
-PKG_SUPPORTED_OPTIONS=	anthy canna eb gnome gtk kde m17nlib qt prime
-PKG_SUGGESTED_OPTIONS=	anthy canna gtk
+#PKG_SUPPORTED_OPTIONS=	anthy canna curses eb gnome gtk kde m17nlib qt prime sj3 wnn x11
+PKG_SUPPORTED_OPTIONS=	anthy canna curses eb gnome gtk kde m17nlib qt prime x11
+PKG_SUGGESTED_OPTIONS=	anthy canna curses gtk x11
 
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=		helperdata uim-dict-gtk
-PLIST_VARS+=		anthy canna gnome gtk kde m17nlib prime qt sj3 wnn
+PLIST_VARS+=		anthy canna gnome gtk kde m17nlib prime qt sj3 wnn x11
+
+.if !empty(PKG_OPTIONS:Mx11)
+.include "../../x11/libX11/buildlink3.mk"
+PLIST.x11=		yes
+.else
+CONFIGURE_ARGS+=	--with-x=no
+.endif
+
+.if !empty(PKG_OPTIONS:Mcurses)
+.include "../../devel/ncurses/buildlink3.mk"	# XXXUEBAYASI setupterm in ncurses is needed
+#.include "../../mk/curses.buildlink3.mk"	# XXXUEBAYASI for FEP
+.else
+.endif
 
 .if !empty(PKG_OPTIONS:Manthy)
 .  include "../../inputmethod/anthy/buildlink3.mk"