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

through PLIST_SUBST to the plist module.

25 files changed, 109 insertions, 127 deletions

diff --git a/net/arla/PLIST b/net/arla/PLIST
index 9a20f3ae99e..42af52a24bd 100644
--- a/net/arla/PLIST
+++ b/net/arla/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.21 2006/08/24 17:59:04 wennmach Exp $
+@comment $NetBSD: PLIST,v 1.22 2008/04/12 22:43:08 jlam Exp $
 bin/afsfsperf
 bin/afstool
-${X11_SUPPORT}bin/amon
+${PLIST.x11}bin/amon
 bin/arla-send-pr
 bin/bos
 bin/fs
diff --git a/net/arla/options.mk b/net/arla/options.mk
index 2bf5f2efc22..d3c414a5384 100644
--- a/net/arla/options.mk
+++ b/net/arla/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2007/08/17 21:03:51 joerg Exp $
+# $NetBSD: options.mk,v 1.4 2008/04/12 22:43:08 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.arla
 PKG_SUPPORTED_OPTIONS=	x11
@@ -6,11 +6,12 @@ PKG_SUGGESTED_OPTIONS=
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		x11
+
 .if !empty(PKG_OPTIONS:Mx11)
 CONFIGURE_ARGS+=	--with-x
-PLIST_SUBST+=		X11_SUPPORT=
+PLIST.x11=		yes
 .include "../../x11/libXaw/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-x
-PLIST_SUBST+=		X11_SUPPORT='@comment '
 .endif
diff --git a/net/bind9/Makefile b/net/bind9/Makefile
index 7837b0069cd..87bd9b2a6b6 100644
--- a/net/bind9/Makefile
+++ b/net/bind9/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2008/01/18 05:08:40 tnn Exp $
+# $NetBSD: Makefile,v 1.96 2008/04/12 22:43:08 jlam Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	${DISTNAME:S/-P1/pl1/}
@@ -45,10 +45,9 @@ FILES_SUBST+=	BIND_GROUP=${BIND_GROUP:Q} BIND_USER=${BIND_USER:Q} PAX=${PAX:Q}
 MESSAGE_SUBST+=	BIND_DIR=${BIND_DIR} BIND_USER=${BIND_USER}
 
 # include/isc/ipv6.h is installed on non-ipv6 platforms
+PLIST_VARS+=	inet6
 .if !empty(MISSING_FEATURES:Minet6)
-PLIST_SUBST+=	IPV6H=
-.else
-PLIST_SUBST+=	IPV6H="@comment "
+PLIST.inet6=	yes
 .endif
 
 PLIST_SRC=	${WRKDIR}/PLIST
diff --git a/net/bind9/PLIST b/net/bind9/PLIST
index 64ee08b01c2..4375b0a9ea6 100644
--- a/net/bind9/PLIST
+++ b/net/bind9/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.20 2007/04/15 18:56:49 cjs Exp $
+@comment $NetBSD: PLIST,v 1.21 2008/04/12 22:43:08 jlam Exp $
 bin/dig
 bin/host
 bin/isc-config.sh
 bin/nslookup
 bin/nsupdate
-${IPV6H}include/isc/ipv6.h
+${PLIST.inet6}include/isc/ipv6.h
 include/bind9/check.h
 include/bind9/getaddresses.h
 include/bind9/version.h
diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile
index a843158e1fc..0948a111c44 100644
--- a/net/flow-tools/Makefile
+++ b/net/flow-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2007/01/07 09:14:02 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2008/04/12 22:43:08 jlam Exp $
 
 DISTNAME=	flow-tools-0.68
 PKGREVISION=	2
@@ -44,19 +44,18 @@ CONFIGURE_ARGS+=	--with-pgsql=${PGSQL_PREFIX:Q}
 .endif
 
 # Python scripts support.
+PLIST_VARS+=		python
 .if !empty(PKG_OPTIONS:Mpython)
 .  include "../../lang/python/application.mk"
 
 PYTHON_PATCH_SCRIPTS=	bin/flow-rpt2rrd bin/flow-log2rrd bin/flow-rptfmt
-PLIST_SUBST+=	PYTHON_OPT=""
+PLIST.python=		yes
 
 post-install:
 .   for s in flow-rpt2rrd flow-log2rrd flow-rptfmt
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${s} ${PREFIX}/bin/${s}
 	${INSTALL_MAN} ${WRKSRC}/docs/${s}.1 ${PREFIX}/${PKGMANDIR}/man1/${s}.1
 .  endfor
