Changeset 82212

Timestamp:

08/10/11 07:53:04 (4 years ago)

Author:

raphael@…

Message:

openvrml:

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

File:

• trunk/dports/graphics/openvrml/Portfile (modified) (3 diffs)

trunk/dports/graphics/openvrml/Portfile

@@ -78 +78 @@
 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
@@ -107 +106 @@
 
 variant x11 conflicts no_x11 {
-    depends_lib-append          port:mesa
     configure.args-delete       --without-x
     configure.args-append       --with-x \
@@ -116 +114 @@
 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
 }