summaryrefslogtreecommitdiff
path: root/devel/m17n-lib
diff options
context:
space:
mode:
authorjlam <jlam>2008-04-12 22:42:57 +0000
committerjlam <jlam>2008-04-12 22:42:57 +0000
commit84db467ec7c8386066718011f8d47775d5608811 (patch)
treefdd67c81079412bf94013749a954125434a9baca /devel/m17n-lib
parent7082f8c2044621c8641f3c82a2da95c2d442048c (diff)
downloadpkgsrc-84db467ec7c8386066718011f8d47775d5608811.tar.gz
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'devel/m17n-lib')
-rw-r--r--devel/m17n-lib/PLIST24
-rw-r--r--devel/m17n-lib/options.mk7
2 files changed, 16 insertions, 15 deletions
diff --git a/devel/m17n-lib/PLIST b/devel/m17n-lib/PLIST
index 01f2156e325..fe3d12cb4dd 100644
--- a/devel/m17n-lib/PLIST
+++ b/devel/m17n-lib/PLIST
@@ -1,25 +1,25 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/02/27 13:48:28 obache Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/04/12 22:42:59 jlam Exp $
bin/m17n-config
bin/m17n-conv
-${X11}bin/m17n-date
-${X11}bin/m17n-dump
-${X11}bin/m17n-edit
-${X11}bin/m17n-view
-${X11}include/m17n-X.h
+${PLIST.x11}bin/m17n-date
+${PLIST.x11}bin/m17n-dump
+${PLIST.x11}bin/m17n-edit
+${PLIST.x11}bin/m17n-view
+${PLIST.x11}include/m17n-X.h
include/m17n-core.h
include/m17n-flt.h
-${X11}include/m17n-gui.h
+${PLIST.x11}include/m17n-gui.h
include/m17n-misc.h
include/m17n.h
-${X11}lib/libm17n-X.la
+${PLIST.x11}lib/libm17n-X.la
lib/libm17n-core.la
lib/libm17n-flt.la
-${X11}lib/libm17n-gd.la
-${X11}lib/libm17n-gui.la
+${PLIST.x11}lib/libm17n-gd.la
+${PLIST.x11}lib/libm17n-gui.la
lib/libm17n.la
lib/libmimx-anthy.la
-${X11}lib/libmimx-ispell.la
+${PLIST.x11}lib/libmimx-ispell.la
lib/pkgconfig/m17n-core.pc
lib/pkgconfig/m17n-flt.pc
-${X11}lib/pkgconfig/m17n-gui.pc
+${PLIST.x11}lib/pkgconfig/m17n-gui.pc
lib/pkgconfig/m17n-shell.pc
diff --git a/devel/m17n-lib/options.mk b/devel/m17n-lib/options.mk
index 83d3d3d9024..322d27f6042 100644
--- a/devel/m17n-lib/options.mk
+++ b/devel/m17n-lib/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2008/03/09 11:17:27 hira Exp $
+# $NetBSD: options.mk,v 1.3 2008/04/12 22:42:59 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.m17n-lib
PKG_SUPPORTED_OPTIONS= anthy x11 libthai
@@ -6,6 +6,8 @@ PKG_SUGGESTED_OPTIONS= x11
.include "../../mk/bsd.options.mk"
+PLIST_VARS+= x11
+
.if !empty(PKG_OPTIONS:Manthy)
.include "../../inputmethod/anthy/buildlink3.mk"
.endif
@@ -17,10 +19,9 @@ PKG_SUGGESTED_OPTIONS= x11
.include "../../graphics/libotf/buildlink3.mk"
.include "../../x11/libXft/buildlink3.mk"
.include "../../mk/xaw.buildlink3.mk"
-PLIST_SUBST+= X11=""
+PLIST.x11= yes
.else
CONFIGURE_ARGS+= --without-gui
-PLIST_SUBST+= X11="@comment "
.endif
.if !empty(PKG_OPTIONS:Mlibthai)