[92209] trunk/dports/devel/cctools-headers/Portfile

[jeremyhu at macports.org]

Revision: 92209
          https://trac.macports.org/changeset/92209
Author:   jeremyhu at macports.org
Date:     2012-04-21 17:12:06 -0700 (Sat, 21 Apr 2012)
Log Message:
-----------
cctools-headers: Provide the latest versions of headers across all OS versions

Modified Paths:
--------------
    trunk/dports/devel/cctools-headers/Portfile

Modified: trunk/dports/devel/cctools-headers/Portfile
===================================================================
--- trunk/dports/devel/cctools-headers/Portfile	2012-04-21 23:35:57 UTC (rev 92208)
+++ trunk/dports/devel/cctools-headers/Portfile	2012-04-22 00:12:06 UTC (rev 92209)
@@ -3,7 +3,8 @@
 PortSystem              1.0
 name                    cctools-headers
 version                 822
-revision                1
+revision                2
+set xnu_headers_version 1699.24.8
 categories              devel
 platforms               darwin
 maintainers             mfeiri jeremyhu openmaintainer
@@ -13,27 +14,19 @@
                         and Darwin. Similar to binutils on other platforms.
 
 homepage                http://opensource.apple.com/source/cctools/
-master_sites            http://opensource.apple.com/tarballs/cctools/
+master_sites            http://opensource.apple.com/tarballs/cctools/:cctools \
+                        http://opensource.apple.com/tarballs/xnu/:xnu
 
 distname                cctools-${version}
+distfiles               cctools-${version}.tar.gz:cctools xnu-${xnu_headers_version}.tar.gz:xnu
 
-checksums               rmd160  1caf207acbf421cdc975926a392fc75dc1d2594c \
-                        sha256  dfaa9bdbd023524d47429674f64d2d5ea393123dabf90868be0aa17f61f45289
+checksums               cctools-${version}.tar.gz \
+                        rmd160  1caf207acbf421cdc975926a392fc75dc1d2594c \
+                        sha256  dfaa9bdbd023524d47429674f64d2d5ea393123dabf90868be0aa17f61f45289 \
+                        xnu-${xnu_headers_version}.tar.gz \
+                        rmd160  18051c3cb9fca5cecc966306d76b91310bf1e9ff \
+                        sha256  4268ce69799db51f1b48e400b6fa6a7041b266a1a5404034398aa51b7084b269
 
-if {${os.arch} == "powerpc"} {
-    version             698.1
-    revision            1
-    distname            cctools-${version}
-    checksums           rmd160  898c7b46869d4989c115420912fdd8d96ae923d3 \
-                        sha256  383f1c0c78a2b3efdfdf7ce01adb7e2f8ee9985164dba6ab1c0fae800a211cec
-} elseif {${os.major} == 8} {
-    version             806
-    revision            1
-    distname            cctools-${version}
-    checksums           rmd160  91c0a3f192f1eed60b64ef5a0a06918d0ce0b0c9 \
-                        sha256  6116c06920112c634f6df2fa8b2f171ee3b90ff2176137da5856336695a6a676
-}
-
 supported_archs         noarch
 universal_variant       no
 use_configure           no
@@ -46,9 +39,12 @@
     file rename -force ${destroot}${prefix}/usr/include ${destroot}${prefix}/
     file delete -force ${destroot}${prefix}/usr
 
-    # These are provided by xnu's installhdrs, but that brings in way more
-    # than we want in MacPorts, so get these headers from cctools instead
-    system "ditto ${worksrcpath}/include/mach ${destroot}${prefix}/include/mach"
+    # cctools has older versions of the mach headers, so we get more recent
+    # versions from xnu.  Note that machine/vm_types.h is still obtained
+    # from the HOST SDK.  This just provides updated macros for new
+    # architecture types.
+    xinstall -d -m 755 ${destroot}${prefix}/include/mach
+    xinstall -m 644 ${workpath}/xnu-${xnu_headers_version}/osfmk/mach/machine.h ${destroot}${prefix}/include/mach
 }
 
 livecheck.type          regex
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120421/3aa6720b/attachment.html>