[pkgsrc/trunk]: pkgsrc/audio/audacious-plugins Use PLIST_VARS framework.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b6971a1acb7e
branches:  trunk
changeset: 549836:b6971a1acb7e
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Nov 10 11:08:27 2008 +0000

description:
Use PLIST_VARS framework.

diffstat:

 audio/audacious-plugins/Makefile   |  17 ++++++++---------
 audio/audacious-plugins/PLIST      |  17 ++++++++++-------
 audio/audacious-plugins/options.mk |  26 +++++++++++++-------------
 3 files changed, 31 insertions(+), 29 deletions(-)

diffs (171 lines):

diff -r c6bf89676d58 -r b6971a1acb7e audio/audacious-plugins/Makefile
--- a/audio/audacious-plugins/Makefile  Mon Nov 10 11:07:51 2008 +0000
+++ b/audio/audacious-plugins/Makefile  Mon Nov 10 11:08:27 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/10/20 09:32:19 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2008/11/10 11:08:27 wiz Exp $
 #
 
 DISTNAME=              audacious-plugins-1.5.0
@@ -40,22 +40,21 @@
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
+PLIST_VARS+=   oss sun
+
 .if ${OPSYS} == "NetBSD"
 RAWPART_cmd=           /sbin/sysctl -n kern.rawpartition | ${TR} 0-9 a-j
 CONFIGURE_ARGS+=       --with-dev-dsp=${DEVOSSSOUND}                   \
                        --with-cdda-device=/dev/rcd0${RAWPART_cmd:sh}   \
                        --with-cdda-dir=/cdrom/
-PLIST_SUBST+=          OSS=""
-PLIST_SUBST+=          SUN=""
+PLIST.oss=     yes
+PLIST.sun=     yes
 .elif ${OPSYS} == "FreeBSD"
-PLIST_SUBST+=          OSS=""
-PLIST_SUBST+=          SUN="@comment "
+PLIST.oss=     yes
 .elif ${OPSYS} == "DragonFly"
-PLIST_SUBST+=          OSS=""
-PLIST_SUBST+=          SUN="@comment "
+PLIST.oss=     yes
 .elif ${OPSYS} == "SunOS"
-PLIST_SUBST+=          OSS="@comment "
-PLIST_SUBST+=          SUN=""
+PLIST.sun=     yes
 #.elif ${OPSYS} == "Linux"
 #.  include    "../../wip/alsa-lib/buildlink3.mk"
 #PKG_SUPPORTED_OPTIONS+= lirc
diff -r c6bf89676d58 -r b6971a1acb7e audio/audacious-plugins/PLIST
--- a/audio/audacious-plugins/PLIST     Mon Nov 10 11:07:51 2008 +0000
+++ b/audio/audacious-plugins/PLIST     Mon Nov 10 11:08:27 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/10/20 09:32:19 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/11/10 11:08:27 wiz Exp $
 lib/audacious/Container/m3u.so
 lib/audacious/Container/pls.so
 lib/audacious/Container/xspf.so
@@ -23,13 +23,13 @@
 lib/audacious/Input/cuesheet.so
 lib/audacious/Input/demac.so
 lib/audacious/Input/flacng.so
+${PLIST.midi}lib/audacious/Input/libtimidity.so
 lib/audacious/Input/madplug.so
 lib/audacious/Input/metronom.so
 lib/audacious/Input/modplug.so
 lib/audacious/Input/musepack.so
 lib/audacious/Input/sexypsf.so
-${SID}lib/audacious/Input/sid.so
-${MIDI}lib/audacious/Input/libtimidity.so
+${PLIST.sid}lib/audacious/Input/sid.so
 lib/audacious/Input/sndfile.so
 lib/audacious/Input/tonegen.so
 lib/audacious/Input/tta.so
@@ -37,13 +37,13 @@
 lib/audacious/Input/vtx.so
 lib/audacious/Input/wavpack.so
 lib/audacious/Input/wma.so
+${PLIST.esd}lib/audacious/Output/ESD.so
 lib/audacious/Output/OSS.so
 lib/audacious/Output/filewriter.so
