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

through PLIST_SUBST to the plist module.

9 files changed, 57 insertions, 61 deletions

diff --git a/databases/freetds/PLIST b/databases/freetds/PLIST
index c92af6c247b..ea5fac1dc8e 100644
--- a/databases/freetds/PLIST
+++ b/databases/freetds/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2005/12/31 04:05:31 jlam Exp $
+@comment $NetBSD: PLIST,v 1.16 2008/04/12 22:42:59 jlam Exp $
 bin/bsqldb
 bin/defncopy
 bin/freebcp
@@ -21,7 +21,7 @@ include/tdsver.h
 lib/libct.la
 lib/libsybdb.la
 lib/libtds.la
-${ODBC}lib/libtdsodbc.la
+${PLIST.odbc}lib/libtdsodbc.la
 lib/libtdssrv.la
 man/man1/bsqldb.1
 man/man1/defncopy.1
diff --git a/databases/freetds/options.mk b/databases/freetds/options.mk
index 7e384b8c7f2..ac89d090fd3 100644
--- a/databases/freetds/options.mk
+++ b/databases/freetds/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/12/30 21:07:42 jlam Exp $
+# $NetBSD: options.mk,v 1.2 2008/04/12 22:42:59 jlam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.freetds
 PKG_OPTIONS_OPTIONAL_GROUPS+=	odbc
@@ -6,6 +6,8 @@ PKG_OPTIONS_GROUP.odbc=		iodbc #unixodbc
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=			odbc
+
 ###
 ### Whether to build with iODBC to enable ODBC access to TDS servers.
 ###
@@ -14,7 +16,7 @@ ODBC_DRIVER=		yes
 .  include "../../databases/iodbc/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-odbc
 CONFIGURE_ARGS+=	--with-iodbc=${BUILDLINK_PREFIX.iodbc}
-PLIST_SUBST+=		ODBC=
+PLIST.odbc=		yes
 .endif
 
 ###
@@ -24,10 +26,9 @@ PLIST_SUBST+=		ODBC=
 .  include "../../databases/unixodbc/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-odbc
 CONFIGURE_ARGS+=	--with-unixodbc=${BUILDLINK_PREFIX.unixodbc}
-PLIST_SUBST+=		ODBC=
+PLIST.odbc=		yes
 .endif
 
 .if empty(PKG_OPTIONS:Miodbc) && empty(PKG_OPTIONS:Munixodbc)
 CONFIGURE_ARGS+=	--disable-odbc
-PLIST_SUBST+=		ODBC="@comment "
 .endif
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
diff --git a/databases/myodbc/PLIST b/databases/myodbc/PLIST
index 79fe114380c..e85922c9961 100644
--- a/databases/myodbc/PLIST
+++ b/databases/myodbc/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2006/01/23 18:53:45 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:42:59 jlam Exp $
 bin/myodbc3m
 lib/libmyodbc3.la
-${WITH_GUI}lib/libmyodbc3S.la
+${PLIST.gui}lib/libmyodbc3S.la
 lib/libmyodbc3_r.la
 share/doc/myodbc/README
 share/doc/myodbc/README.osx
diff --git a/databases/myodbc/options.mk b/databases/myodbc/options.mk
index 02ab69d6907..71ff3be9c9a 100644
--- a/databases/myodbc/options.mk
+++ b/databases/myodbc/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2007/01/14 12:28:56 obache Exp $
+# $NetBSD: options.mk,v 1.4 2008/04/12 22:42:59 jlam Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.myodbc
@@ -9,14 +9,15 @@ PKG_SUGGESTED_OPTIONS=	myodbc-iodbc
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		gui
+
 .if !empty(PKG_OPTIONS:Mmyodbc-gui)
 .  include "../../x11/qt3-tools/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-gui
 USE_LANGUAGES=		c c++
-PLIST_SUBST+=		WITH_GUI=
+PLIST.gui=		yes
 .else
 CONFIGURE_ARGS+=	--disable-gui
-PLIST_SUBST+=		WITH_GUI='@comment '
 .endif
 
 .if !empty(PKG_OPTIONS:Mmyodbc-iodbc)
diff --git a/databases/sqlrelay/PLIST b/databases/sqlrelay/PLIST
index e0410256f68..db09eaf2fbb 100644
--- a/databases/sqlrelay/PLIST
+++ b/databases/sqlrelay/PLIST
@@ -1,18 +1,18 @@
-@comment $NetBSD: PLIST,v 1.5 2006/04/30 16:01:21 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:42:59 jlam Exp $
 bin/backupschema
 bin/fields
 bin/query
 bin/sqlr-cachemanager
-${COND_FREETDS}bin/sqlr-connection-freetds
-${COND_FREETDS}bin/sqlr-connection-freetds-debug
-${COND_MYSQL}bin/sqlr-connection-mysql
-${COND_MYSQL}bin/sqlr-connection-mysql-debug
-${COND_ODBC}bin/sqlr-connection-odbc
-${COND_ODBC}bin/sqlr-connection-odbc-debug
-${COND_PGSQL}bin/sqlr-connection-postgresql
-${COND_PGSQL}bin/sqlr-connection-postgresql-debug
-${COND_SQLITE}bin/sqlr-connection-sqlite
-${COND_SQLITE}bin/sqlr-connection-sqlite-debug
+${PLIST.freetds}bin/sqlr-connection-freetds
+${PLIST.freetds}bin/sqlr-connection-freetds-debug
+${PLIST.mysql}bin/sqlr-connection-mysql
+${PLIST.mysql}bin/sqlr-connection-mysql-debug
+${PLIST.odbc}bin/sqlr-connection-odbc
+${PLIST.odbc}bin/sqlr-connection-odbc-debug
+${PLIST.pgsql}bin/sqlr-connection-postgresql
+${PLIST.pgsql}bin/sqlr-connection-postgresql-debug
+${PLIST.sqlite}bin/sqlr-connection-sqlite
+${PLIST.sqlite}bin/sqlr-connection-sqlite-debug
 bin/sqlr-export
 bin/sqlr-import
 bin/sqlr-listener
