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

through PLIST_SUBST to the plist module.

29 files changed, 139 insertions, 158 deletions

diff --git a/mail/bogofilter/PLIST b/mail/bogofilter/PLIST
index be5637d4068..2af1f821296 100644
--- a/mail/bogofilter/PLIST
+++ b/mail/bogofilter/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.5 2007/02/16 15:47:39 obache Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:03 jlam Exp $
 bin/bf_compact
 bin/bf_copy
 bin/bf_tar
-${QDBM}bin/bogoQDBMupgrade
+${PLIST.qdbm}bin/bogoQDBMupgrade
 bin/bogofilter
 bin/bogolexer
 bin/bogotune
diff --git a/mail/bogofilter/options.mk b/mail/bogofilter/options.mk
index 19286529c6c..0151420f270 100644
--- a/mail/bogofilter/options.mk
+++ b/mail/bogofilter/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2007/02/16 15:47:39 obache Exp $
+# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:03 jlam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.bogofilter
 PKG_OPTIONS_REQUIRED_GROUPS=	database
@@ -13,12 +13,11 @@ CONFIGURE_ARGS+=		--with-database=db
 BUILDLINK_TRANSFORM+=		l:db:db4
 .endif
 
+PLIST_VARS+=			qdbm
 .if !empty(PKG_OPTIONS:Mqdbm)
 CONFIGURE_ARGS+=		--with-database=qdbm
-PLIST_SUBST+=			QDBM=
+PLIST.qdbm=			yes
 .include "../../databases/qdbm/buildlink3.mk"
-.else
-PLIST_SUBST+=			QDBM="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Msqlite)
diff --git a/mail/clamav/PLIST b/mail/clamav/PLIST
index d01c1092e42..d68019264ff 100644
--- a/mail/clamav/PLIST
+++ b/mail/clamav/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2007/12/18 08:16:11 martti Exp $
+@comment $NetBSD: PLIST,v 1.20 2008/04/12 22:43:03 jlam Exp $
 bin/clamav-config
 bin/clamconf
 bin/clamdscan
@@ -19,7 +19,7 @@ man/man5/clamd.conf.5
 man/man5/freshclam.conf.5
 man/man8/clamav-milter.8
 man/man8/clamd.8
-${MILTER}sbin/clamav-milter
+${PLIST.milter}sbin/clamav-milter
 sbin/clamd
 share/examples/clamav/clamd.conf
 share/examples/clamav/daily.cvd
diff --git a/mail/clamav/options.mk b/mail/clamav/options.mk
index c62df15397c..da405bb594c 100644
--- a/mail/clamav/options.mk
+++ b/mail/clamav/options.mk
@@ -1,10 +1,12 @@
-# $NetBSD: options.mk,v 1.3 2007/07/11 17:44:22 xtraeme Exp $
+# $NetBSD: options.mk,v 1.4 2008/04/12 22:43:03 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.clamav
 PKG_SUPPORTED_OPTIONS=	milter clamav-experimental
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		milter
+
 .if !empty(PKG_OPTIONS:Mmilter)
 # force use of pkgsrc version of libmilter -- clamav uses the sendmail binary
 # to check API compatibility(!), so it must build with as new a version of
@@ -12,12 +14,11 @@ PKG_SUPPORTED_OPTIONS=	milter clamav-experimental
 USE_BUILTIN.libmilter=	no
 .  include "../../mail/libmilter/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-milter
-PLIST_SUBST+=		MILTER=
+PLIST.milter=		yes
 .else
 CONFIGURE_ARGS+=	--disable-milter
 # XXX --disable-milter doesn't work as expected, so we need this
 CONFIGURE_ENV+=		ac_cv_header_libmilter_mfapi_h=no
-PLIST_SUBST+=		MILTER="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mclamav-experimental)
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 53184063db0..25ab51d47ef 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2008/01/18 05:08:22 tnn Exp $
+# $NetBSD: Makefile,v 1.76 2008/04/12 22:43:03 jlam Exp $
 
 DISTNAME=	cyrus-imapd-2.2.13
 PKGREVISION=	5
@@ -74,12 +74,11 @@ CONFIGURE_ARGS+=	--without-krb
 CONFIGURE_ARGS+=	--disable-gssapi
 .endif
 
+PLIST_VARS+=		ldap
 .if !empty(PKG_OPTIONS:Mldap)
 CONFIGURE_ARGS+=	--with-ldap=${BUILDLINK_PREFIX.openldap-client}
+PLIST.ldap=		yes
 .  include "../../databases/openldap-client/buildlink3.mk"
-PLIST_SUBST+=		LDAP=
-.else
-PLIST_SUBST+=		LDAP="@comment "
 .endif
 
 .if exists(/usr/bin/compile_et)
@@ -99,15 +98,14 @@ CONFIGURE_ARGS+=	--with-com-err=yes
 #
 CYRUS_IDLE?=		poll
 BUILD_DEFS+=		CYRUS_IDLE
+PLIST_VARS+=		idled
 .if (${CYRUS_IDLE} != "poll") && (${CYRUS_IDLE} != "idled") && \
     (${CYRUS_IDLE} != "no")
 PKG_FAIL_REASON+=	"CYRUS_IDLE must be poll, idled or no"
 .endif
 CONFIGURE_ARGS+=	--with-idle=${CYRUS_IDLE:Q}
 .if ${CYRUS_IDLE} == "idled"
