<!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>[119618] trunk/base/src/port1.0</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/119618">119618</a></dd>
<dt>Author</dt> <dd>snc@macports.org</dd>
<dt>Date</dt> <dd>2014-05-02 08:13:06 -0700 (Fri, 02 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: replace eval with expand</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcport10portconfiguretcl">trunk/base/src/port1.0/portconfigure.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="trunkbasesrcport10portconfiguretcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portconfigure.tcl (119617 => 119618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portconfigure.tcl 2014-05-02 14:38:51 UTC (rev 119617)
+++ trunk/base/src/port1.0/portconfigure.tcl 2014-05-02 15:13:06 UTC (rev 119618)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> ([info exists option_defaults(${type}.cmd)] && [set ${type}.cmd] eq $option_defaults(${type}.cmd)) ||
</span><span class="cx"> (![info exists option_defaults(${type}.cmd)] && [set ${type}.cmd] eq ${type})
</span><span class="cx"> )} {
</span><del>- eval [linsert $dep 0 depends_build-append]
</del><ins>+ depends_build-append {*}$dep
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -99,14 +99,14 @@
</span><span class="cx"> autoreconf.cmd -
</span><span class="cx"> automake.cmd -
</span><span class="cx"> autoconf.cmd {
</span><del>- eval [linsert $configure_map(autoconf) 0 depends_build-delete]
</del><ins>+ depends_build-delete $configure_map(autoconf)
</ins><span class="cx"> }
</span><span class="cx"> xmkmf.cmd {
</span><del>- eval [linsert $configure_map(xmkmf) 0 depends_build-delete]
</del><ins>+ depends_build-delete $configure_map(xmkmf)
</ins><span class="cx"> }
</span><span class="cx"> use_xmkmf {
</span><span class="cx"> if {[tbool args]} {
</span><del>- eval [linsert $configure_map(xmkmf) 0 depends_build-append]
</del><ins>+ depends_build-appendl $configure_map(xmkmf)
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> default {
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> }
</span><span class="cx"> foreach {re fmt} $valid_compilers {
</span><span class="cx"> if {[set matches [regexp -inline $re $compiler]] ne ""} {
</span><del>- set compiler_name [eval [linsert [lrange $matches 1 end] 0 format $fmt]]
</del><ins>+ set compiler_name [format $fmt {*}[lrange $matches 1 end]]
</ins><span class="cx"> break
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -387,7 +387,7 @@
</span><span class="cx"> }
</span><span class="cx"> foreach {re fmt} $valid_compiler_ports {
</span><span class="cx"> if {[set matches [regexp -inline $re $compiler]] ne ""} {
</span><del>- return [eval [linsert [lrange $matches 1 end] 0 format $fmt]]
</del><ins>+ return [format $fmt {*}[lrange $matches 1 end]
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return {}
</span><span class="lines">@@ -702,7 +702,7 @@
</span><span class="cx"> PERL PYTHON RUBY INSTALL AWK BISON PKG_CONFIG PKG_CONFIG_PATH \
</span><span class="cx"> } {
</span><span class="cx"> set value [option configure.[string tolower $env_var]]
</span><del>- eval [linsert $value 0 append_to_environment_value configure $env_var]
</del><ins>+ append_to_environment_value configure $env_var $value
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # https://trac.macports.org/ticket/34221
</span><span class="lines">@@ -719,16 +719,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # add extra flags that are conditional on whether we're building universal
</span><del>- eval [linsert [get_canonical_archflags cc] 0 append_to_environment_value configure CFLAGS]
</del><ins>+ append_to_environment_value configure CFLAGS {*}[get_canonical_archflags cc]
</ins><span class="cx"> foreach tool {cxx objc objcxx cpp f77 f90 fc ld} {
</span><span class="cx"> if {[catch {get_canonical_archflags $tool} flags]} {
</span><span class="cx"> continue
</span><span class="cx"> }
</span><span class="cx"> set env_var [string toupper $tool]FLAGS
</span><del>- eval [linsert $flags 0 append_to_environment_value configure $env_var]
</del><ins>+ append_to_environment_value configure $env_var {*}$flags
</ins><span class="cx"> }
</span><span class="cx"> if {[variant_exists universal] && [variant_isset universal]} {
</span><del>- eval [linsert ${configure.universal_args} 0 configure.pre_args-append]
</del><ins>+ configure.pre_args-append ${configure.universal_args}
</ins><span class="cx"> } else {
</span><span class="cx"> foreach env_var {CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS FFLAGS F90FLAGS FCFLAGS LDFLAGS} {
</span><span class="cx"> if {${configure.march} ne ""} {
</span></span></pre></div>
<a id="trunkbasesrcport10portutiltcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portutil.tcl (119617 => 119618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portutil.tcl 2014-05-02 14:38:51 UTC (rev 119617)
+++ trunk/base/src/port1.0/portutil.tcl 2014-05-02 15:13:06 UTC (rev 119618)
</span><span class="lines">@@ -2823,7 +2823,7 @@
</span><span class="cx"> foreach arch ${archs} {
</span><span class="cx"> lappend exec-lipo -arch ${arch} ${base}/${arch}${file}
</span><span class="cx"> }
</span><del>- eval exec ${exec-lipo} [list -create -output ${target}${file}]
</del><ins>+ exec ${exec-lipo} {*}[list -create -output ${target}${file}]
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # private function
</span></span></pre>
</div>
</div>
</body>
</html>