<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/9a1d3d255b28dba7cdba16fe5da2dc6945b3e568">https://github.com/macports/macports-base/commit/9a1d3d255b28dba7cdba16fe5da2dc6945b3e568</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 9a1d3d255 critcl: update macOS version mapping
</span>9a1d3d255 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9a1d3d255b28dba7cdba16fe5da2dc6945b3e568
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Jun 27 02:48:12 2025 +1000
<span style='display:block; white-space:pre;color:#404040;'> critcl: update macOS version mapping
</span>---
vendor/critcl-3.3.1/lib/app-critcl/runtime.tcl | 9 ++++++---
.../critcl-3.3.1/lib/critcl-platform/platform.tcl | 9 ++++++---
vendor/critcl-3.3.1/lib/critcl/Config.in | 9 ++++++---
vendor/patches/critcl/03-macos-vers.patch | 22 ++++++++++++++--------
vendor/patches/critcl/06-default-osxmin.patch | 11 +++++++----
5 files changed, 39 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/critcl-3.3.1/lib/app-critcl/runtime.tcl b/vendor/critcl-3.3.1/lib/app-critcl/runtime.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index e65593490..87a202c1c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/critcl-3.3.1/lib/app-critcl/runtime.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/critcl-3.3.1/lib/app-critcl/runtime.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,9 +118,12 @@ proc ::critcl::runtime::MapPlatform {{mapping {}}} {
</span> set v1 [lindex $v 0]
set v2 [lindex $v 1]
set v3 [lindex $v 2]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Darwin 19 and earlier are macOS 10.x. Darwin 20 and later are macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 11, macOS 12, etc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$v1 >= 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Darwin 19 and earlier are macOS 10.x. Darwin 20-24 are macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 11-15. Darwin 25 is macOS 26.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$v1 >= 25} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ incr v1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set version $v1.$v2.$v3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {$v1 >= 20} {
</span> incr v1 -9
set version $v1.$v2.$v3
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/critcl-3.3.1/lib/critcl-platform/platform.tcl b/vendor/critcl-3.3.1/lib/critcl-platform/platform.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 797b8c888..63c393f53 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/critcl-3.3.1/lib/critcl-platform/platform.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/critcl-3.3.1/lib/critcl-platform/platform.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -183,9 +183,12 @@ proc ::platform::identify {} {
</span> macosx {
set major [lindex [split $tcl_platform(osVersion) .] 0]
if {$major > 8} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Darwin 19 and earlier are macOS 10.x. Darwin 20 and later
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # are macOS 11, macOS 12, etc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$major >= 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Darwin 19 and earlier are macOS 10.x. Darwin 20-24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # are macOS 11-15. Darwin 25 is macOS 26.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$major >= 25} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ incr major
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append plat $major
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {$major >= 20} {
</span> incr major -9
append plat $major
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/critcl-3.3.1/lib/critcl/Config.in b/vendor/critcl-3.3.1/lib/critcl/Config.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 5ec76fd87..a154e1668 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/critcl-3.3.1/lib/critcl/Config.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/critcl-3.3.1/lib/critcl/Config.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,9 +88,12 @@ if {[string match macosx-* $platform]} {
</span> } else {
# use the current platform
set v1 [lindex [split $::tcl_platform(osVersion) .] 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Darwin 19 and earlier are macOS 10.x. Darwin 20 and later are macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 11, macOS 12, etc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$v1 >= 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Darwin 19 and earlier are macOS 10.x. Darwin 20-24 are macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 11-15. Darwin 25 is macOS 26.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$v1 >= 25} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ incr v1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set osxmin ${v1}.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {$v1 >= 20} {
</span> incr v1 -9
set osxmin ${v1}.0
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/patches/critcl/03-macos-vers.patch b/vendor/patches/critcl/03-macos-vers.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index d7a41df0a..73740c9d1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/patches/critcl/03-macos-vers.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/patches/critcl/03-macos-vers.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,19 @@
</span> index e6b9591..e655934 100644
--- lib/app-critcl/runtime.tcl.orig
+++ lib/app-critcl/runtime.tcl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -117,8 +117,16 @@ proc ::critcl::runtime::MapPlatform {{mapping {}}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -117,8 +117,19 @@ proc ::critcl::runtime::MapPlatform {{mapping {}}} {
</span> set v [split $version .]
set v1 [lindex $v 0]
set v2 [lindex $v 1]
- incr v1 -4
- set version 10.$v1.$v2
+ set v3 [lindex $v 2]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Darwin 19 and earlier are macOS 10.x. Darwin 20 and later are macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # 11, macOS 12, etc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if {$v1 >= 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Darwin 19 and earlier are macOS 10.x. Darwin 20-24 are macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # 11-15. Darwin 25 is macOS 26.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if {$v1 >= 25} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ incr v1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set version $v1.$v2.$v3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } elseif {$v1 >= 20} {
</span> + incr v1 -9
+ set version $v1.$v2.$v3
+ } else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,16 +27,19 @@ diff --git a/lib/critcl-platform/platform.tcl b/lib/critcl-platform/platform.tcl
</span> index fbfc535..d2a84b6 100644
--- lib/critcl-platform/platform.tcl.orig
+++ lib/critcl-platform/platform.tcl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -183,9 +183,16 @@ proc ::platform::identify {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -183,9 +183,19 @@ proc ::platform::identify {} {
</span> macosx {
set major [lindex [split $tcl_platform(osVersion) .] 0]
if {$major > 8} {
- incr major -4
- append plat 10.$major
- return "${plat}-${cpu}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Darwin 19 and earlier are macOS 10.x. Darwin 20 and later
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # are macOS 11, macOS 12, etc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if {$major >= 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Darwin 19 and earlier are macOS 10.x. Darwin 20-24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # are macOS 11-15. Darwin 25 is macOS 26.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if {$major >= 25} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ incr major
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ append plat $major
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } elseif {$major >= 20} {
</span> + incr major -9
+ append plat $major
+ } else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/vendor/patches/critcl/06-default-osxmin.patch b/vendor/patches/critcl/06-default-osxmin.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 4c07b7099..8bd388733 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/vendor/patches/critcl/06-default-osxmin.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/vendor/patches/critcl/06-default-osxmin.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,18 @@
</span> --- lib/critcl/Config.in.orig 2025-02-17 00:15:58
+++ lib/critcl/Config.in 2025-02-17 00:27:16
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -85,6 +85,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -85,6 +85,21 @@
</span> set osxmin $::env(osxmin)
} elseif {[info exists ::env(MACOSX_DEPLOYMENT_TARGET)] && $::env(MACOSX_DEPLOYMENT_TARGET) ne ""} {
set osxmin $::env(MACOSX_DEPLOYMENT_TARGET)
+ } else {
+ # use the current platform
+ set v1 [lindex [split $::tcl_platform(osVersion) .] 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Darwin 19 and earlier are macOS 10.x. Darwin 20 and later are macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # 11, macOS 12, etc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if {$v1 >= 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Darwin 19 and earlier are macOS 10.x. Darwin 20-24 are macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # 11-15. Darwin 25 is macOS 26.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if {$v1 >= 25} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ incr v1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set osxmin ${v1}.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } elseif {$v1 >= 20} {
</span> + incr v1 -9
+ set osxmin ${v1}.0
+ } else {
</pre><pre style='margin:0'>
</pre>