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

through PLIST_SUBST to the plist module.

2 files changed, 26 insertions, 30 deletions

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