<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[138100] trunk/base/src</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/138100">138100</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2015-06-28 00:49:51 -0700 (Sun, 28 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove workarounds for Leopard Tcl env bug. Confirmed that our Tcl 8.5 does not suffer from it on Leopard.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcmacports10macportstcl">trunk/base/src/macports1.0/macports.tcl</a></li>
<li><a href="#trunkbasesrcportporttcl">trunk/base/src/port/port.tcl</a></li>
<li><a href="#trunkbasesrcport10porttracetcl">trunk/base/src/port1.0/porttrace.tcl</a></li>
<li><a href="#trunkbasesrcport10portutiltcl">trunk/base/src/port1.0/portutil.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcmacports10macportstcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/macports.tcl (138099 => 138100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/macports.tcl 2015-06-28 07:25:25 UTC (rev 138099)
+++ trunk/base/src/macports1.0/macports.tcl 2015-06-28 07:49:51 UTC (rev 138100)
</span><span class="lines">@@ -1085,15 +1085,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- # unset environment an extra time, to work around bugs in Leopard Tcl
- if {$macosx_version eq "10.5"} {
- foreach envkey $env_names {
- if {$envkey ni $keepenvkeys} {
- unsetenv $envkey
- }
- }
- }
-
</del><span class="cx"> if {![info exists xcodeversion] || ![info exists xcodebuildcmd]} {
</span><span class="cx"> # We'll resolve these later (if needed)
</span><span class="cx"> trace add variable macports::xcodeversion read macports::setxcodeinfo
</span></span></pre></div>
<a id="trunkbasesrcportporttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port/port.tcl (138099 => 138100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port/port.tcl 2015-06-28 07:25:25 UTC (rev 138099)
+++ trunk/base/src/port/port.tcl 2015-06-28 07:49:51 UTC (rev 138100)
</span><span class="lines">@@ -1870,9 +1870,6 @@
</span><span class="cx"> global env boot_env
</span><span class="cx"> array unset env_save; array set env_save [array get env]
</span><span class="cx"> array unset env *
</span><del>- if {${macports::macosx_version} == "10.5"} {
- unsetenv *
- }
</del><span class="cx"> array set env [array get boot_env]
</span><span class="cx">
</span><span class="cx"> if [catch {system -nodup [list ${macports::autoconf::man_path} $pagepath]} result] {
</span><span class="lines">@@ -1883,9 +1880,6 @@
</span><span class="cx">
</span><span class="cx"> # Restore internal MacPorts environment
</span><span class="cx"> array unset env *
</span><del>- if {${macports::macosx_version} == "10.5"} {
- unsetenv *
- }
</del><span class="cx"> array set env [array get env_save]
</span><span class="cx"> } else {
</span><span class="cx"> ui_error "Sorry, no help for this topic is available."
</span><span class="lines">@@ -3927,9 +3921,6 @@
</span><span class="cx"> # may want stuff from it as well, like TERM.
</span><span class="cx"> array unset env_save; array set env_save [array get env]
</span><span class="cx"> array unset env *
</span><del>- if {${macports::macosx_version} eq "10.5"} {
- unsetenv *
- }
</del><span class="cx"> array set env [array get boot_env]
</span><span class="cx">
</span><span class="cx"> # Find an editor to edit the portfile
</span><span class="lines">@@ -3958,9 +3949,6 @@
</span><span class="cx">
</span><span class="cx"> # Restore internal MacPorts environment
</span><span class="cx"> array unset env *
</span><del>- if {${macports::macosx_version} eq "10.5"} {
- unsetenv *
- }
</del><span class="cx"> array set env [array get env_save]
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbasesrcport10porttracetcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/porttrace.tcl (138099 => 138100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/porttrace.tcl 2015-06-28 07:25:25 UTC (rev 138099)
+++ trunk/base/src/port1.0/porttrace.tcl 2015-06-28 07:49:51 UTC (rev 138100)
</span><span class="lines">@@ -263,9 +263,6 @@
</span><span class="cx">
</span><span class="cx"> foreach var {DYLD_INSERT_LIBRARIES DARWINTRACE_LOG} {
</span><span class="cx"> array unset env $var
</span><del>- if {$macosx_version eq "10.5"} {
- unsetenv $var
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Kill socket
</span></span></pre></div>
<a id="trunkbasesrcport10portutiltcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portutil.tcl (138099 => 138100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portutil.tcl 2015-06-28 07:25:25 UTC (rev 138099)
+++ trunk/base/src/port1.0/portutil.tcl 2015-06-28 07:49:51 UTC (rev 138100)
</span><span class="lines">@@ -461,9 +461,6 @@
</span><span class="cx">
</span><span class="cx"> # Restore the environment.
</span><span class="cx"> array unset env *
</span><del>- if {$macosx_version eq "10.5"} {
- unsetenv *
- }
</del><span class="cx"> array set env [array get saved_env]
</span><span class="cx">
</span><span class="cx"> # Return as if system had been called directly.
</span><span class="lines">@@ -1020,9 +1017,6 @@
</span><span class="cx"> set env(LC_CTYPE) $oldlocale
</span><span class="cx"> } else {
</span><span class="cx"> unset env(LC_CTYPE)
</span><del>- if {$macosx_version eq "10.5"} {
- unsetenv LC_CTYPE
- }
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> close $tmpfd
</span><span class="lines">@@ -1034,9 +1028,6 @@
</span><span class="cx"> set env(LC_CTYPE) $oldlocale
</span><span class="cx"> } else {
</span><span class="cx"> unset env(LC_CTYPE)
</span><del>- if {$macosx_version eq "10.5"} {
- unsetenv LC_CTYPE
- }
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> close $tmpfd
</span><span class="lines">@@ -1607,9 +1598,6 @@
</span><span class="cx"> set env(HOME) $savedhome
</span><span class="cx"> if {[info exists env(TMPDIR)]} {
</span><span class="cx"> unset env(TMPDIR)
</span><del>- if {$macosx_version eq "10.5"} {
- unsetenv TMPDIR
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return $result
</span></span></pre>
</div>
</div>
</body>
</html>