-.else
-PLIST_SUBST+=	PYTHON_OPT="@comment "
 .endif
 
 # To avoid providing more patch files we do the following...
diff --git a/net/flow-tools/PLIST b/net/flow-tools/PLIST
index 8897acec3ab..9cb259e734c 100644
--- a/net/flow-tools/PLIST
+++ b/net/flow-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/06/23 14:20:56 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:08 jlam Exp $
 bin/flow-capture
 bin/flow-cat
 bin/flow-dscan
@@ -9,15 +9,15 @@ bin/flow-filter
 bin/flow-gen
 bin/flow-header
 bin/flow-import
-${PYTHON_OPT}bin/flow-log2rrd
+${PLIST.python}bin/flow-log2rrd
 bin/flow-mask
 bin/flow-merge
 bin/flow-nfilter
 bin/flow-print
 bin/flow-receive
 bin/flow-report
-${PYTHON_OPT}bin/flow-rpt2rrd
-${PYTHON_OPT}bin/flow-rptfmt
+${PLIST.python}bin/flow-rpt2rrd
+${PLIST.python}bin/flow-rptfmt
 bin/flow-send
 bin/flow-split
 bin/flow-stat
@@ -39,15 +39,15 @@ man/man1/flow-filter.1
 man/man1/flow-gen.1
 man/man1/flow-header.1
 man/man1/flow-import.1
-${PYTHON_OPT}man/man1/flow-log2rrd.1
+${PLIST.python}man/man1/flow-log2rrd.1
 man/man1/flow-mask.1
 man/man1/flow-merge.1
 man/man1/flow-nfilter.1
 man/man1/flow-print.1
 man/man1/flow-receive.1
 man/man1/flow-report.1
-${PYTHON_OPT}man/man1/flow-rpt2rrd.1
-${PYTHON_OPT}man/man1/flow-rptfmt.1
+${PLIST.python}man/man1/flow-rpt2rrd.1
+${PLIST.python}man/man1/flow-rptfmt.1
 man/man1/flow-send.1
 man/man1/flow-split.1
 man/man1/flow-stat.1
diff --git a/net/net-snmp/PLIST b/net/net-snmp/PLIST
index 2bd45250f6d..0969a2baf8e 100644
--- a/net/net-snmp/PLIST
+++ b/net/net-snmp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2007/08/11 11:05:56 adam Exp $
+@comment $NetBSD: PLIST,v 1.17 2008/04/12 22:43:08 jlam Exp $
 bin/encode_keychange
 bin/fixproc
 bin/ipf-mod.pl
@@ -102,9 +102,9 @@ include/net-snmp/library/snmp-tc.h
 include/net-snmp/library/snmp.h
 include/net-snmp/library/snmpCallbackDomain.h
 include/net-snmp/library/snmpTCPDomain.h
-${IPV6H}include/net-snmp/library/snmpTCPIPv6Domain.h
+${PLIST.inet6}include/net-snmp/library/snmpTCPIPv6Domain.h
 include/net-snmp/library/snmpUDPDomain.h
-${IPV6H}include/net-snmp/library/snmpUDPIPv6Domain.h
+${PLIST.inet6}include/net-snmp/library/snmpUDPIPv6Domain.h
 include/net-snmp/library/snmpUnixDomain.h
 include/net-snmp/library/snmp_alarm.h
 include/net-snmp/library/snmp_api.h
diff --git a/net/net-snmp/options.mk b/net/net-snmp/options.mk
index 07850bb16f6..42c827a1df3 100644
--- a/net/net-snmp/options.mk
+++ b/net/net-snmp/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2007/11/20 07:51:35 dsainty Exp $
+# $NetBSD: options.mk,v 1.7 2008/04/12 22:43:08 jlam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.net-snmp
 PKG_SUPPORTED_OPTIONS=		ssl
@@ -12,12 +12,12 @@ PKG_SUPPORTED_OPTIONS+=	inet6
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		inet6
 .if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=	--enable-ipv6
