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

through PLIST_SUBST to the plist module.

10 files changed, 81 insertions, 85 deletions

diff --git a/chat/eggdrop/Makefile b/chat/eggdrop/Makefile
index 2267ed6109e..6544b0a5e67 100644
--- a/chat/eggdrop/Makefile
+++ b/chat/eggdrop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2008/03/03 02:19:51 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2008/04/12 22:42:58 jlam Exp $
 
 DISTNAME=	eggdrop1.6.18
 PKGNAME=	eggdrop-1.6.18
@@ -12,6 +12,7 @@ COMMENT=	IRC robot with TCL scripting and multi-channel ability
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+PLIST_VARS=		dynamic
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ENV+=		TCLLIB="${PREFIX}/lib" TCLINC="${PREFIX}/include"
@@ -64,10 +65,9 @@ do-install-program:
 
 .if defined(NOPIC)
 BUILD_TARGET=	static
-PLIST_SUBST+=	NOPIC="@comment "
 .else
 BUILD_TARGET=	eggdrop
-PLIST_SUBST+=	NOPIC=
+PLIST.dynamic=	yes
 do-install: do-install-modules
 do-install-modules:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/eggdrop
diff --git a/chat/eggdrop/PLIST b/chat/eggdrop/PLIST
index c66b36bb985..c6bcf31c7f4 100644
--- a/chat/eggdrop/PLIST
+++ b/chat/eggdrop/PLIST
@@ -1,21 +1,21 @@
-@comment $NetBSD: PLIST,v 1.9 2007/10/18 09:15:33 obache Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/04/12 22:42:58 jlam Exp $
 bin/eggdrop
-${NOPIC}lib/eggdrop/assoc.so
-${NOPIC}lib/eggdrop/blowfish.so
-${NOPIC}lib/eggdrop/channels.so
-${NOPIC}lib/eggdrop/compress.so
-${NOPIC}lib/eggdrop/console.so
-${NOPIC}lib/eggdrop/ctcp.so
-${NOPIC}lib/eggdrop/dns.so
-${NOPIC}lib/eggdrop/filesys.so
-${NOPIC}lib/eggdrop/irc.so
-${NOPIC}lib/eggdrop/notes.so
-${NOPIC}lib/eggdrop/seen.so
-${NOPIC}lib/eggdrop/server.so
-${NOPIC}lib/eggdrop/share.so
-${NOPIC}lib/eggdrop/transfer.so
-${NOPIC}lib/eggdrop/uptime.so
-${NOPIC}lib/eggdrop/wire.so
+${PLIST.dynamic}lib/eggdrop/assoc.so
+${PLIST.dynamic}lib/eggdrop/blowfish.so
+${PLIST.dynamic}lib/eggdrop/channels.so
+${PLIST.dynamic}lib/eggdrop/compress.so
+${PLIST.dynamic}lib/eggdrop/console.so
+${PLIST.dynamic}lib/eggdrop/ctcp.so
+${PLIST.dynamic}lib/eggdrop/dns.so
+${PLIST.dynamic}lib/eggdrop/filesys.so
+${PLIST.dynamic}lib/eggdrop/irc.so
+${PLIST.dynamic}lib/eggdrop/notes.so
+${PLIST.dynamic}lib/eggdrop/seen.so
+${PLIST.dynamic}lib/eggdrop/server.so
+${PLIST.dynamic}lib/eggdrop/share.so
+${PLIST.dynamic}lib/eggdrop/transfer.so
+${PLIST.dynamic}lib/eggdrop/uptime.so
+${PLIST.dynamic}lib/eggdrop/wire.so
 man/man1/eggdrop.1
 share/doc/eggdrop/BANS
 share/doc/eggdrop/BOTNET
@@ -127,4 +127,4 @@ share/examples/eggdrop/eggdrop.conf
 @dirrm share/eggdrop
 @dirrm share/doc/eggdrop/html
 @dirrm share/doc/eggdrop
-${NOPIC}@dirrm lib/eggdrop
+${PLIST.dynamic}@dirrm lib/eggdrop
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
 
diff --git a/chat/libpurple/PLIST b/chat/libpurple/PLIST
index 5e40b0f80e3..88caf5fcb05 100644
--- a/chat/libpurple/PLIST
+++ b/chat/libpurple/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2008/03/04 17:22:40 tnn Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/04/12 22:42:58 jlam Exp $
 include/libpurple/account.h
 include/libpurple/accountopt.h
 include/libpurple/blist.h
@@ -161,18 +161,18 @@ share/sounds/purple/login.wav
 share/sounds/purple/logout.wav
 share/sounds/purple/receive.wav
 share/sounds/purple/send.wav
