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

through PLIST_SUBST to the plist module.

archivers/gtar-base/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2008/04/02 22:03:07 tonnerre Exp $
+# $NetBSD: Makefile,v 1.62 2008/04/12 22:42:57 jlam Exp $
 
 DISTNAME=	tar-1.15.1
 PKGNAME=	gtar-base-1.15.1
@@ -43,20 +43,17 @@ CONFIGURE_ENV+=		gt_cv_func_gnugettext2_libintl=yes
 PLIST_SUBST+=		GTAR_PROGRAM_PREFIX=${GTAR_PROGRAM_PREFIX:Q}
 BUILD_DEFS+=		GNU_PROGRAM_PREFIX
 BUILD_DEFS+=		GTAR_PROGRAM_PREFIX
+PLIST_VARS+=		gtar rmt
 
 TEST_TARGET=		check
 
 .if ${GTAR_PROGRAM_PREFIX} != "g"
-PLIST_SUBST+=		IF_BIN_GTAR=""
-.else
-PLIST_SUBST+=		IF_BIN_GTAR="@comment "
+PLIST.gtar=		yes
 .endif
 
 # don't include rmt if gtar won't build it
 .if ${OPSYS} != "Interix"
-PLIST_SUBST+=		IF_LIBEXEC_RMT=""
-.else
-PLIST_SUBST+=		IF_LIBEXEC_RMT="@comment "
+PLIST.rmt=		yes
 .endif
 
 post-install:

archivers/gtar-base/PLIST

@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.11 2006/04/17 07:07:11 jlam Exp $
+@comment $NetBSD: PLIST,v 1.12 2008/04/12 22:42:57 jlam Exp $
 bin/${GTAR_PROGRAM_PREFIX}tar
-${IF_BIN_GTAR}bin/gtar
-${IF_LIBEXEC_RMT}libexec/${GTAR_PROGRAM_PREFIX}rmt
+${PLIST.gtar}bin/gtar
+${PLIST.rmt}libexec/${GTAR_PROGRAM_PREFIX}rmt
 man/man1/${GTAR_PROGRAM_PREFIX}tar.1
 share/locale/cs/LC_MESSAGES/tar.mo
 share/locale/da/LC_MESSAGES/tar.mo

archivers/p7zip/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2008/04/07 17:48:14 joerg Exp $
+# $NetBSD: Makefile,v 1.41 2008/04/12 22:42:57 jlam Exp $
 
 DISTNAME=	p7zip_4.57_src_all
 PKGNAME=	p7zip-4.57
@@ -18,14 +18,13 @@ MAKE_FILE=		makefile
 MAKE_JOBS_SAFE=		no # missing header when compiling sfx
 NO_CONFIGURE=		yes
 PTHREAD_OPTS+=		require
+PLIST_VARS=		dll
 
 # compiles, but does not recognize any archives as supported
 DYNAMIC_7Z=		NO
 .if !empty(DYNAMIC_7Z:MYES)
 BUILD_TARGET=		all2
-PLIST_SUBST+=		DYNAMIC_7Z=""
-.else
-PLIST_SUBST+=		DYNAMIC_7Z="@comment "
+PLIST.dll=		yes
 .endif
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV:S/-/_/}

archivers/p7zip/PLIST

@@ -1,29 +1,29 @@
-@comment $NetBSD: PLIST,v 1.13 2007/12/16 09:25:22 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2008/04/12 22:42:57 jlam Exp $
 bin/7z
 bin/7za
-${DYNAMIC_7Z}lib/7z/7z
-${DYNAMIC_7Z}lib/7z/Codecs/7zAES.dll
-${DYNAMIC_7Z}lib/7z/Codecs/AES.dll
-${DYNAMIC_7Z}lib/7z/Codecs/BZip2.dll
-${DYNAMIC_7Z}lib/7z/Codecs/Branch.dll
-${DYNAMIC_7Z}lib/7z/Codecs/Copy.dll
-${DYNAMIC_7Z}lib/7z/Codecs/Deflate.dll
-${DYNAMIC_7Z}lib/7z/Codecs/Implode.dll
-${DYNAMIC_7Z}lib/7z/Codecs/LZMA.dll
-${DYNAMIC_7Z}lib/7z/Codecs/PPMD.dll
-${DYNAMIC_7Z}lib/7z/Codecs/Swap.dll
-${DYNAMIC_7Z}lib/7z/Formats/7z.dll
-${DYNAMIC_7Z}lib/7z/Formats/Rar.dll
-${DYNAMIC_7Z}lib/7z/Formats/Tar.dll
-${DYNAMIC_7Z}lib/7z/Formats/Zip.dll
-${DYNAMIC_7Z}lib/7z/Formats/arj.dll
-${DYNAMIC_7Z}lib/7z/Formats/bz2.dll
-${DYNAMIC_7Z}lib/7z/Formats/cab.dll
-${DYNAMIC_7Z}lib/7z/Formats/cpio.dll
-${DYNAMIC_7Z}lib/7z/Formats/deb.dll
-${DYNAMIC_7Z}lib/7z/Formats/gz.dll
-${DYNAMIC_7Z}lib/7z/Formats/rpm.dll
-${DYNAMIC_7Z}lib/7z/Formats/split.dll
+${PLIST.dll}lib/7z/7z
+${PLIST.dll}lib/7z/Codecs/7zAES.dll
+${PLIST.dll}lib/7z/Codecs/AES.dll
+${PLIST.dll}lib/7z/Codecs/BZip2.dll
+${PLIST.dll}lib/7z/Codecs/Branch.dll
+${PLIST.dll}lib/7z/Codecs/Copy.dll
+${PLIST.dll}lib/7z/Codecs/Deflate.dll
+${PLIST.dll}lib/7z/Codecs/Implode.dll
+${PLIST.dll}lib/7z/Codecs/LZMA.dll
+${PLIST.dll}lib/7z/Codecs/PPMD.dll
+${PLIST.dll}lib/7z/Codecs/Swap.dll
+${PLIST.dll}lib/7z/Formats/7z.dll
+${PLIST.dll}lib/7z/Formats/Rar.dll
+${PLIST.dll}lib/7z/Formats/Tar.dll
+${PLIST.dll}lib/7z/Formats/Zip.dll
+${PLIST.dll}lib/7z/Formats/arj.dll
+${PLIST.dll}lib/7z/Formats/bz2.dll
+${PLIST.dll}lib/7z/Formats/cab.dll
+${PLIST.dll}lib/7z/Formats/cpio.dll
+${PLIST.dll}lib/7z/Formats/deb.dll
+${PLIST.dll}lib/7z/Formats/gz.dll
+${PLIST.dll}lib/7z/Formats/rpm.dll
+${PLIST.dll}lib/7z/Formats/split.dll
 man/man1/7z.1
 man/man1/7za.1
 man/man1/7zr.1
@@ -69,6 +69,6 @@ share/doc/p7zip/syntax.htm
 @dirrm share/doc/p7zip/switches
 @dirrm share/doc/p7zip/commands
 @dirrm share/doc/p7zip
-${DYNAMIC_7Z}@dirrm lib/7z/Formats
-${DYNAMIC_7Z}@dirrm lib/7z/Codecs
-${DYNAMIC_7Z}@dirrm lib/7z
+${PLIST.dll}@dirrm lib/7z/Formats
+${PLIST.dll}@dirrm lib/7z/Codecs
+${PLIST.dll}@dirrm lib/7z

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

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)

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

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

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"

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

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
 
 

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

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

audio/moc-devel/options.mk

@@ -1,11 +1,13 @@
-# $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
 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
 

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