summaryrefslogtreecommitdiff
path: root/www/w3m
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 /www/w3m
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 'www/w3m')
-rw-r--r--www/w3m/PLIST4
-rw-r--r--www/w3m/options.mk6
2 files changed, 5 insertions, 5 deletions
diff --git a/www/w3m/PLIST b/www/w3m/PLIST
index 1b718975769..320c08c80e3 100644
--- a/www/w3m/PLIST
+++ b/www/w3m/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2007/01/29 23:05:09 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.14 2008/04/12 22:43:14 jlam Exp $
bin/w3m
bin/w3mman
man/man1/w3m.1
@@ -56,7 +56,7 @@ share/w3m/w3mhelp-w3m_en.html
share/w3m/w3mhelp-w3m_ja.html
share/w3m/w3mhelp.html
libexec/w3m/inflate
-${USE_IMAGE}libexec/w3m/w3mimgdisplay
+${PLIST.image}libexec/w3m/w3mimgdisplay
libexec/w3m/cgi-bin/dirlist.cgi
libexec/w3m/cgi-bin/multipart.cgi
libexec/w3m/cgi-bin/w3mbookmark
diff --git a/www/w3m/options.mk b/www/w3m/options.mk
index 11a40139788..0559573c5fe 100644
--- a/www/w3m/options.mk
+++ b/www/w3m/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2007/10/15 15:44:52 obache Exp $
+# $NetBSD: options.mk,v 1.7 2008/04/12 22:43:14 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.w3m
PKG_SUPPORTED_OPTIONS= inet6 w3m-lynx-key w3m-m17n w3m-unicode
@@ -53,6 +53,7 @@ CONFIGURE_ARGS+= --enable-keymap=lynx
CONFIGURE_ARGS+= --enable-keymap=w3m
.endif
+PLIST_VARS+= image
.if ${_W3M_USE_IMAGE} == "YES"
. for _imagelib in ${PKG_OPTIONS_GROUP.imagelib}
. if !empty(PKG_OPTIONS:M${_imagelib})
@@ -61,9 +62,8 @@ _W3M_IMAGELIB= ${_imagelib:C|^w3m-image-||}
. endfor
USE_X11= YES
CONFIGURE_ARGS+= --enable-image=x11 --with-imagelib=${_W3M_IMAGELIB:Q}
-PLIST_SUBST+= USE_IMAGE=''
+PLIST.image= yes
. include "../../graphics/${_W3M_IMAGELIB}/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-image
-PLIST_SUBST+= USE_IMAGE='@comment '
.endif