Ticket #66163: patch-muniversal-ventura.diff

/opt/local/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/_resources/port1.0/group/muniversal-1.1.tcl

@@ -347 +347 @@
 
 # merge ${base1}/${prefixDir} and ${base2}/${prefixDir} into dir ${base}/${prefixDir}
 #        arch1, arch2: names to prepend to files if a diff merge of two files is forbidden by merger_dont_diff
-#    merger_dont_diff: list of files for which /usr/bin/diff ${diffFormat} will not merge correctly
+#    merger_dont_diff: list of files for which /opt/local/bin/gdiff ${diffFormat} will not merge correctly
 #          diffFormat: format used by diff to merge two text files
 proc muniversal::merge {base1 base2 base prefixDir arch1 arch2 merger_dont_diff diffFormat} {
     set dir1  ${base1}/${prefixDir}
@@ -424 +424 @@
 
                             ui_debug "universal: merge: created ${prefixDir}/${fl} to include ${prefixDir}/${arch1}-${fl} ${prefixDir}/${arch1}-${fl}"
 
-                            system "/usr/bin/diff -d ${diffFormat} \"${dir}/${arch1}-${fl}\" \"${dir}/${arch2}-${fl}\" > \"${dir}/${fl}\"; test \$? -le 1"
+                            system "/opt/local/bin/gdiff -d ${diffFormat} \"${dir}/${arch1}-${fl}\" \"${dir}/${arch2}-${fl}\" > \"${dir}/${fl}\"; test \$? -le 1"
 
                             copy -force ${dir1}/${fl} ${dir}/${arch1}-${fl}
                             copy -force ${dir2}/${fl} ${dir}/${arch2}-${fl}
@@ -531 +531 @@
                                     if { ! [catch {system "test \"`head -c2 ${dir1}/${fl}`\" = '#!'"}] } {
                                         # shell script, hopefully striping out arch flags works...
                                         muniversal::strip_arch_flags ${dir1} ${dir2} ${dir} ${fl}
-                                    } elseif { ! [catch {system "/usr/bin/diff -dw ${diffFormat} \"${dir1}/${fl}\" \"${dir2}/${fl}\" > \"${dir}/${fl}\"; test \$? -le 1"}] } {
+                                    } elseif { ! [catch {system "/opt/local/bin/gdiff -dw ${diffFormat} \"${dir1}/${fl}\" \"${dir2}/${fl}\" > \"${dir}/${fl}\"; test \$? -le 1"}] } {
                                         # diff worked
                                         ui_debug "universal: merge: used diff to create ${prefixDir}/${fl}"
                                     } else {
@@ -957 +957 @@
     global  workpath \
             muniversal.dont_diff
 
-    # /usr/bin/diff can merge two C/C++ files
+    # /opt/local/bin/gdiff can merge two C/C++ files
     # See https://www.gnu.org/software/diffutils/manual/html_mono/diff.html#If-then-else
     # See https://www.gnu.org/software/diffutils/manual/html_mono/diff.html#Detailed%20If-then-else
     set diffFormatProc {--old-group-format='#if (defined(__ppc__) || defined(__ppc64__))