[131423] trunk/base/doc

[ionic at macports.org]

Revision: 131423
          https://trac.macports.org/changeset/131423
Author:   ionic at macports.org
Date:     2015-01-11 18:41:25 -0800 (Sun, 11 Jan 2015)
Log Message:
-----------
base: clarify that --enforce-variants does not reset any variants but uses normal variants merging.

Modified Paths:
--------------
    trunk/base/doc/port.1
    trunk/base/doc/port.1.txt

Modified: trunk/base/doc/port.1
===================================================================
--- 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)
@@ -891,6 +891,8 @@
 .br
 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
 \fB\-\-enforce\-variants\fR, or deactivate the port and reinstall it with different variants\&.
+\fB\-\-enforce\-variants\fR
+will retain the variant merging procedure described previously\&. Variants will not be reset to the default values\&.
 .sp .5v
 .RE
 \ \&

Modified: trunk/base/doc/port.1.txt
===================================================================
--- 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)
@@ -407,7 +407,8 @@
 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
 *--enforce-variants*, or deactivate the port and reinstall it with different
-variants.
+variants. *--enforce-variants* will retain the variant merging procedure
+described previously. Variants will not be reset to the default values.
 
 // Forcing a new paragraph here by inserting a dummy space
 {nbsp}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150111/a613362d/attachment.html>