Revision

116781

Author

cal@macports.org

Date

2014-02-07 07:32:39 -0800 (Fri, 07 Feb 2014)

Log Message

port1.0: treat $macosx_version and $macosx_deployment_target as strings, https://lists.macosforge.org/pipermail/macports-dev/2014-February/025852.html

Modified Paths

• trunk/base/src/port/port.tcl
• trunk/base/src/port1.0/portstartupitem.tcl
• trunk/base/src/port1.0/porttrace.tcl
• trunk/base/src/port1.0/portutil.tcl

Diff

--- trunk/base/src/port/port.tcl	2014-02-07 14:02:29 UTC (rev 116780)
+++ trunk/base/src/port/port.tcl	2014-02-07 15:32:39 UTC (rev 116781)
@@ -3816,7 +3816,7 @@
                     # may want stuff from it as well, like TERM.
                     array unset env_save; array set env_save [array get env]
                     array unset env *
-                    if {${macports::macosx_version} == 10.5} {
+                    if {${macports::macosx_version} eq "10.5"} {
                         unsetenv *
                     }
                     array set env [array get boot_env]
@@ -3847,7 +3847,7 @@
                     
                     # Restore internal MacPorts environment
                     array unset env *
-                    if {${macports::macosx_version} == 10.5} {
+                    if {${macports::macosx_version} eq "10.5"} {
                         unsetenv *
                     }
                     array set env [array get env_save]

--- trunk/base/src/port1.0/portstartupitem.tcl	2014-02-07 14:02:29 UTC (rev 116780)
+++ trunk/base/src/port1.0/portstartupitem.tcl	2014-02-07 15:32:39 UTC (rev 116781)
@@ -600,7 +600,7 @@
     
     puts ${plist} "<key>Debug</key><false/>"
     puts ${plist} "<key>Disabled</key><true/>"
-    if {$macosx_deployment_target != 10.4} {
+    if {$macosx_deployment_target eq "10.4"} {
         puts ${plist} "<key>KeepAlive</key><true/>"
     } else {
         puts ${plist} "<key>OnDemand</key><false/>"

--- trunk/base/src/port1.0/porttrace.tcl	2014-02-07 14:02:29 UTC (rev 116780)
+++ trunk/base/src/port1.0/porttrace.tcl	2014-02-07 15:32:39 UTC (rev 116781)
@@ -172,7 +172,7 @@
         global env trace_fifo macosx_version
         foreach var {DYLD_INSERT_LIBRARIES DYLD_FORCE_FLAT_NAMESPACE DARWINTRACE_LOG DARWINTRACE_SANDBOX_BOUNDS} {
             array unset env $var
-            if {$macosx_version == 10.5} {
+            if {$macosx_version eq "10.5"} {
                 unsetenv $var
             }
         }

--- trunk/base/src/port1.0/portutil.tcl	2014-02-07 14:02:29 UTC (rev 116780)
+++ trunk/base/src/port1.0/portutil.tcl	2014-02-07 15:32:39 UTC (rev 116781)
@@ -461,7 +461,7 @@
 
     # Restore the environment.
     array unset env *
-    if {$macosx_version == 10.5} {
+    if {$macosx_version eq "10.5"} {
         unsetenv *
     }
     array set env [array get saved_env]
@@ -1015,7 +1015,7 @@
                     set env(LC_CTYPE) $oldlocale
                 } else {
                     unset env(LC_CTYPE)
-                    if {$macosx_version == 10.5} {
+                    if {$macosx_version eq "10.5"} {
                         unsetenv LC_CTYPE
                     }
                 }
@@ -1029,7 +1029,7 @@
                 set env(LC_CTYPE) $oldlocale
             } else {
                 unset env(LC_CTYPE)
-                if {$macosx_version == 10.5} {
+                if {$macosx_version eq "10.5"} {
                     unsetenv LC_CTYPE
                 }
             }
@@ -1603,7 +1603,7 @@
     set env(HOME) $savedhome
     if {[info exists env(TMPDIR)]} {
         unset env(TMPDIR)
-        if {$macosx_version == 10.5} {
+        if {$macosx_version eq "10.5"} {
             unsetenv TMPDIR
         }
     }
@@ -3193,7 +3193,7 @@
 proc _check_xcode_version {} {
     global os.subplatform macosx_version xcodeversion
 
-    if {${os.subplatform} == "macosx"} {
+    if {${os.subplatform} eq "macosx"} {
         switch $macosx_version {
             10.4 {
                 set min 2.0