-PLIST_SUBST+=		IDLED=
-.else
-PLIST_SUBST+=		IDLED="@comment "
+PLIST.idled=		yes
 .endif
 
 MAKE_ENV+=		PERL=${PERL5:Q}
diff --git a/mail/cyrus-imapd/PLIST b/mail/cyrus-imapd/PLIST
index a78cb7e0748..df947b83f13 100644
--- a/mail/cyrus-imapd/PLIST
+++ b/mail/cyrus-imapd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2007/12/22 21:15:06 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/04/12 22:43:03 jlam Exp $
 bin/imtest
 bin/installsieve
 bin/lmtptest
@@ -19,7 +19,7 @@ cyrus/bin/cyrdump
 cyrus/bin/deliver
 cyrus/bin/fetchnews
 cyrus/bin/fud
-${IDLED}cyrus/bin/idled
+${PLIST.idled}cyrus/bin/idled
 cyrus/bin/imapd
 cyrus/bin/ipurge
 cyrus/bin/lmtpd
@@ -36,9 +36,9 @@ cyrus/bin/notifyd
 cyrus/bin/pop3d
 cyrus/bin/pop3proxyd
 cyrus/bin/proxyd
-${LDAP}cyrus/bin/ptdump
-${LDAP}cyrus/bin/ptexpire
-${LDAP}cyrus/bin/ptloader
+${PLIST.ldap}cyrus/bin/ptdump
+${PLIST.ldap}cyrus/bin/ptexpire
+${PLIST.ldap}cyrus/bin/ptloader
 cyrus/bin/quota
 cyrus/bin/reconstruct
 cyrus/bin/rehash
diff --git a/mail/dbmail/PLIST b/mail/dbmail/PLIST
index 0ba83bae9f7..9ee77e11d8e 100644
--- a/mail/dbmail/PLIST
+++ b/mail/dbmail/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.7 2007/12/13 07:43:20 obache Exp $
-${MYSQL}lib/dbmail/libmysql.la
-${PGSQL}lib/dbmail/libpgsql.la
-${SQLITE}lib/dbmail/libsqlite.la
-${LDAP}lib/dbmail/libauth_ldap.la
+@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:43:03 jlam Exp $
+${PLIST.mysql}lib/dbmail/libmysql.la
+${PLIST.pgsql}lib/dbmail/libpgsql.la
+${PLIST.sqlite}lib/dbmail/libsqlite.la
+${PLIST.ldap}lib/dbmail/libauth_ldap.la
 lib/dbmail/libauth_sql.la
 lib/dbmail/libdbmail.la
-${SIEVE}lib/dbmail/libsort_sieve.la
+${PLIST.sieve}lib/dbmail/libsort_sieve.la
 man/man1/dbmail-smtp.1
 man/man1/dbmail.1
 man/man5/dbmail.conf.5
@@ -21,9 +21,9 @@ sbin/dbmail-export
 sbin/dbmail-imapd
 sbin/dbmail-lmtpd
 sbin/dbmail-pop3d
-${SIEVE}sbin/dbmail-sievecmd
+${PLIST.sieve}sbin/dbmail-sievecmd
 sbin/dbmail-smtp
-${SIEVE}sbin/dbmail-timsieved
+${PLIST.sieve}sbin/dbmail-timsieved
 sbin/dbmail-users
 sbin/dbmail-util
 share/doc/dbmail/AUTHORS
@@ -44,26 +44,26 @@ share/doc/dbmail/README.usermap
 share/doc/dbmail/THANKS
 share/doc/dbmail/UPGRADING
 share/examples/dbmail/dbmail.conf
-${MYSQL}share/dbmail/sql/mysql/2_1_7-2_2_0.mysql
-${MYSQL}share/dbmail/sql/mysql/create_tables.mysql
-${MYSQL}share/dbmail/sql/mysql/migrate_from_1.x_to_2.0_innodb.mysql
-${MYSQL}share/dbmail/sql/mysql/migrate_from_2.0_to_2.2.mysql
-${MYSQL}share/dbmail/sql/mysql/update_headervalue_01.mysql
-${PGSQL}share/dbmail/sql/postgresql/2_1_7-2_2_0.pgsql
-${PGSQL}share/dbmail/sql/postgresql/create_tables.pgsql
-${PGSQL}share/dbmail/sql/postgresql/migrate_from_1.x_to_2.0.pgsql
-${PGSQL}share/dbmail/sql/postgresql/migrate_from_2.0_to_2.2.pgsql
-${SQLITE}share/dbmail/sql/sqlite/2_1_7-2_2_0.sqlite
-${SQLITE}share/dbmail/sql/sqlite/create_tables.sqlite
+${PLIST.mysql}share/dbmail/sql/mysql/2_1_7-2_2_0.mysql
+${PLIST.mysql}share/dbmail/sql/mysql/create_tables.mysql
+${PLIST.mysql}share/dbmail/sql/mysql/migrate_from_1.x_to_2.0_innodb.mysql
+${PLIST.mysql}share/dbmail/sql/mysql/migrate_from_2.0_to_2.2.mysql
+${PLIST.mysql}share/dbmail/sql/mysql/update_headervalue_01.mysql
+${PLIST.pgsql}share/dbmail/sql/postgresql/2_1_7-2_2_0.pgsql
+${PLIST.pgsql}share/dbmail/sql/postgresql/create_tables.pgsql
+${PLIST.pgsql}share/dbmail/sql/postgresql/migrate_from_1.x_to_2.0.pgsql
+${PLIST.pgsql}share/dbmail/sql/postgresql/migrate_from_2.0_to_2.2.pgsql
+${PLIST.sqlite}share/dbmail/sql/sqlite/2_1_7-2_2_0.sqlite
+${PLIST.sqlite}share/dbmail/sql/sqlite/create_tables.sqlite
 share/examples/rc.d/dbmail
 share/examples/rc.d/dbmailimapd
 share/examples/rc.d/dbmaillmtpd
 share/examples/rc.d/dbmailpop3d
