Convert to use PLIST_VARS instead of manually passing "@comment "

through PLIST_SUBST to the plist module.

3 files changed, 18 insertions, 20 deletions

diff --git a/databases/lbdb/Makefile b/databases/lbdb/Makefile
index 745f5282088..6b3c200649e 100644
--- a/databases/lbdb/Makefile
+++ b/databases/lbdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/06/10 21:12:51 tonio Exp $
+# $NetBSD: Makefile,v 1.20 2008/04/12 22:42:59 jlam Exp $
 
 DISTNAME=		lbdb_0.35.1
 PKGNAME=		${DISTNAME:S/_/-/}
@@ -33,10 +33,9 @@ EGDIR=			${PREFIX}/share/examples/lbdb
 CONF_FILES+=		${EGDIR}/lbdb.rc ${PKG_SYSCONFDIR}/lbdb.rc
 CONF_FILES+=		${EGDIR}/lbdb_ldap.rc ${PKG_SYSCONFDIR}/lbdb_ldap.rc
 
-.if ${OPSYS} == "Interix"
-PLIST_SUBST+=		WITHYP='@comment '
-.else
-PLIST_SUBST+=		WITHYP=''
+PLIST_VARS+=		yp
+.if ${OPSYS} != "Interix"
+PLIST.yp=		yes
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/lbdb/PLIST b/databases/lbdb/PLIST
index 2f2e5f097ad..80a79a78260 100644
--- a/databases/lbdb/PLIST
+++ b/databases/lbdb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/11/08 01:32:56 tv Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:42:59 jlam Exp $
 bin/lbdb-fetchaddr
 bin/lbdb_dotlock
 bin/lbdbq
@@ -11,8 +11,8 @@ libexec/lbdb/m_bbdb
 libexec/lbdb/m_fido
 libexec/lbdb/m_finger
 libexec/lbdb/m_gnomecard
-${WITHGPG}libexec/lbdb/m_gpg
-${WITHABOOK}libexec/lbdb/m_abook
+${PLIST.gnupg}libexec/lbdb/m_gpg
+${PLIST.abook}libexec/lbdb/m_abook
 libexec/lbdb/m_inmail
 libexec/lbdb/m_ldap
 libexec/lbdb/m_muttalias
@@ -20,15 +20,15 @@ libexec/lbdb/m_palm
 libexec/lbdb/m_passwd
 libexec/lbdb/m_pine
 libexec/lbdb/m_wanderlust
-${WITHYP}libexec/lbdb/m_yppasswd
+${PLIST.yp}libexec/lbdb/m_yppasswd
 libexec/lbdb/munge
 libexec/lbdb/munge-keeporder
 libexec/lbdb/mutt_ldap_query
 libexec/lbdb/palm_lsaddr
 libexec/lbdb/qpto8bit
 libexec/lbdb/tac
-${OSXADDRESSBOOK}libexec/lbdb/ABQuery
-${OSXADDRESSBOOK}libexec/lbdb/m_osx_addressbook
+${PLIST.osx-addressbook}libexec/lbdb/ABQuery
+${PLIST.osx-addressbook}libexec/lbdb/m_osx_addressbook
 man/man1/lbdb-fetchaddr.1
 man/man1/lbdb_dotlock.1
 man/man1/lbdbq.1
diff --git a/databases/lbdb/options.mk b/databases/lbdb/options.mk
index cceea988520..0b406d00518 100644
--- a/databases/lbdb/options.mk
+++ b/databases/lbdb/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2005/09/03 12:09:58 tonio Exp $
+# $NetBSD: options.mk,v 1.3 2008/04/12 22:42:59 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.lbdb
 PKG_SUPPORTED_OPTIONS=	osx-addressbook gnupg abook
@@ -6,28 +6,27 @@ PKG_SUGGESTED_OPTIONS= gnupg abook
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		osx-addressbook gnupg abook
+
 .if !empty(PKG_OPTIONS:Mosx-addressbook)
 CONFIGURE_ARGS+=	--with-osx-addressbook
-PLIST_SUBST+= OSXADDRESSBOOK=""
+PLIST.osx-addressbook=	yes
 .else
 CONFIGURE_ARGS+=	--without-osx-addressbook
-PLIST_SUBST+= OSXADDRESSBOOK="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mgnupg)
-DEPENDS+=gnupg-[0-9]*:../../security/gnupg
+DEPENDS+=		gnupg-[0-9]*:../../security/gnupg
 CONFIGURE_ARGS+=	--with-gpg
-PLIST_SUBST+= WITHGPG=""
+PLIST.gnupg=		yes
 .else
 CONFIGURE_ARGS+=	--without-gpg
-PLIST_SUBST+= WITHGPG="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mabook)
-DEPENDS+=abook-[0-9]*:../../databases/abook
+DEPENDS+=		abook-[0-9]*:../../databases/abook
 CONFIGURE_ARGS+=	--with-abook
-PLIST_SUBST+= WITHABOOK=""
+PLIST.abook=		yes
 .else
 CONFIGURE_ARGS+=	--without-abook
-PLIST_SUBST+= WITHABOOK="@comment "
 .endif