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

through PLIST_SUBST to the plist module.

13 files changed, 83 insertions, 96 deletions

diff --git a/multimedia/gstreamer0.10/Makefile b/multimedia/gstreamer0.10/Makefile
index be75da55557..8f142b5a7c2 100644
--- a/multimedia/gstreamer0.10/Makefile
+++ b/multimedia/gstreamer0.10/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/04/10 11:54:40 drochner Exp $
+# $NetBSD: Makefile,v 1.22 2008/04/12 22:43:07 jlam Exp $
 #
 
 DISTNAME=		gstreamer-0.10.19
@@ -47,12 +47,11 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.gstreamer
 PKG_SUPPORTED_OPTIONS=	gstcheck
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=	gstcheck
 .if !empty(PKG_OPTIONS:Mgstcheck)
 .include "../../devel/check/buildlink3.mk"
-PLIST_SUBST+=	GSTCHECK=""
+PLIST.gstcheck=	yes
 TEST_TARGET=	check-torture
-.else
-PLIST_SUBST+=	GSTCHECK="@comment "
 .endif
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/multimedia/gstreamer0.10/PLIST b/multimedia/gstreamer0.10/PLIST
index 840fab76d21..fd1cd54f1ff 100644
--- a/multimedia/gstreamer0.10/PLIST
+++ b/multimedia/gstreamer0.10/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2008/04/10 11:54:40 drochner Exp $
+@comment $NetBSD: PLIST,v 1.12 2008/04/12 22:43:07 jlam Exp $
 bin/gst-feedback-0.10
 bin/gst-inspect-0.10
 bin/gst-launch-0.10
@@ -13,8 +13,8 @@ include/gstreamer-0.10/gst/base/gstcollectpads.h
 include/gstreamer-0.10/gst/base/gstdataqueue.h
 include/gstreamer-0.10/gst/base/gstpushsrc.h
 include/gstreamer-0.10/gst/base/gsttypefindhelper.h
-${GSTCHECK}include/gstreamer-0.10/gst/check/gstbufferstraw.h
-${GSTCHECK}include/gstreamer-0.10/gst/check/gstcheck.h
+${PLIST.gstcheck}include/gstreamer-0.10/gst/check/gstbufferstraw.h
+${PLIST.gstcheck}include/gstreamer-0.10/gst/check/gstcheck.h
 include/gstreamer-0.10/gst/controller/gstcontroller.h
 include/gstreamer-0.10/gst/controller/gstcontrolsource.h
 include/gstreamer-0.10/gst/controller/gstinterpolationcontrolsource.h
@@ -80,14 +80,14 @@ include/gstreamer-0.10/gst/net/gstnettimeprovider.h
 lib/gstreamer-0.10/libgstcoreelements.la
 lib/gstreamer-0.10/libgstcoreindexers.la
 lib/libgstbase-0.10.la
-${GSTCHECK}lib/libgstcheck-0.10.la
+${PLIST.gstcheck}lib/libgstcheck-0.10.la
 lib/libgstcontroller-0.10.la
 lib/libgstdataprotocol-0.10.la
 lib/libgstnet-0.10.la
 lib/libgstreamer-0.10.la
 lib/pkgconfig/gstreamer-0.10.pc
 lib/pkgconfig/gstreamer-base-0.10.pc
-${GSTCHECK}lib/pkgconfig/gstreamer-check-0.10.pc
+${PLIST.gstcheck}lib/pkgconfig/gstreamer-check-0.10.pc
 lib/pkgconfig/gstreamer-controller-0.10.pc
 lib/pkgconfig/gstreamer-dataprotocol-0.10.pc
 lib/pkgconfig/gstreamer-net-0.10.pc
@@ -246,7 +246,7 @@ share/locale/zh_TW/LC_MESSAGES/gstreamer-0.10.mo
 @dirrm include/gstreamer-0.10/gst/net
 @dirrm include/gstreamer-0.10/gst/dataprotocol
 @dirrm include/gstreamer-0.10/gst/controller