-${SIEVE}share/examples/rc.d/dbmailtimsieved
+${PLIST.sieve}share/examples/rc.d/dbmailtimsieved
 @dirrm share/examples/dbmail
-${SQLITE}@dirrm share/dbmail/sql/sqlite
-${PGSQL}@dirrm share/dbmail/sql/postgresql
-${MYSQL}@dirrm share/dbmail/sql/mysql
+${PLIST.sqlite}@dirrm share/dbmail/sql/sqlite
+${PLIST.pgsql}@dirrm share/dbmail/sql/postgresql
+${PLIST.mysql}@dirrm share/dbmail/sql/mysql
 @dirrm share/dbmail/sql
 @dirrm share/doc/dbmail
 @dirrm lib/dbmail
diff --git a/mail/dbmail/options.mk b/mail/dbmail/options.mk
index a71813ec64c..6b5b82c5e3c 100644
--- a/mail/dbmail/options.mk
+++ b/mail/dbmail/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2007/12/13 07:43:20 obache Exp $
+# $NetBSD: options.mk,v 1.8 2008/04/12 22:43:03 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dbmail
 PKG_SUPPORTED_OPTIONS=	ldap sieve
@@ -8,16 +8,16 @@ PKG_SUGGESTED_OPTIONS=	mysql sieve
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		ldap mysql pgsql sieve sqlite
+
 ###
 ### MySQL database support
 ###
 .if !empty(PKG_OPTIONS:Mmysql)
 .include "../../mk/mysql.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-mysql
-PLIST_SUBST+=		MYSQL=""
+PLIST.mysql=		yes
 INSTALLATION_DIRS+=	${DATADIR}/sql/mysql
-.else
-PLIST_SUBST+=		MYSQL="@comment "
 .endif
 
 ###
@@ -26,10 +26,8 @@ PLIST_SUBST+=		MYSQL="@comment "
 .if !empty(PKG_OPTIONS:Mpgsql)
 .include "../../mk/pgsql.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-pgsql
-PLIST_SUBST+=		PGSQL=""
+PLIST.pgsql=		yes
 INSTALLATION_DIRS+=	${DATADIR}/sql/pgsql
-.else
-PLIST_SUBST+=		PGSQL="@comment "
 .endif
 
 ###
@@ -38,10 +36,8 @@ PLIST_SUBST+=		PGSQL="@comment "
 .if !empty(PKG_OPTIONS:Msqlite)
 .include "../../databases/sqlite3/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-sqlite
-PLIST_SUBST+=		SQLITE=""
+PLIST.sqlite=		yes
 INSTALLATION_DIRS+=	${DATADIR}/sql/sqlite
-.else
-PLIST_SUBST+=		SQLITE="@comment "
 .endif
 
 ###
@@ -50,11 +46,10 @@ PLIST_SUBST+=		SQLITE="@comment "
 .if !empty(PKG_OPTIONS:Msieve)
 .include "../../mail/libsieve/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-sieve=${BUILDLINK_PREFIX.libsieve}
-PLIST_SUBST+=		SIEVE=""
+PLIST.sieve=		yes
 FILES_SUBST+=		TIMSIEVED="dbmailtimsieved"
 RCD_SCRIPTS+=		dbmailtimsieved
 .else
-PLIST_SUBST+=		SIEVE="@comment "
 FILES_SUBST+=		TIMSIEVED=""
 .endif
 
@@ -64,9 +59,7 @@ FILES_SUBST+=		TIMSIEVED=""
 .if !empty(PKG_OPTIONS:Mldap)
 .include "../../databases/openldap-client/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-ldap=${BUILDLINK_PREFIX.openldap-client}
-PLIST_SUBST+=		LDAP=""
-.else
-PLIST_SUBST+=		LDAP="@comment "
+PLIST.ldap=		yes
 .endif
 
 ###
diff --git a/mail/dkim-milter/PLIST b/mail/dkim-milter/PLIST
index f7b49e9e50b..78449d05488 100644
--- a/mail/dkim-milter/PLIST
+++ b/mail/dkim-milter/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2008/04/06 12:59:11 adrianp Exp $
-${WITH_ARLIB}lib/libar.a
-${WITH_ARLIB}man/man3/ar.3
+@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:03 jlam Exp $
+${PLIST.arlib}lib/libar.a
+${PLIST.arlib}man/man3/ar.3
 lib/libdkim.a
 include/dkim.h
 libexec/dkim-filter
diff --git a/mail/dkim-milter/options.mk b/mail/dkim-milter/options.mk
index 61eb4199b99..84656a84b56 100644
--- a/mail/dkim-milter/options.mk
+++ b/mail/dkim-milter/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2008/03/09 14:02:08 adrianp Exp $
+# $NetBSD: options.mk,v 1.4 2008/04/12 22:43:03 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dkim-milter
 PKG_SUPPORTED_OPTIONS=	inet6 dkim-milter-arlib debug
