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 /audio/moc | |
| 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 'audio/moc')
| -rw-r--r-- | audio/moc/PLIST | 10 | ||||
| -rw-r--r-- | audio/moc/options.mk | 16 |
2 files changed, 12 insertions, 14 deletions
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 |