[51895] trunk/dports/x11/gtk2/Portfile

[toby at macports.org]

Revision: 51895
          http://trac.macports.org/changeset/51895
Author:   toby at macports.org
Date:     2009-06-05 23:02:55 -0700 (Fri, 05 Jun 2009)
Log Message:
-----------
forward compat with universal_sysroot removal

Modified Paths:
--------------
    trunk/dports/x11/gtk2/Portfile

Modified: trunk/dports/x11/gtk2/Portfile
===================================================================
--- trunk/dports/x11/gtk2/Portfile	2009-06-06 05:59:35 UTC (rev 51894)
+++ trunk/dports/x11/gtk2/Portfile	2009-06-06 06:02:55 UTC (rev 51895)
@@ -93,10 +93,14 @@
                 --disable-glibtest
 
 if { [variant_isset universal] } {
-    configure.env-append    CUPS_CONFIG="${configure.universal_sysroot}/usr/bin/cups-config"
+    if {[info exists universal_sysroot]} {
+        configure.env-append    CUPS_CONFIG="${universal_sysroot}/usr/bin/cups-config"
+    } else {
+        configure.env-append    CUPS_CONFIG="/usr/bin/cups-config"
+    }
 
     # cups is not 32/64-bit universal on Tiger. 
-    if { ${universal_sysroot}=="/Developer/SDKs/MacOSX10.4u.sdk" } {
+    if {${os.major} == "8"} {
         set merger_configure_args(ppc64)   --disable-cups
         set merger_configure_args(x86_64)  --disable-cups
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090605/c905980a/attachment-0001.html>