-${GSTCHECK}@dirrm include/gstreamer-0.10/gst/check
+${PLIST.gstcheck}@dirrm include/gstreamer-0.10/gst/check
 @dirrm include/gstreamer-0.10/gst/base
 @dirrm include/gstreamer-0.10/gst
 @dirrm include/gstreamer-0.10
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index c1a9f1b7fcd..9d232bfe367 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/08/09 20:02:36 drochner Exp $
+# $NetBSD: Makefile,v 1.14 2008/04/12 22:43:07 jlam Exp $
 
 DISTNAME=		mpeg4ip-1.5.0.1
 CATEGORIES=		multimedia
@@ -19,10 +19,9 @@ OVERRIDE_DIRDEPTH=	3		# */*/*/libtool
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Darwin"
-PLIST_SUBST+=	MPEG4IPSDL="@comment "
-.else
-PLIST_SUBST+=	MPEG4IPSDL=
+PLIST_VARS+=		mpeg4ipSDL
+.if ${OPSYS} != "Darwin"
+PLIST.mpeg4ipSDL=	yes
 .endif
 
 .include "../../devel/SDL/buildlink3.mk"
diff --git a/multimedia/mpeg4ip/PLIST b/multimedia/mpeg4ip/PLIST
index cef5c7367b0..3be09002e9d 100644
--- a/multimedia/mpeg4ip/PLIST
+++ b/multimedia/mpeg4ip/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2007/01/05 19:35:46 rillig Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:07 jlam Exp $
 bin/avi2raw
 bin/avidump
 bin/h264_parse
@@ -54,7 +54,7 @@ lib/libmp4.la
 lib/libmp4av.la
 lib/libmp4util.la
 lib/libmp4v2.la
-${MPEG4IPSDL}lib/libmpeg4ipSDL.la
+${PLIST.mpeg4ipSDL}lib/libmpeg4ipSDL.la
 lib/libmpeg4ip_celp.la
 lib/libmpeg4ip_celpbs.la
 lib/libmpeg4ip_faad.la
diff --git a/multimedia/smpeg/PLIST b/multimedia/smpeg/PLIST
index 588184d07a0..c78da85f8be 100644
--- a/multimedia/smpeg/PLIST
+++ b/multimedia/smpeg/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2005/09/04 05:20:05 xtraeme Exp $
-${OPENGL_PLAYER}bin/glmovie
-${GTK_PLAYER}bin/gtv
+@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:43:07 jlam Exp $
+${PLIST.opengl}bin/glmovie
+${PLIST.gtk}bin/gtv
 bin/plaympeg
 bin/smpeg-config
 include/smpeg/MPEG.h
@@ -15,7 +15,7 @@ include/smpeg/MPEGsystem.h
 include/smpeg/MPEGvideo.h
 include/smpeg/smpeg.h
 lib/libsmpeg.la
-${GTK_PLAYER}man/man1/gtv.1
+${PLIST.gtk}man/man1/gtv.1
 man/man1/plaympeg.1
 share/aclocal/smpeg.m4
 @dirrm include/smpeg
diff --git a/multimedia/smpeg/options.mk b/multimedia/smpeg/options.mk
index 0809af00571..68bd85bb2e5 100644
--- a/multimedia/smpeg/options.mk
+++ b/multimedia/smpeg/options.mk
@@ -1,24 +1,24 @@
-# $NetBSD: options.mk,v 1.2 2005/11/04 17:22:08 rillig Exp $
+# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:07 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.smpeg
 PKG_SUPPORTED_OPTIONS=	gtk-player opengl-player
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		gtk opengl
+
 .if !empty(PKG_OPTIONS:Mgtk-player)
-PLIST_SUBST+=		GTK_PLAYER=
+PLIST.gtk=		yes
 CONFIGURE_ARGS+=	--enable-gtk-player
 .  include "../../x11/gtk/buildlink3.mk"
 .else
-PLIST_SUBST+=		GTK_PLAYER="@comment "
 CONFIGURE_ARGS+=	--disable-gtk-player --disable-gtk-test
 .endif
 
 .if !empty(PKG_OPTIONS:Mopengl-player)
