Modified: trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl (110298 => 110299)
--- trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl 2013-08-29 18:13:27 UTC (rev 110298)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl 2013-08-29 18:26:07 UTC (rev 110299)
@@ -533,7 +533,7 @@
merge2Dir ${base1} ${base2} ${base} ${prefixDir}/${fl} ${arch1} ${arch2} ${merger_dont_diff} ${diffFormat}
} else {
# Files are neither directories nor links
- if { ! [catch {system "/usr/bin/cmp \"${dir1}/${fl}\" \"${dir2}/${fl}\" && /bin/cp -v \"${dir1}/${fl}\" \"${dir}\""}] } {
+ if { ! [catch {system "/usr/bin/cmp -s \"${dir1}/${fl}\" \"${dir2}/${fl}\" && /bin/cp -v \"${dir1}/${fl}\" \"${dir}\""}] } {
# Files are byte by byte the same
ui_debug "universal: merge: ${prefixDir}/${fl} is identical in ${base1} and ${base2}"
} else {