[146910] trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

[mcalhoun at macports.org]

Revision: 146910
          https://trac.macports.org/changeset/146910
Author:   mcalhoun at macports.org
Date:     2016-03-20 10:33:34 -0700 (Sun, 20 Mar 2016)
Log Message:
-----------
muniversal-1.0.tcl: compare contents of jar file instead of just of assuming timestamp differences

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2016-03-20 17:31:04 UTC (rev 146909)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2016-03-20 17:33:34 UTC (rev 146910)
@@ -626,11 +626,6 @@
                                             ui_debug "universal: merge: ${prefixDir}/${fl} differs in ${base1} and ${base2}; assume trivial difference"
                                             copy ${dir1}/${fl} ${dir}
                                         }
-                                        *.jar {
-                                            # jar files can be different because of timestamp
-                                            ui_debug "universal: merge: ${prefixDir}/${fl} differs in ${base1} and ${base2}; assume timestamp difference"
-                                            copy ${dir1}/${fl} ${dir}
-                                        }
                                         *.elc {
                                             # elc files can be different because they record when and where they were built.
                                             ui_debug "universal: merge: ${prefixDir}/${fl} differs in ${base1} and ${base2}; assume trivial difference"
@@ -647,6 +642,7 @@
                                         *.xz -
                                         *.gz -
                                         *.zip -
+                                        *.jar -
                                         *.bz2 {
                                             # compressed files can differ due to entropy
                                             switch -glob ${fl} {
@@ -662,6 +658,9 @@
                                                 *.zip {
                                                     set cat "/usr/bin/unzip -p"
                                                 }
+                                                *.jar {
+                                                    set cat "/usr/bin/unzip -p"
+                                                }
                                                 *.bz2 {
                                                     set cat /usr/bin/bzcat
                                                 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160320/4bc066b1/attachment.html>