From 35c6cb7187b136df8080d04a6714b0293860f1bf Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Fri, 20 May 2005 10:04:41 +0000
Subject: Regenerated.

---
 doc/pkgsrc.html | 501 ++++++++++++++++++++++++++++----------------------------
 doc/pkgsrc.txt  |  21 ++-
 2 files changed, 258 insertions(+), 264 deletions(-)

diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html
index 1bc6da6a604..f9f7124b7b1 100644
--- a/doc/pkgsrc.html
+++ b/doc/pkgsrc.html
@@ -542,7 +542,7 @@ alink="#0000FF">
                 "#build.prefix">12.1. Program
                 location</a></span></dt>
 
-                <dt><span class="sect1"><a href="#id2631337">12.2.
+                <dt><span class="sect1"><a href="#id2631338">12.2.
                 Main targets</a></span></dt>
 
                 <dt><span class="sect1"><a href=
@@ -556,17 +556,17 @@ alink="#0000FF">
 
             <dd>
               <dl>
-                <dt><span class="sect1"><a href="#id2632834">13.1.
+                <dt><span class="sect1"><a href="#id2632835">13.1.
                 General operation</a></span></dt>
 
                 <dd>
                   <dl>
                     <dt><span class="sect2"><a href=
-                    "#id2632837">13.1.1. How to pull in variables
+                    "#id2632838">13.1.1. How to pull in variables
                     from /etc/mk.conf</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2632920">13.1.2. Restricted
+                    "#id2632921">13.1.2. Restricted
                     packages</a></span></dt>
 
                     <dt><span class="sect2"><a href=
@@ -574,15 +574,15 @@ alink="#0000FF">
                     dependencies</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2633373">13.1.4. Handling conflicts with
+                    "#id2633374">13.1.4. Handling conflicts with
                     other packages</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2633492">13.1.5. Packages that cannot or
+                    "#id2633493">13.1.5. Packages that cannot or
                     should not be built</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2633517">13.1.6. Packages which should not
+                    "#id2633518">13.1.6. Packages which should not
                     be deleted, once installed</a></span></dt>
 
                     <dt><span class="sect2"><a href=
@@ -590,37 +590,37 @@ alink="#0000FF">
                     with security problems</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2633677">13.1.8. How to handle compiler
+                    "#id2633678">13.1.8. How to handle compiler
                     bugs</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2633700">13.1.9. How to handle incrementing
+                    "#id2633701">13.1.9. How to handle incrementing
                     versions when fixing an existing
                     package</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2633817">13.1.10. Portability of
+                    "#id2633818">13.1.10. Portability of
                     packages</a></span></dt>
                   </dl>
                 </dd>
 
-                <dt><span class="sect1"><a href="#id2633842">13.2.
+                <dt><span class="sect1"><a href="#id2633843">13.2.
                 Possible downloading issues</a></span></dt>
 
                 <dd>
                   <dl>
                     <dt><span class="sect2"><a href=
-                    "#id2633845">13.2.1. Packages whose distfiles
+                    "#id2633846">13.2.1. Packages whose distfiles
                     aren't available for plain
                     downloading</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2633908">13.2.2. How to handle modified
+                    "#id2633909">13.2.2. How to handle modified
                     distfiles with the 'old' name</a></span></dt>
                   </dl>
                 </dd>
 
-                <dt><span class="sect1"><a href="#id2633920">13.3.
+                <dt><span class="sect1"><a href="#id2633921">13.3.
                 Configuration gotchas</a></span></dt>
 
                 <dd>
@@ -630,66 +630,66 @@ alink="#0000FF">
                     libtool</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2634285">13.3.2. Using libtool on GNU
+                    "#id2634286">13.3.2. Using libtool on GNU
                     packages that already support
                     libtool</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2634503">13.3.3. GNU
+                    "#id2634504">13.3.3. GNU
                     Autoconf/Automake</a></span></dt>
                   </dl>
                 </dd>
 
-                <dt><span class="sect1"><a href="#id2634616">13.4.
+                <dt><span class="sect1"><a href="#id2634617">13.4.
                 Building considerations</a></span></dt>
 
                 <dd>
                   <dl>
                     <dt><span class="sect2"><a href=
-                    "#id2634619">13.4.1. CPP
+                    "#id2634620">13.4.1. CPP
                     defines</a></span></dt>
                   </dl>
                 </dd>
 
-                <dt><span class="sect1"><a href="#id2634649">13.5.
+                <dt><span class="sect1"><a href="#id2634650">13.5.
                 Package specific actions</a></span></dt>
 
                 <dd>
                   <dl>
                     <dt><span class="sect2"><a href=
-                    "#id2634652">13.5.1. Package configuration
+                    "#id2634653">13.5.1. Package configuration
                     files</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2634755">13.5.2. User
+                    "#id2634756">13.5.2. User
                     interaction</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2634800">13.5.3. Handling
+                    "#id2634801">13.5.3. Handling
                     licenses</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2634951">13.5.4. Creating an account from a
+                    "#id2634884">13.5.4. Creating an account from a
                     package</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2635013">13.5.5. Installing score
+                    "#id2635014">13.5.5. Installing score
                     files</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2635057">13.5.6. Packages providing login
+                    "#id2635058">13.5.6. Packages providing login
                     shells</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2635114">13.5.7. Packages containing perl
+                    "#id2635115">13.5.7. Packages containing perl
                     scripts</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2635132">13.5.8. Packages with hardcoded
+                    "#id2635133">13.5.8. Packages with hardcoded
                     paths to other interpreters</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2635154">13.5.9. Packages installing perl
+                    "#id2635155">13.5.9. Packages installing perl
                     modules</a></span></dt>
 
                     <dt><span class="sect2"><a href=
@@ -697,40 +697,40 @@ alink="#0000FF">
                     info files</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2635510">13.5.11. Packages installing
+                    "#id2635511">13.5.11. Packages installing
                     GConf2 data files</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2635678">13.5.12. Packages installing
+                    "#id2635680">13.5.12. Packages installing
                     scrollkeeper data files</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2635730">13.5.13. Packages installing X11
+                    "#id2635731">13.5.13. Packages installing X11
                     fonts</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2635777">13.5.14. Packages installing GTK2
+                    "#id2635778">13.5.14. Packages installing GTK2
                     modules</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2635846">13.5.15. Packages installing SGML
+                    "#id2635847">13.5.15. Packages installing SGML
                     or XML data</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2635898">13.5.16. Packages installing
+                    "#id2635899">13.5.16. Packages installing
                     extensions to the MIME database</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2636037">13.5.17. Packages using