-${ESD}lib/audacious/Output/ESD.so
-${JACK}lib/audacious/Output/libjackout.so
+${PLIST.jack}lib/audacious/Output/libjackout.so
+${PLIST.pulse}lib/audacious/Output/libpulse_audio.so
 lib/audacious/Output/null.so
-${PULSE}lib/audacious/Output/libpulse_audio.so
-${SUN}lib/audacious/Output/sun.so
+${PLIST.sun}lib/audacious/Output/sun.so
 lib/audacious/Transport/lastfm.so
 lib/audacious/Transport/mms.so
 lib/audacious/Transport/neon.so
@@ -102,6 +102,8 @@
 share/locale/tr/LC_MESSAGES/audacious-plugins.mo
 @dirrm share/audacious/paranormal/Presets
 @dirrm share/audacious/paranormal
+@comment in audacious: @dirrm share/audacious/images
+@comment in audacious: @dirrm share/audacious
 @dirrm lib/audacious/Visualization
 @dirrm lib/audacious/Transport
 @dirrm lib/audacious/Output
@@ -109,3 +111,4 @@
 @dirrm lib/audacious/General
 @dirrm lib/audacious/Effect
 @dirrm lib/audacious/Container
+@dirrm lib/audacious
diff -r c6bf89676d58 -r b6971a1acb7e audio/audacious-plugins/options.mk
--- a/audio/audacious-plugins/options.mk        Mon Nov 10 11:07:51 2008 +0000
+++ b/audio/audacious-plugins/options.mk        Mon Nov 10 11:08:27 2008 +0000
@@ -1,58 +1,58 @@
-# $NetBSD: options.mk,v 1.2 2008/11/03 06:52:59 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2008/11/10 11:08:27 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.audacious-plugins
 PKG_SUPPORTED_OPTIONS= arts esound inet6 jack midi # pulse sid
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=   sid
 #.if !empty(PKG_OPTIONS:Msid)
 #.  include "../../wip/resid-builder/buildlink3.mk"
-#PLIST_SUBST+=         SID=""
+#PLIST.sid=    yes
 #.else
 #CONFIGURE_ARGS+=      --disable-sid
-#PLIST_SUBST+=         SID="@comment "
 #.endif
 
+PLIST_VARS+=   arts
 .if !empty(PKG_OPTIONS:Marts)
 .  include "../../audio/arts/buildlink3.mk"
-PLIST_SUBST+=          ARTS=""
+PLIST.arts=    yes
 .else
 CONFIGURE_ARGS+=       --disable-arts
-PLIST_SUBST+=          ARTS="@comment "
 .endif
 
+PLIST_VARS+=   esd
 .if !empty(PKG_OPTIONS:Mesound)
 .  include "../../audio/esound/buildlink3.mk"
-PLIST_SUBST+=          ESD=""
+PLIST.esd=     yes
 .else
 CONFIGURE_ARGS+=       --disable-esd
-PLIST_SUBST+=          ESD="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=       --enable-ipv6
 .endif
 
+PLIST_VARS+=   jack
 .if !empty(PKG_OPTIONS:Mjack)
 .  include "../../audio/jack/buildlink3.mk"
-PLIST_SUBST+=          JACK=""
+PLIST.jack=    yes
 .else
 CONFIGURE_ARGS+=       --disable-jack
-PLIST_SUBST+=          JACK="@comment "
 .endif
 
+PLIST_VARS+=   midi
 .if !empty(PKG_OPTIONS:Mmidi)
 BUILD_DEPENDS+=                timidity>=0:../../audio/timidity
-PLIST_SUBST+=          MIDI=""
+PLIST.midi=    yes
 .else
 CONFIGURE_ARGS+=       --disable-timidity
-PLIST_SUBST+=          MIDI="@comment "
 .endif
 
+PLIST_VARS+=   pulse
 #.if !empty(PKG_OPTIONS:Mpulse)
 #.  include "../../wip/pulseaudio/buildlink3.mk"
-#PLIST_SUBST+=         PULSE=""
+#PLIST.pulse=  yes
 #.else
 #CONFIGURE_ARGS+=      --disable-pulse
-#PLIST_SUBST+=         PULSE="@comment "
 #.endif