-PLIST_SUBST+=		OPENGL_PLAYER=
+PLIST.opengl=		yes
 CONFIGURE_ARGS+=	--enable-opengl-player
 .  include "../../graphics/glu/buildlink3.mk"
 .else
-PLIST_SUBST+=		OPENGL_PLAYER="@comment "
 CONFIGURE_ARGS+=	--disable-opengl-player
 .endif
diff --git a/multimedia/transcode/PLIST b/multimedia/transcode/PLIST
index eeaae51f7e5..4746aa43ba2 100644
--- a/multimedia/transcode/PLIST
+++ b/multimedia/transcode/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2008/02/20 12:06:16 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/04/12 22:43:08 jlam Exp $
 bin/avifix
 bin/aviindex
 bin/avimerge
@@ -16,7 +16,7 @@ bin/tcscan
 bin/tcxmlcheck
 bin/tcxpm2rgb
 bin/transcode
-${A52}lib/transcode/a52_decore.la
+${PLIST.a52}lib/transcode/a52_decore.la
 lib/transcode/af6_decore.la
 lib/transcode/export_ac3.la
 lib/transcode/export_af6.conf
@@ -25,17 +25,17 @@ lib/transcode/export_divx4.la
 lib/transcode/export_divx4raw.la
 lib/transcode/export_divx5.la
 lib/transcode/export_divx5raw.la
-${DV}lib/transcode/export_dv.la
-${DV}lib/transcode/export_dvraw.la
+${PLIST.dv}lib/transcode/export_dv.la
+${PLIST.dv}lib/transcode/export_dvraw.la
 lib/transcode/export_ffmpeg.la
-${IMAGEMAGICK}lib/transcode/export_im.la
+${PLIST.imagemagick}lib/transcode/export_im.la
 lib/transcode/export_jpg.la
 lib/transcode/export_lame.la
 lib/transcode/export_mjpeg.la
 lib/transcode/export_mp1e.la
 lib/transcode/export_mp2.la
-${MJPEGTOOLS}lib/transcode/export_mp2enc.la
-${MJPEGTOOLS}lib/transcode/export_mpeg2enc.la
+${PLIST.mjpegtools}lib/transcode/export_mp2enc.la
+${PLIST.mjpegtools}lib/transcode/export_mpeg2enc.la
 lib/transcode/export_null.la
 lib/transcode/export_ogg.la
 lib/transcode/export_pcm.la
@@ -48,7 +48,7 @@ lib/transcode/export_xvid.so
 lib/transcode/export_xvid2.la
 lib/transcode/export_xvid3.la
 lib/transcode/export_xvid4.la
-${MJPEGTOOLS}lib/transcode/export_yuv4mpeg.la
+${PLIST.mjpegtools}lib/transcode/export_yuv4mpeg.la
 lib/transcode/filter_29to23.la
 lib/transcode/filter_32detect.la
 lib/transcode/filter_32drop.la
@@ -56,7 +56,7 @@ lib/transcode/filter_aclip.la
 lib/transcode/filter_ascii.la
 lib/transcode/filter_astat.la
 lib/transcode/filter_clone.la
-${IMAGEMAGICK}lib/transcode/filter_compare.la
+${PLIST.imagemagick}lib/transcode/filter_compare.la
 lib/transcode/filter_control.la
 lib/transcode/filter_cpaudio.la
 lib/transcode/filter_cshift.la
@@ -80,8 +80,8 @@ lib/transcode/filter_invert.la
 lib/transcode/filter_ivtc.la
 lib/transcode/filter_levels.la
 lib/transcode/filter_list.awk
-${IMAGEMAGICK}lib/transcode/filter_logo.la
-${IMAGEMAGICK}lib/transcode/filter_logoaway.la
+${PLIST.imagemagick}lib/transcode/filter_logo.la
+${PLIST.imagemagick}lib/transcode/filter_logoaway.la
 lib/transcode/filter_lowpass.la
 lib/transcode/filter_mask.la
 lib/transcode/filter_modfps.la
