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

through PLIST_SUBST to the plist module.

21 files changed, 92 insertions, 98 deletions

diff --git a/audio/amarok/PLIST b/audio/amarok/PLIST
index 8e5e2808f7c..6ac89cd8e1c 100644
--- a/audio/amarok/PLIST
+++ b/audio/amarok/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2007/08/30 00:01:35 wiz Exp $
+@comment $NetBSD: PLIST,v 1.27 2008/04/12 22:42:57 jlam Exp $
 bin/amarok
 bin/amarok_daapserver.rb
 bin/amarok_libvisual
@@ -8,7 +8,7 @@ bin/amarokcollectionscanner
 lib/kde3/konqsidebar_universalamarok.la
 lib/kde3/libamarok_daap-mediadevice.la
 lib/kde3/libamarok_generic-mediadevice.la
-${IPOD}lib/kde3/libamarok_ipod-mediadevice.la
+${PLIST.ipod}lib/kde3/libamarok_ipod-mediadevice.la
 lib/kde3/libamarok_massstorage-device.la
 lib/kde3/libamarok_nfs-device.la
 lib/kde3/libamarok_smb-device.la
@@ -952,7 +952,7 @@ share/kde/config.kcfg/xinecfg.kcfg
 share/kde/config/amarokrc
 share/kde/services/amarok_daap-mediadevice.desktop
 share/kde/services/amarok_generic-mediadevice.desktop
-${IPOD}share/kde/services/amarok_ipod-mediadevice.desktop
+${PLIST.ipod}share/kde/services/amarok_ipod-mediadevice.desktop
 share/kde/services/amarok_massstorage-device.desktop
 share/kde/services/amarok_nfs-device.desktop
 share/kde/services/amarok_smb-device.desktop
diff --git a/audio/amarok/options.mk b/audio/amarok/options.mk
index d741b6561bd..3614ef3468e 100644
--- a/audio/amarok/options.mk
+++ b/audio/amarok/options.mk
@@ -1,17 +1,17 @@
-# $NetBSD: options.mk,v 1.4 2008/04/08 21:04:07 jlam Exp $
+# $NetBSD: options.mk,v 1.5 2008/04/12 22:42:57 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.amarok
 PKG_SUPPORTED_OPTIONS=	libgpod mysql pgsql
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=	ipod
+
 .if !empty(PKG_OPTIONS:Mlibgpod)
+PLIST.ipod=		yes
 CONFIGURE_ARGS+=	--enable-libgpod
 BUILDLINK_API_DEPENDS.libgpod+=	libgpod>=0.4.2
 .  include "../../audio/libgpod/buildlink3.mk"
-PLIST_SUBST+=	IPOD=""
-.else
-PLIST_SUBST+=	IPOD="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mmysql)
diff --git a/audio/bmp/Makefile b/audio/bmp/Makefile
index 19122a5c801..4ff6ebaefd1 100644
--- a/audio/bmp/Makefile
+++ b/audio/bmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2008/03/06 14:53:47 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2008/04/12 22:42:57 jlam Exp $
 #
 
 BMP_ENABLE_ENCODERS=	yes
@@ -9,12 +9,11 @@ PKGREVISION=		5
 
 DEPENDS+=		unzip-[0-9]*:../../archivers/unzip
 
-.if ${OPSYS} == "Darwin"
-PLIST_SUBST+=	CDAUDIO="@comment "
-.else
-PLIST_SUBST+=	CDAUDIO=""
+PLIST_VARS+=		cdaudio
+.if ${OPSYS} != "Darwin"
+PLIST.cdaudio=		yes
 .endif
-PRINT_PLIST_AWK+=	/cdaudio/ { print "$${CDAUDIO}" $$0; next }
+PRINT_PLIST_AWK+=	/cdaudio/ { print "$${PLIST.cdaudio}" $$0; next }
 
 # XXX Workaround a crash during shutdown that happens when dlclose(3)ing
 # any open plugin.  libstdc++ gets dynamically linked in when the id3lib