@@ -26,12 +26,12 @@ SUBST_SED.libs+=	-e 's|@DEBUG@|dnl|g'
 ###
 ### Use asynchronous DNS resolver library shipping with dkim-milter.
 ###
+PLIST_VARS+=		arlib
 .if !empty(PKG_OPTIONS:Mdkim-milter-arlib)
-PLIST_SUBST+=		WITH_ARLIB=''
+PLIST.arlib=		yes
 SUBST_SED.libs+=	-e 's|@RESOLVLIB@||g'
 SUBST_SED.libs+=	-e 's|@ARLIB@||g'
 .else
-PLIST_SUBST+=		WITH_ARLIB='@comment '
 SUBST_SED.libs+=	-e 's|@RESOLVLIB@|resolv bind|g'
 SUBST_SED.libs+=	-e 's|@ARLIB@|dnl|g'
 .endif
diff --git a/mail/dspam/PLIST b/mail/dspam/PLIST
index 83c07a760b9..aaeea874e0b 100644
--- a/mail/dspam/PLIST
+++ b/mail/dspam/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.17 2007/05/07 09:29:54 adrianp Exp $
-${HASH}bin/cssstat
-${HASH}bin/csscompress
-${HASH}bin/cssclean
-${HASH}bin/cssconvert
+@comment $NetBSD: PLIST,v 1.18 2008/04/12 22:43:03 jlam Exp $
+${PLIST.hash}bin/cssstat
+${PLIST.hash}bin/csscompress
+${PLIST.hash}bin/cssclean
+${PLIST.hash}bin/cssconvert
 bin/dspam
 bin/dspam_2sql
 bin/dspam_admin
@@ -14,7 +14,7 @@ bin/dspam_merge
 bin/dspam_stats
 bin/dspam_train
 bin/dspamc
-${PGSQL}bin/dspam_pg2int8
+${PLIST.pgsql}bin/dspam_pg2int8
 include/dspam/buffer.h
 include/dspam/config.h
 include/dspam/config_shared.h
@@ -84,27 +84,27 @@ share/dspam/webui/cgi-bin/templates/nav_quarantine.html
 share/dspam/webui/cgi-bin/templates/nav_viewmessage.html
 share/dspam/webui/htdocs/base.css
 share/dspam/webui/htdocs/dspam-logo-small.gif
-${MYSQL}share/dspam/mysql/mysql_objects-4.1.sql
-${MYSQL}share/dspam/mysql/mysql_objects-space.sql
-${MYSQL}share/dspam/mysql/mysql_objects-speed.sql
-${MYSQL}share/dspam/mysql/purge.sql
-${MYSQL}share/dspam/mysql/purge-4.1.sql
-${MYSQL}share/dspam/mysql/virtual_users.sql
-${MYSQL}share/dspam/mysql/virtual_user_aliases.sql
-${PGSQL}share/dspam/pgsql/pgsql_objects.sql
-${PGSQL}share/dspam/pgsql/purge.sql
-${PGSQL}share/dspam/pgsql/virtual_users.sql
-${SQLITE}share/dspam/sqlite/purge-2.sql
-${SQLITE}share/dspam/sqlite/purge-3.sql
+${PLIST.mysql}share/dspam/mysql/mysql_objects-4.1.sql
+${PLIST.mysql}share/dspam/mysql/mysql_objects-space.sql
+${PLIST.mysql}share/dspam/mysql/mysql_objects-speed.sql
+${PLIST.mysql}share/dspam/mysql/purge.sql
+${PLIST.mysql}share/dspam/mysql/purge-4.1.sql
+${PLIST.mysql}share/dspam/mysql/virtual_users.sql
+${PLIST.mysql}share/dspam/mysql/virtual_user_aliases.sql
+${PLIST.pgsql}share/dspam/pgsql/pgsql_objects.sql
+${PLIST.pgsql}share/dspam/pgsql/purge.sql
+${PLIST.pgsql}share/dspam/pgsql/virtual_users.sql
+${PLIST.sqlite}share/dspam/sqlite/purge-2.sql
+${PLIST.sqlite}share/dspam/sqlite/purge-3.sql
 share/examples/dspam/cgi-admins
 share/examples/dspam/cgi-default.prefs
 share/examples/dspam/configure.pl
 share/examples/dspam/dspam.conf
 share/examples/rc.d/dspam
 @dirrm share/examples/dspam
-${PGSQL}@dirrm share/dspam/pgsql
-${MYSQL}@dirrm share/dspam/mysql
-${SQLITE}@dirrm share/dspam/sqlite
+${PLIST.pgsql}@dirrm share/dspam/pgsql
+${PLIST.mysql}@dirrm share/dspam/mysql
+${PLIST.sqlite}@dirrm share/dspam/sqlite
 @dirrm share/dspam/webui/htdocs
 @dirrm share/dspam/webui/cgi-bin/templates
 @dirrm share/dspam/webui/cgi-bin
diff --git a/mail/dspam/options.mk b/mail/dspam/options.mk
index 5de07dd21bd..25cd67bf2fb 100644
--- a/mail/dspam/options.mk
+++ b/mail/dspam/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.21 2007/06/22 13:14:22 adrianp Exp $
+# $NetBSD: options.mk,v 1.22 2008/04/12 22:43:03 jlam Exp $
 
 .if defined(DSPAM_DELIVERY_AGENT) && !empty(DSPAM_DELIVERY_AGENT:Mcustom)
 DSPAM_DELIVERY_AGENT:=	${DSPAM_DELIVERY_AGENT_ARGS}