+                    "#id2636038">13.5.17. Packages using
                     intltool</a></span></dt>
 
                     <dt><span class="sect2"><a href=
-                    "#id2636051">13.5.18. Packages installing
+                    "#id2636052">13.5.18. Packages installing
                     startup scripts</a></span></dt>
                   </dl>
                 </dd>
 
-                <dt><span class="sect1"><a href="#id2636072">13.6.
+                <dt><span class="sect1"><a href="#id2636073">13.6.
                 Feedback to the author</a></span></dt>
               </dl>
             </dd>
@@ -743,18 +743,18 @@ alink="#0000FF">
 
             <dd>
               <dl>
-                <dt><span class="sect1"><a href="#id2636739">15.1.
+                <dt><span class="sect1"><a href="#id2636740">15.1.
                 Submitting your packages</a></span></dt>
 
-                <dt><span class="sect1"><a href="#id2636796">15.2.
+                <dt><span class="sect1"><a href="#id2636797">15.2.
                 Committing: Importing a package into
                 CVS</a></span></dt>
 
-                <dt><span class="sect1"><a href="#id2636859">15.3.
+                <dt><span class="sect1"><a href="#id2636860">15.3.
                 Updating a package to a newer
                 version</a></span></dt>
 
-                <dt><span class="sect1"><a href="#id2636878">15.4.
+                <dt><span class="sect1"><a href="#id2636880">15.4.
                 Moving a package in pkgsrc</a></span></dt>
               </dl>
             </dd>
@@ -766,27 +766,27 @@ alink="#0000FF">
 
         <dd>
           <dl>
-            <dt><span class="sect1"><a href="#id2637036">A.1.
+            <dt><span class="sect1"><a href="#id2637037">A.1.
             files</a></span></dt>
 
             <dd>
               <dl>
-                <dt><span class="sect2"><a href="#id2637040">A.1.1.
+                <dt><span class="sect2"><a href="#id2637041">A.1.1.
                 Makefile</a></span></dt>
 
-                <dt><span class="sect2"><a href="#id2637047">A.1.2.
+                <dt><span class="sect2"><a href="#id2637048">A.1.2.
                 DESCR</a></span></dt>
 
-                <dt><span class="sect2"><a href="#id2637062">A.1.3.
+                <dt><span class="sect2"><a href="#id2637063">A.1.3.
                 PLIST</a></span></dt>
 
-                <dt><span class="sect2"><a href="#id2637069">A.1.4.
+                <dt><span class="sect2"><a href="#id2637070">A.1.4.
                 Checking a package with <span><strong class=
                 "command">pkglint</strong></span></a></span></dt>
               </dl>
             </dd>
 
-            <dt><span class="sect1"><a href="#id2637110">A.2. Steps
+            <dt><span class="sect1"><a href="#id2637111">A.2. Steps
             for building, installing, packaging</a></span></dt>
           </dl>
         </dd>
@@ -812,10 +812,10 @@ alink="#0000FF">
 
         <dd>
           <dl>
-            <dt><span class="sect1"><a href="#id2637893">D.1.
+            <dt><span class="sect1"><a href="#id2637894">D.1.
             Targets</a></span></dt>
 
-            <dt><span class="sect1"><a href="#id2637958">D.2.
+            <dt><span class="sect1"><a href="#id2637959">D.2.
             Procedure</a></span></dt>
           </dl>
         </dd>
@@ -4984,7 +4984,7 @@ CONF_FILES=   ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
               <dt><span class="sect1"><a href="#build.prefix">12.1.
               Program location</a></span></dt>
 
-              <dt><span class="sect1"><a href="#id2631337">12.2.
+              <dt><span class="sect1"><a href="#id2631338">12.2.
               Main targets</a></span></dt>
 
               <dt><span class="sect1"><a href=
@@ -4998,17 +4998,17 @@ CONF_FILES=   ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
 
           <dd>
             <dl>
-              <dt><span class="sect1"><a href="#id2632834">13.1.
+              <dt><span class="sect1"><a href="#id2632835">13.1.
               General operation</a></span></dt>
 
               <dd>
                 <dl>
                   <dt><span class="sect2"><a href=
-                  "#id2632837">13.1.1. How to pull in variables
+                  "#id2632838">13.1.1. How to pull in variables
                   from /etc/mk.conf</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2632920">13.1.2. Restricted
+                  "#id2632921">13.1.2. Restricted
                   packages</a></span></dt>
 
                   <dt><span class="sect2"><a href=
@@ -5016,15 +5016,15 @@ CONF_FILES=   ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
                   dependencies</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2633373">13.1.4. Handling conflicts with
+                  "#id2633374">13.1.4. Handling conflicts with
                   other packages</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2633492">13.1.5. Packages that cannot or
+                  "#id2633493">13.1.5. Packages that cannot or
                   should not be built</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2633517">13.1.6. Packages which should not be
+                  "#id2633518">13.1.6. Packages which should not be
                   deleted, once installed</a></span></dt>
 
                   <dt><span class="sect2"><a href=
@@ -5032,37 +5032,37 @@ CONF_FILES=   ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
                   with security problems</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2633677">13.1.8. How to handle compiler
+                  "#id2633678">13.1.8. How to handle compiler
                   bugs</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2633700">13.1.9. How to handle incrementing
+                  "#id2633701">13.1.9. How to handle incrementing
                   versions when fixing an existing
                   package</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2633817">13.1.10. Portability of
+                  "#id2633818">13.1.10. Portability of
                   packages</a></span></dt>
                 </dl>
               </dd>
 
-              <dt><span class="sect1"><a href="#id2633842">13.2.
+              <dt><span class="sect1"><a href="#id2633843">13.2.
               Possible downloading issues</a></span></dt>
 
               <dd>
                 <dl>
                   <dt><span class="sect2"><a href=
-                  "#id2633845">13.2.1. Packages whose distfiles
+                  "#id2633846">13.2.1. Packages whose distfiles
                   aren't available for plain
                   downloading</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2633908">13.2.2. How to handle modified
+                  "#id2633909">13.2.2. How to handle modified
                   distfiles with the 'old' name</a></span></dt>
                 </dl>
               </dd>
 
-              <dt><span class="sect1"><a href="#id2633920">13.3.
+              <dt><span class="sect1"><a href="#id2633921">13.3.
               Configuration gotchas</a></span></dt>
 
               <dd>
@@ -5072,65 +5072,65 @@ CONF_FILES=   ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
                   libtool</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2634285">13.3.2. Using libtool on GNU
+                  "#id2634286">13.3.2. Using libtool on GNU
                   packages that already support
                   libtool</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2634503">13.3.3. GNU