-${DBUS}bin/purple-client-example
-${DBUS}bin/purple-remote
-${DBUS}bin/purple-send
-${DBUS}bin/purple-send-async
-${DBUS}bin/purple-url-handler
-${DBUS}include/libpurple/dbus-bindings.h
-${DBUS}include/libpurple/dbus-define-api.h
-${DBUS}include/libpurple/dbus-purple.h
-${DBUS}include/libpurple/dbus-server.h
-${DBUS}include/libpurple/dbus-useful.h
-${DBUS}lib/libpurple-client.la
-${DBUS}lib/purple-2/dbus-example.la
+${PLIST.dbus}bin/purple-client-example
+${PLIST.dbus}bin/purple-remote
+${PLIST.dbus}bin/purple-send
+${PLIST.dbus}bin/purple-send-async
+${PLIST.dbus}bin/purple-url-handler
+${PLIST.dbus}include/libpurple/dbus-bindings.h
+${PLIST.dbus}include/libpurple/dbus-define-api.h
+${PLIST.dbus}include/libpurple/dbus-purple.h
+${PLIST.dbus}include/libpurple/dbus-server.h
+${PLIST.dbus}include/libpurple/dbus-useful.h
+${PLIST.dbus}lib/libpurple-client.la
+${PLIST.dbus}lib/purple-2/dbus-example.la
 @dirrm lib/purple-2
 @dirrm include/libpurple
 @dirrm share/purple/ca-certs
diff --git a/chat/libpurple/options.mk b/chat/libpurple/options.mk
index 9cada942d8e..fb0456f2dac 100644
--- a/chat/libpurple/options.mk
+++ b/chat/libpurple/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2007/12/01 22:46:42 rillig Exp $
+# $NetBSD: options.mk,v 1.7 2008/04/12 22:42:58 jlam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.libpurple
 PKG_SUPPORTED_OPTIONS+=		gnutls perl tcl debug dbus sasl
@@ -6,6 +6,8 @@ PKG_SUGGESTED_OPTIONS+=		gnutls
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		dbus
+
 .if !empty(PKG_OPTIONS:Mgnutls)
 CONFIGURE_ARGS+=	--disable-nss
 CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include
@@ -39,7 +41,7 @@ CONFIGURE_ARGS+=	--disable-tcl
 .if !empty(PKG_OPTIONS:Mdbus)
 CONFIGURE_ARGS+=	--enable-dbus
 CONFIGURE_ARGS+=	--with-python=${PYTHONBIN}
-PLIST_SUBST+=		DBUS=
+PLIST.dbus=		yes
 REPLACE_SH+=		libpurple/purple-send
 REPLACE_SH+=		libpurple/purple-send-async
 REPLACE_PYTHON+=	libpurple/purple-remote
@@ -50,7 +52,6 @@ REPLACE_PYTHON+=	libpurple/purple-url-handler
 .  include "../../lang/python/application.mk"
 .else
 CONFIGURE_ARGS+=	--disable-dbus
-PLIST_SUBST+=		DBUS="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mdebug)
diff --git a/chat/weechat/PLIST b/chat/weechat/PLIST
index 234d6b47685..991d9309232 100644
--- a/chat/weechat/PLIST
+++ b/chat/weechat/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.8 2007/10/12 18:38:41 tonio Exp $
+@comment $NetBSD: PLIST,v 1.9 2008/04/12 22:42:58 jlam Exp $
 bin/weechat-curses
-${WITHLUA}lib/weechat/plugins/lua.la
-${WITHPYTHON}lib/weechat/plugins/python.la
-${WITHCHARSET}lib/weechat/plugins/charset.la
+${PLIST.lua}lib/weechat/plugins/lua.la
+${PLIST.python}lib/weechat/plugins/python.la
+${PLIST.charset}lib/weechat/plugins/charset.la
 man/man1/weechat-curses.1
 share/doc/weechat/html/de/weechat-doc.css
 share/doc/weechat/html/en/weechat-doc.css
@@ -26,5 +26,5 @@ share/locale/ru/LC_MESSAGES/weechat.mo
 @dirrm share/doc/weechat/html/de
 @dirrm share/doc/weechat/html
 @dirrm share/doc/weechat