diff --git a/audio/bmp/PLIST b/audio/bmp/PLIST
index 6ef47bed50e..830e9bc4448 100644
--- a/audio/bmp/PLIST
+++ b/audio/bmp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/07/31 21:43:55 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:42:58 jlam Exp $
 bin/beep-media-player
 include/bmp/beepctrl.h
 include/bmp/configdb.h
@@ -11,7 +11,7 @@ include/bmp/rcfile.h
 include/bmp/titlestring.h
 include/bmp/util.h
 include/bmp/vfs.h
-${CDAUDIO}lib/bmp/Input/libcdaudio.la
+${PLIST.cdaudio}lib/bmp/Input/libcdaudio.la
 lib/bmp/Input/libmpg123.la
 lib/bmp/Input/libvorbis.la
 lib/bmp/Input/libwav.la
diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index 27040005179..a2489a72fc5 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/11/19 00:10:31 hubertf Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/12 22:42:58 jlam Exp $
 #
 
 DISTNAME=		cmus-2.1.0
@@ -18,11 +18,10 @@ CONFIGURE_ARGS+=	prefix=${PREFIX}
 CONFIGURE_ARGS+=	CONFIG_ALSA=n
 CONFIGURE_ARGS+=	CONFIG_OSS=y
 CONFIGURE_ARGS+=	mandir=${PREFIX}/${PKGMANDIR}/
+PLIST_VARS=		sunaudio
 
 .if exists(/usr/include/sys/audioio.h)
-PLIST_SUBST+=	SUN=""
-.else
-PLIST_SUBST+=	SUN="@comment "
+PLIST.sunaudio=		yes
 .endif
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/audio/cmus/PLIST b/audio/cmus/PLIST
index a41881fdc7b..8f0c5270b16 100644
--- a/audio/cmus/PLIST
+++ b/audio/cmus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2007/01/13 08:57:56 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:42:58 jlam Exp $
 bin/cmus
 bin/cmus-remote
 lib/cmus/ip/flac.so
@@ -8,7 +8,7 @@ lib/cmus/ip/vorbis.so
 lib/cmus/ip/wav.so
 lib/cmus/op/ao.so
 lib/cmus/op/oss.so
-${SUN}lib/cmus/op/sun.so
+${PLIST.sunaudio}lib/cmus/op/sun.so
 man/man1/cmus-remote.1
 man/man1/cmus.1
 share/cmus/cyan.theme
diff --git a/audio/jack-devel/Makefile b/audio/jack-devel/Makefile
index 6f2e4765b9c..5a718c4b477 100644
--- a/audio/jack-devel/Makefile
+++ b/audio/jack-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/04/08 01:44:47 bjs Exp $
+# $NetBSD: Makefile,v 1.4 2008/04/12 22:42:58 jlam Exp $
 #
 
 DISTNAME=	jack-audio-connection-kit-${JACK_VERSION}
@@ -50,28 +50,29 @@ CONFIGURE_ARGS+=	--with-default-tmpdir=/dev/shm
 CONFIGURE_ARGS+=	--with-default-tmpdir=${JACKD_DEFAULT_TMPDIR:Q}
 .endif
 
+PLIST_VARS=		oss sunaudio
+
 ###
 ### XXX The sun driver is buggy on NetBSD right now.  I hope to remedy
 ###	this shortly.
 ###
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "Solaris"
 CONFIGURE_ARGS+=	--enable-sun
-PLIST_SUBST+=		SUN=""
+PLIST.sunaudio=		yes
 .else
 CONFIGURE_ARGS+=	--disable-sun
-PLIST_SUBST+=		SUN="@comment "
 .endif
 
 .include "../../mk/oss.buildlink3.mk"
 
 .if ${OSS_TYPE} != "none"
 CONFIGURE_ARGS+= 	--enable-oss
+PLIST.oss=		yes
 PLIST_SUBST+=		OSS=""
 MAKE_ENV+=		LIBOSSAUDIO=${LIBOSSAUDIO:Q}
 CFLAGS+=		-DDEVOSSAUDIO=\"${DEVOSSAUDIO:U/dev/dsp}\"
 .else
 CONFIGURE_ARGS+= 	--disable-oss
-PLIST_SUBST+=	 	OSS="@comment "
 .endif
 
 