+                  "#id2634504">13.3.3. GNU
                   Autoconf/Automake</a></span></dt>
                 </dl>
               </dd>
 
-              <dt><span class="sect1"><a href="#id2634616">13.4.
+              <dt><span class="sect1"><a href="#id2634617">13.4.
               Building considerations</a></span></dt>
 
               <dd>
                 <dl>
                   <dt><span class="sect2"><a href=
-                  "#id2634619">13.4.1. CPP defines</a></span></dt>
+                  "#id2634620">13.4.1. CPP defines</a></span></dt>
                 </dl>
               </dd>
 
-              <dt><span class="sect1"><a href="#id2634649">13.5.
+              <dt><span class="sect1"><a href="#id2634650">13.5.
               Package specific actions</a></span></dt>
 
               <dd>
                 <dl>
                   <dt><span class="sect2"><a href=
-                  "#id2634652">13.5.1. Package configuration
+                  "#id2634653">13.5.1. Package configuration
                   files</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2634755">13.5.2. User
+                  "#id2634756">13.5.2. User
                   interaction</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2634800">13.5.3. Handling
+                  "#id2634801">13.5.3. Handling
                   licenses</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2634951">13.5.4. Creating an account from a
+                  "#id2634884">13.5.4. Creating an account from a
                   package</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2635013">13.5.5. Installing score
+                  "#id2635014">13.5.5. Installing score
                   files</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2635057">13.5.6. Packages providing login
+                  "#id2635058">13.5.6. Packages providing login
                   shells</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2635114">13.5.7. Packages containing perl
+                  "#id2635115">13.5.7. Packages containing perl
                   scripts</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2635132">13.5.8. Packages with hardcoded
+                  "#id2635133">13.5.8. Packages with hardcoded
                   paths to other interpreters</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2635154">13.5.9. Packages installing perl
+                  "#id2635155">13.5.9. Packages installing perl
                   modules</a></span></dt>
 
                   <dt><span class="sect2"><a href=
@@ -5138,40 +5138,40 @@ CONF_FILES=   ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
                   info files</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2635510">13.5.11. Packages installing GConf2
+                  "#id2635511">13.5.11. Packages installing GConf2
                   data files</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2635678">13.5.12. Packages installing
+                  "#id2635680">13.5.12. Packages installing
                   scrollkeeper data files</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2635730">13.5.13. Packages installing X11
+                  "#id2635731">13.5.13. Packages installing X11
                   fonts</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2635777">13.5.14. Packages installing GTK2
+                  "#id2635778">13.5.14. Packages installing GTK2
                   modules</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2635846">13.5.15. Packages installing SGML or
+                  "#id2635847">13.5.15. Packages installing SGML or
                   XML data</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2635898">13.5.16. Packages installing
+                  "#id2635899">13.5.16. Packages installing
                   extensions to the MIME database</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2636037">13.5.17. Packages using
+                  "#id2636038">13.5.17. Packages using
                   intltool</a></span></dt>
 
                   <dt><span class="sect2"><a href=
-                  "#id2636051">13.5.18. Packages installing startup
+                  "#id2636052">13.5.18. Packages installing startup
                   scripts</a></span></dt>
                 </dl>
               </dd>
 
-              <dt><span class="sect1"><a href="#id2636072">13.6.
+              <dt><span class="sect1"><a href="#id2636073">13.6.
               Feedback to the author</a></span></dt>
             </dl>
           </dd>
@@ -5184,17 +5184,17 @@ CONF_FILES=   ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
 
           <dd>
             <dl>
-              <dt><span class="sect1"><a href="#id2636739">15.1.
+              <dt><span class="sect1"><a href="#id2636740">15.1.
               Submitting your packages</a></span></dt>
 
-              <dt><span class="sect1"><a href="#id2636796">15.2.
+              <dt><span class="sect1"><a href="#id2636797">15.2.
               Committing: Importing a package into
               CVS</a></span></dt>
 
-              <dt><span class="sect1"><a href="#id2636859">15.3.
+              <dt><span class="sect1"><a href="#id2636860">15.3.
               Updating a package to a newer version</a></span></dt>
 
-              <dt><span class="sect1"><a href="#id2636878">15.4.
+              <dt><span class="sect1"><a href="#id2636880">15.4.
               Moving a package in pkgsrc</a></span></dt>
             </dl>
           </dd>
@@ -7707,17 +7707,8 @@ CONFIGURE_ARGS+=        --enable-sasl=${BUILDLINK_PREFIX.sasl}
       
 </pre>
 
-          <p>The first section only exists if you are converting a
-          package that had its own ad-hoc options handling to use
-          <code class="filename">bsd.options.mk</code>. It converts
-          global or legacy options variables into an equivalent
-          <code class="varname">PKG_OPTIONS.<em class=
-          "replaceable"><code>pkg</code></em></code> value. These
-          sections will be removed over time as the old options are
-          in turn deprecated and removed.</p>
-
-          <p>The second section contains the information about
-          which build options are supported by the package, and any
+          <p>The first section contains the information about which
+          build options are supported by the package, and any
           default options settings if needed.</p>
 
           <div class="orderedlist">
@@ -7763,7 +7754,7 @@ CONFIGURE_ARGS+=        --enable-sasl=${BUILDLINK_PREFIX.sasl}
         PKG_DEFAULT_OPTIONS=    kerberos ldap sasl
         PKG_OPTIONS_VAR=        WIBBLE_OPTIONS
         WIBBLE_OPTIONS=         ${PKG_DEFAULT_OPTIONS} -sasl
-        # implies PKG_OPTIONS == "kerberos ldap"
+        # leads to PKG_OPTIONS = kerberos ldap
           
 </pre>
 
@@ -7771,30 +7762,34 @@ CONFIGURE_ARGS+=        --enable-sasl=${BUILDLINK_PREFIX.sasl}
                 <pre class="programlisting">
         PKG_OPTIONS_VAR=        WIBBLE_OPTIONS
         WIBBLE_OPTIONS=         kerberos -ldap ldap
-        # implies PKG_OPTIONS == "kerberos"
+        # leads to PKG_OPTIONS = kerberos
           
 </pre>
 
                 <p>This variable should be set in <code class=
                 "filename">/etc/mk.conf</code>.</p>
               </li>
-            </ol>
-          </div>
 
-          <p>After the inclusion of bsd.options.mk, the following
-          variables are set:</p>
-
-          <div class="itemizedlist">
-            <ul type="disc">
               <li>