-PLIST_SUBST+=		IPV6H=
+PLIST.inet6=		yes
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
-PLIST_SUBST+=		IPV6H="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mssl)
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index c8de110c40d..5bfb3bce45a 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2008/04/06 20:21:52 christos Exp $
+# $NetBSD: Makefile,v 1.59 2008/04/12 22:43:08 jlam Exp $
 
 DISTNAME=	netatalk-2.0.3
 PKGREVISION=	10
@@ -77,24 +77,24 @@ CONFIGURE_ARGS+=	--enable-cups
 CONFIGURE_ARGS+=	--disable-cups
 .endif
 
+PLIST_VARS+=		gssapi
 .if !empty(PKG_OPTIONS:Mkerberos)
 .include "../../mk/krb5.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-gssapi --enable-krbV-uam
-CONFIGURE_ENV+=	GSSAPI_LIBS="-lkrb5 -lroken -lasn1 -lcrypto -lcom_err"
-PLIST_SUBST+=		GSSAPI=""
+CONFIGURE_ENV+=		GSSAPI_LIBS="-lkrb5 -lroken -lasn1 -lcrypto -lcom_err"
+PLIST.gssapi=		yes
 .else
 CONFIGURE_ARGS+=	--without-gssapi
-PLIST_SUBST+=		GSSAPI="@comment "
 .endif
 
+PLIST_VARS+=		pam
 .if !empty(PKG_OPTIONS:Mpam)
 .include "../../mk/pam.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-pam
-PLIST_SUBST+=		PAM=""
+PLIST.pam=		yes
 MESSAGE_SRC+=		MESSAGE MESSAGE.pam
 .else
 CONFIGURE_ARGS+=	--without-pam
-PLIST_SUBST+=		PAM="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mslp)
diff --git a/net/netatalk/PLIST b/net/netatalk/PLIST
index 634c2b91a27..903954aa492 100644
--- a/net/netatalk/PLIST
+++ b/net/netatalk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2008/03/22 04:40:45 taca Exp $
+@comment $NetBSD: PLIST,v 1.16 2008/04/12 22:43:08 jlam Exp $
 bin/achfile
 bin/acleandir.rc
 bin/adv1tov2
@@ -99,11 +99,11 @@ libexec/netatalk/tfwpaprev
 libexec/netatalk/timelord
 libexec/netatalk/uams/uams_clrtxt.so
 libexec/netatalk/uams/uams_dhx.so
-${PAM}libexec/netatalk/uams/uams_dhx_pam.la
+${PLIST.pam}libexec/netatalk/uams/uams_dhx_pam.la
 libexec/netatalk/uams/uams_dhx_passwd.la
-${GSSAPI}libexec/netatalk/uams/uams_gss.la
+${PLIST.gssapi}libexec/netatalk/uams/uams_gss.la
 libexec/netatalk/uams/uams_guest.la
-${PAM}libexec/netatalk/uams/uams_pam.la
+${PLIST.pam}libexec/netatalk/uams/uams_pam.la
 libexec/netatalk/uams/uams_passwd.la
 libexec/netatalk/uams/uams_randnum.la
 man/man1/achfile.1
@@ -157,7 +157,7 @@ share/examples/netatalk/afpd.conf
 share/examples/netatalk/atalkd.conf
 share/examples/netatalk/netatalk.conf
 share/examples/netatalk/papd.conf
-${PAM}share/examples/netatalk/netatalk.pamd
+${PLIST.pam}share/examples/netatalk/netatalk.pamd
 share/examples/rc.d/afpd
 share/examples/rc.d/atalkd
 share/examples/rc.d/cnid_metad
diff --git a/net/netatalk1/PLIST b/net/netatalk1/PLIST
index dba67b49804..966a4265b85 100644
--- a/net/netatalk1/PLIST
+++ b/net/netatalk1/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/06/05 23:40:56 taca Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:08 jlam Exp $
 bin/achfile
 bin/acleandir.rc
 bin/add_netatalk_printer
@@ -100,8 +100,8 @@ libexec/netatalk/timelord
 libexec/netatalk/uams/uams_clrtxt.so
 libexec/netatalk/uams/uams_dhx.so
 libexec/netatalk/uams/uams_dhx_passwd.la
-${PAM}libexec/netatalk/uams/uams_dhx_pam.la
-${PAM}libexec/netatalk/uams/uams_pam.la
+${PLIST.pam}libexec/netatalk/uams/uams_dhx_pam.la
+${PLIST.pam}libexec/netatalk/uams/uams_pam.la
 libexec/netatalk/uams/uams_guest.la
 libexec/netatalk/uams/uams_passwd.la
 libexec/netatalk/uams/uams_randnum.la
