Changeset 82194

Timestamp:

08/10/11 03:13:54 (4 years ago)

Author:

raphael@…

Message:

openvrml:

• fix build with boost 1.47.0 by applying upstream patch; see #30689
• replace no_x11 and no_opengl variant

Location:

trunk/dports/graphics/openvrml

Files:

• Portfile (modified) (6 diffs)
• files (added)
• files/patch-scopeexit.diff (added)

trunk/dports/graphics/openvrml/Portfile

@@ -29 +29 @@
                         port:jpeg \
                         port:fontconfig \
-                        port:mesa \
                         port:libxml2 \
                         port:zlib \
                         port:libiconv \
-                        path:lib/pkgconfig/sdl.pc:libsdl \
                         path:bin/glibtool:libtool
 depends_build           port:pkgconfig
 
 minimum_xcodeversions   {9 3.1}
+
+patchfiles              patch-scopeexit.diff
 
 configure.args          --disable-script-node-javascript \
@@ -44 +44 @@
                         --disable-player \
                         --disable-mozilla-plugin \
-                        --with-x \
-                        --x-includes=${prefix}/include \
-                        --x-libraries=${prefix}/lib
+                        --without-x \
+                        --disable-gl-renderer \
+                        --disable-examples
 configure.ldflags-append    -lboost_system-mt
 
@@ -61 +61 @@
 }
 
-variant js_mozilla conflicts no_x11 description {Enable support for JavaScript in the Script node with Mozilla} {
+variant js_mozilla requires x11 description {Enable support for JavaScript in the Script node with Mozilla} {
     depends_lib-append          path:lib/xulrunner/libxul.dylib:xulrunner
     configure.args-delete       --disable-script-node-javascript
@@ -76 +76 @@
 }
 
-variant no_opengl conflicts xembed description {Do not build the GL renderer} {
+variant opengl conflicts no_opengl description {Build the OpenGL renderer} {
     # examples need SDL player which needs OpenGL
-    depends_lib-delete          port:mesa \
+    depends_lib-append          port:mesa \
                                 path:lib/pkgconfig/sdl.pc:libsdl
-    configure.args-append       --disable-gl-renderer \
+    configure.args-delete       --disable-gl-renderer \
                                 --disable-examples
 }
 
-variant xembed conflicts no_opengl no_x11 description {Build the XEmbed control} {
+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
@@ -96 +98 @@
 }
 
-variant mozilla_plugin requires xembed conflicts no_x11 description {Build the Mozilla plug-in} {
+variant mozilla_plugin requires xembed description {Build the Mozilla plug-in} {
     depends_lib-append          path:lib/xulrunner/libxul.dylib:xulrunner
     configure.args-delete       --disable-mozilla-plugin
@@ -104 +106 @@
 }
 
-variant no_x11 conflicts js_mozilla mozilla_plugin {
-    depends_lib-delete          port:mesa
-    configure.args-delete       --with-x \
+variant x11 conflicts no_x11 {
+    depends_lib-append          port:mesa
+    configure.args-delete       --without-x
+    configure.args-append       --with-x \
                                 --x-includes=${prefix}/include \
                                 --x-libraries=${prefix}/lib
-    configure.args-append       --without-x
+}
+
+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
+    }
+} else {
+    if {![variant_isset no_opengl]} {
+        default_variants        +opengl
+    }
 }