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

through PLIST_SUBST to the plist module.

2 files changed, 29 insertions, 37 deletions

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.
 ###