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

[rowue at macports.org]

Revision: 108405
          https://trac.macports.org/changeset/108405
Author:   rowue at macports.org
Date:     2013-07-22 15:53:53 -0700 (Mon, 22 Jul 2013)
Log Message:
-----------
gwyddion:
        fixed license (gpl-2)
        fixed handling of quartz/no_x11

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

Modified: trunk/dports/science/gwyddion/Portfile
===================================================================
--- trunk/dports/science/gwyddion/Portfile	2013-07-22 20:22:02 UTC (rev 108404)
+++ trunk/dports/science/gwyddion/Portfile	2013-07-22 22:53:53 UTC (rev 108405)
@@ -7,7 +7,7 @@
 version             2.31
 categories          science x11
 platforms           darwin
-license             GPL
+license             gpl-2
 revision            3
 maintainers         rowue gwyddion.net:yeti
 description         Software for SPM Analysis
@@ -43,12 +43,8 @@
 	}
 }
 
-variant no_x11 description { Build gwyddion with quartz gl support} {
-	ui_msg "Use of no_x11 is depraced and will be removed - please use quartz instead."
-	platform darwin 12 {
-	    ui_msg "Quartz gl support is currently broken on OS X 10.8"
-	}
-}
+# remove one year (app.) after gwyddion 2.32 sees the light
+variant no_x11 requires quartz description { Legacy compatibility variant } {} 
 
 variant debug description { Enable debugging } {
     configure.cflags-append "-O0 -g"
@@ -56,7 +52,7 @@
 
 post-destroot {
     xinstall -m 755 -d ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS
-    if {[variant_isset no_x11 or variant_isset quartz]} {
+    if {[variant_isset quartz]} {
         xinstall ${filespath}/gwyddion.quartz ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS/gwyddion
         reinplace "s|@PREFIX@|${prefix}|" ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS/gwyddion
     } else {
@@ -78,7 +74,7 @@
 platform darwin 8 {
 	post-activate {
 		if {[file exists ${prefix}/lib/pkgconfig/gl.pc]} {
-            if {![variant_isset no_x11]} {
+            if {![variant_isset quartz]} {
 			    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/20130722/d2a60eb2/attachment.html>