-${WITHPLUGIN}@dirrm lib/weechat/plugins
-${WITHPLUGIN}@dirrm lib/weechat
+${PLIST.plugin}@dirrm lib/weechat/plugins
+${PLIST.plugin}@dirrm lib/weechat
diff --git a/chat/weechat/options.mk b/chat/weechat/options.mk
index 3f6c79ac981..5b21c0717bb 100644
--- a/chat/weechat/options.mk
+++ b/chat/weechat/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2007/06/10 22:20:10 tonio Exp $
+# $NetBSD: options.mk,v 1.4 2008/04/12 22:42:58 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.weechat
 PKG_SUPPORTED_OPTIONS=	charset gnutls python lua
@@ -6,12 +6,13 @@ PKG_SUGGESTED_OPTIONS=	charset
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		charset lua plugin python
+
 .if !empty(PKG_OPTIONS:Mcharset)
 CONFIGURE_ARGS+=	--enable-charset
-PLIST_SUBST+= WITHCHARSET=""
+PLIST.charset=		yes
 .else
 CONFIGURE_ARGS+=	--disable-charset
-PLIST_SUBST+= WITHCHARSET="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mgnutls)
@@ -21,24 +22,21 @@ PLIST_SUBST+= WITHCHARSET="@comment "
 .if !empty(PKG_OPTIONS:Mpython)
 .include "../../lang/python/extension.mk"
 CONFIGURE_ARGS+=	--enable-python
-PLIST_SUBST+= WITHPYTHON=""
+PLIST.python=		yes
 .else
 CONFIGURE_ARGS+=	--disable-python
-PLIST_SUBST+= WITHPYTHON="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mlua)
 .include "../../lang/lua/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-lua
-PLIST_SUBST+= WITHLUA=""
+PLIST.lua=		yes
 .else
 CONFIGURE_ARGS+=	--disable-lua
-PLIST_SUBST+= WITHLUA="@comment "
 .endif
 
-.if !empty(PKG_OPTIONS:Mpython) || !empty(PKG_OPTIONS:Mlua) \
-    || !empty(PKG_OPTIONS:Mcharset)
-PLIST_SUBST+= WITHPLUGIN=""
-.else
-PLIST_SUBST+= WITHPLUGIN="@comment "
+.if !empty(PKG_OPTIONS:Mpython) || \
+    !empty(PKG_OPTIONS:Mlua) || \
+    !empty(PKG_OPTIONS:Mcharset)
+PLIST.plugin=		yes
 .endif
diff --git a/chat/xchat/PLIST b/chat/xchat/PLIST
index d434ca70e1e..3f1850b7b95 100644
--- a/chat/xchat/PLIST
+++ b/chat/xchat/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.17 2007/09/25 10:54:10 hira Exp $
+@comment $NetBSD: PLIST,v 1.18 2008/04/12 22:42:58 jlam Exp $
 bin/xchat
 share/applications/xchat.desktop
-${GNOME}share/dbus-1/services/org.xchat.service.service
+${PLIST.dbus}share/dbus-1/services/org.xchat.service.service
 share/doc/xchat/README
 share/doc/xchat/faq.html
 share/doc/xchat/plugin20.html
-${GNOME}share/gconf/schemas/apps_xchat_url_handler.schemas
+${PLIST.dbus}share/gconf/schemas/apps_xchat_url_handler.schemas
 share/locale/be/LC_MESSAGES/xchat.mo
 share/locale/ca/LC_MESSAGES/xchat.mo
 share/locale/cs/LC_MESSAGES/xchat.mo
diff --git a/chat/xchat/options.mk b/chat/xchat/options.mk
index 7493b44d450..fb2d11ccce8 100644
--- a/chat/xchat/options.mk
+++ b/chat/xchat/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2007/09/25 15:38:54 hira Exp $
+# $NetBSD: options.mk,v 1.11 2008/04/12 22:42:58 jlam Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -11,6 +11,8 @@ PKG_SUGGESTED_OPTIONS=	ssl
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		dbus
+
 ###
 ### Use OpenSSL libraries for connecting to ircs servers
 ###
@@ -49,7 +51,7 @@ CONFIGURE_ARGS+=	--disable-shm
 ###
 .if !empty(PKG_OPTIONS:Mgnome)
 CONFIGURE_ARGS+=	--enable-dbus
-PLIST_SUBST+=		GNOME=""
+PLIST.dbus=		yes
 SUBST_CLASSES+=		gconf
 SUBST_STAGE.gconf+=	pre-configure
 SUBST_MESSAGE.gconf+=	Disabling schema registration/installation.
@@ -61,7 +63,6 @@ USE_DIRS+=		gnome2-1.5
 .else
 # We set this to ${FALSE} to avoid detection.
 CONFIGURE_ARGS+=	--disable-dbus
-PLIST_SUBST=		GNOME="@comment "
 USE_DIRS+=		xdg-1.1
 .endif