<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/ab736324598df973308d48d5e24b92ffbc53ffcd">https://github.com/macports/macports-ports/commit/ab736324598df973308d48d5e24b92ffbc53ffcd</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ab736324598 MacPorts port: correctly format major macOS version
</span>ab736324598 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ab736324598df973308d48d5e24b92ffbc53ffcd
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Oct 30 22:37:52 2023 +1100
<span style='display:block; white-space:pre;color:#404040;'> MacPorts port: correctly format major macOS version
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/66688
</span>---
sysutils/MacPorts/Portfile | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/MacPorts/Portfile b/sysutils/MacPorts/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8a60058b69b..af443983241 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/MacPorts/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/MacPorts/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,7 +91,13 @@ pre-pkg {
</span> if {${os.major} < 11 || ${os.major} >= 20} {
reinplace "s|is built|contains a Universal installer|" ${resources_lang}/ReadMe.rtf
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__XVERS__|${macosx_deployment_target}|" ${resources_lang}/ReadMe.rtf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $macosx_deployment_target >= 11]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mdt_major [lindex [split $macosx_deployment_target .] 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mdt_major $macosx_deployment_target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__XVERS__|${mdt_major}|" ${resources_lang}/ReadMe.rtf
</span> if {${package.flat}} {
file copy -force -- ${worksrcpath}/portmgr/dmg/Distribution ${workpath}
file attributes ${workpath}/Distribution -permissions 0644
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,7 +109,7 @@ pre-pkg {
</span> default {set xcode_cli "Command Line Tools or UNIX Development"}
}
reinplace "s|__XCODECLITOOLS__|${xcode_cli}|g" ${workpath}/Distribution
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__XVERS__|${macosx_deployment_target}|" ${workpath}/Distribution
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|__XVERS__|$mdt_major|" ${workpath}/Distribution
</span> if {[vercmp $macosx_deployment_target 11] >= 0} {
set next_major [expr {[lindex [split $macosx_deployment_target .] 0]+1}].0
set hostArchs { hostArchitectures="arm64,x86_64"}
</pre><pre style='margin:0'>
</pre>