@@ -89,7 +89,7 @@ lib/transcode/filter_msharpen.la
 lib/transcode/filter_nored.la
 lib/transcode/filter_normalize.la
 lib/transcode/filter_null.la
-${DV}lib/transcode/filter_preview.la
+${PLIST.dv}lib/transcode/filter_preview.la
 lib/transcode/filter_pp.la
 lib/transcode/filter_pv.la
 lib/transcode/filter_resample.la
@@ -99,12 +99,12 @@ lib/transcode/filter_smartbob.la
 lib/transcode/filter_smartdeinter.la
 lib/transcode/filter_smartyuv.la
 lib/transcode/filter_smooth.la
-${MPEG3}lib/transcode/filter_subtitler.la
+${PLIST.mpeg3}lib/transcode/filter_subtitler.la
 lib/transcode/filter_tc_audio.la
 lib/transcode/filter_tc_video.la
 lib/transcode/filter_test.la
 lib/transcode/filter_testframe.la
-${FREETYPE2}lib/transcode/filter_text.la
+${PLIST.freetype2}lib/transcode/filter_text.la
 lib/transcode/filter_tomsmocomp.la
 lib/transcode/filter_unsharp.la
 lib/transcode/filter_videocore.la
@@ -122,12 +122,12 @@ lib/transcode/import_dvd.la
 lib/transcode/import_ffbin.la
 lib/transcode/import_ffmpeg.la
 lib/transcode/import_fraps.la
-${IMAGEMAGICK}lib/transcode/import_im.la
-${IMAGEMAGICK}lib/transcode/import_imlist.la
+${PLIST.imagemagick}lib/transcode/import_im.la
+${PLIST.imagemagick}lib/transcode/import_imlist.la
 lib/transcode/import_lav.la
 lib/transcode/import_mp3.la
 lib/transcode/import_mpeg2.la
-${MPEG3}lib/transcode/import_mpeg3.la
+${PLIST.mpeg3}lib/transcode/import_mpeg3.la
 lib/transcode/import_mplayer.la
 lib/transcode/import_null.la
 lib/transcode/import_nuv.la
diff --git a/multimedia/transcode/options.mk b/multimedia/transcode/options.mk
index be27e70d6e7..9f812c48cc6 100644
--- a/multimedia/transcode/options.mk
+++ b/multimedia/transcode/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2008/02/20 12:14:53 xtraeme Exp $
+# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:08 jlam Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.transcode
@@ -10,78 +10,72 @@ PKG_SUGGESTED_OPTIONS+=	imagemagick
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		${PKG_SUPPORTED_OPTIONS}
+
 .if !empty(PKG_OPTIONS:Ma52)
 .  include "../../audio/liba52/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-a52
 CONFIGURE_ARGS+=	--enable-a52-default-decoder
-PLIST_SUBST+=		A52=
+PLIST.a52=		yes
 .else
-PLIST_SUBST+=		A52='@comment '
 CONFIGURE_ARGS+=	--disable-a52
 .endif
 
 .if !empty(PKG_OPTIONS:Mfreetype2)
 .  include "../../graphics/freetype2/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-freetype2
-PLIST_SUBST+=		FREETYPE2=
+PLIST.freetype2=	yes
 .else
-PLIST_SUBST+=		FREETYPE2='@comment '
 CONFIGURE_ARGS+=	--disable-freetype2
 .endif
 
 .if !empty(PKG_OPTIONS:Mmjpegtools)
 .  include "../../multimedia/mjpegtools/buildlink3.mk"
-PLIST_SUBST+=		MJPEGTOOLS=
+PLIST.mjpegtools=	yes
 CONFIGURE_ARGS+=	--enable-mjpegtools
 .else
-PLIST_SUBST+=		MJPEGTOOLS='@comment '
 CONFIGURE_ARGS+=	--disable-mjpegtools
 .endif
 
 .if !empty(PKG_OPTIONS:Mmpeg3)
 BUILDLINK_API_DEPENDS.libmpeg3+=	libmpeg3>=1.7
