[116452] trunk/base/src/port1.0/portutil.tcl

[cal at macports.org]

Revision: 116452
          https://trac.macports.org/changeset/116452
Author:   cal at macports.org
Date:     2014-01-25 09:03:53 -0800 (Sat, 25 Jan 2014)
Log Message:
-----------
port1.0/portutil.tcl: further cleanup where the patch didn't apply cleanly

Modified Paths:
--------------
    trunk/base/src/port1.0/portutil.tcl

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2014-01-25 16:59:37 UTC (rev 116451)
+++ trunk/base/src/port1.0/portutil.tcl	2014-01-25 17:03:53 UTC (rev 116452)
@@ -1000,7 +1000,7 @@
             lappend cmdline -n
         }
         set cmdline [concat $cmdline [list $pattern < $file >@ $tmpfd 2>@stderr]]
-        if {$locale != ""} {
+        if {$locale ne ""} {
             set env(LC_CTYPE) $locale
         }
         ui_info "$UI_PREFIX [format [msgcat::mc "Patching %s: %s"] [file tail $file] $pattern]"
@@ -1419,7 +1419,7 @@
                 #start tracelib
                 if {($result ==0
                   && [info exists ports_trace]
-                  && $ports_trace == "yes"
+                  && $ports_trace eq "yes"
                   && $target ne "clean"
                   && $target ne "uninstall")} {
                     # uninstall will open a portfile from registry and call
@@ -1535,7 +1535,7 @@
 
                 # Check dependencies & file creations outside workpath.
                 if {[info exists ports_trace]
-                  && $ports_trace == "yes"
+                  && $ports_trace eq "yes"
                   && $target ne "clean"
                   && $target ne "uninstall"} {
 
@@ -3135,7 +3135,7 @@
         }
 
         # Xcode 4.3 and above requires the command-line utilities package to be installed. 
-        if {[vercmp $xcodeversion 4.3] >= 0 || ($xcodeversion == "none" && [file exists "/Applications/Xcode.app"])} {
+        if {[vercmp $xcodeversion 4.3] >= 0 || ($xcodeversion eq "none" && [file exists "/Applications/Xcode.app"])} {
             if {[vercmp $macosx_version 10.9] >= 0} {
                 # on Mavericks, /usr/bin/make might always installed as a shim into the command line tools installer.
                 # Let's check for /Library/Developer/CommandLineTools, installed by the
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140125/df6b1746/attachment.html>