[pkgsrc/trunk]: pkgsrc/doc regen

[dillo <dillo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/febbd1706013
branches:  trunk
changeset: 495495:febbd1706013
user:      dillo <dillo%pkgsrc.org@localhost>
date:      Sat Jun 11 16:33:48 2005 +0000

description:
regen

diffstat:

 doc/pkgsrc.html |  28 ++++++++++++++++------------
 doc/pkgsrc.txt  |  19 +++++++++++--------
 2 files changed, 27 insertions(+), 20 deletions(-)

diffs (119 lines):

diff -r 0d253e1464cd -r febbd1706013 doc/pkgsrc.html
--- a/doc/pkgsrc.html   Sat Jun 11 16:31:40 2005 +0000
+++ b/doc/pkgsrc.html   Sat Jun 11 16:33:48 2005 +0000
@@ -227,8 +227,8 @@
             <dd>
               <dl>
                 <dt><span class="sect1"><a href=
-                "#selecting-options">5.1. Selecting build
-                options</a></span></dt>
+                "#selecting-options">5.1. Selecting Build
+                Options</a></span></dt>
               </dl>
             </dd>
 
@@ -1397,8 +1397,8 @@
           <dd>
             <dl>
               <dt><span class="sect1"><a href=
-              "#selecting-options">5.1. Selecting build
-              options</a></span></dt>
+              "#selecting-options">5.1. Selecting Build
+              Options</a></span></dt>
             </dl>
           </dd>
 
@@ -3107,8 +3107,8 @@
 
           <dl>
             <dt><span class="sect1"><a href=
-            "#selecting-options">5.1. Selecting build
-            options</a></span></dt>
+            "#selecting-options">5.1. Selecting Build
+            Options</a></span></dt>
           </dl>
         </div>
 
@@ -3118,8 +3118,8 @@
               <div>
                 <h2 class="title" style="clear: both"><a name=
                 "selecting-options" id=
-                "selecting-options"></a>5.1.&nbsp;Selecting build
-                options</h2>
+                "selecting-options"></a>5.1.&nbsp;Selecting Build
+                Options</h2>
               </div>
             </div>
           </div>
@@ -8930,13 +8930,17 @@
           set of options, use <code class=
           "varname">PKG_SUGGESTED_OPTIONS</code>.</p>
 
-          <p><code class="varname">PKG_OPTIONS_VAR</code> and at
-          least one of <code class=
+          <p><code class="varname">PKG_OPTIONS_VAR</code> must be
+          defined before including <code class=
+          "filename">bsd.options.mk</code>. If none of <code class=
           "varname">PKG_SUPPORTED_OPTIONS</code>, <code class=
           "varname">PKG_OPTIONS_OPTIONAL_GROUPS</code>, and
           <code class="varname">PKG_OPTIONS_REQUIRED_GROUPS</code>
-          must be defined before including <code class=
-          "filename">bsd.options.mk</code>.</p>
+          are defined (as can happen with platform specific options
+          if none of them is supported on the current platform),
+          <code class="varname">PKG_OPTIONS</code> is set to the
+          empty list and the package is otherwise treated as not
+          using the options framework.</p>
 
           <p>After the inclusion of <code class=
           "filename">bsd.options.mk</code>, the variable
diff -r 0d253e1464cd -r febbd1706013 doc/pkgsrc.txt
--- a/doc/pkgsrc.txt    Sat Jun 11 16:31:40 2005 +0000
+++ b/doc/pkgsrc.txt    Sat Jun 11 16:33:48 2005 +0000
@@ -71,7 +71,7 @@
 
     5. Configuring pkgsrc
 
-        5.1. Selecting build options
+        5.1. Selecting Build Options
 
     6. Creating binary packages
 
@@ -454,7 +454,7 @@
 
 5. Configuring pkgsrc
 
-    5.1. Selecting build options
+    5.1. Selecting Build Options
 
 6. Creating binary packages
 
@@ -1174,9 +1174,9 @@
 
 Table of Contents
 
-5.1. Selecting build options
-
-5.1. Selecting build options
+5.1. Selecting Build Options
+
+5.1. Selecting Build Options
 
 Some packages have build time options, usually to select between different
 dependencies, enable optional support for big dependencies or enable
@@ -3557,9 +3557,12 @@
 PKG_OPTIONS_VAR. These are strictly user-settable. To suggest a default set of
 options, use PKG_SUGGESTED_OPTIONS.
 
-PKG_OPTIONS_VAR and at least one of PKG_SUPPORTED_OPTIONS,
-PKG_OPTIONS_OPTIONAL_GROUPS, and PKG_OPTIONS_REQUIRED_GROUPS must be defined
-before including bsd.options.mk.
+PKG_OPTIONS_VAR must be defined before including bsd.options.mk. If none of
+PKG_SUPPORTED_OPTIONS, PKG_OPTIONS_OPTIONAL_GROUPS, and
+PKG_OPTIONS_REQUIRED_GROUPS are defined (as can happen with platform specific
+options if none of them is supported on the current platform), PKG_OPTIONS is
+set to the empty list and the package is otherwise treated as not using the
+options framework.
 
 After the inclusion of bsd.options.mk, the variable PKG_OPTIONS contains the
 list of selected build options, properly filtered to remove unsupported and