-PLIST_SUBST+=		MPEG3=
 .  include "../../multimedia/libmpeg3/buildlink3.mk"
+PLIST.mpeg3=		yes
 CONFIGURE_ARGS+=	--with-libmpeg3-prefix=${BUILDLINK_PREFIX.libmpeg3}
 CONFIGURE_ARGS+=	--enable-libmpeg3
 .else
-PLIST_SUBST+=		MPEG3='@comment '
 CONFIGURE_ARGS+=	--disable-libmpeg3
 .endif
 
 .if !empty(PKG_OPTIONS:Mlzo)
-PLIST_SUBST+=		LZO=
 .  include "../../archivers/lzo/buildlink3.mk"
+PLIST.lzo=		yes
 CONFIGURE_ARGS+=	--enable-lzo
 CONFIGURE_ARGS+=	--with-lzo-prefix=${BUILDLINK_PREFIX.lzo}
 .else
-PLIST_SUBST+=		LZO='@comment '
 CONFIGURE_ARGS+=	--disable-lzo
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibxml2)
-PLIST_SUBST+=		LIBXML2=
 .  include "../../textproc/libxml2/buildlink3.mk"
+PLIST.libxml2=		yes
 CONFIGURE_ARGS+=	--enable-libxml2
 .else
-PLIST_SUBST+=		LIBXML2='@comment '
 CONFIGURE_ARGS+=	--disable-libxml2
 .endif
 
 .if !empty(PKG_OPTIONS:Mdv)
-PLIST_SUBST+=	DV=
 .  include "../../multimedia/libdv/buildlink3.mk"
+PLIST.dv=		yes
 CONFIGURE_ARGS+=	--enable-libdv
 .else
-PLIST_SUBST+=	DV='@comment '
 CONFIGURE_ARGS+=	--disable-libdv
 .endif
 
 .if !empty(PKG_OPTIONS:Mimagemagick)
-PLIST_SUBST+=		IMAGEMAGICK=
 .  include "../../graphics/ImageMagick/buildlink3.mk"
+PLIST.imagemagick=	yes
 CONFIGURE_ARGS+=	--enable-imagemagick
 .else
-PLIST_SUBST+=		IMAGEMAGICK='@comment '
 CONFIGURE_ARGS+=	--disable-imagemagick
 .endif
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index f6eeb6da2b9..f202280c62c 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2008/03/26 02:32:17 tnn Exp $
+# $NetBSD: Makefile,v 1.51 2008/04/12 22:43:08 jlam Exp $
 #
 
 DISTNAME=		vlc-${VLC_VER}
@@ -84,12 +84,10 @@ SUBST_SED.fnt=		-e "s,${ORIGFNT},${DEFAULT_FONT},"
 SUBST_FILES.fnt=	modules/misc/freetype.c
 SUBST_MESSAGE.fnt=	Fixing hardcoded paths.
 
-.if ${OPSYS} == "NetBSD"
-PLIST_SUBST+=		COND_CDDA="@comment "
-PLIST_SUBST+=		COND_VCD="@comment "
-.else
-PLIST_SUBST+=		COND_CDDA=""
-PLIST_SUBST+=		COND_VCD=""
+PLIST_VARS+=		cdda vcd
+.if ${OPSYS} != "NetBSD"
+PLIST.cdda=		yes
+PLIST.vcd=		yes
 .endif
 
 .if ${X11_TYPE} == "modular"
diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST
index 75065aef97a..3f7c7d47d11 100644
--- a/multimedia/vlc/PLIST
+++ b/multimedia/vlc/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.11 2008/03/08 05:19:57 kefren Exp $
-${COND_SKINS}bin/svlc
+@comment $NetBSD: PLIST,v 1.12 2008/04/12 22:43:08 jlam Exp $
+${PLIST.skins}bin/svlc
 bin/vlc
 bin/vlc-config
-${COND_WXWIDGETS}bin/wxvlc
+${PLIST.wxwidgets}bin/wxvlc
 include/vlc/aout.h
 include/vlc/decoder.h
 include/vlc/input.h
