<!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>[133649] 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/133649">133649</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2015-03-07 16:23:53 -0800 (Sat, 07 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>remove obsolete PortInfo(variant_desc)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcportporttcl">trunk/base/src/port/port.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="trunkbasesrcportporttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port/port.tcl (133648 => 133649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port/port.tcl 2015-03-08 00:20:01 UTC (rev 133648)
+++ trunk/base/src/port/port.tcl 2015-03-08 00:23:53 UTC (rev 133649)
</span><span class="lines">@@ -3567,12 +3567,9 @@
</span><span class="cx"> ui_notice "$portname has no variants"
</span><span class="cx"> } else {
</span><span class="cx"> array unset vinfo
</span><del>- # Use the new format if it exists.
</del><ins>+ # Use the variant info if it exists.
</ins><span class="cx"> if {[info exists portinfo(vinfo)]} {
</span><span class="cx"> array set vinfo $portinfo(vinfo)
</span><del>- # Otherwise fall back to the old format.
- } elseif {[info exists portinfo(variant_desc)]} {
- array set vdescriptions $portinfo(variant_desc)
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # print out all the variants
</span><span class="lines">@@ -3606,10 +3603,6 @@
</span><span class="cx"> if {[info exists variant(requires)]} {
</span><span class="cx"> set vrequires $variant(requires)
</span><span class="cx"> }
</span><del>- # Retrieve variants' information from the old format,
- # which only consists of the description.
- } elseif {[info exists vdescriptions($v)]} {
- set vdescription $vdescriptions($v)
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {[info exists vdescription]} {
</span></span></pre></div>
<a id="trunkbasesrcport10portutiltcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portutil.tcl (133648 => 133649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portutil.tcl 2015-03-08 00:20:01 UTC (rev 133648)
+++ trunk/base/src/port1.0/portutil.tcl 2015-03-08 00:23:53 UTC (rev 133649)
</span><span class="lines">@@ -566,9 +566,7 @@
</span><span class="cx"> # Each key in PortInfo(vinfo) maps to an array which contains the
</span><span class="cx"> # following keys:
</span><span class="cx"> # * conflicts
</span><del>- # * description: This key's mapping is duplicated in
- # PortInfo(variant_desc) for backward compatibility
- # reasons (specifically 1.7.0's format of PortIndex).
</del><ins>+ # * description
</ins><span class="cx"> # * is_default: This key exists iff the variant is a default variant.
</span><span class="cx"> # * requires
</span><span class="cx"> if {![info exists PortInfo(vinfo)]} {
</span><span class="lines">@@ -636,9 +634,6 @@
</span><span class="cx"> # Set description.
</span><span class="cx"> if {$vdesc ne ""} {
</span><span class="cx"> array set variant [list description $vdesc]
</span><del>- # XXX: The following line should be removed after 1.8.0 is
- # released.
- lappend PortInfo(variant_desc) $variant_provides $vdesc
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Set requires.
</span></span></pre>
</div>
</div>
</body>
</html>