[117043] trunk/dports/devel
mfeiri at macports.org
mfeiri at macports.org
Thu Feb 13 13:28:21 PST 2014
Revision: 117043
https://trac.macports.org/changeset/117043
Author: mfeiri at macports.org
Date: 2014-02-13 13:28:21 -0800 (Thu, 13 Feb 2014)
Log Message:
-----------
xnu-headers,libc-headers,libm-headers: move to ${prefix}/Developer/SDKs/Darwin${os.major}.sdk, #39605
Modified Paths:
--------------
trunk/dports/devel/libc-headers/Portfile
trunk/dports/devel/libm-headers/Portfile
trunk/dports/devel/xnu-headers/Portfile
Modified: trunk/dports/devel/libc-headers/Portfile
===================================================================
--- trunk/dports/devel/libc-headers/Portfile 2014-02-13 20:19:13 UTC (rev 117042)
+++ trunk/dports/devel/libc-headers/Portfile 2014-02-13 21:28:21 UTC (rev 117043)
@@ -2,7 +2,7 @@
PortSystem 1.0
name libc-headers
-revision 1
+revision 2
version 997.1.1
categories devel
platforms macosx
@@ -20,7 +20,6 @@
checksums rmd160 a6d0700f16e564b99ec3886f361088404d9820bc \
sha256 2a93e74078d43c28ea1986b9f08ffebc49c92f9c6a38e32b69574949e4ba687b
-conflicts libpftputil
depends_build path:bin/unifdef:developer_cmds
use_configure no
@@ -28,18 +27,9 @@
build {}
destroot.target installhdrs
-destroot.destdir DESTDIR=${destroot}${prefix}
+destroot.destdir DESTDIR=${destroot}${prefix}/Developer/SDKs/Darwin${os.major}.sdk
-post-destroot {
- # instead of extensive rewrites of the darwin <12 installation scripts
- if [file exists ${destroot}${prefix}/usr/include] {
- file rename -force ${destroot}${prefix}/usr/include ${destroot}${prefix}/
- }
- file delete -force ${destroot}${prefix}/usr
- file delete -force ${destroot}${prefix}/System
-}
-
platform darwin 9 {
version 498.1.7
distname Libc-${version}
@@ -76,22 +66,15 @@
sha256 8ef12ebf437227bbe2f6661ef14c6465fa962c84d052b233ab943f516a0c5d77
pre-destroot {
- #file mkdir ${destroot}${prefix}/Developer/SDKs/Darwin${os.major}.sdk/usr/local
- reinplace "s|/System/Library|/Library|g" ${worksrcpath}/xcodescripts/headers.sh
- reinplace "s|/usr||g" ${worksrcpath}/xcodescripts/manpages.sh
file attributes ${worksrcpath}/xcodescripts/headers.sh -permissions +x
file attributes ${worksrcpath}/xcodescripts/manpages.sh -permissions +x
}
destroot.env ARCHS=${build_arch} PLATFORM_NAME=${platforms} \
- DSTROOT=${destroot}${prefix} DERIVED_FILES_DIR=${workpath} \
- SRCROOT=${worksrcpath} PUBLIC_HEADERS_FOLDER_PATH=/include \
- PRIVATE_HEADERS_FOLDER_PATH=/include
-#
-# DSTROOT=${destroot}${prefix}/Developer/SDKs/Darwin${os.major}.sdk \
-# DERIVED_FILES_DIR=${workpath} SRCROOT=${worksrcpath} \
-# PUBLIC_HEADERS_FOLDER_PATH=/usr/include \
-# PRIVATE_HEADERS_FOLDER_PATH=/usr/local/include
+ DSTROOT=${destroot}${prefix}/Developer/SDKs/Darwin${os.major}.sdk \
+ DERIVED_FILES_DIR=${workpath} SRCROOT=${worksrcpath} \
+ PUBLIC_HEADERS_FOLDER_PATH=/usr/include \
+ PRIVATE_HEADERS_FOLDER_PATH=/usr/local/include
destroot.cmd "./xcodescripts/headers.sh && ./xcodescripts/manpages.sh"
}
@@ -99,22 +82,15 @@
platform darwin 13 {
pre-destroot {
- #file mkdir ${destroot}${prefix}/Developer/SDKs/Darwin${os.major}.sdk/usr/local
- reinplace "s|/System/Library|/Library|g" ${worksrcpath}/xcodescripts/headers.sh
- reinplace "s|/usr||g" ${worksrcpath}/xcodescripts/manpages.sh
file attributes ${worksrcpath}/xcodescripts/headers.sh -permissions +x
file attributes ${worksrcpath}/xcodescripts/manpages.sh -permissions +x
}
destroot.env ARCHS=${build_arch} PLATFORM_NAME=${platforms} \
- DSTROOT=${destroot}${prefix} DERIVED_FILES_DIR=${workpath} \
- SRCROOT=${worksrcpath} PUBLIC_HEADERS_FOLDER_PATH=/include \
- PRIVATE_HEADERS_FOLDER_PATH=/include
-#
-# DSTROOT=${destroot}${prefix}/Developer/SDKs/Darwin${os.major}.sdk \
-# DERIVED_FILES_DIR=${workpath} SRCROOT=${worksrcpath} \
-# PUBLIC_HEADERS_FOLDER_PATH=/usr/include \
-# PRIVATE_HEADERS_FOLDER_PATH=/usr/local/include
+ DSTROOT=${destroot}${prefix}/Developer/SDKs/Darwin${os.major}.sdk \
+ DERIVED_FILES_DIR=${workpath} SRCROOT=${worksrcpath} \
+ PUBLIC_HEADERS_FOLDER_PATH=/usr/include \
+ PRIVATE_HEADERS_FOLDER_PATH=/usr/local/include
destroot.cmd "./xcodescripts/headers.sh && ./xcodescripts/manpages.sh"
}
Modified: trunk/dports/devel/libm-headers/Portfile
===================================================================
--- trunk/dports/devel/libm-headers/Portfile 2014-02-13 20:19:13 UTC (rev 117042)
+++ trunk/dports/devel/libm-headers/Portfile 2014-02-13 21:28:21 UTC (rev 117043)
@@ -5,6 +5,7 @@
name libm-headers
version 2026
+revision 1
categories devel
maintainers mfeiri openmaintainer
supported_archs noarch
@@ -22,7 +23,7 @@
sha256 876a4fbce9818c2d508a066a14f38f565ff3ef23ab42a69df77b4bf1a2404d0b
xcode.target InstallHeaders
-xcode.destroot.settings PUBLIC_HEADERS_FOLDER_PATH=${prefix}/include
+xcode.destroot.settings PUBLIC_HEADERS_FOLDER_PATH=${prefix}/Developer/SDKs/Darwin${os.major}.sdk/usr/include
platform darwin 9 {
version 292.4
Modified: trunk/dports/devel/xnu-headers/Portfile
===================================================================
--- trunk/dports/devel/xnu-headers/Portfile 2014-02-13 20:19:13 UTC (rev 117042)
+++ trunk/dports/devel/xnu-headers/Portfile 2014-02-13 21:28:21 UTC (rev 117043)
@@ -4,11 +4,11 @@
PortSystem 1.0
name xnu-headers
version 2422.1.72
+revision 1
categories devel
platforms darwin
maintainers mfeiri openmaintainer
license APSL BSD
-conflicts poll-emulator
description X is Not Unix (XNU) kernel headers
long_description Header files for the XNU kernel used in \
@@ -27,16 +27,12 @@
build {}
destroot.target installhdrs
-destroot.args DSTROOT=${destroot}${prefix}
+destroot.args DSTROOT=${destroot}${prefix}/Developer/SDKs/Darwin${os.major}.sdk
variant universal {
destroot.env-append RC_ARCHS='${configure.universal_archs}'
}
-post-destroot {
- file rename -force ${destroot}${prefix}/usr/include ${destroot}${prefix}/
- file rename -force ${destroot}${prefix}/System/Library/Frameworks ${destroot}${prefix}/Library/
-}
platform darwin 9 {
version 1228.15.4
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140213/abe237da/attachment-0001.html>
More information about the macports-changes
mailing list