diff --git a/audio/jack-devel/PLIST b/audio/jack-devel/PLIST
index 3ecf40e90f5..5fc00223e00 100644
--- a/audio/jack-devel/PLIST
+++ b/audio/jack-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2008/04/08 01:44:47 bjs Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:42:58 jlam Exp $
 bin/jack_alias
 bin/jack_connect
 bin/jack_disconnect
@@ -30,8 +30,8 @@ lib/jack/inprocess.la
 lib/jack/intime.la
 lib/jack/jack_dummy.la
 lib/jack/jack_net.la
-${OSS}lib/jack/jack_oss.la
-${SUN}lib/jack/jack_sun.la
+${PLIST.oss}lib/jack/jack_oss.la
+${PLIST.sunaudio}lib/jack/jack_sun.la
 lib/jack/netsource.la
 lib/libjack.la
 lib/libjackserver.la
diff --git a/audio/moc-devel/PLIST b/audio/moc-devel/PLIST
index 2cb89b1915d..faa1b06681d 100644
--- a/audio/moc-devel/PLIST
+++ b/audio/moc-devel/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/04/07 16:10:37 bjs Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/04/12 22:42:58 jlam Exp $
 bin/mocp
-${FLAC}lib/moc/decoder_plugins/libflac_decoder.la
+${PLIST.flac}lib/moc/decoder_plugins/libflac_decoder.la
 lib/moc/decoder_plugins/libmp3_decoder.la
-${VORBIS}lib/moc/decoder_plugins/libvorbis_decoder.la
-${SNDFILE}lib/moc/decoder_plugins/libsndfile_formats_decoder.la
-${SPEEX}lib/moc/decoder_plugins/libspeex_decoder.la
+${PLIST.vorbis}lib/moc/decoder_plugins/libvorbis_decoder.la
+${PLIST.sndfile}lib/moc/decoder_plugins/libsndfile_formats_decoder.la
+${PLIST.speex}lib/moc/decoder_plugins/libspeex_decoder.la
 man/man1/mocp.1
 share/doc/moc/README
 share/doc/moc/THANKS
diff --git a/audio/moc-devel/options.mk b/audio/moc-devel/options.mk
index b5437013bd2..cbfd40eb89d 100644
--- a/audio/moc-devel/options.mk
+++ b/audio/moc-devel/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2008/04/08 01:52:41 bjs Exp $
+# $NetBSD: options.mk,v 1.3 2008/04/12 22:42:58 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.moc
 PKG_SUPPORTED_OPTIONS=	sndfile flac vorbis speex curl samplerate jack
@@ -6,6 +6,8 @@ PKG_SUGGESTED_OPTIONS=	sndfile flac vorbis curl
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		flac sndfile speex vorbis
+
 .if !empty(PKG_OPTIONS:Mjack)
 CONFIGURE_ARGS+=	--with-jack
 ###
@@ -30,38 +32,34 @@ CONFIGURE_ARGS+=	--without-samplerate
 .endif
 
 .if !empty(PKG_OPTIONS:Msndfile)
-PLIST_SUBST+=		SNDFILE=
+PLIST.sndfile=		yes
 CONFIGURE_ARGS+=	--with-sndfile
 .  include "../../audio/libsndfile/buildlink3.mk"
 .else
-PLIST_SUBST+=		SNDFILE='@comment '
 CONFIGURE_ARGS+=	--without-sndfile
 .endif
 
 .if !empty(PKG_OPTIONS:Mflac)
-PLIST_SUBST+=		FLAC=
+PLIST.flac=		yes
 CONFIGURE_ARGS+=	--with-flac
 .  include "../../audio/flac/buildlink3.mk"
 .else
-PLIST_SUBST+=		FLAC='@comment '
 CONFIGURE_ARGS+=	--without-flac
 .endif
 
 .if !empty(PKG_OPTIONS:Mvorbis)
-PLIST_SUBST+=		VORBIS=
+PLIST.vorbis=		yes
 CONFIGURE_ARGS+=	--with-vorbis
 .  include "../../audio/libvorbis/buildlink3.mk"
 .else
-PLIST_SUBST+=		VORBIS='@comment '
 CONFIGURE_ARGS+=	--without-vorbis
 .endif
 
 .if !empty(PKG_OPTIONS:Mspeex)
