<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/dd834792d8d99abf5949702682664f767e0b5859">https://github.com/macports/macports-ports/commit/dd834792d8d99abf5949702682664f767e0b5859</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit dd834792d8d99abf5949702682664f767e0b5859
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Sep 18 04:23:31 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> xcodeversion pg: cleanup
</span>---
_resources/port1.0/group/xcodeversion-1.0.tcl | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/xcodeversion-1.0.tcl b/_resources/port1.0/group/xcodeversion-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 8529f284d01..f9d59d97052 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/xcodeversion-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/xcodeversion-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,18 +16,17 @@ default minimum_xcodeversions {}
</span>
platform macosx {
pre-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach {darwin_major minimum_xcodeversion} [join ${minimum_xcodeversions}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach {darwin_major minimum_xcodeversion} [concat {*}${minimum_xcodeversions}] {
</span> if {${darwin_major} == ${os.major}} {
if {![info exists xcodeversion] || $xcodeversion eq "none"} {
ui_error "Couldn't determine your Xcode version (from '/usr/bin/xcodebuild -version')."
ui_error ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "On macOS ${macosx_version}, ${name} @${version} requires Xcode ${minimum_xcodeversion} or later but you have none installed."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "On macOS ${macos_version_major}, ${name} @${version} requires Xcode ${minimum_xcodeversion} or later but you have none installed."
</span> ui_error "See https://guide.macports.org/chunked/installing.xcode.html for download links."
ui_error ""
return -code error "unable to find Xcode"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${xcodeversion} ${minimum_xcodeversion}] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "On macOS ${macosx_version}, ${name} @${version} requires Xcode ${minimum_xcodeversion} or later but you have Xcode ${xcodeversion}."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[vercmp ${xcodeversion} ${minimum_xcodeversion}] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "On macOS ${macos_version_major}, ${name} @${version} requires Xcode ${minimum_xcodeversion} or later but you have Xcode ${xcodeversion}."
</span> ui_error "See https://guide.macports.org/chunked/installing.xcode.html for download links."
return -code error "incompatible Xcode version"
}
</pre><pre style='margin:0'>
</pre>