-                <p><code class="varname">PKG_OPTIONS</code>
-                contains the list of the selected build options,
-                properly filtered to remove unsupported and
-                duplicate options.</p>
+                <p>The <code class=
+                "varname">PKG_OPTIONS_LEGACY_VARS</code> is only
+                needed if you are converting a package that had its
+                own ad-hoc options handling to use <code class=
+                "filename">bsd.options.mk</code>. It converts
+                global or legacy options variables into an
+                equivalent <code class=
+                "varname">PKG_OPTIONS.<em class=
+                "replaceable"><code>pkg</code></em></code>
+                value.</p>
               </li>
-            </ul>
+            </ol>
           </div>
 
+          <p>After the inclusion of bsd.options.mk, the variable
+          <code class="varname">PKG_OPTIONS</code> contains the
+          list of the selected build options, properly filtered to
+          remove unsupported and duplicate options.</p>
+
           <p>The remaining sections contain the logic that is
           specific to each option. There should be a check for
           every option listed in <code class=
@@ -7824,7 +7819,7 @@ CONFIGURE_ARGS+=        --enable-sasl=${BUILDLINK_PREFIX.sasl}
             <dt><span class="sect1"><a href="#build.prefix">12.1.
             Program location</a></span></dt>
 
-            <dt><span class="sect1"><a href="#id2631337">12.2. Main
+            <dt><span class="sect1"><a href="#id2631338">12.2. Main
             targets</a></span></dt>
 
             <dt><span class="sect1"><a href=
@@ -8026,7 +8021,7 @@ GTKDIR_DEFAULT= ${LOCALBASE}
             <div>
               <div>
                 <h2 class="title" style="clear: both"><a name=
-                "id2631337" id="id2631337"></a>12.2.&nbsp;Main
+                "id2631338" id="id2631338"></a>12.2.&nbsp;Main
                 targets</h2>
               </div>
             </div>
@@ -8805,17 +8800,17 @@ make build
           <p><b>Table of Contents</b></p>
 
           <dl>
-            <dt><span class="sect1"><a href="#id2632834">13.1.
+            <dt><span class="sect1"><a href="#id2632835">13.1.
             General operation</a></span></dt>
 
             <dd>
               <dl>
                 <dt><span class="sect2"><a href=
-                "#id2632837">13.1.1. How to pull in variables from
+                "#id2632838">13.1.1. How to pull in variables from
                 /etc/mk.conf</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2632920">13.1.2. Restricted
+                "#id2632921">13.1.2. Restricted
                 packages</a></span></dt>
 
                 <dt><span class="sect2"><a href=
@@ -8823,15 +8818,15 @@ make build
                 dependencies</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2633373">13.1.4. Handling conflicts with other
+                "#id2633374">13.1.4. Handling conflicts with other
                 packages</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2633492">13.1.5. Packages that cannot or should
+                "#id2633493">13.1.5. Packages that cannot or should
                 not be built</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2633517">13.1.6. Packages which should not be
+                "#id2633518">13.1.6. Packages which should not be
                 deleted, once installed</a></span></dt>
 
                 <dt><span class="sect2"><a href=
@@ -8839,37 +8834,37 @@ make build
                 security problems</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2633677">13.1.8. How to handle compiler
+                "#id2633678">13.1.8. How to handle compiler
                 bugs</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2633700">13.1.9. How to handle incrementing
+                "#id2633701">13.1.9. How to handle incrementing
                 versions when fixing an existing
                 package</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2633817">13.1.10. Portability of
+                "#id2633818">13.1.10. Portability of
                 packages</a></span></dt>
               </dl>
             </dd>
 
-            <dt><span class="sect1"><a href="#id2633842">13.2.
+            <dt><span class="sect1"><a href="#id2633843">13.2.
             Possible downloading issues</a></span></dt>
 
             <dd>
               <dl>
                 <dt><span class="sect2"><a href=
-                "#id2633845">13.2.1. Packages whose distfiles
+                "#id2633846">13.2.1. Packages whose distfiles
                 aren't available for plain
                 downloading</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2633908">13.2.2. How to handle modified
+                "#id2633909">13.2.2. How to handle modified
                 distfiles with the 'old' name</a></span></dt>
               </dl>
             </dd>
 
-            <dt><span class="sect1"><a href="#id2633920">13.3.
+            <dt><span class="sect1"><a href="#id2633921">13.3.
             Configuration gotchas</a></span></dt>
 
             <dd>
@@ -8879,64 +8874,64 @@ make build
                 libtool</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2634285">13.3.2. Using libtool on GNU packages
+                "#id2634286">13.3.2. Using libtool on GNU packages
                 that already support libtool</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2634503">13.3.3. GNU
+                "#id2634504">13.3.3. GNU
                 Autoconf/Automake</a></span></dt>
               </dl>
             </dd>
 
-            <dt><span class="sect1"><a href="#id2634616">13.4.
+            <dt><span class="sect1"><a href="#id2634617">13.4.
             Building considerations</a></span></dt>
 
             <dd>
               <dl>
                 <dt><span class="sect2"><a href=
-                "#id2634619">13.4.1. CPP defines</a></span></dt>
+                "#id2634620">13.4.1. CPP defines</a></span></dt>
               </dl>
             </dd>
 
-            <dt><span class="sect1"><a href="#id2634649">13.5.
+            <dt><span class="sect1"><a href="#id2634650">13.5.
             Package specific actions</a></span></dt>
 
             <dd>
               <dl>
                 <dt><span class="sect2"><a href=
-                "#id2634652">13.5.1. Package configuration
+                "#id2634653">13.5.1. Package configuration
                 files</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2634755">13.5.2. User
+                "#id2634756">13.5.2. User
                 interaction</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2634800">13.5.3. Handling
+                "#id2634801">13.5.3. Handling
                 licenses</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2634951">13.5.4. Creating an account from a
+                "#id2634884">13.5.4. Creating an account from a
                 package</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2635013">13.5.5. Installing score
+                "#id2635014">13.5.5. Installing score
                 files</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2635057">13.5.6. Packages providing login
+                "#id2635058">13.5.6. Packages providing login
                 shells</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2635114">13.5.7. Packages containing perl
+                "#id2635115">13.5.7. Packages containing perl
                 scripts</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2635132">13.5.8. Packages with hardcoded paths
+                "#id2635133">13.5.8. Packages with hardcoded paths
                 to other interpreters</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2635154">13.5.9. Packages installing perl
+                "#id2635155">13.5.9. Packages installing perl
                 modules</a></span></dt>
 
                 <dt><span class="sect2"><a href=
@@ -8944,40 +8939,40 @@ make build
                 files</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2635510">13.5.11. Packages installing GConf2
