reword FLAVORS/FLAVOR slightly to make it less confusing.

1 files changed, 14 insertions, 11 deletions

diff --git a/share/man/man5/bsd.port.mk.5 b/share/man/man5/bsd.port.mk.5
index 91ee8afa7e8..48612d63b44 100644
--- a/share/man/man5/bsd.port.mk.5
+++ b/share/man/man5/bsd.port.mk.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bsd.port.mk.5,v 1.227 2009/05/16 22:19:06 simon Exp $
+.\" $OpenBSD: bsd.port.mk.5,v 1.228 2009/05/19 19:43:17 espie Exp $
 .\"
 .\" Copyright (c) 2000-2008 Marc Espie
 .\"
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 16 2009 $
+.Dd $Mdocdate: May 19 2009 $
 .Dt BSD.PORT.MK 5
 .Os
 .Sh NAME
@@ -2436,9 +2436,11 @@ FLAVORS and MULTI_PACKAGES.
 The current MULTI_PACKAGES mechanism was introduced after
 .Ox 4.0 .
 .Pp
-If a port can be compiled with several options, set FLAVORS to the list of
-possible options in the Makefile.
-When building the port, set
+If a port can be compiled with several options, these options 
+should be turned into FLAVORS.
+The port maintainer will set FLAVORS to be the list of possible options in 
+the Makefile.
+When building the port, the package builder will set
 .Li "FLAVOR='option1 option2...'"
 to build a specific flavor of the port.
 The Makefile should test the value of FLAVOR as follows:
@@ -2454,12 +2456,13 @@ FLAVOR?=
 .Pp
 .Pa bsd.port.mk
 takes care of a few details, such as generating a distinct work directory for
-each flavor, or adding a dash separated list of options to the package
-name.
-The order in which FLAVOR is specified does not matter: the generated list,
-called the canonical package extension, matches the ordering of FLAVORS.
-Also, it is an error to specify an option in FLAVOR that does not appear
-in FLAVORS.
+each flavor, or creating a FULLPKGNAME by adding a dash separated list of 
+flavors to the base package name.
+The order in which FLAVOR is specified does not matter: this dash separated
+list will be reordered to match the ordering of FLAVORS.
+.Pp
+It is an error to specify an option in FLAVOR that does not appear in FLAVORS,
+to prevent misspellings.
 .Pp
 In recursive package building, flavors can be specified as a comma
 separated list after the package directory, e.g., SUBDIR+=vim,no_x11.