summaryrefslogtreecommitdiff
path: root/www/emacs-w3m
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 /www/emacs-w3m
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 'www/emacs-w3m')
-rw-r--r--www/emacs-w3m/Makefile7
-rw-r--r--www/emacs-w3m/PLIST48
-rw-r--r--www/emacs-w3m/options.mk7
3 files changed, 30 insertions, 32 deletions
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index 3dafc71a672..f7908b3e006 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/10/29 13:11:11 uebayasi Exp $
+# $NetBSD: Makefile,v 1.22 2008/04/12 22:43:13 jlam Exp $
DISTNAME= emacs-w3m-1.4.4
PKGREVISION= 1
@@ -30,11 +30,10 @@ SUBST_SED.fix-icondir= -e 's|etc/images/w3m|etc/w3m|g' \
.include "../../mk/emacs.mk"
# GNU Emacs 21 or later and XEmacs have GUI support
+PLIST_VARS+= gui
.if (${EMACS_FLAVOR} == "emacs" && ${EMACS_VERSION_MAJOR} > 20) || \
${EMACS_FLAVOR} == "xemacs"
-PLIST_SUBST+= FOR_gui=""
-.else
-PLIST_SUBST+= FOR_gui="@comment "
+PLIST.gui= yes
.endif
DOCUMENTS= COPYING ChangeLog ChangeLog.1 README README.ja
diff --git a/www/emacs-w3m/PLIST b/www/emacs-w3m/PLIST
index 4b4e7a0d7c9..97777abbaab 100644
--- a/www/emacs-w3m/PLIST
+++ b/www/emacs-w3m/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.10 2007/10/29 13:11:11 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/04/12 22:43:13 jlam Exp $
${EMACS_LISPPREFIX}/w3m/ChangeLog
${EMACS_LISPPREFIX}/w3m/ChangeLog.1
${EMACS_LISPPREFIX}/w3m/mew-w3m.el
-${FOR_mew}${EMACS_LISPPREFIX}/w3m/mew-w3m.elc
+${PLIST.mew}${EMACS_LISPPREFIX}/w3m/mew-w3m.elc
${EMACS_LISPPREFIX}/w3m/mime-w3m.el
${EMACS_LISPPREFIX}/w3m/mime-w3m.elc
${EMACS_LISPPREFIX}/w3m/octet.el
@@ -68,7 +68,7 @@ ${FOR_xemacs215}${EMACS_LISPPREFIX}/w3m/w3m-xmas.elc
${EMACS_LISPPREFIX}/w3m/w3m.el
${EMACS_LISPPREFIX}/w3m/w3m.elc
${EMACS_LISPPREFIX}/w3m/mew-shimbun.el
-${FOR_mew}${EMACS_LISPPREFIX}/w3m/mew-shimbun.elc
+${PLIST.mew}${EMACS_LISPPREFIX}/w3m/mew-shimbun.elc
${EMACS_LISPPREFIX}/w3m/w3m-ccl.el
${EMACS_LISPPREFIX}/w3m/w3m-favicon.el
${EMACS_LISPPREFIX}/w3m/w3m-filter.el
@@ -317,27 +317,27 @@ ${ETCDIR}/ChangeLog
${ETCDIR}/ChangeLog.1
${ETCDIR}/README
${ETCDIR}/README.ja
-${FOR_gui}${ETCDIR}/antenna-up.xpm
-${FOR_gui}${ETCDIR}/back-disabled.xpm
-${FOR_gui}${ETCDIR}/back-up.xpm
-${FOR_gui}${ETCDIR}/copy-up.xpm
-${FOR_gui}${ETCDIR}/db-history-up.xpm
-${FOR_gui}${ETCDIR}/forward-disabled.xpm
-${FOR_gui}${ETCDIR}/forward-up.xpm
-${FOR_gui}${ETCDIR}/history-up.xpm
-${FOR_gui}${ETCDIR}/home-up.xpm
-${FOR_gui}${ETCDIR}/image-up.xpm
-${FOR_gui}${ETCDIR}/open-up.xpm
-${FOR_gui}${ETCDIR}/parent-disabled.xpm
-${FOR_gui}${ETCDIR}/parent-up.xpm
-${FOR_gui}${ETCDIR}/reload-up.xpm
-${FOR_gui}${ETCDIR}/search-up.xpm
-${FOR_gui}${ETCDIR}/spinner.gif
-${FOR_gui}${ETCDIR}/state-00.xpm
-${FOR_gui}${ETCDIR}/state-01.xpm
-${FOR_gui}${ETCDIR}/state-10.xpm
-${FOR_gui}${ETCDIR}/state-11.xpm
-${FOR_gui}${ETCDIR}/weather-up.xpm
+${PLIST.gui}${ETCDIR}/antenna-up.xpm
+${PLIST.gui}${ETCDIR}/back-disabled.xpm
+${PLIST.gui}${ETCDIR}/back-up.xpm
+${PLIST.gui}${ETCDIR}/copy-up.xpm
+${PLIST.gui}${ETCDIR}/db-history-up.xpm
+${PLIST.gui}${ETCDIR}/forward-disabled.xpm
+${PLIST.gui}${ETCDIR}/forward-up.xpm
+${PLIST.gui}${ETCDIR}/history-up.xpm
+${PLIST.gui}${ETCDIR}/home-up.xpm
+${PLIST.gui}${ETCDIR}/image-up.xpm
+${PLIST.gui}${ETCDIR}/open-up.xpm
+${PLIST.gui}${ETCDIR}/parent-disabled.xpm
+${PLIST.gui}${ETCDIR}/parent-up.xpm
+${PLIST.gui}${ETCDIR}/reload-up.xpm
+${PLIST.gui}${ETCDIR}/search-up.xpm
+${PLIST.gui}${ETCDIR}/spinner.gif
+${PLIST.gui}${ETCDIR}/state-00.xpm
+${PLIST.gui}${ETCDIR}/state-01.xpm
+${PLIST.gui}${ETCDIR}/state-10.xpm
+${PLIST.gui}${ETCDIR}/state-11.xpm
+${PLIST.gui}${ETCDIR}/weather-up.xpm
info/emacs-w3m-ja.info
info/emacs-w3m.info
@dirrm ${EMACS_LISPPREFIX}/w3m
diff --git a/www/emacs-w3m/options.mk b/www/emacs-w3m/options.mk
index 9a611060270..b798cbe175d 100644
--- a/www/emacs-w3m/options.mk
+++ b/www/emacs-w3m/options.mk
@@ -1,13 +1,12 @@
-# $NetBSD: options.mk,v 1.1 2007/10/29 13:11:11 uebayasi Exp $
+# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:13 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.emacs-w3m
PKG_SUPPORTED_OPTIONS= emacs-w3m-mew
.include "../../mk/bsd.options.mk"
+PLIST_VARS+= mew
.if !empty(PKG_OPTIONS:Memacs-w3m-mew)
.include "../../mail/mew/buildlink3.mk"
-PLIST_SUBST+= FOR_mew=
-.else
-PLIST_SUBST+= FOR_mew="@comment "
+PLIST.mew= yes
.endif