<!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>[116514] 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/116514">116514</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-01-27 07:23:40 -0800 (Mon, 27 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>base/src: further Tcl cleanup, by courtesy of Gustaf Neumann, Tcl8.4-clean</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcpackage10portmpkgtcl">trunk/base/src/package1.0/portmpkg.tcl</a></li>
<li><a href="#trunkbasesrcpackage10portpkgtcl">trunk/base/src/package1.0/portpkg.tcl</a></li>
<li><a href="#trunkbasesrcportporttcl">trunk/base/src/port/port.tcl</a></li>
<li><a href="#trunkbasesrcportportindextcl">trunk/base/src/port/portindex.tcl</a></li>
<li><a href="#trunkbasesrcport10portlinttcl">trunk/base/src/port1.0/portlint.tcl</a></li>
<li><a href="#trunkbasesrcport10portstartupitemtcl">trunk/base/src/port1.0/portstartupitem.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>
<li><a href="#trunkbasesrcregistry20registrytcl">trunk/base/src/registry2.0/registry.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcpackage10portmpkgtcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/package1.0/portmpkg.tcl (116513 => 116514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/package1.0/portmpkg.tcl 2014-01-27 15:18:28 UTC (rev 116513)
+++ trunk/base/src/package1.0/portmpkg.tcl 2014-01-27 15:23:40 UTC (rev 116514)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx">
</span><span class="cx"> proc portmpkg::epoch_namestr {portepoch} {
</span><span class="cx"> set portepoch_namestr ""
</span><del>- if {${portepoch} != "0"} {
</del><ins>+ if {${portepoch} != 0} {
</ins><span class="cx"> set portepoch_namestr "${portepoch}_"
</span><span class="cx"> }
</span><span class="cx"> return ${portepoch_namestr}
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx">
</span><span class="cx"> proc portmpkg::revision_namestr {portrevision} {
</span><span class="cx"> set portrevision_namestr ""
</span><del>- if {${portrevision} != "0"} {
</del><ins>+ if {${portrevision} != 0} {
</ins><span class="cx"> set portrevision_namestr "_${portrevision}"
</span><span class="cx"> }
</span><span class="cx"> return ${portrevision_namestr}
</span><span class="lines">@@ -171,13 +171,13 @@
</span><span class="cx"> set name [lindex $dep 0]
</span><span class="cx"> set epoch [lindex $dep 1]
</span><span class="cx"> set epoch_namestr ""
</span><del>- if {$epoch != "0"} {
</del><ins>+ if {$epoch != 0} {
</ins><span class="cx"> set epoch_namestr "${epoch}_"
</span><span class="cx"> }
</span><span class="cx"> set vers [lindex $dep 2]
</span><span class="cx"> set rev [lindex $dep 3]
</span><span class="cx"> set rev_namestr ""
</span><del>- if {$rev != "0"} {
</del><ins>+ if {$rev != 0} {
</ins><span class="cx"> set rev_namestr "_${rev}"
</span><span class="cx"> }
</span><span class="cx"> set mport [lindex $dep 4]
</span></span></pre></div>
<a id="trunkbasesrcpackage10portpkgtcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/package1.0/portpkg.tcl (116513 => 116514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/package1.0/portpkg.tcl 2014-01-27 15:18:28 UTC (rev 116513)
+++ trunk/base/src/package1.0/portpkg.tcl 2014-01-27 15:23:40 UTC (rev 116514)
</span><span class="lines">@@ -113,11 +113,11 @@
</span><span class="cx"> pkg_post_unarchive_deletions portpkg::language
</span><span class="cx">
</span><span class="cx"> set portepoch_namestr ""
</span><del>- if {${portepoch} != "0"} {
</del><ins>+ if {${portepoch} != 0} {
</ins><span class="cx"> set portepoch_namestr "${portepoch}_"
</span><span class="cx"> }
</span><span class="cx"> set portrevision_namestr ""
</span><del>- if {${portrevision} != "0"} {
</del><ins>+ if {${portrevision} != 0} {
</ins><span class="cx"> set portrevision_namestr "_${portrevision}"
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -319,7 +319,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> set portname [xml_escape $portname]
</span><del>- if {$portepoch != "0"} {
</del><ins>+ if {$portepoch != 0} {
</ins><span class="cx"> set portepoch [xml_escape $portepoch]
</span><span class="cx"> set portepoch_str "${portepoch}_"
</span><span class="cx"> } else {
</span><span class="lines">@@ -327,7 +327,7 @@
</span><span class="cx"> set portepoch_str ""
</span><span class="cx"> }
</span><span class="cx"> set portversion [xml_escape $portversion]
</span><del>- if {$portrevision != "0"} {
</del><ins>+ if {$portrevision != 0} {
</ins><span class="cx"> set portrevision [xml_escape $portrevision]
</span><span class="cx"> set portrevision_str "_${portrevision}"
</span><span class="cx"> } else {
</span><span class="lines">@@ -399,7 +399,7 @@
</span><span class="cx"> proc portpkg::write_distribution {dfile portname portepoch portversion portrevision} {
</span><span class="cx"> global macosx_deployment_target
</span><span class="cx"> set portname [xml_escape $portname]
</span><del>- if {$portepoch != "0"} {
</del><ins>+ if {$portepoch != 0} {
</ins><span class="cx"> set portepoch [xml_escape $portepoch]
</span><span class="cx"> set portepoch_str "${portepoch}_"
</span><span class="cx"> } else {
</span><span class="lines">@@ -407,7 +407,7 @@
</span><span class="cx"> set portepoch_str ""
</span><span class="cx"> }
</span><span class="cx"> set portversion [xml_escape $portversion]
</span><del>- if {$portrevision != "0"} {
</del><ins>+ if {$portrevision != 0} {
</ins><span class="cx"> set portrevision [xml_escape $portrevision]
</span><span class="cx"> set portrevision_str "_${portrevision}"
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkbasesrcportporttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port/port.tcl (116513 => 116514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port/port.tcl 2014-01-27 15:18:28 UTC (rev 116513)
+++ trunk/base/src/port/port.tcl 2014-01-27 15:23:40 UTC (rev 116514)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> # @param name variable name
</span><span class="cx"> # @param value constant variable value
</span><span class="cx"> proc const {name args} {
</span><del>- interp alias {} $name {} _const [expr $args]
</del><ins>+ interp alias {} $name {} _const [expr {$args}]
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ##
</span><span class="lines">@@ -3816,7 +3816,7 @@
</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} == "10.5"} {
</del><ins>+ if {${macports::macosx_version} == 10.5} {
</ins><span class="cx"> unsetenv *
</span><span class="cx"> }
</span><span class="cx"> array set env [array get boot_env]
</span><span class="lines">@@ -3847,7 +3847,7 @@
</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"} {
</del><ins>+ if {${macports::macosx_version} == 10.5} {
</ins><span class="cx"> unsetenv *
</span><span class="cx"> }
</span><span class="cx"> array set env [array get env_save]
</span></span></pre></div>
<a id="trunkbasesrcportportindextcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port/portindex.tcl (116513 => 116514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port/portindex.tcl 2014-01-27 15:18:28 UTC (rev 116513)
+++ trunk/base/src/port/portindex.tcl 2014-01-27 15:23:40 UTC (rev 116514)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> ui_options port_options save_prefix keepkeys
</span><span class="cx">
</span><span class="cx"> # try to reuse the existing entry if it's still valid
</span><del>- if {$full_reindex != "1" && [info exists qindex([string tolower [file tail $portdir]])]} {
</del><ins>+ if {$full_reindex != 1 && [info exists qindex([string tolower [file tail $portdir]])]} {
</ins><span class="cx"> try {
</span><span class="cx"> set mtime [file mtime [file join $directory $portdir Portfile]]
</span><span class="cx"> if {$oldmtime >= $mtime} {
</span></span></pre></div>
<a id="trunkbasesrcport10portlinttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portlint.tcl (116513 => 116514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portlint.tcl 2014-01-27 15:18:28 UTC (rev 116513)
+++ trunk/base/src/port1.0/portlint.tcl 2014-01-27 15:23:40 UTC (rev 116514)
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx">
</span><span class="cx"> # Check for hardcoded paths
</span><span class="cx"> if {!$hashline
</span><del>- && $name != "MacPorts"
</del><ins>+ && $name ne "MacPorts"
</ins><span class="cx"> && [string match "*/opt/local*" $line]
</span><span class="cx"> && ![regexp {^\s*reinplace} $line]
</span><span class="cx"> && ![regexp {^\s*system.*\Wsed\W} $line]} {
</span></span></pre></div>
<a id="trunkbasesrcport10portstartupitemtcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portstartupitem.tcl (116513 => 116514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portstartupitem.tcl 2014-01-27 15:18:28 UTC (rev 116513)
+++ trunk/base/src/port1.0/portstartupitem.tcl 2014-01-27 15:23:40 UTC (rev 116514)
</span><span class="lines">@@ -600,7 +600,7 @@
</span><span class="cx">
</span><span class="cx"> puts ${plist} "<key>Debug</key><false/>"
</span><span class="cx"> puts ${plist} "<key>Disabled</key><true/>"
</span><del>- if {$macosx_deployment_target != "10.4"} {
</del><ins>+ if {$macosx_deployment_target != 10.4} {
</ins><span class="cx"> puts ${plist} "<key>KeepAlive</key><true/>"
</span><span class="cx"> } else {
</span><span class="cx"> puts ${plist} "<key>OnDemand</key><false/>"
</span></span></pre></div>
<a id="trunkbasesrcport10porttracetcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/porttrace.tcl (116513 => 116514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/porttrace.tcl 2014-01-27 15:18:28 UTC (rev 116513)
+++ trunk/base/src/port1.0/porttrace.tcl 2014-01-27 15:23:40 UTC (rev 116514)
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> global env trace_fifo macosx_version
</span><span class="cx"> foreach var {DYLD_INSERT_LIBRARIES DYLD_FORCE_FLAT_NAMESPACE DARWINTRACE_LOG DARWINTRACE_SANDBOX_BOUNDS} {
</span><span class="cx"> array unset env $var
</span><del>- if {$macosx_version == "10.5"} {
</del><ins>+ if {$macosx_version == 10.5} {
</ins><span class="cx"> unsetenv $var
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbasesrcport10portutiltcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portutil.tcl (116513 => 116514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portutil.tcl 2014-01-27 15:18:28 UTC (rev 116513)
+++ trunk/base/src/port1.0/portutil.tcl 2014-01-27 15:23:40 UTC (rev 116514)
</span><span class="lines">@@ -461,7 +461,7 @@
</span><span class="cx">
</span><span class="cx"> # Restore the environment.
</span><span class="cx"> array unset env *
</span><del>- if {$macosx_version == "10.5"} {
</del><ins>+ if {$macosx_version == 10.5} {
</ins><span class="cx"> unsetenv *
</span><span class="cx"> }
</span><span class="cx"> array set env [array get saved_env]
</span><span class="lines">@@ -1015,7 +1015,7 @@
</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 == "10.5"} {
</del><ins>+ if {$macosx_version == 10.5} {
</ins><span class="cx"> unsetenv LC_CTYPE
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1029,7 +1029,7 @@
</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 == "10.5"} {
</del><ins>+ if {$macosx_version == 10.5} {
</ins><span class="cx"> unsetenv LC_CTYPE
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1174,7 +1174,7 @@
</span><span class="cx"> # Wrapper for file rename that handles case-only renames
</span><span class="cx"> proc move {args} {
</span><span class="cx"> set options {}
</span><del>- while {[string match -* [lindex $args 0]]} {
</del><ins>+ while {[string match "-*" [lindex $args 0]]} {
</ins><span class="cx"> set arg [string range [lindex $args 0] 1 end]
</span><span class="cx"> set args [lreplace $args 0 0]
</span><span class="cx"> switch -- $arg {
</span><span class="lines">@@ -1603,7 +1603,7 @@
</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 == "10.5"} {
</del><ins>+ if {$macosx_version == 10.5} {
</ins><span class="cx"> unsetenv TMPDIR
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbasesrcregistry20registrytcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/registry2.0/registry.tcl (116513 => 116514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/registry2.0/registry.tcl 2014-01-27 15:18:28 UTC (rev 116513)
+++ trunk/base/src/registry2.0/registry.tcl 2014-01-27 15:23:40 UTC (rev 116514)
</span><span class="lines">@@ -457,7 +457,7 @@
</span><span class="cx"> set installtype [receipt_flat::property_retrieve $iref installtype]
</span><span class="cx"> lappend proplist installtype $installtype
</span><span class="cx"> set location [receipt_flat::property_retrieve $iref location]
</span><del>- if {$location == "0"} {
</del><ins>+ if {$location == 0} {
</ins><span class="cx"> set location [receipt_flat::property_retrieve $iref imagedir]
</span><span class="cx"> }
</span><span class="cx"> set contents [receipt_flat::property_retrieve $iref contents]
</span></span></pre>
</div>
</div>
</body>
</html>