summaryrefslogtreecommitdiff
path: root/inputmethod
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2008-04-12 22:42:57 +0000
committerjlam <jlam@pkgsrc.org>2008-04-12 22:42:57 +0000
commit841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a (patch)
treefdd67c81079412bf94013749a954125434a9baca /inputmethod
parent6874584eae20f517f70816571f6d4ac696db16b3 (diff)
downloadpkgsrc-841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a.tar.gz
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'inputmethod')
-rw-r--r--inputmethod/skk/PLIST6
-rw-r--r--inputmethod/skk/options.mk8
-rw-r--r--inputmethod/uim/PLIST44
-rw-r--r--inputmethod/uim/options.mk29
4 files changed, 40 insertions, 47 deletions
diff --git a/inputmethod/skk/PLIST b/inputmethod/skk/PLIST
index 179f0519533..e0b3c81222e 100644
--- a/inputmethod/skk/PLIST
+++ b/inputmethod/skk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2008/03/11 01:26:08 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/04/12 22:43:02 jlam Exp $
${EMACS_INFOPREFIX}/skk.info
${FOR_emacs20}${EMACS_LISPPREFIX}/skk/ccc.el
${FOR_emacs21}${EMACS_LISPPREFIX}/skk/ccc.el
@@ -75,8 +75,8 @@ ${EMACS_LISPPREFIX}/skk/skk-leim.el
${EMACS_LISPPREFIX}/skk/skk-leim.elc
${EMACS_LISPPREFIX}/skk/skk-look.el
${EMACS_LISPPREFIX}/skk/skk-look.elc
-${FOR_LOOKUP}${EMACS_LISPPREFIX}/skk/skk-lookup.el
-${FOR_LOOKUP}${EMACS_LISPPREFIX}/skk/skk-lookup.elc
+${PLIST.lookup}${EMACS_LISPPREFIX}/skk/skk-lookup.el
+${PLIST.lookup}${EMACS_LISPPREFIX}/skk/skk-lookup.elc
${EMACS_LISPPREFIX}/skk/skk-macs.el
${EMACS_LISPPREFIX}/skk/skk-macs.elc
${EMACS_LISPPREFIX}/skk/skk-num.el
diff --git a/inputmethod/skk/options.mk b/inputmethod/skk/options.mk
index eadadd4b028..061f7719864 100644
--- a/inputmethod/skk/options.mk
+++ b/inputmethod/skk/options.mk
@@ -1,13 +1,13 @@
-# $NetBSD: options.mk,v 1.4 2007/10/29 13:25:26 uebayasi Exp $
+# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:02 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.skk
PKG_SUPPORTED_OPTIONS= lookup
.include "../../mk/bsd.options.mk"
+PLIST_VARS+= lookup
+
.if !empty(PKG_OPTIONS:Mlookup)
.include "../../misc/lookup/buildlink3.mk"
-PLIST_SUBST+= FOR_LOOKUP=""
-.else
-PLIST_SUBST+= FOR_LOOKUP="@comment "
+PLIST.lookup= yes
.endif
diff --git a/inputmethod/uim/PLIST b/inputmethod/uim/PLIST
index 5b6e8e38805..296da877898 100644
--- a/inputmethod/uim/PLIST
+++ b/inputmethod/uim/PLIST
@@ -1,18 +1,18 @@
-@comment $NetBSD: PLIST,v 1.4 2008/03/02 01:57:37 obache Exp $
-${QT}bin/uim-chardict-qt
-${UIM_DICT_GTK}bin/uim-dict-gtk
+@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:02 jlam Exp $
+${PLIST.qt}bin/uim-chardict-qt
+${PLIST.uim-dict-gtk}bin/uim-dict-gtk
bin/uim-fep
bin/uim-fep-tick
-${GTK}bin/uim-im-switcher-gtk
-${QT}bin/uim-im-switcher-qt
-${GTK}bin/uim-input-pad-ja
+${PLIST.gtk}bin/uim-im-switcher-gtk
+${PLIST.qt}bin/uim-im-switcher-qt
+${PLIST.gtk}bin/uim-input-pad-ja
bin/uim-module-manager
-${GTK}bin/uim-pref-gtk
-${QT}bin/uim-pref-qt
+${PLIST.gtk}bin/uim-pref-gtk
+${PLIST.qt}bin/uim-pref-qt
bin/uim-sh
-${GTK}bin/uim-toolbar-gtk
-${QT}bin/uim-toolbar-qt
-${GTK}bin/uim-toolbar-gtk-systray
+${PLIST.gtk}bin/uim-toolbar-gtk
+${PLIST.qt}bin/uim-toolbar-qt
+${PLIST.gtk}bin/uim-toolbar-gtk-systray
bin/uim-xim
include/uim/plugin.h
include/uim/uim-compat-scm.h
@@ -24,15 +24,15 @@ include/uim/uim-util.h
include/uim/uim.h
lib/libuim-custom.la
lib/libuim.la
-${GTK}lib/gtk-2.0/2.10.0/immodules/im-uim.la
-${KDE}lib/kde3/uim_panelapplet.la
+${PLIST.gtk}lib/gtk-2.0/2.10.0/immodules/im-uim.la
+${PLIST.kde}lib/kde3/uim_panelapplet.la
lib/pkgconfig/uim.pc
-${ANTHY}lib/uim/plugin/libuim-anthy.la
-${CANNA}lib/uim/plugin/libuim-canna.la
+${PLIST.anthy}lib/uim/plugin/libuim-anthy.la
+${PLIST.canna}lib/uim/plugin/libuim-canna.la
lib/uim/plugin/libuim-custom-enabler.la
lib/uim/plugin/libuim-skk.la
-${GTK}libexec/uim-candwin-gtk
-${QT}libexec/uim-candwin-qt
+${PLIST.gtk}libexec/uim-candwin-gtk
+${PLIST.qt}libexec/uim-candwin-qt
libexec/uim-helper-server
man/man1/uim-xim.1
share/applications/uim.desktop
@@ -51,8 +51,8 @@ share/doc/uim/uim-fep/README.ja
share/locale/fr/LC_MESSAGES/uim.mo
share/locale/ja/LC_MESSAGES/uim.mo
share/locale/ko/LC_MESSAGES/uim.mo
-${QT}share/locale/ja/LC_MESSAGES/uim-chardict-qt.mo
-${KDE}share/kde/apps/kicker/applets/uimapplet.desktop
+${PLIST.qt}share/locale/ja/LC_MESSAGES/uim-chardict-qt.mo
+${PLIST.kde}share/kde/apps/kicker/applets/uimapplet.desktop
share/uim/action.scm
share/uim/anthy-custom.scm
share/uim/anthy-key-custom.scm
@@ -75,8 +75,8 @@ share/uim/generic.scm
share/uim/hangul.scm
share/uim/hangul2.scm
share/uim/hangul3.scm
-${QT}share/uim/helperdata/bushu.t
-${UIM_DICT_GTK}share/uim/helperdata/uim-dict-ui.xml
+${PLIST.qt}share/uim/helperdata/bushu.t
+${PLIST.uim-dict-gtk}share/uim/helperdata/uim-dict-ui.xml
share/uim/i18n.scm
share/uim/im-custom.scm
share/uim/im-switcher.scm
@@ -210,7 +210,7 @@ share/uim/ustr.scm
share/uim/util.scm
share/uim/viqr.scm
share/uim/zaurus.scm
-${HELPERDATA}@dirrm share/uim/helperdata
+${PLIST.helperdata}@dirrm share/uim/helperdata
@dirrm share/uim/pixmaps
@dirrm share/uim
@comment in kde: @dirrm share/kde/apps/kicker/applets
diff --git a/inputmethod/uim/options.mk b/inputmethod/uim/options.mk
index 4b8771564f3..3d3aba28beb 100644
--- a/inputmethod/uim/options.mk
+++ b/inputmethod/uim/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2008/03/02 01:57:37 obache Exp $
+# $NetBSD: options.mk,v 1.12 2008/04/12 22:43:02 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.uim
PKG_SUPPORTED_OPTIONS= anthy canna eb gtk qt kde
@@ -6,29 +6,27 @@ PKG_SUGGESTED_OPTIONS= anthy canna gtk
.include "../../mk/bsd.options.mk"
-PLIST_SUBST+= HELPERDATA="@comment "
-PLIST_SUBST+= UIM_DICT_GTK="@comment "
+PLIST_VARS+= helperdata uim-dict-gtk
+PLIST_VARS+= anthy canna gtk kde qt
.if !empty(PKG_OPTIONS:Manthy)
. include "../../inputmethod/anthy/buildlink3.mk"
CONFIGURE_ARGS+= --with-anthy --enable-dict
-PLIST_SUBST+= ANTHY=
+PLIST.anthy= yes
. if !empty(PKG_OPTIONS:Mgtk)
-PLIST_SUBST+= HELPERDATA=
-PLIST_SUBST+= UIM_DICT_GTK=
+PLIST.helperdata= yes
+PLIST.uim-dict-gtk= yes
. endif
.else
CONFIGURE_ARGS+= --without-anthy
-PLIST_SUBST+= ANTHY="@comment "
.endif
.if !empty(PKG_OPTIONS:Mcanna)
. include "../../inputmethod/canna-lib/buildlink3.mk"
CONFIGURE_ARGS+= --with-canna
-PLIST_SUBST+= CANNA=
+PLIST.canna= yes
.else
CONFIGURE_ARGS+= --without-canna
-PLIST_SUBST+= CANNA="@comment "
.endif
.if !empty(PKG_OPTIONS:Meb)
@@ -39,10 +37,9 @@ CONFIGURE_ARGS+= --without-eb
.if !empty(PKG_OPTIONS:Mgtk)
.include "../../x11/gtk2/modules.mk"
-PLIST_SUBST+= GTK=
+PLIST.gtk= yes
.else
CONFIGURE_ARGS+= --without-gtk2
-PLIST_SUBST+= GTK="@comment "
.endif
.if !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde)
@@ -51,17 +48,13 @@ BUILD_DEPENDS+= qt3-tools-3.*:../../x11/qt3-tools
CONFIGURE_ARGS+= --with-qt CXXFLAGS=-lc
# This option don't work. Need immodule patch for Qt3(uim-1.4.x not support Qt4)
#CONFIGURE_ARGS+= --with-qt-immodule
-PLIST_SUBST+= HELPERDATA=
-PLIST_SUBST+= QT=
-.else
-PLIST_SUBST+= QT="@comment "
+PLIST.helperdata= yes
+PLIST.qt= yes
.endif
.if !empty(PKG_OPTIONS:Mkde)
. include "../../x11/kdelibs3/buildlink3.mk"
. include "../../x11/qt3-libs/buildlink3.mk"
CONFIGURE_ARGS+= --enable-kde-applet=yes
-PLIST_SUBST+= KDE=
-.else
-PLIST_SUBST+= KDE="@comment "
+PLIST.kde= yes
.endif