+                "#id2635511">13.5.11. Packages installing GConf2
                 data files</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2635678">13.5.12. Packages installing
+                "#id2635680">13.5.12. Packages installing
                 scrollkeeper data files</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2635730">13.5.13. Packages installing X11
+                "#id2635731">13.5.13. Packages installing X11
                 fonts</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2635777">13.5.14. Packages installing GTK2
+                "#id2635778">13.5.14. Packages installing GTK2
                 modules</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2635846">13.5.15. Packages installing SGML or
+                "#id2635847">13.5.15. Packages installing SGML or
                 XML data</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2635898">13.5.16. Packages installing
+                "#id2635899">13.5.16. Packages installing
                 extensions to the MIME database</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2636037">13.5.17. Packages using
+                "#id2636038">13.5.17. Packages using
                 intltool</a></span></dt>
 
                 <dt><span class="sect2"><a href=
-                "#id2636051">13.5.18. Packages installing startup
+                "#id2636052">13.5.18. Packages installing startup
                 scripts</a></span></dt>
               </dl>
             </dd>
 
-            <dt><span class="sect1"><a href="#id2636072">13.6.
+            <dt><span class="sect1"><a href="#id2636073">13.6.
             Feedback to the author</a></span></dt>
           </dl>
         </div>
@@ -8987,7 +8982,7 @@ make build
             <div>
               <div>
                 <h2 class="title" style="clear: both"><a name=
-                "id2632834" id="id2632834"></a>13.1.&nbsp;General
+                "id2632835" id="id2632835"></a>13.1.&nbsp;General
                 operation</h2>
               </div>
             </div>
@@ -8997,8 +8992,8 @@ make build
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2632837" id=
-                  "id2632837"></a>13.1.1.&nbsp;How to pull in
+                  <h3 class="title"><a name="id2632838" id=
+                  "id2632838"></a>13.1.1.&nbsp;How to pull in
                   variables from /etc/mk.conf</h3>
                 </div>
               </div>
@@ -9058,8 +9053,8 @@ CFLAGS+=  -your -flags
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2632920" id=
-                  "id2632920"></a>13.1.2.&nbsp;Restricted
+                  <h3 class="title"><a name="id2632921" id=
+                  "id2632921"></a>13.1.2.&nbsp;Restricted
                   packages</h3>
                 </div>
               </div>
@@ -9366,8 +9361,8 @@ pre-clean:
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2633373" id=
-                  "id2633373"></a>13.1.4.&nbsp;Handling conflicts
+                  <h3 class="title"><a name="id2633374" id=
+                  "id2633374"></a>13.1.4.&nbsp;Handling conflicts
                   with other packages</h3>
                 </div>
               </div>
@@ -9414,8 +9409,8 @@ CONFLICTS=      Xaw3d-[0-9]*
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2633492" id=
-                  "id2633492"></a>13.1.5.&nbsp;Packages that cannot
+                  <h3 class="title"><a name="id2633493" id=
+                  "id2633493"></a>13.1.5.&nbsp;Packages that cannot
                   or should not be built</h3>
                 </div>
               </div>
@@ -9446,8 +9441,8 @@ CONFLICTS=      Xaw3d-[0-9]*
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2633517" id=
-                  "id2633517"></a>13.1.6.&nbsp;Packages which
+                  <h3 class="title"><a name="id2633518" id=
+                  "id2633518"></a>13.1.6.&nbsp;Packages which
                   should not be deleted, once installed</h3>
                 </div>
               </div>
@@ -9510,8 +9505,8 @@ CONFLICTS=      Xaw3d-[0-9]*
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2633677" id=
-                  "id2633677"></a>13.1.8.&nbsp;How to handle
+                  <h3 class="title"><a name="id2633678" id=
+                  "id2633678"></a>13.1.8.&nbsp;How to handle
                   compiler bugs</h3>
                 </div>
               </div>
@@ -9536,8 +9531,8 @@ CONFLICTS=      Xaw3d-[0-9]*
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2633700" id=
-                  "id2633700"></a>13.1.9.&nbsp;How to handle
+                  <h3 class="title"><a name="id2633701" id=
+                  "id2633701"></a>13.1.9.&nbsp;How to handle
                   incrementing versions when fixing an existing
                   package</h3>
                 </div>
@@ -9577,8 +9572,8 @@ DISTNAME=   foo-17.43
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2633817" id=
-                  "id2633817"></a>13.1.10.&nbsp;Portability of
+                  <h3 class="title"><a name="id2633818" id=
+                  "id2633818"></a>13.1.10.&nbsp;Portability of
                   packages</h3>
                 </div>
               </div>
@@ -9594,8 +9589,8 @@ DISTNAME=   foo-17.43
               <div class="titlepage">
                 <div>
                   <div>
-                    <h4 class="title"><a name="id2633822" id=
-                    "id2633822"></a>13.1.10.1.&nbsp;${INSTALL},
+                    <h4 class="title"><a name="id2633824" id=
+                    "id2633824"></a>13.1.10.1.&nbsp;${INSTALL},
                     ${INSTALL_DATA_DIR}, ...</h4>
                   </div>
                 </div>
@@ -9620,7 +9615,7 @@ ${INSTALL_DATA_DIR} ${PREFIX}/dir2
             <div>
               <div>
                 <h2 class="title" style="clear: both"><a name=
-                "id2633842" id="id2633842"></a>13.2.&nbsp;Possible
+                "id2633843" id="id2633843"></a>13.2.&nbsp;Possible
                 downloading issues</h2>
               </div>
             </div>
@@ -9630,8 +9625,8 @@ ${INSTALL_DATA_DIR} ${PREFIX}/dir2
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2633845" id=
-                  "id2633845"></a>13.2.1.&nbsp;Packages whose
+                  <h3 class="title"><a name="id2633846" id=
+                  "id2633846"></a>13.2.1.&nbsp;Packages whose
                   distfiles aren't available for plain
                   downloading</h3>
                 </div>
@@ -9692,8 +9687,8 @@ ${INSTALL_DATA_DIR} ${PREFIX}/dir2
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2633908" id=
-                  "id2633908"></a>13.2.2.&nbsp;How to handle
+                  <h3 class="title"><a name="id2633909" id=
+                  "id2633909"></a>13.2.2.&nbsp;How to handle
                   modified distfiles with the 'old' name</h3>
                 </div>
               </div>
@@ -9722,8 +9717,8 @@ ${INSTALL_DATA_DIR} ${PREFIX}/dir2
             <div>
               <div>
                 <h2 class="title" style="clear: both"><a name=
