[99335] trunk/dports/audio/mpd/Portfile

[rmstonecipher at macports.org]

Revision: 99335
          http://trac.macports.org//changeset/99335
Author:   rmstonecipher at macports.org
Date:     2012-11-01 19:57:13 -0700 (Thu, 01 Nov 2012)
Log Message:
-----------
audio/mpd grouped mp3 decoder choices into mutually-exclusive variants, force-disabled jack (an undesired dependency enabled by default if detected)

Modified Paths:
--------------
    trunk/dports/audio/mpd/Portfile

Modified: trunk/dports/audio/mpd/Portfile
===================================================================
--- trunk/dports/audio/mpd/Portfile	2012-11-02 02:31:49 UTC (rev 99334)
+++ trunk/dports/audio/mpd/Portfile	2012-11-02 02:57:13 UTC (rev 99335)
@@ -33,7 +33,6 @@
     port:libcue \
     port:libiconv \
     port:libid3tag \
-    port:libmad \
     port:libmpcdec \
     port:libogg \
     port:libvorbis \
@@ -43,10 +42,9 @@
 configure.args \
     --mandir=${prefix}/share/man \
     --disable-ffmpeg \
-    --enable-mad \
+    --disable-jack \
     --enable-ao \
-    --enable-lastfm \
-    --disable-mpg123
+    --enable-lastfm
 configure.cflags-append -I${prefix}/include
 variant ffmpeg description {Support for myriad formats via ffmpeg} {
     depends_lib-append	path:lib/libavcodec.dylib:ffmpeg
@@ -60,12 +58,15 @@
     depends_lib-append    port:libmodplug
     configure.args-append --enable-modplug
 }
-variant mpg123 description {Use mpg123 rather than mad as mp3 deconding library} {
-    depends_lib-delete    port:libmad
+variant mpg123 conflicts mad description {Use mpg123 rather than mad as mp3 deconding library} {
     depends_lib-append    port:mpg123
-    configure.args-delete --enable-mad --disable-mpg123
     configure.args-append --enable-mpg123 --disable-mad
 }
+variant mad conflicts mpg123 description (Use mad rather than mpg123 as mp3 decoding library} {
+    depends_lib-append      port:libmad
+    configure.args-append   --enable-mad --disable-mpg123
+}
+default_variants    mad
 platform macosx {
     configure.args-delete --enable-ao
     depends_lib-delete    port:libao
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121101/cf841e2f/attachment.html>