diff --git a/net/netatalk1/options.mk b/net/netatalk1/options.mk
index 67bc9d95fbc..dd6655c8dfe 100644
--- a/net/netatalk1/options.mk
+++ b/net/netatalk1/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2007/02/22 19:26:56 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:08 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.netatalk1
 PKG_SUPPORTED_OPTIONS=	pam
@@ -7,11 +7,11 @@ PKG_SUPPORTED_OPTIONS=	pam
 ###
 ### Support PAM authentication and build smbpass and winbind PAM modules.
 ###
+PLIST_VARS+=		pam
 .if !empty(PKG_OPTIONS:Mpam)
 .  include "../../security/PAM/module.mk"
 CONFIGURE_ARGS+=	--with-pam
-PLIST_SUBST+=		PAM=
+PLIST.pam=		yes
 .else
 CONFIGURE_ARGS+=	--without-pam
-PLIST_SUBST+=		PAM="@comment "
 .endif
diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile
index 59916541a3a..c52c084bb22 100644
--- a/net/ntp4/Makefile
+++ b/net/ntp4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2008/01/24 11:55:42 is Exp $
+# $NetBSD: Makefile,v 1.54 2008/04/12 22:43:08 jlam Exp $
 #
 
 DISTNAME=	ntp-4.2.0
@@ -37,8 +37,7 @@ post-install:
 
 .include "../../mk/bsd.prefs.mk"
 
-TIMETRIM=	""
-NO_TIMETRIM=	"@comment "
+PLIST_VARS+=	ntptime timetrim
 
 .if ${OPSYS} == "NetBSD"
 #
@@ -55,15 +54,11 @@ LOWER_OPSYS_VERSUFFIX=	2
 # Don't pick up libwww's -lmd5, until buildlink can be fixed.
 #
 CONFIGURE_ENV+=	ac_cv_lib_md5_MD5Init=no
+PLIST.ntptime=		yes
 .elif ${OPSYS} == "IRIX"
-TIMETRIM=	"@comment "
-NO_TIMETRIM=	""
-.elif ${OPSYS} == "SunOS" && ${LOWER_OPSYS} == "solaris"
-TIMETRIM=      "@comment "
+PLIST.timetrim=		yes
 .endif
 
-PLIST_SUBST+=	TIMETRIM=${TIMETRIM} NO_TIMETRIM=${NO_TIMETRIM}
-
 .include "../../security/openssl/buildlink3.mk"
 
 CONFIGURE_ARGS+=	--with-openssl-incdir=${SSLBASE}/include
diff --git a/net/ntp4/PLIST b/net/ntp4/PLIST
index c10b977cb50..e8ab2f9474a 100644
--- a/net/ntp4/PLIST
+++ b/net/ntp4/PLIST
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.8 2006/07/12 17:41:54 rillig Exp $
+@comment $NetBSD: PLIST,v 1.9 2008/04/12 22:43:08 jlam Exp $
 bin/ntp-keygen
 bin/ntp-wait
 bin/ntpd
 bin/ntpdate
 bin/ntpdc
 bin/ntpq
-${TIMETRIM}bin/ntptime
+${PLIST.ntptime}bin/ntptime
 bin/ntptrace
-${TIMETRIM}bin/tickadj
-${NO_TIMETRIM}bin/timetrim
+${PLIST.ntptime}bin/tickadj
+${PLIST.timetrim}bin/timetrim
 share/doc/ntp4/accopt.html
 share/doc/ntp4/assoc.html
 share/doc/ntp4/audio.html
diff --git a/net/py-mimelib/Makefile b/net/py-mimelib/Makefile
index 4d6f8fe0b86..8c2a0c08eb3 100644
--- a/net/py-mimelib/Makefile
+++ b/net/py-mimelib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:23 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2008/04/12 22:43:08 jlam Exp $
 #
 
 DISTNAME=	email-2.5
@@ -19,10 +19,11 @@ PYTHON_VERSIONS_ACCEPTED= 21 22 23
 .include "../../lang/python/extension.mk"
 
 # _compat22.py is not byte-compiled if built with 2.1(-)