-PLIST_SUBST+=		SPEEX=
+PLIST.speex=		yes
 CONFIGURE_ARGS+=	--with-speex
 .  include "../../audio/speex/buildlink3.mk"
 .else
-PLIST_SUBST+=		SPEEX='@comment '
 CONFIGURE_ARGS+=	--without-speex
 .endif
 
diff --git a/audio/moc/PLIST b/audio/moc/PLIST
index 848aa7d665b..9a01cd2da09 100644
--- a/audio/moc/PLIST
+++ b/audio/moc/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2006/02/12 18:35:55 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/04/12 22:42:58 jlam Exp $
 bin/mocp
-${FLAC}lib/moc/decoder_plugins/libflac_decoder.la
+${PLIST.flac}lib/moc/decoder_plugins/libflac_decoder.la
 lib/moc/decoder_plugins/libmp3_decoder.la
-${VORBIS}lib/moc/decoder_plugins/libvorbis_decoder.la
-${SNDFILE}lib/moc/decoder_plugins/libsndfile_formats_decoder.la
-${SPEEX}lib/moc/decoder_plugins/libspeex_decoder.la
+${PLIST.vorbis}lib/moc/decoder_plugins/libvorbis_decoder.la
+${PLIST.sndfile}lib/moc/decoder_plugins/libsndfile_formats_decoder.la
+${PLIST.speex}lib/moc/decoder_plugins/libspeex_decoder.la
 man/man1/mocp.1
 share/doc/moc/README
 share/doc/moc/THANKS
diff --git a/audio/moc/options.mk b/audio/moc/options.mk
index aa301ee44f1..6d16cb4a5e9 100644
--- a/audio/moc/options.mk
+++ b/audio/moc/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2008/04/07 16:15:25 bjs Exp $
+# $NetBSD: options.mk,v 1.4 2008/04/12 22:42:58 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.moc
 PKG_SUPPORTED_OPTIONS=	sndfile flac vorbis speex curl samplerate
@@ -6,6 +6,8 @@ PKG_SUGGESTED_OPTIONS=	sndfile flac vorbis curl
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		fac sndfile speex vorbis
+
 .if !empty(PKG_OPTIONS:Msamplerate)
 PKG_OPTIONS+=		sndfile
 CONFIGURE_ARGS+=	--with-samplerate
@@ -15,38 +17,34 @@ CONFIGURE_ARGS+=	--without-samplerate
 .endif
 
 .if !empty(PKG_OPTIONS:Msndfile) || defined(PKG_OPTIONS:Msamplerate)
-PLIST_SUBST+=		SNDFILE=
+PLIST.sndfile=		yes
 CONFIGURE_ARGS+=	--with-sndfile
 .  include "../../audio/libsndfile/buildlink3.mk"
 .else
-PLIST_SUBST+=		SNDFILE='@comment '
 CONFIGURE_ARGS+=	--without-sndfile
 .endif
 
 .if !empty(PKG_OPTIONS:Mflac)
-PLIST_SUBST+=		FLAC=
+PLIST.flac=		yes
 CONFIGURE_ARGS+=	--with-flac
 .  include "../../audio/flac/buildlink3.mk"
 .else
-PLIST_SUBST+=		FLAC='@comment '
 CONFIGURE_ARGS+=	--without-flac
 .endif
 
 .if !empty(PKG_OPTIONS:Mvorbis)
-PLIST_SUBST+=		VORBIS=
+PLIST.vorbis=		yes
 CONFIGURE_ARGS+=	--with-vorbis
 .  include "../../audio/libvorbis/buildlink3.mk"
 .else
-PLIST_SUBST+=		VORBIS='@comment '
 CONFIGURE_ARGS+=	--without-vorbis
 .endif
 
 .if !empty(PKG_OPTIONS:Mspeex)
-PLIST_SUBST+=		SPEEX=
+PLIST.speex=		yes
 CONFIGURE_ARGS+=	--with-speex
 .  include "../../audio/speex/buildlink3.mk"
 .else
-PLIST_SUBST+=		SPEEX='@comment '
 CONFIGURE_ARGS+=	--without-speex
 .endif
 