-                "id2633920" id=
-                "id2633920"></a>13.3.&nbsp;Configuration
+                "id2633921" id=
+                "id2633921"></a>13.3.&nbsp;Configuration
                 gotchas</h2>
               </div>
             </div>
@@ -9942,8 +9937,8 @@ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${SOMELIB:.a=.la} ${PREFIX}/lib
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2634285" id=
-                  "id2634285"></a>13.3.2.&nbsp;Using libtool on GNU
+                  <h3 class="title"><a name="id2634286" id=
+                  "id2634286"></a>13.3.2.&nbsp;Using libtool on GNU
                   packages that already support libtool</h3>
                 </div>
               </div>
@@ -10021,8 +10016,8 @@ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${SOMELIB:.a=.la} ${PREFIX}/lib
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2634503" id=
-                  "id2634503"></a>13.3.3.&nbsp;GNU
+                  <h3 class="title"><a name="id2634504" id=
+                  "id2634504"></a>13.3.3.&nbsp;GNU
                   Autoconf/Automake</h3>
                 </div>
               </div>
@@ -10088,7 +10083,7 @@ pre-configure:
             <div>
               <div>
                 <h2 class="title" style="clear: both"><a name=
-                "id2634616" id="id2634616"></a>13.4.&nbsp;Building
+                "id2634617" id="id2634617"></a>13.4.&nbsp;Building
                 considerations</h2>
               </div>
             </div>
@@ -10098,8 +10093,8 @@ pre-configure:
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2634619" id=
-                  "id2634619"></a>13.4.1.&nbsp;CPP defines</h3>
+                  <h3 class="title"><a name="id2634620" id=
+                  "id2634620"></a>13.4.1.&nbsp;CPP defines</h3>
                 </div>
               </div>
             </div>
@@ -10138,7 +10133,7 @@ pre-configure:
             <div>
               <div>
                 <h2 class="title" style="clear: both"><a name=
-                "id2634649" id="id2634649"></a>13.5.&nbsp;Package
+                "id2634650" id="id2634650"></a>13.5.&nbsp;Package
                 specific actions</h2>
               </div>
             </div>
@@ -10148,8 +10143,8 @@ pre-configure:
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2634652" id=
-                  "id2634652"></a>13.5.1.&nbsp;Package
+                  <h3 class="title"><a name="id2634653" id=
+                  "id2634653"></a>13.5.1.&nbsp;Package
                   configuration files</h3>
                 </div>
               </div>
@@ -10221,8 +10216,8 @@ pre-configure:
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2634755" id=
-                  "id2634755"></a>13.5.2.&nbsp;User
+                  <h3 class="title"><a name="id2634756" id=
+                  "id2634756"></a>13.5.2.&nbsp;User
                   interaction</h3>
                 </div>
               </div>
@@ -10271,8 +10266,8 @@ INTERACTIVE_STAGE= configure install
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2634800" id=
-                  "id2634800"></a>13.5.3.&nbsp;Handling
+                  <h3 class="title"><a name="id2634801" id=
+                  "id2634801"></a>13.5.3.&nbsp;Handling
                   licenses</h3>
                 </div>
               </div>
@@ -10346,8 +10341,8 @@ ACCEPTABLE_LICENSES+=graphviz-license
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2634951" id=
-                  "id2634951"></a>13.5.4.&nbsp;Creating an account
+                  <h3 class="title"><a name="id2634884" id=
+                  "id2634884"></a>13.5.4.&nbsp;Creating an account
                   from a package</h3>
                 </div>
               </div>
@@ -10401,8 +10396,8 @@ user:group[:[userid][:[description][:[home][:shell]]]]
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2635013" id=
-                  "id2635013"></a>13.5.5.&nbsp;Installing score
+                  <h3 class="title"><a name="id2635014" id=
+                  "id2635014"></a>13.5.5.&nbsp;Installing score
                   files</h3>
                 </div>
               </div>
@@ -10439,8 +10434,8 @@ user:group[:[userid][:[description][:[home][:shell]]]]
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2635057" id=
-                  "id2635057"></a>13.5.6.&nbsp;Packages providing
+                  <h3 class="title"><a name="id2635058" id=
+                  "id2635058"></a>13.5.6.&nbsp;Packages providing
                   login shells</h3>
                 </div>
               </div>
@@ -10475,8 +10470,8 @@ user:group[:[userid][:[description][:[home][:shell]]]]
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2635114" id=
-                  "id2635114"></a>13.5.7.&nbsp;Packages containing
+                  <h3 class="title"><a name="id2635115" id=
+                  "id2635115"></a>13.5.7.&nbsp;Packages containing
                   perl scripts</h3>
                 </div>
               </div>
@@ -10494,8 +10489,8 @@ user:group[:[userid][:[description][:[home][:shell]]]]
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2635132" id=
-                  "id2635132"></a>13.5.8.&nbsp;Packages with
+                  <h3 class="title"><a name="id2635133" id=
+                  "id2635133"></a>13.5.8.&nbsp;Packages with
                   hardcoded paths to other interpreters</h3>
                 </div>
               </div>
@@ -10521,8 +10516,8 @@ user:group[:[userid][:[description][:[home][:shell]]]]
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2635154" id=
-                  "id2635154"></a>13.5.9.&nbsp;Packages installing
+                  <h3 class="title"><a name="id2635155" id=
+                  "id2635155"></a>13.5.9.&nbsp;Packages installing
                   perl modules</h3>
                 </div>
               </div>
@@ -10661,8 +10656,8 @@ PERL5_PACKLIST=   ${PERL5_SITEARCH}/auto/Pg/.packlist
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2635510" id=
-                  "id2635510"></a>13.5.11.&nbsp;Packages installing
+                  <h3 class="title"><a name="id2635511" id=
+                  "id2635511"></a>13.5.11.&nbsp;Packages installing
                   GConf2 data files</h3>
                 </div>
               </div>
@@ -10736,8 +10731,8 @@ PERL5_PACKLIST=   ${PERL5_SITEARCH}/auto/Pg/.packlist
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2635678" id=
-                  "id2635678"></a>13.5.12.&nbsp;Packages installing
+                  <h3 class="title"><a name="id2635680" id=
+                  "id2635680"></a>13.5.12.&nbsp;Packages installing
                   scrollkeeper data files</h3>
                 </div>
               </div>
@@ -10781,8 +10776,8 @@ PERL5_PACKLIST=   ${PERL5_SITEARCH}/auto/Pg/.packlist
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2635730" id=
-                  "id2635730"></a>13.5.13.&nbsp;Packages installing
+                  <h3 class="title"><a name="id2635731" id=
+                  "id2635731"></a>13.5.13.&nbsp;Packages installing
                   X11 fonts</h3>
                 </div>
               </div>