+PLIST_VARS+=	compat22
 .if !empty(PYPKGPREFIX:Mpy21*)
-PLIST_SUBST+=	NOT21="@comment "
+# nothing
 .else
-PLIST_SUBST+=	NOT21=""
+PLIST.compat22=	yes
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-mimelib/PLIST b/net/py-mimelib/PLIST
index 1e0f29c9ab0..160e0bf5716 100644
--- a/net/py-mimelib/PLIST
+++ b/net/py-mimelib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/10/21 12:43:33 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:43:08 jlam Exp $
 ${PYSITELIB}/email/Charset.py
 ${PYSITELIB}/email/Charset.pyc
 ${PYSITELIB}/email/Charset.pyo
@@ -54,8 +54,8 @@ ${PYSITELIB}/email/_compat21.py
 ${PYSITELIB}/email/_compat21.pyc
 ${PYSITELIB}/email/_compat21.pyo
 ${PYSITELIB}/email/_compat22.py
-${NOT21}${PYSITELIB}/email/_compat22.pyc
-${NOT21}${PYSITELIB}/email/_compat22.pyo
+${PLIST.compat22}${PYSITELIB}/email/_compat22.pyc
+${PLIST.compat22}${PYSITELIB}/email/_compat22.pyo
 ${PYSITELIB}/email/_parseaddr.py
 ${PYSITELIB}/email/_parseaddr.pyc
 ${PYSITELIB}/email/_parseaddr.pyo
diff --git a/net/samba/Makefile b/net/samba/Makefile
index a6ca90af5ec..76dbdeab250 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.180 2008/04/03 20:19:42 jlam Exp $
+# $NetBSD: Makefile,v 1.181 2008/04/12 22:43:08 jlam Exp $
 
 .include "Makefile.mirrors"
 
@@ -70,11 +70,10 @@ CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
 # Only Linux supports mount.cifs for mounting a CIFS share into the
 # filesystem.
 #
+PLIST_VARS+=		cifsmount
 .if ${OPSYS} == "Linux"
 CONFIGURE_ARGS+=	--with-cifsmount
-PLIST_SUBST+=		CIFSMOUNT=
-.else
-PLIST_SUBST+=		CIFSMOUNT="@comment "
+PLIST.cifsmount=	yes
 .endif
 
 # mktemp is useful for the replacement adduser script, but don't require
diff --git a/net/samba/PLIST b/net/samba/PLIST
index 7a2bc0422fd..6e2ce5987fe 100644
--- a/net/samba/PLIST
+++ b/net/samba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.38 2008/04/03 20:19:42 jlam Exp $
+@comment $NetBSD: PLIST,v 1.39 2008/04/12 22:43:08 jlam Exp $
 bin/eventlogadm
 bin/findsmb
 bin/net
@@ -21,11 +21,11 @@ bin/tdbbackup
 bin/tdbdump
 bin/tdbtool
 bin/testparm
-${WINBIND}bin/wbinfo
+${PLIST.winbind}bin/wbinfo
 include/libmsrpc.h
 include/libsmbclient.h
-${NSS_WINBIND}
-${NSS_WINS}
+${PLIST.winbind}${NSS_WINBIND}
+${PLIST.winbind}${NSS_WINS}
 lib/samba/auth/script.so
 lib/samba/charset/CP437.so
 lib/samba/charset/CP850.so
@@ -61,14 +61,14 @@ lib/samba/vfs/extd_audit.so
 lib/samba/vfs/fake_perms.so
 lib/samba/vfs/full_audit.so
 lib/samba/vfs/netatalk.so
-${FAM}lib/samba/vfs/notify_fam.so
+${PLIST.fam}lib/samba/vfs/notify_fam.so
 lib/samba/vfs/readahead.so
 lib/samba/vfs/readonly.so
 lib/samba/vfs/recycle.so
 lib/samba/vfs/shadow_copy.so
-${PAM_SMBPASS}
-${PAM_WINBIND}
-${CUPS}libexec/cups/backend/smb
+${PLIST.pam}lib/security/pam_smbpass.so
+${PLIST.pam}${PLIST.winbind}lib/security/pam_winbind.so
+${PLIST.cups}libexec/cups/backend/smb
 man/man1/findsmb.1
 man/man1/log2pcap.1
 man/man1/nmblookup.1
