<!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>[131423] trunk/base/doc</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/131423">131423</a></dd>
<dt>Author</dt> <dd>ionic@macports.org</dd>
<dt>Date</dt> <dd>2015-01-11 18:41:25 -0800 (Sun, 11 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: clarify that --enforce-variants does not reset any variants but uses normal variants merging.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasedocport1">trunk/base/doc/port.1</a></li>
<li><a href="#trunkbasedocport1txt">trunk/base/doc/port.1.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasedocport1"></a>
<div class="modfile"><h4>Modified: trunk/base/doc/port.1 (131422 => 131423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/doc/port.1 2015-01-12 01:22:21 UTC (rev 131422)
+++ trunk/base/doc/port.1 2015-01-12 02:41:25 UTC (rev 131423)
</span><span class="lines">@@ -891,6 +891,8 @@
</span><span class="cx"> .br
</span><span class="cx"> By selecting the variants to use in the upgraded build of the port, any variants specified on the command line take highest precedence, then the variants active in the latest installed version of the port, and finally the global variants specified in variants\&.conf, if any\&. Note that upgrade will not normally rebuild a port only to change the selected variants; you can either specify
</span><span class="cx"> \fB\-\-enforce\-variants\fR, or deactivate the port and reinstall it with different variants\&.
</span><ins>+\fB\-\-enforce\-variants\fR
+will retain the variant merging procedure described previously\&. Variants will not be reset to the default values\&.
</ins><span class="cx"> .sp .5v
</span><span class="cx"> .RE
</span><span class="cx"> \ \&
</span></span></pre></div>
<a id="trunkbasedocport1txt"></a>
<div class="modfile"><h4>Modified: trunk/base/doc/port.1.txt (131422 => 131423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/doc/port.1.txt 2015-01-12 01:22:21 UTC (rev 131422)
+++ trunk/base/doc/port.1.txt 2015-01-12 02:41:25 UTC (rev 131423)
</span><span class="lines">@@ -407,7 +407,8 @@
</span><span class="cx"> specified in variants.conf, if any. Note that upgrade will not normally rebuild
</span><span class="cx"> a port only to change the selected variants; you can either specify
</span><span class="cx"> *--enforce-variants*, or deactivate the port and reinstall it with different
</span><del>-variants.
</del><ins>+variants. *--enforce-variants* will retain the variant merging procedure
+described previously. Variants will not be reset to the default values.
</ins><span class="cx">
</span><span class="cx"> // Forcing a new paragraph here by inserting a dummy space
</span><span class="cx"> {nbsp}
</span></span></pre>
</div>
</div>
</body>
</html>