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.

---
 devel/semi/PLIST      |  6 +++---
 devel/semi/options.mk | 12 +++++-------
 2 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'devel/semi')

diff --git a/devel/semi/PLIST b/devel/semi/PLIST
index b96dac543ff..b4167f4b2d7 100644
--- a/devel/semi/PLIST
+++ b/devel/semi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2007/10/29 12:59:00 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/04/12 22:43:00 jlam Exp $
 ${EMACS_INFOPREFIX}/mime-ui-en.info
 ${EMACS_INFOPREFIX}/mime-ui-ja.info
 ${FOR_xemacs}${EMACS_LISPPREFIX}/semi/auto-autoloads.el
@@ -8,7 +8,7 @@ ${FOR_xemacs}${EMACS_LISPPREFIX}/semi/custom-load.elc
 ${EMACS_LISPPREFIX}/semi/mail-mime-setup.el
 ${EMACS_LISPPREFIX}/semi/mail-mime-setup.elc
 ${EMACS_LISPPREFIX}/semi/mime-bbdb.el
-${FOR_bbdb}${EMACS_LISPPREFIX}/semi/mime-bbdb.elc
+${PLIST.bbdb}${EMACS_LISPPREFIX}/semi/mime-bbdb.elc
 ${EMACS_LISPPREFIX}/semi/mime-edit.el
 ${EMACS_LISPPREFIX}/semi/mime-edit.elc
 ${EMACS_LISPPREFIX}/semi/mime-image.el
@@ -24,7 +24,7 @@ ${EMACS_LISPPREFIX}/semi/mime-setup.elc
 ${EMACS_LISPPREFIX}/semi/mime-view.el
 ${EMACS_LISPPREFIX}/semi/mime-view.elc
 ${EMACS_LISPPREFIX}/semi/mime-w3.el
-${FOR_w3}${EMACS_LISPPREFIX}/semi/mime-w3.elc
+${PLIST.w3}${EMACS_LISPPREFIX}/semi/mime-w3.elc
 ${EMACS_LISPPREFIX}/semi/pgg-def.el
 ${EMACS_LISPPREFIX}/semi/pgg-def.elc
 ${EMACS_LISPPREFIX}/semi/pgg-gpg.el
diff --git a/devel/semi/options.mk b/devel/semi/options.mk
index 84d22ded6ba..efd4820e07d 100644
--- a/devel/semi/options.mk
+++ b/devel/semi/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2007/10/29 13:01:37 uebayasi Exp $
+# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:00 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.semi
 PKG_SUPPORTED_OPTIONS=	semi-bbdb
@@ -8,18 +8,16 @@ PKG_SUGGESTED_OPTIONS=
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=	bbdb w3
+
 .if !empty(PKG_OPTIONS:Msemi-bbdb)
 .include "../../misc/bbdb/buildlink3.mk"
-PLIST_SUBST+=	FOR_bbdb=
-.else
-PLIST_SUBST+=	FOR_bbdb="@comment "
+PLIST.bbdb=	yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mw3)
 .include "../../www/w3/buildlink3.mk"
-PLIST_SUBST+=	FOR_w3=
-.else
-PLIST_SUBST+=	FOR_w3="@comment "
+PLIST.w3=	yes
 .endif
 
 # XXX inter-dependency!?!?!?
-- 
cgit v1.2.3