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

[ryandesign at macports.org]

Revision: 61087
          http://trac.macports.org/changeset/61087
Author:   ryandesign at macports.org
Date:     2009-12-01 12:27:47 -0800 (Tue, 01 Dec 2009)
Log Message:
-----------
muniversal-1.0.tcl: fix typos/wording

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	2009-12-01 20:04:51 UTC (rev 61086)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2009-12-01 20:27:47 UTC (rev 61087)
@@ -383,7 +383,7 @@
         delete ${destroot}
 
         # 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 forbiddend by merger_dont_diff
+        #        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
         #          diffFormat: format used by diff to merge two text files
         proc merge2Dir {base1 base2 base prefixDir arch1 arch2 merger_dont_diff diffFormat} {
@@ -502,12 +502,12 @@
                                                     copy ${dir1}/${fl} ${dir}
                                                 }
                                                 *.elc {
-                                                    # elc files can be differet because they record when and where they were built.
+                                                    # elc files can be different because they record when and where they were built.
                                                     ui_debug "universal: merge: ${prefixDir}/${fl} is different in ${base1} and ${base2}; assume trivial difference"
                                                     copy ${dir1}/${fl} ${dir}
                                                 }
                                                 default {
-                                                    error "Can not create ${prefixDir}/${fl} from ${base1} and ${base2}"
+                                                    error "Cannot create ${prefixDir}/${fl} from ${base1} and ${base2}"
                                                 }
                                             }
                                         }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091201/fc52ffd2/attachment.html>