@@ -129,15 +129,15 @@ man/man8/vfs_readonly.8
 man/man8/vfs_recycle.8
 man/man8/vfs_shadow_copy.8
 man/man8/winbindd.8
-${CIFSMOUNT}sbin/mount.cifs
+${PLIST.cifsmount}sbin/mount.cifs
 sbin/nmbd
 sbin/smbd
 sbin/swat
-${CIFSMOUNT}sbin/umount.cifs
-${WINBIND}sbin/winbindd
+${PLIST.cifsmount}sbin/umount.cifs
+${PLIST.winbind}sbin/winbindd
 share/doc/samba/NT4-Locking.reg
 share/doc/samba/NT4_PlainPassword.reg
-${PAM}share/doc/samba/README.pam_smbpass
+${PLIST.pam}share/doc/samba/README.pam_smbpass
 share/doc/samba/Win-2Kx-XPP-DeleteCachedProfiles.reg
 share/doc/samba/Win-2Kx-XPP-ForceLocalProfile.reg
 share/doc/samba/Win-NT-DeleteRoamingProfile.reg
@@ -151,16 +151,16 @@ share/doc/samba/WindowsTerminalServer.reg
 share/examples/rc.d/nmbd
 share/examples/rc.d/samba
 share/examples/rc.d/smbd
-${WINBIND}share/examples/rc.d/winbindd
+${PLIST.winbind}share/examples/rc.d/winbindd
 share/examples/samba/adduser.sh
 share/examples/samba/deluser.sh
 share/examples/samba/mknissmbpasswd.sh
 share/examples/samba/mknissmbpwdtbl.sh
 share/examples/samba/mksmbpasswd.sh
-${PAM}share/examples/samba/pam_smbpass/kdc-pdc
-${PAM}share/examples/samba/pam_smbpass/password-mature
-${PAM}share/examples/samba/pam_smbpass/password-migration
-${PAM}share/examples/samba/pam_smbpass/password-sync
+${PLIST.pam}share/examples/samba/pam_smbpass/kdc-pdc
+${PLIST.pam}share/examples/samba/pam_smbpass/password-mature
+${PLIST.pam}share/examples/samba/pam_smbpass/password-migration
+${PLIST.pam}share/examples/samba/pam_smbpass/password-sync
 share/examples/samba/samba.schema
 share/examples/samba/smb.conf.default
 share/examples/samba/updatesmbpasswd.sh
@@ -639,7 +639,7 @@ share/samba/swat/using_samba/toc.html
 @dirrm share/samba/swat/help
 @dirrm share/samba/swat
 @dirrm share/samba
-${PAM}@dirrm share/examples/samba/pam_smbpass
+${PLIST.pam}@dirrm share/examples/samba/pam_smbpass
 @dirrm share/examples/samba
 @dirrm share/doc/samba
 @dirrm lib/samba/vfs
diff --git a/net/samba/options.mk b/net/samba/options.mk
index 0adc5c05810..b96f6361b88 100644
--- a/net/samba/options.mk
+++ b/net/samba/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.23 2008/04/03 20:19:42 jlam Exp $
+# $NetBSD: options.mk,v 1.24 2008/04/12 22:43:08 jlam Exp $
 
 # Recommended package options for various setups:
 #
@@ -51,10 +51,11 @@ CONFIGURE_ARGS+=	--with-acl-support
 ###
 ### Native CUPS support for providing printing services.
 ###
+PLIST_VARS+=		cups
 .if !empty(PKG_OPTIONS:Mcups)
 .  include "../../print/cups/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-cups
-PLIST_SUBST+=		CUPS=
+PLIST.cups=		yes
 INSTALLATION_DIRS+=	libexec/cups/backend
 
 .PHONY: samba-cups-install
@@ -64,19 +65,18 @@ samba-cups-install:
 		${LN} -fs ../../../bin/smbspool smb
 .else
 CONFIGURE_ARGS+=	--disable-cups
-PLIST_SUBST+=		CUPS="@comment "
 .endif
 
 ###
 ### Access Control List support.
 ###
+PLIST_VARS+=		fam
 .if !empty(PKG_OPTIONS:Mfam)
 .  include "../../mk/fam.buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-fam
-PLIST_SUBST+=		FAM=
+PLIST.fam=		yes
 .else
 CONFIGURE_ARGS+=	--disable-fam