@@ -10819,8 +10814,8 @@ PERL5_PACKLIST=   ${PERL5_SITEARCH}/auto/Pg/.packlist
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2635777" id=
-                  "id2635777"></a>13.5.14.&nbsp;Packages installing
+                  <h3 class="title"><a name="id2635778" id=
+                  "id2635778"></a>13.5.14.&nbsp;Packages installing
                   GTK2 modules</h3>
                 </div>
               </div>
@@ -10886,8 +10881,8 @@ PERL5_PACKLIST=   ${PERL5_SITEARCH}/auto/Pg/.packlist
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2635846" id=
-                  "id2635846"></a>13.5.15.&nbsp;Packages installing
+                  <h3 class="title"><a name="id2635847" id=
+                  "id2635847"></a>13.5.15.&nbsp;Packages installing
                   SGML or XML data</h3>
                 </div>
               </div>
@@ -10948,8 +10943,8 @@ PERL5_PACKLIST=   ${PERL5_SITEARCH}/auto/Pg/.packlist
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2635898" id=
-                  "id2635898"></a>13.5.16.&nbsp;Packages installing
+                  <h3 class="title"><a name="id2635899" id=
+                  "id2635899"></a>13.5.16.&nbsp;Packages installing
                   extensions to the MIME database</h3>
                 </div>
               </div>
@@ -11007,8 +11002,8 @@ PERL5_PACKLIST=   ${PERL5_SITEARCH}/auto/Pg/.packlist
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2636037" id=
-                  "id2636037"></a>13.5.17.&nbsp;Packages using
+                  <h3 class="title"><a name="id2636038" id=
+                  "id2636038"></a>13.5.17.&nbsp;Packages using
                   intltool</h3>
                 </div>
               </div>
@@ -11031,8 +11026,8 @@ PERL5_PACKLIST=   ${PERL5_SITEARCH}/auto/Pg/.packlist
             <div class="titlepage">
               <div>
                 <div>
-                  <h3 class="title"><a name="id2636051" id=
-                  "id2636051"></a>13.5.18.&nbsp;Packages installing
+                  <h3 class="title"><a name="id2636052" id=
+                  "id2636052"></a>13.5.18.&nbsp;Packages installing
                   startup scripts</h3>
                 </div>
               </div>
@@ -11055,7 +11050,7 @@ PERL5_PACKLIST=   ${PERL5_SITEARCH}/auto/Pg/.packlist
             <div>
               <div>
                 <h2 class="title" style="clear: both"><a name=
-                "id2636072" id="id2636072"></a>13.6.&nbsp;Feedback
+                "id2636073" id="id2636073"></a>13.6.&nbsp;Feedback
                 to the author</h2>
               </div>
             </div>
@@ -11291,17 +11286,17 @@ PERL5_PACKLIST=   ${PERL5_SITEARCH}/auto/Pg/.packlist
           <p><b>Table of Contents</b></p>
 
           <dl>
-            <dt><span class="sect1"><a href="#id2636739">15.1.
+            <dt><span class="sect1"><a href="#id2636740">15.1.
             Submitting your packages</a></span></dt>
 
-            <dt><span class="sect1"><a href="#id2636796">15.2.
+            <dt><span class="sect1"><a href="#id2636797">15.2.
             Committing: Importing a package into
             CVS</a></span></dt>
 
-            <dt><span class="sect1"><a href="#id2636859">15.3.
+            <dt><span class="sect1"><a href="#id2636860">15.3.
             Updating a package to a newer version</a></span></dt>
 
-            <dt><span class="sect1"><a href="#id2636878">15.4.
+            <dt><span class="sect1"><a href="#id2636880">15.4.
             Moving a package in pkgsrc</a></span></dt>
           </dl>
         </div>
@@ -11311,8 +11306,8 @@ PERL5_PACKLIST=   ${PERL5_SITEARCH}/auto/Pg/.packlist
             <div>
               <div>
                 <h2 class="title" style="clear: both"><a name=
-                "id2636739" id=
-                "id2636739"></a>15.1.&nbsp;Submitting your
+                "id2636740" id=
+                "id2636740"></a>15.1.&nbsp;Submitting your
                 packages</h2>
               </div>
             </div>
@@ -11381,8 +11376,8 @@ PERL5_PACKLIST=   ${PERL5_SITEARCH}/auto/Pg/.packlist
             <div>
               <div>
                 <h2 class="title" style="clear: both"><a name=
-                "id2636796" id=
-                "id2636796"></a>15.2.&nbsp;Committing: Importing a
+                "id2636797" id=
+                "id2636797"></a>15.2.&nbsp;Committing: Importing a
                 package into CVS</h2>
               </div>
             </div>
@@ -11438,7 +11433,7 @@ PERL5_PACKLIST=   ${PERL5_SITEARCH}/auto/Pg/.packlist
             <div>
               <div>
                 <h2 class="title" style="clear: both"><a name=
-                "id2636859" id="id2636859"></a>15.3.&nbsp;Updating
+                "id2636860" id="id2636860"></a>15.3.&nbsp;Updating
                 a package to a newer version</h2>
               </div>
             </div>
@@ -11489,7 +11484,7 @@ PERL5_PACKLIST=   ${PERL5_SITEARCH}/auto/Pg/.packlist
             <div>
               <div>
                 <h2 class="title" style="clear: both"><a name=
-                "id2636878" id="id2636878"></a>15.4.&nbsp;Moving a
+                "id2636880" id="id2636880"></a>15.4.&nbsp;Moving a
                 package in pkgsrc</h2>
               </div>
             </div>
@@ -11590,27 +11585,27 @@ PERL5_PACKLIST=   ${PERL5_SITEARCH}/auto/Pg/.packlist
         <p><b>Table of Contents</b></p>
 
         <dl>
-          <dt><span class="sect1"><a href="#id2637036">A.1.
+          <dt><span class="sect1"><a href="#id2637037">A.1.
           files</a></span></dt>
 
           <dd>
             <dl>
-              <dt><span class="sect2"><a href="#id2637040">A.1.1.
+              <dt><span class="sect2"><a href="#id2637041">A.1.1.
               Makefile</a></span></dt>
 
-              <dt><span class="sect2"><a href="#id2637047">A.1.2.
+              <dt><span class="sect2"><a href="#id2637048">A.1.2.
               DESCR</a></span></dt>
 