@@ -38,6 +38,8 @@ CONFIGURE_ARGS+=	--with-delivery-agent=${DSPAM_DELIVERY_AGENT_BIN:Q}
 PKG_FAIL_REASON+=	"${PKGBASE}: unknown delivery agent \`${DSPAM_DELIVERY_AGENT}'"
 .endif
 
+PLIST_VARS+=		hash mysql pgsql sqlite
+
 ###
 ### This is the backend database used to store the DSPAM signatures as
 ### well as other state information.  The recommended storage driver is
@@ -54,7 +56,7 @@ PKG_OPTIONS:=		${PKG_OPTIONS:Nldap}
 .endif
 .if !empty(DSPAM_STORAGE_DRIVER:Mhash)
 CONFIGURE_ARGS+=	--with-storage-driver=hash_drv
-HASH_PLIST_SUBST+=	HASH=
+PLIST.hash=		yes
 .elif !empty(DSPAM_STORAGE_DRIVER:Mmysql)
 .  include "../../mk/mysql.buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-mysql4-initialization
@@ -62,22 +64,22 @@ CONFIGURE_ARGS+=	--with-storage-driver=mysql_drv
 CONFIGURE_ARGS+=	\
 	--with-mysql-includes=${BUILDLINK_PREFIX.mysql-client}/include/mysql \
 	--with-mysql-libraries=${BUILDLINK_PREFIX.mysql-client}/lib
-MYSQL_PLIST_SUBST=	MYSQL=
+PLIST.mysql=		yes
 .elif !empty(DSPAM_STORAGE_DRIVER:Mpgsql)
 .  include "../../mk/pgsql.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-storage-driver=pgsql_drv
 CONFIGURE_ARGS+=	\
 	--with-pgsql-includes=${PGSQL_PREFIX}/include/postgresql	\
 	--with-pgsql-libraries=${PGSQL_PREFIX}/lib
-PGSQL_PLIST_SUBST=	PGSQL=
+PLIST.pgsql=		yes
 .elif !empty(DSPAM_STORAGE_DRIVER:Msqlite)
 .  include "../../databases/sqlite/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-storage-driver=sqlite_drv
-SQLITE_PLIST_SUBST=	SQLITE=
+PLIST.sqlite=		yes
 .elif !empty(DSPAM_STORAGE_DRIVER:Msqlite3)
 .  include "../../databases/sqlite3/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-storage-driver=sqlite3_drv
-SQLITE_PLIST_SUBST+=	SQLITE=
+PLIST.sqlite=		yes
 .else
 PKG_FAIL_REASON+=	"${PKGBASE}: unknown storage driver \\'${DSPAM_STORAGE_DRIVER}\\'"
 .endif
@@ -91,16 +93,6 @@ CONFIGURE_ARGS+=	--enable-daemon
 . endif
 .endif
 
-MYSQL_PLIST_SUBST?=	MYSQL="@comment "
-PGSQL_PLIST_SUBST?=	PGSQL="@comment "
-SQLITE_PLIST_SUBST?=	SQLITE="@comment "
-HASH_PLIST_SUBST?=	HASH="@comment "
-
-PLIST_SUBST+=		${MYSQL_PLIST_SUBST}
-PLIST_SUBST+=		${PGSQL_PLIST_SUBST}
-PLIST_SUBST+=		${SQLITE_PLIST_SUBST}
-PLIST_SUBST+=		${HASH_PLIST_SUBST}
-
 ###
 ### The following are only available for mysql and pgsql backends.
 ###
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 2d9803d9b7f..07c6c7d8b48 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.128 2008/03/05 19:08:05 drochner Exp $
+# $NetBSD: Makefile,v 1.129 2008/04/12 22:43:03 jlam Exp $
 
 DISTNAME=		evolution-2.12.3
 PKGREVISION=		2
@@ -67,9 +67,10 @@ CONFIGURE_ARGS+=	--with-krb5
 CONFIGURE_ARGS+=	--without-krb5
 .endif
 
+PLIST_VARS+=		smime
 .if !empty(PKG_OPTIONS:Mssl)
 CONFIGURE_ARGS+=	--enable-nss=yes
-PLIST_SUBST+=		HAVE_SMIME=
+PLIST.smime=		yes
 PRINT_PLIST_AWK+=	/smime/ { print "$${HAVE_SMIME}" $$0; next; }
 # XXX Workaround for the following problem: addressbook/util/libeabutil.la
 # is compiled as a static library only which uses the NSS stuff.  When other
@@ -89,7 +90,6 @@ post-wrapper:
 	cd ${BUILDLINK_DIR}/lib/pkgconfig && ${LN} -s nss.pc mozilla-nss.pc
 .else
 CONFIGURE_ARGS+=	--disable-nss
-PLIST_SUBST+=		HAVE_SMIME="@comment "
 .endif
 
 PKGCONFIG_OVERRIDE=	evolution-plugin.pc.in
diff --git a/mail/evolution/PLIST b/mail/evolution/PLIST
index 196b44ae3d4..744c579325b 100644
--- a/mail/evolution/PLIST
+++ b/mail/evolution/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2007/11/03 21:55:00 drochner Exp $
+@comment $NetBSD: PLIST,v 1.33 2008/04/12 22:43:03 jlam Exp $
 bin/evolution
 include/evolution-2.12/addressbook/gui/widgets/eab-config.h
 include/evolution-2.12/addressbook/gui/widgets/eab-menu.h