-PLIST_SUBST+=		FAM="@comment "
 .endif
 
 ###
@@ -92,13 +92,13 @@ CONFIGURE_ARGS+=	--without-ldap
 ###
 ### Support PAM authentication and build smbpass and winbind PAM modules.
 ###
+PLIST_VARS+=		pam
 .if !empty(PKG_OPTIONS:Mpam)
 .  include "../../security/PAM/module.mk"
 CONFIGURE_ARGS+=	--with-pam
 CONFIGURE_ARGS+=	--with-pam_smbpass
 CONFIGURE_ARGS+=	--with-pammodulesdir=${PAM_INSTMODULEDIR}
-PLIST_SUBST+=		PAM_SMBPASS=lib/security/pam_smbpass.so
-PLIST_SUBST+=		PAM=
+PLIST.pam=		yes
 INSTALLATION_DIRS+=	${EGDIR}/pam_smbpass
 
 .PHONY: samba-pam-smbpass-install
@@ -110,15 +110,13 @@ samba-pam-smbpass-install:
 		${INSTALL_DATA} $${f} \
 			${DESTDIR}${PREFIX}/${EGDIR}/pam_smbpass/$${f};	\
 	done
-.else
-PLIST_SUBST+=		PAM_SMBPASS="@comment no PAM smbpass module"
-PLIST_SUBST+=		PAM="@comment "
 .endif
 
 ###
 ### Support querying a PDC for domain user and group information, e.g.,
 ### through NSS or PAM.
 ###
+PLIST_VARS+=		winbind
 .if !empty(PKG_OPTIONS:Mwinbind)
 CONFIGURE_ARGS+=	--with-winbind
 
@@ -128,14 +126,7 @@ SAMBA_STATIC_MODULES:=	${SAMBA_STATIC_MODULES},idmap_ad
 .  endif
 
 WINBINDD_RCD_SCRIPT=	winbindd
-PLIST_SUBST+=		WINBIND=
-
-# Install the PAM winbind module if we're also building with PAM support.
-.  if empty(PKG_OPTIONS:Mpam)
-PLIST_SUBST+=	PAM_WINBIND="@comment no PAM winbind module"
-.  else
-PLIST_SUBST+=	PAM_WINBIND=lib/security/pam_winbind.so
-.  endif
+PLIST.winbind=		yes
 
 # Install the NSS winbind module if it exists.
 PLIST_SUBST+=		NSS_WINBIND=${NSS_WINBIND:Q}
@@ -174,10 +165,8 @@ samba-nss-wins-install:
 	${TEST} ! -f $$lib || ${INSTALL_LIB} $$lib ${DESTDIR}${PREFIX:Q}/lib
 .else
 CONFIGURE_ARGS+=	--without-winbind
-PLIST_SUBST+=		WINBIND="@comment "
-PLIST_SUBST+=		PAM_WINBIND="@comment no PAM winbind module"
-PLIST_SUBST+=		NSS_WINBIND="@comment no NSS winbind module"
-PLIST_SUBST+=		NSS_WINS="@comment no NSS WINS module"
+PLIST_SUBST+=		NSS_WINBIND="no NSS winbind module"
+PLIST_SUBST+=		NSS_WINS="no NSS WINS module"
 .endif
 
 ###
diff --git a/net/ser/PLIST b/net/ser/PLIST
index 99346506b79..0f71f78d2f2 100644
--- a/net/ser/PLIST
+++ b/net/ser/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2007/06/01 00:26:36 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/04/12 22:43:08 jlam Exp $
 sbin/ser
 sbin/serctl
 sbin/ser_mysql.sh
@@ -18,7 +18,7 @@ lib/ser/modules/mangler.so
 lib/ser/modules/maxfwd.so
 lib/ser/modules/mediaproxy.so
 lib/ser/modules/msilo.so
-${WITH_MYSQL}lib/ser/modules/mysql.so
+${PLIST.mysql}lib/ser/modules/mysql.so
 lib/ser/modules/nathelper.so
 lib/ser/modules/pa.so
 lib/ser/modules/pdt.so
