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

[jeremyhu at macports.org]

Revision: 48116
          http://trac.macports.org/changeset/48116
Author:   jeremyhu at macports.org
Date:     2009-03-14 13:34:49 -0700 (Sat, 14 Mar 2009)
Log Message:
-----------
gwyddion: Don't turn off GL just because you're on Tiger.  Tell the user to use xorg-server.

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

Modified: trunk/dports/science/gwyddion/Portfile
===================================================================
--- trunk/dports/science/gwyddion/Portfile	2009-03-14 19:56:11 UTC (rev 48115)
+++ trunk/dports/science/gwyddion/Portfile	2009-03-14 20:34:49 UTC (rev 48116)
@@ -6,7 +6,7 @@
 name                gwyddion
 version             2.13
 categories          science x11
-revision            1
+revision            2
 platforms           darwin
 maintainers         rowue at macports.org yeti at gwyddion.net
 description         Software for SPM Analysis
@@ -33,19 +33,6 @@
                     --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 description {Using system X11 libraries} {
-    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
@@ -69,3 +56,11 @@
 post-activate {
         system "${prefix}/bin/update-mime-database ${prefix}/share/mime ; true"
 }
+
+platform darwin 8 {
+	post-activate {
+		if {[file exists ${x11prefix}/lib/pkgconfig/x11.pc]} {
+			ui_msg "openGL support currently requires you to use MacPorts' X11 server (xorg-server) rather than Apple's."
+		}
+	}
+}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090314/f3bb05a8/attachment-0001.html>