@@ -22,12 +22,12 @@ lib/vlc/access/libaccess_http_plugin.so
 lib/vlc/access/libaccess_mms_plugin.so
 lib/vlc/access/libaccess_tcp_plugin.so
 lib/vlc/access/libaccess_udp_plugin.so
-${COND_CDDA}lib/vlc/access/libcddax_plugin.so
+${PLIST.cdda}lib/vlc/access/libcddax_plugin.so
 lib/vlc/access/libcddax_plugin.so
 lib/vlc/access/libdvdnav_plugin.so
 lib/vlc/access/libdvdread_plugin.so
 lib/vlc/access/libscreen_plugin.so
-${COND_VCD}lib/vlc/access/libvcd_plugin.so
+${PLIST.vcd}lib/vlc/access/libvcd_plugin.so
 lib/vlc/access_filter/libaccess_filter_dump_plugin.so
 lib/vlc/access_filter/libaccess_filter_record_plugin.so
 lib/vlc/access_filter/libaccess_filter_timeshift_plugin.so
@@ -68,7 +68,7 @@ lib/vlc/audio_mixer/libspdif_mixer_plugin.so
 lib/vlc/audio_mixer/libtrivial_mixer_plugin.so
 lib/vlc/audio_output/libaout_file_plugin.so
 lib/vlc/audio_output/libaout_sdl_plugin.so
-${COND_ARTS}lib/vlc/audio_output/libarts_plugin.so
+${PLIST.arts}lib/vlc/audio_output/libarts_plugin.so
 lib/vlc/audio_output/liboss_plugin.so
 lib/vlc/codec/liba52_plugin.so
 lib/vlc/codec/libadpcm_plugin.so
@@ -78,7 +78,7 @@ lib/vlc/codec/libcmml_plugin.so
 lib/vlc/codec/libcvdsub_plugin.so
 lib/vlc/codec/libdts_plugin.so
 lib/vlc/codec/libdvbsub_plugin.so
-${COND_FAAD}lib/vlc/codec/libfaad_plugin.so
+${PLIST.faad}lib/vlc/codec/libfaad_plugin.so
 lib/vlc/codec/libfake_plugin.so
 lib/vlc/codec/libflacdec_plugin.so
 lib/vlc/codec/liblibmpeg2_plugin.so
@@ -135,8 +135,8 @@ lib/vlc/demux/libvobsub_plugin.so
 lib/vlc/demux/libvoc_plugin.so
 lib/vlc/demux/libwav_plugin.so
 lib/vlc/demux/libxa_plugin.so
-${COND_SKINS}lib/vlc/gui/libskins2_plugin.so
-${COND_WXWIDGETS}lib/vlc/gui/libwxwidgets_plugin.so
+${PLIST.skins}lib/vlc/gui/libskins2_plugin.so
+${PLIST.wxwidgets}lib/vlc/gui/libwxwidgets_plugin.so
 lib/vlc/libffmpeg.a
 lib/vlc/libi420_rgb_mmx.a
 lib/vlc/libi420_ymga_mmx.a
diff --git a/multimedia/vlc/options.mk b/multimedia/vlc/options.mk
index 6db553ab3ce..a83b5275cf7 100644
--- a/multimedia/vlc/options.mk
+++ b/multimedia/vlc/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2008/03/08 05:19:57 kefren Exp $
+# $NetBSD: options.mk,v 1.6 2008/04/12 22:43:08 jlam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.vlc
 PKG_SUPPORTED_OPTIONS=		skins wxwidgets faad arts
@@ -6,37 +6,35 @@ PKG_SUGGESTED_OPTIONS=		wxwidgets faad
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		${PKG_SUPPORTED_OPTIONS}
+
 .if !empty(PKG_OPTIONS:Mskins)
 CONFIGURE_ARGS+=	--enable-skins2
-PLIST_SUBST+=		COND_SKINS=
+PLIST.skins=		yes
 .else
 CONFIGURE_ARGS+=	--disable-skins2
