[48111] trunk/dports/science/gwyddion/Portfile

[rowue at macports.org]

Revision: 48111
          http://trac.macports.org/changeset/48111
Author:   rowue at macports.org
Date:     2009-03-14 11:15:31 -0700 (Sat, 14 Mar 2009)
Log Message:
-----------
Removed gl for use on tiger if system_x11 is not set - see #13517

Modified Paths:
--------------
    trunk/dports/science/gwyddion/Portfile

Modified: trunk/dports/science/gwyddion/Portfile
===================================================================
--- trunk/dports/science/gwyddion/Portfile	2009-03-14 17:52:41 UTC (rev 48110)
+++ trunk/dports/science/gwyddion/Portfile	2009-03-14 18:15:31 UTC (rev 48111)
@@ -6,6 +6,7 @@
 name                gwyddion
 version             2.13
 categories          science x11
+revision            1
 platforms           darwin
 maintainers         rowue at macports.org yeti at gwyddion.net
 description         Software for SPM Analysis
@@ -28,18 +29,32 @@
                     port:fftw-3 \
                     port:gtkglext
 
-configure.args      --disable-desktop-file-update
+configure.args      --disable-desktop-file-update \
+                    --x-include=${prefix}/include \
+                    --x-lib=${prefix}/lib
 
+
+platform darwin 8 {
+    if {![variant_isset system_x11]} {
+        ui_msg "openGL support disabled - use variant system_x11 to enable it"
+        depends_lib-delete      port:gtkglext
+        configure.args-append   --without-gl
+    }
+}
+
+variant system_x11 {
+    default_variants    +system_x11
+}
+
 # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
 # This block helps us link correctly and setup our pc files correctly when we
 # are +system_x11 and x11prefix is somewhere non-standard and should cause
 # AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
-configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
 if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
-    pre-configure {
-        configure.cppflags-append -I${x11prefix}/include
-        configure.ldflags-append  -L${x11prefix}/lib
-    }
+     pre-configure {
+         configure.cppflags-append -I${x11prefix}/include
+         configure.ldflags-append  -L${x11prefix}/lib
+     }
 
     # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11
     post-destroot {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090314/657f60d1/attachment-0001.html>