summaryrefslogtreecommitdiff
path: root/audio/moc-devel
diff options
context:
space:
mode:
authorjlam <jlam>2008-04-12 22:42:57 +0000
committerjlam <jlam>2008-04-12 22:42:57 +0000
commit84db467ec7c8386066718011f8d47775d5608811 (patch)
treefdd67c81079412bf94013749a954125434a9baca /audio/moc-devel
parent7082f8c2044621c8641f3c82a2da95c2d442048c (diff)
downloadpkgsrc-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-devel')
-rw-r--r--audio/moc-devel/PLIST10
-rw-r--r--audio/moc-devel/options.mk16
2 files changed, 12 insertions, 14 deletions
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