@@ -226,7 +226,7 @@ lib/evolution/2.12/libecontactlisteditor.la
 lib/evolution/2.12/libefilterbar.la
 lib/evolution/2.12/libemiscwidgets.la
 lib/evolution/2.12/libeshell.la
-${HAVE_SMIME}lib/evolution/2.12/libessmime.la
+${PLIST.smime}lib/evolution/2.12/libessmime.la
 lib/evolution/2.12/libetable.la
 lib/evolution/2.12/libetext.la
 lib/evolution/2.12/libetimezonedialog.la
@@ -237,7 +237,7 @@ lib/evolution/2.12/libevolution-addressbook-importers.la
 lib/evolution/2.12/libevolution-calendar-a11y.la
 lib/evolution/2.12/libevolution-calendar-importers.la
 lib/evolution/2.12/libevolution-mail-importers.la
-${HAVE_SMIME}lib/evolution/2.12/libevolution-smime.la
+${PLIST.smime}lib/evolution/2.12/libevolution-smime.la
 lib/evolution/2.12/libevolution-widgets-a11y.la
 lib/evolution/2.12/libfilter.la
 lib/evolution/2.12/libmenus.la
@@ -431,7 +431,7 @@ share/evolution/2.12/glade/proxy-login-dialog.glade
 share/evolution/2.12/glade/publish-calendar.glade
 share/evolution/2.12/glade/recurrence-page.glade
 share/evolution/2.12/glade/schedule-page.glade
-${HAVE_SMIME}share/evolution/2.12/glade/smime-ui.glade
+${PLIST.smime}share/evolution/2.12/glade/smime-ui.glade
 share/evolution/2.12/glade/task-details-page.glade
 share/evolution/2.12/glade/task-page.glade
 share/evolution/2.12/help/quickref/C/quickref.pdf
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index bab2a55d31a..914be853834 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2008/02/22 01:16:58 gdt Exp $
+# $NetBSD: Makefile,v 1.67 2008/04/12 22:43:03 jlam Exp $
 
 DISTNAME=		mutt-1.5.17
 PKGREVISION=		5
@@ -60,10 +60,9 @@ INSTALLATION_DIRS+=	${DOCDIR} ${EGDIR}
 
 # Define WRKSRC explicitly so we can use its value below.
 WRKSRC=			${WRKDIR}/${DISTNAME}
+PLIST_VARS+=		dotlock
 .if exists(${WRKSRC}/mutt_dotlock)
-PLIST_SUBST+=		MUTT_DOTLOCK=
-.else
-PLIST_SUBST+=		MUTT_DOTLOCK="@comment "
+PLIST.dotlock=		yes
 .endif
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR}
 
diff --git a/mail/mutt-devel/PLIST b/mail/mutt-devel/PLIST
index 8f36e1197c0..00a704af001 100644
--- a/mail/mutt-devel/PLIST
+++ b/mail/mutt-devel/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.16 2007/11/07 21:19:36 tonio Exp $
+@comment $NetBSD: PLIST,v 1.17 2008/04/12 22:43:03 jlam Exp $
 bin/flea
 bin/mutt
 bin/muttbug
-${MUTT_DOTLOCK}bin/mutt_dotlock
+${PLIST.dotlock}bin/mutt_dotlock
 bin/pgpewrap
 bin/pgpring
-${WITHSMIME}bin/smime_keys
+${PLIST.smime}bin/smime_keys
 man/man1/flea.1
 man/man1/mutt.1
 man/man1/mutt_dotlock.1
diff --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk
index 087992edcda..d78ba3a2fe0 100644
--- a/mail/mutt-devel/options.mk
+++ b/mail/mutt-devel/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.28 2008/03/08 14:28:32 joerg Exp $
+# $NetBSD: options.mk,v 1.29 2008/04/12 22:43:03 jlam Exp $
 
 # Global and legacy options
 
@@ -68,15 +68,15 @@ CONFIGURE_ARGS+=	--without-ssl
 ###
 ### S/MIME
 ###
