<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/1a750bbfd522f9e2382ea77d985c9d498590462c">https://github.com/macports/macports-ports/commit/1a750bbfd522f9e2382ea77d985c9d498590462c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1a750bbfd522f9e2382ea77d985c9d498590462c
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Jun 8 05:05:58 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> muniversal PG: fix procedure name from version 1.0
</span>---
_resources/port1.0/group/muniversal-1.1.tcl | 4 ++--
1 file changed, 2 insertions(+), 2 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 6ff16fba3be..fd9c120b00c 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;'>@@ -419,7 +419,7 @@ proc muniversal::merge {base1 base2 base prefixDir arch1 arch2 merger_dont_diff
</span> }
*.pc -
*-config {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- mergeStripArchFlags ${dir1} ${dir2} ${dir} ${fl}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ muniversal::strip_arch_flags ${dir1} ${dir2} ${dir} ${fl}
</span> }
*.la {
if {[option destroot.delete_la_files]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -498,7 +498,7 @@ proc muniversal::merge {base1 base2 base prefixDir arch1 arch2 merger_dont_diff
</span> default {
if { ! [catch {system "test \"`head -c2 ${dir1}/${fl}`\" = '#!'"}] } {
# shell script, hopefully striping out arch flags works...
<span style='display:block; white-space:pre;background:#ffe0e0;'>- mergeStripArchFlags ${dir1} ${dir2} ${dir} ${fl}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ muniversal::strip_arch_flags ${dir1} ${dir2} ${dir} ${fl}
</span> } elseif { ! [catch {system "/usr/bin/diff -dw ${diffFormat} \"${dir1}/${fl}\" \"${dir2}/${fl}\" > \"${dir}/${fl}\"; test \$? -le 1"}] } {
# diff worked
ui_debug "universal: merge: used diff to create ${prefixDir}/${fl}"
</pre><pre style='margin:0'>
</pre>