diff --git a/audio/normalize/PLIST b/audio/normalize/PLIST
index b73cfec2311..8100c5a1dba 100644
--- a/audio/normalize/PLIST
+++ b/audio/normalize/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2006/04/21 09:28:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:42:58 jlam Exp $
 bin/normalize
 bin/normalize-mp3
 bin/normalize-ogg
-${XMMS_PLUGIN}lib/xmms/Effect/librva.la
+${PLIST.xmms}lib/xmms/Effect/librva.la
 man/man1/normalize-mp3.1
 man/man1/normalize.1
 share/locale/en_GB/LC_MESSAGES/normalize.mo
diff --git a/audio/normalize/options.mk b/audio/normalize/options.mk
index 060d1e27adc..e81b3754e02 100644
--- a/audio/normalize/options.mk
+++ b/audio/normalize/options.mk
@@ -1,13 +1,13 @@
-# $NetBSD: options.mk,v 1.1 2006/04/21 09:28:47 adam Exp $
+# $NetBSD: options.mk,v 1.2 2008/04/12 22:42:58 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.normalize
 PKG_SUPPORTED_OPTIONS=	xmms
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		xmms
+
 .if !empty(PKG_OPTIONS:Mxmms)
-PLIST_SUBST+=	XMMS_PLUGIN=
+PLIST.xmms=		yes
 .include "../../audio/xmms/buildlink3.mk"
-.else
-PLIST_SUBST+=	XMMS_PLUGIN="@comment "
 .endif
diff --git a/audio/streamtuner/PLIST b/audio/streamtuner/PLIST
index 4244f750f6a..1afc9882360 100644
--- a/audio/streamtuner/PLIST
+++ b/audio/streamtuner/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2006/04/17 07:07:12 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/04/12 22:42:58 jlam Exp $
 bin/streamtuner
 include/streamtuner/st-action-api.h
 include/streamtuner/st-category-api.h
@@ -21,10 +21,10 @@ include/streamtuner/st-version-api.h
 include/streamtuner/streamtuner.h
 lib/pkgconfig/streamtuner.pc
 lib/streamtuner/plugins/live365.la
-${LOCAL_PLUGIN}lib/streamtuner/plugins/local.la
-${PYTHON_PLUGIN}lib/streamtuner/plugins/python.la
+${PLIST.local}lib/streamtuner/plugins/local.la
+${PLIST.python}lib/streamtuner/plugins/python.la
 lib/streamtuner/plugins/shoutcast.la
-${XIPH_PLUGIN}lib/streamtuner/plugins/xiph.la
+${PLIST.xiph}lib/streamtuner/plugins/xiph.la
 share/applications/streamtuner.desktop
 share/doc/streamtuner/api-reference.html
 share/doc/streamtuner/ch01s02.html
@@ -66,12 +66,12 @@ share/locale/ja/LC_MESSAGES/streamtuner.mo
 share/locale/pt/LC_MESSAGES/streamtuner.mo
 share/omf/streamtuner/streamtuner-C.omf
 share/pixmaps/streamtuner.png
-${PYTHON_PLUGIN}share/streamtuner/python/icons/basic.ch.png
-${PYTHON_PLUGIN}share/streamtuner/python/icons/google-stations.png
-${PYTHON_PLUGIN}share/streamtuner/python/icons/punkcast.com.png
-${PYTHON_PLUGIN}share/streamtuner/python/scripts/basic.ch.py
-${PYTHON_PLUGIN}share/streamtuner/python/scripts/google-stations.py
-${PYTHON_PLUGIN}share/streamtuner/python/scripts/punkcast.com.py
+${PLIST.python}share/streamtuner/python/icons/basic.ch.png
+${PLIST.python}share/streamtuner/python/icons/google-stations.png
+${PLIST.python}share/streamtuner/python/icons/punkcast.com.png
+${PLIST.python}share/streamtuner/python/scripts/basic.ch.py
+${PLIST.python}share/streamtuner/python/scripts/google-stations.py
+${PLIST.python}share/streamtuner/python/scripts/punkcast.com.py
 share/streamtuner/ui/applications.png
 share/streamtuner/ui/bookmarks.png
 share/streamtuner/ui/browse.png
