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

[jmr at macports.org]

Revision: 103519
          https://trac.macports.org/changeset/103519
Author:   jmr at macports.org
Date:     2013-02-28 01:47:52 -0800 (Thu, 28 Feb 2013)
Log Message:
-----------
unset env vars correctly on 10.5

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

Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl	2013-02-28 07:57:17 UTC (rev 103518)
+++ trunk/base/src/port1.0/portutil.tcl	2013-02-28 09:47:52 UTC (rev 103519)
@@ -915,7 +915,7 @@
 # reinplace
 # Provides "sed in place" functionality
 proc reinplace {args}  {
-    global env worksrcpath
+    global env worksrcpath macosx_version
     set extended 0
     set suppress 0
     set oldlocale_exists 0
@@ -1005,6 +1005,9 @@
                     set env(LC_CTYPE) $oldlocale
                 } else {
                     unset env(LC_CTYPE)
+                    if {$macosx_version == "10.5"} {
+                        unsetenv LC_CTYPE
+                    }
                 }
             }
             close $tmpfd
@@ -1016,6 +1019,9 @@
                 set env(LC_CTYPE) $oldlocale
             } else {
                 unset env(LC_CTYPE)
+                if {$macosx_version == "10.5"} {
+                    unsetenv LC_CTYPE
+                }
             }
         }
         close $tmpfd
@@ -1311,7 +1317,8 @@
 
 proc target_run {ditem} {
     global target_state_fd workpath portpath ports_trace PortInfo ports_dryrun \
-           ports_dry_last_skipped worksrcpath prefix subport env portdbpath
+           ports_dry_last_skipped worksrcpath prefix subport env portdbpath \
+           macosx_version
     set portname $subport
     set result 0
     set skipped 0
@@ -1545,6 +1552,9 @@
     set env(HOME) $savedhome
     if {[info exists env(TMPDIR)]} {
         unset env(TMPDIR)
+        if {$macosx_version == "10.5"} {
+            unsetenv TMPDIR
+        }
     }
 
     return $result
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130228/106918d5/attachment.html>