Changeset 99335

Timestamp:

Nov 2, 2012, 2:57:13 AM (12 years ago)

Author:

rmstonecipher@…

Message:

audio/mpd grouped mp3 decoder choices into mutually-exclusive variants, force-disabled jack (an undesired dependency enabled by default if detected)

File:

• trunk/dports/audio/mpd/Portfile (modified) (3 diffs)

trunk/dports/audio/mpd/Portfile

@@ -34 +34 @@
     port:libiconv \
     port:libid3tag \
-    port:libmad \
     port:libmpcdec \
     port:libogg \
@@ -44 +43 @@
     --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} {
@@ -61 +59 @@
     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