<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4fe45f091bc3e674f4df0deb9d7f769ddcdef65b">https://github.com/macports/macports-ports/commit/4fe45f091bc3e674f4df0deb9d7f769ddcdef65b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4fe45f091bc3e674f4df0deb9d7f769ddcdef65b
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Mar 14 21:33:52 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> MacOSX.sdk: Allow Apple CDN paths to be used
</span>---
devel/MacOSX.sdk/Portfile | 42 +++++++++++++++++++++++++++++++++---------
1 file changed, 33 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/MacOSX.sdk/Portfile b/devel/MacOSX.sdk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ced4e3021aa..a5d8cd38c6c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/MacOSX.sdk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/MacOSX.sdk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,13 +28,29 @@ switch ${os.arch} {
</span> }
homepage https://developer.apple.com/macos/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default master_sites {https://download.developer.apple.com/Developer_Tools/${master_sites.mirror_subdir}}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default master_sites.mirror_subdir \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {${distname}}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.suffix .dmg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options cdn_path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default cdn_path {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default distname {[expr {${cdn_path} eq {} ? "${name}-${version}" : [file rootname [file tail ${cdn_path}]]}]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default dist_subdir {[expr {${cdn_path} eq {} ? ${name} : "${name}/${version}"}]}
</span>
options extract_paths
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default extract_paths {"Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${sdk_major}.sdk"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default extract_paths {[expr {${cdn_path} eq {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ? "Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${sdk_major}.sdk"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : "Library/Developer/CommandLineTools/SDKs/MacOSX${sdk_major}.sdk"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default extract.suffix {[expr {${cdn_path} eq {} ? ".dmg" : [file extension ${cdn_path}]}]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default master_sites {[expr {${cdn_path} eq {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ? "https://download.developer.apple.com/Developer_Tools/${master_sites.mirror_subdir}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : "https://swcdn.apple.com/content/downloads/${master_sites.mirror_subdir}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default master_sites.mirror_subdir \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {[expr {${cdn_path} eq {} ? ${distname} : [file dirname ${cdn_path}]}]}
</span>
options xar_file
default xar_file {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,6 +143,7 @@ subport MacOSX10.13.sdk {
</span> # 10.13.1-17B41 187514526 2019-11-01 Command_Line_Tools_macOS_10.12_for_Xcode_9.1.dmg
# 10.13.1-17B41 182201735 2019-11-01 Command_Line_Tools_macOS_10.13_for_Xcode_9.1.dmg
# 10.13.1-17B41 5442909430 2019-11-01 Xcode_9.1.xip
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# 10.13.2-17C76 28071275 2017-11-17 33/36/041-90419-A_7JJ4H9ZHO2/xs88ob5wjz6riz7g6764twblnvksusg4ps/CLTools_SDK_macOS1013.pkg
</span> # 10.13.2-17C76 187629224 2019-11-01 Command_Line_Tools_macOS_10.12_for_Xcode_9.2.dmg
# 10.13.2-17C76 182316425 2019-11-01 Command_Line_Tools_macOS_10.13_for_Xcode_9.2.dmg
# 10.13.2-17C76 5478692088 2019-11-01 Xcode_9.2.xip
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -155,6 +172,7 @@ subport MacOSX10.12.sdk {
</span> # SDK Size Date File Notes
# 10.12-16A300 4415370488 2019-11-08 Xcode_8.xip
# 10.12.1-16B2649 4446762222 2019-11-08 Xcode_8.1.xip
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# 10.12.2-16C58 27030882 2016-12-05 22/62/041-88607/wg8avdk0jo75k9a13gentz9stwqgrqmcv6/CLTools_SDK_OSX1012.pkg
</span> # 10.12.2-16C58 154679192 2019-11-08 Command_Line_Tools_macOS_10.11_for_Xcode_8.2.dmg
# 10.12.2-16C58 154863510 2019-11-08 Command_Line_Tools_macOS_10.12_for_Xcode_8.2.dmg
# 10.12.2-16C58 4526912760 2019-11-08 Xcode_8.2.xip
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -328,7 +346,7 @@ subport MacOSX10.6.sdk {
</span>
pre-fetch {
foreach distfile ${distfiles} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file isfile ${distpath}/${distfile}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${cdn_path} eq {} && ![file isfile ${distpath}/${distfile}]} {
</span> ui_error "This port cannot download the needed files automatically."
ui_error "Please log in to your Apple Developer account at:"
ui_error ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -403,9 +421,15 @@ if {${subport} eq ${name}} {
</span>
set distfile [lindex ${extract.only} 0]
set ext [file extension ${distfile}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${ext} eq ".xip"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xar_file ${distfile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xar_payload Content
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch ${ext} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .pkg {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xar_file ${distfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xar_payload Payload
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .xip {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xar_file ${distfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xar_payload Content
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {${xar_file} ne ""} {
# /usr/bin/xar does not support -O / --to-stdout
</pre><pre style='margin:0'>
</pre>