@@ -56,12 +56,12 @@ man/man8/sqlr-listener.8
 man/man8/sqlr-scaler.8
 man/man8/sqlr-start.8
 man/man8/sqlr-stop.8
-${COND_PERL}${PERL5_SUB_INSTALLVENDORMAN3DIR}/SQLRelay::Connection.3
-${COND_PERL}${PERL5_SUB_INSTALLVENDORMAN3DIR}/SQLRelay::Cursor.3
-${COND_PERL}${PERL5_SUB_INSTALLVENDORARCH}/SQLRelay/Connection.pm
-${COND_PERL}${PERL5_SUB_INSTALLVENDORARCH}/SQLRelay/Cursor.pm
-${COND_PERL}${PERL5_SUB_INSTALLVENDORARCH}/auto/SQLRelay/Connection/Connection.so
-${COND_PERL}${PERL5_SUB_INSTALLVENDORARCH}/auto/SQLRelay/Cursor/Cursor.so
+${PLIST.perl}${PERL5_SUB_INSTALLVENDORMAN3DIR}/SQLRelay::Connection.3
+${PLIST.perl}${PERL5_SUB_INSTALLVENDORMAN3DIR}/SQLRelay::Cursor.3
+${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/SQLRelay/Connection.pm
+${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/SQLRelay/Cursor.pm
+${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/SQLRelay/Connection/Connection.so
+${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/SQLRelay/Cursor/Cursor.so
 share/doc/sqlrelay/api/c++/sqlrclient.h.html
 share/doc/sqlrelay/api/c/sqlrclientwrapper.h.html
 share/doc/sqlrelay/api/java/allclasses-frame.html
diff --git a/databases/sqlrelay/options.mk b/databases/sqlrelay/options.mk
index db86d97bb63..4bfb8431daf 100644
--- a/databases/sqlrelay/options.mk
+++ b/databases/sqlrelay/options.mk
@@ -1,10 +1,12 @@
-# $NetBSD: options.mk,v 1.5 2006/04/30 16:01:21 joerg Exp $
+# $NetBSD: options.mk,v 1.6 2008/04/12 22:42:59 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sqlrelay
 PKG_SUPPORTED_OPTIONS+= mysql pgsql sqlite odbc freetds perl
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		freetds mysql odbc perl pgsql sqlite
+
 .if !empty(PKG_OPTIONS:Mperl)
 PERL5_PACKLIST=		auto/SQLRelay/Connection/.packlist
 PERL5_PACKLIST+=	auto/SQLRelay/Cursor/.packlist
@@ -14,7 +16,7 @@ CONFIGURE_ARGS+=	--with-perl-site-arch=${PERL5_INSTALLVENDORARCH:Q}
 CONFIGURE_ARGS+=	--with-perl-site-lib=${PERL5_INSTALLVENDORLIB:Q}
 CONFIGURE_ARGS+=	--with-perl-install-man3-dir=${PERL5_INSTALLVENDORMAN3DIR:Q}
 
-PLIST_SUBST+=	COND_PERL=""
+PLIST.perl=		yes
 
 .include "../../lang/perl5/buildlink3.mk"
 .include "../../lang/perl5/packlist.mk"
@@ -22,50 +24,44 @@ PLIST_SUBST+=	COND_PERL=""
 
 .else
 CONFIGURE_ARGS+=	--disable-perl
-PLIST_SUBST+=	COND_PERL="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mmysql)
 CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-client:Q}
-PLIST_SUBST+=	COND_MYSQL=""
+PLIST.mysql=		yes
 .include "../../mk/mysql.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-mysql
-PLIST_SUBST+=	COND_MYSQL="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mpgsql)
 CONFIGURE_ARGS+=	--with-postgresql=${PGSQL_PREFIX:Q}
+PLIST.pgsql=		yes
 .include "../../mk/pgsql.buildlink3.mk"
-PLIST_SUBST+=	COND_PGSQL=""
 .else
 CONFIGURE_ARGS+=	--disable-postgresql
-PLIST_SUBST+=	COND_PGSQL="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Msqlite)
 CONFIGURE_ARGS+=	--with-sqlite=${BUILDLINK_PREFIX.sqlite3:Q}
-PLIST_SUBST+=	COND_SQLITE=""
+PLIST.sqlite=		yes
 .include "../../databases/sqlite3/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-sqlite
-PLIST_SUBST+=	COND_SQLITE="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Modbc)
 CONFIGURE_ARGS+=	--with-odbc=${BUILDLINK_PREFIX.unixodbc:Q}
-PLIST_SUBST+=	COND_ODBC=""
+PLIST.odbc=		yes
 .include "../../databases/unixodbc/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-odbc
-PLIST_SUBST+=	COND_ODBC="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mfreetds)
 CONFIGURE_ARGS+=	--with-freetds=${BUILDLINK_PREFIX.freetds:Q}
-PLIST_SUBST+=	COND_FREETDS=""
+PLIST.freetds=		yes
 .include "../../databases/freetds/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-freetds
-PLIST_SUBST+=	COND_FREETDS="@comment "
 .endif