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

[raphael at macports.org]

Revision: 82212
          http://trac.macports.org/changeset/82212
Author:   raphael at macports.org
Date:     2011-08-10 07:53:04 -0700 (Wed, 10 Aug 2011)
Log Message:
-----------
openvrml:

 * simplify default_variants and handle negative variants
 * remove multiple library dependency on mesa

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

Modified: trunk/dports/graphics/openvrml/Portfile
===================================================================
--- trunk/dports/graphics/openvrml/Portfile	2011-08-10 14:35:57 UTC (rev 82211)
+++ trunk/dports/graphics/openvrml/Portfile	2011-08-10 14:53:04 UTC (rev 82212)
@@ -77,8 +77,7 @@
 
 variant opengl conflicts no_opengl description {Build the OpenGL renderer} {
     # examples need SDL player which needs OpenGL
-    depends_lib-append          port:mesa \
-                                path:lib/pkgconfig/sdl.pc:libsdl
+    depends_lib-append          path:lib/pkgconfig/sdl.pc:libsdl
     configure.args-delete       --disable-gl-renderer \
                                 --disable-examples
 }
@@ -106,7 +105,6 @@
 }
 
 variant x11 conflicts no_x11 {
-    depends_lib-append          port:mesa
     configure.args-delete       --without-x
     configure.args-append       --with-x \
                                 --x-includes=${prefix}/include \
@@ -115,18 +113,22 @@
 
 variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
 
-if {![variant_isset no_x11]} {
-    if {![variant_isset no_opengl]} {
-        default_variants        +x11+opengl
-    } else {
-        default_variants        +x11
-    }
+if {[variant_isset no_x11]} {
+    default_variants -x11
 } else {
-    if {![variant_isset no_opengl]} {
-        default_variants        +opengl
-    }
+    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
+}
+
 livecheck.type                  regex
 livecheck.url                   http://sourceforge.net/projects/${name}/files/
 livecheck.regex                 ${name}-(\[0-9.\]+)\\.tar
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110810/e3450c2d/attachment.html>