[140968] users/devans/GNOME-3/stable/dports/gnome/gtk2

[devans at macports.org]

Revision: 140968
          https://trac.macports.org/changeset/140968
Author:   devans at macports.org
Date:     2015-10-06 15:30:41 -0700 (Tue, 06 Oct 2015)
Log Message:
-----------
GNOME-3/stable: gtk2, merge changes from trunk.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/gnome/gtk2/Portfile

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/gnome/gtk2/


Property changes on: users/devans/GNOME-3/stable/dports/gnome/gtk2
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/gtk2:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/rmstonecipher/gnome/gtk2:102363-103172
   + /branches/mld-qt-481/dports/gnome/gtk2:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gtk2:133112-140962
/users/rmstonecipher/gnome/gtk2:102363-103172

Modified: users/devans/GNOME-3/stable/dports/gnome/gtk2/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gtk2/Portfile	2015-10-06 22:28:42 UTC (rev 140967)
+++ users/devans/GNOME-3/stable/dports/gnome/gtk2/Portfile	2015-10-06 22:30:41 UTC (rev 140968)
@@ -142,7 +142,14 @@
     configure.env-append CUPS_CONFIG=${cups}
 
     # Find architectures which will not run on build platform.
-    set cpu64bit_capable [sysctl hw.cpu64bit_capable]
+    if {${os.major} >= 9} {
+        set cpu64bit_capable [sysctl hw.cpu64bit_capable]
+    } elseif {(![catch {sysctl hw.optional.x86_64} is_x86_64] && $is_x86_64)
+            || (![catch {sysctl hw.optional.64bitops} is_ppc64] && $is_ppc64)} {
+        set cpu64bit_capable 1
+    } else {
+        set cpu64bit_capable 0
+    }
     if {${os.arch} eq "i386"} {
         set cross_archs ppc64
         if {${os.major} >= 10} {
@@ -200,8 +207,8 @@
         if {${os.arch} eq "i386"} {
             set host i686
         }
-        eval reinplace s/@host@/${host}-apple-darwin${os.version}/ \
-            [glob -directory ${worksrcpath} *.pc.in]
+        reinplace s/@host@/${host}-apple-darwin${os.version}/ \
+            {*}[glob -directory ${worksrcpath} *.pc.in]
     }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151006/104209e7/attachment.html>