<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f1e0f3d4c943afa25e82bd21efe85fa2219f0813">https://github.com/macports/macports-ports/commit/f1e0f3d4c943afa25e82bd21efe85fa2219f0813</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f1e0f3d4c943afa25e82bd21efe85fa2219f0813
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Dec 29 21:27:19 2022 -0700

<span style='display:block; white-space:pre;color:#404040;'>    muniversal 1.1 PG: put utility proc in namespace
</span>---
 _resources/port1.0/group/muniversal-1.1.tcl | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

<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 ff9c9d66eca..c81eb0a2935 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;'>@@ -45,15 +45,6 @@ if {[option universal_possible] && [variant_isset universal]} {
</span>     if {${os.platform} eq "darwin" && ${os.major} >= 22} {
         depends_build-append port:diffutils-for-muniversal
     }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    proc muniversal_get_diff_to_use {} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        global prefix os.major os.platform
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {${os.platform} eq "darwin" && ${os.major} >= 22} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-          return "${prefix}/libexec/diffutils/bin/diff"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-          return "/usr/bin/diff"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span> }
 
 # allow `foreach arch ${muniversal.architectures} { ... }` to be used regardless of whether +universal set or not
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,6 +182,15 @@ namespace eval muniversal {}
</span> # internal procedures
 ####################################################################################################################################
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+proc muniversal::muniversal_get_diff_to_use {} {
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+        return "${prefix}/libexec/diffutils/bin/diff"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        return "/usr/bin/diff"
</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;'>+
</span> # a version of `sysctl hw.cpu64bit_capable` that works on older systems
 # see https://trac.macports.org/ticket/25873
 proc muniversal::cpu64bit_capable {} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -441,7 +441,7 @@ proc muniversal::merge {base1 base2 base prefixDir arch1 arch2 merger_dont_diff
</span> 
                             ui_debug "universal: merge: created ${prefixDir}/${fl} to include ${prefixDir}/${arch1}-${fl} ${prefixDir}/${arch1}-${fl}"
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            system "[muniversal_get_diff_to_use] -d ${diffFormat} \"${dir}/${arch1}-${fl}\" \"${dir}/${arch2}-${fl}\" > \"${dir}/${fl}\"; test \$? -le 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            system "[muniversal::muniversal_get_diff_to_use] -d ${diffFormat} \"${dir}/${arch1}-${fl}\" \"${dir}/${arch2}-${fl}\" > \"${dir}/${fl}\"; test \$? -le 1"
</span> 
                             copy -force ${dir1}/${fl} ${dir}/${arch1}-${fl}
                             copy -force ${dir2}/${fl} ${dir}/${arch2}-${fl}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -548,7 +548,7 @@ proc muniversal::merge {base1 base2 base prefixDir arch1 arch2 merger_dont_diff
</span>                                     if { ! [catch {system "test \"`head -c2 ${dir1}/${fl}`\" = '#!'"}] } {
                                         # shell script, hopefully striping out arch flags works...
                                         muniversal::strip_arch_flags ${dir1} ${dir2} ${dir} ${fl}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    } elseif { ! [catch {system "[muniversal_get_diff_to_use] -dw ${diffFormat} \"${dir1}/${fl}\" \"${dir2}/${fl}\" > \"${dir}/${fl}\"; test \$? -le 1"}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    } elseif { ! [catch {system "[muniversal::muniversal_get_diff_to_use] -dw ${diffFormat} \"${dir1}/${fl}\" \"${dir2}/${fl}\" > \"${dir}/${fl}\"; test \$? -le 1"}] } {
</span>                                         # diff worked
                                         ui_debug "universal: merge: used diff to create ${prefixDir}/${fl}"
                                     } else {
</pre><pre style='margin:0'>

</pre>