<!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>[119691] trunk/base/src/package1.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/119691">119691</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-05-03 15:27:43 -0700 (Sat, 03 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: package1.0/port{dpkg,s?rpm}.tcl: Replace eval with {*}, unify whitespace</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcpackage10portdpkgtcl">trunk/base/src/package1.0/portdpkg.tcl</a></li>
<li><a href="#trunkbasesrcpackage10portrpmtcl">trunk/base/src/package1.0/portrpm.tcl</a></li>
<li><a href="#trunkbasesrcpackage10portsrpmtcl">trunk/base/src/package1.0/portsrpm.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcpackage10portdpkgtcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/package1.0/portdpkg.tcl (119690 => 119691)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/package1.0/portdpkg.tcl 2014-05-03 22:22:56 UTC (rev 119690)
+++ trunk/base/src/package1.0/portdpkg.tcl 2014-05-03 22:27:43 UTC (rev 119691)
</span><span class="lines">@@ -188,10 +188,10 @@
</span><span class="cx"> # xxx: only examines the portfile component of the depspec
</span><span class="cx"> set depends {}
</span><span class="cx"> if {[info exists portinfo(depends_run)]} {
</span><del>- eval "lappend depends $portinfo(depends_run)"
</del><ins>+ lappend depends {*}$portinfo(depends_run)
</ins><span class="cx"> }
</span><span class="cx"> if {[info exists portinfo(depends_lib)]} {
</span><del>- eval "lappend depends $portinfo(depends_lib)"
</del><ins>+ lappend depends {*}$portinfo(depends_lib)
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> foreach depspec $depends {
</span></span></pre></div>
<a id="trunkbasesrcpackage10portrpmtcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/package1.0/portrpm.tcl (119690 => 119691)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/package1.0/portrpm.tcl 2014-05-03 22:22:56 UTC (rev 119690)
+++ trunk/base/src/package1.0/portrpm.tcl 2014-05-03 22:27:43 UTC (rev 119691)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> foreach dir [list "${prefix}/src/macports/RPMS" "${prefix}/src/apple/RPMS" "/usr/src/apple/RPMS" "/macports/rpms/RPMS"] {
</span><span class="cx"> foreach arch [list ${configure.build_arch} ${os.arch} "fat" "noarch"] {
</span><span class="cx"> set rpmpath "$dir/${arch}/${portname}-${portversion}-${portrevision}.${arch}.rpm"
</span><del>- if {[file readable $rpmpath] && ([file mtime ${rpmpath}] >= [file mtime ${portpath}/Portfile])} {
</del><ins>+ if {[file readable $rpmpath] && ([file mtime ${rpmpath}] >= [file mtime ${portpath}/Portfile])} {
</ins><span class="cx"> ui_debug "$rpmpath"
</span><span class="cx"> ui_msg "$UI_PREFIX [format [msgcat::mc "RPM package for %s version %s is up-to-date"] ${portname} ${portversion}]"
</span><span class="cx"> return 0
</span><span class="lines">@@ -125,8 +125,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- # depend on system (virtual packages for apple stuff)
- lappend dependencies "org.macports.${os.platform}${os.major}"
</del><ins>+ # depend on system (virtual packages for apple stuff)
+ lappend dependencies "org.macports.${os.platform}${os.major}"
</ins><span class="cx">
</span><span class="cx"> set listpath ${workpath}/${portname}.filelist
</span><span class="cx"> system "rm -f '${workpath}/${portname}.filelist' && touch '${workpath}/${portname}.filelist'"
</span><span class="lines">@@ -142,8 +142,8 @@
</span><span class="cx"> proc portrpm::make_dependency_list {portname} {
</span><span class="cx"> set result {}
</span><span class="cx"> if {[catch {set res [mport_lookup $portname]} error]} {
</span><del>- global errorInfo
- ui_debug "$errorInfo"
</del><ins>+ global errorInfo
+ ui_debug "$errorInfo"
</ins><span class="cx"> ui_error "port lookup failed: $error"
</span><span class="cx"> return 1
</span><span class="cx"> }
</span><span class="lines">@@ -154,14 +154,18 @@
</span><span class="cx"> # get the union of depends_run and depends_lib
</span><span class="cx"> # xxx: only examines the portfile component of the depspec
</span><span class="cx"> set depends {}
</span><del>- if {[info exists portinfo(depends_run)]} { eval "lappend depends $portinfo(depends_run)" }
- if {[info exists portinfo(depends_lib)]} { eval "lappend depends $portinfo(depends_lib)" }
</del><ins>+ if {[info exists portinfo(depends_run)]} {
+ lappend depends {*}$portinfo(depends_run)
+ }
+ if {[info exists portinfo(depends_lib)]} {
+ lappend depends {*}$portinfo(depends_lib)
+ }
</ins><span class="cx">
</span><span class="cx"> foreach depspec $depends {
</span><span class="cx"> set dep [lindex [split $depspec :] end]
</span><span class="cx">
</span><span class="cx"> # xxx: nasty hack
</span><del>- if {$dep != "XFree86"} {
</del><ins>+ if {$dep ne "XFree86"} {
</ins><span class="cx"> lappend result {*}[make_dependency_list $dep]
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -181,21 +185,21 @@
</span><span class="cx"> set words [split $orig]
</span><span class="cx"> set numWords [llength $words]
</span><span class="cx"> for {set cnt 0} {$cnt < $numWords} {incr cnt} {
</span><del>- set w [lindex $words $cnt]
- set wLen [string length $w]
</del><ins>+ set w [lindex $words $cnt]
+ set wLen [string length $w]
</ins><span class="cx">
</span><del>- if {($pos+$wLen < $Length)} {
- # append word to current line
- if {$pos} {append line " "; incr pos}
- append line $w
- incr pos $wLen
- } else {
- # line full => write buffer and begin a new line
- if {[string length $text]} {append text "\n"}
- append text $line
- set line $w
- set pos $wLen
- }
</del><ins>+ if {($pos+$wLen < $Length)} {
+ # append word to current line
+ if {$pos} {append line " "; incr pos}
+ append line $w
+ incr pos $wLen
+ } else {
+ # line full => write buffer and begin a new line
+ if {[string length $text]} {append text "\n"}
+ append text $line
+ set line $w
+ set pos $wLen
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {[string length $text]} {append text "\n"}
</span><span class="lines">@@ -228,12 +232,12 @@
</span><span class="cx"> BuildRoot: ${destroot}
</span><span class="cx"> AutoReq: no"
</span><span class="cx"> if {$epoch != 0} {
</span><del>- puts $specfd "Epoch: ${epoch}"
</del><ins>+ puts $specfd "Epoch: ${epoch}"
</ins><span class="cx"> }
</span><span class="cx"> if {[llength ${dependencies}] != 0} {
</span><del>- foreach require ${dependencies} {
- puts $specfd "Requires: [regsub -all -- "\-" $require "_"]"
- }
</del><ins>+ foreach require ${dependencies} {
+ puts $specfd "Requires: [regsub -all -- "\-" $require "_"]"
+ }
</ins><span class="cx"> }
</span><span class="cx"> set wrap_description [word_wrap ${long_description} 72]
</span><span class="cx"> puts $specfd "
</span></span></pre></div>
<a id="trunkbasesrcpackage10portsrpmtcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/package1.0/portsrpm.tcl (119690 => 119691)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/package1.0/portsrpm.tcl 2014-05-03 22:22:56 UTC (rev 119690)
+++ trunk/base/src/package1.0/portsrpm.tcl 2014-05-03 22:27:43 UTC (rev 119691)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> foreach dir [list "${prefix}/src/macports/SRPMS" "${prefix}/src/apple/SRPMS" "/usr/src/apple/SRPMS" "/macports/rpms/SRPMS"] {
</span><span class="cx"> foreach arch {"src" "nosrc"} {
</span><span class="cx"> set rpmpath "$dir/${portname}-${portversion}-${portrevision}.${arch}.rpm"
</span><del>- if {[file readable $rpmpath] && ([file mtime ${rpmpath}] >= [file mtime ${portpath}/Portfile])} {
</del><ins>+ if {[file readable $rpmpath] && ([file mtime ${rpmpath}] >= [file mtime ${portpath}/Portfile])} {
</ins><span class="cx"> ui_debug "$rpmpath"
</span><span class="cx"> ui_msg "$UI_PREFIX [format [msgcat::mc "SRPM package for %s version %s is up-to-date"] ${portname} ${portversion}]"
</span><span class="cx"> return 0
</span><span class="lines">@@ -141,8 +141,8 @@
</span><span class="cx"> proc portsrpm::make_dependency_list {portname} {
</span><span class="cx"> set result {}
</span><span class="cx"> if {[catch {set res [mport_lookup $portname]} error]} {
</span><del>- global errorInfo
- ui_debug "$errorInfo"
</del><ins>+ global errorInfo
+ ui_debug "$errorInfo"
</ins><span class="cx"> ui_error "port lookup failed: $error"
</span><span class="cx"> return 1
</span><span class="cx"> }
</span><span class="lines">@@ -154,10 +154,18 @@
</span><span class="cx"> # get the union of depends_fetch, depends_extract, depends_build and depends_lib
</span><span class="cx"> # xxx: only examines the portfile component of the depspec
</span><span class="cx"> set depends {}
</span><del>- if {[info exists portinfo(depends_fetch)]} { eval "lappend depends $portinfo(depends_fetch)" }
- if {[info exists portinfo(depends_extract)]} { eval "lappend depends $portinfo(depends_extract)" }
- if {[info exists portinfo(depends_build)]} { eval "lappend depends $portinfo(depends_build)" }
- if {[info exists portinfo(depends_lib)]} { eval "lappend depends $portinfo(depends_lib)" }
</del><ins>+ if {[info exists portinfo(depends_fetch)]} {
+ lappend depends {*}$portinfo(depends_fetch)
+ }
+ if {[info exists portinfo(depends_extract)]} {
+ lappend depends {*}$portinfo(depends_extract)
+ }
+ if {[info exists portinfo(depends_build)]} {
+ lappend depends {*}$portinfo(depends_build)
+ }
+ if {[info exists portinfo(depends_lib)]} {
+ lappend depends {*}$portinfo(depends_lib)
+ }
</ins><span class="cx">
</span><span class="cx"> foreach depspec $depends {
</span><span class="cx"> set dep [lindex [split $depspec :] end]
</span><span class="lines">@@ -183,21 +191,21 @@
</span><span class="cx"> set words [split $orig]
</span><span class="cx"> set numWords [llength $words]
</span><span class="cx"> for {set cnt 0} {$cnt < $numWords} {incr cnt} {
</span><del>- set w [lindex $words $cnt]
- set wLen [string length $w]
</del><ins>+ set w [lindex $words $cnt]
+ set wLen [string length $w]
</ins><span class="cx">
</span><del>- if {($pos+$wLen < $Length)} {
- # append word to current line
- if {$pos} {append line " "; incr pos}
- append line $w
- incr pos $wLen
- } else {
- # line full => write buffer and begin a new line
- if {[string length $text]} {append text "\n"}
- append text $line
- set line $w
- set pos $wLen
- }
</del><ins>+ if {($pos+$wLen < $Length)} {
+ # append word to current line
+ if {$pos} {append line " "; incr pos}
+ append line $w
+ incr pos $wLen
+ } else {
+ # line full => write buffer and begin a new line
+ if {[string length $text]} {append text "\n"}
+ append text $line
+ set line $w
+ set pos $wLen
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {[string length $text]} {append text "\n"}
</span><span class="lines">@@ -228,7 +236,7 @@
</span><span class="cx"> puts $specfd "Source1: $zip"
</span><span class="cx"> }
</span><span class="cx"> if {$epoch != 0} {
</span><del>- puts $specfd "Epoch: ${epoch}"
</del><ins>+ puts $specfd "Epoch: ${epoch}"
</ins><span class="cx"> }
</span><span class="cx"> set first 2
</span><span class="cx"> set count $first
</span><span class="lines">@@ -254,9 +262,9 @@
</span><span class="cx"> }
</span><span class="cx"> puts $specfd "AutoReq: no"
</span><span class="cx"> if {[llength ${dependencies}] != 0} {
</span><del>- foreach require ${dependencies} {
- puts $specfd "BuildRequires: [regsub -all -- "\-" $require "_"]"
- }
</del><ins>+ foreach require ${dependencies} {
+ puts $specfd "BuildRequires: [regsub -all -- "\-" $require "_"]"
+ }
</ins><span class="cx"> }
</span><span class="cx"> set wrap_description [word_wrap ${long_description} 72]
</span><span class="cx"> if {$zip ne ""} {
</span></span></pre>
</div>
</div>
</body>
</html>