[110726] trunk/dports/graphics/openvrml/Portfile

[macsforever2000 at macports.org]

Revision: 110726
          https://trac.macports.org/changeset/110726
Author:   macsforever2000 at macports.org
Date:     2013-09-04 12:39:05 -0700 (Wed, 04 Sep 2013)
Log Message:
-----------
openvrml: Remove legacy no_x11 and no_opengl variants. (#39383)

Modified Paths:
--------------
    trunk/dports/graphics/openvrml/Portfile

Modified: trunk/dports/graphics/openvrml/Portfile
===================================================================
--- trunk/dports/graphics/openvrml/Portfile	2013-09-04 19:11:46 UTC (rev 110725)
+++ trunk/dports/graphics/openvrml/Portfile	2013-09-04 19:39:05 UTC (rev 110726)
@@ -76,15 +76,13 @@
     configure.env-append        JS_CFLAGS="-DXP_UNIX -DJS_THREADSAFE -I${prefix}/include/js"
 }
 
-variant opengl conflicts no_opengl description {Build the OpenGL renderer} {
+variant opengl description {Build the OpenGL renderer} {
     # examples need SDL player which needs OpenGL
     depends_lib-append          path:lib/pkgconfig/sdl.pc:libsdl
     configure.args-delete       --disable-gl-renderer \
                                 --disable-examples
 }
 
-variant no_opengl conflicts opengl description {Legacy compatibility variant} {}
-
 variant xembed requires opengl x11 description {Build the XEmbed control} {
     depends_lib-append          port:gtkglext \
                                 port:dbus-glib
@@ -105,27 +103,15 @@
     destroot.args-append        mozpluginsdir=${prefix}/lib/nsplugins
 }
 
-variant x11 conflicts no_x11 {
+variant x11 {
     configure.args-delete       --without-x
     configure.args-append       --with-x \
                                 --x-includes=${prefix}/include \
                                 --x-libraries=${prefix}/lib
 }
 
-variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
+default_variants +x11 +opengl
 
-if {[variant_isset no_x11]} {
-    default_variants -x11
-} else {
-    default_variants +x11
-}
-
-if {[variant_isset no_opengl]} {
-    default_variants -opengl
-} else {
-    default_variants +opengl
-}
-
 if {[variant_isset x11] || [variant_isset opengl]} {
     depends_lib-append          port:mesa
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130904/59296363/attachment.html>