[pkgsrc/trunk]: pkgsrc/inputmethod/uim Add options: curses, x11.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6365f92b5577
branches:  trunk
changeset: 552778:6365f92b5577
user:      uebayasi <uebayasi%pkgsrc.org@localhost>
date:      Fri Jan 09 03:32:08 2009 +0000

description:
Add options: curses, x11.

diffstat:

 inputmethod/uim/Makefile   |   6 +++---
 inputmethod/uim/PLIST      |   6 +++---
 inputmethod/uim/options.mk |  23 ++++++++++++++++++-----
 3 files changed, 24 insertions(+), 11 deletions(-)

diffs (88 lines):

diff -r 649a9599966b -r 6365f92b5577 inputmethod/uim/Makefile
--- a/inputmethod/uim/Makefile  Thu Jan 08 22:51:52 2009 +0000
+++ b/inputmethod/uim/Makefile  Fri Jan 09 03:32:08 2009 +0000
@@ -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 @@
 
 .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 @@
 .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 -r 649a9599966b -r 6365f92b5577 inputmethod/uim/PLIST
--- a/inputmethod/uim/PLIST     Thu Jan 08 22:51:52 2009 +0000
+++ b/inputmethod/uim/PLIST     Fri Jan 09 03:32:08 2009 +0000
@@ -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 @@
 ${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.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 -r 649a9599966b -r 6365f92b5577 inputmethod/uim/options.mk
--- a/inputmethod/uim/options.mk        Thu Jan 08 22:51:52 2009 +0000
+++ b/inputmethod/uim/options.mk        Fri Jan 09 03:32:08 2009 +0000
@@ -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"