[142117] trunk/dports/gnome/gstreamer010-gst-plugins-base/Portfile

[mojca at macports.org]

Revision: 142117
          https://trac.macports.org/changeset/142117
Author:   mojca at macports.org
Date:     2015-11-03 23:48:20 -0800 (Tue, 03 Nov 2015)
Log Message:
-----------
gstreamer010-gst-plugins-base: remove no_x11 no_ogg no_gnome_vfs (#39383)

Modified Paths:
--------------
    trunk/dports/gnome/gstreamer010-gst-plugins-base/Portfile

Modified: trunk/dports/gnome/gstreamer010-gst-plugins-base/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer010-gst-plugins-base/Portfile	2015-11-04 07:39:33 UTC (rev 142116)
+++ trunk/dports/gnome/gstreamer010-gst-plugins-base/Portfile	2015-11-04 07:48:20 UTC (rev 142117)
@@ -62,11 +62,7 @@
     system "touch ${destroot}${prefix}/include/gstreamer-0.10/gst/audio/audio-enumtypes.h"
 }
 
-# legacy variants +no_x11 +no_ogg +no_gnome_vfs may be removed after 5/2015
-
-variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
-
-variant x11 conflicts no_x11 {
+variant x11 {
     depends_lib-append port:xorg-libice \
                        port:xorg-libsm \
                        port:xorg-libXv
@@ -74,40 +70,18 @@
     configure.args-delete --without-x --disable-x --disable-xvideo --disable-xshm
 }
 
-if {[variant_isset no_x11]} {
-    default_variants -x11
-} else {
-    default_variants +x11
-}
-
-variant no_ogg conflicts ogg description {Legacy compatibility variant} {}
-
-variant ogg conflicts no_ogg description {Build with support for libogg, libvorbis, libtheora} {
+variant ogg description {Build with support for libogg, libvorbis, libtheora} {
     depends_lib-append    port:libogg port:libvorbis port:libtheora
     configure.args-delete --disable-ogg --disable-vorbis --disable-theora
 }
 
-if {[variant_isset no_ogg]} {
-    default_variants -ogg
-} else {
-    default_variants +ogg
-}
-
 # users of qt4-x11, which depends on gst-plugins-base but has no use for its
-# deeper gnome-related dependencies may wish to use this variant
-variant no_gnome_vfs conflicts gnome_vfs description {Legacy compatibility variant} {}
-
-variant gnome_vfs conflicts no_gnome_vfs description {Enable gnome-vfs support} {
+# deeper gnome-related dependencies may wish to disable this variant
+variant gnome_vfs description {Enable gnome-vfs support} {
     depends_lib-append    port:gnome-vfs
     configure.args-delete --disable-gnome_vfs
 }
 
-if {[variant_isset no_gnome_vfs]} {
-    default_variants -gnome_vfs
-} else {
-    default_variants +gnome_vfs
-}
-
 variant examples description {Build example programs} {
     PortGroup qt4 1.0
     depends_lib-append port:gtk2
@@ -125,6 +99,8 @@
     configure.args-delete --disable-cdparanoia
 }
 
+default_variants +gnome_vfs +ogg +x11
+
 #-fgcse (from -O2) causes build failures, but -O2 -fno-gcse doesn't seem to work
 if {[string match "*gcc-4.2" ${configure.compiler}]} {
     lappend merger_configure_cflags(i386) -O1 -fexpensive-optimizations
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/e345de11/attachment-0001.html>