diff options
author | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
---|---|---|
committer | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
commit | 84db467ec7c8386066718011f8d47775d5608811 (patch) | |
tree | fdd67c81079412bf94013749a954125434a9baca /multimedia/vlc | |
parent | 7082f8c2044621c8641f3c82a2da95c2d442048c (diff) | |
download | pkgsrc-84db467ec7c8386066718011f8d47775d5608811.tar.gz |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'multimedia/vlc')
-rw-r--r-- | multimedia/vlc/Makefile | 12 | ||||
-rw-r--r-- | multimedia/vlc/PLIST | 18 | ||||
-rw-r--r-- | multimedia/vlc/options.mk | 16 |
3 files changed, 21 insertions, 25 deletions
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 |