+PLIST_VARS+=		smime
 .if !empty(PKG_OPTIONS:Msmime)
 USE_TOOLS+=		perl:run
 REPLACE_PERL+=		*.pl */*.pl
 .  include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-smime
-PLIST_SUBST+=		WITHSMIME=''
+PLIST.smime=		yes
 .else
 CONFIGURE_ARGS+=	--disable-smime
-PLIST_SUBST+=		WITHSMIME='@comment '
 .endif
 
 ###
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 62eaa0252a1..317d2026372 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.155 2008/02/22 00:36:12 gdt Exp $
+# $NetBSD: Makefile,v 1.156 2008/04/12 22:43:04 jlam Exp $
 
 DISTNAME=		mutt-1.4.2.3
 PKGREVISION=		2
@@ -86,10 +86,9 @@ FILES_SUBST+=		DOCDIR=${DOCDIR:Q}
 
 INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
 
+PLIST_VARS+=		dotlock
 .if exists(${WRKSRC}/mutt_dotlock)
-PLIST_SUBST+=		MUTT_DOTLOCK=
-.else
-PLIST_SUBST+=		MUTT_DOTLOCK="@comment "
+PLIST.dotlock=		yes
 .endif
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR}
 
diff --git a/mail/mutt/PLIST b/mail/mutt/PLIST
index 9ad5b1d4517..4cd31228a82 100644
--- a/mail/mutt/PLIST
+++ b/mail/mutt/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.12 2006/06/20 09:14:46 tron Exp $
+@comment $NetBSD: PLIST,v 1.13 2008/04/12 22:43:04 jlam Exp $
 bin/flea
 bin/mutt
 bin/muttbug
-${MUTT_DOTLOCK}bin/mutt_dotlock
+${PLIST.dotlock}bin/mutt_dotlock
 bin/pgpewrap
 bin/pgpring
 man/man1/flea.1
diff --git a/mail/perdition/PLIST b/mail/perdition/PLIST
index 3e65f2f2dc5..f4c60700aeb 100644
--- a/mail/perdition/PLIST
+++ b/mail/perdition/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/03/04 16:06:29 tv Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:04 jlam Exp $
 include/jain.h
 lib/libjain.la
 lib/libperditiondb_nis.la
@@ -16,7 +16,7 @@ sbin/perdition.imap4s
 sbin/perdition.imaps
 sbin/perdition.pop3
 sbin/perdition.pop3s
-${PERDITION_HAVE_PAM}share/examples/pam.d/perdition
+${PLIST.pam}share/examples/pam.d/perdition
 share/examples/perdition/Makefile
 share/examples/perdition/Makefile.popmap
 share/examples/perdition/perdition.conf
diff --git a/mail/perdition/options.mk b/mail/perdition/options.mk
index da5430a6472..676cbf6f2c5 100644
--- a/mail/perdition/options.mk
+++ b/mail/perdition/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2007/03/02 12:05:32 grant Exp $
+# $NetBSD: options.mk,v 1.4 2008/04/12 22:43:04 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.perdition
 PKG_SUPPORTED_OPTIONS=	ssl pam
@@ -6,16 +6,17 @@ PKG_SUGGESTED_OPTIONS=	ssl
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		pam
+
 ###
 ### Build with PAM support.
 ###
 .if !empty(PKG_OPTIONS:Mpam)
 .  include "../../mk/pam.buildlink3.mk"
-PLIST_SUBST+=		PERDITION_HAVE_PAM=
+PLIST.pam=		yes
 .else
 # prevent recognition of PAM in the base system
 CONFIGURE_ENV+=		ac_cv_header_security_pam_appl_h=no
-PLIST_SUBST+=		PERDITION_HAVE_PAM="@comment "
 .endif
 
 ###
diff --git a/mail/postfix-current/PLIST b/mail/postfix-current/PLIST
index a5b6051ca7c..ffd1b3be8eb 100644
--- a/mail/postfix-current/PLIST
+++ b/mail/postfix-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2008/02/18 17:46:22 ghen Exp $
+@comment $NetBSD: PLIST,v 1.17 2008/04/12 22:43:04 jlam Exp $
 bin/mailq
 bin/newaliases
 libexec/postfix/anvil
@@ -167,7 +167,7 @@ share/examples/postfix/master.cf
 share/examples/postfix/post-install
 share/examples/postfix/postfix-script
 share/examples/postfix/relocated
-${SASL}share/examples/postfix/smtpd.conf
+${PLIST.csasl}share/examples/postfix/smtpd.conf
 share/examples/postfix/transport
 share/examples/postfix/virtual
 share/examples/rc.d/postfix
diff --git a/mail/postfix-current/options.mk b/mail/postfix-current/options.mk
index fa2e7e0f01f..33190db67d1 100644
--- a/mail/postfix-current/options.mk
+++ b/mail/postfix-current/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.21 2008/02/04 13:07:54 ghen Exp $
+# $NetBSD: options.mk,v 1.22 2008/04/12 22:43:04 jlam Exp $
 
 # Global and legacy options
 
@@ -86,6 +86,7 @@ AUXLIBS+=	-L${PGSQL_PREFIX}/lib -lpq \
 ### Cyrus SASL support for SMTP authentication.
 ### (Dovecot SASL support is built in by default.)
 ###
+PLIST_VARS+=	csasl
 .if !empty(PKG_OPTIONS:Msasl)
 .  include "../../security/cyrus-sasl/buildlink3.mk"
 BUILDLINK_INCDIRS.cyrus-sasl=	include/sasl
@@ -95,13 +96,12 @@ CCARGS+=	-DUSE_CYRUS_SASL
 AUXLIBS+=	-L${BUILDLINK_PREFIX.cyrus-sasl}/lib			\
 		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
 		-lsasl2
-PLIST_SUBST+=	SASL=
+PLIST.csasl=	yes
 MESSAGE_SRC+=	${PKGDIR}/MESSAGE.sasl
 MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 MESSAGE_SUBST+=	SASLLIBDIR=${SASLLIBDIR}
 MAKE_DIRS+=	${SASLLIBDIR}
 CONF_FILES+=	${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf
 .else
-PLIST_SUBST+=	SASL="@comment "
 CCARGS+=	-DDEF_SERVER_SASL_TYPE=\"dovecot\"
 .endif
diff --git a/mail/postfix/PLIST b/mail/postfix/PLIST
index 56bb5a406bc..5dcfaa313dc 100644
--- a/mail/postfix/PLIST
+++ b/mail/postfix/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2008/02/18 17:45:34 ghen Exp $
+@comment $NetBSD: PLIST,v 1.20 2008/04/12 22:43:04 jlam Exp $
 bin/mailq
 bin/newaliases
 libexec/postfix/anvil
@@ -165,7 +165,7 @@ share/examples/postfix/post-install
 share/examples/postfix/postfix-files
 share/examples/postfix/postfix-script
 share/examples/postfix/relocated
-${SASL}share/examples/postfix/smtpd.conf
+${PLIST.csasl}share/examples/postfix/smtpd.conf
 share/examples/postfix/transport
 share/examples/postfix/virtual
 share/examples/rc.d/postfix
diff --git a/mail/postfix/options.mk b/mail/postfix/options.mk
index 34a0f4bc7e6..367f82c080e 100644
--- a/mail/postfix/options.mk
+++ b/mail/postfix/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.30 2008/02/18 17:45:34 ghen Exp $
+# $NetBSD: options.mk,v 1.31 2008/04/12 22:43:04 jlam Exp $
 
 # Global and legacy options
 
@@ -86,6 +86,7 @@ AUXLIBS+=	-L${PGSQL_PREFIX}/lib -lpq \
 ### Cyrus SASL support for SMTP authentication.
 ### (Dovecot SASL support is built in by default.)
 ###
+PLIST_VARS+=	csasl
 .if !empty(PKG_OPTIONS:Msasl)
 .  include "../../security/cyrus-sasl/buildlink3.mk"
 BUILDLINK_INCDIRS.cyrus-sasl=	include/sasl
@@ -95,13 +96,12 @@ CCARGS+=	-DUSE_CYRUS_SASL
 AUXLIBS+=	-L${BUILDLINK_PREFIX.cyrus-sasl}/lib			\
 		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
 		-lsasl2
-PLIST_SUBST+=	SASL=
+PLIST.csasl=	yes
 MESSAGE_SRC+=	${PKGDIR}/MESSAGE.sasl
 MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 MESSAGE_SUBST+=	SASLLIBDIR=${SASLLIBDIR}
 MAKE_DIRS+=	${SASLLIBDIR}
 CONF_FILES+=	${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf
 .else
-PLIST_SUBST+=	SASL="@comment "
 CCARGS+=	-DDEF_SERVER_SASL_TYPE=\"dovecot\"
 .endif
diff --git a/mail/qmail/PLIST b/mail/qmail/PLIST
index 59b100365e9..2678f942a30 100644
--- a/mail/qmail/PLIST
+++ b/mail/qmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2007/03/09 12:34:22 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.12 2008/04/12 22:43:04 jlam Exp $
 bin/bouncesaying
 bin/condredirect
 bin/datemail
@@ -43,7 +43,7 @@ bin/qsmhook
 bin/sendmail
 bin/splogger
 bin/tcp-env
-${QMAIL_TLS}bin/update_tmprsadh
+${PLIST.tls}bin/update_tmprsadh
 man/cat1/bouncesaying.0
 man/cat1/condredirect.0
 man/cat1/except.0
@@ -164,7 +164,7 @@ share/doc/qmail/PIC.relaybad
 share/doc/qmail/PIC.relaygood
 share/doc/qmail/PIC.rem2local
 share/doc/qmail/README.pkgsrc
-${QMAIL_QREGEX}share/doc/qmail/README.qregex
+${PLIST.qregex}share/doc/qmail/README.qregex
 share/doc/qmail/REMOVE.binmail
 share/doc/qmail/REMOVE.sendmail
 share/doc/qmail/SENDMAIL${DARWINSUFX}
diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk
index 83bf03d3e3d..4273854d95b 100644
--- a/mail/qmail/options.mk
+++ b/mail/qmail/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.29 2008/03/20 03:30:32 schmonz Exp $
+# $NetBSD: options.mk,v 1.30 2008/04/12 22:43:04 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.qmail
 PKG_OPTIONS_OPTIONAL_GROUPS=	rcpt
@@ -45,13 +45,13 @@ PATCHFILES+=		${OUTGOINGIP_PATCH}
 SITES.${OUTGOINGIP_PATCH}=	http://www.qmail.org/
 .endif
 
-PLIST_SUBST+=		QMAIL_QREGEX="@comment "
+PLIST_VARS+=		qregex
 .if !empty(PKG_OPTIONS:Mqmail-qregex)
 QREGEX_PATCH=		qregex-20060423.patch
 PATCHFILES+=		${QREGEX_PATCH}
 SITES.${QREGEX_PATCH}=	http://www.arda.homeunix.net/store/qmail/
 PATCH_DIST_STRIP.${QREGEX_PATCH}=	-p3
-PLIST_SUBST+=		QMAIL_QREGEX=""
+PLIST.qregex=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mqmail-realrcptto)
@@ -61,7 +61,7 @@ SITES.${REALRCPTTO_PATCH}=	http://code.dogmap.org/qmail/
 PATCH_DIST_STRIP.${REALRCPTTO_PATCH}=	-p1
 .endif
 
-PLIST_SUBST+=		QMAIL_TLS="@comment "
+PLIST_VARS+=		tls
 .if !empty(PKG_OPTIONS:Msasl) || !empty(PKG_OPTIONS:Mtls)
 .  if empty(PKG_OPTIONS:Msasl)
 PKG_OPTIONS+=		sasl
@@ -74,7 +74,7 @@ SITES.${TLSSASL_PATCH}=	http://shupp.org/patches/
 CFLAGS+=		-DTLS=20060104	# NOTE: update according to the patch
 DJB_INSTALL_TARGETS=	cert tmprsadh
 USE_TOOLS+=		gmake
-PLIST_SUBST+=		QMAIL_TLS=""
+PLIST.tls=		yes
 .  endif
 .endif
 
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