@@ -84,7 +84,7 @@ share/streamtuner/ui/local.png
 share/streamtuner/ui/logo.png
 share/streamtuner/ui/main-category-running.png
 share/streamtuner/ui/main-category.png
-${PYTHON_PLUGIN}share/streamtuner/ui/python.png
+${PLIST.python}share/streamtuner/ui/python.png
 share/streamtuner/ui/preselections.png
 share/streamtuner/ui/record.png
 share/streamtuner/ui/search-category-running.png
@@ -95,9 +95,9 @@ share/streamtuner/ui/streamtuner.png
 share/streamtuner/ui/tune-in.png
 share/streamtuner/ui/xiph.png
 @dirrm share/streamtuner/ui
-${PYTHON_PLUGIN}@dirrm share/streamtuner/python/scripts
-${PYTHON_PLUGIN}@dirrm share/streamtuner/python/icons
-${PYTHON_PLUGIN}@dirrm share/streamtuner/python
+${PLIST.python}@dirrm share/streamtuner/python/scripts
+${PLIST.python}@dirrm share/streamtuner/python/icons
+${PLIST.python}@dirrm share/streamtuner/python
 @dirrm share/streamtuner
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/streamtuner
diff --git a/audio/streamtuner/options.mk b/audio/streamtuner/options.mk
index b7a93ede259..5e47d362531 100644
--- a/audio/streamtuner/options.mk
+++ b/audio/streamtuner/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/10/19 09:45:09 xtraeme Exp $
+# $NetBSD: options.mk,v 1.2 2008/04/12 22:42:58 jlam Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.streamtuner
@@ -7,29 +7,28 @@ PKG_SUGGESTED_OPTIONS=	streamtuner-local streamtuner-xiph
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		local python xiph
+
 .if !empty(PKG_OPTIONS:Mstreamtuner-local)
-PLIST_SUBST+=		LOCAL_PLUGIN=
+PLIST.local=		yes
 CONFIGURE_ARGS+=	--enable-local
 .  include "../../audio/taglib/buildlink3.mk"
 .else
-PLIST_SUBST+=		LOCAL_PLUGIN='@comment '
 CONFIGURE_ARGS+=	--disable-local
 .endif
 
 .if !empty(PKG_OPTIONS:Mstreamtuner-xiph)
-PLIST_SUBST+=		XIPH_PLUGIN=
+PLIST.xiph=		yes
 CONFIGURE_ARGS+=	--enable-xiph
 .  include "../../textproc/libxml2/buildlink3.mk"
 .else
-PLIST_SUBST+=		XIPH_PLUGIN='@comment '
 CONFIGURE_ARGS+=	--disable-xiph
 .endif
 
 .if !empty(PKG_OPTIONS:Mpython)
-PLIST_SUBST+=		PYTHON_PLUGIN=
+PLIST.python=		yes
 CONFIGURE_ARGS+=	--enable-python
 .  include "../../x11/py-gtk2/buildlink3.mk"
 .else
-PLIST_SUBST+=		PYTHON_PLUGIN='@comment '
 CONFIGURE_ARGS+=	--disable-python
 .endif
diff --git a/audio/xmms-modplug/Makefile b/audio/xmms-modplug/Makefile
index 5f8bbaf5752..1a0732f53f0 100644
--- a/audio/xmms-modplug/Makefile
+++ b/audio/xmms-modplug/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/02/22 19:26:08 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2008/04/12 22:42:58 jlam Exp $
 #
 
 DISTNAME=		modplugxmms-2.05
@@ -21,6 +21,7 @@ USE_TOOLS+=		pkg-config
 
 CFLAGS+=		-DDEVICE_NAME="\"${DEVOSSSOUND}\""
 USE_LANGUAGES=		c c++
+PLIST_VARS=		modplugplay
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
@@ -31,10 +32,8 @@ SUBST_MESSAGE.mpplay=	Skipping modplugplay
 SUBST_STAGE.mpplay=	pre-build
 SUBST_FILES.mpplay=	Makefile
 SUBST_SED.mpplay=	-e 's,^\(SUBDIRS = modplugxmms glade\) modplugplay,\1,'