-              <dt><span class="sect2"><a href="#id2637062">A.1.3.
+              <dt><span class="sect2"><a href="#id2637063">A.1.3.
               PLIST</a></span></dt>
 
-              <dt><span class="sect2"><a href="#id2637069">A.1.4.
+              <dt><span class="sect2"><a href="#id2637070">A.1.4.
               Checking a package with <span><strong class=
               "command">pkglint</strong></span></a></span></dt>
             </dl>
           </dd>
 
-          <dt><span class="sect1"><a href="#id2637110">A.2. Steps
+          <dt><span class="sect1"><a href="#id2637111">A.2. Steps
           for building, installing, packaging</a></span></dt>
         </dl>
       </div>
@@ -11628,7 +11623,7 @@ PERL5_PACKLIST=   ${PERL5_SITEARCH}/auto/Pg/.packlist
           <div>
             <div>
               <h2 class="title" style="clear: both"><a name=
-              "id2637036" id="id2637036"></a>A.1.&nbsp;files</h2>
+              "id2637037" id="id2637037"></a>A.1.&nbsp;files</h2>
             </div>
           </div>
         </div>
@@ -11637,8 +11632,8 @@ PERL5_PACKLIST=   ${PERL5_SITEARCH}/auto/Pg/.packlist
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a name="id2637040" id=
-                "id2637040"></a>A.1.1.&nbsp;Makefile</h3>
+                <h3 class="title"><a name="id2637041" id=
+                "id2637041"></a>A.1.1.&nbsp;Makefile</h3>
               </div>
             </div>
           </div>
@@ -11665,8 +11660,8 @@ INFO_FILES=     bison.info
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a name="id2637047" id=
-                "id2637047"></a>A.1.2.&nbsp;DESCR</h3>
+                <h3 class="title"><a name="id2637048" id=
+                "id2637048"></a>A.1.2.&nbsp;DESCR</h3>
               </div>
             </div>
           </div>
@@ -11682,8 +11677,8 @@ of the NetBSD source tree is beyond me.
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a name="id2637062" id=
-                "id2637062"></a>A.1.3.&nbsp;PLIST</h3>
+                <h3 class="title"><a name="id2637063" id=
+                "id2637063"></a>A.1.3.&nbsp;PLIST</h3>
               </div>
             </div>
           </div>
@@ -11700,8 +11695,8 @@ share/bison.hairy
           <div class="titlepage">
             <div>
               <div>
-                <h3 class="title"><a name="id2637069" id=
-                "id2637069"></a>A.1.4.&nbsp;Checking a package with
+                <h3 class="title"><a name="id2637070" id=
+                "id2637070"></a>A.1.4.&nbsp;Checking a package with
                 <span><strong class=
                 "command">pkglint</strong></span></h3>
               </div>
@@ -11735,7 +11730,7 @@ looks fine.
           <div>
             <div>
               <h2 class="title" style="clear: both"><a name=
-              "id2637110" id="id2637110"></a>A.2.&nbsp;Steps for
+              "id2637111" id="id2637111"></a>A.2.&nbsp;Steps for
               building, installing, packaging</h2>
             </div>
           </div>
@@ -12153,10 +12148,10 @@ Registering depends:.
         <p><b>Table of Contents</b></p>
 
         <dl>
-          <dt><span class="sect1"><a href="#id2637893">D.1.
+          <dt><span class="sect1"><a href="#id2637894">D.1.
           Targets</a></span></dt>
 
-          <dt><span class="sect1"><a href="#id2637958">D.2.
+          <dt><span class="sect1"><a href="#id2637959">D.2.
           Procedure</a></span></dt>
         </dl>
       </div>
@@ -12169,7 +12164,7 @@ Registering depends:.
           <div>
             <div>
               <h2 class="title" style="clear: both"><a name=
-              "id2637893" id="id2637893"></a>D.1.&nbsp;Targets</h2>
+              "id2637894" id="id2637894"></a>D.1.&nbsp;Targets</h2>
             </div>
           </div>
         </div>
@@ -12220,8 +12215,8 @@ Registering depends:.
           <div>
             <div>
               <h2 class="title" style="clear: both"><a name=
-              "id2637958" id=
-              "id2637958"></a>D.2.&nbsp;Procedure</h2>
+              "id2637959" id=
+              "id2637959"></a>D.2.&nbsp;Procedure</h2>
             </div>
           </div>
         </div>
diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index 387fc55f0d6..376415684bf 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -3112,12 +3112,7 @@ CONFIGURE_ARGS+=        --enable-sasl=${BUILDLINK_PREFIX.sasl}
 .endif
 
 
-The first section only exists if you are converting a package that had its own
-ad-hoc options handling to use bsd.options.mk. It converts global or legacy
-options variables into an equivalent PKG_OPTIONS.pkg value. These sections will
-be removed over time as the old options are in turn deprecated and removed.
-
-The second section contains the information about which build options are
+The first section contains the information about which build options are
 supported by the package, and any default options settings if needed.
 
  1. PKG_OPTIONS_VAR is the name of the make(1) variable that contains the
@@ -3139,22 +3134,26 @@ supported by the package, and any default options settings if needed.
             PKG_DEFAULT_OPTIONS=    kerberos ldap sasl
             PKG_OPTIONS_VAR=        WIBBLE_OPTIONS
             WIBBLE_OPTIONS=         ${PKG_DEFAULT_OPTIONS} -sasl
-            # implies PKG_OPTIONS == "kerberos ldap"
+            # leads to PKG_OPTIONS = kerberos ldap
 
 
     or
 
             PKG_OPTIONS_VAR=        WIBBLE_OPTIONS
             WIBBLE_OPTIONS=         kerberos -ldap ldap
-            # implies PKG_OPTIONS == "kerberos"
+            # leads to PKG_OPTIONS = kerberos
 
 
     This variable should be set in /etc/mk.conf.
 
-After the inclusion of bsd.options.mk, the following variables are set:
+ 5. The PKG_OPTIONS_LEGACY_VARS is only needed if you are converting a package
+    that had its own ad-hoc options handling to use bsd.options.mk. It converts
+    global or legacy options variables into an equivalent PKG_OPTIONS.pkg
+    value.
 
-  * PKG_OPTIONS contains the list of the selected build options, properly
-    filtered to remove unsupported and duplicate options.
+After the inclusion of bsd.options.mk, the variable PKG_OPTIONS contains the
+list of the selected build options, properly filtered to remove unsupported and
+duplicate options.
 
 The remaining sections contain the logic that is specific to each option. There
 should be a check for every option listed in PKG_SUPPORTED_OPTIONS, and there
-- 
cgit v1.2.3