From 841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sat, 12 Apr 2008 22:42:57 +0000
Subject: Convert to use PLIST_VARS instead of manually passing "@comment "
 through PLIST_SUBST to the plist module.

---
 mail/wl/PLIST      | 8 ++++----
 mail/wl/options.mk | 7 +++----
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'mail/wl')

diff --git a/mail/wl/PLIST b/mail/wl/PLIST
index 82f39d0fbf8..91a5485f76b 100644
--- a/mail/wl/PLIST
+++ b/mail/wl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2007/10/29 13:06:05 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.12 2008/04/12 22:43:04 jlam Exp $
 ${EMACS_INFOPREFIX}/wl-ja.info
 ${EMACS_INFOPREFIX}/wl.info
 ${EMACS_LISPPREFIX}/wl/acap.el
@@ -55,8 +55,8 @@ ${EMACS_LISPPREFIX}/wl/elmo-pop3.el
 ${EMACS_LISPPREFIX}/wl/elmo-pop3.elc
 ${EMACS_LISPPREFIX}/wl/elmo-sendlog.el
 ${EMACS_LISPPREFIX}/wl/elmo-sendlog.elc
-${FOR_emacs_w3m}${EMACS_LISPPREFIX}/wl/elmo-shimbun.el
-${FOR_emacs_w3m}${EMACS_LISPPREFIX}/wl/elmo-shimbun.elc
+${PLIST.emacs-w3m}${EMACS_LISPPREFIX}/wl/elmo-shimbun.el
+${PLIST.emacs-w3m}${EMACS_LISPPREFIX}/wl/elmo-shimbun.elc
 ${EMACS_LISPPREFIX}/wl/elmo-signal.el
 ${EMACS_LISPPREFIX}/wl/elmo-signal.elc
 ${EMACS_LISPPREFIX}/wl/elmo-spam.el
@@ -203,7 +203,7 @@ ${FOR_emacs_x}share/wl/pipe.xpm
 ${FOR_emacs_x}share/wl/plugged.xpm
 ${FOR_emacs_x}share/wl/pop.xpm
 ${FOR_emacs_x}share/wl/queue.xpm
-${FOR_emacs_x}${FOR_emacs_w3m}share/wl/shimbun.xpm
+${FOR_emacs_x}${PLIST.emacs-w3m}share/wl/shimbun.xpm
 ${FOR_emacs_x}share/wl/trash-e.xpm
 ${FOR_emacs_x}share/wl/trash.xpm
 ${FOR_emacs_x}share/wl/unplugged.xpm
diff --git a/mail/wl/options.mk b/mail/wl/options.mk
index 62494bb8b07..a57c0f69fba 100644
--- a/mail/wl/options.mk
+++ b/mail/wl/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2007/10/29 13:06:05 uebayasi Exp $
+# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:04 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.wl
 PKG_SUPPORTED_OPTIONS=	emacs-w3m
@@ -6,9 +6,8 @@ PKG_SUGGESTED_OPTIONS=	emacs-w3m
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		emacs-w3m
 .if !empty(PKG_OPTIONS:Memacs-w3m)
 .include "../../www/emacs-w3m/buildlink3.mk"
-PLIST_SUBST+=	FOR_emacs_w3m=""
-.else
-PLIST_SUBST+=	FOR_emacs_w3m="@comment "
+PLIST.emacs-w3m=	yes
 .endif
-- 
cgit v1.2.3