<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/256aa13aac9bb131ccd3b6712bbab89208a61c96">https://github.com/macports/macports-ports/commit/256aa13aac9bb131ccd3b6712bbab89208a61c96</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 256aa13aac9 muniversal diff fix: use os.major
</span>256aa13aac9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 256aa13aac9bb131ccd3b6712bbab89208a61c96
</span>Author: kencu <ken.cunningham.webuse@gmail.com>
AuthorDate: Sun Nov 13 07:36:08 2022 -0800
<span style='display:block; white-space:pre;color:#404040;'> muniversal diff fix: use os.major
</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/66240
</span>---
_resources/port1.0/group/muniversal-1.0.tcl | 6 +++---
_resources/port1.0/group/muniversal-1.1.tcl | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/muniversal-1.0.tcl b/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 50f702462af..ccec98b5382 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,13 +33,13 @@ default merger_no_3_archs no
</span> default merger_arch_flag yes
default merger_arch_compiler no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.version} >= 22} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} >= 22} {
</span> depends_build-append port:diffutils-for-muniversal
}
proc muniversal_get_diff_to_use {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global prefix os.version os.platform
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${os.version} >= 22} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global prefix os.platform os.major
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} >= 22} {
</span> return "${prefix}/libexec/diffutils/bin/diff"
} else {
return "/usr/bin/diff"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/muniversal-1.1.tcl b/_resources/port1.0/group/muniversal-1.1.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index aaf5117cb8b..6a18b080fad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/muniversal-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/muniversal-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,13 +41,13 @@ default muniversal.dont_diff {}
</span> # utilites
##########################################################################################
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.version} >= 22} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} >= 22} {
</span> depends_build-append port:diffutils-for-muniversal
}
proc muniversal_get_diff_to_use {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global prefix os.version os.platform
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${os.version} >= 22} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global prefix os.major os.platform
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} >= 22} {
</span> return "${prefix}/libexec/diffutils/bin/diff"
} else {
return "/usr/bin/diff"
</pre><pre style='margin:0'>
</pre>