-
-PLIST_SUBST+=		NOTFOROSX="@comment "
 .else
-PLIST_SUBST+=		NOTFOROSX=""
+PLIST.modplugplay=	yes
 .endif
 
 .include "../../audio/libmodplug/buildlink3.mk"
diff --git a/audio/xmms-modplug/PLIST b/audio/xmms-modplug/PLIST
index 804c3eacf48..4f8e8d3fbdc 100644
--- a/audio/xmms-modplug/PLIST
+++ b/audio/xmms-modplug/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2006/08/29 04:40:53 ben Exp $
-${NOTFOROSX}bin/modplugplay
+@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:42:58 jlam Exp $
+${PLIST.modplugplay}bin/modplugplay
 lib/xmms/Input/libmodplugxmms.la
diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index b1cdf9e3e9a..a549ce6344a 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2007/12/21 23:23:58 joerg Exp $
+# $NetBSD: Makefile,v 1.70 2008/04/12 22:42:58 jlam Exp $
 #
 
 .include "Makefile.common"
@@ -7,11 +7,12 @@ USE_TOOLS+=	msgfmt
 
 CONFIGURE_ARGS+=	--disable-esd
 
+PLIST_VARS+=		cdaudio
+
 .if ${OPSYS} == "Darwin"
-PLIST_SUBST+=	CDAUDIO="@comment "
 _INSTALL_UNSTRIPPED=	yes
 .else
-PLIST_SUBST+=	CDAUDIO=""
+PLIST.cdaudio=		yes
 .endif
 
 BUILDLINK_DEPMETHOD.libXt?=	build
diff --git a/audio/xmms/Makefile.common b/audio/xmms/Makefile.common
index d35807f8d9d..41e0b16b28c 100644
--- a/audio/xmms/Makefile.common
+++ b/audio/xmms/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2007/11/29 18:36:35 wiz Exp $
+# $NetBSD: Makefile.common,v 1.28 2008/04/12 22:42:58 jlam Exp $
 #
 
 DISTNAME=	xmms-1.2.11
@@ -14,6 +14,7 @@ USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
+PLIST_VARS=		oss
 
 DISTINFO_FILE=		${.CURDIR}/../../audio/xmms/distinfo
 FILESDIR=		${.CURDIR}/../../audio/xmms/files
@@ -65,9 +66,8 @@ post-patch:
 .if ${OPSYS} != "FreeBSD" && ${OPSYS} != "Linux" && ${OPSYS} != "NetBSD" && \
 	${OPSYS} != "OpenBSD" && ${OPSYS} != "DragonFly"
 CONFIGURE_ARGS+=	--disable-oss
-PLIST_SUBST+=		OSS="@comment "
 .else
-PLIST_SUBST+=		OSS=""
+PLIST.oss=		yes
 .endif
 
 .include "../../audio/libmikmod/buildlink3.mk"
diff --git a/audio/xmms/PLIST.common b/audio/xmms/PLIST.common
index 6a5a3daf886..5c752eca9ea 100644
--- a/audio/xmms/PLIST.common
+++ b/audio/xmms/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.10 2007/12/06 10:30:53 martti Exp $
+@comment $NetBSD: PLIST.common,v 1.11 2008/04/12 22:42:58 jlam Exp $
 bin/wmxmms
 bin/xmms
 bin/xmms-config
@@ -16,13 +16,13 @@ lib/xmms/Effect/libstereo.la
 lib/xmms/Effect/libvoice.la
 lib/xmms/General/libir.la
 lib/xmms/General/libsong_change.la
-${CDAUDIO}lib/xmms/Input/libcdaudio.la
+${PLIST.cdaudio}lib/xmms/Input/libcdaudio.la
 lib/xmms/Input/libmikmod.la
 lib/xmms/Input/libmpg123.la
 lib/xmms/Input/libtonegen.la
 lib/xmms/Input/libvorbis.la
 lib/xmms/Input/libwav.la
-${OSS}lib/xmms/Output/libOSS.la
+${PLIST.oss}lib/xmms/Output/libOSS.la
 lib/xmms/Output/libdisk_writer.la
 lib/xmms/Visualization/libbscope.la
 lib/xmms/Visualization/libogl_spectrum.la