regen

2 files changed, 26 insertions, 19 deletions

diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html
index b5ab9d5389a..d9b70a357f6 100644
--- a/doc/pkgsrc.html
+++ b/doc/pkgsrc.html
@@ -227,8 +227,8 @@ alink="#0000FF">
             <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 @@ alink="#0000FF">
           <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 @@ CFLAGS= -xtarget=ultra -xarch=v9
 
           <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 @@ CFLAGS= -xtarget=ultra -xarch=v9
               <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 @@ CONFIGURE_ARGS+=        --enable-ldap=${BUILDLINK_PREFIX.openldap}
           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 --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index a707f380e49..4c58abcfc81 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -71,7 +71,7 @@ I. The pkgsrc user's guide
 
     5. Configuring pkgsrc
 
-        5.1. Selecting build options
+        5.1. Selecting Build Options
 
     6. Creating binary packages
 
@@ -454,7 +454,7 @@ Table of Contents
 
 5. Configuring pkgsrc
 
-    5.1. Selecting build options
+    5.1. Selecting Build Options
 
 6. Creating binary packages
 
@@ -1174,9 +1174,9 @@ Chapter 5. Configuring pkgsrc
 
 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 @@ A package should never modify PKG_DEFAULT_OPTIONS or the variable named in
 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