<!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>[116517] trunk/base/portmgr/packaging</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/116517">116517</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-01-27 07:31:02 -0800 (Mon, 27 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>portmgr/packaging: Tcl cleanup, patch by Gustaf Neumann, Tcl8.4-clean</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbaseportmgrpackagingdpkgalltcl">trunk/base/portmgr/packaging/dpkgall.tcl</a></li>
<li><a href="#trunkbaseportmgrpackagingmpkgalltcl">trunk/base/portmgr/packaging/mpkgall.tcl</a></li>
<li><a href="#trunkbaseportmgrpackagingpackagealltcl">trunk/base/portmgr/packaging/packageall.tcl</a></li>
<li><a href="#trunkbaseportmgrpackagingrpmalltcl">trunk/base/portmgr/packaging/rpmall.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbaseportmgrpackagingdpkgalltcl"></a>
<div class="modfile"><h4>Modified: trunk/base/portmgr/packaging/dpkgall.tcl (116516 => 116517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/portmgr/packaging/dpkgall.tcl 2014-01-27 15:30:01 UTC (rev 116516)
+++ trunk/base/portmgr/packaging/dpkgall.tcl 2014-01-27 15:31:02 UTC (rev 116517)
</span><span class="lines">@@ -106,9 +106,9 @@
</span><span class="cx">
</span><span class="cx"> proc ui_channels {priority} {
</span><span class="cx"> global dpkg::logfd
</span><del>- if {[info exists logfd] && [string length $logfd] > 0 } {
</del><ins>+ if {[info exists logfd] && $logfd ne ""} {
</ins><span class="cx"> return {$logfd}
</span><del>- } elseif {$message(priority) != "debug"} {
</del><ins>+ } elseif {$message(priority) ne "debug"} {
</ins><span class="cx"> # If there's no log file, echo to stdout
</span><span class="cx"> return {stdout}
</span><span class="cx"> }
</span><span class="lines">@@ -640,7 +640,7 @@
</span><span class="cx"> set reqlist ""
</span><span class="cx">
</span><span class="cx"> foreach {binary port} $requiredports {
</span><del>- if {[find_binary $binary] == ""} {
</del><ins>+ if {[find_binary $binary] eq ""} {
</ins><span class="cx"> lappend reqlist $port
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -685,7 +685,7 @@
</span><span class="cx"> set buildlist [lsort -unique $builddeps]
</span><span class="cx">
</span><span class="cx"> foreach port $builddeps {
</span><del>- if {[lsearch -exact $port $rundeps] >= 0 } {
</del><ins>+ if {[lsearch -exact $port $rundeps] >= 0} {
</ins><span class="cx"> lappend removelist $port
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbaseportmgrpackagingmpkgalltcl"></a>
<div class="modfile"><h4>Modified: trunk/base/portmgr/packaging/mpkgall.tcl (116516 => 116517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/portmgr/packaging/mpkgall.tcl 2014-01-27 15:30:01 UTC (rev 116516)
+++ trunk/base/portmgr/packaging/mpkgall.tcl 2014-01-27 15:31:02 UTC (rev 116517)
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx">
</span><span class="cx"> proc write_welcome_html {filename portname portversion long_description description homepage} {
</span><span class="cx"> set fd [open ${filename} w+]
</span><del>- if {$long_description == ""} {
</del><ins>+ if {$long_description eq ""} {
</ins><span class="cx"> set long_description $description
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> <font face=\"Helvetica\">${long_description}</font>
</span><span class="cx"> <p>"
</span><span class="cx">
</span><del>- if {$homepage != ""} {
</del><ins>+ if {$homepage ne ""} {
</ins><span class="cx"> puts $fd "<font face=\"Helvetica\">${homepage}</font><p>"
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> proc mpkg_write_info_plist {infofile portname portversion portrevision destination dependencies} {
</span><span class="cx"> set vers [split $portversion "."]
</span><span class="cx">
</span><del>- if {[string index $destination end] != "/"} {
</del><ins>+ if {[string index $destination end] ne "/"} {
</ins><span class="cx"> append destination /
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbaseportmgrpackagingpackagealltcl"></a>
<div class="modfile"><h4>Modified: trunk/base/portmgr/packaging/packageall.tcl (116516 => 116517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/portmgr/packaging/packageall.tcl 2014-01-27 15:30:01 UTC (rev 116516)
+++ trunk/base/portmgr/packaging/packageall.tcl 2014-01-27 15:31:02 UTC (rev 116517)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> proc ui_isset {val} {
</span><span class="cx"> global ui_options
</span><span class="cx"> if {[info exists ui_options($val)]} {
</span><del>- if {$ui_options($val) == "yes"} {
</del><ins>+ if {$ui_options($val) eq "yes"} {
</ins><span class="cx"> return 1
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx">
</span><span class="cx"> proc pkg_ui_log {message} {
</span><span class="cx"> global logfd
</span><del>- if {[string length $logfd] > 0 } {
</del><ins>+ if {$logfd ne ""} {
</ins><span class="cx"> log_message $logfd $message
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -147,13 +147,13 @@
</span><span class="cx"> set depends {}
</span><span class="cx"> if {[info exists portinfo(depends_run)]} { eval "lappend depends $portinfo(depends_run)" }
</span><span class="cx"> if {[info exists portinfo(depends_lib)]} { eval "lappend depends $portinfo(depends_lib)" }
</span><del>- if {$includeBuildDeps != "" && [info exists portinfo(depends_build)]} {
</del><ins>+ if {$includeBuildDeps ne "" && [info exists portinfo(depends_build)]} {
</ins><span class="cx"> eval "lappend depends $portinfo(depends_build)"
</span><span class="cx"> }
</span><del>- if {$includeBuildDeps != "" && [info exists portinfo(depends_fetch)]} {
</del><ins>+ if {$includeBuildDeps ne "" && [info exists portinfo(depends_fetch)]} {
</ins><span class="cx"> eval "lappend depends $portinfo(depends_fetch)"
</span><span class="cx"> }
</span><del>- if {$includeBuildDeps != "" && [info exists portinfo(depends_extract)]} {
</del><ins>+ if {$includeBuildDeps ne "" && [info exists portinfo(depends_extract)]} {
</ins><span class="cx"> eval "lappend depends $portinfo(depends_extract)"
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -298,7 +298,7 @@
</span><span class="cx"> # If there was a log file left over from the previous pass,
</span><span class="cx"> # then the port failed with an error. Send the log in an
</span><span class="cx"> # email to the maintainers.
</span><del>- if {[string length $logfd] > 0} {
</del><ins>+ if {$logfd ne ""} {
</ins><span class="cx"> close $logfd
</span><span class="cx"> set logfd ""
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbaseportmgrpackagingrpmalltcl"></a>
<div class="modfile"><h4>Modified: trunk/base/portmgr/packaging/rpmall.tcl (116516 => 116517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/portmgr/packaging/rpmall.tcl 2014-01-27 15:30:01 UTC (rev 116516)
+++ trunk/base/portmgr/packaging/rpmall.tcl 2014-01-27 15:31:02 UTC (rev 116517)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> proc ui_isset {val} {
</span><span class="cx"> global ui_options
</span><span class="cx"> if {[info exists ui_options($val)]} {
</span><del>- if {$ui_options($val) == "yes"} {
</del><ins>+ if {$ui_options($val) eq "yes"} {
</ins><span class="cx"> return 1
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx">
</span><span class="cx"> proc pkg_ui_log {message} {
</span><span class="cx"> global logfd
</span><del>- if {[string length $logfd] > 0 } {
</del><ins>+ if {$logfd ne ""} {
</ins><span class="cx"> log_message $logfd $message
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -152,13 +152,13 @@
</span><span class="cx"> set depends {}
</span><span class="cx"> if {[info exists portinfo(depends_run)]} { eval "lappend depends $portinfo(depends_run)" }
</span><span class="cx"> if {[info exists portinfo(depends_lib)]} { eval "lappend depends $portinfo(depends_lib)" }
</span><del>- if {$includeBuildDeps != "" && [info exists portinfo(depends_build)]} {
</del><ins>+ if {$includeBuildDeps ne "" && [info exists portinfo(depends_build)]} {
</ins><span class="cx"> eval "lappend depends $portinfo(depends_build)"
</span><span class="cx"> }
</span><del>- if {$includeBuildDeps != "" && [info exists portinfo(depends_fetch)]} {
</del><ins>+ if {$includeBuildDeps ne "" && [info exists portinfo(depends_fetch)]} {
</ins><span class="cx"> eval "lappend depends $portinfo(depends_fetch)"
</span><span class="cx"> }
</span><del>- if {$includeBuildDeps != "" && [info exists portinfo(depends_extract)]} {
</del><ins>+ if {$includeBuildDeps ne "" && [info exists portinfo(depends_extract)]} {
</ins><span class="cx"> eval "lappend depends $portinfo(depends_extract)"
</span><span class="cx"> }
</span><span class="cx"> foreach depspec $depends {
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx"> # If there was a log file left over from the previous pass,
</span><span class="cx"> # then the port failed with an error. Send the log in an
</span><span class="cx"> # email to the maintainers.
</span><del>- if {[string length $logfd] > 0} {
</del><ins>+ if {$logfd ne ""} {
</ins><span class="cx"> close $logfd
</span><span class="cx"> set logfd ""
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>