diff --git a/net/ser/options.mk b/net/ser/options.mk
index 57d0b5751e7..41eab5bbda9 100644
--- a/net/ser/options.mk
+++ b/net/ser/options.mk
@@ -1,14 +1,13 @@
-# $NetBSD: options.mk,v 1.1 2007/06/01 00:26:36 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:08 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ser
 PKG_SUPPORTED_OPTIONS=	mysql
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=	mysql
 .if !empty(PKG_OPTIONS:Mmysql)
 MAKE_ENV+= include_modules="mysql"
 .include "../../mk/mysql.buildlink3.mk"
-PLIST_SUBST+=	WITH_MYSQL=""
-.else
-PLIST_SUBST+=	WITH_MYSQL="@comment "
+PLIST.mysql=	yes
 .endif
diff --git a/net/speedtouch/Makefile b/net/speedtouch/Makefile
index f30b576f45c..1451e15f78b 100644
--- a/net/speedtouch/Makefile
+++ b/net/speedtouch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2007/02/22 19:26:59 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2008/04/12 22:43:08 jlam Exp $
 
 DISTNAME=		speedtouch-1.3.1
 PKGREVISION=		4
@@ -29,11 +29,12 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 PLIST_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
 RCD_SCRIPTS=		adsl
 
+PLIST_VARS+=		pppoa3
+
 .include "../../mk/pthread.buildlink3.mk"
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "native"
-PLIST_SUBST+=		PPPOA3=""
+PLIST.pppoa3=		yes
 .else
-PLIST_SUBST+=		PPPOA3="@comment "
 CONFIGURE_ENV+=		ac_cv_lib_pthread_pthread_create=no
 .endif
 
diff --git a/net/speedtouch/PLIST b/net/speedtouch/PLIST
index 1724186154c..9318cbdc008 100644
--- a/net/speedtouch/PLIST
+++ b/net/speedtouch/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2005/06/18 11:29:10 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:43:08 jlam Exp $
 share/examples/rc.d/adsl
 @exec ${MKDIR} ${PKG_SYSCONFDIR}/speedtouch
 bin/speedtouch-setup
@@ -14,7 +14,7 @@ man/man8/pppoa2.8
 man/man8/pppoa3.8
 sbin/modem_run
 sbin/pppoa2
-${PPPOA3}sbin/pppoa3
+${PLIST.pppoa3}sbin/pppoa3
 share/doc/speedtouch/FAQ
 share/doc/speedtouch/FAQ-fr
 share/doc/speedtouch/INSTALL
diff --git a/net/wireshark/PLIST b/net/wireshark/PLIST
index 6977e47dc90..45e42e3c380 100644
--- a/net/wireshark/PLIST
+++ b/net/wireshark/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2008/03/31 13:13:40 tron Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/04/12 22:43:08 jlam Exp $
 bin/capinfos
 bin/dftest
 bin/dumpcap
@@ -9,7 +9,7 @@ bin/randpkt
 bin/rawshark
 bin/text2pcap
 bin/tshark
-${WIRESHARK}bin/wireshark
+${PLIST.x11}bin/wireshark
 lib/libwireshark.la
 lib/libwiretap.la
 lib/wireshark/plugins/${PKGVERSION}/agentx.la
@@ -50,7 +50,7 @@ man/man1/mergecap.1
 man/man1/rawshark.1
 man/man1/text2pcap.1
 man/man1/tshark.1
-${WIRESHARK}man/man1/wireshark.1
+${PLIST.x11}man/man1/wireshark.1
 man/man4/wireshark-filter.4
 share/wireshark/AUTHORS-SHORT
 share/wireshark/COPYING
diff --git a/net/wireshark/options.mk b/net/wireshark/options.mk
index 8f1943acc22..dcb9034d9fd 100644
--- a/net/wireshark/options.mk
+++ b/net/wireshark/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2008/02/13 20:10:20 tron Exp $
+# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:09 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.wireshark
 PKG_SUPPORTED_OPTIONS=	x11
@@ -6,14 +6,13 @@ PKG_SUGGESTED_OPTIONS=	x11
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		x11
+
 .if !empty(PKG_OPTIONS:Mx11)
 CONFIGURE_ARGS+=	--enable-gtk2
 CONFIGURE_ARGS+=	--with-gtk-prefix=${BUILDLINK_PREFIX.gtk2}
-
-PLIST_SUBST+=		WIRESHARK=
+PLIST.x11=		yes
 .include "../../x11/gtk2/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-wireshark
-
-PLIST_SUBST+=		WIRESHARK="@comment "
 .endif