-PLIST_SUBST+=		COND_SKINS="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mwxwidgets)
 .include "../../x11/wxGTK/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-wxwidgets
-PLIST_SUBST+=		COND_WXWIDGETS=
+PLIST.wxwidgets=	yes
 .else
 CONFIGURE_ARGS+=	--disable-wxwidgets
-PLIST_SUBST+=		COND_WXWIDGETS="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mfaad)
 CONFIGURE_ARGS+=	--enable-faad
-PLIST_SUBST+=		COND_FAAD=
+PLIST.faad=		yes
 .include "../../audio/faad2/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-faad
-PLIST_SUBST+=		COND_FAAD="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Marts)
 CONFIGURE_ARGS+=	--enable-arts
-PLIST_SUBST+=		COND_ARTS=
+PLIST.arts=		yes
 .include "../../audio/arts/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-arts
-PLIST_SUBST+=		COND_ARTS="@comment "
 .endif
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index 02af9d18c5e..98ad3575c4b 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.47 2008/04/10 11:48:58 drochner Exp $
+# $NetBSD: Makefile.common,v 1.48 2008/04/12 22:43:08 jlam Exp $
 #
 
 # used by audio/xine-arts/Makefile
@@ -36,12 +36,11 @@ PKGSRC_MAKE_ENV+=	"mkdir_p"="mkdir -p"
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${X11_TYPE} == "native" && !exists(${X11BASE}/lib/libXv.so)
-PLIST_SUBST+=		HAVE_XV="@comment "
-.else
-.include "../../x11/libXv/buildlink3.mk"
+PLIST_VARS+=		xv
+.if ${X11_TYPE} != "native"
+.  include "../../x11/libXv/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-xv-path='${X11BASE}/lib'
-PLIST_SUBST+=		HAVE_XV=
+PLIST.xv=		yes
 .endif
 
 pre-configure:
diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common
index 4f1d7566f2d..f579d6d5b35 100644
--- a/multimedia/xine-lib/PLIST.common
+++ b/multimedia/xine-lib/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.23 2008/04/10 11:48:58 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.24 2008/04/12 22:43:08 jlam Exp $
 bin/xine-config
 include/xine.h
 include/xine/alphablend.h
@@ -51,8 +51,8 @@ lib/xine/plugins/1.20/post/xineplug_post_planar.a
 lib/xine/plugins/1.20/post/xineplug_post_planar.so
 lib/xine/plugins/1.20/post/xineplug_post_switch.a
 lib/xine/plugins/1.20/post/xineplug_post_switch.so
-${HAVE_XV}lib/xine/plugins/1.20/post/xineplug_post_tvtime.a
-${HAVE_XV}lib/xine/plugins/1.20/post/xineplug_post_tvtime.so
+${PLIST.xv}lib/xine/plugins/1.20/post/xineplug_post_tvtime.a
+${PLIST.xv}lib/xine/plugins/1.20/post/xineplug_post_tvtime.so
 lib/xine/plugins/1.20/post/xineplug_post_visualizations.a
 lib/xine/plugins/1.20/post/xineplug_post_visualizations.so
 lib/xine/plugins/1.20/xineplug_ao_out_file.a
@@ -193,8 +193,8 @@ lib/xine/plugins/1.20/xineplug_vo_out_none.so
 @comment lib/xine/plugins/1.20/xineplug_vo_out_sdl.so
 lib/xine/plugins/1.20/xineplug_vo_out_xshm.a
 lib/xine/plugins/1.20/xineplug_vo_out_xshm.so
-${HAVE_XV}lib/xine/plugins/1.20/xineplug_vo_out_xv.a
-${HAVE_XV}lib/xine/plugins/1.20/xineplug_vo_out_xv.so
+${PLIST.xv}lib/xine/plugins/1.20/xineplug_vo_out_xv.a
+${PLIST.xv}lib/xine/plugins/1.20/xineplug_vo_out_xv.so
 man/man1/xine-config.1
 man/man5/xine.5
 share/aclocal/xine.m4