2 files changed, 20 insertions, 24 deletions
diff --git a/chat/jabberd2/PLIST b/chat/jabberd2/PLIST
index e54f26df224..b4b04053d59 100644
--- a/chat/jabberd2/PLIST
+++ b/chat/jabberd2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2008/02/20 14:33:04 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:42:58 jlam Exp $
 bin/c2s
 bin/jabberd
 bin/migrate.pl
@@ -8,12 +8,12 @@ bin/router
 bin/s2s
 bin/sm
 lib/jabberd/authreg_anon.la
-${DB_OPT}lib/jabberd/authreg_db.la
-${LDAP_OPT}lib/jabberd/authreg_ldap.la
-${MYSQL_OPT}lib/jabberd/authreg_mysql.la
-${PAM_OPT}lib/jabberd/authreg_pam.la
-${PGSQL_OPT}lib/jabberd/authreg_pgsql.la
-${SQLITE_OPT}lib/jabberd/authreg_sqlite.la
+${PLIST.db}lib/jabberd/authreg_db.la
+${PLIST.ldap}lib/jabberd/authreg_ldap.la
+${PLIST.mysql}lib/jabberd/authreg_mysql.la
+${PLIST.pam}lib/jabberd/authreg_pam.la
+${PLIST.pgsql}lib/jabberd/authreg_pgsql.la
+${PLIST.sqlite}lib/jabberd/authreg_sqlite.la
 lib/jabberd/authreg_pipe.la
 lib/jabberd/mod_active.la
 lib/jabberd/mod_amp.la
@@ -40,10 +40,10 @@ lib/jabberd/mod_template-roster.la
 lib/jabberd/mod_vacation.la
 lib/jabberd/mod_validate.la
 lib/jabberd/storage_fs.la
-${DB_OPT}lib/jabberd/storage_db.la
-${MYSQL_OPT}lib/jabberd/storage_mysql.la
-${PGSQL_OPT}lib/jabberd/storage_pgsql.la
-${SQLITE_OPT}lib/jabberd/storage_sqlite.la
+${PLIST.db}lib/jabberd/storage_db.la
+${PLIST.mysql}lib/jabberd/storage_mysql.la
+${PLIST.pgsql}lib/jabberd/storage_pgsql.la
+${PLIST.sqlite}lib/jabberd/storage_sqlite.la
 man/man8/c2s.8
 man/man8/jabberd.8
 man/man8/resolver.8
diff --git a/chat/jabberd2/options.mk b/chat/jabberd2/options.mk
index 102da9f35ea..eeb18bbf313 100644
--- a/chat/jabberd2/options.mk
+++ b/chat/jabberd2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.19 2008/02/20 14:33:04 xtraeme Exp $
+# $NetBSD: options.mk,v 1.20 2008/04/12 22:42:58 jlam Exp $
 #
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.jabberd2
@@ -14,6 +14,8 @@ PKG_SUGGESTED_OPTIONS=		auth-sqlite storage-sqlite
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		db ldap mysql pam pgsql sqlite
+
 .if !empty(PKG_OPTIONS:Mauth-db) || !empty(PKG_OPTIONS:Mstorage-db)
 SUBST_CLASSES+=		fixdb
 SUBST_STAGE.fixdb=	post-configure
@@ -21,57 +23,51 @@ SUBST_FILES.fixdb=	storage/Makefile.in
 SUBST_SED.fixdb=	-e "s|@DB_LIBS@||g"
 BUILDLINK_TRANSFORM+=	rm:-ldb
 BDB_ACCEPTED=		db4
-PLIST_SUBST+=		DB_OPT=
+PLIST.db=		yes
 CONFIGURE_ARGS+=	--enable-db
 .  include "../../mk/bdb.buildlink3.mk"
 .else
-PLIST_SUBST+=		DB_OPT='@comment '
 CONFIGURE_ARGS+=	--disable-db
 .endif
 
 .if !empty(PKG_OPTIONS:Mauth-mysql) || !empty(PKG_OPTIONS:Mstorage-mysql)
-PLIST_SUBST+=		MYSQL_OPT=
+PLIST.mysql=		yes
 CONFIGURE_ARGS+=	--enable-mysql
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.mysql-client}/include/mysql
 .  include "../../mk/mysql.buildlink3.mk"
 .else
-PLIST_SUBST+=		MYSQL_OPT='@comment '
 CONFIGURE_ARGS+=	--disable-mysql
 .endif
 
 .if !empty(PKG_OPTIONS:Mauth-pgsql) || !empty(PKG_OPTIONS:Mstorage-pgsql)
-PLIST_SUBST+=		PGSQL_OPT=
+PLIST.pgsql=		yes
 CONFIGURE_ARGS+=	--enable-pgsql
 .  include "../../mk/pgsql.buildlink3.mk"
 .else
-PLIST_SUBST+=		PGSQL_OPT='@comment '
 CONFIGURE_ARGS+=	--disable-pgsql
 .endif
 
 .if !empty(PKG_OPTIONS:Mauth-sqlite) || !empty(PKG_OPTIONS:Mstorage-sqlite)
-PLIST_SUBST+=		SQLITE_OPT=
+PLIST.sqlite=		yes
 CONFIGURE_ARGS+=	--enable-sqlite
 .  include "../../databases/sqlite3/buildlink3.mk"
 .else
-PLIST_SUBST+=		SQLITE_OPT='@comment '
 CONFIGURE_ARGS+=	--disable-sqlite
 .endif
 
 .if !empty(PKG_OPTIONS:Mauth-ldap)
-PLIST_SUBST+=		LDAP_OPT=
+PLIST.ldap=		yes
 CONFIGURE_ARGS+=	--enable-ldap
 .  include "../../databases/openldap-client/buildlink3.mk"
 .else
-PLIST_SUBST+=		LDAP_OPT='@comment '
 CONFIGURE_ARGS+=	--disable-ldap
 .endif
 
 .if !empty(PKG_OPTIONS:Mauth-pam)
-PLIST_SUBST+=		PAM_OPT=
+PLIST.pam=		yes
 CONFIGURE_ARGS+=	--enable-pam
 .  include "../../mk/pam.buildlink3.mk"
 .else
-PLIST_SUBST+=		PAM_OPT='@comment '
 CONFIGURE_ARGS+=	--disable-pam
 .endif