pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/doc



Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Apr 28 15:22:38 UTC 2019

Modified Files:
        pkgsrc/doc: pkgsrc.html pkgsrc.txt

Log Message:
doc/pkgsrc.*: regen


To generate a diff of this commit:
cvs rdiff -u -r1.266 -r1.267 pkgsrc/doc/pkgsrc.html
cvs rdiff -u -r1.264 -r1.265 pkgsrc/doc/pkgsrc.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/doc/pkgsrc.html
diff -u pkgsrc/doc/pkgsrc.html:1.266 pkgsrc/doc/pkgsrc.html:1.267
--- pkgsrc/doc/pkgsrc.html:1.266        Fri Apr 19 13:46:39 2019
+++ pkgsrc/doc/pkgsrc.html      Sun Apr 28 15:22:38 2019
@@ -31,7 +31,7 @@
       </h3>
 </div></div>
 <div><p class="copyright">Copyright � 1994-2019 The NetBSD Foundation, Inc</p></div>
-<div><p class="pubdate">$NetBSD: pkgsrc.xml,v 1.33 2019/01/01 02:50:23 jnemeth Exp $</p></div>
+<div><p class="pubdate">$NetBSD: pkgsrc.xml,v 1.34 2019/04/28 13:41:18 rillig Exp $</p></div>
 <div><div class="abstract">
 <p class="title"><b>Abstract</b></p>
 <p>pkgsrc is a centralized package management system for
@@ -60,359 +60,361 @@
 </dl></dd>
 <dt><span class="part"><a href="#users-guide">I. The pkgsrc user's guide</a></span></dt>
 <dd><dl>
-<dt><span class="chapter"><a href="#getting">2. Where to get pkgsrc and how to keep it up-to-date</a></span></dt>
+<dt><span class="chapter"><a href="#help-user">2. Getting help</a></span></dt>
+<dt><span class="chapter"><a href="#getting">3. Where to get pkgsrc and how to keep it up-to-date</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#getting-first">2.1. Getting pkgsrc for the first time</a></span></dt>
+<dt><span class="sect1"><a href="#getting-first">3.1. Getting pkgsrc for the first time</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#getting-via-tar">2.1.1. As tar archive</a></span></dt>
-<dt><span class="sect2"><a href="#getting-via-cvs">2.1.2. Via anonymous CVS</a></span></dt>
+<dt><span class="sect2"><a href="#getting-via-tar">3.1.1. As tar archive</a></span></dt>
+<dt><span class="sect2"><a href="#getting-via-cvs">3.1.2. Via anonymous CVS</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#uptodate">2.2. Keeping pkgsrc up-to-date</a></span></dt>
+<dt><span class="sect1"><a href="#uptodate">3.2. Keeping pkgsrc up-to-date</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#uptodate-tar">2.2.1. Via tar files</a></span></dt>
-<dt><span class="sect2"><a href="#uptodate-cvs">2.2.2. Via CVS</a></span></dt>
+<dt><span class="sect2"><a href="#uptodate-tar">3.2.1. Via tar files</a></span></dt>
+<dt><span class="sect2"><a href="#uptodate-cvs">3.2.2. Via CVS</a></span></dt>
 </dl></dd>
 </dl></dd>
-<dt><span class="chapter"><a href="#platforms">3. Using pkgsrc on systems other than NetBSD</a></span></dt>
+<dt><span class="chapter"><a href="#platforms">4. Using pkgsrc on systems other than NetBSD</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#binarydist">3.1. Binary distribution</a></span></dt>
-<dt><span class="sect1"><a href="#bootstrapping-pkgsrc">3.2. Bootstrapping pkgsrc</a></span></dt>
+<dt><span class="sect1"><a href="#binarydist">4.1. Binary distribution</a></span></dt>
+<dt><span class="sect1"><a href="#bootstrapping-pkgsrc">4.2. Bootstrapping pkgsrc</a></span></dt>
 </dl></dd>
-<dt><span class="chapter"><a href="#using">4. Using pkgsrc</a></span></dt>
+<dt><span class="chapter"><a href="#using">5. Using pkgsrc</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#using-pkg">4.1. Using binary packages</a></span></dt>
+<dt><span class="sect1"><a href="#using-pkg">5.1. Using binary packages</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#finding-binary-packages">4.1.1. Finding binary packages</a></span></dt>
-<dt><span class="sect2"><a href="#installing-binary-packages">4.1.2. Installing binary packages</a></span></dt>
-<dt><span class="sect2"><a href="#using.pkg_delete">4.1.3. Deinstalling packages</a></span></dt>
-<dt><span class="sect2"><a href="#using.pkg_info">4.1.4. Getting information about installed packages</a></span></dt>
-<dt><span class="sect2"><a href="#vulnerabilities">4.1.5. Checking for security vulnerabilities in installed packages</a></span></dt>
-<dt><span class="sect2"><a href="#pkg_versions">4.1.6. Finding if newer versions of your installed packages are in pkgsrc</a></span></dt>
-<dt><span class="sect2"><a href="#using.pkg_admin">4.1.7. Other administrative functions</a></span></dt>
+<dt><span class="sect2"><a href="#finding-binary-packages">5.1.1. Finding binary packages</a></span></dt>
+<dt><span class="sect2"><a href="#installing-binary-packages">5.1.2. Installing binary packages</a></span></dt>
+<dt><span class="sect2"><a href="#using.pkg_delete">5.1.3. Deinstalling packages</a></span></dt>
+<dt><span class="sect2"><a href="#using.pkg_info">5.1.4. Getting information about installed packages</a></span></dt>
+<dt><span class="sect2"><a href="#vulnerabilities">5.1.5. Checking for security vulnerabilities in installed packages</a></span></dt>
+<dt><span class="sect2"><a href="#pkg_versions">5.1.6. Finding if newer versions of your installed packages are in pkgsrc</a></span></dt>
+<dt><span class="sect2"><a href="#using.pkg_admin">5.1.7. Other administrative functions</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#building-packages-from-source">4.2. Building packages from source</a></span></dt>
+<dt><span class="sect1"><a href="#building-packages-from-source">5.2. Building packages from source</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#requirements">4.2.1. Requirements</a></span></dt>
-<dt><span class="sect2"><a href="#fetching-distfiles">4.2.2. Fetching distfiles</a></span></dt>
-<dt><span class="sect2"><a href="#how-to-build-and-install">4.2.3. How to build and install</a></span></dt>
+<dt><span class="sect2"><a href="#requirements">5.2.1. Requirements</a></span></dt>
+<dt><span class="sect2"><a href="#fetching-distfiles">5.2.2. Fetching distfiles</a></span></dt>
+<dt><span class="sect2"><a href="#how-to-build-and-install">5.2.3. How to build and install</a></span></dt>
 </dl></dd>
 </dl></dd>
-<dt><span class="chapter"><a href="#configuring">5. Configuring pkgsrc</a></span></dt>
+<dt><span class="chapter"><a href="#configuring">6. Configuring pkgsrc</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#general-configuration">5.1. General configuration</a></span></dt>
-<dt><span class="sect1"><a href="#variables-affecting-build">5.2. Variables affecting the build process</a></span></dt>
-<dt><span class="sect1"><a href="#variables-affecting-installation">5.3. Variables affecting the installation process</a></span></dt>
-<dt><span class="sect1"><a href="#conf.compiler">5.4. Selecting and configuring the compiler</a></span></dt>
+<dt><span class="sect1"><a href="#general-configuration">6.1. General configuration</a></span></dt>
+<dt><span class="sect1"><a href="#variables-affecting-build">6.2. Variables affecting the build process</a></span></dt>
+<dt><span class="sect1"><a href="#variables-affecting-installation">6.3. Variables affecting the installation process</a></span></dt>
+<dt><span class="sect1"><a href="#conf.compiler">6.4. Selecting and configuring the compiler</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#selecting-the-compiler">5.4.1. Selecting the compiler</a></span></dt>
-<dt><span class="sect2"><a href="#conf.cflags">5.4.2. Additional flags to the compiler (<code class="varname">CFLAGS</code>)</a></span></dt>
-<dt><span class="sect2"><a href="#conf.ldflags">5.4.3. Additional flags to the linker (<code class="varname">LDFLAGS</code>)</a></span></dt>
+<dt><span class="sect2"><a href="#selecting-the-compiler">6.4.1. Selecting the compiler</a></span></dt>
+<dt><span class="sect2"><a href="#conf.cflags">6.4.2. Additional flags to the compiler (<code class="varname">CFLAGS</code>)</a></span></dt>
+<dt><span class="sect2"><a href="#conf.ldflags">6.4.3. Additional flags to the linker (<code class="varname">LDFLAGS</code>)</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#developer-advanced-settings">5.5. Developer/advanced settings</a></span></dt>
-<dt><span class="sect1"><a href="#selecting-build-options">5.6. Selecting Build Options</a></span></dt>
+<dt><span class="sect1"><a href="#developer-advanced-settings">6.5. Developer/advanced settings</a></span></dt>
+<dt><span class="sect1"><a href="#selecting-build-options">6.6. Selecting Build Options</a></span></dt>
 </dl></dd>
-<dt><span class="chapter"><a href="#binary">6. Creating binary packages</a></span></dt>
+<dt><span class="chapter"><a href="#binary">7. Creating binary packages</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#building-a-single-binary-package">6.1. Building a single binary package</a></span></dt>
-<dt><span class="sect1"><a href="#settings-for-creationg-of-binary-packages">6.2. Settings for creation of binary packages</a></span></dt>
+<dt><span class="sect1"><a href="#building-a-single-binary-package">7.1. Building a single binary package</a></span></dt>
+<dt><span class="sect1"><a href="#settings-for-creationg-of-binary-packages">7.2. Settings for creation of binary packages</a></span></dt>
 </dl></dd>
-<dt><span class="chapter"><a href="#bulk">7. Creating binary packages for everything in pkgsrc (bulk
+<dt><span class="chapter"><a href="#bulk">8. Creating binary packages for everything in pkgsrc (bulk
 builds)</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#bulk.pre">7.1. Preparations</a></span></dt>
-<dt><span class="sect1"><a href="#bulk.pbulk">7.2. Running a pbulk-style bulk build</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="#bulk.pbulk.conf">7.2.1. Configuration</a></span></dt></dl></dd>
-<dt><span class="sect1"><a href="#bulk.req">7.3. Requirements of a full bulk build</a></span></dt>
-<dt><span class="sect1"><a href="#creating-cdroms">7.4. Creating a multiple CD-ROM packages collection</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="#cdpack-example">7.4.1. Example of cdpack</a></span></dt></dl></dd>
-</dl></dd>
-<dt><span class="chapter"><a href="#files">8. Directory layout of the installed files</a></span></dt>
-<dd><dl>
-<dt><span class="sect1"><a href="#files.localbase">8.1. File system layout in <code class="literal">${LOCALBASE}</code></a></span></dt>
-<dt><span class="sect1"><a href="#files.varbase">8.2. File system layout in <code class="literal">${VARBASE}</code></a></span></dt>
-</dl></dd>
-<dt><span class="chapter"><a href="#faq">9. Frequently Asked Questions</a></span></dt>
-<dd><dl>
-<dt><span class="sect1"><a href="#mailing-list-pointers">9.1. Are there any mailing lists for pkg-related discussion?</a></span></dt>
-<dt><span class="sect1"><a href="#faq-pkgtools">9.2. Utilities for package management (pkgtools)</a></span></dt>
-<dt><span class="sect1"><a href="#non-root-pkgsrc">9.3. How to use pkgsrc as non-root</a></span></dt>
-<dt><span class="sect1"><a href="#resume-transfers">9.4. How to resume transfers when fetching distfiles?</a></span></dt>
-<dt><span class="sect1"><a href="#x.org-from-pkgsrc">9.5. How can I install/use modular X.org from pkgsrc?</a></span></dt>
-<dt><span class="sect1"><a href="#fetch-behind-firewall">9.6. How to fetch files from behind a firewall</a></span></dt>
-<dt><span class="sect1"><a href="#fetch-https">9.7. How to fetch files from HTTPS sites</a></span></dt>
-<dt><span class="sect1"><a href="#passive-ftp">9.8. How do I tell <span class="command"><strong>make fetch</strong></span> to do passive FTP?</a></span></dt>
-<dt><span class="sect1"><a href="#fetching-all-distfiles">9.9. How to fetch all distfiles at once</a></span></dt>
-<dt><span class="sect1"><a href="#tmac.andoc-missing">9.10. What does <span class="quote">&#8220;<span class="quote">Don't know how to make
+<dt><span class="sect1"><a href="#bulk.pre">8.1. Preparations</a></span></dt>
+<dt><span class="sect1"><a href="#bulk.pbulk">8.2. Running a pbulk-style bulk build</a></span></dt>
+<dd><dl><dt><span class="sect2"><a href="#bulk.pbulk.conf">8.2.1. Configuration</a></span></dt></dl></dd>
+<dt><span class="sect1"><a href="#bulk.req">8.3. Requirements of a full bulk build</a></span></dt>
+<dt><span class="sect1"><a href="#creating-cdroms">8.4. Creating a multiple CD-ROM packages collection</a></span></dt>
+<dd><dl><dt><span class="sect2"><a href="#cdpack-example">8.4.1. Example of cdpack</a></span></dt></dl></dd>
+</dl></dd>
+<dt><span class="chapter"><a href="#files">9. Directory layout of the installed files</a></span></dt>
+<dd><dl>
+<dt><span class="sect1"><a href="#files.localbase">9.1. File system layout in <code class="literal">${LOCALBASE}</code></a></span></dt>
+<dt><span class="sect1"><a href="#files.varbase">9.2. File system layout in <code class="literal">${VARBASE}</code></a></span></dt>
+</dl></dd>
+<dt><span class="chapter"><a href="#faq">10. Frequently Asked Questions</a></span></dt>
+<dd><dl>
+<dt><span class="sect1"><a href="#mailing-list-pointers">10.1. Are there any mailing lists for pkg-related discussion?</a></span></dt>
+<dt><span class="sect1"><a href="#faq-pkgtools">10.2. Utilities for package management (pkgtools)</a></span></dt>
+<dt><span class="sect1"><a href="#non-root-pkgsrc">10.3. How to use pkgsrc as non-root</a></span></dt>
+<dt><span class="sect1"><a href="#resume-transfers">10.4. How to resume transfers when fetching distfiles?</a></span></dt>
+<dt><span class="sect1"><a href="#x.org-from-pkgsrc">10.5. How can I install/use modular X.org from pkgsrc?</a></span></dt>
+<dt><span class="sect1"><a href="#fetch-behind-firewall">10.6. How to fetch files from behind a firewall</a></span></dt>
+<dt><span class="sect1"><a href="#fetch-https">10.7. How to fetch files from HTTPS sites</a></span></dt>
+<dt><span class="sect1"><a href="#passive-ftp">10.8. How do I tell <span class="command"><strong>make fetch</strong></span> to do passive FTP?</a></span></dt>
+<dt><span class="sect1"><a href="#fetching-all-distfiles">10.9. How to fetch all distfiles at once</a></span></dt>
+<dt><span class="sect1"><a href="#tmac.andoc-missing">10.10. What does <span class="quote">&#8220;<span class="quote">Don't know how to make
 /usr/share/tmac/tmac.andoc</span>&#8221;</span> mean?</a></span></dt>
-<dt><span class="sect1"><a href="#bsd.own.mk-missing">9.11. What does <span class="quote">&#8220;<span class="quote">Could not find bsd.own.mk</span>&#8221;</span> mean?</a></span></dt>
-<dt><span class="sect1"><a href="#using-sudo-with-pkgsrc">9.12. Using 'sudo' with pkgsrc</a></span></dt>
-<dt><span class="sect1"><a href="#faq.conf">9.13. How do I change the location of configuration files?</a></span></dt>
-<dt><span class="sect1"><a href="#audit-packages">9.14. Automated security checks</a></span></dt>
-<dt><span class="sect1"><a href="#ufaq-cflags">9.15. Why do some packages ignore my <code class="varname">CFLAGS</code>?</a></span></dt>
-<dt><span class="sect1"><a href="#ufaq-fail">9.16. A package does not build.  What shall I do?</a></span></dt>
-<dt><span class="sect1"><a href="#faq.rcs-conflicts">9.17. What does <span class="quote">&#8220;<span class="quote">Makefile appears to contain unresolved cvs/rcs/??? merge 
conflicts</span>&#8221;</span> mean?</a></span></dt>
+<dt><span class="sect1"><a href="#bsd.own.mk-missing">10.11. What does <span class="quote">&#8220;<span class="quote">Could not find bsd.own.mk</span>&#8221;</span> mean?</a></span></dt>
+<dt><span class="sect1"><a href="#using-sudo-with-pkgsrc">10.12. Using 'sudo' with pkgsrc</a></span></dt>
+<dt><span class="sect1"><a href="#faq.conf">10.13. How do I change the location of configuration files?</a></span></dt>
+<dt><span class="sect1"><a href="#audit-packages">10.14. Automated security checks</a></span></dt>
+<dt><span class="sect1"><a href="#ufaq-cflags">10.15. Why do some packages ignore my <code class="varname">CFLAGS</code>?</a></span></dt>
+<dt><span class="sect1"><a href="#ufaq-fail">10.16. A package does not build.  What shall I do?</a></span></dt>
+<dt><span class="sect1"><a href="#faq.rcs-conflicts">10.17. What does <span class="quote">&#8220;<span class="quote">Makefile appears to contain unresolved cvs/rcs/??? merge 
conflicts</span>&#8221;</span> mean?</a></span></dt>
 </dl></dd>
 </dl></dd>
 <dt><span class="part"><a href="#developers-guide">II. The pkgsrc developer's guide</a></span></dt>
 <dd><dl>
-<dt><span class="chapter"><a href="#creating">10. Creating a new pkgsrc package from scratch</a></span></dt>
+<dt><span class="chapter"><a href="#help-devel">11. Getting help</a></span></dt>
+<dt><span class="chapter"><a href="#creating">12. Creating a new pkgsrc package from scratch</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#creating.common">10.1. Common types of packages</a></span></dt>
+<dt><span class="sect1"><a href="#creating.common">12.1. Common types of packages</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#creating.perl-module">10.1.1. Perl modules</a></span></dt>
-<dt><span class="sect2"><a href="#creating.python-module">10.1.2. Python modules and programs</a></span></dt>
+<dt><span class="sect2"><a href="#creating.perl-module">12.1.1. Perl modules</a></span></dt>
+<dt><span class="sect2"><a href="#creating.python-module">12.1.2. Python modules and programs</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#creating.examples">10.2. Examples</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="#creating.nvu">10.2.1. How the www/nvu package came into pkgsrc</a></span></dt></dl></dd>
+<dt><span class="sect1"><a href="#creating.examples">12.2. Examples</a></span></dt>
+<dd><dl><dt><span class="sect2"><a href="#creating.nvu">12.2.1. How the www/nvu package came into pkgsrc</a></span></dt></dl></dd>
 </dl></dd>
-<dt><span class="chapter"><a href="#components">11. Package components - files, directories and contents</a></span></dt>
+<dt><span class="chapter"><a href="#components">13. Package components - files, directories and contents</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#components.Makefile">11.1. <code class="filename">Makefile</code></a></span></dt>
-<dt><span class="sect1"><a href="#components.distinfo">11.2. <code class="filename">distinfo</code></a></span></dt>
-<dt><span class="sect1"><a href="#components.patches">11.3. <code class="filename">patches/*</code></a></span></dt>
+<dt><span class="sect1"><a href="#components.Makefile">13.1. <code class="filename">Makefile</code></a></span></dt>
+<dt><span class="sect1"><a href="#components.distinfo">13.2. <code class="filename">distinfo</code></a></span></dt>
+<dt><span class="sect1"><a href="#components.patches">13.3. <code class="filename">patches/*</code></a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#components.patch.structure">11.3.1. Structure of a single patch file</a></span></dt>
-<dt><span class="sect2"><a href="#components.patches.caveats">11.3.2. Creating patch files</a></span></dt>
-<dt><span class="sect2"><a href="#components.patches.sources">11.3.3. Sources where the patch files come from</a></span></dt>
-<dt><span class="sect2"><a href="#components.patches.guidelines">11.3.4. Patching guidelines</a></span></dt>
-<dt><span class="sect2"><a href="#components.patches.feedback">11.3.5. Feedback to the author</a></span></dt>
+<dt><span class="sect2"><a href="#components.patch.structure">13.3.1. Structure of a single patch file</a></span></dt>
+<dt><span class="sect2"><a href="#components.patches.caveats">13.3.2. Creating patch files</a></span></dt>
+<dt><span class="sect2"><a href="#components.patches.sources">13.3.3. Sources where the patch files come from</a></span></dt>
+<dt><span class="sect2"><a href="#components.patches.guidelines">13.3.4. Patching guidelines</a></span></dt>
+<dt><span class="sect2"><a href="#components.patches.feedback">13.3.5. Feedback to the author</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#other-mandatory-files">11.4. Other mandatory files</a></span></dt>
-<dt><span class="sect1"><a href="#components.optional">11.5. Optional files</a></span></dt>
+<dt><span class="sect1"><a href="#other-mandatory-files">13.4. Other mandatory files</a></span></dt>
+<dt><span class="sect1"><a href="#components.optional">13.5. Optional files</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#components.optional.bin">11.5.1. Files affecting the binary package</a></span></dt>
-<dt><span class="sect2"><a href="#components.optional.build">11.5.2. Files affecting the build process</a></span></dt>
-<dt><span class="sect2"><a href="#components.optional.none">11.5.3. Files affecting nothing at all</a></span></dt>
+<dt><span class="sect2"><a href="#components.optional.bin">13.5.1. Files affecting the binary package</a></span></dt>
+<dt><span class="sect2"><a href="#components.optional.build">13.5.2. Files affecting the build process</a></span></dt>
+<dt><span class="sect2"><a href="#components.optional.none">13.5.3. Files affecting nothing at all</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#work-dir">11.6. <code class="filename">work*</code></a></span></dt>
-<dt><span class="sect1"><a href="#files-dir">11.7. <code class="filename">files/*</code></a></span></dt>
+<dt><span class="sect1"><a href="#work-dir">13.6. <code class="filename">work*</code></a></span></dt>
+<dt><span class="sect1"><a href="#files-dir">13.7. <code class="filename">files/*</code></a></span></dt>
 </dl></dd>
-<dt><span class="chapter"><a href="#makefile">12. Programming in <code class="filename">Makefile</code>s</a></span></dt>
+<dt><span class="chapter"><a href="#makefile">14. Programming in <code class="filename">Makefile</code>s</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#makefile.style">12.1. Caveats</a></span></dt>
-<dt><span class="sect1"><a href="#makefile.variables">12.2. <code class="filename">Makefile</code> variables</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="#makefile.variables.names">12.2.1. Naming conventions</a></span></dt></dl></dd>
-<dt><span class="sect1"><a href="#makefile.code">12.3. Code snippets</a></span></dt>
+<dt><span class="sect1"><a href="#makefile.style">14.1. Caveats</a></span></dt>
+<dt><span class="sect1"><a href="#makefile.variables">14.2. <code class="filename">Makefile</code> variables</a></span></dt>
+<dd><dl><dt><span class="sect2"><a href="#makefile.variables.names">14.2.1. Naming conventions</a></span></dt></dl></dd>
+<dt><span class="sect1"><a href="#makefile.code">14.3. Code snippets</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#adding-to-list">12.3.1. Adding things to a list</a></span></dt>
-<dt><span class="sect2"><a href="#echo-literal">12.3.2. Echoing a string exactly as-is</a></span></dt>
-<dt><span class="sect2"><a href="#cflags-gnu-configure">12.3.3. Passing <code class="varname">CFLAGS</code> to GNU configure scripts</a></span></dt>
-<dt><span class="sect2"><a href="#empty-variables">12.3.4. Handling possibly empty variables</a></span></dt>
+<dt><span class="sect2"><a href="#adding-to-list">14.3.1. Adding things to a list</a></span></dt>
+<dt><span class="sect2"><a href="#echo-literal">14.3.2. Echoing a string exactly as-is</a></span></dt>
+<dt><span class="sect2"><a href="#cflags-gnu-configure">14.3.3. Passing <code class="varname">CFLAGS</code> to GNU configure scripts</a></span></dt>
+<dt><span class="sect2"><a href="#empty-variables">14.3.4. Handling possibly empty variables</a></span></dt>
 </dl></dd>
 </dl></dd>
-<dt><span class="chapter"><a href="#plist">13. PLIST issues</a></span></dt>
+<dt><span class="chapter"><a href="#plist">15. PLIST issues</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#rcs-id">13.1. RCS ID</a></span></dt>
-<dt><span class="sect1"><a href="#automatic-plist-generation">13.2. Semi-automatic <code class="filename">PLIST</code> generation</a></span></dt>
-<dt><span class="sect1"><a href="#print-PLIST">13.3. Tweaking output of <span class="command"><strong>make print-PLIST</strong></span></a></span></dt>
-<dt><span class="sect1"><a href="#plist.misc">13.4. Variable substitution in PLIST</a></span></dt>
-<dt><span class="sect1"><a href="#manpage-compression">13.5. Man page compression</a></span></dt>
-<dt><span class="sect1"><a href="#using-PLIST_SRC">13.6. Changing PLIST source with <code class="varname">PLIST_SRC</code></a></span></dt>
-<dt><span class="sect1"><a href="#platform-specific-plist">13.7. Platform-specific and differing PLISTs</a></span></dt>
-<dt><span class="sect1"><a href="#build-plist">13.8. Build-specific PLISTs</a></span></dt>
-<dt><span class="sect1"><a href="#faq.common-dirs">13.9. Sharing directories between packages</a></span></dt>
+<dt><span class="sect1"><a href="#rcs-id">15.1. RCS ID</a></span></dt>
+<dt><span class="sect1"><a href="#automatic-plist-generation">15.2. Semi-automatic <code class="filename">PLIST</code> generation</a></span></dt>
+<dt><span class="sect1"><a href="#print-PLIST">15.3. Tweaking output of <span class="command"><strong>make print-PLIST</strong></span></a></span></dt>
+<dt><span class="sect1"><a href="#plist.misc">15.4. Variable substitution in PLIST</a></span></dt>
+<dt><span class="sect1"><a href="#manpage-compression">15.5. Man page compression</a></span></dt>
+<dt><span class="sect1"><a href="#using-PLIST_SRC">15.6. Changing PLIST source with <code class="varname">PLIST_SRC</code></a></span></dt>
+<dt><span class="sect1"><a href="#platform-specific-plist">15.7. Platform-specific and differing PLISTs</a></span></dt>
+<dt><span class="sect1"><a href="#build-plist">15.8. Build-specific PLISTs</a></span></dt>
+<dt><span class="sect1"><a href="#faq.common-dirs">15.9. Sharing directories between packages</a></span></dt>
 </dl></dd>
-<dt><span class="chapter"><a href="#buildlink">14. Buildlink methodology</a></span></dt>
+<dt><span class="chapter"><a href="#buildlink">16. Buildlink methodology</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#converting-to-buildlink3">14.1. Converting packages to use buildlink3</a></span></dt>
-<dt><span class="sect1"><a href="#creating-buildlink3.mk">14.2. Writing <code class="filename">buildlink3.mk</code> files</a></span></dt>
+<dt><span class="sect1"><a href="#converting-to-buildlink3">16.1. Converting packages to use buildlink3</a></span></dt>
+<dt><span class="sect1"><a href="#creating-buildlink3.mk">16.2. Writing <code class="filename">buildlink3.mk</code> files</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#anatomy-of-bl3">14.2.1. Anatomy of a buildlink3.mk file</a></span></dt>
-<dt><span class="sect2"><a href="#updating-buildlink-depends">14.2.2. Updating
+<dt><span class="sect2"><a href="#anatomy-of-bl3">16.2.1. Anatomy of a buildlink3.mk file</a></span></dt>
+<dt><span class="sect2"><a href="#updating-buildlink-depends">16.2.2. Updating
       <code class="varname">BUILDLINK_API_DEPENDS.<em class="replaceable"><code>pkg</code></em></code>
       and
       <code class="varname">BUILDLINK_ABI_DEPENDS.<em class="replaceable"><code>pkg</code></em></code>
       in <code class="filename">buildlink3.mk</code> files</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#writing-builtin.mk">14.3. Writing <code class="filename">builtin.mk</code> files</a></span></dt>
+<dt><span class="sect1"><a href="#writing-builtin.mk">16.3. Writing <code class="filename">builtin.mk</code> files</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#anatomy-of-builtin.mk">14.3.1. Anatomy of a <code class="filename">builtin.mk</code> file</a></span></dt>
-<dt><span class="sect2"><a href="#native-or-pkgsrc-preference">14.3.2. Global preferences for native or pkgsrc software</a></span></dt>
+<dt><span class="sect2"><a href="#anatomy-of-builtin.mk">16.3.1. Anatomy of a <code class="filename">builtin.mk</code> file</a></span></dt>
+<dt><span class="sect2"><a href="#native-or-pkgsrc-preference">16.3.2. Global preferences for native or pkgsrc software</a></span></dt>
 </dl></dd>
 </dl></dd>
-<dt><span class="chapter"><a href="#pkginstall">15. The pkginstall framework</a></span></dt>
+<dt><span class="chapter"><a href="#pkginstall">17. The pkginstall framework</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#files-and-dirs-outside-prefix">15.1. Files and directories outside the installation prefix</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#dirs-outside-prefix">15.1.1. Directory manipulation</a></span></dt>
-<dt><span class="sect2"><a href="#files-outside-prefix">15.1.2. File manipulation</a></span></dt>
-</dl></dd>
-<dt><span class="sect1"><a href="#conf-files">15.2. Configuration files</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#conf-files-sysconfdir">15.2.1. How <code class="varname">PKG_SYSCONFDIR</code> is set</a></span></dt>
-<dt><span class="sect2"><a href="#conf-files-configure">15.2.2. Telling the software where configuration files are</a></span></dt>
-<dt><span class="sect2"><a href="#conf-files-patching">15.2.3. Patching installations</a></span></dt>
-<dt><span class="sect2"><a href="#conf-files-disable">15.2.4. Disabling handling of configuration files</a></span></dt>
-</dl></dd>
-<dt><span class="sect1"><a href="#rcd-scripts">15.3. System startup scripts</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="#rcd-scripts-disable">15.3.1. Disabling handling of system startup scripts</a></span></dt></dl></dd>
-<dt><span class="sect1"><a href="#users-and-groups">15.4. System users and groups</a></span></dt>
-<dt><span class="sect1"><a href="#shells">15.5. System shells</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="#shells-disable">15.5.1. Disabling shell registration</a></span></dt></dl></dd>
-<dt><span class="sect1"><a href="#fonts">15.6. Fonts</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="#fonts-disable">15.6.1. Disabling automatic update of the fonts databases</a></span></dt></dl></dd>
-</dl></dd>
-<dt><span class="chapter"><a href="#options">16. Options handling</a></span></dt>
-<dd><dl>
-<dt><span class="sect1"><a href="#global-default-options">16.1. Global default options</a></span></dt>
-<dt><span class="sect1"><a href="#converting-to-options">16.2. Converting packages to use <code class="filename">bsd.options.mk</code></a></span></dt>
-<dt><span class="sect1"><a href="#option-names">16.3. Option Names</a></span></dt>
-<dt><span class="sect1"><a href="#option-build">16.4. Determining the options of dependencies</a></span></dt>
-</dl></dd>
-<dt><span class="chapter"><a href="#build">17. The build process</a></span></dt>
-<dd><dl>
-<dt><span class="sect1"><a href="#build.intro">17.1. Introduction</a></span></dt>
-<dt><span class="sect1"><a href="#build.prefix">17.2. Program location</a></span></dt>
-<dt><span class="sect1"><a href="#build.builddirs">17.3. Directories used during the build process</a></span></dt>
-<dt><span class="sect1"><a href="#build.running">17.4. Running a phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.fetch">17.5. The <span class="emphasis"><em>fetch</em></span> phase</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#build.fetch.what">17.5.1. What to fetch and where to get it from</a></span></dt>
-<dt><span class="sect2"><a href="#build.fetch.how">17.5.2. How are the files fetched?</a></span></dt>
-</dl></dd>
-<dt><span class="sect1"><a href="#build.checksum">17.6. The <span class="emphasis"><em>checksum</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.extract">17.7. The <span class="emphasis"><em>extract</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.patch">17.8. The <span class="emphasis"><em>patch</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.tools">17.9. The <span class="emphasis"><em>tools</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.wrapper">17.10. The <span class="emphasis"><em>wrapper</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.configure">17.11. The <span class="emphasis"><em>configure</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.build">17.12. The <span class="emphasis"><em>build</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.test">17.13. The <span class="emphasis"><em>test</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.install">17.14. The <span class="emphasis"><em>install</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.package">17.15. The <span class="emphasis"><em>package</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.clean">17.16. Cleaning up</a></span></dt>
-<dt><span class="sect1"><a href="#build.helpful-targets">17.17. Other helpful targets</a></span></dt>
-</dl></dd>
-<dt><span class="chapter"><a href="#tools">18. Tools needed for building or running</a></span></dt>
-<dd><dl>
-<dt><span class="sect1"><a href="#pkgsrc-tools">18.1. Tools for pkgsrc builds</a></span></dt>
-<dt><span class="sect1"><a href="#package-tools">18.2. Tools needed by packages</a></span></dt>
-<dt><span class="sect1"><a href="#platform-tools">18.3. Tools provided by platforms</a></span></dt>
-</dl></dd>
-<dt><span class="chapter"><a href="#fixes">19. Making your package work</a></span></dt>
-<dd><dl>
-<dt><span class="sect1"><a href="#general-operation">19.1. General operation</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#pulling-vars-from-etc-mk.conf">19.1.1. How to pull in user-settable variables from <code class="filename">mk.conf</code></a></span></dt>
-<dt><span class="sect2"><a href="#user-interaction">19.1.2. User interaction</a></span></dt>
-<dt><span class="sect2"><a href="#handling-licenses">19.1.3. Handling licenses</a></span></dt>
-<dt><span class="sect2"><a href="#restricted-packages">19.1.4. Restricted packages</a></span></dt>
-<dt><span class="sect2"><a href="#dependencies">19.1.5. Handling dependencies</a></span></dt>
-<dt><span class="sect2"><a href="#conflicts">19.1.6. Handling conflicts with other packages</a></span></dt>
-<dt><span class="sect2"><a href="#not-building-packages">19.1.7. Packages that cannot or should not be built</a></span></dt>
-<dt><span class="sect2"><a href="#undeletable-packages">19.1.8. Packages which should not be deleted, once installed</a></span></dt>
-<dt><span class="sect2"><a href="#security-handling">19.1.9. Handling packages with security problems</a></span></dt>
-<dt><span class="sect2"><a href="#bumping-pkgrevision">19.1.10. How to handle incrementing versions when fixing an existing package</a></span></dt>
-<dt><span class="sect2"><a href="#fixes.subst">19.1.11. Substituting variable text in the package files (the SUBST framework)</a></span></dt>
-</dl></dd>
-<dt><span class="sect1"><a href="#fixes.fetch">19.2. The <span class="emphasis"><em>fetch</em></span> phase</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#no-plain-download">19.2.1. Packages whose distfiles aren't available for plain downloading</a></span></dt>
-<dt><span class="sect2"><a href="#modified-distfiles-same-name">19.2.2. How to handle modified distfiles with the 'old' name</a></span></dt>
-<dt><span class="sect2"><a href="#build.fetch.github">19.2.3. Packages hosted on github.com</a></span></dt>
-</dl></dd>
-<dt><span class="sect1"><a href="#fixes.configure">19.3. The <span class="emphasis"><em>configure</em></span> phase</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#fixes.libtool">19.3.1. Shared libraries - libtool</a></span></dt>
-<dt><span class="sect2"><a href="#using-libtool">19.3.2. Using libtool on GNU packages that already support libtool</a></span></dt>
-<dt><span class="sect2"><a href="#autoconf-automake">19.3.3. GNU Autoconf/Automake</a></span></dt>
-</dl></dd>
-<dt><span class="sect1"><a href="#programming-languages">19.4. Programming languages</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#basic-programming-languages">19.4.1. C, C++, and Fortran</a></span></dt>
-<dt><span class="sect2"><a href="#java-programming-language">19.4.2. Java</a></span></dt>
-<dt><span class="sect2"><a href="#perl-scripts">19.4.3. Packages containing perl scripts</a></span></dt>
-<dt><span class="sect2"><a href="#shell-scripts">19.4.4. Packages containing shell scripts</a></span></dt>
-<dt><span class="sect2"><a href="#other-programming-languages">19.4.5. Other programming languages</a></span></dt>
-</dl></dd>
-<dt><span class="sect1"><a href="#fixes.build">19.5. The <span class="emphasis"><em>build</em></span> phase</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#fixes.build.cpp">19.5.1. Compiling C and C++ code conditionally</a></span></dt>
-<dt><span class="sect2"><a href="#compiler-bugs">19.5.2. How to handle compiler bugs</a></span></dt>
-<dt><span class="sect2"><a href="#undefined-reference">19.5.3. Undefined reference to <span class="quote">&#8220;<span class="quote">...</span>&#8221;</span></a></span></dt>
-<dt><span class="sect2"><a href="#out-of-memory">19.5.4. Running out of memory</a></span></dt>
-</dl></dd>
-<dt><span class="sect1"><a href="#fixes.install">19.6. The <span class="emphasis"><em>install</em></span> phase</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#install-scripts">19.6.1. Creating needed directories</a></span></dt>
-<dt><span class="sect2"><a href="#where-to-install-documentation">19.6.2. Where to install documentation</a></span></dt>
-<dt><span class="sect2"><a href="#installing-score-files">19.6.3. Installing highscore files</a></span></dt>
-<dt><span class="sect2"><a href="#destdir-support">19.6.4. Adding DESTDIR support to packages</a></span></dt>
-<dt><span class="sect2"><a href="#hardcoded-paths">19.6.5. Packages with hardcoded paths to other interpreters</a></span></dt>
-<dt><span class="sect2"><a href="#perl-modules">19.6.6. Packages installing perl modules</a></span></dt>
-<dt><span class="sect2"><a href="#faq.info-files">19.6.7. Packages installing info files</a></span></dt>
-<dt><span class="sect2"><a href="#manpages">19.6.8. Packages installing man pages</a></span></dt>
-<dt><span class="sect2"><a href="#gconf-data-files">19.6.9. Packages installing GConf data files</a></span></dt>
-<dt><span class="sect2"><a href="#scrollkeeper-data-files">19.6.10. Packages installing scrollkeeper/rarian data files</a></span></dt>
-<dt><span class="sect2"><a href="#x11-fonts">19.6.11. Packages installing X11 fonts</a></span></dt>
-<dt><span class="sect2"><a href="#gtk2-modules">19.6.12. Packages installing GTK2 modules</a></span></dt>
-<dt><span class="sect2"><a href="#sgml-xml-data">19.6.13. Packages installing SGML or XML data</a></span></dt>
-<dt><span class="sect2"><a href="#mime-database">19.6.14. Packages installing extensions to the MIME database</a></span></dt>
-<dt><span class="sect2"><a href="#intltool">19.6.15. Packages using intltool</a></span></dt>
-<dt><span class="sect2"><a href="#startup-scripts">19.6.16. Packages installing startup scripts</a></span></dt>
-<dt><span class="sect2"><a href="#tex-packages">19.6.17. Packages installing TeX modules</a></span></dt>
-<dt><span class="sect2"><a href="#emulation-packages">19.6.18. Packages supporting running binaries in
+<dt><span class="sect1"><a href="#files-and-dirs-outside-prefix">17.1. Files and directories outside the installation prefix</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#dirs-outside-prefix">17.1.1. Directory manipulation</a></span></dt>
+<dt><span class="sect2"><a href="#files-outside-prefix">17.1.2. File manipulation</a></span></dt>
+</dl></dd>
+<dt><span class="sect1"><a href="#conf-files">17.2. Configuration files</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#conf-files-sysconfdir">17.2.1. How <code class="varname">PKG_SYSCONFDIR</code> is set</a></span></dt>
+<dt><span class="sect2"><a href="#conf-files-configure">17.2.2. Telling the software where configuration files are</a></span></dt>
+<dt><span class="sect2"><a href="#conf-files-patching">17.2.3. Patching installations</a></span></dt>
+<dt><span class="sect2"><a href="#conf-files-disable">17.2.4. Disabling handling of configuration files</a></span></dt>
+</dl></dd>
+<dt><span class="sect1"><a href="#rcd-scripts">17.3. System startup scripts</a></span></dt>
+<dd><dl><dt><span class="sect2"><a href="#rcd-scripts-disable">17.3.1. Disabling handling of system startup scripts</a></span></dt></dl></dd>
+<dt><span class="sect1"><a href="#users-and-groups">17.4. System users and groups</a></span></dt>
+<dt><span class="sect1"><a href="#shells">17.5. System shells</a></span></dt>
+<dd><dl><dt><span class="sect2"><a href="#shells-disable">17.5.1. Disabling shell registration</a></span></dt></dl></dd>
+<dt><span class="sect1"><a href="#fonts">17.6. Fonts</a></span></dt>
+<dd><dl><dt><span class="sect2"><a href="#fonts-disable">17.6.1. Disabling automatic update of the fonts databases</a></span></dt></dl></dd>
+</dl></dd>
+<dt><span class="chapter"><a href="#options">18. Options handling</a></span></dt>
+<dd><dl>
+<dt><span class="sect1"><a href="#global-default-options">18.1. Global default options</a></span></dt>
+<dt><span class="sect1"><a href="#converting-to-options">18.2. Converting packages to use <code class="filename">bsd.options.mk</code></a></span></dt>
+<dt><span class="sect1"><a href="#option-names">18.3. Option Names</a></span></dt>
+<dt><span class="sect1"><a href="#option-build">18.4. Determining the options of dependencies</a></span></dt>
+</dl></dd>
+<dt><span class="chapter"><a href="#build">19. The build process</a></span></dt>
+<dd><dl>
+<dt><span class="sect1"><a href="#build.intro">19.1. Introduction</a></span></dt>
+<dt><span class="sect1"><a href="#build.prefix">19.2. Program location</a></span></dt>
+<dt><span class="sect1"><a href="#build.builddirs">19.3. Directories used during the build process</a></span></dt>
+<dt><span class="sect1"><a href="#build.running">19.4. Running a phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.fetch">19.5. The <span class="emphasis"><em>fetch</em></span> phase</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#build.fetch.what">19.5.1. What to fetch and where to get it from</a></span></dt>
+<dt><span class="sect2"><a href="#build.fetch.how">19.5.2. How are the files fetched?</a></span></dt>
+</dl></dd>
+<dt><span class="sect1"><a href="#build.checksum">19.6. The <span class="emphasis"><em>checksum</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.extract">19.7. The <span class="emphasis"><em>extract</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.patch">19.8. The <span class="emphasis"><em>patch</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.tools">19.9. The <span class="emphasis"><em>tools</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.wrapper">19.10. The <span class="emphasis"><em>wrapper</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.configure">19.11. The <span class="emphasis"><em>configure</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.build">19.12. The <span class="emphasis"><em>build</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.test">19.13. The <span class="emphasis"><em>test</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.install">19.14. The <span class="emphasis"><em>install</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.package">19.15. The <span class="emphasis"><em>package</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.clean">19.16. Cleaning up</a></span></dt>
+<dt><span class="sect1"><a href="#build.helpful-targets">19.17. Other helpful targets</a></span></dt>
+</dl></dd>
+<dt><span class="chapter"><a href="#tools">20. Tools needed for building or running</a></span></dt>
+<dd><dl>
+<dt><span class="sect1"><a href="#pkgsrc-tools">20.1. Tools for pkgsrc builds</a></span></dt>
+<dt><span class="sect1"><a href="#package-tools">20.2. Tools needed by packages</a></span></dt>
+<dt><span class="sect1"><a href="#platform-tools">20.3. Tools provided by platforms</a></span></dt>
+</dl></dd>
+<dt><span class="chapter"><a href="#fixes">21. Making your package work</a></span></dt>
+<dd><dl>
+<dt><span class="sect1"><a href="#general-operation">21.1. General operation</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#pulling-vars-from-etc-mk.conf">21.1.1. How to pull in user-settable variables from <code class="filename">mk.conf</code></a></span></dt>
+<dt><span class="sect2"><a href="#user-interaction">21.1.2. User interaction</a></span></dt>
+<dt><span class="sect2"><a href="#handling-licenses">21.1.3. Handling licenses</a></span></dt>
+<dt><span class="sect2"><a href="#restricted-packages">21.1.4. Restricted packages</a></span></dt>
+<dt><span class="sect2"><a href="#dependencies">21.1.5. Handling dependencies</a></span></dt>
+<dt><span class="sect2"><a href="#conflicts">21.1.6. Handling conflicts with other packages</a></span></dt>
+<dt><span class="sect2"><a href="#not-building-packages">21.1.7. Packages that cannot or should not be built</a></span></dt>
+<dt><span class="sect2"><a href="#undeletable-packages">21.1.8. Packages which should not be deleted, once installed</a></span></dt>
+<dt><span class="sect2"><a href="#security-handling">21.1.9. Handling packages with security problems</a></span></dt>
+<dt><span class="sect2"><a href="#bumping-pkgrevision">21.1.10. How to handle incrementing versions when fixing an existing package</a></span></dt>
+<dt><span class="sect2"><a href="#fixes.subst">21.1.11. Substituting variable text in the package files (the SUBST framework)</a></span></dt>
+</dl></dd>
+<dt><span class="sect1"><a href="#fixes.fetch">21.2. The <span class="emphasis"><em>fetch</em></span> phase</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#no-plain-download">21.2.1. Packages whose distfiles aren't available for plain downloading</a></span></dt>
+<dt><span class="sect2"><a href="#modified-distfiles-same-name">21.2.2. How to handle modified distfiles with the 'old' name</a></span></dt>
+<dt><span class="sect2"><a href="#build.fetch.github">21.2.3. Packages hosted on github.com</a></span></dt>
+</dl></dd>
+<dt><span class="sect1"><a href="#fixes.configure">21.3. The <span class="emphasis"><em>configure</em></span> phase</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#fixes.libtool">21.3.1. Shared libraries - libtool</a></span></dt>
+<dt><span class="sect2"><a href="#using-libtool">21.3.2. Using libtool on GNU packages that already support libtool</a></span></dt>
+<dt><span class="sect2"><a href="#autoconf-automake">21.3.3. GNU Autoconf/Automake</a></span></dt>
+</dl></dd>
+<dt><span class="sect1"><a href="#programming-languages">21.4. Programming languages</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#basic-programming-languages">21.4.1. C, C++, and Fortran</a></span></dt>
+<dt><span class="sect2"><a href="#java-programming-language">21.4.2. Java</a></span></dt>
+<dt><span class="sect2"><a href="#perl-scripts">21.4.3. Packages containing perl scripts</a></span></dt>
+<dt><span class="sect2"><a href="#shell-scripts">21.4.4. Packages containing shell scripts</a></span></dt>
+<dt><span class="sect2"><a href="#other-programming-languages">21.4.5. Other programming languages</a></span></dt>
+</dl></dd>
+<dt><span class="sect1"><a href="#fixes.build">21.5. The <span class="emphasis"><em>build</em></span> phase</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#fixes.build.cpp">21.5.1. Compiling C and C++ code conditionally</a></span></dt>
+<dt><span class="sect2"><a href="#compiler-bugs">21.5.2. How to handle compiler bugs</a></span></dt>
+<dt><span class="sect2"><a href="#undefined-reference">21.5.3. Undefined reference to <span class="quote">&#8220;<span class="quote">...</span>&#8221;</span></a></span></dt>
+<dt><span class="sect2"><a href="#out-of-memory">21.5.4. Running out of memory</a></span></dt>
+</dl></dd>
+<dt><span class="sect1"><a href="#fixes.install">21.6. The <span class="emphasis"><em>install</em></span> phase</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#install-scripts">21.6.1. Creating needed directories</a></span></dt>
+<dt><span class="sect2"><a href="#where-to-install-documentation">21.6.2. Where to install documentation</a></span></dt>
+<dt><span class="sect2"><a href="#installing-score-files">21.6.3. Installing highscore files</a></span></dt>
+<dt><span class="sect2"><a href="#destdir-support">21.6.4. Adding DESTDIR support to packages</a></span></dt>
+<dt><span class="sect2"><a href="#hardcoded-paths">21.6.5. Packages with hardcoded paths to other interpreters</a></span></dt>
+<dt><span class="sect2"><a href="#perl-modules">21.6.6. Packages installing perl modules</a></span></dt>
+<dt><span class="sect2"><a href="#faq.info-files">21.6.7. Packages installing info files</a></span></dt>
+<dt><span class="sect2"><a href="#manpages">21.6.8. Packages installing man pages</a></span></dt>
+<dt><span class="sect2"><a href="#gconf-data-files">21.6.9. Packages installing GConf data files</a></span></dt>
+<dt><span class="sect2"><a href="#scrollkeeper-data-files">21.6.10. Packages installing scrollkeeper/rarian data files</a></span></dt>
+<dt><span class="sect2"><a href="#x11-fonts">21.6.11. Packages installing X11 fonts</a></span></dt>
+<dt><span class="sect2"><a href="#gtk2-modules">21.6.12. Packages installing GTK2 modules</a></span></dt>
+<dt><span class="sect2"><a href="#sgml-xml-data">21.6.13. Packages installing SGML or XML data</a></span></dt>
+<dt><span class="sect2"><a href="#mime-database">21.6.14. Packages installing extensions to the MIME database</a></span></dt>
+<dt><span class="sect2"><a href="#intltool">21.6.15. Packages using intltool</a></span></dt>
+<dt><span class="sect2"><a href="#startup-scripts">21.6.16. Packages installing startup scripts</a></span></dt>
+<dt><span class="sect2"><a href="#tex-packages">21.6.17. Packages installing TeX modules</a></span></dt>
+<dt><span class="sect2"><a href="#emulation-packages">21.6.18. Packages supporting running binaries in
     emulation</a></span></dt>
-<dt><span class="sect2"><a href="#hicolor-theme">19.6.19. Packages installing hicolor theme icons</a></span></dt>
-<dt><span class="sect2"><a href="#desktop-files">19.6.20. Packages installing desktop files</a></span></dt>
+<dt><span class="sect2"><a href="#hicolor-theme">21.6.19. Packages installing hicolor theme icons</a></span></dt>
+<dt><span class="sect2"><a href="#desktop-files">21.6.20. Packages installing desktop files</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#punting">19.7. Marking packages as having problems</a></span></dt>
+<dt><span class="sect1"><a href="#punting">21.7. Marking packages as having problems</a></span></dt>
 </dl></dd>
-<dt><span class="chapter"><a href="#debug">20. Debugging</a></span></dt>
-<dt><span class="chapter"><a href="#submit">21. Submitting and Committing</a></span></dt>
+<dt><span class="chapter"><a href="#debug">22. Debugging</a></span></dt>
+<dt><span class="chapter"><a href="#submit">23. Submitting and Committing</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#submitting-binary-packages">21.1. Submitting binary packages</a></span></dt>
-<dt><span class="sect1"><a href="#submitting-your-package">21.2. Submitting source packages (for non-NetBSD-developers)</a></span></dt>
-<dt><span class="sect1"><a href="#general-notes-for-changes">21.3. General notes when adding, updating, or removing packages</a></span></dt>
-<dt><span class="sect1"><a href="#commit-messages">21.4. Commit Messages</a></span></dt>
-<dt><span class="sect1"><a href="#committing-importing">21.5. Committing: Adding a package to CVS</a></span></dt>
-<dt><span class="sect1"><a href="#updating-package">21.6. Updating a package to a newer version</a></span></dt>
-<dt><span class="sect1"><a href="#renaming-package">21.7. Renaming a package in pkgsrc</a></span></dt>
-<dt><span class="sect1"><a href="#moving-package">21.8. Moving a package in pkgsrc</a></span></dt>
-</dl></dd>
-<dt><span class="chapter"><a href="#devfaq">22. Frequently Asked Questions</a></span></dt>
-<dt><span class="chapter"><a href="#gnome">23. GNOME packaging and porting</a></span></dt>
-<dd><dl>
-<dt><span class="sect1"><a href="#meta-packages">23.1. Meta packages</a></span></dt>
-<dt><span class="sect1"><a href="#new-package">23.2. Packaging a GNOME application</a></span></dt>
-<dt><span class="sect1"><a href="#full-update">23.3. Updating GNOME to a newer version</a></span></dt>
-<dt><span class="sect1"><a href="#patching">23.4. Patching guidelines</a></span></dt>
+<dt><span class="sect1"><a href="#submitting-binary-packages">23.1. Submitting binary packages</a></span></dt>
+<dt><span class="sect1"><a href="#submitting-your-package">23.2. Submitting source packages (for non-NetBSD-developers)</a></span></dt>
+<dt><span class="sect1"><a href="#general-notes-for-changes">23.3. General notes when adding, updating, or removing packages</a></span></dt>
+<dt><span class="sect1"><a href="#commit-messages">23.4. Commit Messages</a></span></dt>
+<dt><span class="sect1"><a href="#committing-importing">23.5. Committing: Adding a package to CVS</a></span></dt>
+<dt><span class="sect1"><a href="#updating-package">23.6. Updating a package to a newer version</a></span></dt>
+<dt><span class="sect1"><a href="#renaming-package">23.7. Renaming a package in pkgsrc</a></span></dt>
+<dt><span class="sect1"><a href="#moving-package">23.8. Moving a package in pkgsrc</a></span></dt>
+</dl></dd>
+<dt><span class="chapter"><a href="#devfaq">24. Frequently Asked Questions</a></span></dt>
+<dt><span class="chapter"><a href="#gnome">25. GNOME packaging and porting</a></span></dt>
+<dd><dl>
+<dt><span class="sect1"><a href="#meta-packages">25.1. Meta packages</a></span></dt>
+<dt><span class="sect1"><a href="#new-package">25.2. Packaging a GNOME application</a></span></dt>
+<dt><span class="sect1"><a href="#full-update">25.3. Updating GNOME to a newer version</a></span></dt>
+<dt><span class="sect1"><a href="#patching">25.4. Patching guidelines</a></span></dt>
 </dl></dd>
 </dl></dd>
 <dt><span class="part"><a href="#infrastructure">III. The pkgsrc infrastructure internals</a></span></dt>
 <dd><dl>
-<dt><span class="chapter"><a href="#infr.design">24. Design of the pkgsrc infrastructure</a></span></dt>
+<dt><span class="chapter"><a href="#infr.design">26. Design of the pkgsrc infrastructure</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#infr.vardef">24.1. The meaning of variable definitions</a></span></dt>
-<dt><span class="sect1"><a href="#infr.vardef.problems">24.2. Avoiding problems before they arise</a></span></dt>
-<dt><span class="sect1"><a href="#infr.var">24.3. Variable evaluation</a></span></dt>
+<dt><span class="sect1"><a href="#infr.vardef">26.1. The meaning of variable definitions</a></span></dt>
+<dt><span class="sect1"><a href="#infr.vardef.problems">26.2. Avoiding problems before they arise</a></span></dt>
+<dt><span class="sect1"><a href="#infr.var">26.3. Variable evaluation</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#infr.var.load">24.3.1. At load time</a></span></dt>
-<dt><span class="sect2"><a href="#infr.var.run">24.3.2. At runtime</a></span></dt>
+<dt><span class="sect2"><a href="#infr.var.load">26.3.1. At load time</a></span></dt>
+<dt><span class="sect2"><a href="#infr.var.run">26.3.2. At runtime</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#infr.varspec">24.4. How can variables be specified?</a></span></dt>
-<dt><span class="sect1"><a href="#infr.design.intf">24.5. Designing interfaces for Makefile fragments</a></span></dt>
+<dt><span class="sect1"><a href="#infr.varspec">26.4. How can variables be specified?</a></span></dt>
+<dt><span class="sect1"><a href="#infr.design.intf">26.5. Designing interfaces for Makefile fragments</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#infr.design.intf.proc">24.5.1. Procedures with parameters</a></span></dt>
-<dt><span class="sect2"><a href="#infr.design.intf.action">24.5.2. Actions taken on behalf of parameters</a></span></dt>
+<dt><span class="sect2"><a href="#infr.design.intf.proc">26.5.1. Procedures with parameters</a></span></dt>
+<dt><span class="sect2"><a href="#infr.design.intf.action">26.5.2. Actions taken on behalf of parameters</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#infr.order">24.6. The order in which files are loaded</a></span></dt>
+<dt><span class="sect1"><a href="#infr.order">26.6. The order in which files are loaded</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#infr.order.prefs">24.6.1. The order in <code class="filename">bsd.prefs.mk</code></a></span></dt>
-<dt><span class="sect2"><a href="#infr.order.pkg">24.6.2. The order in <code class="filename">bsd.pkg.mk</code></a></span></dt>
+<dt><span class="sect2"><a href="#infr.order.prefs">26.6.1. The order in <code class="filename">bsd.prefs.mk</code></a></span></dt>
+<dt><span class="sect2"><a href="#infr.order.pkg">26.6.2. The order in <code class="filename">bsd.pkg.mk</code></a></span></dt>
 </dl></dd>
 </dl></dd>
-<dt><span class="chapter"><a href="#regression">25. Regression tests</a></span></dt>
+<dt><span class="chapter"><a href="#regression">27. Regression tests</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#regression.run">25.1. Running the regression tests</a></span></dt>
-<dt><span class="sect1"><a href="#regression.new">25.2. Adding a new regression test</a></span></dt>
+<dt><span class="sect1"><a href="#regression.run">27.1. Running the regression tests</a></span></dt>
+<dt><span class="sect1"><a href="#regression.new">27.2. Adding a new regression test</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#regression.fun.override">25.2.1. Overridable functions</a></span></dt>
-<dt><span class="sect2"><a href="#regression.fun.helper">25.2.2. Helper functions</a></span></dt>
+<dt><span class="sect2"><a href="#regression.fun.override">27.2.1. Overridable functions</a></span></dt>
+<dt><span class="sect2"><a href="#regression.fun.helper">27.2.2. Helper functions</a></span></dt>
 </dl></dd>
 </dl></dd>
-<dt><span class="chapter"><a href="#porting">26. Porting pkgsrc</a></span></dt>
-<dd><dl><dt><span class="sect1"><a href="#porting.opsys">26.1. Porting pkgsrc to a new operating system</a></span></dt></dl></dd>
+<dt><span class="chapter"><a href="#porting">28. Porting pkgsrc</a></span></dt>
+<dd><dl><dt><span class="sect1"><a href="#porting.opsys">28.1. Porting pkgsrc to a new operating system</a></span></dt></dl></dd>
 </dl></dd>
 <dt><span class="appendix"><a href="#examples">A. A simple example package: bison</a></span></dt>
 <dd><dl>
@@ -441,10 +443,11 @@ builds)</a></span></dt>
 <code class="filename">pkgsrc-20<em class="replaceable"><code>xx</code></em>Q<em class="replaceable"><code>y</code></em></code>:
 source packages</a></span></dt>
 </dl></dd>
-<dt><span class="appendix"><a href="#editing">D. Editing guidelines for the pkgsrc guide</a></span></dt>
+<dt><span class="appendix"><a href="#help-topics">D. Help topics</a></span></dt>
+<dt><span class="appendix"><a href="#editing">E. Editing guidelines for the pkgsrc guide</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#targets">D.1. Make targets</a></span></dt>
-<dt><span class="sect1"><a href="#procedure">D.2. Procedure</a></span></dt>
+<dt><span class="sect1"><a href="#targets">E.1. Make targets</a></span></dt>
+<dt><span class="sect1"><a href="#procedure">E.2. Procedure</a></span></dt>
 </dl></dd>
 </dl>
 </div>
@@ -453,9 +456,9 @@ source packages</a></span></dt>
 <dl>
 <dt>1.1. <a href="#supported-platforms">Platforms supported by pkgsrc</a>
 </dt>
-<dt>11.1. <a href="#patch-examples">Patching examples</a>
+<dt>13.1. <a href="#patch-examples">Patching examples</a>
 </dt>
-<dt>23.1. <a href="#plist-handling">PLIST handling for GNOME packages</a>
+<dt>25.1. <a href="#plist-handling">PLIST handling for GNOME packages</a>
 </dt>
 </dl>
 </div>
@@ -799,115 +802,147 @@ minutes!</p>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="chapter"><a href="#getting">2. Where to get pkgsrc and how to keep it up-to-date</a></span></dt>
+<dt><span class="chapter"><a href="#help-user">2. Getting help</a></span></dt>
+<dt><span class="chapter"><a href="#getting">3. Where to get pkgsrc and how to keep it up-to-date</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#getting-first">2.1. Getting pkgsrc for the first time</a></span></dt>
+<dt><span class="sect1"><a href="#getting-first">3.1. Getting pkgsrc for the first time</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#getting-via-tar">2.1.1. As tar archive</a></span></dt>
-<dt><span class="sect2"><a href="#getting-via-cvs">2.1.2. Via anonymous CVS</a></span></dt>
+<dt><span class="sect2"><a href="#getting-via-tar">3.1.1. As tar archive</a></span></dt>
+<dt><span class="sect2"><a href="#getting-via-cvs">3.1.2. Via anonymous CVS</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#uptodate">2.2. Keeping pkgsrc up-to-date</a></span></dt>
+<dt><span class="sect1"><a href="#uptodate">3.2. Keeping pkgsrc up-to-date</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#uptodate-tar">2.2.1. Via tar files</a></span></dt>
-<dt><span class="sect2"><a href="#uptodate-cvs">2.2.2. Via CVS</a></span></dt>
+<dt><span class="sect2"><a href="#uptodate-tar">3.2.1. Via tar files</a></span></dt>
+<dt><span class="sect2"><a href="#uptodate-cvs">3.2.2. Via CVS</a></span></dt>
 </dl></dd>
 </dl></dd>
-<dt><span class="chapter"><a href="#platforms">3. Using pkgsrc on systems other than NetBSD</a></span></dt>
+<dt><span class="chapter"><a href="#platforms">4. Using pkgsrc on systems other than NetBSD</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#binarydist">3.1. Binary distribution</a></span></dt>
-<dt><span class="sect1"><a href="#bootstrapping-pkgsrc">3.2. Bootstrapping pkgsrc</a></span></dt>
+<dt><span class="sect1"><a href="#binarydist">4.1. Binary distribution</a></span></dt>
+<dt><span class="sect1"><a href="#bootstrapping-pkgsrc">4.2. Bootstrapping pkgsrc</a></span></dt>
 </dl></dd>
-<dt><span class="chapter"><a href="#using">4. Using pkgsrc</a></span></dt>
+<dt><span class="chapter"><a href="#using">5. Using pkgsrc</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#using-pkg">4.1. Using binary packages</a></span></dt>
+<dt><span class="sect1"><a href="#using-pkg">5.1. Using binary packages</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#finding-binary-packages">4.1.1. Finding binary packages</a></span></dt>
-<dt><span class="sect2"><a href="#installing-binary-packages">4.1.2. Installing binary packages</a></span></dt>
-<dt><span class="sect2"><a href="#using.pkg_delete">4.1.3. Deinstalling packages</a></span></dt>
-<dt><span class="sect2"><a href="#using.pkg_info">4.1.4. Getting information about installed packages</a></span></dt>
-<dt><span class="sect2"><a href="#vulnerabilities">4.1.5. Checking for security vulnerabilities in installed packages</a></span></dt>
-<dt><span class="sect2"><a href="#pkg_versions">4.1.6. Finding if newer versions of your installed packages are in pkgsrc</a></span></dt>
-<dt><span class="sect2"><a href="#using.pkg_admin">4.1.7. Other administrative functions</a></span></dt>
+<dt><span class="sect2"><a href="#finding-binary-packages">5.1.1. Finding binary packages</a></span></dt>
+<dt><span class="sect2"><a href="#installing-binary-packages">5.1.2. Installing binary packages</a></span></dt>
+<dt><span class="sect2"><a href="#using.pkg_delete">5.1.3. Deinstalling packages</a></span></dt>
+<dt><span class="sect2"><a href="#using.pkg_info">5.1.4. Getting information about installed packages</a></span></dt>
+<dt><span class="sect2"><a href="#vulnerabilities">5.1.5. Checking for security vulnerabilities in installed packages</a></span></dt>
+<dt><span class="sect2"><a href="#pkg_versions">5.1.6. Finding if newer versions of your installed packages are in pkgsrc</a></span></dt>
+<dt><span class="sect2"><a href="#using.pkg_admin">5.1.7. Other administrative functions</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#building-packages-from-source">4.2. Building packages from source</a></span></dt>
+<dt><span class="sect1"><a href="#building-packages-from-source">5.2. Building packages from source</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#requirements">4.2.1. Requirements</a></span></dt>
-<dt><span class="sect2"><a href="#fetching-distfiles">4.2.2. Fetching distfiles</a></span></dt>
-<dt><span class="sect2"><a href="#how-to-build-and-install">4.2.3. How to build and install</a></span></dt>
+<dt><span class="sect2"><a href="#requirements">5.2.1. Requirements</a></span></dt>
+<dt><span class="sect2"><a href="#fetching-distfiles">5.2.2. Fetching distfiles</a></span></dt>
+<dt><span class="sect2"><a href="#how-to-build-and-install">5.2.3. How to build and install</a></span></dt>
 </dl></dd>
 </dl></dd>
-<dt><span class="chapter"><a href="#configuring">5. Configuring pkgsrc</a></span></dt>
+<dt><span class="chapter"><a href="#configuring">6. Configuring pkgsrc</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#general-configuration">5.1. General configuration</a></span></dt>
-<dt><span class="sect1"><a href="#variables-affecting-build">5.2. Variables affecting the build process</a></span></dt>
-<dt><span class="sect1"><a href="#variables-affecting-installation">5.3. Variables affecting the installation process</a></span></dt>
-<dt><span class="sect1"><a href="#conf.compiler">5.4. Selecting and configuring the compiler</a></span></dt>
+<dt><span class="sect1"><a href="#general-configuration">6.1. General configuration</a></span></dt>
+<dt><span class="sect1"><a href="#variables-affecting-build">6.2. Variables affecting the build process</a></span></dt>
+<dt><span class="sect1"><a href="#variables-affecting-installation">6.3. Variables affecting the installation process</a></span></dt>
+<dt><span class="sect1"><a href="#conf.compiler">6.4. Selecting and configuring the compiler</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#selecting-the-compiler">5.4.1. Selecting the compiler</a></span></dt>
-<dt><span class="sect2"><a href="#conf.cflags">5.4.2. Additional flags to the compiler (<code class="varname">CFLAGS</code>)</a></span></dt>
-<dt><span class="sect2"><a href="#conf.ldflags">5.4.3. Additional flags to the linker (<code class="varname">LDFLAGS</code>)</a></span></dt>
+<dt><span class="sect2"><a href="#selecting-the-compiler">6.4.1. Selecting the compiler</a></span></dt>
+<dt><span class="sect2"><a href="#conf.cflags">6.4.2. Additional flags to the compiler (<code class="varname">CFLAGS</code>)</a></span></dt>
+<dt><span class="sect2"><a href="#conf.ldflags">6.4.3. Additional flags to the linker (<code class="varname">LDFLAGS</code>)</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#developer-advanced-settings">5.5. Developer/advanced settings</a></span></dt>
-<dt><span class="sect1"><a href="#selecting-build-options">5.6. Selecting Build Options</a></span></dt>
+<dt><span class="sect1"><a href="#developer-advanced-settings">6.5. Developer/advanced settings</a></span></dt>
+<dt><span class="sect1"><a href="#selecting-build-options">6.6. Selecting Build Options</a></span></dt>
 </dl></dd>
-<dt><span class="chapter"><a href="#binary">6. Creating binary packages</a></span></dt>
+<dt><span class="chapter"><a href="#binary">7. Creating binary packages</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#building-a-single-binary-package">6.1. Building a single binary package</a></span></dt>
-<dt><span class="sect1"><a href="#settings-for-creationg-of-binary-packages">6.2. Settings for creation of binary packages</a></span></dt>
+<dt><span class="sect1"><a href="#building-a-single-binary-package">7.1. Building a single binary package</a></span></dt>
+<dt><span class="sect1"><a href="#settings-for-creationg-of-binary-packages">7.2. Settings for creation of binary packages</a></span></dt>
 </dl></dd>
-<dt><span class="chapter"><a href="#bulk">7. Creating binary packages for everything in pkgsrc (bulk
+<dt><span class="chapter"><a href="#bulk">8. Creating binary packages for everything in pkgsrc (bulk
 builds)</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#bulk.pre">7.1. Preparations</a></span></dt>
-<dt><span class="sect1"><a href="#bulk.pbulk">7.2. Running a pbulk-style bulk build</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="#bulk.pbulk.conf">7.2.1. Configuration</a></span></dt></dl></dd>
-<dt><span class="sect1"><a href="#bulk.req">7.3. Requirements of a full bulk build</a></span></dt>
-<dt><span class="sect1"><a href="#creating-cdroms">7.4. Creating a multiple CD-ROM packages collection</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="#cdpack-example">7.4.1. Example of cdpack</a></span></dt></dl></dd>
-</dl></dd>
-<dt><span class="chapter"><a href="#files">8. Directory layout of the installed files</a></span></dt>
-<dd><dl>
-<dt><span class="sect1"><a href="#files.localbase">8.1. File system layout in <code class="literal">${LOCALBASE}</code></a></span></dt>
-<dt><span class="sect1"><a href="#files.varbase">8.2. File system layout in <code class="literal">${VARBASE}</code></a></span></dt>
-</dl></dd>
-<dt><span class="chapter"><a href="#faq">9. Frequently Asked Questions</a></span></dt>
-<dd><dl>
-<dt><span class="sect1"><a href="#mailing-list-pointers">9.1. Are there any mailing lists for pkg-related discussion?</a></span></dt>
-<dt><span class="sect1"><a href="#faq-pkgtools">9.2. Utilities for package management (pkgtools)</a></span></dt>
-<dt><span class="sect1"><a href="#non-root-pkgsrc">9.3. How to use pkgsrc as non-root</a></span></dt>
-<dt><span class="sect1"><a href="#resume-transfers">9.4. How to resume transfers when fetching distfiles?</a></span></dt>
-<dt><span class="sect1"><a href="#x.org-from-pkgsrc">9.5. How can I install/use modular X.org from pkgsrc?</a></span></dt>
-<dt><span class="sect1"><a href="#fetch-behind-firewall">9.6. How to fetch files from behind a firewall</a></span></dt>
-<dt><span class="sect1"><a href="#fetch-https">9.7. How to fetch files from HTTPS sites</a></span></dt>
-<dt><span class="sect1"><a href="#passive-ftp">9.8. How do I tell <span class="command"><strong>make fetch</strong></span> to do passive FTP?</a></span></dt>
-<dt><span class="sect1"><a href="#fetching-all-distfiles">9.9. How to fetch all distfiles at once</a></span></dt>
-<dt><span class="sect1"><a href="#tmac.andoc-missing">9.10. What does <span class="quote">&#8220;<span class="quote">Don't know how to make
+<dt><span class="sect1"><a href="#bulk.pre">8.1. Preparations</a></span></dt>
+<dt><span class="sect1"><a href="#bulk.pbulk">8.2. Running a pbulk-style bulk build</a></span></dt>
+<dd><dl><dt><span class="sect2"><a href="#bulk.pbulk.conf">8.2.1. Configuration</a></span></dt></dl></dd>
+<dt><span class="sect1"><a href="#bulk.req">8.3. Requirements of a full bulk build</a></span></dt>
+<dt><span class="sect1"><a href="#creating-cdroms">8.4. Creating a multiple CD-ROM packages collection</a></span></dt>
+<dd><dl><dt><span class="sect2"><a href="#cdpack-example">8.4.1. Example of cdpack</a></span></dt></dl></dd>
+</dl></dd>
+<dt><span class="chapter"><a href="#files">9. Directory layout of the installed files</a></span></dt>
+<dd><dl>
+<dt><span class="sect1"><a href="#files.localbase">9.1. File system layout in <code class="literal">${LOCALBASE}</code></a></span></dt>
+<dt><span class="sect1"><a href="#files.varbase">9.2. File system layout in <code class="literal">${VARBASE}</code></a></span></dt>
+</dl></dd>
+<dt><span class="chapter"><a href="#faq">10. Frequently Asked Questions</a></span></dt>
+<dd><dl>
+<dt><span class="sect1"><a href="#mailing-list-pointers">10.1. Are there any mailing lists for pkg-related discussion?</a></span></dt>
+<dt><span class="sect1"><a href="#faq-pkgtools">10.2. Utilities for package management (pkgtools)</a></span></dt>
+<dt><span class="sect1"><a href="#non-root-pkgsrc">10.3. How to use pkgsrc as non-root</a></span></dt>
+<dt><span class="sect1"><a href="#resume-transfers">10.4. How to resume transfers when fetching distfiles?</a></span></dt>
+<dt><span class="sect1"><a href="#x.org-from-pkgsrc">10.5. How can I install/use modular X.org from pkgsrc?</a></span></dt>
+<dt><span class="sect1"><a href="#fetch-behind-firewall">10.6. How to fetch files from behind a firewall</a></span></dt>
+<dt><span class="sect1"><a href="#fetch-https">10.7. How to fetch files from HTTPS sites</a></span></dt>
+<dt><span class="sect1"><a href="#passive-ftp">10.8. How do I tell <span class="command"><strong>make fetch</strong></span> to do passive FTP?</a></span></dt>
+<dt><span class="sect1"><a href="#fetching-all-distfiles">10.9. How to fetch all distfiles at once</a></span></dt>
+<dt><span class="sect1"><a href="#tmac.andoc-missing">10.10. What does <span class="quote">&#8220;<span class="quote">Don't know how to make
 /usr/share/tmac/tmac.andoc</span>&#8221;</span> mean?</a></span></dt>
-<dt><span class="sect1"><a href="#bsd.own.mk-missing">9.11. What does <span class="quote">&#8220;<span class="quote">Could not find bsd.own.mk</span>&#8221;</span> mean?</a></span></dt>
-<dt><span class="sect1"><a href="#using-sudo-with-pkgsrc">9.12. Using 'sudo' with pkgsrc</a></span></dt>
-<dt><span class="sect1"><a href="#faq.conf">9.13. How do I change the location of configuration files?</a></span></dt>
-<dt><span class="sect1"><a href="#audit-packages">9.14. Automated security checks</a></span></dt>
-<dt><span class="sect1"><a href="#ufaq-cflags">9.15. Why do some packages ignore my <code class="varname">CFLAGS</code>?</a></span></dt>
-<dt><span class="sect1"><a href="#ufaq-fail">9.16. A package does not build.  What shall I do?</a></span></dt>
-<dt><span class="sect1"><a href="#faq.rcs-conflicts">9.17. What does <span class="quote">&#8220;<span class="quote">Makefile appears to contain unresolved cvs/rcs/??? merge 
conflicts</span>&#8221;</span> mean?</a></span></dt>
+<dt><span class="sect1"><a href="#bsd.own.mk-missing">10.11. What does <span class="quote">&#8220;<span class="quote">Could not find bsd.own.mk</span>&#8221;</span> mean?</a></span></dt>
+<dt><span class="sect1"><a href="#using-sudo-with-pkgsrc">10.12. Using 'sudo' with pkgsrc</a></span></dt>
+<dt><span class="sect1"><a href="#faq.conf">10.13. How do I change the location of configuration files?</a></span></dt>
+<dt><span class="sect1"><a href="#audit-packages">10.14. Automated security checks</a></span></dt>
+<dt><span class="sect1"><a href="#ufaq-cflags">10.15. Why do some packages ignore my <code class="varname">CFLAGS</code>?</a></span></dt>
+<dt><span class="sect1"><a href="#ufaq-fail">10.16. A package does not build.  What shall I do?</a></span></dt>
+<dt><span class="sect1"><a href="#faq.rcs-conflicts">10.17. What does <span class="quote">&#8220;<span class="quote">Makefile appears to contain unresolved cvs/rcs/??? merge 
conflicts</span>&#8221;</span> mean?</a></span></dt>
 </dl></dd>
 </dl>
 </div>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="getting"></a>Chapter�2.�Where to get pkgsrc and how to keep it up-to-date</h2></div></div></div>
+<a name="help-user"></a>Chapter�2.�Getting help</h2></div></div></div>
+<p>
+       To get help when using pkgsrc, the definitive source is this
+       document, the pkgsrc guide. If you don't find anything here,
+       there are alternatives:
+</p>
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p>
+       The built-in pkgsrc help, which is available after bootstrapping
+       pkgsrc. Run <span class="command"><strong>bmake help topic=&#8230;</strong></span> to get
+       help for any topic, such as a variable name like
+       <code class="varname">BUILD_DEFS</code>, a make target like
+       <span class="command"><strong>do-build</strong></span>, a missing C or C++ function like
+       <span class="command"><strong>strcasecmp</strong></span> or any other topic.</p>
+<p>The available help topics are listed in <a class="xref" href="#help-topics" title="Appendix�D.�Help topics">Appendix�D, <i>Help topics</i></a>.</p>
+</li>
+<li class="listitem"><p>
+       The pkgsrc-users mailing list, to which
+       <a class="ulink" href="https://www.NetBSD.org/mailinglists/#pkgsrc-users"; target="_top">you
+       can subscribe</a> and then <a class="ulink" href="mailto:pkgsrc-users%NetBSD.org@localhost"; target="_top">ask your
+       questions</a>.</p></li>
+<li class="listitem"><p>The #pkgsrc IRC channel, which is accessible
+       <a class="ulink" href="https://webchat.freenode.net/"; target="_top">via a web browser</a>
+       or by using a specialized chat program such as
+       <a class="ulink" href="http://xchat.org/"; target="_top">XChat</a>.
+       Pick any user name and join the channel #pkgsrc.</p></li>
+</ul></div>
+</div>
+<div class="chapter">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="getting"></a>Chapter�3.�Where to get pkgsrc and how to keep it up-to-date</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="sect1"><a href="#getting-first">2.1. Getting pkgsrc for the first time</a></span></dt>
+<dt><span class="sect1"><a href="#getting-first">3.1. Getting pkgsrc for the first time</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#getting-via-tar">2.1.1. As tar archive</a></span></dt>
-<dt><span class="sect2"><a href="#getting-via-cvs">2.1.2. Via anonymous CVS</a></span></dt>
+<dt><span class="sect2"><a href="#getting-via-tar">3.1.1. As tar archive</a></span></dt>
+<dt><span class="sect2"><a href="#getting-via-cvs">3.1.2. Via anonymous CVS</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#uptodate">2.2. Keeping pkgsrc up-to-date</a></span></dt>
+<dt><span class="sect1"><a href="#uptodate">3.2. Keeping pkgsrc up-to-date</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#uptodate-tar">2.2.1. Via tar files</a></span></dt>
-<dt><span class="sect2"><a href="#uptodate-cvs">2.2.2. Via CVS</a></span></dt>
+<dt><span class="sect2"><a href="#uptodate-tar">3.2.1. Via tar files</a></span></dt>
+<dt><span class="sect2"><a href="#uptodate-cvs">3.2.2. Via CVS</a></span></dt>
 </dl></dd>
 </dl>
 </div>
@@ -921,7 +956,7 @@ other programs. A safe bet is to use onl
 and dashes.</p>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="getting-first"></a>2.1.�Getting pkgsrc for the first time</h2></div></div></div>
+<a name="getting-first"></a>3.1.�Getting pkgsrc for the first time</h2></div></div></div>
 <p>Before you download any pkgsrc files, you should decide
        whether you want the <span class="emphasis"><em>current</em></span> branch or the
        <span class="emphasis"><em>stable</em></span> branch. The latter is forked on a
@@ -936,7 +971,7 @@ and dashes.</p>
        Thus you can switch to using CVS at any later time.</p>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="getting-via-tar"></a>2.1.1.�As tar archive</h3></div></div></div>
+<a name="getting-via-tar"></a>3.1.1.�As tar archive</h3></div></div></div>
 <p>The primary download location for all pkgsrc files is
        <a class="ulink" href="https://cdn.NetBSD.org/pub/pkgsrc/"; target="_top">https://cdn.NetBSD.org/pub/pkgsrc/</a> or
        <a class="ulink" href="ftp://ftp.NetBSD.org/pub/pkgsrc/"; target="_top">ftp://ftp.NetBSD.org/pub/pkgsrc/</a>
@@ -971,7 +1006,7 @@ and dashes.</p>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="getting-via-cvs"></a>2.1.2.�Via anonymous CVS</h3></div></div></div>
+<a name="getting-via-cvs"></a>3.1.2.�Via anonymous CVS</h3></div></div></div>
 <p>To fetch a specific pkgsrc stable branch, run:</p>
 <pre class="screen"><code class="prompt">$</code> <strong class="userinput"><code>cd /usr &amp;&amp; cvs -q -z2 -d anoncvs%anoncvs.NetBSD.org@localhost:/cvsroot checkout -r pkgsrc-2019Q1 -P 
pkgsrc</code></strong>
 </pre>
@@ -1011,14 +1046,14 @@ release -d
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="uptodate"></a>2.2.�Keeping pkgsrc up-to-date</h2></div></div></div>
+<a name="uptodate"></a>3.2.�Keeping pkgsrc up-to-date</h2></div></div></div>
 <p>The preferred way to keep pkgsrc up-to-date is via CVS
        (which also works if you have first installed it via a tar
        file). It saves bandwidth and hard disk activity, compared to
        downloading the tar file again.</p>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="uptodate-tar"></a>2.2.1.�Via tar files</h3></div></div></div>
+<a name="uptodate-tar"></a>3.2.1.�Via tar files</h3></div></div></div>
 <div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p>When updating from a tar file, you first need to
@@ -1034,7 +1069,7 @@ release -d
        before updating. You can also configure pkgsrc to store distfiles
         and packages in directories outside the pkgsrc tree by setting the
        <code class="varname">DISTDIR</code> and <code class="varname">PACKAGES</code>
-       variables. See <a class="xref" href="#configuring" title="Chapter�5.�Configuring pkgsrc">Chapter�5, <i>Configuring pkgsrc</i></a> for the details.</p>
+       variables. See <a class="xref" href="#configuring" title="Chapter�6.�Configuring pkgsrc">Chapter�6, <i>Configuring pkgsrc</i></a> for the details.</p>
 <p>To update pkgsrc from a tar file, download the tar file as
        explained above. Then, make sure that you have not made any
        changes to the files in the pkgsrc directory. Remove the pkgsrc
@@ -1042,7 +1077,7 @@ release -d
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="uptodate-cvs"></a>2.2.2.�Via CVS</h3></div></div></div>
+<a name="uptodate-cvs"></a>3.2.2.�Via CVS</h3></div></div></div>
 <p>To update pkgsrc via CVS, change to the <code class="filename">pkgsrc</code> directory and run cvs:</p>
 <pre class="screen"><code class="prompt">$</code> <strong class="userinput"><code>cd /usr/pkgsrc &amp;&amp; cvs update -dP</code></strong>
 </pre>
@@ -1051,7 +1086,7 @@ release -d
 </pre>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="uptodate-cvs-switch"></a>2.2.2.1.�Switching between different pkgsrc branches</h4></div></div></div>
+<a name="uptodate-cvs-switch"></a>3.2.2.1.�Switching between different pkgsrc branches</h4></div></div></div>
 <p>When updating pkgsrc, the CVS program keeps track of the
        branch you selected. But if you, for whatever reason, want to
        switch from the stable branch to the current one, you can do it
@@ -1062,7 +1097,7 @@ release -d
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="uptodate-cvs-changes"></a>2.2.2.2.�What happens to my changes when updating?</h4></div></div></div>
+<a name="uptodate-cvs-changes"></a>3.2.2.2.�What happens to my changes when updating?</h4></div></div></div>
 <p>When you update pkgsrc, the CVS program will only touch
        those files that are registered in the CVS repository. That
        means that any packages that you created on your own will stay
@@ -1076,22 +1111,22 @@ release -d
 </div>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="platforms"></a>Chapter�3.�Using pkgsrc on systems other than NetBSD</h2></div></div></div>
+<a name="platforms"></a>Chapter�4.�Using pkgsrc on systems other than NetBSD</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="sect1"><a href="#binarydist">3.1. Binary distribution</a></span></dt>
-<dt><span class="sect1"><a href="#bootstrapping-pkgsrc">3.2. Bootstrapping pkgsrc</a></span></dt>
+<dt><span class="sect1"><a href="#binarydist">4.1. Binary distribution</a></span></dt>
+<dt><span class="sect1"><a href="#bootstrapping-pkgsrc">4.2. Bootstrapping pkgsrc</a></span></dt>
 </dl>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="binarydist"></a>3.1.�Binary distribution</h2></div></div></div>
-<p>See <a class="xref" href="#using-pkg" title="4.1.�Using binary packages">Section�4.1, &#8220;Using binary packages&#8221;</a>.</p>
+<a name="binarydist"></a>4.1.�Binary distribution</h2></div></div></div>
+<p>See <a class="xref" href="#using-pkg" title="5.1.�Using binary packages">Section�5.1, &#8220;Using binary packages&#8221;</a>.</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="bootstrapping-pkgsrc"></a>3.2.�Bootstrapping pkgsrc</h2></div></div></div>
+<a name="bootstrapping-pkgsrc"></a>4.2.�Bootstrapping pkgsrc</h2></div></div></div>
 <p>pkgsrc can be bootstrapped for use in two different modes:
     privileged and unprivileged one. In unprivileged mode in contrast
     to privileged one all programs are installed under one particular user
@@ -1139,25 +1174,25 @@ release -d
 </div>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="using"></a>Chapter�4.�Using pkgsrc</h2></div></div></div>
+<a name="using"></a>Chapter�5.�Using pkgsrc</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="sect1"><a href="#using-pkg">4.1. Using binary packages</a></span></dt>
+<dt><span class="sect1"><a href="#using-pkg">5.1. Using binary packages</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#finding-binary-packages">4.1.1. Finding binary packages</a></span></dt>
-<dt><span class="sect2"><a href="#installing-binary-packages">4.1.2. Installing binary packages</a></span></dt>
-<dt><span class="sect2"><a href="#using.pkg_delete">4.1.3. Deinstalling packages</a></span></dt>
-<dt><span class="sect2"><a href="#using.pkg_info">4.1.4. Getting information about installed packages</a></span></dt>
-<dt><span class="sect2"><a href="#vulnerabilities">4.1.5. Checking for security vulnerabilities in installed packages</a></span></dt>
-<dt><span class="sect2"><a href="#pkg_versions">4.1.6. Finding if newer versions of your installed packages are in pkgsrc</a></span></dt>
-<dt><span class="sect2"><a href="#using.pkg_admin">4.1.7. Other administrative functions</a></span></dt>
-</dl></dd>
-<dt><span class="sect1"><a href="#building-packages-from-source">4.2. Building packages from source</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#requirements">4.2.1. Requirements</a></span></dt>
-<dt><span class="sect2"><a href="#fetching-distfiles">4.2.2. Fetching distfiles</a></span></dt>
-<dt><span class="sect2"><a href="#how-to-build-and-install">4.2.3. How to build and install</a></span></dt>
+<dt><span class="sect2"><a href="#finding-binary-packages">5.1.1. Finding binary packages</a></span></dt>
+<dt><span class="sect2"><a href="#installing-binary-packages">5.1.2. Installing binary packages</a></span></dt>
+<dt><span class="sect2"><a href="#using.pkg_delete">5.1.3. Deinstalling packages</a></span></dt>
+<dt><span class="sect2"><a href="#using.pkg_info">5.1.4. Getting information about installed packages</a></span></dt>
+<dt><span class="sect2"><a href="#vulnerabilities">5.1.5. Checking for security vulnerabilities in installed packages</a></span></dt>
+<dt><span class="sect2"><a href="#pkg_versions">5.1.6. Finding if newer versions of your installed packages are in pkgsrc</a></span></dt>
+<dt><span class="sect2"><a href="#using.pkg_admin">5.1.7. Other administrative functions</a></span></dt>
+</dl></dd>
+<dt><span class="sect1"><a href="#building-packages-from-source">5.2. Building packages from source</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#requirements">5.2.1. Requirements</a></span></dt>
+<dt><span class="sect2"><a href="#fetching-distfiles">5.2.2. Fetching distfiles</a></span></dt>
+<dt><span class="sect2"><a href="#how-to-build-and-install">5.2.3. How to build and install</a></span></dt>
 </dl></dd>
 </dl>
 </div>
@@ -1169,7 +1204,7 @@ of pkgsrc, too. Then you are able to bui
 and you can still use binary packages from someone else.</p>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="using-pkg"></a>4.1.�Using binary packages</h2></div></div></div>
+<a name="using-pkg"></a>5.1.�Using binary packages</h2></div></div></div>
 <p>On the <a class="ulink" href="https://cdn.NetBSD.org/"; target="_top">cdn.NetBSD.org</a>
   site and mirrors, there are collections of binary packages,
   ready to be installed. These binary packages have been built using the
@@ -1181,10 +1216,10 @@ and you can still use binary packages fr
 </ul></div>
 <p>If you cannot use these directories for whatever reasons (maybe
   because you're not root), you cannot use these binary packages, but
-  have to build the packages yourself, which is explained in <a class="xref" href="#bootstrapping-pkgsrc" title="3.2.�Bootstrapping pkgsrc">Section�3.2, &#8220;Bootstrapping pkgsrc&#8221;</a>.</p>
+  have to build the packages yourself, which is explained in <a class="xref" href="#bootstrapping-pkgsrc" title="4.2.�Bootstrapping pkgsrc">Section�4.2, &#8220;Bootstrapping pkgsrc&#8221;</a>.</p>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="finding-binary-packages"></a>4.1.1.�Finding binary packages</h3></div></div></div>
+<a name="finding-binary-packages"></a>5.1.1.�Finding binary packages</h3></div></div></div>
 <p>To install binary packages, you first need to know from where
     to get them. The first place where you should look is on the main
     pkgsrc FTP server in the directory <a class="ulink" href="https://cdn.NetBSD.org/pub/pkgsrc/packages/"; target="_top"><code class="filename">/pub/pkgsrc/packages</code></a>.</p>
@@ -1203,7 +1238,7 @@ and you can still use binary packages fr
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="installing-binary-packages"></a>4.1.2.�Installing binary packages</h3></div></div></div>
+<a name="installing-binary-packages"></a>5.1.2.�Installing binary packages</h3></div></div></div>
 <p>In the directory from the last section, there is a
     subdirectory called <code class="filename">All/</code>, which contains all the
     binary packages that are available for the platform, excluding those
@@ -1242,7 +1277,7 @@ and you can still use binary packages fr
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="using.pkg_delete"></a>4.1.3.�Deinstalling packages</h3></div></div></div>
+<a name="using.pkg_delete"></a>5.1.3.�Deinstalling packages</h3></div></div></div>
 <p>To deinstall a package, it does not matter whether it was
     installed from source code or from a binary package. The
     <span class="command"><strong>pkg_delete</strong></span> command does not know it anyway.
@@ -1268,13 +1303,13 @@ and you can still use binary packages fr
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="using.pkg_info"></a>4.1.4.�Getting information about installed packages</h3></div></div></div>
+<a name="using.pkg_info"></a>5.1.4.�Getting information about installed packages</h3></div></div></div>
 <p>The <span class="command"><strong>pkg_info</strong></span> shows information about
     installed packages or binary package files.</p>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="vulnerabilities"></a>4.1.5.�Checking for security vulnerabilities in installed packages</h3></div></div></div>
+<a name="vulnerabilities"></a>5.1.5.�Checking for security vulnerabilities in installed packages</h3></div></div></div>
 <p>
       The NetBSD Security-Officer and Packages Groups maintain a list of
       known security vulnerabilities to packages which are (or have been)
@@ -1337,7 +1372,7 @@ check_pkg_vulnerabilities=YES
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="pkg_versions"></a>4.1.6.�Finding if newer versions of your installed packages are in pkgsrc</h3></div></div></div>
+<a name="pkg_versions"></a>5.1.6.�Finding if newer versions of your installed packages are in pkgsrc</h3></div></div></div>
 <p>
       Install <a href="https://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/pkgtools/lintpkgsrc/README.html"; target="_top"><code class="filename">pkgtools/lintpkgsrc</code></a> and run
       <span class="command"><strong>lintpkgsrc</strong></span> with the <span class="quote">&#8220;<span class="quote">-i</span>&#8221;</span>
@@ -1354,14 +1389,14 @@ Version mismatch: 'tcsh' 6.09.00 vs 6.10
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="using.pkg_admin"></a>4.1.7.�Other administrative functions</h3></div></div></div>
+<a name="using.pkg_admin"></a>5.1.7.�Other administrative functions</h3></div></div></div>
 <p>The <span class="command"><strong>pkg_admin</strong></span> executes various
     administrative functions on the package system.</p>
 </div>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="building-packages-from-source"></a>4.2.�Building packages from source</h2></div></div></div>
+<a name="building-packages-from-source"></a>5.2.�Building packages from source</h2></div></div></div>
 <p>After obtaining pkgsrc, the <code class="filename">pkgsrc</code>
   directory now contains a set of packages, organized into
   categories. You can browse the online index of packages, or run
@@ -1379,7 +1414,7 @@ Version mismatch: 'tcsh' 6.09.00 vs 6.10
   instructions how to create your own packages.</p>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="requirements"></a>4.2.1.�Requirements</h3></div></div></div>
+<a name="requirements"></a>5.2.1.�Requirements</h3></div></div></div>
 <p>To build packages from source, you need a working C
     compiler. On NetBSD, you need to install the
     <span class="quote">&#8220;<span class="quote">comp</span>&#8221;</span> and the <span class="quote">&#8220;<span class="quote">text</span>&#8221;</span> distribution
@@ -1389,7 +1424,7 @@ Version mismatch: 'tcsh' 6.09.00 vs 6.10
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="fetching-distfiles"></a>4.2.2.�Fetching distfiles</h3></div></div></div>
+<a name="fetching-distfiles"></a>5.2.2.�Fetching distfiles</h3></div></div></div>
 <p>The first step for building a package is downloading the
     distfiles (i.e. the unmodified source). If they have not yet been
     downloaded, pkgsrc will fetch them automatically.</p>
@@ -1439,7 +1474,7 @@ Version mismatch: 'tcsh' 6.09.00 vs 6.10
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="how-to-build-and-install"></a>4.2.3.�How to build and install</h3></div></div></div>
+<a name="how-to-build-and-install"></a>5.2.3.�How to build and install</h3></div></div></div>
 <p>
       Once the software has downloaded, any patches will be applied, then it
       will be compiled for you. This may take some time depending on your
@@ -1570,21 +1605,21 @@ Version mismatch: 'tcsh' 6.09.00 vs 6.10
 </div>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="configuring"></a>Chapter�5.�Configuring pkgsrc</h2></div></div></div>
+<a name="configuring"></a>Chapter�6.�Configuring pkgsrc</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="sect1"><a href="#general-configuration">5.1. General configuration</a></span></dt>
-<dt><span class="sect1"><a href="#variables-affecting-build">5.2. Variables affecting the build process</a></span></dt>
-<dt><span class="sect1"><a href="#variables-affecting-installation">5.3. Variables affecting the installation process</a></span></dt>
-<dt><span class="sect1"><a href="#conf.compiler">5.4. Selecting and configuring the compiler</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#selecting-the-compiler">5.4.1. Selecting the compiler</a></span></dt>
-<dt><span class="sect2"><a href="#conf.cflags">5.4.2. Additional flags to the compiler (<code class="varname">CFLAGS</code>)</a></span></dt>
-<dt><span class="sect2"><a href="#conf.ldflags">5.4.3. Additional flags to the linker (<code class="varname">LDFLAGS</code>)</a></span></dt>
+<dt><span class="sect1"><a href="#general-configuration">6.1. General configuration</a></span></dt>
+<dt><span class="sect1"><a href="#variables-affecting-build">6.2. Variables affecting the build process</a></span></dt>
+<dt><span class="sect1"><a href="#variables-affecting-installation">6.3. Variables affecting the installation process</a></span></dt>
+<dt><span class="sect1"><a href="#conf.compiler">6.4. Selecting and configuring the compiler</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#selecting-the-compiler">6.4.1. Selecting the compiler</a></span></dt>
+<dt><span class="sect2"><a href="#conf.cflags">6.4.2. Additional flags to the compiler (<code class="varname">CFLAGS</code>)</a></span></dt>
+<dt><span class="sect2"><a href="#conf.ldflags">6.4.3. Additional flags to the linker (<code class="varname">LDFLAGS</code>)</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#developer-advanced-settings">5.5. Developer/advanced settings</a></span></dt>
-<dt><span class="sect1"><a href="#selecting-build-options">5.6. Selecting Build Options</a></span></dt>
+<dt><span class="sect1"><a href="#developer-advanced-settings">6.5. Developer/advanced settings</a></span></dt>
+<dt><span class="sect1"><a href="#selecting-build-options">6.6. Selecting Build Options</a></span></dt>
 </dl>
 </div>
 <a name="mk.conf"></a><p>The whole pkgsrc system is configured in a single file, usually
@@ -1601,7 +1636,7 @@ kinds of variables, and no special error
 spelling mistakes) takes place.</p>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="general-configuration"></a>5.1.�General configuration</h2></div></div></div>
+<a name="general-configuration"></a>6.1.�General configuration</h2></div></div></div>
 <p>The following variables apply to all
     pkgsrc packages. A complete list of the variables that can be
     configured by the user is available in
@@ -1651,7 +1686,7 @@ spelling mistakes) takes place.</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="variables-affecting-build"></a>5.2.�Variables affecting the build process</h2></div></div></div>
+<a name="variables-affecting-build"></a>6.2.�Variables affecting the build process</h2></div></div></div>
 <p>
       </p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
@@ -1672,7 +1707,7 @@ spelling mistakes) takes place.</p>
            pkgsrc tree instances.)</p></li>
 <li class="listitem"><p><code class="varname">LOCALPATCHES</code>:
            Directory for local patches that aren't part of pkgsrc.
-           See <a class="xref" href="#components.patches" title="11.3.�patches/*">Section�11.3, &#8220;<code class="filename">patches/*</code>&#8221;</a> for more
+           See <a class="xref" href="#components.patches" title="13.3.�patches/*">Section�13.3, &#8220;<code class="filename">patches/*</code>&#8221;</a> for more
            information.</p></li>
 <li class="listitem"><p><code class="varname">PKGMAKECONF</code>: Location of
            the <a class="link" href="#mk.conf"><code class="filename">mk.conf</code></a> file used by a package's
@@ -1684,7 +1719,7 @@ spelling mistakes) takes place.</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="variables-affecting-installation"></a>5.3.�Variables affecting the installation process</h2></div></div></div>
+<a name="variables-affecting-installation"></a>6.3.�Variables affecting the installation process</h2></div></div></div>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><code class="varname">PKGSRC_KEEP_BIN_PKGSRC</code>:
                 By default, binary packages of built packages are
                 preserved in <code class="filename">${PACKAGES}/All</code>. Setting
@@ -1752,10 +1787,10 @@ uid=1000(myusername) gid=100(users) grou
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="conf.compiler"></a>5.4.�Selecting and configuring the compiler</h2></div></div></div>
+<a name="conf.compiler"></a>6.4.�Selecting and configuring the compiler</h2></div></div></div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="selecting-the-compiler"></a>5.4.1.�Selecting the compiler</h3></div></div></div>
+<a name="selecting-the-compiler"></a>6.4.1.�Selecting the compiler</h3></div></div></div>
 <p>By default, pkgsrc will use GCC to build packages.  This may be
     overridden by setting the following variables in /etc/mk.conf:</p>
 <div class="variablelist"><dl class="variablelist">
@@ -1823,7 +1858,7 @@ uid=1000(myusername) gid=100(users) grou
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="conf.cflags"></a>5.4.2.�Additional flags to the compiler (<code class="varname">CFLAGS</code>)</h3></div></div></div>
+<a name="conf.cflags"></a>6.4.2.�Additional flags to the compiler (<code class="varname">CFLAGS</code>)</h3></div></div></div>
 <p>If you wish to set the <code class="varname">CFLAGS</code> variable,
        please make sure to use the <code class="literal">+=</code> operator
        instead of the <code class="literal">=</code> operator:</p>
@@ -1839,7 +1874,7 @@ CFLAGS+=        -your -flags
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="conf.ldflags"></a>5.4.3.�Additional flags to the linker (<code class="varname">LDFLAGS</code>)</h3></div></div></div>
+<a name="conf.ldflags"></a>6.4.3.�Additional flags to the linker (<code class="varname">LDFLAGS</code>)</h3></div></div></div>
 <p>If you want to pass flags to the linker, both in the configure
 step and the build step, you can do this in two ways.  Either set
 <code class="varname">LDFLAGS</code> or <code class="varname">LIBS</code>.  The difference
@@ -1857,7 +1892,7 @@ LDFLAGS+=        -your -linkerflags
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="developer-advanced-settings"></a>5.5.�Developer/advanced settings</h2></div></div></div>
+<a name="developer-advanced-settings"></a>6.5.�Developer/advanced settings</h2></div></div></div>
 <p>
       </p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
@@ -1889,7 +1924,7 @@ LDFLAGS+=        -your -linkerflags
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="selecting-build-options"></a>5.6.�Selecting Build Options</h2></div></div></div>
+<a name="selecting-build-options"></a>6.6.�Selecting Build Options</h2></div></div></div>
 <p>Some packages have build time options, usually to select
     between different dependencies, enable optional support for big
     dependencies or enable experimental features.</p>
@@ -1960,17 +1995,17 @@ PKG_OPTIONS.apache=     suexec </pre>
 </div>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="binary"></a>Chapter�6.�Creating binary packages</h2></div></div></div>
+<a name="binary"></a>Chapter�7.�Creating binary packages</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="sect1"><a href="#building-a-single-binary-package">6.1. Building a single binary package</a></span></dt>
-<dt><span class="sect1"><a href="#settings-for-creationg-of-binary-packages">6.2. Settings for creation of binary packages</a></span></dt>
+<dt><span class="sect1"><a href="#building-a-single-binary-package">7.1. Building a single binary package</a></span></dt>
+<dt><span class="sect1"><a href="#settings-for-creationg-of-binary-packages">7.2. Settings for creation of binary packages</a></span></dt>
 </dl>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="building-a-single-binary-package"></a>6.1.�Building a single binary package</h2></div></div></div>
+<a name="building-a-single-binary-package"></a>7.1.�Building a single binary package</h2></div></div></div>
 <p>Once you have built and installed a package, you can create
     a <span class="emphasis"><em>binary package</em></span> which can be installed on
     another system with <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?pkg_add+1.i386+NetBSD-8.0";><span class="citerefentry"><span 
class="refentrytitle">pkg_add</span>(1)</span></a>. This saves having to build
@@ -1991,28 +2026,28 @@ PKG_OPTIONS.apache=     suexec </pre>
     <code class="filename">/usr/pkgsrc/packages</code>, in the form of a
     gzipped tar file. See <a class="xref" href="#logs.package" title="B.2.�Packaging figlet">Section�B.2, &#8220;Packaging figlet&#8221;</a> for a
     continuation of the above <a href="https://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/misc/figlet/README.html"; target="_top"><code class="filename">misc/figlet</code></a> example.</p>
-<p>See <a class="xref" href="#submit" title="Chapter�21.�Submitting and Committing">Chapter�21, <i>Submitting and Committing</i></a> for information on how to submit
+<p>See <a class="xref" href="#submit" title="Chapter�23.�Submitting and Committing">Chapter�23, <i>Submitting and Committing</i></a> for information on how to submit
     such a binary package.</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="settings-for-creationg-of-binary-packages"></a>6.2.�Settings for creation of binary packages</h2></div></div></div>
-<p>See <a class="xref" href="#build.helpful-targets" title="17.17.�Other helpful targets">Section�17.17, &#8220;Other helpful targets&#8221;</a>.</p>
+<a name="settings-for-creationg-of-binary-packages"></a>7.2.�Settings for creation of binary packages</h2></div></div></div>
+<p>See <a class="xref" href="#build.helpful-targets" title="19.17.�Other helpful targets">Section�19.17, &#8220;Other helpful targets&#8221;</a>.</p>
 </div>
 </div>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="bulk"></a>Chapter�7.�Creating binary packages for everything in pkgsrc (bulk
+<a name="bulk"></a>Chapter�8.�Creating binary packages for everything in pkgsrc (bulk
 builds)</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="sect1"><a href="#bulk.pre">7.1. Preparations</a></span></dt>
-<dt><span class="sect1"><a href="#bulk.pbulk">7.2. Running a pbulk-style bulk build</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="#bulk.pbulk.conf">7.2.1. Configuration</a></span></dt></dl></dd>
-<dt><span class="sect1"><a href="#bulk.req">7.3. Requirements of a full bulk build</a></span></dt>
-<dt><span class="sect1"><a href="#creating-cdroms">7.4. Creating a multiple CD-ROM packages collection</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="#cdpack-example">7.4.1. Example of cdpack</a></span></dt></dl></dd>
+<dt><span class="sect1"><a href="#bulk.pre">8.1. Preparations</a></span></dt>
+<dt><span class="sect1"><a href="#bulk.pbulk">8.2. Running a pbulk-style bulk build</a></span></dt>
+<dd><dl><dt><span class="sect2"><a href="#bulk.pbulk.conf">8.2.1. Configuration</a></span></dt></dl></dd>
+<dt><span class="sect1"><a href="#bulk.req">8.3. Requirements of a full bulk build</a></span></dt>
+<dt><span class="sect1"><a href="#creating-cdroms">8.4. Creating a multiple CD-ROM packages collection</a></span></dt>
+<dd><dl><dt><span class="sect2"><a href="#cdpack-example">8.4.1. Example of cdpack</a></span></dt></dl></dd>
 </dl>
 </div>
 <p>For a number of reasons you may want to build binary packages
@@ -2026,7 +2061,7 @@ The bulk build system, or pbulk ("p" sta
 This chapter describes how to set it up.</p>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="bulk.pre"></a>7.1.�Preparations</h2></div></div></div>
+<a name="bulk.pre"></a>8.1.�Preparations</h2></div></div></div>
 <p>First of all, you have to decide whether you build all packages
 or a limited set of them. Full bulk builds usually consume a lot more resources,
 both space and time, than builds for some practical sets of packages.
@@ -2051,7 +2086,7 @@ certain packages tried to install files 
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="bulk.pbulk"></a>7.2.�Running a pbulk-style bulk build</h2></div></div></div>
+<a name="bulk.pbulk"></a>8.2.�Running a pbulk-style bulk build</h2></div></div></div>
 <p>Running a pbulk-style bulk build works roughly as follows:</p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p>First, build the pbulk infrastructure in a fresh pkgsrc location.</p></li>
@@ -2059,7 +2094,7 @@ certain packages tried to install files 
 </ul></div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="bulk.pbulk.conf"></a>7.2.1.�Configuration</h3></div></div></div>
+<a name="bulk.pbulk.conf"></a>8.2.1.�Configuration</h3></div></div></div>
 <p>To simplify configuration, we provide the helper script <code class="filename">mk/pbulk/pbulk.sh</code>.</p>
 <p>In order to use it, prepare a clear system (real one, chroot environment, jail, zone, virtual machine).
 Configure network access to fetch distribution files.
@@ -2120,7 +2155,7 @@ unprivileged bulk build and helps config
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="bulk.req"></a>7.3.�Requirements of a full bulk build</h2></div></div></div>
+<a name="bulk.req"></a>8.3.�Requirements of a full bulk build</h2></div></div></div>
 <p>A complete bulk build requires lots of disk space. Some of the
 disk space can be read-only, some other must be writable. Some can be on
 remote filesystems (such as NFS) and some should be local. Some can be
@@ -2136,7 +2171,7 @@ temporary filesystems, others must survi
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="creating-cdroms"></a>7.4.�Creating a multiple CD-ROM packages collection</h2></div></div></div>
+<a name="creating-cdroms"></a>8.4.�Creating a multiple CD-ROM packages collection</h2></div></div></div>
 <p>After your pkgsrc bulk-build has completed, you may wish to
     create a CD-ROM set of the resulting binary packages to assist
     in installing packages on other machines.  The
@@ -2147,7 +2182,7 @@ temporary filesystems, others must survi
     CD as that package.</p>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="cdpack-example"></a>7.4.1.�Example of cdpack</h3></div></div></div>
+<a name="cdpack-example"></a>8.4.1.�Example of cdpack</h3></div></div></div>
 <p>Complete documentation for cdpack is found in the cdpack(1)
       man page. The following short example assumes that the binary
       packages are left in
@@ -2182,12 +2217,12 @@ temporary filesystems, others must survi
 </div>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="files"></a>Chapter�8.�Directory layout of the installed files</h2></div></div></div>
+<a name="files"></a>Chapter�9.�Directory layout of the installed files</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="sect1"><a href="#files.localbase">8.1. File system layout in <code class="literal">${LOCALBASE}</code></a></span></dt>
-<dt><span class="sect1"><a href="#files.varbase">8.2. File system layout in <code class="literal">${VARBASE}</code></a></span></dt>
+<dt><span class="sect1"><a href="#files.localbase">9.1. File system layout in <code class="literal">${LOCALBASE}</code></a></span></dt>
+<dt><span class="sect1"><a href="#files.varbase">9.2. File system layout in <code class="literal">${VARBASE}</code></a></span></dt>
 </dl>
 </div>
 <p>The files that are installed by pkgsrc are organized in a way that
@@ -2236,7 +2271,7 @@ itself.</p></li>
 </ul></div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="files.localbase"></a>8.1.�File system layout in <code class="literal">${LOCALBASE}</code>
+<a name="files.localbase"></a>9.1.�File system layout in <code class="literal">${LOCALBASE}</code>
 </h2></div></div></div>
 <p>The following directories exist in a typical pkgsrc installation
 in <code class="filename">${LOCALBASE}</code>.</p>
@@ -2302,7 +2337,7 @@ installation.</p></dd>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="files.varbase"></a>8.2.�File system layout in <code class="literal">${VARBASE}</code>
+<a name="files.varbase"></a>9.2.�File system layout in <code class="literal">${VARBASE}</code>
 </h2></div></div></div>
 <div class="variablelist"><dl class="variablelist">
 <dt><span class="term"><code class="filename">db/pkg</code> (the usual location of
@@ -2323,28 +2358,28 @@ currently running.</p></dd>
 </div>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="faq"></a>Chapter�9.�Frequently Asked Questions</h2></div></div></div>
+<a name="faq"></a>Chapter�10.�Frequently Asked Questions</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="sect1"><a href="#mailing-list-pointers">9.1. Are there any mailing lists for pkg-related discussion?</a></span></dt>
-<dt><span class="sect1"><a href="#faq-pkgtools">9.2. Utilities for package management (pkgtools)</a></span></dt>
-<dt><span class="sect1"><a href="#non-root-pkgsrc">9.3. How to use pkgsrc as non-root</a></span></dt>
-<dt><span class="sect1"><a href="#resume-transfers">9.4. How to resume transfers when fetching distfiles?</a></span></dt>
-<dt><span class="sect1"><a href="#x.org-from-pkgsrc">9.5. How can I install/use modular X.org from pkgsrc?</a></span></dt>
-<dt><span class="sect1"><a href="#fetch-behind-firewall">9.6. How to fetch files from behind a firewall</a></span></dt>
-<dt><span class="sect1"><a href="#fetch-https">9.7. How to fetch files from HTTPS sites</a></span></dt>
-<dt><span class="sect1"><a href="#passive-ftp">9.8. How do I tell <span class="command"><strong>make fetch</strong></span> to do passive FTP?</a></span></dt>
-<dt><span class="sect1"><a href="#fetching-all-distfiles">9.9. How to fetch all distfiles at once</a></span></dt>
-<dt><span class="sect1"><a href="#tmac.andoc-missing">9.10. What does <span class="quote">&#8220;<span class="quote">Don't know how to make
+<dt><span class="sect1"><a href="#mailing-list-pointers">10.1. Are there any mailing lists for pkg-related discussion?</a></span></dt>
+<dt><span class="sect1"><a href="#faq-pkgtools">10.2. Utilities for package management (pkgtools)</a></span></dt>
+<dt><span class="sect1"><a href="#non-root-pkgsrc">10.3. How to use pkgsrc as non-root</a></span></dt>
+<dt><span class="sect1"><a href="#resume-transfers">10.4. How to resume transfers when fetching distfiles?</a></span></dt>
+<dt><span class="sect1"><a href="#x.org-from-pkgsrc">10.5. How can I install/use modular X.org from pkgsrc?</a></span></dt>
+<dt><span class="sect1"><a href="#fetch-behind-firewall">10.6. How to fetch files from behind a firewall</a></span></dt>
+<dt><span class="sect1"><a href="#fetch-https">10.7. How to fetch files from HTTPS sites</a></span></dt>
+<dt><span class="sect1"><a href="#passive-ftp">10.8. How do I tell <span class="command"><strong>make fetch</strong></span> to do passive FTP?</a></span></dt>
+<dt><span class="sect1"><a href="#fetching-all-distfiles">10.9. How to fetch all distfiles at once</a></span></dt>
+<dt><span class="sect1"><a href="#tmac.andoc-missing">10.10. What does <span class="quote">&#8220;<span class="quote">Don't know how to make
 /usr/share/tmac/tmac.andoc</span>&#8221;</span> mean?</a></span></dt>
-<dt><span class="sect1"><a href="#bsd.own.mk-missing">9.11. What does <span class="quote">&#8220;<span class="quote">Could not find bsd.own.mk</span>&#8221;</span> mean?</a></span></dt>
-<dt><span class="sect1"><a href="#using-sudo-with-pkgsrc">9.12. Using 'sudo' with pkgsrc</a></span></dt>
-<dt><span class="sect1"><a href="#faq.conf">9.13. How do I change the location of configuration files?</a></span></dt>
-<dt><span class="sect1"><a href="#audit-packages">9.14. Automated security checks</a></span></dt>
-<dt><span class="sect1"><a href="#ufaq-cflags">9.15. Why do some packages ignore my <code class="varname">CFLAGS</code>?</a></span></dt>
-<dt><span class="sect1"><a href="#ufaq-fail">9.16. A package does not build.  What shall I do?</a></span></dt>
-<dt><span class="sect1"><a href="#faq.rcs-conflicts">9.17. What does <span class="quote">&#8220;<span class="quote">Makefile appears to contain unresolved cvs/rcs/??? merge 
conflicts</span>&#8221;</span> mean?</a></span></dt>
+<dt><span class="sect1"><a href="#bsd.own.mk-missing">10.11. What does <span class="quote">&#8220;<span class="quote">Could not find bsd.own.mk</span>&#8221;</span> mean?</a></span></dt>
+<dt><span class="sect1"><a href="#using-sudo-with-pkgsrc">10.12. Using 'sudo' with pkgsrc</a></span></dt>
+<dt><span class="sect1"><a href="#faq.conf">10.13. How do I change the location of configuration files?</a></span></dt>
+<dt><span class="sect1"><a href="#audit-packages">10.14. Automated security checks</a></span></dt>
+<dt><span class="sect1"><a href="#ufaq-cflags">10.15. Why do some packages ignore my <code class="varname">CFLAGS</code>?</a></span></dt>
+<dt><span class="sect1"><a href="#ufaq-fail">10.16. A package does not build.  What shall I do?</a></span></dt>
+<dt><span class="sect1"><a href="#faq.rcs-conflicts">10.17. What does <span class="quote">&#8220;<span class="quote">Makefile appears to contain unresolved cvs/rcs/??? merge 
conflicts</span>&#8221;</span> mean?</a></span></dt>
 </dl>
 </div>
 <p>This section contains hints, tips &amp; tricks on special things in
@@ -2352,7 +2387,7 @@ pkgsrc that we didn't find a better plac
 it contains items for both pkgsrc users and developers.</p>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="mailing-list-pointers"></a>9.1.�Are there any mailing lists for pkg-related discussion?</h2></div></div></div>
+<a name="mailing-list-pointers"></a>10.1.�Are there any mailing lists for pkg-related discussion?</h2></div></div></div>
 <p>The following mailing lists may be of interest to pkgsrc users:</p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p><a class="ulink" href="http://www.NetBSD.org/mailinglists/index.html#pkgsrc-users"; target="_top">pkgsrc-users</a>:
@@ -2383,7 +2418,7 @@ it contains items for both pkgsrc users 
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="faq-pkgtools"></a>9.2.�Utilities for package management (pkgtools)</h2></div></div></div>
+<a name="faq-pkgtools"></a>10.2.�Utilities for package management (pkgtools)</h2></div></div></div>
 <p>The directory <code class="filename">pkgsrc/pkgtools</code> contains
 a number of useful utilities for both users and developers of pkgsrc.  This
 section attempts only to make the reader aware of some of the utilities and when
@@ -2459,9 +2494,9 @@ utilities)</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="non-root-pkgsrc"></a>9.3.�How to use pkgsrc as non-root</h2></div></div></div>
+<a name="non-root-pkgsrc"></a>10.3.�How to use pkgsrc as non-root</h2></div></div></div>
 <p>To install packages from source as a non-root user, download
-pkgsrc as described in <a class="xref" href="#getting" title="Chapter�2.�Where to get pkgsrc and how to keep it up-to-date">Chapter�2, <i>Where to get pkgsrc and how to keep it up-to-date</i></a>, 
cd into that
+pkgsrc as described in <a class="xref" href="#getting" title="Chapter�3.�Where to get pkgsrc and how to keep it up-to-date">Chapter�3, <i>Where to get pkgsrc and how to keep it up-to-date</i></a>, 
cd into that
 directory and run the command <span class="command"><strong>./bootstrap/bootstrap
 --unprivileged</strong></span>.</p>
 <p>This will install the binary part of pkgsrc to
@@ -2471,7 +2506,7 @@ into <code class="filename">~/pkg/etc</c
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="resume-transfers"></a>9.4.�How to resume transfers when fetching distfiles?</h2></div></div></div>
+<a name="resume-transfers"></a>10.4.�How to resume transfers when fetching distfiles?</h2></div></div></div>
 <p>By default, resuming transfers in pkgsrc is disabled, but you can
 enable this feature by adding the option
 <code class="varname">PKG_RESUME_TRANSFERS=YES</code> into
@@ -2495,7 +2530,7 @@ FETCH_USING=    wget
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="x.org-from-pkgsrc"></a>9.5.�How can I install/use modular X.org from pkgsrc?</h2></div></div></div>
+<a name="x.org-from-pkgsrc"></a>10.5.�How can I install/use modular X.org from pkgsrc?</h2></div></div></div>
 <p>If you want to use modular X.org from pkgsrc instead of your system's own X11
 (<code class="filename">/usr/X11R6</code>, <code class="filename">/usr/openwin</code>, ...)
 you will have to add the following line into
@@ -2506,7 +2541,7 @@ X11_TYPE=modular
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="fetch-behind-firewall"></a>9.6.�How to fetch files from behind a firewall</h2></div></div></div>
+<a name="fetch-behind-firewall"></a>10.6.�How to fetch files from behind a firewall</h2></div></div></div>
 <p>If you are sitting behind a firewall which does not allow direct
 connections to Internet hosts (i.e. non-NAT), you may specify the
 relevant proxy hosts.  This is done using an environment variable in the
@@ -2521,7 +2556,7 @@ http_proxy=http://orpheus.amdahl.com:80/
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="fetch-https"></a>9.7.�How to fetch files from HTTPS sites</h2></div></div></div>
+<a name="fetch-https"></a>10.7.�How to fetch files from HTTPS sites</h2></div></div></div>
 <p>Some fetch tools are not prepared to support HTTPS by default
 (for example, the one in NetBSD 6.0), or the one installed by the
 pkgsrc bootstrap (to avoid an openssl dependency that low in the
@@ -2536,7 +2571,7 @@ installed before you can use them this w
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="passive-ftp"></a>9.8.�How do I tell <span class="command"><strong>make fetch</strong></span> to do passive FTP?</h2></div></div></div>
+<a name="passive-ftp"></a>10.8.�How do I tell <span class="command"><strong>make fetch</strong></span> to do passive FTP?</h2></div></div></div>
 <p>This depends on which utility is used to retrieve distfiles.  From
 <code class="filename">bsd.pkg.mk</code>, <code class="varname">FETCH_CMD</code> is assigned
 the first available command from the following list:</p>
@@ -2556,7 +2591,7 @@ transfers.</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="fetching-all-distfiles"></a>9.9.�How to fetch all distfiles at once</h2></div></div></div>
+<a name="fetching-all-distfiles"></a>10.9.�How to fetch all distfiles at once</h2></div></div></div>
 <p>You would like to download all the distfiles in a single batch
 from work or university, where you can't run a <span class="command"><strong>make
 fetch</strong></span>.  There is an archive of distfiles on <a class="ulink" href="ftp://ftp.NetBSD.org/pub/pkgsrc/distfiles/"; target="_top">ftp.NetBSD.org</a>,
@@ -2588,7 +2623,7 @@ by running:</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="tmac.andoc-missing"></a>9.10.�What does <span class="quote">&#8220;<span class="quote">Don't know how to make
+<a name="tmac.andoc-missing"></a>10.10.�What does <span class="quote">&#8220;<span class="quote">Don't know how to make
 /usr/share/tmac/tmac.andoc</span>&#8221;</span> mean?</h2></div></div></div>
 <p>When compiling the <a href="https://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/pkgtools/pkg_install/README.html"; target="_top"><code class="filename">pkgtools/pkg_install</code></a>
 package, you get the error from make that it doesn't know how to make
@@ -2602,7 +2637,7 @@ environment or in <a class="link" href="
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="bsd.own.mk-missing"></a>9.11.�What does <span class="quote">&#8220;<span class="quote">Could not find bsd.own.mk</span>&#8221;</span> mean?</h2></div></div></div>
+<a name="bsd.own.mk-missing"></a>10.11.�What does <span class="quote">&#8220;<span class="quote">Could not find bsd.own.mk</span>&#8221;</span> mean?</h2></div></div></div>
 <p>You didn't install the compiler set, <code class="filename">comp.tgz</code>,
 when you installed your NetBSD machine.  Please get and install it, by
 extracting it in <code class="filename">/</code>:</p>
@@ -2614,7 +2649,7 @@ the one that corresponds to your release
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="using-sudo-with-pkgsrc"></a>9.12.�Using 'sudo' with pkgsrc</h2></div></div></div>
+<a name="using-sudo-with-pkgsrc"></a>10.12.�Using 'sudo' with pkgsrc</h2></div></div></div>
 <p>When installing packages as non-root user and using the just-in-time
 <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?su+1.i386+NetBSD-8.0";><span class="citerefentry"><span class="refentrytitle">su</span>(1)</span></a> feature of pkgsrc, it can 
become annoying to type in the root
 password for each required package installed.  To avoid this, the sudo
@@ -2632,7 +2667,7 @@ SU_CMD=        ${LOCALBASE}/bin/sudo /bi
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="faq.conf"></a>9.13.�How do I change the location of configuration files?</h2></div></div></div>
+<a name="faq.conf"></a>10.13.�How do I change the location of configuration files?</h2></div></div></div>
 <p>As the system administrator, you can choose where configuration files
 are installed.  The default settings make all these files go into
 <code class="filename">${PREFIX}/etc</code> or some of its subdirectories; this may
@@ -2654,7 +2689,7 @@ reinstall any affected packages.</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="audit-packages"></a>9.14.�Automated security checks</h2></div></div></div>
+<a name="audit-packages"></a>10.14.�Automated security checks</h2></div></div></div>
 <p>Please be aware that there can often be bugs in third-party software,
 and some of these bugs can leave a machine vulnerable to exploitation by
 attackers.  In an effort to lessen the exposure, the NetBSD packages team
@@ -2678,14 +2713,14 @@ do this, refer to the following two tool
     containing more information.</p></li>
 </ol></div>
 <p>Use of these tools is strongly recommended!
-See <a class="xref" href="#vulnerabilities" title="4.1.5.�Checking for security vulnerabilities in installed packages">Section�4.1.5, &#8220;Checking for security vulnerabilities in installed 
packages&#8221;</a> for instructions on how to automate checking and
+See <a class="xref" href="#vulnerabilities" title="5.1.5.�Checking for security vulnerabilities in installed packages">Section�5.1.5, &#8220;Checking for security vulnerabilities in installed 
packages&#8221;</a> for instructions on how to automate checking and
 reporting.</p>
 <p>If this database is installed, pkgsrc builds will use it to
 perform a security check before building any package.</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="ufaq-cflags"></a>9.15.�Why do some packages ignore my <code class="varname">CFLAGS</code>?</h2></div></div></div>
+<a name="ufaq-cflags"></a>10.15.�Why do some packages ignore my <code class="varname">CFLAGS</code>?</h2></div></div></div>
 <p>When you add your own preferences to the
        <code class="varname">CFLAGS</code> variable in your
        <a class="link" href="#mk.conf"><code class="filename">mk.conf</code></a>, these flags are passed in
@@ -2707,7 +2742,7 @@ perform a security check before building
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="ufaq-fail"></a>9.16.�A package does not build.  What shall I do?</h2></div></div></div>
+<a name="ufaq-fail"></a>10.16.�A package does not build.  What shall I do?</h2></div></div></div>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p>Make sure that your copy of pkgsrc is consistent. A
        case that occurs often is that people only update pkgsrc in
@@ -2723,14 +2758,14 @@ perform a security check before building
        extracted. Run <span class="command"><strong>make clean clean-depends</strong></span> to
        verify this.</p></li>
 <li class="step"><p>If you are a package developer who wants to invest
-       some work, have a look at <a class="xref" href="#fixes" title="Chapter�19.�Making your package work">Chapter�19, <i>Making your package work</i></a>.</p></li>
+       some work, have a look at <a class="xref" href="#fixes" title="Chapter�21.�Making your package work">Chapter�21, <i>Making your package work</i></a>.</p></li>
 <li class="step"><p>If the problem still exists, write a mail to the
        <code class="literal">pkgsrc-users</code> mailing list.</p></li>
 </ol></div>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="faq.rcs-conflicts"></a>9.17.�What does <span class="quote">&#8220;<span class="quote">Makefile appears to contain unresolved cvs/rcs/??? merge conflicts</span>&#8221;</span> 
mean?</h2></div></div></div>
+<a name="faq.rcs-conflicts"></a>10.17.�What does <span class="quote">&#8220;<span class="quote">Makefile appears to contain unresolved cvs/rcs/??? merge conflicts</span>&#8221;</span> 
mean?</h2></div></div></div>
 <p>You have modified a file from pkgsrc, and someone else has
 modified that same file afterwards in the CVS repository. Both changes
 are in the same region of the file, so when you updated pkgsrc, the
@@ -2755,245 +2790,277 @@ anymore, you can remove that file and ru
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="chapter"><a href="#creating">10. Creating a new pkgsrc package from scratch</a></span></dt>
+<dt><span class="chapter"><a href="#help-devel">11. Getting help</a></span></dt>
+<dt><span class="chapter"><a href="#creating">12. Creating a new pkgsrc package from scratch</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#creating.common">10.1. Common types of packages</a></span></dt>
+<dt><span class="sect1"><a href="#creating.common">12.1. Common types of packages</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#creating.perl-module">10.1.1. Perl modules</a></span></dt>
-<dt><span class="sect2"><a href="#creating.python-module">10.1.2. Python modules and programs</a></span></dt>
+<dt><span class="sect2"><a href="#creating.perl-module">12.1.1. Perl modules</a></span></dt>
+<dt><span class="sect2"><a href="#creating.python-module">12.1.2. Python modules and programs</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#creating.examples">10.2. Examples</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="#creating.nvu">10.2.1. How the www/nvu package came into pkgsrc</a></span></dt></dl></dd>
+<dt><span class="sect1"><a href="#creating.examples">12.2. Examples</a></span></dt>
+<dd><dl><dt><span class="sect2"><a href="#creating.nvu">12.2.1. How the www/nvu package came into pkgsrc</a></span></dt></dl></dd>
 </dl></dd>
-<dt><span class="chapter"><a href="#components">11. Package components - files, directories and contents</a></span></dt>
+<dt><span class="chapter"><a href="#components">13. Package components - files, directories and contents</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#components.Makefile">11.1. <code class="filename">Makefile</code></a></span></dt>
-<dt><span class="sect1"><a href="#components.distinfo">11.2. <code class="filename">distinfo</code></a></span></dt>
-<dt><span class="sect1"><a href="#components.patches">11.3. <code class="filename">patches/*</code></a></span></dt>
+<dt><span class="sect1"><a href="#components.Makefile">13.1. <code class="filename">Makefile</code></a></span></dt>
+<dt><span class="sect1"><a href="#components.distinfo">13.2. <code class="filename">distinfo</code></a></span></dt>
+<dt><span class="sect1"><a href="#components.patches">13.3. <code class="filename">patches/*</code></a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#components.patch.structure">11.3.1. Structure of a single patch file</a></span></dt>
-<dt><span class="sect2"><a href="#components.patches.caveats">11.3.2. Creating patch files</a></span></dt>
-<dt><span class="sect2"><a href="#components.patches.sources">11.3.3. Sources where the patch files come from</a></span></dt>
-<dt><span class="sect2"><a href="#components.patches.guidelines">11.3.4. Patching guidelines</a></span></dt>
-<dt><span class="sect2"><a href="#components.patches.feedback">11.3.5. Feedback to the author</a></span></dt>
+<dt><span class="sect2"><a href="#components.patch.structure">13.3.1. Structure of a single patch file</a></span></dt>
+<dt><span class="sect2"><a href="#components.patches.caveats">13.3.2. Creating patch files</a></span></dt>
+<dt><span class="sect2"><a href="#components.patches.sources">13.3.3. Sources where the patch files come from</a></span></dt>
+<dt><span class="sect2"><a href="#components.patches.guidelines">13.3.4. Patching guidelines</a></span></dt>
+<dt><span class="sect2"><a href="#components.patches.feedback">13.3.5. Feedback to the author</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#other-mandatory-files">11.4. Other mandatory files</a></span></dt>
-<dt><span class="sect1"><a href="#components.optional">11.5. Optional files</a></span></dt>
+<dt><span class="sect1"><a href="#other-mandatory-files">13.4. Other mandatory files</a></span></dt>
+<dt><span class="sect1"><a href="#components.optional">13.5. Optional files</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#components.optional.bin">11.5.1. Files affecting the binary package</a></span></dt>
-<dt><span class="sect2"><a href="#components.optional.build">11.5.2. Files affecting the build process</a></span></dt>
-<dt><span class="sect2"><a href="#components.optional.none">11.5.3. Files affecting nothing at all</a></span></dt>
+<dt><span class="sect2"><a href="#components.optional.bin">13.5.1. Files affecting the binary package</a></span></dt>
+<dt><span class="sect2"><a href="#components.optional.build">13.5.2. Files affecting the build process</a></span></dt>
+<dt><span class="sect2"><a href="#components.optional.none">13.5.3. Files affecting nothing at all</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#work-dir">11.6. <code class="filename">work*</code></a></span></dt>
-<dt><span class="sect1"><a href="#files-dir">11.7. <code class="filename">files/*</code></a></span></dt>
+<dt><span class="sect1"><a href="#work-dir">13.6. <code class="filename">work*</code></a></span></dt>
+<dt><span class="sect1"><a href="#files-dir">13.7. <code class="filename">files/*</code></a></span></dt>
 </dl></dd>
-<dt><span class="chapter"><a href="#makefile">12. Programming in <code class="filename">Makefile</code>s</a></span></dt>
+<dt><span class="chapter"><a href="#makefile">14. Programming in <code class="filename">Makefile</code>s</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#makefile.style">12.1. Caveats</a></span></dt>
-<dt><span class="sect1"><a href="#makefile.variables">12.2. <code class="filename">Makefile</code> variables</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="#makefile.variables.names">12.2.1. Naming conventions</a></span></dt></dl></dd>
-<dt><span class="sect1"><a href="#makefile.code">12.3. Code snippets</a></span></dt>
+<dt><span class="sect1"><a href="#makefile.style">14.1. Caveats</a></span></dt>
+<dt><span class="sect1"><a href="#makefile.variables">14.2. <code class="filename">Makefile</code> variables</a></span></dt>
+<dd><dl><dt><span class="sect2"><a href="#makefile.variables.names">14.2.1. Naming conventions</a></span></dt></dl></dd>
+<dt><span class="sect1"><a href="#makefile.code">14.3. Code snippets</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#adding-to-list">12.3.1. Adding things to a list</a></span></dt>
-<dt><span class="sect2"><a href="#echo-literal">12.3.2. Echoing a string exactly as-is</a></span></dt>
-<dt><span class="sect2"><a href="#cflags-gnu-configure">12.3.3. Passing <code class="varname">CFLAGS</code> to GNU configure scripts</a></span></dt>
-<dt><span class="sect2"><a href="#empty-variables">12.3.4. Handling possibly empty variables</a></span></dt>
+<dt><span class="sect2"><a href="#adding-to-list">14.3.1. Adding things to a list</a></span></dt>
+<dt><span class="sect2"><a href="#echo-literal">14.3.2. Echoing a string exactly as-is</a></span></dt>
+<dt><span class="sect2"><a href="#cflags-gnu-configure">14.3.3. Passing <code class="varname">CFLAGS</code> to GNU configure scripts</a></span></dt>
+<dt><span class="sect2"><a href="#empty-variables">14.3.4. Handling possibly empty variables</a></span></dt>
 </dl></dd>
 </dl></dd>
-<dt><span class="chapter"><a href="#plist">13. PLIST issues</a></span></dt>
+<dt><span class="chapter"><a href="#plist">15. PLIST issues</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#rcs-id">13.1. RCS ID</a></span></dt>
-<dt><span class="sect1"><a href="#automatic-plist-generation">13.2. Semi-automatic <code class="filename">PLIST</code> generation</a></span></dt>
-<dt><span class="sect1"><a href="#print-PLIST">13.3. Tweaking output of <span class="command"><strong>make print-PLIST</strong></span></a></span></dt>
-<dt><span class="sect1"><a href="#plist.misc">13.4. Variable substitution in PLIST</a></span></dt>
-<dt><span class="sect1"><a href="#manpage-compression">13.5. Man page compression</a></span></dt>
-<dt><span class="sect1"><a href="#using-PLIST_SRC">13.6. Changing PLIST source with <code class="varname">PLIST_SRC</code></a></span></dt>
-<dt><span class="sect1"><a href="#platform-specific-plist">13.7. Platform-specific and differing PLISTs</a></span></dt>
-<dt><span class="sect1"><a href="#build-plist">13.8. Build-specific PLISTs</a></span></dt>
-<dt><span class="sect1"><a href="#faq.common-dirs">13.9. Sharing directories between packages</a></span></dt>
+<dt><span class="sect1"><a href="#rcs-id">15.1. RCS ID</a></span></dt>
+<dt><span class="sect1"><a href="#automatic-plist-generation">15.2. Semi-automatic <code class="filename">PLIST</code> generation</a></span></dt>
+<dt><span class="sect1"><a href="#print-PLIST">15.3. Tweaking output of <span class="command"><strong>make print-PLIST</strong></span></a></span></dt>
+<dt><span class="sect1"><a href="#plist.misc">15.4. Variable substitution in PLIST</a></span></dt>
+<dt><span class="sect1"><a href="#manpage-compression">15.5. Man page compression</a></span></dt>
+<dt><span class="sect1"><a href="#using-PLIST_SRC">15.6. Changing PLIST source with <code class="varname">PLIST_SRC</code></a></span></dt>
+<dt><span class="sect1"><a href="#platform-specific-plist">15.7. Platform-specific and differing PLISTs</a></span></dt>
+<dt><span class="sect1"><a href="#build-plist">15.8. Build-specific PLISTs</a></span></dt>
+<dt><span class="sect1"><a href="#faq.common-dirs">15.9. Sharing directories between packages</a></span></dt>
 </dl></dd>
-<dt><span class="chapter"><a href="#buildlink">14. Buildlink methodology</a></span></dt>
+<dt><span class="chapter"><a href="#buildlink">16. Buildlink methodology</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#converting-to-buildlink3">14.1. Converting packages to use buildlink3</a></span></dt>
-<dt><span class="sect1"><a href="#creating-buildlink3.mk">14.2. Writing <code class="filename">buildlink3.mk</code> files</a></span></dt>
+<dt><span class="sect1"><a href="#converting-to-buildlink3">16.1. Converting packages to use buildlink3</a></span></dt>
+<dt><span class="sect1"><a href="#creating-buildlink3.mk">16.2. Writing <code class="filename">buildlink3.mk</code> files</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#anatomy-of-bl3">14.2.1. Anatomy of a buildlink3.mk file</a></span></dt>
-<dt><span class="sect2"><a href="#updating-buildlink-depends">14.2.2. Updating
+<dt><span class="sect2"><a href="#anatomy-of-bl3">16.2.1. Anatomy of a buildlink3.mk file</a></span></dt>
+<dt><span class="sect2"><a href="#updating-buildlink-depends">16.2.2. Updating
       <code class="varname">BUILDLINK_API_DEPENDS.<em class="replaceable"><code>pkg</code></em></code>
       and
       <code class="varname">BUILDLINK_ABI_DEPENDS.<em class="replaceable"><code>pkg</code></em></code>
       in <code class="filename">buildlink3.mk</code> files</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#writing-builtin.mk">14.3. Writing <code class="filename">builtin.mk</code> files</a></span></dt>
+<dt><span class="sect1"><a href="#writing-builtin.mk">16.3. Writing <code class="filename">builtin.mk</code> files</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#anatomy-of-builtin.mk">14.3.1. Anatomy of a <code class="filename">builtin.mk</code> file</a></span></dt>
-<dt><span class="sect2"><a href="#native-or-pkgsrc-preference">14.3.2. Global preferences for native or pkgsrc software</a></span></dt>
+<dt><span class="sect2"><a href="#anatomy-of-builtin.mk">16.3.1. Anatomy of a <code class="filename">builtin.mk</code> file</a></span></dt>
+<dt><span class="sect2"><a href="#native-or-pkgsrc-preference">16.3.2. Global preferences for native or pkgsrc software</a></span></dt>
 </dl></dd>
 </dl></dd>
-<dt><span class="chapter"><a href="#pkginstall">15. The pkginstall framework</a></span></dt>
+<dt><span class="chapter"><a href="#pkginstall">17. The pkginstall framework</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#files-and-dirs-outside-prefix">15.1. Files and directories outside the installation prefix</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#dirs-outside-prefix">15.1.1. Directory manipulation</a></span></dt>
-<dt><span class="sect2"><a href="#files-outside-prefix">15.1.2. File manipulation</a></span></dt>
-</dl></dd>
-<dt><span class="sect1"><a href="#conf-files">15.2. Configuration files</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#conf-files-sysconfdir">15.2.1. How <code class="varname">PKG_SYSCONFDIR</code> is set</a></span></dt>
-<dt><span class="sect2"><a href="#conf-files-configure">15.2.2. Telling the software where configuration files are</a></span></dt>
-<dt><span class="sect2"><a href="#conf-files-patching">15.2.3. Patching installations</a></span></dt>
-<dt><span class="sect2"><a href="#conf-files-disable">15.2.4. Disabling handling of configuration files</a></span></dt>
-</dl></dd>
-<dt><span class="sect1"><a href="#rcd-scripts">15.3. System startup scripts</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="#rcd-scripts-disable">15.3.1. Disabling handling of system startup scripts</a></span></dt></dl></dd>
-<dt><span class="sect1"><a href="#users-and-groups">15.4. System users and groups</a></span></dt>
-<dt><span class="sect1"><a href="#shells">15.5. System shells</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="#shells-disable">15.5.1. Disabling shell registration</a></span></dt></dl></dd>
-<dt><span class="sect1"><a href="#fonts">15.6. Fonts</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="#fonts-disable">15.6.1. Disabling automatic update of the fonts databases</a></span></dt></dl></dd>
-</dl></dd>
-<dt><span class="chapter"><a href="#options">16. Options handling</a></span></dt>
-<dd><dl>
-<dt><span class="sect1"><a href="#global-default-options">16.1. Global default options</a></span></dt>
-<dt><span class="sect1"><a href="#converting-to-options">16.2. Converting packages to use <code class="filename">bsd.options.mk</code></a></span></dt>
-<dt><span class="sect1"><a href="#option-names">16.3. Option Names</a></span></dt>
-<dt><span class="sect1"><a href="#option-build">16.4. Determining the options of dependencies</a></span></dt>
-</dl></dd>
-<dt><span class="chapter"><a href="#build">17. The build process</a></span></dt>
-<dd><dl>
-<dt><span class="sect1"><a href="#build.intro">17.1. Introduction</a></span></dt>
-<dt><span class="sect1"><a href="#build.prefix">17.2. Program location</a></span></dt>
-<dt><span class="sect1"><a href="#build.builddirs">17.3. Directories used during the build process</a></span></dt>
-<dt><span class="sect1"><a href="#build.running">17.4. Running a phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.fetch">17.5. The <span class="emphasis"><em>fetch</em></span> phase</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#build.fetch.what">17.5.1. What to fetch and where to get it from</a></span></dt>
-<dt><span class="sect2"><a href="#build.fetch.how">17.5.2. How are the files fetched?</a></span></dt>
-</dl></dd>
-<dt><span class="sect1"><a href="#build.checksum">17.6. The <span class="emphasis"><em>checksum</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.extract">17.7. The <span class="emphasis"><em>extract</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.patch">17.8. The <span class="emphasis"><em>patch</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.tools">17.9. The <span class="emphasis"><em>tools</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.wrapper">17.10. The <span class="emphasis"><em>wrapper</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.configure">17.11. The <span class="emphasis"><em>configure</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.build">17.12. The <span class="emphasis"><em>build</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.test">17.13. The <span class="emphasis"><em>test</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.install">17.14. The <span class="emphasis"><em>install</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.package">17.15. The <span class="emphasis"><em>package</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.clean">17.16. Cleaning up</a></span></dt>
-<dt><span class="sect1"><a href="#build.helpful-targets">17.17. Other helpful targets</a></span></dt>
-</dl></dd>
-<dt><span class="chapter"><a href="#tools">18. Tools needed for building or running</a></span></dt>
-<dd><dl>
-<dt><span class="sect1"><a href="#pkgsrc-tools">18.1. Tools for pkgsrc builds</a></span></dt>
-<dt><span class="sect1"><a href="#package-tools">18.2. Tools needed by packages</a></span></dt>
-<dt><span class="sect1"><a href="#platform-tools">18.3. Tools provided by platforms</a></span></dt>
-</dl></dd>
-<dt><span class="chapter"><a href="#fixes">19. Making your package work</a></span></dt>
-<dd><dl>
-<dt><span class="sect1"><a href="#general-operation">19.1. General operation</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#pulling-vars-from-etc-mk.conf">19.1.1. How to pull in user-settable variables from <code class="filename">mk.conf</code></a></span></dt>
-<dt><span class="sect2"><a href="#user-interaction">19.1.2. User interaction</a></span></dt>
-<dt><span class="sect2"><a href="#handling-licenses">19.1.3. Handling licenses</a></span></dt>
-<dt><span class="sect2"><a href="#restricted-packages">19.1.4. Restricted packages</a></span></dt>
-<dt><span class="sect2"><a href="#dependencies">19.1.5. Handling dependencies</a></span></dt>
-<dt><span class="sect2"><a href="#conflicts">19.1.6. Handling conflicts with other packages</a></span></dt>
-<dt><span class="sect2"><a href="#not-building-packages">19.1.7. Packages that cannot or should not be built</a></span></dt>
-<dt><span class="sect2"><a href="#undeletable-packages">19.1.8. Packages which should not be deleted, once installed</a></span></dt>
-<dt><span class="sect2"><a href="#security-handling">19.1.9. Handling packages with security problems</a></span></dt>
-<dt><span class="sect2"><a href="#bumping-pkgrevision">19.1.10. How to handle incrementing versions when fixing an existing package</a></span></dt>
-<dt><span class="sect2"><a href="#fixes.subst">19.1.11. Substituting variable text in the package files (the SUBST framework)</a></span></dt>
-</dl></dd>
-<dt><span class="sect1"><a href="#fixes.fetch">19.2. The <span class="emphasis"><em>fetch</em></span> phase</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#no-plain-download">19.2.1. Packages whose distfiles aren't available for plain downloading</a></span></dt>
-<dt><span class="sect2"><a href="#modified-distfiles-same-name">19.2.2. How to handle modified distfiles with the 'old' name</a></span></dt>
-<dt><span class="sect2"><a href="#build.fetch.github">19.2.3. Packages hosted on github.com</a></span></dt>
-</dl></dd>
-<dt><span class="sect1"><a href="#fixes.configure">19.3. The <span class="emphasis"><em>configure</em></span> phase</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#fixes.libtool">19.3.1. Shared libraries - libtool</a></span></dt>
-<dt><span class="sect2"><a href="#using-libtool">19.3.2. Using libtool on GNU packages that already support libtool</a></span></dt>
-<dt><span class="sect2"><a href="#autoconf-automake">19.3.3. GNU Autoconf/Automake</a></span></dt>
-</dl></dd>
-<dt><span class="sect1"><a href="#programming-languages">19.4. Programming languages</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#basic-programming-languages">19.4.1. C, C++, and Fortran</a></span></dt>
-<dt><span class="sect2"><a href="#java-programming-language">19.4.2. Java</a></span></dt>
-<dt><span class="sect2"><a href="#perl-scripts">19.4.3. Packages containing perl scripts</a></span></dt>
-<dt><span class="sect2"><a href="#shell-scripts">19.4.4. Packages containing shell scripts</a></span></dt>
-<dt><span class="sect2"><a href="#other-programming-languages">19.4.5. Other programming languages</a></span></dt>
-</dl></dd>
-<dt><span class="sect1"><a href="#fixes.build">19.5. The <span class="emphasis"><em>build</em></span> phase</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#fixes.build.cpp">19.5.1. Compiling C and C++ code conditionally</a></span></dt>
-<dt><span class="sect2"><a href="#compiler-bugs">19.5.2. How to handle compiler bugs</a></span></dt>
-<dt><span class="sect2"><a href="#undefined-reference">19.5.3. Undefined reference to <span class="quote">&#8220;<span class="quote">...</span>&#8221;</span></a></span></dt>
-<dt><span class="sect2"><a href="#out-of-memory">19.5.4. Running out of memory</a></span></dt>
-</dl></dd>
-<dt><span class="sect1"><a href="#fixes.install">19.6. The <span class="emphasis"><em>install</em></span> phase</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#install-scripts">19.6.1. Creating needed directories</a></span></dt>
-<dt><span class="sect2"><a href="#where-to-install-documentation">19.6.2. Where to install documentation</a></span></dt>
-<dt><span class="sect2"><a href="#installing-score-files">19.6.3. Installing highscore files</a></span></dt>
-<dt><span class="sect2"><a href="#destdir-support">19.6.4. Adding DESTDIR support to packages</a></span></dt>
-<dt><span class="sect2"><a href="#hardcoded-paths">19.6.5. Packages with hardcoded paths to other interpreters</a></span></dt>
-<dt><span class="sect2"><a href="#perl-modules">19.6.6. Packages installing perl modules</a></span></dt>
-<dt><span class="sect2"><a href="#faq.info-files">19.6.7. Packages installing info files</a></span></dt>
-<dt><span class="sect2"><a href="#manpages">19.6.8. Packages installing man pages</a></span></dt>
-<dt><span class="sect2"><a href="#gconf-data-files">19.6.9. Packages installing GConf data files</a></span></dt>
-<dt><span class="sect2"><a href="#scrollkeeper-data-files">19.6.10. Packages installing scrollkeeper/rarian data files</a></span></dt>
-<dt><span class="sect2"><a href="#x11-fonts">19.6.11. Packages installing X11 fonts</a></span></dt>
-<dt><span class="sect2"><a href="#gtk2-modules">19.6.12. Packages installing GTK2 modules</a></span></dt>
-<dt><span class="sect2"><a href="#sgml-xml-data">19.6.13. Packages installing SGML or XML data</a></span></dt>
-<dt><span class="sect2"><a href="#mime-database">19.6.14. Packages installing extensions to the MIME database</a></span></dt>
-<dt><span class="sect2"><a href="#intltool">19.6.15. Packages using intltool</a></span></dt>
-<dt><span class="sect2"><a href="#startup-scripts">19.6.16. Packages installing startup scripts</a></span></dt>
-<dt><span class="sect2"><a href="#tex-packages">19.6.17. Packages installing TeX modules</a></span></dt>
-<dt><span class="sect2"><a href="#emulation-packages">19.6.18. Packages supporting running binaries in
+<dt><span class="sect1"><a href="#files-and-dirs-outside-prefix">17.1. Files and directories outside the installation prefix</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#dirs-outside-prefix">17.1.1. Directory manipulation</a></span></dt>
+<dt><span class="sect2"><a href="#files-outside-prefix">17.1.2. File manipulation</a></span></dt>
+</dl></dd>
+<dt><span class="sect1"><a href="#conf-files">17.2. Configuration files</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#conf-files-sysconfdir">17.2.1. How <code class="varname">PKG_SYSCONFDIR</code> is set</a></span></dt>
+<dt><span class="sect2"><a href="#conf-files-configure">17.2.2. Telling the software where configuration files are</a></span></dt>
+<dt><span class="sect2"><a href="#conf-files-patching">17.2.3. Patching installations</a></span></dt>
+<dt><span class="sect2"><a href="#conf-files-disable">17.2.4. Disabling handling of configuration files</a></span></dt>
+</dl></dd>
+<dt><span class="sect1"><a href="#rcd-scripts">17.3. System startup scripts</a></span></dt>
+<dd><dl><dt><span class="sect2"><a href="#rcd-scripts-disable">17.3.1. Disabling handling of system startup scripts</a></span></dt></dl></dd>
+<dt><span class="sect1"><a href="#users-and-groups">17.4. System users and groups</a></span></dt>
+<dt><span class="sect1"><a href="#shells">17.5. System shells</a></span></dt>
+<dd><dl><dt><span class="sect2"><a href="#shells-disable">17.5.1. Disabling shell registration</a></span></dt></dl></dd>
+<dt><span class="sect1"><a href="#fonts">17.6. Fonts</a></span></dt>
+<dd><dl><dt><span class="sect2"><a href="#fonts-disable">17.6.1. Disabling automatic update of the fonts databases</a></span></dt></dl></dd>
+</dl></dd>
+<dt><span class="chapter"><a href="#options">18. Options handling</a></span></dt>
+<dd><dl>
+<dt><span class="sect1"><a href="#global-default-options">18.1. Global default options</a></span></dt>
+<dt><span class="sect1"><a href="#converting-to-options">18.2. Converting packages to use <code class="filename">bsd.options.mk</code></a></span></dt>
+<dt><span class="sect1"><a href="#option-names">18.3. Option Names</a></span></dt>
+<dt><span class="sect1"><a href="#option-build">18.4. Determining the options of dependencies</a></span></dt>
+</dl></dd>
+<dt><span class="chapter"><a href="#build">19. The build process</a></span></dt>
+<dd><dl>
+<dt><span class="sect1"><a href="#build.intro">19.1. Introduction</a></span></dt>
+<dt><span class="sect1"><a href="#build.prefix">19.2. Program location</a></span></dt>
+<dt><span class="sect1"><a href="#build.builddirs">19.3. Directories used during the build process</a></span></dt>
+<dt><span class="sect1"><a href="#build.running">19.4. Running a phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.fetch">19.5. The <span class="emphasis"><em>fetch</em></span> phase</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#build.fetch.what">19.5.1. What to fetch and where to get it from</a></span></dt>
+<dt><span class="sect2"><a href="#build.fetch.how">19.5.2. How are the files fetched?</a></span></dt>
+</dl></dd>
+<dt><span class="sect1"><a href="#build.checksum">19.6. The <span class="emphasis"><em>checksum</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.extract">19.7. The <span class="emphasis"><em>extract</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.patch">19.8. The <span class="emphasis"><em>patch</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.tools">19.9. The <span class="emphasis"><em>tools</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.wrapper">19.10. The <span class="emphasis"><em>wrapper</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.configure">19.11. The <span class="emphasis"><em>configure</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.build">19.12. The <span class="emphasis"><em>build</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.test">19.13. The <span class="emphasis"><em>test</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.install">19.14. The <span class="emphasis"><em>install</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.package">19.15. The <span class="emphasis"><em>package</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.clean">19.16. Cleaning up</a></span></dt>
+<dt><span class="sect1"><a href="#build.helpful-targets">19.17. Other helpful targets</a></span></dt>
+</dl></dd>
+<dt><span class="chapter"><a href="#tools">20. Tools needed for building or running</a></span></dt>
+<dd><dl>
+<dt><span class="sect1"><a href="#pkgsrc-tools">20.1. Tools for pkgsrc builds</a></span></dt>
+<dt><span class="sect1"><a href="#package-tools">20.2. Tools needed by packages</a></span></dt>
+<dt><span class="sect1"><a href="#platform-tools">20.3. Tools provided by platforms</a></span></dt>
+</dl></dd>
+<dt><span class="chapter"><a href="#fixes">21. Making your package work</a></span></dt>
+<dd><dl>
+<dt><span class="sect1"><a href="#general-operation">21.1. General operation</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#pulling-vars-from-etc-mk.conf">21.1.1. How to pull in user-settable variables from <code class="filename">mk.conf</code></a></span></dt>
+<dt><span class="sect2"><a href="#user-interaction">21.1.2. User interaction</a></span></dt>
+<dt><span class="sect2"><a href="#handling-licenses">21.1.3. Handling licenses</a></span></dt>
+<dt><span class="sect2"><a href="#restricted-packages">21.1.4. Restricted packages</a></span></dt>
+<dt><span class="sect2"><a href="#dependencies">21.1.5. Handling dependencies</a></span></dt>
+<dt><span class="sect2"><a href="#conflicts">21.1.6. Handling conflicts with other packages</a></span></dt>
+<dt><span class="sect2"><a href="#not-building-packages">21.1.7. Packages that cannot or should not be built</a></span></dt>
+<dt><span class="sect2"><a href="#undeletable-packages">21.1.8. Packages which should not be deleted, once installed</a></span></dt>
+<dt><span class="sect2"><a href="#security-handling">21.1.9. Handling packages with security problems</a></span></dt>
+<dt><span class="sect2"><a href="#bumping-pkgrevision">21.1.10. How to handle incrementing versions when fixing an existing package</a></span></dt>
+<dt><span class="sect2"><a href="#fixes.subst">21.1.11. Substituting variable text in the package files (the SUBST framework)</a></span></dt>
+</dl></dd>
+<dt><span class="sect1"><a href="#fixes.fetch">21.2. The <span class="emphasis"><em>fetch</em></span> phase</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#no-plain-download">21.2.1. Packages whose distfiles aren't available for plain downloading</a></span></dt>
+<dt><span class="sect2"><a href="#modified-distfiles-same-name">21.2.2. How to handle modified distfiles with the 'old' name</a></span></dt>
+<dt><span class="sect2"><a href="#build.fetch.github">21.2.3. Packages hosted on github.com</a></span></dt>
+</dl></dd>
+<dt><span class="sect1"><a href="#fixes.configure">21.3. The <span class="emphasis"><em>configure</em></span> phase</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#fixes.libtool">21.3.1. Shared libraries - libtool</a></span></dt>
+<dt><span class="sect2"><a href="#using-libtool">21.3.2. Using libtool on GNU packages that already support libtool</a></span></dt>
+<dt><span class="sect2"><a href="#autoconf-automake">21.3.3. GNU Autoconf/Automake</a></span></dt>
+</dl></dd>
+<dt><span class="sect1"><a href="#programming-languages">21.4. Programming languages</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#basic-programming-languages">21.4.1. C, C++, and Fortran</a></span></dt>
+<dt><span class="sect2"><a href="#java-programming-language">21.4.2. Java</a></span></dt>
+<dt><span class="sect2"><a href="#perl-scripts">21.4.3. Packages containing perl scripts</a></span></dt>
+<dt><span class="sect2"><a href="#shell-scripts">21.4.4. Packages containing shell scripts</a></span></dt>
+<dt><span class="sect2"><a href="#other-programming-languages">21.4.5. Other programming languages</a></span></dt>
+</dl></dd>
+<dt><span class="sect1"><a href="#fixes.build">21.5. The <span class="emphasis"><em>build</em></span> phase</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#fixes.build.cpp">21.5.1. Compiling C and C++ code conditionally</a></span></dt>
+<dt><span class="sect2"><a href="#compiler-bugs">21.5.2. How to handle compiler bugs</a></span></dt>
+<dt><span class="sect2"><a href="#undefined-reference">21.5.3. Undefined reference to <span class="quote">&#8220;<span class="quote">...</span>&#8221;</span></a></span></dt>
+<dt><span class="sect2"><a href="#out-of-memory">21.5.4. Running out of memory</a></span></dt>
+</dl></dd>
+<dt><span class="sect1"><a href="#fixes.install">21.6. The <span class="emphasis"><em>install</em></span> phase</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#install-scripts">21.6.1. Creating needed directories</a></span></dt>
+<dt><span class="sect2"><a href="#where-to-install-documentation">21.6.2. Where to install documentation</a></span></dt>
+<dt><span class="sect2"><a href="#installing-score-files">21.6.3. Installing highscore files</a></span></dt>
+<dt><span class="sect2"><a href="#destdir-support">21.6.4. Adding DESTDIR support to packages</a></span></dt>
+<dt><span class="sect2"><a href="#hardcoded-paths">21.6.5. Packages with hardcoded paths to other interpreters</a></span></dt>
+<dt><span class="sect2"><a href="#perl-modules">21.6.6. Packages installing perl modules</a></span></dt>
+<dt><span class="sect2"><a href="#faq.info-files">21.6.7. Packages installing info files</a></span></dt>
+<dt><span class="sect2"><a href="#manpages">21.6.8. Packages installing man pages</a></span></dt>
+<dt><span class="sect2"><a href="#gconf-data-files">21.6.9. Packages installing GConf data files</a></span></dt>
+<dt><span class="sect2"><a href="#scrollkeeper-data-files">21.6.10. Packages installing scrollkeeper/rarian data files</a></span></dt>
+<dt><span class="sect2"><a href="#x11-fonts">21.6.11. Packages installing X11 fonts</a></span></dt>
+<dt><span class="sect2"><a href="#gtk2-modules">21.6.12. Packages installing GTK2 modules</a></span></dt>
+<dt><span class="sect2"><a href="#sgml-xml-data">21.6.13. Packages installing SGML or XML data</a></span></dt>
+<dt><span class="sect2"><a href="#mime-database">21.6.14. Packages installing extensions to the MIME database</a></span></dt>
+<dt><span class="sect2"><a href="#intltool">21.6.15. Packages using intltool</a></span></dt>
+<dt><span class="sect2"><a href="#startup-scripts">21.6.16. Packages installing startup scripts</a></span></dt>
+<dt><span class="sect2"><a href="#tex-packages">21.6.17. Packages installing TeX modules</a></span></dt>
+<dt><span class="sect2"><a href="#emulation-packages">21.6.18. Packages supporting running binaries in
     emulation</a></span></dt>
-<dt><span class="sect2"><a href="#hicolor-theme">19.6.19. Packages installing hicolor theme icons</a></span></dt>
-<dt><span class="sect2"><a href="#desktop-files">19.6.20. Packages installing desktop files</a></span></dt>
+<dt><span class="sect2"><a href="#hicolor-theme">21.6.19. Packages installing hicolor theme icons</a></span></dt>
+<dt><span class="sect2"><a href="#desktop-files">21.6.20. Packages installing desktop files</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#punting">19.7. Marking packages as having problems</a></span></dt>
+<dt><span class="sect1"><a href="#punting">21.7. Marking packages as having problems</a></span></dt>
 </dl></dd>
-<dt><span class="chapter"><a href="#debug">20. Debugging</a></span></dt>
-<dt><span class="chapter"><a href="#submit">21. Submitting and Committing</a></span></dt>
+<dt><span class="chapter"><a href="#debug">22. Debugging</a></span></dt>
+<dt><span class="chapter"><a href="#submit">23. Submitting and Committing</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#submitting-binary-packages">21.1. Submitting binary packages</a></span></dt>
-<dt><span class="sect1"><a href="#submitting-your-package">21.2. Submitting source packages (for non-NetBSD-developers)</a></span></dt>
-<dt><span class="sect1"><a href="#general-notes-for-changes">21.3. General notes when adding, updating, or removing packages</a></span></dt>
-<dt><span class="sect1"><a href="#commit-messages">21.4. Commit Messages</a></span></dt>
-<dt><span class="sect1"><a href="#committing-importing">21.5. Committing: Adding a package to CVS</a></span></dt>
-<dt><span class="sect1"><a href="#updating-package">21.6. Updating a package to a newer version</a></span></dt>
-<dt><span class="sect1"><a href="#renaming-package">21.7. Renaming a package in pkgsrc</a></span></dt>
-<dt><span class="sect1"><a href="#moving-package">21.8. Moving a package in pkgsrc</a></span></dt>
-</dl></dd>
-<dt><span class="chapter"><a href="#devfaq">22. Frequently Asked Questions</a></span></dt>
-<dt><span class="chapter"><a href="#gnome">23. GNOME packaging and porting</a></span></dt>
-<dd><dl>
-<dt><span class="sect1"><a href="#meta-packages">23.1. Meta packages</a></span></dt>
-<dt><span class="sect1"><a href="#new-package">23.2. Packaging a GNOME application</a></span></dt>
-<dt><span class="sect1"><a href="#full-update">23.3. Updating GNOME to a newer version</a></span></dt>
-<dt><span class="sect1"><a href="#patching">23.4. Patching guidelines</a></span></dt>
+<dt><span class="sect1"><a href="#submitting-binary-packages">23.1. Submitting binary packages</a></span></dt>
+<dt><span class="sect1"><a href="#submitting-your-package">23.2. Submitting source packages (for non-NetBSD-developers)</a></span></dt>
+<dt><span class="sect1"><a href="#general-notes-for-changes">23.3. General notes when adding, updating, or removing packages</a></span></dt>
+<dt><span class="sect1"><a href="#commit-messages">23.4. Commit Messages</a></span></dt>
+<dt><span class="sect1"><a href="#committing-importing">23.5. Committing: Adding a package to CVS</a></span></dt>
+<dt><span class="sect1"><a href="#updating-package">23.6. Updating a package to a newer version</a></span></dt>
+<dt><span class="sect1"><a href="#renaming-package">23.7. Renaming a package in pkgsrc</a></span></dt>
+<dt><span class="sect1"><a href="#moving-package">23.8. Moving a package in pkgsrc</a></span></dt>
+</dl></dd>
+<dt><span class="chapter"><a href="#devfaq">24. Frequently Asked Questions</a></span></dt>
+<dt><span class="chapter"><a href="#gnome">25. GNOME packaging and porting</a></span></dt>
+<dd><dl>
+<dt><span class="sect1"><a href="#meta-packages">25.1. Meta packages</a></span></dt>
+<dt><span class="sect1"><a href="#new-package">25.2. Packaging a GNOME application</a></span></dt>
+<dt><span class="sect1"><a href="#full-update">25.3. Updating GNOME to a newer version</a></span></dt>
+<dt><span class="sect1"><a href="#patching">25.4. Patching guidelines</a></span></dt>
 </dl></dd>
 </dl>
 </div>
 </div>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="creating"></a>Chapter�10.�Creating a new pkgsrc package from scratch</h2></div></div></div>
+<a name="help-devel"></a>Chapter�11.�Getting help</h2></div></div></div>
+<p>
+       To get help when developing pkgsrc, the definitive source is this
+       document, the pkgsrc guide. If you don't find anything here,
+       there are alternatives:
+</p>
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p>
+       The built-in pkgsrc help, which is available after bootstrapping
+       pkgsrc. Run <span class="command"><strong>bmake help topic=&#8230;</strong></span> to get
+       help for any topic, such as a variable name like
+       <code class="varname">BUILD_DEFS</code>, a make target like
+       <span class="command"><strong>do-build</strong></span>, a missing C or C++ function like
+       <span class="command"><strong>strcasecmp</strong></span> or any other topic.</p>
+<p>The available help topics are listed in <a class="xref" href="#help-topics" title="Appendix�D.�Help topics">Appendix�D, <i>Help topics</i></a>.</p>
+</li>
+<li class="listitem"><p>
+       The tech-pkg mailing list, to which
+       <a class="ulink" href="https://www.NetBSD.org/mailinglists/#tech-pkg"; target="_top">you
+       can subscribe</a> and then <a class="ulink" href="mailto:tech-pkg%NetBSD.org@localhost"; target="_top">ask your
+       questions</a>.</p></li>
+<li class="listitem"><p>The #pkgsrc IRC channel, which is accessible
+       <a class="ulink" href="https://webchat.freenode.net/"; target="_top">via a web browser</a>
+       or by using a specialized chat program such as
+       <a class="ulink" href="http://xchat.org/"; target="_top">XChat</a>.
+       Pick any user name and join the channel #pkgsrc.</p></li>
+</ul></div>
+</div>
+<div class="chapter">
+<div class="titlepage"><div><div><h2 class="title">
+<a name="creating"></a>Chapter�12.�Creating a new pkgsrc package from scratch</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="sect1"><a href="#creating.common">10.1. Common types of packages</a></span></dt>
+<dt><span class="sect1"><a href="#creating.common">12.1. Common types of packages</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#creating.perl-module">10.1.1. Perl modules</a></span></dt>
-<dt><span class="sect2"><a href="#creating.python-module">10.1.2. Python modules and programs</a></span></dt>
+<dt><span class="sect2"><a href="#creating.perl-module">12.1.1. Perl modules</a></span></dt>
+<dt><span class="sect2"><a href="#creating.python-module">12.1.2. Python modules and programs</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#creating.examples">10.2. Examples</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="#creating.nvu">10.2.1. How the www/nvu package came into pkgsrc</a></span></dt></dl></dd>
+<dt><span class="sect1"><a href="#creating.examples">12.2. Examples</a></span></dt>
+<dd><dl><dt><span class="sect2"><a href="#creating.nvu">12.2.1. How the www/nvu package came into pkgsrc</a></span></dt></dl></dd>
 </dl>
 </div>
 <p>When you find a package that is not yet in pkgsrc, you
@@ -3052,7 +3119,7 @@ know what pkglint's warnings want to tel
 -e</strong></span>, which outputs additional
 explanations.</p></li>
 <li class="step"><p>In many cases the package is not yet ready to build. You can
-find instructions for the most common cases in the next section, <a class="xref" href="#creating.common" title="10.1.�Common types of packages">Section�10.1, &#8220;Common types of 
packages&#8221;</a>. After you have followed the instructions
+find instructions for the most common cases in the next section, <a class="xref" href="#creating.common" title="12.1.�Common types of packages">Section�12.1, &#8220;Common types of 
packages&#8221;</a>. After you have followed the instructions
 over there, you can hopefully continue here.</p></li>
 <li class="step"><p>Run <span class="command"><strong>bmake clean</strong></span> to clean the working
 directory from the extracted files. Besides these files, a lot of cache
@@ -3060,7 +3127,7 @@ files and other system information has b
 directory, which may become wrong after you edited the
 <code class="filename">Makefile</code>.</p></li>
 <li class="step"><p>Now, run <span class="command"><strong>bmake</strong></span> to build the package. For
-the various things that can go wrong in this phase, consult <a class="xref" href="#fixes" title="Chapter�19.�Making your package work">Chapter�19, <i>Making your package work</i></a>.</p></li>
+the various things that can go wrong in this phase, consult <a class="xref" href="#fixes" title="Chapter�21.�Making your package work">Chapter�21, <i>Making your package work</i></a>.</p></li>
 <li class="step"><p>When the package builds fine, the next step is to install
 the package. Run <span class="command"><strong>bmake install</strong></span> and hope that
 everything works.</p></li>
@@ -3083,16 +3150,16 @@ package from the set of installed files.
 </ol></div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="creating.common"></a>10.1.�Common types of packages</h2></div></div></div>
+<a name="creating.common"></a>12.1.�Common types of packages</h2></div></div></div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="creating.perl-module"></a>10.1.1.�Perl modules</h3></div></div></div>
+<a name="creating.perl-module"></a>12.1.1.�Perl modules</h3></div></div></div>
 <p>Simple Perl modules are handled automatically by
 <span class="command"><strong>url2pkg</strong></span>, including dependencies.</p>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="creating.python-module"></a>10.1.2.�Python modules and programs</h3></div></div></div>
+<a name="creating.python-module"></a>12.1.2.�Python modules and programs</h3></div></div></div>
 <p>Python modules and programs packages are easily created using a
 set of predefined variables.</p>
 <p>
@@ -3156,13 +3223,13 @@ of supported packages.</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="creating.examples"></a>10.2.�Examples</h2></div></div></div>
+<a name="creating.examples"></a>12.2.�Examples</h2></div></div></div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="creating.nvu"></a>10.2.1.�How the www/nvu package came into pkgsrc</h3></div></div></div>
+<a name="creating.nvu"></a>12.2.1.�How the www/nvu package came into pkgsrc</h3></div></div></div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="creating.nvu.init"></a>10.2.1.1.�The initial package</h4></div></div></div>
+<a name="creating.nvu.init"></a>12.2.1.1.�The initial package</h4></div></div></div>
 <p>Looking at the file <code class="filename">pkgsrc/doc/TODO</code>, I saw
 that the <span class="quote">&#8220;<span class="quote">nvu</span>&#8221;</span> package has not yet been imported into
 pkgsrc. As the description says it has to do with the web, the obvious
@@ -3228,7 +3295,7 @@ Good luck! (See pkgsrc/doc/pkgsrc.txt fo
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="creating.nvu.problems"></a>10.2.1.2.�Fixing all kinds of problems to make the package work</h4></div></div></div>
+<a name="creating.nvu.problems"></a>12.2.1.2.�Fixing all kinds of problems to make the package work</h4></div></div></div>
 <p>Now that the package has been extracted, let's see what's inside
 it. The package has a <code class="filename">README.txt</code>, but that only
 says something about mozilla, so it's probably useless for seeing what
@@ -3364,7 +3431,7 @@ everything worked.</p>
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="creating.nvu.inst"></a>10.2.1.3.�Installing the package</h4></div></div></div>
+<a name="creating.nvu.inst"></a>12.2.1.3.�Installing the package</h4></div></div></div>
 <pre class="programlisting">
 <code class="prompt">$</code> bmake CHECK_FILES=no install
 [...]
@@ -3378,29 +3445,29 @@ everything worked.</p>
 </div>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="components"></a>Chapter�11.�Package components - files, directories and contents</h2></div></div></div>
+<a name="components"></a>Chapter�13.�Package components - files, directories and contents</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="sect1"><a href="#components.Makefile">11.1. <code class="filename">Makefile</code></a></span></dt>
-<dt><span class="sect1"><a href="#components.distinfo">11.2. <code class="filename">distinfo</code></a></span></dt>
-<dt><span class="sect1"><a href="#components.patches">11.3. <code class="filename">patches/*</code></a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#components.patch.structure">11.3.1. Structure of a single patch file</a></span></dt>
-<dt><span class="sect2"><a href="#components.patches.caveats">11.3.2. Creating patch files</a></span></dt>
-<dt><span class="sect2"><a href="#components.patches.sources">11.3.3. Sources where the patch files come from</a></span></dt>
-<dt><span class="sect2"><a href="#components.patches.guidelines">11.3.4. Patching guidelines</a></span></dt>
-<dt><span class="sect2"><a href="#components.patches.feedback">11.3.5. Feedback to the author</a></span></dt>
-</dl></dd>
-<dt><span class="sect1"><a href="#other-mandatory-files">11.4. Other mandatory files</a></span></dt>
-<dt><span class="sect1"><a href="#components.optional">11.5. Optional files</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#components.optional.bin">11.5.1. Files affecting the binary package</a></span></dt>
-<dt><span class="sect2"><a href="#components.optional.build">11.5.2. Files affecting the build process</a></span></dt>
-<dt><span class="sect2"><a href="#components.optional.none">11.5.3. Files affecting nothing at all</a></span></dt>
+<dt><span class="sect1"><a href="#components.Makefile">13.1. <code class="filename">Makefile</code></a></span></dt>
+<dt><span class="sect1"><a href="#components.distinfo">13.2. <code class="filename">distinfo</code></a></span></dt>
+<dt><span class="sect1"><a href="#components.patches">13.3. <code class="filename">patches/*</code></a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#components.patch.structure">13.3.1. Structure of a single patch file</a></span></dt>
+<dt><span class="sect2"><a href="#components.patches.caveats">13.3.2. Creating patch files</a></span></dt>
+<dt><span class="sect2"><a href="#components.patches.sources">13.3.3. Sources where the patch files come from</a></span></dt>
+<dt><span class="sect2"><a href="#components.patches.guidelines">13.3.4. Patching guidelines</a></span></dt>
+<dt><span class="sect2"><a href="#components.patches.feedback">13.3.5. Feedback to the author</a></span></dt>
+</dl></dd>
+<dt><span class="sect1"><a href="#other-mandatory-files">13.4. Other mandatory files</a></span></dt>
+<dt><span class="sect1"><a href="#components.optional">13.5. Optional files</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#components.optional.bin">13.5.1. Files affecting the binary package</a></span></dt>
+<dt><span class="sect2"><a href="#components.optional.build">13.5.2. Files affecting the build process</a></span></dt>
+<dt><span class="sect2"><a href="#components.optional.none">13.5.3. Files affecting nothing at all</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#work-dir">11.6. <code class="filename">work*</code></a></span></dt>
-<dt><span class="sect1"><a href="#files-dir">11.7. <code class="filename">files/*</code></a></span></dt>
+<dt><span class="sect1"><a href="#work-dir">13.6. <code class="filename">work*</code></a></span></dt>
+<dt><span class="sect1"><a href="#files-dir">13.7. <code class="filename">files/*</code></a></span></dt>
 </dl>
 </div>
 <p>Whenever you're preparing a package, there are a number of
@@ -3408,7 +3475,7 @@ files involved which are described in th
 sections.</p>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="components.Makefile"></a>11.1.�<code class="filename">Makefile</code>
+<a name="components.Makefile"></a>13.1.�<code class="filename">Makefile</code>
 </h2></div></div></div>
 <p>Building, installation and creation of a binary package are all
   controlled by the package's <code class="filename">Makefile</code>.
@@ -3457,7 +3524,7 @@ converters    games         mbone       
     <code class="varname">DYNAMIC_MASTER_SITES</code>,
     <code class="varname">DIST_SUBDIR</code>, <code class="varname">EXTRACT_SUFX</code>
     and <code class="varname">DISTFILES</code> are discussed in detail in
-    <a class="xref" href="#build.fetch" title="17.5.�The fetch phase">Section�17.5, &#8220;The <span class="emphasis"><em>fetch</em></span> phase&#8221;</a>.</p></li>
+    <a class="xref" href="#build.fetch" title="19.5.�The fetch phase">Section�19.5, &#8220;The <span class="emphasis"><em>fetch</em></span> phase&#8221;</a>.</p></li>
 </ul></div>
 <p>The second section contains information about separately
   downloaded patches, if any.
@@ -3503,7 +3570,7 @@ converters    games         mbone       
     description of the package (should not include the package
     name).</p></li>
 <li class="listitem"><p><code class="varname">LICENSE</code> indicates the license(s)
-    applicable for the package. See <a class="xref" href="#handling-licenses" title="19.1.3.�Handling licenses">Section�19.1.3, &#8220;Handling licenses&#8221;</a> for further details.</p></li>
+    applicable for the package. See <a class="xref" href="#handling-licenses" title="21.1.3.�Handling licenses">Section�21.1.3, &#8220;Handling licenses&#8221;</a> for further details.</p></li>
 </ul></div>
 <p>Other variables that affect the build:
   </p>
@@ -3547,12 +3614,12 @@ converters    games         mbone       
 <li class="listitem"><p>Replace <code class="filename">/usr/local</code> with
       <span class="quote">&#8220;<span class="quote">${PREFIX}</span>&#8221;</span> in all files (see patches,
       below).</p></li>
-<li class="listitem"><p>If the package installs any info files, see <a class="xref" href="#faq.info-files" title="19.6.7.�Packages installing info files">Section�19.6.7, &#8220;Packages installing 
info files&#8221;</a>.</p></li>
+<li class="listitem"><p>If the package installs any info files, see <a class="xref" href="#faq.info-files" title="21.6.7.�Packages installing info files">Section�21.6.7, &#8220;Packages installing 
info files&#8221;</a>.</p></li>
 </ul></div>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="components.distinfo"></a>11.2.�<code class="filename">distinfo</code>
+<a name="components.distinfo"></a>13.2.�<code class="filename">distinfo</code>
 </h2></div></div></div>
 <p>The <code class="filename">distinfo</code> file contains the message
   digest, or checksum, of each distfile needed for the package. This
@@ -3563,7 +3630,7 @@ converters    games         mbone       
   RMD160, SHA512), as well as the file size.</p>
 <p>The <code class="filename">distinfo</code> file also contains the
   checksums for all the patches found in the
-  <code class="filename">patches</code> directory (see <a class="xref" href="#components.patches" title="11.3.�patches/*">Section�11.3, &#8220;<code class="filename">patches/*</code>&#8221;</a>). 
These checksums ensure that patches
+  <code class="filename">patches</code> directory (see <a class="xref" href="#components.patches" title="13.3.�patches/*">Section�13.3, &#8220;<code class="filename">patches/*</code>&#8221;</a>). 
These checksums ensure that patches
   are only applied intentionally and that they don't accidentally change,
   e.g. when merging different changes together. They also make sure that
   new patches are actually added to CVS and old ones are removed.
@@ -3579,7 +3646,7 @@ converters    games         mbone       
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="components.patches"></a>11.3.�<code class="filename">patches/*</code>
+<a name="components.patches"></a>13.3.�<code class="filename">patches/*</code>
 </h2></div></div></div>
 <p>Some packages don't work out-of-the box on the various
   platforms that are supported by pkgsrc. These packages need
@@ -3590,7 +3657,7 @@ converters    games         mbone       
   extracting them, in alphabetic order.</p>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="components.patch.structure"></a>11.3.1.�Structure of a single patch file</h3></div></div></div>
+<a name="components.patch.structure"></a>13.3.1.�Structure of a single patch file</h3></div></div></div>
 <p>The <code class="filename">patch-*</code> files should be in
   <span class="command"><strong>diff -bu</strong></span> format, and apply without a fuzz to avoid
   problems. (To force patches to apply with fuzz you can set
@@ -3618,7 +3685,7 @@ converters    games         mbone       
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="components.patches.caveats"></a>11.3.2.�Creating patch files</h3></div></div></div>
+<a name="components.patches.caveats"></a>13.3.2.�Creating patch files</h3></div></div></div>
 <p>One important thing to mention is to pay attention that no RCS
   IDs get stored in the patch files, as these will cause problems when
   later checked into the NetBSD CVS tree. Use the
@@ -3637,7 +3704,7 @@ converters    games         mbone       
   the changes.</p>
 <p>When you have finished a package, remember to generate
   the checksums for the patch files by using the <span class="command"><strong>make
-  makepatchsum</strong></span> command, see <a class="xref" href="#components.distinfo" title="11.2.�distinfo">Section�11.2, &#8220;<code class="filename">distinfo</code>&#8221;</a>.</p>
+  makepatchsum</strong></span> command, see <a class="xref" href="#components.distinfo" title="13.2.�distinfo">Section�13.2, &#8220;<code class="filename">distinfo</code>&#8221;</a>.</p>
 <p>When adding a patch that corrects a problem in the
   distfile (rather than e.g. enforcing pkgsrc's view of where
   man pages should go), send the patch as a bug report to the
@@ -3654,7 +3721,7 @@ converters    games         mbone       
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="components.patches.sources"></a>11.3.3.�Sources where the patch files come from</h3></div></div></div>
+<a name="components.patches.sources"></a>13.3.3.�Sources where the patch files come from</h3></div></div></div>
 <p>If you want to share patches between multiple packages
   in pkgsrc, e.g. because they use the same distfiles, set
   <code class="varname">PATCHDIR</code> to the path where the patch files
@@ -3681,7 +3748,7 @@ PATCHDIR= ${.CURDIR}/../xemacs/patches
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="components.patches.guidelines"></a>11.3.4.�Patching guidelines</h3></div></div></div>
+<a name="components.patches.guidelines"></a>13.3.4.�Patching guidelines</h3></div></div></div>
 <p>When fixing a portability issue in the code do not use
       preprocessor magic to check for the current operating system nor
       platform.  Doing so hurts portability to other platforms because
@@ -3705,7 +3772,7 @@ PATCHDIR= ${.CURDIR}/../xemacs/patches
       <span class="emphasis"><em>It doesn't work unless it is right!</em></span></p>
 <p>Some typical examples:</p>
 <div class="table">
-<a name="patch-examples"></a><p class="title"><b>Table�11.1.�Patching examples</b></p>
+<a name="patch-examples"></a><p class="title"><b>Table�13.1.�Patching examples</b></p>
 <div class="table-contents"><table class="table" summary="Patching examples" border="1">
 <colgroup>
 <col>
@@ -3789,7 +3856,7 @@ monitor_file(...)
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="components.patches.feedback"></a>11.3.5.�Feedback to the author</h3></div></div></div>
+<a name="components.patches.feedback"></a>13.3.5.�Feedback to the author</h3></div></div></div>
 <p>Always, always, <span class="strong"><strong>always</strong></span>
       feed back any <span class="emphasis"><em>portability fixes</em></span> or
       improvements you do to a package to the mainstream developers.
@@ -3812,7 +3879,7 @@ monitor_file(...)
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="other-mandatory-files"></a>11.4.�Other mandatory files</h2></div></div></div>
+<a name="other-mandatory-files"></a>13.4.�Other mandatory files</h2></div></div></div>
 <div class="variablelist"><dl class="variablelist">
 <dt><span class="term"><code class="filename">DESCR</code></span></dt>
 <dd><p>A multi-line description of the piece of software.  This should include
@@ -3824,16 +3891,16 @@ monitor_file(...)
          system: all the binaries, manual pages, etc. There are other
          directives which may be entered in this file, to control the
          creation and deletion of directories, and the location of
-         inserted files.  See <a class="xref" href="#plist" title="Chapter�13.�PLIST issues">Chapter�13, <i>PLIST issues</i></a> for more
+         inserted files.  See <a class="xref" href="#plist" title="Chapter�15.�PLIST issues">Chapter�15, <i>PLIST issues</i></a> for more
          information.</p></dd>
 </dl></div>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="components.optional"></a>11.5.�Optional files</h2></div></div></div>
+<a name="components.optional"></a>13.5.�Optional files</h2></div></div></div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="components.optional.bin"></a>11.5.1.�Files affecting the binary package</h3></div></div></div>
+<a name="components.optional.bin"></a>13.5.1.�Files affecting the binary package</h3></div></div></div>
 <div class="variablelist"><dl class="variablelist">
 <dt><span class="term"><code class="filename">INSTALL</code></span></dt>
 <dd>
@@ -3843,7 +3910,7 @@ monitor_file(...)
            are moved in place. This can be used to do any custom
            procedures not possible with @exec commands in
            <code class="filename">PLIST</code>. See <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?pkg_add+1.i386+NetBSD-8.0";><span class="citerefentry"><span 
class="refentrytitle">pkg_add</span>(1)</span></a> and
-           <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?pkg_create+1.i386+NetBSD-8.0";><span class="citerefentry"><span class="refentrytitle">pkg_create</span>(1)</span></a> for 
more information.  See also <a class="xref" href="#files-and-dirs-outside-prefix" title="15.1.�Files and directories outside the installation prefix">Section�15.1, &#8220;Files and directories 
outside the installation prefix&#8221;</a>.
+           <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?pkg_create+1.i386+NetBSD-8.0";><span class="citerefentry"><span class="refentrytitle">pkg_create</span>(1)</span></a> for 
more information.  See also <a class="xref" href="#files-and-dirs-outside-prefix" title="17.1.�Files and directories outside the installation prefix">Section�17.1, &#8220;Files and directories 
outside the installation prefix&#8221;</a>.
            Please note that you can modify variables in it easily by using
            <code class="varname">FILES_SUBST</code> in the package's
            <code class="filename">Makefile</code>:</p>
@@ -3907,7 +3974,7 @@ MESSAGE_SUBST+=  SOMEVAR="somevalue"
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="components.optional.build"></a>11.5.2.�Files affecting the build process</h3></div></div></div>
+<a name="components.optional.build"></a>13.5.2.�Files affecting the build process</h3></div></div></div>
 <div class="variablelist"><dl class="variablelist">
 <dt><span class="term"><code class="filename">Makefile.common</code></span></dt>
 <dd><p>This file contains arbitrary things that could
@@ -3919,7 +3986,7 @@ MESSAGE_SUBST+=  SOMEVAR="somevalue"
        describes what it does.</p></dd>
 <dt><span class="term"><code class="filename">buildlink3.mk</code></span></dt>
 <dd><p>This file contains the dependency information
-       for the buildlink3 framework (see <a class="xref" href="#buildlink" title="Chapter�14.�Buildlink methodology">Chapter�14, <i>Buildlink methodology</i></a>).</p></dd>
+       for the buildlink3 framework (see <a class="xref" href="#buildlink" title="Chapter�16.�Buildlink methodology">Chapter�16, <i>Buildlink methodology</i></a>).</p></dd>
 <dt><span class="term"><code class="filename">hacks.mk</code></span></dt>
 <dd><p>This file contains workarounds for compiler bugs
        and similar things. It is included automatically by the pkgsrc
@@ -3928,7 +3995,7 @@ MESSAGE_SUBST+=  SOMEVAR="somevalue"
        it.</p></dd>
 <dt><span class="term"><code class="filename">options.mk</code></span></dt>
 <dd><p>This file contains the code for the
-       package-specific options (see <a class="xref" href="#options" title="Chapter�16.�Options handling">Chapter�16, <i>Options handling</i></a>) that can be
+       package-specific options (see <a class="xref" href="#options" title="Chapter�18.�Options handling">Chapter�18, <i>Options handling</i></a>) that can be
        selected by the user. If a package has only one or two options,
        it is equally acceptable to put the code directly into the
        <code class="filename">Makefile</code>.</p></dd>
@@ -3936,7 +4003,7 @@ MESSAGE_SUBST+=  SOMEVAR="somevalue"
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="components.optional.none"></a>11.5.3.�Files affecting nothing at all</h3></div></div></div>
+<a name="components.optional.none"></a>13.5.3.�Files affecting nothing at all</h3></div></div></div>
 <div class="variablelist"><dl class="variablelist">
 <dt><span class="term"><code class="filename">README*</code></span></dt>
 <dd><p>These files do not take place in the creation of
@@ -3951,7 +4018,7 @@ MESSAGE_SUBST+=  SOMEVAR="somevalue"
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="work-dir"></a>11.6.�<code class="filename">work*</code>
+<a name="work-dir"></a>13.6.�<code class="filename">work*</code>
 </h2></div></div></div>
 <p>When you type <span class="command"><strong>make</strong></span>, the distribution files are
     unpacked into the directory denoted by
@@ -3965,7 +4032,7 @@ MESSAGE_SUBST+=  SOMEVAR="somevalue"
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="files-dir"></a>11.7.�<code class="filename">files/*</code>
+<a name="files-dir"></a>13.7.�<code class="filename">files/*</code>
 </h2></div></div></div>
 <p>If you have any files that you wish to be placed in the package prior
     to configuration or building, you could place these files here and use
@@ -3985,19 +4052,19 @@ FILESDIR=${.CURDIR}/../xemacs/files
 </div>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="makefile"></a>Chapter�12.�Programming in <code class="filename">Makefile</code>s</h2></div></div></div>
+<a name="makefile"></a>Chapter�14.�Programming in <code class="filename">Makefile</code>s</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="sect1"><a href="#makefile.style">12.1. Caveats</a></span></dt>
-<dt><span class="sect1"><a href="#makefile.variables">12.2. <code class="filename">Makefile</code> variables</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="#makefile.variables.names">12.2.1. Naming conventions</a></span></dt></dl></dd>
-<dt><span class="sect1"><a href="#makefile.code">12.3. Code snippets</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#adding-to-list">12.3.1. Adding things to a list</a></span></dt>
-<dt><span class="sect2"><a href="#echo-literal">12.3.2. Echoing a string exactly as-is</a></span></dt>
-<dt><span class="sect2"><a href="#cflags-gnu-configure">12.3.3. Passing <code class="varname">CFLAGS</code> to GNU configure scripts</a></span></dt>
-<dt><span class="sect2"><a href="#empty-variables">12.3.4. Handling possibly empty variables</a></span></dt>
+<dt><span class="sect1"><a href="#makefile.style">14.1. Caveats</a></span></dt>
+<dt><span class="sect1"><a href="#makefile.variables">14.2. <code class="filename">Makefile</code> variables</a></span></dt>
+<dd><dl><dt><span class="sect2"><a href="#makefile.variables.names">14.2.1. Naming conventions</a></span></dt></dl></dd>
+<dt><span class="sect1"><a href="#makefile.code">14.3. Code snippets</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#adding-to-list">14.3.1. Adding things to a list</a></span></dt>
+<dt><span class="sect2"><a href="#echo-literal">14.3.2. Echoing a string exactly as-is</a></span></dt>
+<dt><span class="sect2"><a href="#cflags-gnu-configure">14.3.3. Passing <code class="varname">CFLAGS</code> to GNU configure scripts</a></span></dt>
+<dt><span class="sect2"><a href="#empty-variables">14.3.4. Handling possibly empty variables</a></span></dt>
 </dl></dd>
 </dl>
 </div>
@@ -4007,17 +4074,17 @@ FILESDIR=${.CURDIR}/../xemacs/files
   like pkgsrc requires some discipline to keep the code correct and
   understandable.</p>
 <p>The basic ingredients for <code class="filename">Makefile</code>
-  programming are variables (which are actually macros) and shell
+  programming are variables and shell
   commands. Among these shell commands may even be more complex ones
   like <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?awk+1.i386+NetBSD-8.0";><span class="citerefentry"><span class="refentrytitle">awk</span>(1)</span></a> programs. To make 
sure that every shell command runs
   as intended it is necessary to quote all variables correctly when they
   are used.</p>
-<p>This chapter describes some patterns, that appear quite often in
+<p>This chapter describes some patterns that appear quite often in
   <code class="filename">Makefile</code>s, including the pitfalls that come along
   with them.</p>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="makefile.style"></a>12.1.�Caveats</h2></div></div></div>
+<a name="makefile.style"></a>14.1.�Caveats</h2></div></div></div>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
 <p>When you are creating a file as a
     target of a rule, always write the data to a temporary file first
@@ -4044,81 +4111,57 @@ correct:
 <p>You might remember that <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?make+1.i386+NetBSD-8.0";><span class="citerefentry"><span class="refentrytitle">make</span>(1)</span></a> 
sometimes removes
     <code class="literal">${.TARGET}</code> in case of error, but this only
     happens when it is interrupted, for example by pressing
-    <code class="literal">^C</code>. This does <span class="emphasis"><em>not</em></span> happen
+    <code class="literal">Ctrl+C</code>. This does <span class="emphasis"><em>not</em></span> happen
     when one of the commands fails (like <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?false+1.i386+NetBSD-8.0";><span class="citerefentry"><span 
class="refentrytitle">false</span>(1)</span></a> above).</p>
 </li></ul></div>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="makefile.variables"></a>12.2.�<code class="filename">Makefile</code> variables</h2></div></div></div>
+<a name="makefile.variables"></a>14.2.�<code class="filename">Makefile</code> variables</h2></div></div></div>
 <p><code class="filename">Makefile</code> variables contain strings that
-    can be processed using the five operators ``='', ``+='', ``?='',
-    ``:='', and ``!='', which are described in the <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?make+1.i386+NetBSD-8.0";><span class="citerefentry"><span 
class="refentrytitle">make</span>(1)</span></a> man
+    can be processed using the five operators <code class="code">=</code>,
+    <code class="code">+=</code>, <code class="code">?=</code>, <code class="code">:=</code> and
+    <code class="code">!=</code>, which are described in the <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?make+1.i386+NetBSD-8.0";><span class="citerefentry"><span 
class="refentrytitle">make</span>(1)</span></a> man
     page.</p>
 <p>When a variable's value is parsed from a
-    <code class="filename">Makefile</code>, the hash character ``#'' and the
-    backslash character ``\'' are handled specially. If a backslash is
-    followed by a newline, any whitespace immediately in front of the
-    backslash, the backslash, the newline, and any whitespace
-    immediately behind the newline are replaced with a single space. A
-    backslash character and an immediately following hash character are
-    replaced with a single hash character. Otherwise, the backslash is
-    passed as is. In a variable assignment, any hash character that is
-    not preceded by a backslash starts a comment that continues up to the
-    end of the logical line.</p>
+    <code class="filename">Makefile</code>, the hash character <code class="code">#</code> and
+    the backslash character <code class="code">\</code> are handled specially. If a
+    backslash is the last character in a line, that backslash is removed
+    from the line and the line continues with the next line of the file.</p>
+<p>The <code class="code">#</code> character starts a comment that reaches
+    until the end of the line. To get an actual <code class="code">#</code> character,
+    such as in a URL, write <code class="code">\#</code> instead.</p>
 <p>The evaluation of variables either happens immediately or lazy.
-    It happens immediately when the variable occurs
-    on the right-hand side of the ``:='' or the ``!='' operator, in a
+    It happens immediately when the variable occurs on the right-hand
+    side of the <code class="code">:=</code> or the <code class="code">!=</code> operator, in a
     <code class="varname">.if</code> condition or a <code class="varname">.for</code> loop.
     In the other cases, it is evaluated lazily.</p>
 <p>Some of the modifiers split the string into words and then
-    operate on the words, others operate on the string as a whole. When
-    a string is split into words, it is split like in <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?sh+1.i386+NetBSD-8.0";><span class="citerefentry"><span 
class="refentrytitle">sh</span>(1)</span></a>.</p>
-<p>There are several types of variables that should be handled
-    differently. Strings and two types of lists.</p>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p><span class="emphasis"><em>Strings</em></span> can contain arbitrary
-      characters. Nevertheless, you should restrict yourself to only
-      using printable characters. Examples are
-      <code class="varname">PREFIX</code> and
-      <code class="varname">COMMENT</code>.</p></li>
-<li class="listitem"><p><span class="emphasis"><em>Internal lists</em></span> are lists that
-      are never exported to any shell command. Their elements are
-      separated by whitespace. Therefore, the elements themselves cannot
-      have embedded whitespace. Any other characters are allowed.
-      Internal lists can be used in <span class="command"><strong>.for</strong></span> loops.
-      Examples are <code class="varname">DEPENDS</code> and
-      <code class="varname">BUILD_DEPENDS</code>.</p></li>
-<li class="listitem"><p><span class="emphasis"><em>External lists</em></span> are lists that
-      may be exported to a shell command. Their elements can contain any
-      characters, including whitespace. That's why they cannot be used
-      in <span class="command"><strong>.for</strong></span> loops. Examples are
-      <code class="varname">DISTFILES</code> and
-      <code class="varname">MASTER_SITES</code>.</p></li>
-</ul></div>
+    operate on the words, others operate on the string as a whole. When a
+    string is split into words, double quotes and single quotes are
+    interpreted as delimiters, just like in <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?sh+1.i386+NetBSD-8.0";><span class="citerefentry"><span 
class="refentrytitle">sh</span>(1)</span></a>.</p>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="makefile.variables.names"></a>12.2.1.�Naming conventions</h3></div></div></div>
+<a name="makefile.variables.names"></a>14.2.1.�Naming conventions</h3></div></div></div>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p>All variable names starting with an underscore
        are reserved for use by the pkgsrc infrastructure. They shall
-       not be used by package
-       <code class="filename">Makefile</code>s.</p></li>
+       not be used by packages.</p></li>
 <li class="listitem"><p>In <span class="command"><strong>.for</strong></span> loops you should use
        lowercase variable names for the iteration
        variables.</p></li>
-<li class="listitem"><p>All list variables should have a ``plural''
-       name, e.g. <code class="varname">PKG_OPTIONS</code> or
+<li class="listitem"><p>All list variables should have a plural name,
+       such as <code class="varname">PKG_OPTIONS</code> or
        <code class="varname">DISTFILES</code>.</p></li>
 </ul></div>
 </div>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="makefile.code"></a>12.3.�Code snippets</h2></div></div></div>
+<a name="makefile.code"></a>14.3.�Code snippets</h2></div></div></div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="adding-to-list"></a>12.3.1.�Adding things to a list</h3></div></div></div>
+<a name="adding-to-list"></a>14.3.1.�Adding things to a list</h3></div></div></div>
 <p>When adding a string that possibly contains whitespace or quotes to
 a list (example 1), it must be quoted using the <code class="code">:Q</code>
 modifier.</p>
@@ -4135,7 +4178,7 @@ LIST+=          ${ANOTHER_LIST}   # 2
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="echo-literal"></a>12.3.2.�Echoing a string exactly as-is</h3></div></div></div>
+<a name="echo-literal"></a>14.3.2.�Echoing a string exactly as-is</h3></div></div></div>
 <p>Echoing a string containing special characters needs special
 work.</p>
 <pre class="programlisting">
@@ -4165,7 +4208,7 @@ when adding elements to the list.</p>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="cflags-gnu-configure"></a>12.3.3.�Passing <code class="varname">CFLAGS</code> to GNU configure scripts</h3></div></div></div>
+<a name="cflags-gnu-configure"></a>14.3.3.�Passing <code class="varname">CFLAGS</code> to GNU configure scripts</h3></div></div></div>
 <p>When passing <code class="varname">CFLAGS</code> or similar variables to a
 GNU-style configure script (especially those that call other configure
 scripts), it must not have leading or trailing whitespace, since
@@ -4189,7 +4232,7 @@ space.</p>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="empty-variables"></a>12.3.4.�Handling possibly empty variables</h3></div></div></div>
+<a name="empty-variables"></a>14.3.4.�Handling possibly empty variables</h3></div></div></div>
 <p>When a possibly empty variable is used in a shell program, it may
 lead to a syntax error.</p>
 <pre class="programlisting">
@@ -4222,9 +4265,8 @@ install-examples:
         echo "Installing ${egfile}"
 .endfor
 </pre>
-<p>This variant only works when <code class="varname">EGFILES</code> does not
-contain filenames with spaces, since the <code class="code">.for</code> loop splits on
-simple whitespace.</p>
+<p>If one of the filenames contains special characters, it should be
+enclosed in single or double quotes.</p>
 <p>To have a shell command test whether a make variable is empty, use
 the following code: <code class="code">${TEST} -z ${POSSIBLY_EMPTY:Q}""</code>.</p>
 </div>
@@ -4232,19 +4274,19 @@ the following code: <code class="code">$
 </div>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="plist"></a>Chapter�13.�PLIST issues</h2></div></div></div>
+<a name="plist"></a>Chapter�15.�PLIST issues</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="sect1"><a href="#rcs-id">13.1. RCS ID</a></span></dt>
-<dt><span class="sect1"><a href="#automatic-plist-generation">13.2. Semi-automatic <code class="filename">PLIST</code> generation</a></span></dt>
-<dt><span class="sect1"><a href="#print-PLIST">13.3. Tweaking output of <span class="command"><strong>make print-PLIST</strong></span></a></span></dt>
-<dt><span class="sect1"><a href="#plist.misc">13.4. Variable substitution in PLIST</a></span></dt>
-<dt><span class="sect1"><a href="#manpage-compression">13.5. Man page compression</a></span></dt>
-<dt><span class="sect1"><a href="#using-PLIST_SRC">13.6. Changing PLIST source with <code class="varname">PLIST_SRC</code></a></span></dt>
-<dt><span class="sect1"><a href="#platform-specific-plist">13.7. Platform-specific and differing PLISTs</a></span></dt>
-<dt><span class="sect1"><a href="#build-plist">13.8. Build-specific PLISTs</a></span></dt>
-<dt><span class="sect1"><a href="#faq.common-dirs">13.9. Sharing directories between packages</a></span></dt>
+<dt><span class="sect1"><a href="#rcs-id">15.1. RCS ID</a></span></dt>
+<dt><span class="sect1"><a href="#automatic-plist-generation">15.2. Semi-automatic <code class="filename">PLIST</code> generation</a></span></dt>
+<dt><span class="sect1"><a href="#print-PLIST">15.3. Tweaking output of <span class="command"><strong>make print-PLIST</strong></span></a></span></dt>
+<dt><span class="sect1"><a href="#plist.misc">15.4. Variable substitution in PLIST</a></span></dt>
+<dt><span class="sect1"><a href="#manpage-compression">15.5. Man page compression</a></span></dt>
+<dt><span class="sect1"><a href="#using-PLIST_SRC">15.6. Changing PLIST source with <code class="varname">PLIST_SRC</code></a></span></dt>
+<dt><span class="sect1"><a href="#platform-specific-plist">15.7. Platform-specific and differing PLISTs</a></span></dt>
+<dt><span class="sect1"><a href="#build-plist">15.8. Build-specific PLISTs</a></span></dt>
+<dt><span class="sect1"><a href="#faq.common-dirs">15.9. Sharing directories between packages</a></span></dt>
 </dl>
 </div>
 <p>The <code class="filename">PLIST</code> file contains a package's
@@ -4257,7 +4299,7 @@ the following code: <code class="code">$
   below!).</p>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="rcs-id"></a>13.1.�RCS ID</h2></div></div></div>
+<a name="rcs-id"></a>15.1.�RCS ID</h2></div></div></div>
 <p>Be sure to add a RCS ID line as the first thing in any
     <code class="filename">PLIST</code> file you write:</p>
 <pre class="programlisting">
@@ -4269,15 +4311,15 @@ adding the RCS ID the space should be om
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="automatic-plist-generation"></a>13.2.�Semi-automatic <code class="filename">PLIST</code> generation</h2></div></div></div>
+<a name="automatic-plist-generation"></a>15.2.�Semi-automatic <code class="filename">PLIST</code> generation</h2></div></div></div>
 <p>You can use the <span class="command"><strong>make print-PLIST</strong></span> command
     to output a PLIST that matches any new files since the package
-    was extracted.  See <a class="xref" href="#build.helpful-targets" title="17.17.�Other helpful targets">Section�17.17, &#8220;Other helpful targets&#8221;</a> for
+    was extracted.  See <a class="xref" href="#build.helpful-targets" title="19.17.�Other helpful targets">Section�19.17, &#8220;Other helpful targets&#8221;</a> for
     more information on this target.</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="print-PLIST"></a>13.3.�Tweaking output of <span class="command"><strong>make print-PLIST</strong></span>
+<a name="print-PLIST"></a>15.3.�Tweaking output of <span class="command"><strong>make print-PLIST</strong></span>
 </h2></div></div></div>
 <p>The <code class="varname">PRINT_PLIST_AWK</code> variable takes a set
     of AWK patterns and actions that are used to filter the output of
@@ -4292,7 +4334,7 @@ PRINT_PLIST_AWK+=       /^libdata\/foo/ 
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="plist.misc"></a>13.4.�Variable substitution in PLIST</h2></div></div></div>
+<a name="plist.misc"></a>15.4.�Variable substitution in PLIST</h2></div></div></div>
 <p>A number of variables are substituted automatically in
     PLISTs when a package is installed on a system. This includes the
     following variables:</p>
@@ -4338,7 +4380,7 @@ well as searching the <code class="filen
 <code class="varname">PLIST_SUBST</code> should help.</p>
 <p>If you want to change other variables not listed above, you
     can add variables and their expansions to this variable in the
-    following way, similar to <code class="varname">MESSAGE_SUBST</code> (see <a class="xref" href="#components.optional" title="11.5.�Optional files">Section�11.5, &#8220;Optional 
files&#8221;</a>):</p>
+    following way, similar to <code class="varname">MESSAGE_SUBST</code> (see <a class="xref" href="#components.optional" title="13.5.�Optional files">Section�13.5, &#8220;Optional 
files&#8221;</a>):</p>
 <pre class="programlisting">
 PLIST_SUBST+=   SOMEVAR="somevalue"
 </pre>
@@ -4377,7 +4419,7 @@ adding the RCS ID the space should be om
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="manpage-compression"></a>13.5.�Man page compression</h2></div></div></div>
+<a name="manpage-compression"></a>15.5.�Man page compression</h2></div></div></div>
 <p>Man pages should be installed in compressed form if
     <code class="varname">MANZ</code> is set (in <code class="filename">bsd.own.mk</code>),
     and uncompressed otherwise. To handle this in the
@@ -4390,7 +4432,7 @@ adding the RCS ID the space should be om
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="using-PLIST_SRC"></a>13.6.�Changing PLIST source with <code class="varname">PLIST_SRC</code>
+<a name="using-PLIST_SRC"></a>15.6.�Changing PLIST source with <code class="varname">PLIST_SRC</code>
 </h2></div></div></div>
 <p>To use one or more files as source for the <code class="filename">PLIST</code> used
     in generating the binary package, set the variable
@@ -4401,7 +4443,7 @@ adding the RCS ID the space should be om
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="platform-specific-plist"></a>13.7.�Platform-specific and differing PLISTs</h2></div></div></div>
+<a name="platform-specific-plist"></a>15.7.�Platform-specific and differing PLISTs</h2></div></div></div>
 <p>Some packages decide to install a different set of files based on
     the operating system being used. These differences can be
     automatically handled by using the following files:</p>
@@ -4415,7 +4457,7 @@ adding the RCS ID the space should be om
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="build-plist"></a>13.8.�Build-specific PLISTs</h2></div></div></div>
+<a name="build-plist"></a>15.8.�Build-specific PLISTs</h2></div></div></div>
 <p>Some packages decide to generate hard-to-guess file names
     during installation that are hard to wire down.</p>
 <p>In such cases, you can set the
@@ -4433,7 +4475,7 @@ GENERATE_PLIST+=        ${ECHO} bin/${DI
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="faq.common-dirs"></a>13.9.�Sharing directories between packages</h2></div></div></div>
+<a name="faq.common-dirs"></a>15.9.�Sharing directories between packages</h2></div></div></div>
 <p>A <span class="quote">&#8220;<span class="quote">shared directory</span>&#8221;</span> is a directory where
     multiple (and unrelated) packages install files.  These
     directories were problematic because you had to add special
@@ -4460,24 +4502,24 @@ GENERATE_PLIST+=        ${ECHO} bin/${DI
 </div>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="buildlink"></a>Chapter�14.�Buildlink methodology</h2></div></div></div>
+<a name="buildlink"></a>Chapter�16.�Buildlink methodology</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="sect1"><a href="#converting-to-buildlink3">14.1. Converting packages to use buildlink3</a></span></dt>
-<dt><span class="sect1"><a href="#creating-buildlink3.mk">14.2. Writing <code class="filename">buildlink3.mk</code> files</a></span></dt>
+<dt><span class="sect1"><a href="#converting-to-buildlink3">16.1. Converting packages to use buildlink3</a></span></dt>
+<dt><span class="sect1"><a href="#creating-buildlink3.mk">16.2. Writing <code class="filename">buildlink3.mk</code> files</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#anatomy-of-bl3">14.2.1. Anatomy of a buildlink3.mk file</a></span></dt>
-<dt><span class="sect2"><a href="#updating-buildlink-depends">14.2.2. Updating
+<dt><span class="sect2"><a href="#anatomy-of-bl3">16.2.1. Anatomy of a buildlink3.mk file</a></span></dt>
+<dt><span class="sect2"><a href="#updating-buildlink-depends">16.2.2. Updating
       <code class="varname">BUILDLINK_API_DEPENDS.<em class="replaceable"><code>pkg</code></em></code>
       and
       <code class="varname">BUILDLINK_ABI_DEPENDS.<em class="replaceable"><code>pkg</code></em></code>
       in <code class="filename">buildlink3.mk</code> files</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#writing-builtin.mk">14.3. Writing <code class="filename">builtin.mk</code> files</a></span></dt>
+<dt><span class="sect1"><a href="#writing-builtin.mk">16.3. Writing <code class="filename">builtin.mk</code> files</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#anatomy-of-builtin.mk">14.3.1. Anatomy of a <code class="filename">builtin.mk</code> file</a></span></dt>
-<dt><span class="sect2"><a href="#native-or-pkgsrc-preference">14.3.2. Global preferences for native or pkgsrc software</a></span></dt>
+<dt><span class="sect2"><a href="#anatomy-of-builtin.mk">16.3.1. Anatomy of a <code class="filename">builtin.mk</code> file</a></span></dt>
+<dt><span class="sect2"><a href="#native-or-pkgsrc-preference">16.3.2. Global preferences for native or pkgsrc software</a></span></dt>
 </dl></dd>
 </dl>
 </div>
@@ -4505,7 +4547,7 @@ GENERATE_PLIST+=        ${ECHO} bin/${DI
   software.</p>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="converting-to-buildlink3"></a>14.1.�Converting packages to use buildlink3</h2></div></div></div>
+<a name="converting-to-buildlink3"></a>16.1.�Converting packages to use buildlink3</h2></div></div></div>
 <p>The process of converting packages to use the buildlink3
     framework (<span class="quote">&#8220;<span class="quote">bl3ifying</span>&#8221;</span>) is fairly straightforward.
     The things to keep in mind are:</p>
@@ -4592,7 +4634,7 @@ BUILDLINK_API_DEPENDS.foo+=   foo&gt;=1.
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="creating-buildlink3.mk"></a>14.2.�Writing <code class="filename">buildlink3.mk</code> files</h2></div></div></div>
+<a name="creating-buildlink3.mk"></a>16.2.�Writing <code class="filename">buildlink3.mk</code> files</h2></div></div></div>
 <a name="buildlink3.mk"></a><p>A package's <code class="filename">buildlink3.mk</code> file is
     included by Makefiles to indicate the need to compile and link
     against header files and libraries provided by the package.  A
@@ -4612,7 +4654,7 @@ BUILDLINK_API_DEPENDS.foo+=   foo&gt;=1.
     </pre>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="anatomy-of-bl3"></a>14.2.1.�Anatomy of a buildlink3.mk file</h3></div></div></div>
+<a name="anatomy-of-bl3"></a>16.2.1.�Anatomy of a buildlink3.mk file</h3></div></div></div>
 <p>The following real-life example
       <code class="filename">buildlink3.mk</code> is taken
       from <code class="filename">pkgsrc/graphics/tiff</code>:</p>
@@ -4756,7 +4798,7 @@ BUILDLINK_TREE+=        -tiff
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="updating-buildlink-depends"></a>14.2.2.�Updating
+<a name="updating-buildlink-depends"></a>16.2.2.�Updating
       <code class="varname">BUILDLINK_API_DEPENDS.<em class="replaceable"><code>pkg</code></em></code>
       and
       <code class="varname">BUILDLINK_ABI_DEPENDS.<em class="replaceable"><code>pkg</code></em></code>
@@ -4783,7 +4825,7 @@ BUILDLINK_TREE+=        -tiff
       adjusted, too. This is needed so pkgsrc will require the correct
       package dependency and not settle for an older one when building
       the source.</p>
-<p>See <a class="xref" href="#dependencies" title="19.1.5.�Handling dependencies">Section�19.1.5, &#8220;Handling dependencies&#8221;</a> for
+<p>See <a class="xref" href="#dependencies" title="21.1.5.�Handling dependencies">Section�21.1.5, &#8220;Handling dependencies&#8221;</a> for
       more information about dependencies on other packages,
       including the <code class="varname">BUILDLINK_ABI_DEPENDS</code> and
       <code class="varname">ABI_DEPENDS</code> definitions.</p>
@@ -4802,7 +4844,7 @@ BUILDLINK_TREE+=        -tiff
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="writing-builtin.mk"></a>14.3.�Writing <code class="filename">builtin.mk</code> files</h2></div></div></div>
+<a name="writing-builtin.mk"></a>16.3.�Writing <code class="filename">builtin.mk</code> files</h2></div></div></div>
 <p>Some packages in pkgsrc install headers and libraries that
       coincide with headers and libraries present in the base system.
       Aside from a <code class="filename">buildlink3.mk</code> file, these
@@ -4827,7 +4869,7 @@ BUILDLINK_TREE+=        -tiff
 </ol></div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="anatomy-of-builtin.mk"></a>14.3.1.�Anatomy of a <code class="filename">builtin.mk</code> file</h3></div></div></div>
+<a name="anatomy-of-builtin.mk"></a>16.3.1.�Anatomy of a <code class="filename">builtin.mk</code> file</h3></div></div></div>
 <p>The following is the recommended template for builtin.mk
       files:</p>
 <pre class="programlisting">
@@ -4914,7 +4956,7 @@ CHECK_BUILTIN.foo?=     no
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="native-or-pkgsrc-preference"></a>14.3.2.�Global preferences for native or pkgsrc software</h3></div></div></div>
+<a name="native-or-pkgsrc-preference"></a>16.3.2.�Global preferences for native or pkgsrc software</h3></div></div></div>
 <p>When building packages, it's possible to choose whether to set
        a global preference for using either the built-in (native)
        version or the pkgsrc version of software to satisfy a
@@ -4956,29 +4998,29 @@ PREFER_NATIVE=  getopt skey tcp_wrappers
 </div>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="pkginstall"></a>Chapter�15.�The pkginstall framework</h2></div></div></div>
+<a name="pkginstall"></a>Chapter�17.�The pkginstall framework</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="sect1"><a href="#files-and-dirs-outside-prefix">15.1. Files and directories outside the installation prefix</a></span></dt>
+<dt><span class="sect1"><a href="#files-and-dirs-outside-prefix">17.1. Files and directories outside the installation prefix</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#dirs-outside-prefix">15.1.1. Directory manipulation</a></span></dt>
-<dt><span class="sect2"><a href="#files-outside-prefix">15.1.2. File manipulation</a></span></dt>
+<dt><span class="sect2"><a href="#dirs-outside-prefix">17.1.1. Directory manipulation</a></span></dt>
+<dt><span class="sect2"><a href="#files-outside-prefix">17.1.2. File manipulation</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#conf-files">15.2. Configuration files</a></span></dt>
+<dt><span class="sect1"><a href="#conf-files">17.2. Configuration files</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#conf-files-sysconfdir">15.2.1. How <code class="varname">PKG_SYSCONFDIR</code> is set</a></span></dt>
-<dt><span class="sect2"><a href="#conf-files-configure">15.2.2. Telling the software where configuration files are</a></span></dt>
-<dt><span class="sect2"><a href="#conf-files-patching">15.2.3. Patching installations</a></span></dt>
-<dt><span class="sect2"><a href="#conf-files-disable">15.2.4. Disabling handling of configuration files</a></span></dt>
-</dl></dd>
-<dt><span class="sect1"><a href="#rcd-scripts">15.3. System startup scripts</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="#rcd-scripts-disable">15.3.1. Disabling handling of system startup scripts</a></span></dt></dl></dd>
-<dt><span class="sect1"><a href="#users-and-groups">15.4. System users and groups</a></span></dt>
-<dt><span class="sect1"><a href="#shells">15.5. System shells</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="#shells-disable">15.5.1. Disabling shell registration</a></span></dt></dl></dd>
-<dt><span class="sect1"><a href="#fonts">15.6. Fonts</a></span></dt>
-<dd><dl><dt><span class="sect2"><a href="#fonts-disable">15.6.1. Disabling automatic update of the fonts databases</a></span></dt></dl></dd>
+<dt><span class="sect2"><a href="#conf-files-sysconfdir">17.2.1. How <code class="varname">PKG_SYSCONFDIR</code> is set</a></span></dt>
+<dt><span class="sect2"><a href="#conf-files-configure">17.2.2. Telling the software where configuration files are</a></span></dt>
+<dt><span class="sect2"><a href="#conf-files-patching">17.2.3. Patching installations</a></span></dt>
+<dt><span class="sect2"><a href="#conf-files-disable">17.2.4. Disabling handling of configuration files</a></span></dt>
+</dl></dd>
+<dt><span class="sect1"><a href="#rcd-scripts">17.3. System startup scripts</a></span></dt>
+<dd><dl><dt><span class="sect2"><a href="#rcd-scripts-disable">17.3.1. Disabling handling of system startup scripts</a></span></dt></dl></dd>
+<dt><span class="sect1"><a href="#users-and-groups">17.4. System users and groups</a></span></dt>
+<dt><span class="sect1"><a href="#shells">17.5. System shells</a></span></dt>
+<dd><dl><dt><span class="sect2"><a href="#shells-disable">17.5.1. Disabling shell registration</a></span></dt></dl></dd>
+<dt><span class="sect1"><a href="#fonts">17.6. Fonts</a></span></dt>
+<dd><dl><dt><span class="sect2"><a href="#fonts-disable">17.6.1. Disabling automatic update of the fonts databases</a></span></dt></dl></dd>
 </dl>
 </div>
 <p>This chapter describes the framework known as
@@ -5004,7 +5046,7 @@ described above is by means of the insta
 automatically generated by pkginstall.</p>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="files-and-dirs-outside-prefix"></a>15.1.�Files and directories outside the installation prefix</h2></div></div></div>
+<a name="files-and-dirs-outside-prefix"></a>17.1.�Files and directories outside the installation prefix</h2></div></div></div>
 <p>As you already know, the <code class="filename">PLIST</code> file holds a list
 of files and directories that belong to a package.  The names used in it
 are relative to the installation prefix (<code class="filename">${PREFIX}</code>),
@@ -5037,7 +5079,7 @@ and directories based on variables set i
 these variables.</p>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="dirs-outside-prefix"></a>15.1.1.�Directory manipulation</h3></div></div></div>
+<a name="dirs-outside-prefix"></a>17.1.1.�Directory manipulation</h3></div></div></div>
 <p>The following variables can be set to request the creation of
 directories anywhere in the file system:</p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
@@ -5070,7 +5112,7 @@ MAKE_DIRS_PERMS+=       ${VARBASE}/foo/p
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="files-outside-prefix"></a>15.1.2.�File manipulation</h3></div></div></div>
+<a name="files-outside-prefix"></a>17.1.2.�File manipulation</h3></div></div></div>
 <p>Creating non-empty files outside the installation prefix is tricky
 because the <code class="filename">PLIST</code> forces all files to be inside it.
 To overcome this problem, the only solution is to extract the file in the
@@ -5111,7 +5153,7 @@ REQD_FILES_PERMS+=      ${PREFIX}/share/
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="conf-files"></a>15.2.�Configuration files</h2></div></div></div>
+<a name="conf-files"></a>17.2.�Configuration files</h2></div></div></div>
 <p>Configuration files are special in the sense that they are installed
 in their own specific directory, <code class="varname">PKG_SYSCONFDIR</code>, and
 need special treatment during installation (most of which is automated by
@@ -5123,7 +5165,7 @@ be removed if they have local modificati
 administrators never lose any custom changes they may have made.</p>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="conf-files-sysconfdir"></a>15.2.1.�How <code class="varname">PKG_SYSCONFDIR</code> is set</h3></div></div></div>
+<a name="conf-files-sysconfdir"></a>17.2.1.�How <code class="varname">PKG_SYSCONFDIR</code> is set</h3></div></div></div>
 <p>As said before, the <code class="varname">PKG_SYSCONFDIR</code> variable
 specifies where configuration files shall be installed.  Its contents are
 set based upon the following variables:</p>
@@ -5171,13 +5213,13 @@ following:</p>
     <code class="filename">${PKG_SYSCONFBASE}</code>.</p></li>
 </ol></div>
 <p>It is worth mentioning that <code class="filename">${PKG_SYSCONFDIR}</code> is
-automatically added to <code class="filename">OWN_DIRS</code>.  See <a class="xref" href="#dirs-outside-prefix" title="15.1.1.�Directory manipulation">Section�15.1.1, &#8220;Directory 
manipulation&#8221;</a> what this means.  This does not apply to
+automatically added to <code class="filename">OWN_DIRS</code>.  See <a class="xref" href="#dirs-outside-prefix" title="17.1.1.�Directory manipulation">Section�17.1.1, &#8220;Directory 
manipulation&#8221;</a> what this means.  This does not apply to
 subdirectories of <code class="filename">${PKG_SYSCONFDIR}</code>, they still have to
 be created with OWN_DIRS or MAKE_DIRS.</p>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="conf-files-configure"></a>15.2.2.�Telling the software where configuration files are</h3></div></div></div>
+<a name="conf-files-configure"></a>17.2.2.�Telling the software where configuration files are</h3></div></div></div>
 <p>Given that pkgsrc (and users!) expect configuration files to be in a
 known place, you need to teach each package where it shall install its
 files.  In some cases you will have to patch the package Makefiles to
@@ -5194,7 +5236,7 @@ unfortunately).</p>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="conf-files-patching"></a>15.2.3.�Patching installations</h3></div></div></div>
+<a name="conf-files-patching"></a>17.2.3.�Patching installations</h3></div></div></div>
 <p>As said before, pkginstall automatically handles configuration files.
 This means that <span class="strong"><strong>the packages themselves must not
 touch the contents of <code class="filename">${PKG_SYSCONFDIR}</code>
@@ -5211,7 +5253,7 @@ examples hierarchy), the pkginstall fram
 during the package installation to update what is in
 <code class="filename">${PKG_SYSCONFDIR}</code>.  To achieve this, the variables
 <code class="varname">CONF_FILES</code> and <code class="varname">CONF_FILES_PERMS</code> are
-used.  Check out <a class="xref" href="#files-outside-prefix" title="15.1.2.�File manipulation">Section�15.1.2, &#8220;File manipulation&#8221;</a> for information
+used.  Check out <a class="xref" href="#files-outside-prefix" title="17.1.2.�File manipulation">Section�17.1.2, &#8220;File manipulation&#8221;</a> for information
 about their syntax and their purpose.  Here is an example, taken from the
 <a href="https://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/mail/mutt/README.html"; target="_top"><code class="filename">mail/mutt</code></a> package:</p>
 <pre class="programlisting">
@@ -5223,7 +5265,7 @@ package and has no meaning outside it.</
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="conf-files-disable"></a>15.2.4.�Disabling handling of configuration files</h3></div></div></div>
+<a name="conf-files-disable"></a>17.2.4.�Disabling handling of configuration files</h3></div></div></div>
 <p>The automatic copying of config files can be toggled by setting the
 environment variable <code class="varname">PKG_CONFIG</code> prior to package
 installation.</p>
@@ -5231,10 +5273,10 @@ installation.</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="rcd-scripts"></a>15.3.�System startup scripts</h2></div></div></div>
+<a name="rcd-scripts"></a>17.3.�System startup scripts</h2></div></div></div>
 <p>System startup scripts are special files because they must be
 installed in a place known by the underlying OS, usually outside the
-installation prefix.  Therefore, the same rules described in <a class="xref" href="#files-and-dirs-outside-prefix" title="15.1.�Files and directories outside the installation prefix">Section�15.1, 
&#8220;Files and directories outside the installation prefix&#8221;</a> apply, and the same solutions
+installation prefix.  Therefore, the same rules described in <a class="xref" href="#files-and-dirs-outside-prefix" title="17.1.�Files and directories outside the installation prefix">Section�17.1, 
&#8220;Files and directories outside the installation prefix&#8221;</a> apply, and the same solutions
 can be used.  However, pkginstall provides a special mechanism to handle
 these files.</p>
 <p>In order to provide system startup scripts, the package has
@@ -5269,7 +5311,7 @@ script in an automated fashion:</p>
 </ol></div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="rcd-scripts-disable"></a>15.3.1.�Disabling handling of system startup scripts</h3></div></div></div>
+<a name="rcd-scripts-disable"></a>17.3.1.�Disabling handling of system startup scripts</h3></div></div></div>
 <p>The automatic copying of config files can be toggled by setting the
 environment variable <code class="varname">PKG_RCD_SCRIPTS</code> prior to package
 installation.  Note that the scripts will be always copied inside the
@@ -5279,7 +5321,7 @@ matter what the value of this variable i
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="users-and-groups"></a>15.4.�System users and groups</h2></div></div></div>
+<a name="users-and-groups"></a>17.4.�System users and groups</h2></div></div></div>
 <p>If a package needs to create special users and/or groups during
 installation, it can do so by using the pkginstall framework.</p>
 <p>Users can be created by adding entries to the
@@ -5317,7 +5359,7 @@ final installation scripts.</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="shells"></a>15.5.�System shells</h2></div></div></div>
+<a name="shells"></a>17.5.�System shells</h2></div></div></div>
 <p>Packages that install system shells should register them in the shell
 database, <code class="filename">/etc/shells</code>, to make things easier to the
 administrator.  This must be done from the installation scripts to keep
@@ -5332,7 +5374,7 @@ PKG_SHELL=      ${PREFIX}/bin/zsh
 </pre>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="shells-disable"></a>15.5.1.�Disabling shell registration</h3></div></div></div>
+<a name="shells-disable"></a>17.5.1.�Disabling shell registration</h3></div></div></div>
 <p>The automatic registration of shell interpreters can be disabled by
 the administrator by setting the <code class="filename">PKG_REGISTER_SHELLS</code>
 environment variable to <code class="literal">NO</code>.</p>
@@ -5340,7 +5382,7 @@ environment variable to <code class="lit
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="fonts"></a>15.6.�Fonts</h2></div></div></div>
+<a name="fonts"></a>17.6.�Fonts</h2></div></div></div>
 <p>Packages that install X11 fonts should update the database files
 that index the fonts within each fonts directory.  This can easily be
 accomplished within the pkginstall framework.</p>
@@ -5358,7 +5400,7 @@ FONTS_DIRS.ttf= ${PREFIX}/share/fonts/X1
 </pre>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="fonts-disable"></a>15.6.1.�Disabling automatic update of the fonts databases</h3></div></div></div>
+<a name="fonts-disable"></a>17.6.1.�Disabling automatic update of the fonts databases</h3></div></div></div>
 <p>The automatic update of fonts databases can be disabled by
 the administrator by setting the <code class="filename">PKG_UPDATE_FONTS_DB</code>
 environment variable to <code class="literal">NO</code>.</p>
@@ -5367,14 +5409,14 @@ environment variable to <code class="lit
 </div>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="options"></a>Chapter�16.�Options handling</h2></div></div></div>
+<a name="options"></a>Chapter�18.�Options handling</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="sect1"><a href="#global-default-options">16.1. Global default options</a></span></dt>
-<dt><span class="sect1"><a href="#converting-to-options">16.2. Converting packages to use <code class="filename">bsd.options.mk</code></a></span></dt>
-<dt><span class="sect1"><a href="#option-names">16.3. Option Names</a></span></dt>
-<dt><span class="sect1"><a href="#option-build">16.4. Determining the options of dependencies</a></span></dt>
+<dt><span class="sect1"><a href="#global-default-options">18.1. Global default options</a></span></dt>
+<dt><span class="sect1"><a href="#converting-to-options">18.2. Converting packages to use <code class="filename">bsd.options.mk</code></a></span></dt>
+<dt><span class="sect1"><a href="#option-names">18.3. Option Names</a></span></dt>
+<dt><span class="sect1"><a href="#option-build">18.4. Determining the options of dependencies</a></span></dt>
 </dl>
 </div>
 <p>Many packages have the ability to be built to support different
@@ -5413,7 +5455,7 @@ that depend on non-free dependencies (es
 almost always be split if feasible.</p>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="global-default-options"></a>16.1.�Global default options</h2></div></div></div>
+<a name="global-default-options"></a>18.1.�Global default options</h2></div></div></div>
 <p>Global default options are listed in
 <code class="varname">PKG_DEFAULT_OPTIONS</code>, which is a list of the options
 that should be built into every package if that option is supported.
@@ -5421,7 +5463,7 @@ This variable should be set in <a class=
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="converting-to-options"></a>16.2.�Converting packages to use <code class="filename">bsd.options.mk</code>
+<a name="converting-to-options"></a>18.2.�Converting packages to use <code class="filename">bsd.options.mk</code>
 </h2></div></div></div>
 <p>The following example shows how
 <code class="filename">bsd.options.mk</code> should be used
@@ -5560,7 +5602,7 @@ whether it is listed in <code class="var
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="option-names"></a>16.3.�Option Names</h2></div></div></div>
+<a name="option-names"></a>18.3.�Option Names</h2></div></div></div>
 <p>Options that enable similar features in different packages (like
 optional support for a library) should use a common name in all
 packages that support it (like the name of the library).  If another
@@ -5584,7 +5626,7 @@ support.</span>&#8221;</span> The file i
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="option-build"></a>16.4.�Determining the options of dependencies</h2></div></div></div>
+<a name="option-build"></a>18.4.�Determining the options of dependencies</h2></div></div></div>
 <p>When writing <a class="link" href="#buildlink3.mk"><code class="filename">buildlink3.mk</code></a> files, it is often necessary to list
 different dependencies based on the options with which the package was
 built. For querying these options, the file
@@ -5608,36 +5650,36 @@ details.</p>
 </div>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="build"></a>Chapter�17.�The build process</h2></div></div></div>
+<a name="build"></a>Chapter�19.�The build process</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="sect1"><a href="#build.intro">17.1. Introduction</a></span></dt>
-<dt><span class="sect1"><a href="#build.prefix">17.2. Program location</a></span></dt>
-<dt><span class="sect1"><a href="#build.builddirs">17.3. Directories used during the build process</a></span></dt>
-<dt><span class="sect1"><a href="#build.running">17.4. Running a phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.fetch">17.5. The <span class="emphasis"><em>fetch</em></span> phase</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#build.fetch.what">17.5.1. What to fetch and where to get it from</a></span></dt>
-<dt><span class="sect2"><a href="#build.fetch.how">17.5.2. How are the files fetched?</a></span></dt>
-</dl></dd>
-<dt><span class="sect1"><a href="#build.checksum">17.6. The <span class="emphasis"><em>checksum</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.extract">17.7. The <span class="emphasis"><em>extract</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.patch">17.8. The <span class="emphasis"><em>patch</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.tools">17.9. The <span class="emphasis"><em>tools</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.wrapper">17.10. The <span class="emphasis"><em>wrapper</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.configure">17.11. The <span class="emphasis"><em>configure</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.build">17.12. The <span class="emphasis"><em>build</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.test">17.13. The <span class="emphasis"><em>test</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.install">17.14. The <span class="emphasis"><em>install</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.package">17.15. The <span class="emphasis"><em>package</em></span> phase</a></span></dt>
-<dt><span class="sect1"><a href="#build.clean">17.16. Cleaning up</a></span></dt>
-<dt><span class="sect1"><a href="#build.helpful-targets">17.17. Other helpful targets</a></span></dt>
+<dt><span class="sect1"><a href="#build.intro">19.1. Introduction</a></span></dt>
+<dt><span class="sect1"><a href="#build.prefix">19.2. Program location</a></span></dt>
+<dt><span class="sect1"><a href="#build.builddirs">19.3. Directories used during the build process</a></span></dt>
+<dt><span class="sect1"><a href="#build.running">19.4. Running a phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.fetch">19.5. The <span class="emphasis"><em>fetch</em></span> phase</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#build.fetch.what">19.5.1. What to fetch and where to get it from</a></span></dt>
+<dt><span class="sect2"><a href="#build.fetch.how">19.5.2. How are the files fetched?</a></span></dt>
+</dl></dd>
+<dt><span class="sect1"><a href="#build.checksum">19.6. The <span class="emphasis"><em>checksum</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.extract">19.7. The <span class="emphasis"><em>extract</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.patch">19.8. The <span class="emphasis"><em>patch</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.tools">19.9. The <span class="emphasis"><em>tools</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.wrapper">19.10. The <span class="emphasis"><em>wrapper</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.configure">19.11. The <span class="emphasis"><em>configure</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.build">19.12. The <span class="emphasis"><em>build</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.test">19.13. The <span class="emphasis"><em>test</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.install">19.14. The <span class="emphasis"><em>install</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.package">19.15. The <span class="emphasis"><em>package</em></span> phase</a></span></dt>
+<dt><span class="sect1"><a href="#build.clean">19.16. Cleaning up</a></span></dt>
+<dt><span class="sect1"><a href="#build.helpful-targets">19.17. Other helpful targets</a></span></dt>
 </dl>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="build.intro"></a>17.1.�Introduction</h2></div></div></div>
+<a name="build.intro"></a>19.1.�Introduction</h2></div></div></div>
 <p>This chapter gives a detailed description on how a package is
     built. Building a package is separated into different
     <span class="emphasis"><em>phases</em></span> (for example <code class="varname">fetch</code>,
@@ -5664,7 +5706,7 @@ details.</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="build.prefix"></a>17.2.�Program location</h2></div></div></div>
+<a name="build.prefix"></a>19.2.�Program location</h2></div></div></div>
 <p>Before outlining the process performed by the NetBSD package system in
     the next section, here's a brief discussion on where programs are
     installed, and which variables influence this.</p>
@@ -5675,7 +5717,7 @@ details.</p>
     for pkgs in the <code class="filename">cross</code> category.  The value of
     <code class="varname">PREFIX</code> needs to be put
     into the various places in the program's source where paths to
-    these files are encoded.  See <a class="xref" href="#components.patches" title="11.3.�patches/*">Section�11.3, &#8220;<code class="filename">patches/*</code>&#8221;</a> and <a class="xref" 
href="#fixes.libtool" title="19.3.1.�Shared libraries - libtool">Section�19.3.1, &#8220;Shared libraries - libtool&#8221;</a> for more details.</p>
+    these files are encoded.  See <a class="xref" href="#components.patches" title="13.3.�patches/*">Section�13.3, &#8220;<code class="filename">patches/*</code>&#8221;</a> and <a class="xref" 
href="#fixes.libtool" title="21.3.1.�Shared libraries - libtool">Section�21.3.1, &#8220;Shared libraries - libtool&#8221;</a> for more details.</p>
 <p>When choosing which of these variables to use,
     follow the following rules:</p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
@@ -5706,7 +5748,7 @@ details.</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="build.builddirs"></a>17.3.�Directories used during the build process</h2></div></div></div>
+<a name="build.builddirs"></a>19.3.�Directories used during the build process</h2></div></div></div>
 <p>When building a package, various directories are used to store
     source files, temporary files, pkgsrc-internal files, and so on. These
     directories are explained here.</p>
@@ -5751,7 +5793,7 @@ details.</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="build.running"></a>17.4.�Running a phase</h2></div></div></div>
+<a name="build.running"></a>19.4.�Running a phase</h2></div></div></div>
 <p>You can run a particular phase by typing <span class="command"><strong>make
     phase</strong></span>, where <span class="emphasis"><em>phase</em></span> is the name of the
     phase. This will automatically run all phases that are required for this
@@ -5761,14 +5803,14 @@ details.</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="build.fetch"></a>17.5.�The <span class="emphasis"><em>fetch</em></span> phase</h2></div></div></div>
+<a name="build.fetch"></a>19.5.�The <span class="emphasis"><em>fetch</em></span> phase</h2></div></div></div>
 <p>The first step in building a package is to fetch the
     distribution files (distfiles) from the sites that are providing
     them. This is the task of the <span class="emphasis"><em>fetch</em></span>
     phase.</p>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="build.fetch.what"></a>17.5.1.�What to fetch and where to get it from</h3></div></div></div>
+<a name="build.fetch.what"></a>19.5.1.�What to fetch and where to get it from</h3></div></div></div>
 <p>In simple cases, <code class="varname">MASTER_SITES</code>
       defines all URLs from where the distfile, whose name is
       derived from the <code class="varname">DISTNAME</code> variable, is
@@ -5885,7 +5927,7 @@ MASTER_SITES=   ${MASTER_SITE_SOURCEFORG
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="build.fetch.how"></a>17.5.2.�How are the files fetched?</h3></div></div></div>
+<a name="build.fetch.how"></a>19.5.2.�How are the files fetched?</h3></div></div></div>
 <p>The <span class="emphasis"><em>fetch</em></span> phase makes sure that
       all the distfiles exist in a local directory
       (<code class="varname">DISTDIR</code>, which can be set by the pkgsrc
@@ -5919,7 +5961,7 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="build.checksum"></a>17.6.�The <span class="emphasis"><em>checksum</em></span> phase</h2></div></div></div>
+<a name="build.checksum"></a>19.6.�The <span class="emphasis"><em>checksum</em></span> phase</h2></div></div></div>
 <p>After the distfile(s) are fetched, their checksum is
     generated and compared with the checksums stored in the
     distinfo file. If the checksums don't match, the build is
@@ -5930,7 +5972,7 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="build.extract"></a>17.7.�The <span class="emphasis"><em>extract</em></span> phase</h2></div></div></div>
+<a name="build.extract"></a>19.7.�The <span class="emphasis"><em>extract</em></span> phase</h2></div></div></div>
 <p>When the distfiles are present on the local system, they
     need to be extracted, as they usually come in the form of some
     compressed archive format.</p>
@@ -5970,7 +6012,7 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="build.patch"></a>17.8.�The <span class="emphasis"><em>patch</em></span> phase</h2></div></div></div>
+<a name="build.patch"></a>19.8.�The <span class="emphasis"><em>patch</em></span> phase</h2></div></div></div>
 <p>After extraction, all the patches named by the
     <code class="varname">PATCHFILES</code>, those present in the patches
     subdirectory of the package as well as in
@@ -5981,7 +6023,7 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
     applied, files ending in <code class="filename">.orig</code> or
     <code class="filename">.rej</code> are ignored. Any special options to
     <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?patch+1.i386+NetBSD-8.0";><span class="citerefentry"><span class="refentrytitle">patch</span>(1)</span></a> can be handed in
-    <code class="varname">PATCH_DIST_ARGS</code>.  See <a class="xref" href="#components.patches" title="11.3.�patches/*">Section�11.3, &#8220;<code class="filename">patches/*</code>&#8221;</a> for 
more details.</p>
+    <code class="varname">PATCH_DIST_ARGS</code>.  See <a class="xref" href="#components.patches" title="13.3.�patches/*">Section�13.3, &#8220;<code class="filename">patches/*</code>&#8221;</a> for 
more details.</p>
 <p>By default <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?patch+1.i386+NetBSD-8.0";><span class="citerefentry"><span class="refentrytitle">patch</span>(1)</span></a> is given 
special args to make
     it fail if the patches apply with some lines of fuzz. Please
     fix (regen) the patches so that they apply cleanly. The
@@ -5991,13 +6033,13 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="build.tools"></a>17.9.�The <span class="emphasis"><em>tools</em></span> phase</h2></div></div></div>
-<p>This is covered in <a class="xref" href="#tools" title="Chapter�18.�Tools needed for building or running">Chapter�18, <i>Tools needed for building or running</i></a>.
+<a name="build.tools"></a>19.9.�The <span class="emphasis"><em>tools</em></span> phase</h2></div></div></div>
+<p>This is covered in <a class="xref" href="#tools" title="Chapter�20.�Tools needed for building or running">Chapter�20, <i>Tools needed for building or running</i></a>.
     </p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="build.wrapper"></a>17.10.�The <span class="emphasis"><em>wrapper</em></span> phase</h2></div></div></div>
+<a name="build.wrapper"></a>19.10.�The <span class="emphasis"><em>wrapper</em></span> phase</h2></div></div></div>
 <p>This phase creates wrapper programs for the compilers and
     linkers. The following variables can be used to tweak the
     wrappers.</p>
@@ -6035,7 +6077,7 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="build.configure"></a>17.11.�The <span class="emphasis"><em>configure</em></span> phase</h2></div></div></div>
+<a name="build.configure"></a>19.11.�The <span class="emphasis"><em>configure</em></span> phase</h2></div></div></div>
 <p>Most pieces of software need information on the header
     files, system calls, and library routines which are available
     on the platform they run on. The process of determining this
@@ -6093,7 +6135,7 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="build.build"></a>17.12.�The <span class="emphasis"><em>build</em></span> phase</h2></div></div></div>
+<a name="build.build"></a>19.12.�The <span class="emphasis"><em>build</em></span> phase</h2></div></div></div>
 <p>For building a package, a rough equivalent of the
     following code is executed.</p>
 <pre class="programlisting">
@@ -6128,12 +6170,12 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="build.test"></a>17.13.�The <span class="emphasis"><em>test</em></span> phase</h2></div></div></div>
+<a name="build.test"></a>19.13.�The <span class="emphasis"><em>test</em></span> phase</h2></div></div></div>
 <p>[TODO]</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="build.install"></a>17.14.�The <span class="emphasis"><em>install</em></span> phase</h2></div></div></div>
+<a name="build.install"></a>19.14.�The <span class="emphasis"><em>install</em></span> phase</h2></div></div></div>
 <p>Once the build stage has completed, the final step is to
     install the software in public directories, so users can
     access the programs and files.</p>
@@ -6226,7 +6268,7 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="build.package"></a>17.15.�The <span class="emphasis"><em>package</em></span> phase</h2></div></div></div>
+<a name="build.package"></a>19.15.�The <span class="emphasis"><em>package</em></span> phase</h2></div></div></div>
 <p>Once the install stage has completed, a binary package of
     the installed files can be built.  These binary packages can be
     used for quick installation without previous compilation, e.g. by
@@ -6241,7 +6283,7 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="build.clean"></a>17.16.�Cleaning up</h2></div></div></div>
+<a name="build.clean"></a>19.16.�Cleaning up</h2></div></div></div>
 <p>Once you're finished with a package, you can clean the work
     directory by running <span class="command"><strong>make clean</strong></span>.  If you want
     to clean the work directories of all dependencies too, use
@@ -6249,7 +6291,7 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="build.helpful-targets"></a>17.17.�Other helpful targets</h2></div></div></div>
+<a name="build.helpful-targets"></a>19.17.�Other helpful targets</h2></div></div></div>
 <div class="variablelist"><dl class="variablelist">
 <dt><span class="term">pre/post-*</span></dt>
 <dd><p>For any of the main targets described in the
@@ -6573,7 +6615,7 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
          <code class="filename">PLIST</code>, as the <span class="quote">&#8220;<span class="quote">find
          -newer</span>&#8221;</span> command used by this target won't catch
          them!</p>
-<p>See <a class="xref" href="#print-PLIST" title="13.3.�Tweaking output of make print-PLIST">Section�13.3, &#8220;Tweaking output of <span class="command"><strong>make 
print-PLIST</strong></span>&#8221;</a> for more
+<p>See <a class="xref" href="#print-PLIST" title="15.3.�Tweaking output of make print-PLIST">Section�15.3, &#8220;Tweaking output of <span class="command"><strong>make 
print-PLIST</strong></span>&#8221;</a> for more
          information on this target.</p>
 </dd>
 <dt><span class="term">bulk-package</span></dt>
@@ -6582,7 +6624,7 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
          package already exists, no action is taken. If not, this
          target will compile, install and package it (and its
          depends, if <code class="varname">PKG_DEPENDS</code> is set
-         properly. See <a class="xref" href="#bulk" title="Chapter�7.�Creating binary packages for everything in pkgsrc (bulk builds)">Chapter�7, <i>Creating binary packages for everything in pkgsrc 
(bulk
+         properly. See <a class="xref" href="#bulk" title="Chapter�8.�Creating binary packages for everything in pkgsrc (bulk builds)">Chapter�8, <i>Creating binary packages for everything in pkgsrc 
(bulk
 builds)</i></a>).
          After creating the binary package, the sources, the
          just-installed package and its required packages are
@@ -6615,13 +6657,13 @@ builds)</i></a>).
 </div>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="tools"></a>Chapter�18.�Tools needed for building or running</h2></div></div></div>
+<a name="tools"></a>Chapter�20.�Tools needed for building or running</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="sect1"><a href="#pkgsrc-tools">18.1. Tools for pkgsrc builds</a></span></dt>
-<dt><span class="sect1"><a href="#package-tools">18.2. Tools needed by packages</a></span></dt>
-<dt><span class="sect1"><a href="#platform-tools">18.3. Tools provided by platforms</a></span></dt>
+<dt><span class="sect1"><a href="#pkgsrc-tools">20.1. Tools for pkgsrc builds</a></span></dt>
+<dt><span class="sect1"><a href="#package-tools">20.2. Tools needed by packages</a></span></dt>
+<dt><span class="sect1"><a href="#platform-tools">20.3. Tools provided by platforms</a></span></dt>
 </dl>
 </div>
 <p>The <code class="varname">USE_TOOLS</code> definition is used both internally
@@ -6645,7 +6687,7 @@ yacc) or a better sed.</p>
 <span class="command"><strong>make show-tools</strong></span>.</p>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="pkgsrc-tools"></a>18.1.�Tools for pkgsrc builds</h2></div></div></div>
+<a name="pkgsrc-tools"></a>20.1.�Tools for pkgsrc builds</h2></div></div></div>
 <p>The default set of tools used by pkgsrc is defined in
 <code class="filename">bsd.pkg.mk</code>. This includes standard Unix tools,
 such as: <span class="command"><strong>cat</strong></span>, <span class="command"><strong>awk</strong></span>,
@@ -6658,7 +6700,7 @@ to define the tools needed.</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="package-tools"></a>18.2.�Tools needed by packages</h2></div></div></div>
+<a name="package-tools"></a>20.2.�Tools needed by packages</h2></div></div></div>
 <p>In the following examples, the :run means that it is needed at
 run-time (and becomes a DEPENDS).
 The default is a build dependency which can be set with
@@ -6678,7 +6720,7 @@ tool at run-time, then just use <code cl
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="platform-tools"></a>18.3.�Tools provided by platforms</h2></div></div></div>
+<a name="platform-tools"></a>20.3.�Tools provided by platforms</h2></div></div></div>
 <p>When improving or porting pkgsrc to a new platform, have a look
 at (or create) the corresponding platform specific make file fragment under
 <code class="filename">pkgsrc/mk/tools/tools.${OPSYS}.mk</code> which defines
@@ -6696,81 +6738,81 @@ TOOLS_PLATFORM.true?=           true    
 </div>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="fixes"></a>Chapter�19.�Making your package work</h2></div></div></div>
+<a name="fixes"></a>Chapter�21.�Making your package work</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="sect1"><a href="#general-operation">19.1. General operation</a></span></dt>
+<dt><span class="sect1"><a href="#general-operation">21.1. General operation</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#pulling-vars-from-etc-mk.conf">19.1.1. How to pull in user-settable variables from <code class="filename">mk.conf</code></a></span></dt>
-<dt><span class="sect2"><a href="#user-interaction">19.1.2. User interaction</a></span></dt>
-<dt><span class="sect2"><a href="#handling-licenses">19.1.3. Handling licenses</a></span></dt>
-<dt><span class="sect2"><a href="#restricted-packages">19.1.4. Restricted packages</a></span></dt>
-<dt><span class="sect2"><a href="#dependencies">19.1.5. Handling dependencies</a></span></dt>
-<dt><span class="sect2"><a href="#conflicts">19.1.6. Handling conflicts with other packages</a></span></dt>
-<dt><span class="sect2"><a href="#not-building-packages">19.1.7. Packages that cannot or should not be built</a></span></dt>
-<dt><span class="sect2"><a href="#undeletable-packages">19.1.8. Packages which should not be deleted, once installed</a></span></dt>
-<dt><span class="sect2"><a href="#security-handling">19.1.9. Handling packages with security problems</a></span></dt>
-<dt><span class="sect2"><a href="#bumping-pkgrevision">19.1.10. How to handle incrementing versions when fixing an existing package</a></span></dt>
-<dt><span class="sect2"><a href="#fixes.subst">19.1.11. Substituting variable text in the package files (the SUBST framework)</a></span></dt>
-</dl></dd>
-<dt><span class="sect1"><a href="#fixes.fetch">19.2. The <span class="emphasis"><em>fetch</em></span> phase</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#no-plain-download">19.2.1. Packages whose distfiles aren't available for plain downloading</a></span></dt>
-<dt><span class="sect2"><a href="#modified-distfiles-same-name">19.2.2. How to handle modified distfiles with the 'old' name</a></span></dt>
-<dt><span class="sect2"><a href="#build.fetch.github">19.2.3. Packages hosted on github.com</a></span></dt>
-</dl></dd>
-<dt><span class="sect1"><a href="#fixes.configure">19.3. The <span class="emphasis"><em>configure</em></span> phase</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#fixes.libtool">19.3.1. Shared libraries - libtool</a></span></dt>
-<dt><span class="sect2"><a href="#using-libtool">19.3.2. Using libtool on GNU packages that already support libtool</a></span></dt>
-<dt><span class="sect2"><a href="#autoconf-automake">19.3.3. GNU Autoconf/Automake</a></span></dt>
-</dl></dd>
-<dt><span class="sect1"><a href="#programming-languages">19.4. Programming languages</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#basic-programming-languages">19.4.1. C, C++, and Fortran</a></span></dt>
-<dt><span class="sect2"><a href="#java-programming-language">19.4.2. Java</a></span></dt>
-<dt><span class="sect2"><a href="#perl-scripts">19.4.3. Packages containing perl scripts</a></span></dt>
-<dt><span class="sect2"><a href="#shell-scripts">19.4.4. Packages containing shell scripts</a></span></dt>
-<dt><span class="sect2"><a href="#other-programming-languages">19.4.5. Other programming languages</a></span></dt>
-</dl></dd>
-<dt><span class="sect1"><a href="#fixes.build">19.5. The <span class="emphasis"><em>build</em></span> phase</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#fixes.build.cpp">19.5.1. Compiling C and C++ code conditionally</a></span></dt>
-<dt><span class="sect2"><a href="#compiler-bugs">19.5.2. How to handle compiler bugs</a></span></dt>
-<dt><span class="sect2"><a href="#undefined-reference">19.5.3. Undefined reference to <span class="quote">&#8220;<span class="quote">...</span>&#8221;</span></a></span></dt>
-<dt><span class="sect2"><a href="#out-of-memory">19.5.4. Running out of memory</a></span></dt>
-</dl></dd>
-<dt><span class="sect1"><a href="#fixes.install">19.6. The <span class="emphasis"><em>install</em></span> phase</a></span></dt>
-<dd><dl>
-<dt><span class="sect2"><a href="#install-scripts">19.6.1. Creating needed directories</a></span></dt>
-<dt><span class="sect2"><a href="#where-to-install-documentation">19.6.2. Where to install documentation</a></span></dt>
-<dt><span class="sect2"><a href="#installing-score-files">19.6.3. Installing highscore files</a></span></dt>
-<dt><span class="sect2"><a href="#destdir-support">19.6.4. Adding DESTDIR support to packages</a></span></dt>
-<dt><span class="sect2"><a href="#hardcoded-paths">19.6.5. Packages with hardcoded paths to other interpreters</a></span></dt>
-<dt><span class="sect2"><a href="#perl-modules">19.6.6. Packages installing perl modules</a></span></dt>
-<dt><span class="sect2"><a href="#faq.info-files">19.6.7. Packages installing info files</a></span></dt>
-<dt><span class="sect2"><a href="#manpages">19.6.8. Packages installing man pages</a></span></dt>
-<dt><span class="sect2"><a href="#gconf-data-files">19.6.9. Packages installing GConf data files</a></span></dt>
-<dt><span class="sect2"><a href="#scrollkeeper-data-files">19.6.10. Packages installing scrollkeeper/rarian data files</a></span></dt>
-<dt><span class="sect2"><a href="#x11-fonts">19.6.11. Packages installing X11 fonts</a></span></dt>
-<dt><span class="sect2"><a href="#gtk2-modules">19.6.12. Packages installing GTK2 modules</a></span></dt>
-<dt><span class="sect2"><a href="#sgml-xml-data">19.6.13. Packages installing SGML or XML data</a></span></dt>
-<dt><span class="sect2"><a href="#mime-database">19.6.14. Packages installing extensions to the MIME database</a></span></dt>
-<dt><span class="sect2"><a href="#intltool">19.6.15. Packages using intltool</a></span></dt>
-<dt><span class="sect2"><a href="#startup-scripts">19.6.16. Packages installing startup scripts</a></span></dt>
-<dt><span class="sect2"><a href="#tex-packages">19.6.17. Packages installing TeX modules</a></span></dt>
-<dt><span class="sect2"><a href="#emulation-packages">19.6.18. Packages supporting running binaries in
+<dt><span class="sect2"><a href="#pulling-vars-from-etc-mk.conf">21.1.1. How to pull in user-settable variables from <code class="filename">mk.conf</code></a></span></dt>
+<dt><span class="sect2"><a href="#user-interaction">21.1.2. User interaction</a></span></dt>
+<dt><span class="sect2"><a href="#handling-licenses">21.1.3. Handling licenses</a></span></dt>
+<dt><span class="sect2"><a href="#restricted-packages">21.1.4. Restricted packages</a></span></dt>
+<dt><span class="sect2"><a href="#dependencies">21.1.5. Handling dependencies</a></span></dt>
+<dt><span class="sect2"><a href="#conflicts">21.1.6. Handling conflicts with other packages</a></span></dt>
+<dt><span class="sect2"><a href="#not-building-packages">21.1.7. Packages that cannot or should not be built</a></span></dt>
+<dt><span class="sect2"><a href="#undeletable-packages">21.1.8. Packages which should not be deleted, once installed</a></span></dt>
+<dt><span class="sect2"><a href="#security-handling">21.1.9. Handling packages with security problems</a></span></dt>
+<dt><span class="sect2"><a href="#bumping-pkgrevision">21.1.10. How to handle incrementing versions when fixing an existing package</a></span></dt>
+<dt><span class="sect2"><a href="#fixes.subst">21.1.11. Substituting variable text in the package files (the SUBST framework)</a></span></dt>
+</dl></dd>
+<dt><span class="sect1"><a href="#fixes.fetch">21.2. The <span class="emphasis"><em>fetch</em></span> phase</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#no-plain-download">21.2.1. Packages whose distfiles aren't available for plain downloading</a></span></dt>
+<dt><span class="sect2"><a href="#modified-distfiles-same-name">21.2.2. How to handle modified distfiles with the 'old' name</a></span></dt>
+<dt><span class="sect2"><a href="#build.fetch.github">21.2.3. Packages hosted on github.com</a></span></dt>
+</dl></dd>
+<dt><span class="sect1"><a href="#fixes.configure">21.3. The <span class="emphasis"><em>configure</em></span> phase</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#fixes.libtool">21.3.1. Shared libraries - libtool</a></span></dt>
+<dt><span class="sect2"><a href="#using-libtool">21.3.2. Using libtool on GNU packages that already support libtool</a></span></dt>
+<dt><span class="sect2"><a href="#autoconf-automake">21.3.3. GNU Autoconf/Automake</a></span></dt>
+</dl></dd>
+<dt><span class="sect1"><a href="#programming-languages">21.4. Programming languages</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#basic-programming-languages">21.4.1. C, C++, and Fortran</a></span></dt>
+<dt><span class="sect2"><a href="#java-programming-language">21.4.2. Java</a></span></dt>
+<dt><span class="sect2"><a href="#perl-scripts">21.4.3. Packages containing perl scripts</a></span></dt>
+<dt><span class="sect2"><a href="#shell-scripts">21.4.4. Packages containing shell scripts</a></span></dt>
+<dt><span class="sect2"><a href="#other-programming-languages">21.4.5. Other programming languages</a></span></dt>
+</dl></dd>
+<dt><span class="sect1"><a href="#fixes.build">21.5. The <span class="emphasis"><em>build</em></span> phase</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#fixes.build.cpp">21.5.1. Compiling C and C++ code conditionally</a></span></dt>
+<dt><span class="sect2"><a href="#compiler-bugs">21.5.2. How to handle compiler bugs</a></span></dt>
+<dt><span class="sect2"><a href="#undefined-reference">21.5.3. Undefined reference to <span class="quote">&#8220;<span class="quote">...</span>&#8221;</span></a></span></dt>
+<dt><span class="sect2"><a href="#out-of-memory">21.5.4. Running out of memory</a></span></dt>
+</dl></dd>
+<dt><span class="sect1"><a href="#fixes.install">21.6. The <span class="emphasis"><em>install</em></span> phase</a></span></dt>
+<dd><dl>
+<dt><span class="sect2"><a href="#install-scripts">21.6.1. Creating needed directories</a></span></dt>
+<dt><span class="sect2"><a href="#where-to-install-documentation">21.6.2. Where to install documentation</a></span></dt>
+<dt><span class="sect2"><a href="#installing-score-files">21.6.3. Installing highscore files</a></span></dt>
+<dt><span class="sect2"><a href="#destdir-support">21.6.4. Adding DESTDIR support to packages</a></span></dt>
+<dt><span class="sect2"><a href="#hardcoded-paths">21.6.5. Packages with hardcoded paths to other interpreters</a></span></dt>
+<dt><span class="sect2"><a href="#perl-modules">21.6.6. Packages installing perl modules</a></span></dt>
+<dt><span class="sect2"><a href="#faq.info-files">21.6.7. Packages installing info files</a></span></dt>
+<dt><span class="sect2"><a href="#manpages">21.6.8. Packages installing man pages</a></span></dt>
+<dt><span class="sect2"><a href="#gconf-data-files">21.6.9. Packages installing GConf data files</a></span></dt>
+<dt><span class="sect2"><a href="#scrollkeeper-data-files">21.6.10. Packages installing scrollkeeper/rarian data files</a></span></dt>
+<dt><span class="sect2"><a href="#x11-fonts">21.6.11. Packages installing X11 fonts</a></span></dt>
+<dt><span class="sect2"><a href="#gtk2-modules">21.6.12. Packages installing GTK2 modules</a></span></dt>
+<dt><span class="sect2"><a href="#sgml-xml-data">21.6.13. Packages installing SGML or XML data</a></span></dt>
+<dt><span class="sect2"><a href="#mime-database">21.6.14. Packages installing extensions to the MIME database</a></span></dt>
+<dt><span class="sect2"><a href="#intltool">21.6.15. Packages using intltool</a></span></dt>
+<dt><span class="sect2"><a href="#startup-scripts">21.6.16. Packages installing startup scripts</a></span></dt>
+<dt><span class="sect2"><a href="#tex-packages">21.6.17. Packages installing TeX modules</a></span></dt>
+<dt><span class="sect2"><a href="#emulation-packages">21.6.18. Packages supporting running binaries in
     emulation</a></span></dt>
-<dt><span class="sect2"><a href="#hicolor-theme">19.6.19. Packages installing hicolor theme icons</a></span></dt>
-<dt><span class="sect2"><a href="#desktop-files">19.6.20. Packages installing desktop files</a></span></dt>
+<dt><span class="sect2"><a href="#hicolor-theme">21.6.19. Packages installing hicolor theme icons</a></span></dt>
+<dt><span class="sect2"><a href="#desktop-files">21.6.20. Packages installing desktop files</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#punting">19.7. Marking packages as having problems</a></span></dt>
+<dt><span class="sect1"><a href="#punting">21.7. Marking packages as having problems</a></span></dt>
 </dl>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="general-operation"></a>19.1.�General operation</h2></div></div></div>
+<a name="general-operation"></a>21.1.�General operation</h2></div></div></div>
 <p>One appealing feature of pkgsrc is that it runs on many
   different platforms. As a result, it is important to ensure,
   where possible, that packages in pkgsrc are portable. This
@@ -6778,7 +6820,7 @@ TOOLS_PLATFORM.true?=           true    
   attention to while working on pkgsrc.</p>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="pulling-vars-from-etc-mk.conf"></a>19.1.1.�How to pull in user-settable variables from <a class="link" href="#mk.conf"><code class="filename">mk.conf</code></a>
+<a name="pulling-vars-from-etc-mk.conf"></a>21.1.1.�How to pull in user-settable variables from <a class="link" href="#mk.conf"><code class="filename">mk.conf</code></a>
 </h3></div></div></div>
 <p>The pkgsrc user can configure pkgsrc by overriding several
     variables in the file pointed to by <code class="varname">MAKECONF</code>,
@@ -6806,7 +6848,7 @@ TOOLS_PLATFORM.true?=           true    
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="user-interaction"></a>19.1.2.�User interaction</h3></div></div></div>
+<a name="user-interaction"></a>21.1.2.�User interaction</h3></div></div></div>
 <p>Occasionally, packages require interaction from the user,
     and this can be in a number of ways:</p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
@@ -6831,7 +6873,7 @@ INTERACTIVE_STAGE=      configure instal
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="handling-licenses"></a>19.1.3.�Handling licenses</h3></div></div></div>
+<a name="handling-licenses"></a>21.1.3.�Handling licenses</h3></div></div></div>
 <p>Authors of software can choose the licence under which software
     can be copied.  The Free Software Foundation has declared some
     licenses "Free", and the Open Source Initiative has a definition of
@@ -6894,7 +6936,7 @@ ACCEPTABLE_LICENSES+=xv-license
     tag.</p>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="new-license"></a>19.1.3.1.�Adding a package with a new license</h4></div></div></div>
+<a name="new-license"></a>21.1.3.1.�Adding a package with a new license</h4></div></div></div>
 <p>When adding a package with a new license, the following steps
     are required:</p>
 <div class="orderedlist"><ol class="orderedlist" type="1">
@@ -6916,7 +6958,7 @@ ACCEPTABLE_LICENSES+=xv-license
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="change-license"></a>19.1.3.2.�Change to the license</h4></div></div></div>
+<a name="change-license"></a>21.1.3.2.�Change to the license</h4></div></div></div>
 <p>When the license changes (in a way other than formatting),
     make sure that the new license has a different name (e.g.,
     append the version number if it exists, or the date).  Just
@@ -6930,7 +6972,7 @@ ACCEPTABLE_LICENSES+=xv-license
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="restricted-packages"></a>19.1.4.�Restricted packages</h3></div></div></div>
+<a name="restricted-packages"></a>21.1.4.�Restricted packages</h3></div></div></div>
 <p>Some licenses restrict how software may be re-distributed.
     By declaring the restrictions, package tools can
     automatically refrain from e.g. placing binary packages on FTP
@@ -6999,7 +7041,7 @@ ACCEPTABLE_LICENSES+=xv-license
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="dependencies"></a>19.1.5.�Handling dependencies</h3></div></div></div>
+<a name="dependencies"></a>21.1.5.�Handling dependencies</h3></div></div></div>
 <p>Your package may depend on some other package being present
     - and there are various ways of expressing this dependency.
     pkgsrc supports the <code class="varname">BUILD_DEPENDS</code> and
@@ -7007,7 +7049,7 @@ ACCEPTABLE_LICENSES+=xv-license
     <code class="varname">USE_TOOLS</code> definition, as well as dependencies
     via <code class="filename">buildlink3.mk</code>, which is the preferred way
     to handle dependencies, and which uses the variables named above.
-    See <a class="xref" href="#buildlink" title="Chapter�14.�Buildlink methodology">Chapter�14, <i>Buildlink methodology</i></a> for more information.</p>
+    See <a class="xref" href="#buildlink" title="Chapter�16.�Buildlink methodology">Chapter�16, <i>Buildlink methodology</i></a> for more information.</p>
 <p>The basic difference between the two variables is as
     follows: The <code class="varname">DEPENDS</code> definition registers
     that pre-requisite in the binary package so it will be pulled in
@@ -7093,7 +7135,7 @@ DEPENDS+=       ImageMagick&gt;=6.0:../.
 <p>If you need to depend on minimum versions of libraries,
        see the buildlink section of the pkgsrc guide.</p>
 <p>For security fixes, please update the package
-       vulnerabilities file. See <a class="xref" href="#security-handling" title="19.1.9.�Handling packages with security problems">Section�19.1.9, &#8220;Handling packages with security 
problems&#8221;</a> for more
+       vulnerabilities file. See <a class="xref" href="#security-handling" title="21.1.9.�Handling packages with security problems">Section�21.1.9, &#8220;Handling packages with security 
problems&#8221;</a> for more
        information.</p>
 </li>
 </ol></div>
@@ -7106,7 +7148,7 @@ DEPENDS+=       ImageMagick&gt;=6.0:../.
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="conflicts"></a>19.1.6.�Handling conflicts with other packages</h3></div></div></div>
+<a name="conflicts"></a>21.1.6.�Handling conflicts with other packages</h3></div></div></div>
 <p>Your package may conflict with other packages a user might
     already have installed on his system, e.g. if your package
     installs the same set of files as another package in the pkgsrc
@@ -7139,7 +7181,7 @@ CONFLICTS=      libXaw3d-[0-9]*
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="not-building-packages"></a>19.1.7.�Packages that cannot or should not be built</h3></div></div></div>
+<a name="not-building-packages"></a>21.1.7.�Packages that cannot or should not be built</h3></div></div></div>
 <p>There are several reasons why a package might be
     instructed to not build under certain circumstances.  If the
     package builds and runs on most platforms, the exceptions
@@ -7178,7 +7220,7 @@ CONFLICTS=      libXaw3d-[0-9]*
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="undeletable-packages"></a>19.1.8.�Packages which should not be deleted, once installed</h3></div></div></div>
+<a name="undeletable-packages"></a>21.1.8.�Packages which should not be deleted, once installed</h3></div></div></div>
 <p>To ensure that a package may not be deleted, once it has been
     installed, the <code class="varname">PKG_PRESERVE</code> definition should
     be set in the package Makefile. This will be carried into any
@@ -7189,7 +7231,7 @@ CONFLICTS=      libXaw3d-[0-9]*
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="security-handling"></a>19.1.9.�Handling packages with security problems</h3></div></div></div>
+<a name="security-handling"></a>21.1.9.�Handling packages with security problems</h3></div></div></div>
 <p>When a vulnerability is found, this should be noted in
     <code class="filename">localsrc/security/advisories/pkg-vulnerabilities</code>,
     and after committing that file, ask pkgsrc-security%NetBSD.org@localhost to
@@ -7206,7 +7248,7 @@ CONFLICTS=      libXaw3d-[0-9]*
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="bumping-pkgrevision"></a>19.1.10.�How to handle incrementing versions when fixing an existing package</h3></div></div></div>
+<a name="bumping-pkgrevision"></a>21.1.10.�How to handle incrementing versions when fixing an existing package</h3></div></div></div>
 <p>When making fixes to an existing package it can be useful
     to change the version number in <code class="varname">PKGNAME</code>. To
     avoid conflicting with future versions by the original author, a
@@ -7267,7 +7309,7 @@ DISTNAME=       foo-17.43
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="fixes.subst"></a>19.1.11.�Substituting variable text in the package files (the SUBST framework)</h3></div></div></div>
+<a name="fixes.subst"></a>21.1.11.�Substituting variable text in the package files (the SUBST framework)</h3></div></div></div>
 <p>When you want to replace the same text in multiple files
     or when the replacement text varies, patches alone cannot help.
     This is where the SUBST framework comes in. It provides an
@@ -7327,10 +7369,10 @@ SUBST_SED.fix-paths+=           -e 's,"/
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="fixes.fetch"></a>19.2.�The <span class="emphasis"><em>fetch</em></span> phase</h2></div></div></div>
+<a name="fixes.fetch"></a>21.2.�The <span class="emphasis"><em>fetch</em></span> phase</h2></div></div></div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="no-plain-download"></a>19.2.1.�Packages whose distfiles aren't available for plain downloading</h3></div></div></div>
+<a name="no-plain-download"></a>21.2.1.�Packages whose distfiles aren't available for plain downloading</h3></div></div></div>
 <p>If you need to download from a dynamic URL you can set
     <code class="varname">DYNAMIC_MASTER_SITES</code> and a <span class="command"><strong>make
     fetch</strong></span> will call <code class="filename">files/getsite.sh</code>
@@ -7351,7 +7393,7 @@ FETCH_MESSAGE+= "manually from "${MASTER
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="modified-distfiles-same-name"></a>19.2.2.�How to handle modified distfiles with the 'old' name</h3></div></div></div>
+<a name="modified-distfiles-same-name"></a>21.2.2.�How to handle modified distfiles with the 'old' name</h3></div></div></div>
 <p>Sometimes authors of a software package make some
     modifications after the software was released, and they put up a
     new distfile without changing the package's version number. If a
@@ -7368,7 +7410,7 @@ FETCH_MESSAGE+= "manually from "${MASTER
     python or ruby packages, where <code class="varname">PKGNAME</code> includes
     a variable prefix). All <code class="varname">DISTFILES</code> and
     <code class="varname">PATCHFILES</code> for this package will be put in that
-    subdirectory of the local distfiles directory. (See <a class="xref" href="#bumping-pkgrevision" title="19.1.10.�How to handle incrementing versions when fixing an existing 
package">Section�19.1.10, &#8220;How to handle incrementing versions when fixing an existing package&#8221;</a> for more details.) In case this
+    subdirectory of the local distfiles directory. (See <a class="xref" href="#bumping-pkgrevision" title="21.1.10.�How to handle incrementing versions when fixing an existing 
package">Section�21.1.10, &#8220;How to handle incrementing versions when fixing an existing package&#8221;</a> for more details.) In case this
     happens more often, <code class="varname">PKGNAME</code> can be used (thus
     including the <code class="filename">nbX</code> suffix) or a date stamp can
     be appended, like
@@ -7384,12 +7426,12 @@ FETCH_MESSAGE+= "manually from "${MASTER
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="build.fetch.github"></a>19.2.3.�Packages hosted on github.com</h3></div></div></div>
+<a name="build.fetch.github"></a>21.2.3.�Packages hosted on github.com</h3></div></div></div>
 <p>Helper methods exist for packages hosted on github.com which will often have distfile names that clash with other packages, for example <code class="filename">1.0.tar.gz</code>. Use one of the 
three recipes from below:
     </p>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="build.fetch.github.tag"></a>19.2.3.1.�Fetch based on a tagged release</h4></div></div></div>
+<a name="build.fetch.github.tag"></a>21.2.3.1.�Fetch based on a tagged release</h4></div></div></div>
 <p>
         If your distfile URL looks similar to <code class="literal">http://github.com/username/exampleproject/archive/v1.0.zip</code>, then you are packaging a tagged release.
       </p>
@@ -7403,7 +7445,7 @@ EXTRACT_SUFX=   .zip
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="build.fetch.github.commit"></a>19.2.3.2.�Fetch based on a specific commit</h4></div></div></div>
+<a name="build.fetch.github.commit"></a>21.2.3.2.�Fetch based on a specific commit</h4></div></div></div>
 <p>
         If your distfile URL looks similar to <code class="literal">http://github.com/example/example/archive/988881adc9fc3655077dc2d4d757d480b5ea0e11.tar.gz</code>, then you are packaging a 
specific commit not tied to a release.
       </p>
@@ -7416,7 +7458,7 @@ GITHUB_TAG=     988881adc9fc3655077dc2d4
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="build.fetch.github.release"></a>19.2.3.3.�Fetch based on release</h4></div></div></div>
+<a name="build.fetch.github.release"></a>21.2.3.3.�Fetch based on release</h4></div></div></div>
 <p>
         If your distfile URL looks similar to <code class="literal">http://github.com/username/exampleproject/releases/download/rel-1.6/offensive-1.6.zip</code>, then you are packaging a release.
       </p>
@@ -7433,10 +7475,10 @@ EXTRACT_SUFX=   .zip
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="fixes.configure"></a>19.3.�The <span class="emphasis"><em>configure</em></span> phase</h2></div></div></div>
+<a name="fixes.configure"></a>21.3.�The <span class="emphasis"><em>configure</em></span> phase</h2></div></div></div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="fixes.libtool"></a>19.3.1.�Shared libraries - libtool</h3></div></div></div>
+<a name="fixes.libtool"></a>21.3.1.�Shared libraries - libtool</h3></div></div></div>
 <p>pkgsrc supports many different machines, with different
     object formats like a.out and ELF, and varying abilities to do
     shared library and dynamic loading at all. To accompany this,
@@ -7561,7 +7603,7 @@ ${LIBTOOL} --mode=install ${BSD_INSTALL_
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="using-libtool"></a>19.3.2.�Using libtool on GNU packages that already support libtool</h3></div></div></div>
+<a name="using-libtool"></a>21.3.2.�Using libtool on GNU packages that already support libtool</h3></div></div></div>
 <p>Add <code class="varname">USE_LIBTOOL=yes</code> to the
     package Makefile. This will override the package's own libtool
     in most cases.  For older libtool using packages,  libtool is
@@ -7602,7 +7644,7 @@ ${LIBTOOL} --mode=install ${BSD_INSTALL_
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="autoconf-automake"></a>19.3.3.�GNU Autoconf/Automake</h3></div></div></div>
+<a name="autoconf-automake"></a>21.3.3.�GNU Autoconf/Automake</h3></div></div></div>
 <p>If a package needs GNU autoconf or automake to be executed
     to regenerate the configure script and Makefile.in makefile
     templates, then they should be executed in a pre-configure
@@ -7643,14 +7685,14 @@ pre-configure:
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="programming-languages"></a>19.4.�Programming languages</h2></div></div></div>
+<a name="programming-languages"></a>21.4.�Programming languages</h2></div></div></div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="basic-programming-languages"></a>19.4.1.�C, C++, and Fortran</h3></div></div></div>
+<a name="basic-programming-languages"></a>21.4.1.�C, C++, and Fortran</h3></div></div></div>
 <p>Compilers for the C, C++, and Fortran languages comes with
     the NetBSD base system.  By default, pkgsrc assumes that a package
     is written in C and will hide all other compilers (via the wrapper
-    framework, see <a class="xref" href="#buildlink" title="Chapter�14.�Buildlink methodology">Chapter�14, <i>Buildlink methodology</i></a>).</p>
+    framework, see <a class="xref" href="#buildlink" title="Chapter�16.�Buildlink methodology">Chapter�16, <i>Buildlink methodology</i></a>).</p>
 <p>To declare which language's compiler a package needs, set
     the <code class="varname">USE_LANGUAGES</code> variable. Allowed values
     currently are <span class="quote">&#8220;<span class="quote">c</span>&#8221;</span>, <span class="quote">&#8220;<span class="quote">c++</span>&#8221;</span>, and
@@ -7661,7 +7703,7 @@ pre-configure:
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="java-programming-language"></a>19.4.2.�Java</h3></div></div></div>
+<a name="java-programming-language"></a>21.4.2.�Java</h3></div></div></div>
 <p>If a program is written in Java, use the Java framework in
     pkgsrc.  The package must include
     <code class="filename">../../mk/java-vm.mk</code>.  This Makefile fragment
@@ -7690,7 +7732,7 @@ pre-configure:
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="perl-scripts"></a>19.4.3.�Packages containing perl scripts</h3></div></div></div>
+<a name="perl-scripts"></a>21.4.3.�Packages containing perl scripts</h3></div></div></div>
 <p>If your package contains interpreted perl scripts, add
     <span class="quote">&#8220;<span class="quote">perl</span>&#8221;</span> to the <code class="varname">USE_TOOLS</code> variable
     and set <code class="varname">REPLACE_PERL</code> to ensure that the proper
@@ -7702,12 +7744,12 @@ pre-configure:
 <p>If a particular version of perl is needed, set the
     <code class="varname">PERL5_REQD</code> variable to the version number.  The
     default is <span class="quote">&#8220;<span class="quote">5.0</span>&#8221;</span>.</p>
-<p>See <a class="xref" href="#perl-modules" title="19.6.6.�Packages installing perl modules">Section�19.6.6, &#8220;Packages installing perl modules&#8221;</a> for information
+<p>See <a class="xref" href="#perl-modules" title="21.6.6.�Packages installing perl modules">Section�21.6.6, &#8220;Packages installing perl modules&#8221;</a> for information
     about handling perl modules.</p>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="shell-scripts"></a>19.4.4.�Packages containing shell scripts</h3></div></div></div>
+<a name="shell-scripts"></a>21.4.4.�Packages containing shell scripts</h3></div></div></div>
 <p><code class="varname">REPLACE_SH</code>,
     <code class="varname">REPLACE_BASH</code>, <code class="varname">REPLACE_CSH</code>,
     and <code class="varname">REPLACE_KSH</code> can be used to replace shell
@@ -7722,7 +7764,7 @@ pre-configure:
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="other-programming-languages"></a>19.4.5.�Other programming languages</h3></div></div></div>
+<a name="other-programming-languages"></a>21.4.5.�Other programming languages</h3></div></div></div>
 <p>Currently, there is no special handling for other languages
     in pkgsrc.  If a compiler package provides a
     <code class="filename">buildlink3.mk</code> file, include that, otherwise
@@ -7732,7 +7774,7 @@ pre-configure:
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="fixes.build"></a>19.5.�The <span class="emphasis"><em>build</em></span> phase</h2></div></div></div>
+<a name="fixes.build"></a>21.5.�The <span class="emphasis"><em>build</em></span> phase</h2></div></div></div>
 <p>The most common failures when building a package are that
        some platforms do not provide certain header files, functions or
        libraries, or they provide the functions in a library that the
@@ -7741,7 +7783,7 @@ pre-configure:
        use the missing functions or provides a replacement function.</p>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="fixes.build.cpp"></a>19.5.1.�Compiling C and C++ code conditionally</h3></div></div></div>
+<a name="fixes.build.cpp"></a>21.5.1.�Compiling C and C++ code conditionally</h3></div></div></div>
 <p>If a package already comes with a GNU configure script, the
        preferred way to fix the build failure is to change the
        configure script, not the code. In the other cases, you can
@@ -7761,7 +7803,7 @@ pre-configure:
        does not define it. Use <code class="varname">__sun</code> instead.</p>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="fixes.build.cpp.os"></a>19.5.1.1.�C preprocessor macros to identify the operating system</h4></div></div></div>
+<a name="fixes.build.cpp.os"></a>21.5.1.1.�C preprocessor macros to identify the operating system</h4></div></div></div>
 <p>To distinguish between 4.4 BSD-derived systems and the
         rest of the world, you should use the following code.</p>
 <pre class="programlisting">
@@ -7792,7 +7834,7 @@ Solaris     sun, __sun
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="fixes.build.cpp.arch"></a>19.5.1.2.�C preprocessor macros to identify the hardware architecture</h4></div></div></div>
+<a name="fixes.build.cpp.arch"></a>21.5.1.2.�C preprocessor macros to identify the hardware architecture</h4></div></div></div>
 <pre class="programlisting">
 i386        i386, __i386, __i386__
 MIPS        __mips
@@ -7801,7 +7843,7 @@ SPARC       sparc, __sparc
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="fixes.build.cpp.compiler"></a>19.5.1.3.�C preprocessor macros to identify the compiler</h4></div></div></div>
+<a name="fixes.build.cpp.compiler"></a>21.5.1.3.�C preprocessor macros to identify the compiler</h4></div></div></div>
 <pre class="programlisting">
 GCC         __GNUC__ (major version), __GNUC_MINOR__
 MIPSpro     _COMPILER_VERSION (0x741 for MIPSpro 7.41)
@@ -7812,7 +7854,7 @@ SunPro C++  __SUNPRO_CC (0x580 for Sun C
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="compiler-bugs"></a>19.5.2.�How to handle compiler bugs</h3></div></div></div>
+<a name="compiler-bugs"></a>21.5.2.�How to handle compiler bugs</h3></div></div></div>
 <p>Some source files trigger bugs in the compiler, based on
         combinations of compiler version and architecture and almost
         always relation to optimisation being enabled.  Common symptoms
@@ -7830,7 +7872,7 @@ SunPro C++  __SUNPRO_CC (0x580 for Sun C
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="undefined-reference"></a>19.5.3.�Undefined reference to <span class="quote">&#8220;<span class="quote">...</span>&#8221;</span>
+<a name="undefined-reference"></a>21.5.3.�Undefined reference to <span class="quote">&#8220;<span class="quote">...</span>&#8221;</span>
 </h3></div></div></div>
 <p>This error message often means that a package did not
        link to a shared library it needs. The following functions are
@@ -7893,7 +7935,7 @@ SunPro C++  __SUNPRO_CC (0x580 for Sun C
     bmake</strong></span>.</p>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="undefined-reference-sunpro"></a>19.5.3.1.�Special issue: The SunPro compiler</h4></div></div></div>
+<a name="undefined-reference-sunpro"></a>21.5.3.1.�Special issue: The SunPro compiler</h4></div></div></div>
 <p>When you are using the SunPro compiler, there is another
 possibility. That compiler cannot handle the following code:</p>
 <pre class="programlisting">
@@ -7919,7 +7961,7 @@ of functions.</p>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="out-of-memory"></a>19.5.4.�Running out of memory</h3></div></div></div>
+<a name="out-of-memory"></a>21.5.4.�Running out of memory</h3></div></div></div>
 <p>Sometimes packages fail to build because the compiler runs
     into an operating system specific soft limit.  With the
     <code class="varname">UNLIMIT_RESOURCES</code> variable pkgsrc can be told
@@ -7934,10 +7976,10 @@ of functions.</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="fixes.install"></a>19.6.�The <span class="emphasis"><em>install</em></span> phase</h2></div></div></div>
+<a name="fixes.install"></a>21.6.�The <span class="emphasis"><em>install</em></span> phase</h2></div></div></div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="install-scripts"></a>19.6.1.�Creating needed directories</h3></div></div></div>
+<a name="install-scripts"></a>21.6.1.�Creating needed directories</h3></div></div></div>
 <p>The BSD-compatible <span class="command"><strong>install</strong></span> supplied
     with some operating systems cannot create more than one
     directory at a time. As such, you should call
@@ -7953,7 +7995,7 @@ ${INSTALL_DATA_DIR} ${PREFIX}/dir2
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="where-to-install-documentation"></a>19.6.2.�Where to install documentation</h3></div></div></div>
+<a name="where-to-install-documentation"></a>21.6.2.�Where to install documentation</h3></div></div></div>
 <p>In general, documentation should be installed into
     <code class="filename">${PREFIX}/share/doc/${PKGBASE}</code> or
     <code class="filename">${PREFIX}/share/doc/${PKGNAME}</code> (the latter
@@ -7982,7 +8024,7 @@ ${INSTALL_DATA_DIR} ${PREFIX}/dir2
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="installing-score-files"></a>19.6.3.�Installing highscore files</h3></div></div></div>
+<a name="installing-score-files"></a>21.6.3.�Installing highscore files</h3></div></div></div>
 <p>Certain packages, most of them in the games category, install
     a score file that allows all users on the system to record their
     highscores.  In order for this to work, the binaries need to be
@@ -8026,7 +8068,7 @@ SPECIAL_PERMS+=         ${PREFIX}/bin/mo
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="destdir-support"></a>19.6.4.�Adding DESTDIR support to packages</h3></div></div></div>
+<a name="destdir-support"></a>21.6.4.�Adding DESTDIR support to packages</h3></div></div></div>
 <p><code class="varname">DESTDIR</code> support means that a package
     installs into a staging directory, not the final location of the
     files. Then a binary package is created which can be used for
@@ -8055,7 +8097,7 @@ SPECIAL_PERMS+=         ${PREFIX}/bin/mo
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="hardcoded-paths"></a>19.6.5.�Packages with hardcoded paths to other interpreters</h3></div></div></div>
+<a name="hardcoded-paths"></a>21.6.5.�Packages with hardcoded paths to other interpreters</h3></div></div></div>
 <p>Your package may also contain scripts with hardcoded paths to
       other interpreters besides (or as well as) perl.  To correct the
       full pathname to the script interpreter, you need to set the
@@ -8077,7 +8119,7 @@ REPLACE_FILES.tcl=      # list of tcl sc
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="perl-modules"></a>19.6.6.�Packages installing perl modules</h3></div></div></div>
+<a name="perl-modules"></a>21.6.6.�Packages installing perl modules</h3></div></div></div>
 <p>Makefiles of packages providing perl5 modules should include
     the Makefile fragment
     <code class="filename">../../lang/perl5/module.mk</code>.  It provides a
@@ -8117,7 +8159,7 @@ PERL5_PACKLIST= auto/Pg/.packlist
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="faq.info-files"></a>19.6.7.�Packages installing info files</h3></div></div></div>
+<a name="faq.info-files"></a>21.6.7.�Packages installing info files</h3></div></div></div>
 <p>Some packages install info files or use the
     <span class="quote">&#8220;<span class="quote">makeinfo</span>&#8221;</span>  or <span class="quote">&#8220;<span class="quote">install-info</span>&#8221;</span>
     commands.  <code class="varname">INFO_FILES</code> should be defined in
@@ -8164,7 +8206,7 @@ PERL5_PACKLIST= auto/Pg/.packlist
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="manpages"></a>19.6.8.�Packages installing man pages</h3></div></div></div>
+<a name="manpages"></a>21.6.8.�Packages installing man pages</h3></div></div></div>
 <p>All packages that install manual pages should install them
     into the same directory, so that there is one common place to look
     for them. In pkgsrc, this place is
@@ -8196,12 +8238,12 @@ PERL5_PACKLIST= auto/Pg/.packlist
     Or if the <code class="filename">./configure</code> script uses
     a non-standard use of --mandir, you can set
     <code class="varname">GNU_CONFIGURE_MANDIR</code> as needed.</p>
-<p>See <a class="xref" href="#manpage-compression" title="13.5.�Man page compression">Section�13.5, &#8220;Man page compression&#8221;</a> for
+<p>See <a class="xref" href="#manpage-compression" title="15.5.�Man page compression">Section�15.5, &#8220;Man page compression&#8221;</a> for
     information on installation of compressed manual pages.</p>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="gconf-data-files"></a>19.6.9.�Packages installing GConf data files</h3></div></div></div>
+<a name="gconf-data-files"></a>21.6.9.�Packages installing GConf data files</h3></div></div></div>
 <p>If a package installs <code class="filename">.schemas</code> or
     <code class="filename">.entries</code> files, used by GConf,
     you need to take some extra steps to make sure they get registered
@@ -8221,7 +8263,7 @@ PERL5_PACKLIST= auto/Pg/.packlist
        need to manually patch the package.</p></li>
 <li class="listitem"><p>Check the PLIST and remove any entries under the etc/gconf
        directory, as they will be handled automatically.  See
-       <a class="xref" href="#faq.conf" title="9.13.�How do I change the location of configuration files?">Section�9.13, &#8220;How do I change the location of configuration files?&#8221;</a> for 
more information.</p></li>
+       <a class="xref" href="#faq.conf" title="10.13.�How do I change the location of configuration files?">Section�10.13, &#8220;How do I change the location of configuration files?&#8221;</a> for 
more information.</p></li>
 <li class="listitem"><p>Define the <code class="varname">GCONF_SCHEMAS</code> variable in
        your <code class="filename">Makefile</code> with a list of all
        <code class="filename">.schemas</code> files installed by the package, if
@@ -8235,7 +8277,7 @@ PERL5_PACKLIST= auto/Pg/.packlist
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="scrollkeeper-data-files"></a>19.6.10.�Packages installing scrollkeeper/rarian data files</h3></div></div></div>
+<a name="scrollkeeper-data-files"></a>21.6.10.�Packages installing scrollkeeper/rarian data files</h3></div></div></div>
 <p>If a package installs <code class="filename">.omf</code> files, used by
     scrollkeeper/rarian, you need to take some extra steps to make sure they
     get registered in the database:</p>
@@ -8256,7 +8298,7 @@ PERL5_PACKLIST= auto/Pg/.packlist
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="x11-fonts"></a>19.6.11.�Packages installing X11 fonts</h3></div></div></div>
+<a name="x11-fonts"></a>21.6.11.�Packages installing X11 fonts</h3></div></div></div>
 <p>If a package installs font files, you will need to rebuild
     the fonts database in the directory where they get installed at
     installation and deinstallation time.  This can be automatically
@@ -8273,7 +8315,7 @@ PERL5_PACKLIST= auto/Pg/.packlist
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="gtk2-modules"></a>19.6.12.�Packages installing GTK2 modules</h3></div></div></div>
+<a name="gtk2-modules"></a>21.6.12.�Packages installing GTK2 modules</h3></div></div></div>
 <p>If a package installs GTK2 immodules or loaders, you need to
     take some extra steps to get them registered in the GTK2 database
     properly:</p>
@@ -8301,7 +8343,7 @@ PERL5_PACKLIST= auto/Pg/.packlist
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="sgml-xml-data"></a>19.6.13.�Packages installing SGML or XML data</h3></div></div></div>
+<a name="sgml-xml-data"></a>21.6.13.�Packages installing SGML or XML data</h3></div></div></div>
 <p>If a package installs SGML or XML data files that need to be
     registered in system-wide catalogs (like DTDs, sub-catalogs,
     etc.), you need to take some extra steps:</p>
@@ -8329,7 +8371,7 @@ PERL5_PACKLIST= auto/Pg/.packlist
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="mime-database"></a>19.6.14.�Packages installing extensions to the MIME database</h3></div></div></div>
+<a name="mime-database"></a>21.6.14.�Packages installing extensions to the MIME database</h3></div></div></div>
 <p>If a package provides extensions to the MIME database by
     installing <code class="filename">.xml</code> files inside
     <code class="filename">${PREFIX}/share/mime/packages</code>, you
@@ -8359,7 +8401,7 @@ PERL5_PACKLIST= auto/Pg/.packlist
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="intltool"></a>19.6.15.�Packages using intltool</h3></div></div></div>
+<a name="intltool"></a>21.6.15.�Packages using intltool</h3></div></div></div>
 <p>If a package uses intltool during its build, add
     <code class="literal">intltool</code> to the <code class="varname">USE_TOOLS</code>,
     which forces it to use the intltool package provided by pkgsrc,
@@ -8370,7 +8412,7 @@ PERL5_PACKLIST= auto/Pg/.packlist
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="startup-scripts"></a>19.6.16.�Packages installing startup scripts</h3></div></div></div>
+<a name="startup-scripts"></a>21.6.16.�Packages installing startup scripts</h3></div></div></div>
 <p>If a package contains a rc.d script, it won't be copied into
     the startup directory by default, but you can enable it, by adding
     the option <code class="varname">PKG_RCD_SCRIPTS=YES</code> in
@@ -8381,7 +8423,7 @@ PERL5_PACKLIST= auto/Pg/.packlist
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="tex-packages"></a>19.6.17.�Packages installing TeX modules</h3></div></div></div>
+<a name="tex-packages"></a>21.6.17.�Packages installing TeX modules</h3></div></div></div>
 <p>If a package installs TeX packages into the texmf tree,
     the <code class="filename">ls-R</code> database of the tree needs to be
     updated.</p>
@@ -8420,7 +8462,7 @@ PERL5_PACKLIST= auto/Pg/.packlist
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="emulation-packages"></a>19.6.18.�Packages supporting running binaries in
+<a name="emulation-packages"></a>21.6.18.�Packages supporting running binaries in
     emulation</h3></div></div></div>
 <p>There are some packages that provide libraries and
     executables for running binaries from a one operating system
@@ -8437,7 +8479,7 @@ PERL5_PACKLIST= auto/Pg/.packlist
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="hicolor-theme"></a>19.6.19.�Packages installing hicolor theme icons</h3></div></div></div>
+<a name="hicolor-theme"></a>21.6.19.�Packages installing hicolor theme icons</h3></div></div></div>
 <p>If a package installs images under the
     <code class="filename">share/icons/hicolor</code> and/or updates the
     <code class="filename">share/icons/hicolor/icon-theme.cache</code>
@@ -8459,7 +8501,7 @@ PERL5_PACKLIST= auto/Pg/.packlist
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="desktop-files"></a>19.6.20.�Packages installing desktop files</h3></div></div></div>
+<a name="desktop-files"></a>21.6.20.�Packages installing desktop files</h3></div></div></div>
 <p>If a package installs <code class="filename">.desktop</code> files
       under <code class="filename">share/applications</code> and these include
       MIME information (MimeType key), you need to take extra steps to
@@ -8478,7 +8520,7 @@ PERL5_PACKLIST= auto/Pg/.packlist
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="punting"></a>19.7.�Marking packages as having problems</h2></div></div></div>
+<a name="punting"></a>21.7.�Marking packages as having problems</h2></div></div></div>
 <p>In some cases one does not have the time to solve a problem
   immediately. In this case, one can plainly mark a package as broken.  For
   this, one just sets the variable <code class="varname">BROKEN</code> to the
@@ -8492,7 +8534,7 @@ PERL5_PACKLIST= auto/Pg/.packlist
 </div>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="debug"></a>Chapter�20.�Debugging</h2></div></div></div>
+<a name="debug"></a>Chapter�22.�Debugging</h2></div></div></div>
 <p>To check out all the gotchas when building a package, here are
   the steps that I do in order to get a package working.  Please note
   this is basically the same as what was explained in the previous
@@ -8530,7 +8572,7 @@ PERL5_PACKLIST= auto/Pg/.packlist
       package.</p>
 </li>
 <li class="listitem"><p>Look at the <code class="filename">Makefile</code>, fix if
-      necessary; see <a class="xref" href="#components.Makefile" title="11.1.�Makefile">Section�11.1, &#8220;<code class="filename">Makefile</code>&#8221;</a>.</p></li>
+      necessary; see <a class="xref" href="#components.Makefile" title="13.1.�Makefile">Section�13.1, &#8220;<code class="filename">Makefile</code>&#8221;</a>.</p></li>
 <li class="listitem">
 <p>Generate a <code class="filename">PLIST</code>:</p>
 <pre class="screen"><code class="prompt">#</code> <strong class="userinput"><code>make install</code></strong>
@@ -8569,42 +8611,42 @@ PERL5_PACKLIST= auto/Pg/.packlist
       reports:</p>
 <pre class="screen"><code class="prompt">#</code> <strong class="userinput"><code>pkglint</code></strong></pre>
 </li>
-<li class="listitem"><p>Submit (or commit, if you have cvs access); see <a class="xref" href="#submit" title="Chapter�21.�Submitting and Committing">Chapter�21, <i>Submitting and 
Committing</i></a>.</p></li>
+<li class="listitem"><p>Submit (or commit, if you have cvs access); see <a class="xref" href="#submit" title="Chapter�23.�Submitting and Committing">Chapter�23, <i>Submitting and 
Committing</i></a>.</p></li>
 </ul></div>
 </div>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="submit"></a>Chapter�21.�Submitting and Committing</h2></div></div></div>
+<a name="submit"></a>Chapter�23.�Submitting and Committing</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="sect1"><a href="#submitting-binary-packages">21.1. Submitting binary packages</a></span></dt>
-<dt><span class="sect1"><a href="#submitting-your-package">21.2. Submitting source packages (for non-NetBSD-developers)</a></span></dt>
-<dt><span class="sect1"><a href="#general-notes-for-changes">21.3. General notes when adding, updating, or removing packages</a></span></dt>
-<dt><span class="sect1"><a href="#commit-messages">21.4. Commit Messages</a></span></dt>
-<dt><span class="sect1"><a href="#committing-importing">21.5. Committing: Adding a package to CVS</a></span></dt>
-<dt><span class="sect1"><a href="#updating-package">21.6. Updating a package to a newer version</a></span></dt>
-<dt><span class="sect1"><a href="#renaming-package">21.7. Renaming a package in pkgsrc</a></span></dt>
-<dt><span class="sect1"><a href="#moving-package">21.8. Moving a package in pkgsrc</a></span></dt>
+<dt><span class="sect1"><a href="#submitting-binary-packages">23.1. Submitting binary packages</a></span></dt>
+<dt><span class="sect1"><a href="#submitting-your-package">23.2. Submitting source packages (for non-NetBSD-developers)</a></span></dt>
+<dt><span class="sect1"><a href="#general-notes-for-changes">23.3. General notes when adding, updating, or removing packages</a></span></dt>
+<dt><span class="sect1"><a href="#commit-messages">23.4. Commit Messages</a></span></dt>
+<dt><span class="sect1"><a href="#committing-importing">23.5. Committing: Adding a package to CVS</a></span></dt>
+<dt><span class="sect1"><a href="#updating-package">23.6. Updating a package to a newer version</a></span></dt>
+<dt><span class="sect1"><a href="#renaming-package">23.7. Renaming a package in pkgsrc</a></span></dt>
+<dt><span class="sect1"><a href="#moving-package">23.8. Moving a package in pkgsrc</a></span></dt>
 </dl>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="submitting-binary-packages"></a>21.1.�Submitting binary packages</h2></div></div></div>
+<a name="submitting-binary-packages"></a>23.1.�Submitting binary packages</h2></div></div></div>
 <p>Our policy is that we accept binaries only from pkgsrc
        developers to guarantee that the packages don't contain any
        trojan horses etc. This is not to annoy anyone but rather to
        protect our users! You're still free to put up your home-made
        binary packages and tell the world where to get them. NetBSD
        developers doing bulk builds and wanting to upload them please
-       see <a class="xref" href="#bulk" title="Chapter�7.�Creating binary packages for everything in pkgsrc (bulk builds)">Chapter�7, <i>Creating binary packages for everything in pkgsrc (bulk
+       see <a class="xref" href="#bulk" title="Chapter�8.�Creating binary packages for everything in pkgsrc (bulk builds)">Chapter�8, <i>Creating binary packages for everything in pkgsrc (bulk
 builds)</i></a>.</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="submitting-your-package"></a>21.2.�Submitting source packages (for non-NetBSD-developers)</h2></div></div></div>
+<a name="submitting-your-package"></a>23.2.�Submitting source packages (for non-NetBSD-developers)</h2></div></div></div>
 <p>First, check that your package is complete, compiles and
-       runs well; see <a class="xref" href="#debug" title="Chapter�20.�Debugging">Chapter�20, <i>Debugging</i></a> and the rest of this
+       runs well; see <a class="xref" href="#debug" title="Chapter�22.�Debugging">Chapter�22, <i>Debugging</i></a> and the rest of this
        document. Next, generate an uuencoded gzipped <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?tar+1.i386+NetBSD-8.0";><span class="citerefentry"><span 
class="refentrytitle">tar</span>(1)</span></a>
        archive that contains all files that make up the package.
        Finally, send this package to the pkgsrc bug tracking system,
@@ -8632,7 +8674,7 @@ builds)</i></a>.</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="general-notes-for-changes"></a>21.3.�General notes when adding, updating, or removing packages</h2></div></div></div>
+<a name="general-notes-for-changes"></a>23.3.�General notes when adding, updating, or removing packages</h2></div></div></div>
 <p>Please note all package additions, updates, moves, and
        removals in <code class="filename">pkgsrc/doc/CHANGES-<em class="replaceable"><code>YYYY</code></em></code>. It's very
        important to keep this file up to date and conforming to the
@@ -8671,7 +8713,7 @@ builds)</i></a>.</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="commit-messages"></a>21.4.�Commit Messages</h2></div></div></div>
+<a name="commit-messages"></a>23.4.�Commit Messages</h2></div></div></div>
 <p>For several years, there have been mirrors of pkgsrc in
   fossil, git, and hg. Standard practise when using these tools is to
   make the first line of a commit message function as a summary that
@@ -8712,7 +8754,7 @@ builds)</i></a>.</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="committing-importing"></a>21.5.�Committing: Adding a package to CVS</h2></div></div></div>
+<a name="committing-importing"></a>23.5.�Committing: Adding a package to CVS</h2></div></div></div>
 <p>This section is only of interest for pkgsrc developers with write
   access to the pkgsrc repository.</p>
 <p>When the package is finished, <span class="quote">&#8220;<span class="quote">cvs add</span>&#8221;</span> the files.
@@ -8744,7 +8786,7 @@ much easier to get wrong than <span clas
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="updating-package"></a>21.6.�Updating a package to a newer version</h2></div></div></div>
+<a name="updating-package"></a>23.6.�Updating a package to a newer version</h2></div></div></div>
 <p>Please always put a concise, appropriate and relevant summary of the
   changes between old and new versions into the commit log when updating
   a package. There are various reasons for this:</p>
@@ -8768,7 +8810,7 @@ much easier to get wrong than <span clas
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="renaming-package"></a>21.7.�Renaming a package in pkgsrc</h2></div></div></div>
+<a name="renaming-package"></a>23.7.�Renaming a package in pkgsrc</h2></div></div></div>
 <p>Renaming packages is not recommended.</p>
 <p>When renaming packages, be sure to fix any references to old name
   in other Makefiles, options, buildlink files, etc.</p>
@@ -8786,7 +8828,7 @@ much easier to get wrong than <span clas
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="moving-package"></a>21.8.�Moving a package in pkgsrc</h2></div></div></div>
+<a name="moving-package"></a>23.8.�Moving a package in pkgsrc</h2></div></div></div>
 <p>It is preferred that packages are not renamed or moved, but if needed
   please follow these steps.
 </p>
@@ -8834,47 +8876,47 @@ place.</p></li>
 </div>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="devfaq"></a>Chapter�22.�Frequently Asked Questions</h2></div></div></div>
+<a name="devfaq"></a>Chapter�24.�Frequently Asked Questions</h2></div></div></div>
 <p>This section contains the answers to questions that may
        arise when you are writing a package. If you don't find your
        question answered here, first have a look in the other chapters,
        and if you still don't have the answer, ask on the
        <code class="literal">pkgsrc-users</code> mailing list.</p>
 <div class="qandaset">
-<a name="idm79150160"></a><dl>
-<dt>22.1. <a href="#devfaq.makeflags">What is the difference between
+<a name="idm79126896"></a><dl>
+<dt>24.1. <a href="#devfaq.makeflags">What is the difference between
        MAKEFLAGS, .MAKEFLAGS and
        MAKE_FLAGS?</a>
 </dt>
-<dt>22.2. <a href="#devfaq.make">What is the difference between
+<dt>24.2. <a href="#devfaq.make">What is the difference between
        MAKE, GMAKE and
        MAKE_PROGRAM?</a>
 </dt>
-<dt>22.3. <a href="#devfaq.cc">What is the difference between
+<dt>24.3. <a href="#devfaq.cc">What is the difference between
        CC, PKG_CC and
        PKGSRC_COMPILER?</a>
 </dt>
-<dt>22.4. <a href="#devfaq.bl3flags">What is the difference between
+<dt>24.4. <a href="#devfaq.bl3flags">What is the difference between
        BUILDLINK_LDFLAGS,
        BUILDLINK_LDADD and
        BUILDLINK_LIBS?</a>
 </dt>
-<dt>22.5. <a href="#devfaq.bl3prefix">Why does make show-var
+<dt>24.5. <a href="#devfaq.bl3prefix">Why does make show-var
        VARNAME=BUILDLINK_PREFIX.foo
        say it's empty?</a>
 </dt>
-<dt>22.6. <a href="#devfaq.master_sites">What does
+<dt>24.6. <a href="#devfaq.master_sites">What does
        ${MASTER_SITE_SOURCEFORGE:=package/} mean? I
        don't understand the := inside
        it.</a>
 </dt>
-<dt>22.7. <a href="#devfaq.mailinglists">Which mailing lists are there for package
+<dt>24.7. <a href="#devfaq.mailinglists">Which mailing lists are there for package
        developers?</a>
 </dt>
-<dt>22.8. <a href="#devfaq.documentation">Where is the pkgsrc
+<dt>24.8. <a href="#devfaq.documentation">Where is the pkgsrc
        documentation?</a>
 </dt>
-<dt>22.9. <a href="#devfaq.too-much-time">I have a little time to kill.  What shall I
+<dt>24.9. <a href="#devfaq.too-much-time">I have a little time to kill.  What shall I
 do?</a>
 </dt>
 </dl>
@@ -8886,7 +8928,7 @@ do?</a>
 <tbody>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.makeflags"></a><a name="idm79149776"></a><p><b>22.1.</b></p>
+<a name="devfaq.makeflags"></a><a name="idm79126512"></a><p><b>24.1.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
        <code class="varname">MAKEFLAGS</code>, <code class="varname">.MAKEFLAGS</code> and
@@ -8902,7 +8944,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.make"></a><a name="idm79137488"></a><p><b>22.2.</b></p>
+<a name="devfaq.make"></a><a name="idm79122544"></a><p><b>24.2.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
        <code class="varname">MAKE</code>, <code class="varname">GMAKE</code> and
@@ -8920,7 +8962,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.cc"></a><a name="idm79133136"></a><p><b>22.3.</b></p>
+<a name="devfaq.cc"></a><a name="idm79118064"></a><p><b>24.3.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
        <code class="varname">CC</code>, <code class="varname">PKG_CC</code> and
@@ -8938,7 +8980,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3flags"></a><a name="idm79128912"></a><p><b>22.4.</b></p>
+<a name="devfaq.bl3flags"></a><a name="idm79113968"></a><p><b>24.4.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
        <code class="varname">BUILDLINK_LDFLAGS</code>,
@@ -8951,7 +8993,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3prefix"></a><a name="idm79126736"></a><p><b>22.5.</b></p>
+<a name="devfaq.bl3prefix"></a><a name="idm79111664"></a><p><b>24.5.</b></p>
 </td>
 <td align="left" valign="top"><p>Why does <span class="command"><strong>make show-var
        VARNAME=BUILDLINK_PREFIX.<em class="replaceable"><code>foo</code></em></strong></span>
@@ -8967,7 +9009,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.master_sites"></a><a name="idm79115344"></a><p><b>22.6.</b></p>
+<a name="devfaq.master_sites"></a><a name="idm79108592"></a><p><b>24.6.</b></p>
 </td>
 <td align="left" valign="top"><p>What does
        <code class="code">${MASTER_SITE_SOURCEFORGE:=package/}</code> mean? I
@@ -8991,7 +9033,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.mailinglists"></a><a name="idm79108560"></a><p><b>22.7.</b></p>
+<a name="devfaq.mailinglists"></a><a name="idm79101680"></a><p><b>24.7.</b></p>
 </td>
 <td align="left" valign="top"><p>Which mailing lists are there for package
        developers?</p></td>
@@ -9016,7 +9058,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.documentation"></a><a name="idm79104720"></a><p><b>22.8.</b></p>
+<a name="devfaq.documentation"></a><a name="idm79097968"></a><p><b>24.8.</b></p>
 </td>
 <td align="left" valign="top"><p>Where is the pkgsrc
        documentation?</p></td>
@@ -9064,7 +9106,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.too-much-time"></a><a name="idm79098192"></a><p><b>22.9.</b></p>
+<a name="devfaq.too-much-time"></a><a name="idm79083248"></a><p><b>24.9.</b></p>
 </td>
 <td align="left" valign="top"><p>I have a little time to kill.  What shall I
 do?</p></td>
@@ -9095,14 +9137,14 @@ anyway.</p>
 </div>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="gnome"></a>Chapter�23.�GNOME packaging and porting</h2></div></div></div>
+<a name="gnome"></a>Chapter�25.�GNOME packaging and porting</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="sect1"><a href="#meta-packages">23.1. Meta packages</a></span></dt>
-<dt><span class="sect1"><a href="#new-package">23.2. Packaging a GNOME application</a></span></dt>
-<dt><span class="sect1"><a href="#full-update">23.3. Updating GNOME to a newer version</a></span></dt>
-<dt><span class="sect1"><a href="#patching">23.4. Patching guidelines</a></span></dt>
+<dt><span class="sect1"><a href="#meta-packages">25.1. Meta packages</a></span></dt>
+<dt><span class="sect1"><a href="#new-package">25.2. Packaging a GNOME application</a></span></dt>
+<dt><span class="sect1"><a href="#full-update">25.3. Updating GNOME to a newer version</a></span></dt>
+<dt><span class="sect1"><a href="#patching">25.4. Patching guidelines</a></span></dt>
 </dl>
 </div>
 <p>Quoting <a class="ulink" href="http://www.gnome.org/"; target="_top">GNOME's web
@@ -9139,7 +9181,7 @@ important information regarding their in
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="meta-packages"></a>23.1.�Meta packages</h2></div></div></div>
+<a name="meta-packages"></a>25.1.�Meta packages</h2></div></div></div>
 <p>pkgsrc includes three GNOME-related meta packages:</p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p><a href="https://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/meta-pkgs/gnome-base/README.html"; target="_top"><code class="filename">meta-pkgs/gnome-base</code></a>: Provides
@@ -9173,7 +9215,7 @@ change it to alphabetical sorting!</em><
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="new-package"></a>23.2.�Packaging a GNOME application</h2></div></div></div>
+<a name="new-package"></a>25.2.�Packaging a GNOME application</h2></div></div></div>
 <p>Almost all GNOME applications are written in C and use a common
 set of tools as their build system.  Things get different with the new
 bindings to other languages (such as Python), but the following will
@@ -9240,7 +9282,7 @@ solution is given.  After applying the s
 <span class="emphasis"><em>regenerate the package's file list</em></span> with
 <span class="command"><strong>make print-PLIST</strong></span> and ensure it is correct.</p>
 <div class="table">
-<a name="plist-handling"></a><p class="title"><b>Table�23.1.�PLIST handling for GNOME packages</b></p>
+<a name="plist-handling"></a><p class="title"><b>Table�25.1.�PLIST handling for GNOME packages</b></p>
 <div class="table-contents"><table class="table" summary="PLIST handling for GNOME packages" border="1">
 <colgroup>
 <col>
@@ -9253,24 +9295,24 @@ solution is given.  After applying the s
 <tbody>
 <tr>
 <td>Installs OMF files under <code class="filename">share/omf</code>.</td>
-<td>See <a class="xref" href="#scrollkeeper-data-files" title="19.6.10.�Packages installing scrollkeeper/rarian data files">Section�19.6.10, &#8220;Packages installing scrollkeeper/rarian data 
files&#8221;</a>.</td>
+<td>See <a class="xref" href="#scrollkeeper-data-files" title="21.6.10.�Packages installing scrollkeeper/rarian data files">Section�21.6.10, &#8220;Packages installing scrollkeeper/rarian data 
files&#8221;</a>.</td>
 </tr>
 <tr>
 <td>Installs icons under the
         <code class="filename">share/icons/hicolor</code> hierarchy or updates
         <code class="filename">share/icons/hicolor/icon-theme.cache</code>.</td>
-<td>See <a class="xref" href="#hicolor-theme" title="19.6.19.�Packages installing hicolor theme icons">Section�19.6.19, &#8220;Packages installing hicolor theme icons&#8221;</a>.</td>
+<td>See <a class="xref" href="#hicolor-theme" title="21.6.19.�Packages installing hicolor theme icons">Section�21.6.19, &#8220;Packages installing hicolor theme icons&#8221;</a>.</td>
 </tr>
 <tr>
 <td>Installs files under
         <code class="filename">share/mime/packages</code>.</td>
-<td>See <a class="xref" href="#mime-database" title="19.6.14.�Packages installing extensions to the MIME database">Section�19.6.14, &#8220;Packages installing extensions to the MIME 
database&#8221;</a>.</td>
+<td>See <a class="xref" href="#mime-database" title="21.6.14.�Packages installing extensions to the MIME database">Section�21.6.14, &#8220;Packages installing extensions to the MIME 
database&#8221;</a>.</td>
 </tr>
 <tr>
 <td>Installs <code class="filename">.desktop</code> files under
         <code class="filename">share/applications</code> and these include MIME
         information.</td>
-<td>See <a class="xref" href="#desktop-files" title="19.6.20.�Packages installing desktop files">Section�19.6.20, &#8220;Packages installing desktop files&#8221;</a>.</td>
+<td>See <a class="xref" href="#desktop-files" title="21.6.20.�Packages installing desktop files">Section�21.6.20, &#8220;Packages installing desktop files&#8221;</a>.</td>
 </tr>
 </tbody>
 </table></div>
@@ -9279,7 +9321,7 @@ solution is given.  After applying the s
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="full-update"></a>23.3.�Updating GNOME to a newer version</h2></div></div></div>
+<a name="full-update"></a>25.3.�Updating GNOME to a newer version</h2></div></div></div>
 <p>When seeing GNOME as a whole, there are two kinds of
 updates:</p>
 <div class="variablelist"><dl class="variablelist">
@@ -9368,11 +9410,11 @@ followed:</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="patching"></a>23.4.�Patching guidelines</h2></div></div></div>
+<a name="patching"></a>25.4.�Patching guidelines</h2></div></div></div>
 <p>GNOME is a very big component in pkgsrc which approaches 100
 packages.  Please, it is very important that you always, always,
 <span class="strong"><strong>always</strong></span> feed back any portability
-fixes you do to a GNOME package to the mainstream developers (see <a class="xref" href="#components.patches.feedback" title="11.3.5.�Feedback to the author">Section�11.3.5, &#8220;Feedback to the 
author&#8221;</a>).  This is the only way to get
+fixes you do to a GNOME package to the mainstream developers (see <a class="xref" href="#components.patches.feedback" title="13.3.5.�Feedback to the author">Section�13.3.5, &#8220;Feedback to the 
author&#8221;</a>).  This is the only way to get
 their attention on portability issues and to ensure that future versions
 can be built out-of-the box on NetBSD.  The less custom patches in
 pkgsrc, the easier further updates are.  Those developers in charge of
@@ -9389,7 +9431,7 @@ issues.  While the FreeBSD GNOME people 
 GNOME to their operating system, the official GNOME sources are now
 plagued by conditionals that check for <code class="varname">__FreeBSD__</code>
 and similar macros.  This hurts portability.  Please see our patching
-guidelines (<a class="xref" href="#components.patches.guidelines" title="11.3.4.�Patching guidelines">Section�11.3.4, &#8220;Patching guidelines&#8221;</a>) for more
+guidelines (<a class="xref" href="#components.patches.guidelines" title="13.3.4.�Patching guidelines">Section�13.3.4, &#8220;Patching guidelines&#8221;</a>) for more
 details.</p>
 </div>
 </div>
@@ -9406,64 +9448,64 @@ details.</p>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="chapter"><a href="#infr.design">24. Design of the pkgsrc infrastructure</a></span></dt>
+<dt><span class="chapter"><a href="#infr.design">26. Design of the pkgsrc infrastructure</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#infr.vardef">24.1. The meaning of variable definitions</a></span></dt>
-<dt><span class="sect1"><a href="#infr.vardef.problems">24.2. Avoiding problems before they arise</a></span></dt>
-<dt><span class="sect1"><a href="#infr.var">24.3. Variable evaluation</a></span></dt>
+<dt><span class="sect1"><a href="#infr.vardef">26.1. The meaning of variable definitions</a></span></dt>
+<dt><span class="sect1"><a href="#infr.vardef.problems">26.2. Avoiding problems before they arise</a></span></dt>
+<dt><span class="sect1"><a href="#infr.var">26.3. Variable evaluation</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#infr.var.load">24.3.1. At load time</a></span></dt>
-<dt><span class="sect2"><a href="#infr.var.run">24.3.2. At runtime</a></span></dt>
+<dt><span class="sect2"><a href="#infr.var.load">26.3.1. At load time</a></span></dt>
+<dt><span class="sect2"><a href="#infr.var.run">26.3.2. At runtime</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#infr.varspec">24.4. How can variables be specified?</a></span></dt>
-<dt><span class="sect1"><a href="#infr.design.intf">24.5. Designing interfaces for Makefile fragments</a></span></dt>
+<dt><span class="sect1"><a href="#infr.varspec">26.4. How can variables be specified?</a></span></dt>
+<dt><span class="sect1"><a href="#infr.design.intf">26.5. Designing interfaces for Makefile fragments</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#infr.design.intf.proc">24.5.1. Procedures with parameters</a></span></dt>
-<dt><span class="sect2"><a href="#infr.design.intf.action">24.5.2. Actions taken on behalf of parameters</a></span></dt>
+<dt><span class="sect2"><a href="#infr.design.intf.proc">26.5.1. Procedures with parameters</a></span></dt>
+<dt><span class="sect2"><a href="#infr.design.intf.action">26.5.2. Actions taken on behalf of parameters</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#infr.order">24.6. The order in which files are loaded</a></span></dt>
+<dt><span class="sect1"><a href="#infr.order">26.6. The order in which files are loaded</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#infr.order.prefs">24.6.1. The order in <code class="filename">bsd.prefs.mk</code></a></span></dt>
-<dt><span class="sect2"><a href="#infr.order.pkg">24.6.2. The order in <code class="filename">bsd.pkg.mk</code></a></span></dt>
+<dt><span class="sect2"><a href="#infr.order.prefs">26.6.1. The order in <code class="filename">bsd.prefs.mk</code></a></span></dt>
+<dt><span class="sect2"><a href="#infr.order.pkg">26.6.2. The order in <code class="filename">bsd.pkg.mk</code></a></span></dt>
 </dl></dd>
 </dl></dd>
-<dt><span class="chapter"><a href="#regression">25. Regression tests</a></span></dt>
+<dt><span class="chapter"><a href="#regression">27. Regression tests</a></span></dt>
 <dd><dl>
-<dt><span class="sect1"><a href="#regression.run">25.1. Running the regression tests</a></span></dt>
-<dt><span class="sect1"><a href="#regression.new">25.2. Adding a new regression test</a></span></dt>
+<dt><span class="sect1"><a href="#regression.run">27.1. Running the regression tests</a></span></dt>
+<dt><span class="sect1"><a href="#regression.new">27.2. Adding a new regression test</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#regression.fun.override">25.2.1. Overridable functions</a></span></dt>
-<dt><span class="sect2"><a href="#regression.fun.helper">25.2.2. Helper functions</a></span></dt>
+<dt><span class="sect2"><a href="#regression.fun.override">27.2.1. Overridable functions</a></span></dt>
+<dt><span class="sect2"><a href="#regression.fun.helper">27.2.2. Helper functions</a></span></dt>
 </dl></dd>
 </dl></dd>
-<dt><span class="chapter"><a href="#porting">26. Porting pkgsrc</a></span></dt>
-<dd><dl><dt><span class="sect1"><a href="#porting.opsys">26.1. Porting pkgsrc to a new operating system</a></span></dt></dl></dd>
+<dt><span class="chapter"><a href="#porting">28. Porting pkgsrc</a></span></dt>
+<dd><dl><dt><span class="sect1"><a href="#porting.opsys">28.1. Porting pkgsrc to a new operating system</a></span></dt></dl></dd>
 </dl>
 </div>
 </div>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="infr.design"></a>Chapter�24.�Design of the pkgsrc infrastructure</h2></div></div></div>
+<a name="infr.design"></a>Chapter�26.�Design of the pkgsrc infrastructure</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="sect1"><a href="#infr.vardef">24.1. The meaning of variable definitions</a></span></dt>
-<dt><span class="sect1"><a href="#infr.vardef.problems">24.2. Avoiding problems before they arise</a></span></dt>
-<dt><span class="sect1"><a href="#infr.var">24.3. Variable evaluation</a></span></dt>
+<dt><span class="sect1"><a href="#infr.vardef">26.1. The meaning of variable definitions</a></span></dt>
+<dt><span class="sect1"><a href="#infr.vardef.problems">26.2. Avoiding problems before they arise</a></span></dt>
+<dt><span class="sect1"><a href="#infr.var">26.3. Variable evaluation</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#infr.var.load">24.3.1. At load time</a></span></dt>
-<dt><span class="sect2"><a href="#infr.var.run">24.3.2. At runtime</a></span></dt>
+<dt><span class="sect2"><a href="#infr.var.load">26.3.1. At load time</a></span></dt>
+<dt><span class="sect2"><a href="#infr.var.run">26.3.2. At runtime</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#infr.varspec">24.4. How can variables be specified?</a></span></dt>
-<dt><span class="sect1"><a href="#infr.design.intf">24.5. Designing interfaces for Makefile fragments</a></span></dt>
+<dt><span class="sect1"><a href="#infr.varspec">26.4. How can variables be specified?</a></span></dt>
+<dt><span class="sect1"><a href="#infr.design.intf">26.5. Designing interfaces for Makefile fragments</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#infr.design.intf.proc">24.5.1. Procedures with parameters</a></span></dt>
-<dt><span class="sect2"><a href="#infr.design.intf.action">24.5.2. Actions taken on behalf of parameters</a></span></dt>
+<dt><span class="sect2"><a href="#infr.design.intf.proc">26.5.1. Procedures with parameters</a></span></dt>
+<dt><span class="sect2"><a href="#infr.design.intf.action">26.5.2. Actions taken on behalf of parameters</a></span></dt>
 </dl></dd>
-<dt><span class="sect1"><a href="#infr.order">24.6. The order in which files are loaded</a></span></dt>
+<dt><span class="sect1"><a href="#infr.order">26.6. The order in which files are loaded</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#infr.order.prefs">24.6.1. The order in <code class="filename">bsd.prefs.mk</code></a></span></dt>
-<dt><span class="sect2"><a href="#infr.order.pkg">24.6.2. The order in <code class="filename">bsd.pkg.mk</code></a></span></dt>
+<dt><span class="sect2"><a href="#infr.order.prefs">26.6.1. The order in <code class="filename">bsd.prefs.mk</code></a></span></dt>
+<dt><span class="sect2"><a href="#infr.order.pkg">26.6.2. The order in <code class="filename">bsd.pkg.mk</code></a></span></dt>
 </dl></dd>
 </dl>
 </div>
@@ -9473,7 +9515,7 @@ details.</p>
        like.</p>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="infr.vardef"></a>24.1.�The meaning of variable definitions</h2></div></div></div>
+<a name="infr.vardef"></a>26.1.�The meaning of variable definitions</h2></div></div></div>
 <p>Whenever a variable is defined in the pkgsrc
        infrastructure, the location and the way of definition provide
        much information about the intended use of that variable.
@@ -9504,7 +9546,7 @@ details.</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="infr.vardef.problems"></a>24.2.�Avoiding problems before they arise</h2></div></div></div>
+<a name="infr.vardef.problems"></a>26.2.�Avoiding problems before they arise</h2></div></div></div>
 <p>All variables that contain lists of things should default
        to being empty. Two examples that do not follow this rule are
        <code class="varname">USE_LANGUAGES</code> and
@@ -9528,10 +9570,10 @@ DISTFILES=      ${DISTNAME}${EXTRACT_SUF
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="infr.var"></a>24.3.�Variable evaluation</h2></div></div></div>
+<a name="infr.var"></a>26.3.�Variable evaluation</h2></div></div></div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="infr.var.load"></a>24.3.1.�At load time</h3></div></div></div>
+<a name="infr.var.load"></a>26.3.1.�At load time</h3></div></div></div>
 <p>Variable evaluation takes place either at load time or at
        runtime, depending on the context in which they occur. The
        contexts where variables are evaluated at load time are:</p>
@@ -9573,7 +9615,7 @@ CFLAGS+=                -Wall
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="infr.var.run"></a>24.3.2.�At runtime</h3></div></div></div>
+<a name="infr.var.run"></a>26.3.2.�At runtime</h3></div></div></div>
 <p>After all the files have been loaded, the values of the
        variables cannot be changed anymore. Variables that are used in
        the shell commands are expanded at this point.</p>
@@ -9581,7 +9623,7 @@ CFLAGS+=                -Wall
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="infr.varspec"></a>24.4.�How can variables be specified?</h2></div></div></div>
+<a name="infr.varspec"></a>26.4.�How can variables be specified?</h2></div></div></div>
 <p>There are many ways in which the definition and use of a
        variable can be restricted in order to detect bugs and violations
        of the (mostly unwritten) policies. A package can be checked with
@@ -9590,14 +9632,14 @@ CFLAGS+=                -Wall
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="infr.design.intf"></a>24.5.�Designing interfaces for Makefile fragments</h2></div></div></div>
+<a name="infr.design.intf"></a>26.5.�Designing interfaces for Makefile fragments</h2></div></div></div>
 <p>Most of the <code class="filename">.mk</code> files fall into one
        of the following classes. Cases where a file falls into more
        than one class should be avoided as it often leads to subtle
        bugs.</p>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="infr.design.intf.proc"></a>24.5.1.�Procedures with parameters</h3></div></div></div>
+<a name="infr.design.intf.proc"></a>26.5.1.�Procedures with parameters</h3></div></div></div>
 <p>In a traditional imperative programming language some of
        the <code class="filename">.mk</code> files could be described as
        procedures. They take some input parameters and&mdash;after
@@ -9631,7 +9673,7 @@ CFLAGS+=                -Wall
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="infr.design.intf.action"></a>24.5.2.�Actions taken on behalf of parameters</h3></div></div></div>
+<a name="infr.design.intf.action"></a>26.5.2.�Actions taken on behalf of parameters</h3></div></div></div>
 <p>Action files take some input parameters and may define
        runtime variables. They shall not define loadtime variables.
        There are action files that are included implicitly by the
@@ -9643,7 +9685,7 @@ CFLAGS+=                -Wall
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="infr.order"></a>24.6.�The order in which files are loaded</h2></div></div></div>
+<a name="infr.order"></a>26.6.�The order in which files are loaded</h2></div></div></div>
 <p>Package <code class="filename">Makefile</code>s usually consist of
        a set of variable definitions, and include the file
        <code class="filename">../../mk/bsd.pkg.mk</code> in the very last line.
@@ -9658,7 +9700,7 @@ CFLAGS+=                -Wall
        are loaded and gives reasons for that order.</p>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="infr.order.prefs"></a>24.6.1.�The order in <code class="filename">bsd.prefs.mk</code>
+<a name="infr.order.prefs"></a>26.6.1.�The order in <code class="filename">bsd.prefs.mk</code>
 </h3></div></div></div>
 <p>The very first action in <code class="filename">bsd.prefs.mk</code>
        is to define some essential variables like
@@ -9683,7 +9725,7 @@ CFLAGS+=                -Wall
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="infr.order.pkg"></a>24.6.2.�The order in <code class="filename">bsd.pkg.mk</code>
+<a name="infr.order.pkg"></a>26.6.2.�The order in <code class="filename">bsd.pkg.mk</code>
 </h3></div></div></div>
 <p>First, <code class="filename">bsd.prefs.mk</code> is loaded.</p>
 <p>Then, the various <code class="filename">*-vars.mk</code> files are
@@ -9716,15 +9758,15 @@ CFLAGS+=                -Wall
 </div>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="regression"></a>Chapter�25.�Regression tests</h2></div></div></div>
+<a name="regression"></a>Chapter�27.�Regression tests</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="sect1"><a href="#regression.run">25.1. Running the regression tests</a></span></dt>
-<dt><span class="sect1"><a href="#regression.new">25.2. Adding a new regression test</a></span></dt>
+<dt><span class="sect1"><a href="#regression.run">27.1. Running the regression tests</a></span></dt>
+<dt><span class="sect1"><a href="#regression.new">27.2. Adding a new regression test</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#regression.fun.override">25.2.1. Overridable functions</a></span></dt>
-<dt><span class="sect2"><a href="#regression.fun.helper">25.2.2. Helper functions</a></span></dt>
+<dt><span class="sect2"><a href="#regression.fun.override">27.2.1. Overridable functions</a></span></dt>
+<dt><span class="sect2"><a href="#regression.fun.helper">27.2.2. Helper functions</a></span></dt>
 </dl></dd>
 </dl>
 </div>
@@ -9738,7 +9780,7 @@ CFLAGS+=                -Wall
        how you can add new tests.</p>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="regression.run"></a>25.1.�Running the regression tests</h2></div></div></div>
+<a name="regression.run"></a>27.1.�Running the regression tests</h2></div></div></div>
 <p>You first need to install the <a href="https://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/pkgtools/pkg_regress/README.html"; target="_top"><code class="filename">pkgtools/pkg_regress</code></a> 
package, which
        provides the <span class="command"><strong>pkg_regress</strong></span> command. Then you
        can simply run that command, which will run all tests in the
@@ -9746,7 +9788,7 @@ CFLAGS+=                -Wall
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="regression.new"></a>25.2.�Adding a new regression test</h2></div></div></div>
+<a name="regression.new"></a>27.2.�Adding a new regression test</h2></div></div></div>
 <p>Every directory in the <code class="filename">regress</code>
        category that contains a file called <code class="filename">spec</code>
        is considered a regression test. This file is a shell program
@@ -9755,7 +9797,7 @@ CFLAGS+=                -Wall
        needs.</p>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="regression.fun.override"></a>25.2.1.�Overridable functions</h3></div></div></div>
+<a name="regression.fun.override"></a>27.2.1.�Overridable functions</h3></div></div></div>
 <p>These functions do not take any parameters. Although they
        are called in <span class="quote">&#8220;<span class="quote">set -e</span>&#8221;</span> mode, they don't stop at the
        first failing command. See <a class="ulink" href="http://stackoverflow.com/q/4072984"; target="_top">this StackOverflow
@@ -9802,7 +9844,7 @@ check_result() {
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="regression.fun.helper"></a>25.2.2.�Helper functions</h3></div></div></div>
+<a name="regression.fun.helper"></a>27.2.2.�Helper functions</h3></div></div></div>
 <div class="variablelist"><dl class="variablelist">
 <dt><span class="term"><code class="varname">exit_status expected</code></span></dt>
 <dd><p>This function compares the exitcode of the
@@ -9831,10 +9873,10 @@ output_require "^[[:alpha:]+[[:space:]][
 </div>
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="porting"></a>Chapter�26.�Porting pkgsrc</h2></div></div></div>
+<a name="porting"></a>Chapter�28.�Porting pkgsrc</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc"><dt><span class="sect1"><a href="#porting.opsys">26.1. Porting pkgsrc to a new operating system</a></span></dt></dl>
+<dl class="toc"><dt><span class="sect1"><a href="#porting.opsys">28.1. Porting pkgsrc to a new operating system</a></span></dt></dl>
 </div>
 <p>The pkgsrc system has already been ported to many
        operating systems, hardware architectures and compilers. This
@@ -9842,7 +9884,7 @@ output_require "^[[:alpha:]+[[:space:]][
        portable.</p>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="porting.opsys"></a>26.1.�Porting pkgsrc to a new operating system</h2></div></div></div>
+<a name="porting.opsys"></a>28.1.�Porting pkgsrc to a new operating system</h2></div></div></div>
 <p>To port pkgsrc to a new operating system (called
        <code class="literal">MyOS</code> in this example), you need to touch the
        following files:</p>
@@ -9967,7 +10009,7 @@ looks fine.</pre>
 <code class="prompt">#</code> <strong class="userinput"><code>cd bison</code></strong>
 <code class="prompt">#</code> <strong class="userinput"><code>mkdir patches</code></strong></pre>
 <p>Create <code class="filename">Makefile</code>, <code class="filename">DESCR</code> and
-      <code class="filename">PLIST</code> (see <a class="xref" href="#components" title="Chapter�11.�Package components - files, directories and contents">Chapter�11, <i>Package components - files, 
directories and contents</i></a>)
+      <code class="filename">PLIST</code> (see <a class="xref" href="#components" title="Chapter�13.�Package components - files, directories and contents">Chapter�13, <i>Package components - files, 
directories and contents</i></a>)
       then continue with fetching the distfile:</p>
 <pre class="screen"><code class="prompt">#</code> <strong class="userinput"><code>make fetch</code></strong>
 &gt;&gt; bison-1.25.tar.gz doesn't seem to exist on this system.
@@ -10314,19 +10356,1382 @@ source packages</h2></div></div></div>
 </div>
 <div class="appendix">
 <div class="titlepage"><div><div><h1 class="title">
-<a name="editing"></a>Appendix�D.�Editing guidelines for the pkgsrc guide</h1></div></div></div>
+<a name="help-topics"></a>Appendix�D.�Help topics</h1></div></div></div>
+<p>
+       The following list contains all help topics that are available
+       when running <span class="command"><strong>bmake help topic=:index</strong></span>.
+</p>
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p>#!</p></li>
+<li class="listitem"><p>-lintl</p></li>
+<li class="listitem"><p>64bit</p></li>
+<li class="listitem"><p>ABI</p></li>
+<li class="listitem"><p>ACCEPTABLE_LICENSES</p></li>
+<li class="listitem"><p>ACROREAD_FONTPATH</p></li>
+<li class="listitem"><p>ADDITIONAL</p></li>
+<li class="listitem"><p>AFAIK</p></li>
+<li class="listitem"><p>AIX</p></li>
+<li class="listitem"><p>ALLOW_VULNERABLE_PACKAGES</p></li>
+<li class="listitem"><p>ALL_ENV</p></li>
+<li class="listitem"><p>ALSA_PC</p></li>
+<li class="listitem"><p>ALTERNATIVES_SRC</p></li>
+<li class="listitem"><p>AMANDA_TMP</p></li>
+<li class="listitem"><p>AMANDA_USER</p></li>
+<li class="listitem"><p>AMANDA_VAR</p></li>
+<li class="listitem"><p>APACHE_GROUP</p></li>
+<li class="listitem"><p>APACHE_MODULE_NAME</p></li>
+<li class="listitem"><p>APACHE_MODULE_SRC</p></li>
+<li class="listitem"><p>APACHE_MODULE_SRCDIR</p></li>
+<li class="listitem"><p>APACHE_PKG_PREFIX</p></li>
+<li class="listitem"><p>APACHE_SUEXEC_CONFIGURE_ARGS</p></li>
+<li class="listitem"><p>APACHE_SUEXEC_DOCROOT</p></li>
+<li class="listitem"><p>APACHE_USER</p></li>
+<li class="listitem"><p>APPEND_ABI</p></li>
+<li class="listitem"><p>APPEND_ELF</p></li>
+<li class="listitem"><p>ARLA_CACHE</p></li>
+<li class="listitem"><p>AUDIT_PACKAGES_FLAGS</p></li>
+<li class="listitem"><p>AUTOCONF_REQD</p></li>
+<li class="listitem"><p>AUTOMAKE_OVERRIDE</p></li>
+<li class="listitem"><p>AUTOMAKE_REQD</p></li>
+<li class="listitem"><p>AUTO_MKDIRS</p></li>
+<li class="listitem"><p>BDB185_DEFAULT</p></li>
+<li class="listitem"><p>BDBBASE</p></li>
+<li class="listitem"><p>BDB_ACCEPTED</p></li>
+<li class="listitem"><p>BDB_DEFAULT</p></li>
+<li class="listitem"><p>BDB_LIBS</p></li>
+<li class="listitem"><p>BDB_TYPE</p></li>
+<li class="listitem"><p>BIND_DIR</p></li>
+<li class="listitem"><p>BIND_GROUP</p></li>
+<li class="listitem"><p>BIND_USER</p></li>
+<li class="listitem"><p>BINPKG_SITES</p></li>
+<li class="listitem"><p>BIN_INSTALL_FLAGS</p></li>
+<li class="listitem"><p>BISON_PKGDATADIR</p></li>
+<li class="listitem"><p>BOOTSTRAP_DEPENDS</p></li>
+<li class="listitem"><p>BOOTSTRAP_SETUPTOOLS</p></li>
+<li class="listitem"><p>BROKEN</p></li>
+<li class="listitem"><p>BROKEN_EXCEPT_ON_PLATFORM</p></li>
+<li class="listitem"><p>BROKEN_ON_PLATFORM</p></li>
+<li class="listitem"><p>BSDSRCDIR</p></li>
+<li class="listitem"><p>BSDXSRCDIR</p></li>
+<li class="listitem"><p>BSD_MAKE_ENV</p></li>
+<li class="listitem"><p>BUILDLINK_AUTO_DIRS</p></li>
+<li class="listitem"><p>BUILDLINK_AUTO_VARS</p></li>
+<li class="listitem"><p>BUILDLINK_CFLAGS</p></li>
+<li class="listitem"><p>BUILDLINK_CONTENTS_FILTER</p></li>
+<li class="listitem"><p>BUILDLINK_CPPFLAGS</p></li>
+<li class="listitem"><p>BUILDLINK_DEPMETHOD</p></li>
+<li class="listitem"><p>BUILDLINK_FILES</p></li>
+<li class="listitem"><p>BUILDLINK_FILES_CMD</p></li>
+<li class="listitem"><p>BUILDLINK_FNAME_TRANSFORM</p></li>
+<li class="listitem"><p>BUILDLINK_LDFLAGS</p></li>
+<li class="listitem"><p>BUILDLINK_LIBS</p></li>
+<li class="listitem"><p>BUILDLINK_OPSYS_SUPPORT_PTHREAD</p></li>
+<li class="listitem"><p>BUILDLINK_PKGNAME</p></li>
+<li class="listitem"><p>BUILDLINK_PREFIX</p></li>
+<li class="listitem"><p>BUILDLINK_RPATHDIRS</p></li>
+<li class="listitem"><p>BUILDLINK_TREE</p></li>
+<li class="listitem"><p>BUILD_DEFS</p></li>
+<li class="listitem"><p>BUILD_DEFS_EFFECTS</p></li>
+<li class="listitem"><p>BUILD_DIRS</p></li>
+<li class="listitem"><p>BUILD_ENV_SHELL</p></li>
+<li class="listitem"><p>BUILD_MAKE_CMD</p></li>
+<li class="listitem"><p>BUILD_MAKE_FLAGS</p></li>
+<li class="listitem"><p>BUILD_TARGET</p></li>
+<li class="listitem"><p>BUILTIN_FIND_FILES</p></li>
+<li class="listitem"><p>BUILTIN_FIND_FILES_VAR</p></li>
+<li class="listitem"><p>BUILTIN_FIND_GREP</p></li>
+<li class="listitem"><p>BUILTIN_FIND_HEADERS</p></li>
+<li class="listitem"><p>BUILTIN_FIND_HEADERS_VAR</p></li>
+<li class="listitem"><p>BUILTIN_PKG</p></li>
+<li class="listitem"><p>BUILTIN_TEST_CURSES_DEFINES</p></li>
+<li class="listitem"><p>BUILTIN_TEST_CURSES_FUNCS</p></li>
+<li class="listitem"><p>BUILTIN_VERSION_SCRIPT</p></li>
+<li class="listitem"><p>BUILTIN_X11_TYPE</p></li>
+<li class="listitem"><p>BUILTIN_X11_VERSION</p></li>
+<li class="listitem"><p>CACTI_GROUP</p></li>
+<li class="listitem"><p>CACTI_USER</p></li>
+<li class="listitem"><p>CANNA_GROUP</p></li>
+<li class="listitem"><p>CANNA_USER</p></li>
+<li class="listitem"><p>CAT</p></li>
+<li class="listitem"><p>CCACHE_BASE</p></li>
+<li class="listitem"><p>CCACHE_DIR</p></li>
+<li class="listitem"><p>CCACHE_LOGFILE</p></li>
+<li class="listitem"><p>CC_VERSION</p></li>
+<li class="listitem"><p>CC_VERSION_STRING</p></li>
+<li class="listitem"><p>CDRECORD_CONF</p></li>
+<li class="listitem"><p>CDROM_PKG_URL_DIR</p></li>
+<li class="listitem"><p>CDROM_PKG_URL_HOST</p></li>
+<li class="listitem"><p>CHECKOUT_DATE</p></li>
+<li class="listitem"><p>CHECK_FAKEHOME</p></li>
+<li class="listitem"><p>CHECK_FILES</p></li>
+<li class="listitem"><p>CHECK_FILES_SKIP</p></li>
+<li class="listitem"><p>CHECK_FILES_STRICT</p></li>
+<li class="listitem"><p>CHECK_HEADERS</p></li>
+<li class="listitem"><p>CHECK_HEADERS_SKIP</p></li>
+<li class="listitem"><p>CHECK_INTERPRETER</p></li>
+<li class="listitem"><p>CHECK_INTERPRETER_SKIP</p></li>
+<li class="listitem"><p>CHECK_PERMS</p></li>
+<li class="listitem"><p>CHECK_PERMS_AUTOFIX</p></li>
+<li class="listitem"><p>CHECK_PERMS_SKIP</p></li>
+<li class="listitem"><p>CHECK_PORTABILITY</p></li>
+<li class="listitem"><p>CHECK_PORTABILITY_SKIP</p></li>
+<li class="listitem"><p>CHECK_RELRO</p></li>
+<li class="listitem"><p>CHECK_RELRO_SKIP</p></li>
+<li class="listitem"><p>CHECK_RELRO_SUPPORTED</p></li>
+<li class="listitem"><p>CHECK_SHLIBS</p></li>
+<li class="listitem"><p>CHECK_SHLIBS_BLACKLIST</p></li>
+<li class="listitem"><p>CHECK_SHLIBS_SKIP</p></li>
+<li class="listitem"><p>CHECK_SHLIBS_SUPPORTED</p></li>
+<li class="listitem"><p>CHECK_SSP</p></li>
+<li class="listitem"><p>CHECK_SSP_SKIP</p></li>
+<li class="listitem"><p>CHECK_SSP_SUPPORTED</p></li>
+<li class="listitem"><p>CHECK_STRIPPED</p></li>
+<li class="listitem"><p>CHECK_STRIPPED_SKIP</p></li>
+<li class="listitem"><p>CHECK_WRKREF</p></li>
+<li class="listitem"><p>CHECK_WRKREF_EXTRA_DIRS</p></li>
+<li class="listitem"><p>CHECK_WRKREF_SKIP</p></li>
+<li class="listitem"><p>CLAMAV_DBDIR</p></li>
+<li class="listitem"><p>CLAMAV_GROUP</p></li>
+<li class="listitem"><p>CLAMAV_USER</p></li>
+<li class="listitem"><p>CLANGBASE</p></li>
+<li class="listitem"><p>CLEANDEPENDS</p></li>
+<li class="listitem"><p>CMAKE_DEPENDENCIES_REWRITE</p></li>
+<li class="listitem"><p>CMAKE_INSTALL_PREFIX</p></li>
+<li class="listitem"><p>CMAKE_MODULE_PATH_OVERRIDE</p></li>
+<li class="listitem"><p>CMAKE_PKGSRC_BUILD_FLAGS</p></li>
+<li class="listitem"><p>CMAKE_PREFIX_PATH</p></li>
+<li class="listitem"><p>CMAKE_USE_GNU_INSTALL_DIRS</p></li>
+<li class="listitem"><p>COMMON_LISP_DOCFILES</p></li>
+<li class="listitem"><p>COMMON_LISP_EXAMPLES</p></li>
+<li class="listitem"><p>COMMON_LISP_EXTRAFILES</p></li>
+<li class="listitem"><p>COMMON_LISP_PACKAGES</p></li>
+<li class="listitem"><p>COMMON_LISP_SYSTEM</p></li>
+<li class="listitem"><p>COMPILER_RPATH_FLAG</p></li>
+<li class="listitem"><p>COMPILER_USE_SYMLINKS</p></li>
+<li class="listitem"><p>CONFIGURE_ARGS</p></li>
+<li class="listitem"><p>CONFIGURE_DIRS</p></li>
+<li class="listitem"><p>CONFIGURE_ENV</p></li>
+<li class="listitem"><p>CONFIGURE_HAS_INFODIR</p></li>
+<li class="listitem"><p>CONFIGURE_HAS_MANDIR</p></li>
+<li class="listitem"><p>CONFIGURE_SCRIPT</p></li>
+<li class="listitem"><p>CONFIG_SHELL</p></li>
+<li class="listitem"><p>CONFIG_SHELL_FLAGS</p></li>
+<li class="listitem"><p>CONF_FILES</p></li>
+<li class="listitem"><p>CONF_FILES_MODE</p></li>
+<li class="listitem"><p>CONF_FILES_PERMS</p></li>
+<li class="listitem"><p>CONSERVER_DEFAULTHOST</p></li>
+<li class="listitem"><p>CONSERVER_DEFAULTPORT</p></li>
+<li class="listitem"><p>CP</p></li>
+<li class="listitem"><p>CPP</p></li>
+<li class="listitem"><p>CPP_PRECOMP_FLAGS</p></li>
+<li class="listitem"><p>CREATE_WRKDIR_SYMLINK</p></li>
+<li class="listitem"><p>CROSSBASE</p></li>
+<li class="listitem"><p>CTFCONVERT</p></li>
+<li class="listitem"><p>CTF_FILES_SKIP</p></li>
+<li class="listitem"><p>CTF_SUPPORTED</p></li>
+<li class="listitem"><p>CTYPE</p></li>
+<li class="listitem"><p>CUPS_GROUP</p></li>
+<li class="listitem"><p>CUPS_SYSTEM_GROUPS</p></li>
+<li class="listitem"><p>CUPS_USER</p></li>
+<li class="listitem"><p>CURSES_DEFAULT</p></li>
+<li class="listitem"><p>CURSES_TYPE</p></li>
+<li class="listitem"><p>CVS_EXTRACTDIR</p></li>
+<li class="listitem"><p>CVS_MODULE</p></li>
+<li class="listitem"><p>CVS_PROJECT</p></li>
+<li class="listitem"><p>CVS_REPOSITORIES</p></li>
+<li class="listitem"><p>CVS_ROOT</p></li>
+<li class="listitem"><p>CVS_ROOT_GNU</p></li>
+<li class="listitem"><p>CVS_ROOT_NONGNU</p></li>
+<li class="listitem"><p>CVS_ROOT_SOURCEFORGE</p></li>
+<li class="listitem"><p>CVS_TAG</p></li>
+<li class="listitem"><p>CXX</p></li>
+<li class="listitem"><p>CYRUS_GROUP</p></li>
+<li class="listitem"><p>CYRUS_IDLE</p></li>
+<li class="listitem"><p>CYRUS_USER</p></li>
+<li class="listitem"><p>DAEMONTOOLS_GROUP</p></li>
+<li class="listitem"><p>DAEMONTOOLS_LOG_USER</p></li>
+<li class="listitem"><p>DBUS_GROUP</p></li>
+<li class="listitem"><p>DBUS_USER</p></li>
+<li class="listitem"><p>DEFANG_GROUP</p></li>
+<li class="listitem"><p>DEFANG_USER</p></li>
+<li class="listitem"><p>DEFAULT_ACCEPTABLE_LICENSES</p></li>
+<li class="listitem"><p>DEFAULT_DISTFILES</p></li>
+<li class="listitem"><p>DEFAULT_IRC_SERVER</p></li>
+<li class="listitem"><p>DEFAULT_SERIAL_DEVICE</p></li>
+<li class="listitem"><p>DEF_UMASK</p></li>
+<li class="listitem"><p>DEINSTALLDEPENDS</p></li>
+<li class="listitem"><p>DEINSTALL_SRC</p></li>
+<li class="listitem"><p>DEINSTALL_TEMPLATES</p></li>
+<li class="listitem"><p>DELAYED_ERROR_MSG</p></li>
+<li class="listitem"><p>DELAYED_WARNING_MSG</p></li>
+<li class="listitem"><p>DEPENDS_TARGET</p></li>
+<li class="listitem"><p>DEPENDS_TYPE</p></li>
+<li class="listitem"><p>DESTDIR</p></li>
+<li class="listitem"><p>DESTDIR_VARNAME</p></li>
+<li class="listitem"><p>DIALER_GROUP</p></li>
+<li class="listitem"><p>DIGEST_REQD</p></li>
+<li class="listitem"><p>DISTDIR</p></li>
+<li class="listitem"><p>DISTFILES</p></li>
+<li class="listitem"><p>DISTINFO_FILE</p></li>
+<li class="listitem"><p>DISTNAME</p></li>
+<li class="listitem"><p>DIST_PATH</p></li>
+<li class="listitem"><p>DIST_SUBDIR</p></li>
+<li class="listitem"><p>DJBDNS_AXFR_USER</p></li>
+<li class="listitem"><p>DJBDNS_CACHE_USER</p></li>
+<li class="listitem"><p>DJBDNS_DJBDNS_GROUP</p></li>
+<li class="listitem"><p>DJBDNS_LOG_USER</p></li>
+<li class="listitem"><p>DJBDNS_RBL_USER</p></li>
+<li class="listitem"><p>DJBDNS_TINY_USER</p></li>
+<li class="listitem"><p>DLOPEN_REQUIRE_PTHREADS</p></li>
+<li class="listitem"><p>DL_AUTO_VARS</p></li>
+<li class="listitem"><p>DL_CFLAGS</p></li>
+<li class="listitem"><p>DL_LDFLAGS</p></li>
+<li class="listitem"><p>DL_LIBS</p></li>
+<li class="listitem"><p>DNS</p></li>
+<li class="listitem"><p>DOWNLOADED_DISTFILE</p></li>
+<li class="listitem"><p>DT_LAYOUT</p></li>
+<li class="listitem"><p>DYNAMIC_SITES_CMD</p></li>
+<li class="listitem"><p>DYNAMIC_SITES_SCRIPT</p></li>
+<li class="listitem"><p>ECHO</p></li>
+<li class="listitem"><p>ECHO_N</p></li>
+<li class="listitem"><p>ELK_GUI</p></li>
+<li class="listitem"><p>EMACS_TYPE</p></li>
+<li class="listitem"><p>EMULDIR</p></li>
+<li class="listitem"><p>EMULSUBDIR</p></li>
+<li class="listitem"><p>EMULSUBDIRSLASH</p></li>
+<li class="listitem"><p>EMUL_ARCH</p></li>
+<li class="listitem"><p>EMUL_DISTRO</p></li>
+<li class="listitem"><p>EMUL_EXEC_FMT</p></li>
+<li class="listitem"><p>EMUL_IS_NATIVE</p></li>
+<li class="listitem"><p>EMUL_MODULES</p></li>
+<li class="listitem"><p>EMUL_OPSYS</p></li>
+<li class="listitem"><p>EMUL_PKG_FMT</p></li>
+<li class="listitem"><p>EMUL_PLATFORM</p></li>
+<li class="listitem"><p>EMUL_PLATFORMS</p></li>
+<li class="listitem"><p>EMUL_PREFER</p></li>
+<li class="listitem"><p>EMUL_REQD</p></li>
+<li class="listitem"><p>EMUL_TYPE</p></li>
+<li class="listitem"><p>ERROR_MSG</p></li>
+<li class="listitem"><p>EXIM_GROUP</p></li>
+<li class="listitem"><p>EXIM_USER</p></li>
+<li class="listitem"><p>EXPORT_SYMBOLS_LDFLAGS</p></li>
+<li class="listitem"><p>EXTRACTOR</p></li>
+<li class="listitem"><p>EXTRACT_CMD</p></li>
+<li class="listitem"><p>EXTRACT_CMD_DEFAULT</p></li>
+<li class="listitem"><p>EXTRACT_DIR</p></li>
+<li class="listitem"><p>EXTRACT_ELEMENTS</p></li>
+<li class="listitem"><p>EXTRACT_ENV</p></li>
+<li class="listitem"><p>EXTRACT_ONLY</p></li>
+<li class="listitem"><p>EXTRACT_OPTS</p></li>
+<li class="listitem"><p>EXTRACT_SUFX</p></li>
+<li class="listitem"><p>EXTRACT_USING</p></li>
+<li class="listitem"><p>FAILOVER_FETCH</p></li>
+<li class="listitem"><p>FAIL_MSG</p></li>
+<li class="listitem"><p>FAKE_NCURSES</p></li>
+<li class="listitem"><p>FAM</p></li>
+<li class="listitem"><p>FAM_ACCEPTED</p></li>
+<li class="listitem"><p>FAM_DEFAULT</p></li>
+<li class="listitem"><p>FAM_SERVER</p></li>
+<li class="listitem"><p>FCPATH</p></li>
+<li class="listitem"><p>FEATURE_CPPFLAGS</p></li>
+<li class="listitem"><p>FEATURE_LDFLAGS</p></li>
+<li class="listitem"><p>FEATURE_LIBS</p></li>
+<li class="listitem"><p>FETCH_AFTER_ARGS</p></li>
+<li class="listitem"><p>FETCH_BEFORE_ARGS</p></li>
+<li class="listitem"><p>FETCH_CMD</p></li>
+<li class="listitem"><p>FETCH_OUTPUT_ARGS</p></li>
+<li class="listitem"><p>FETCH_PROXY</p></li>
+<li class="listitem"><p>FETCH_RESUME_ARGS</p></li>
+<li class="listitem"><p>FETCH_USING</p></li>
+<li class="listitem"><p>FILES_SUBST</p></li>
+<li class="listitem"><p>FILES_SUBST_SED</p></li>
+<li class="listitem"><p>FIX_SYSTEM_HEADERS</p></li>
+<li class="listitem"><p>FLUXBOX_USE_GNOME</p></li>
+<li class="listitem"><p>FLUXBOX_USE_KDE</p></li>
+<li class="listitem"><p>FLUXBOX_USE_XFT</p></li>
+<li class="listitem"><p>FLUXBOX_USE_XINERAMA</p></li>
+<li class="listitem"><p>FONTDIR</p></li>
+<li class="listitem"><p>FONTS_DIRS</p></li>
+<li class="listitem"><p>FONTS_VERBOSE</p></li>
+<li class="listitem"><p>FOO_HACKS_MK</p></li>
+<li class="listitem"><p>FOSSIL_EXTRACTDIR</p></li>
+<li class="listitem"><p>FOSSIL_REPO</p></li>
+<li class="listitem"><p>FOSSIL_REPOSITORIES</p></li>
+<li class="listitem"><p>FOSSIL_VERSION</p></li>
+<li class="listitem"><p>FOX_USE_XUNICODE</p></li>
+<li class="listitem"><p>FREEWNN_GROUP</p></li>
+<li class="listitem"><p>FREEWNN_USER</p></li>
+<li class="listitem"><p>FTP_PKG_URL_DIR</p></li>
+<li class="listitem"><p>FTP_PKG_URL_HOST</p></li>
+<li class="listitem"><p>GAMEDATAMODE</p></li>
+<li class="listitem"><p>GAMEDATA_PERMS</p></li>
+<li class="listitem"><p>GAMEDIRMODE</p></li>
+<li class="listitem"><p>GAMEDIR_PERMS</p></li>
+<li class="listitem"><p>GAMEGRP</p></li>
+<li class="listitem"><p>GAMEMODE</p></li>
+<li class="listitem"><p>GAMEOWN</p></li>
+<li class="listitem"><p>GAMES_GROUP</p></li>
+<li class="listitem"><p>GAMES_USER</p></li>
+<li class="listitem"><p>GCC</p></li>
+<li class="listitem"><p>GCCBASE</p></li>
+<li class="listitem"><p>GCC_REQD</p></li>
+<li class="listitem"><p>GCC_VERSION_SUFFIX</p></li>
+<li class="listitem"><p>GEM_BUILD</p></li>
+<li class="listitem"><p>GEM_CLEANBUILD</p></li>
+<li class="listitem"><p>GEM_CLEANBUILD_EXTENSIONS</p></li>
+<li class="listitem"><p>GEM_DOCDIR</p></li>
+<li class="listitem"><p>GEM_EXTSDIR</p></li>
+<li class="listitem"><p>GEM_HOME</p></li>
+<li class="listitem"><p>GEM_LIBDIR</p></li>
+<li class="listitem"><p>GEM_NAME</p></li>
+<li class="listitem"><p>GEM_PATH</p></li>
+<li class="listitem"><p>GEM_SPECFILE</p></li>
+<li class="listitem"><p>GENERATE_PLIST</p></li>
+<li class="listitem"><p>GHOSTSCRIPT_REQD</p></li>
+<li class="listitem"><p>GITHUB_PROJECT</p></li>
+<li class="listitem"><p>GITHUB_RELEASE</p></li>
+<li class="listitem"><p>GITHUB_TAG</p></li>
+<li class="listitem"><p>GITHUB_TYPE</p></li>
+<li class="listitem"><p>GIT_BRANCH</p></li>
+<li class="listitem"><p>GIT_ENV</p></li>
+<li class="listitem"><p>GIT_EXTRACTDIR</p></li>
+<li class="listitem"><p>GIT_REPO</p></li>
+<li class="listitem"><p>GIT_REPOSITORIES</p></li>
+<li class="listitem"><p>GIT_REVISION</p></li>
+<li class="listitem"><p>GIT_TAG</p></li>
+<li class="listitem"><p>GNU</p></li>
+<li class="listitem"><p>GNU_CONFIGURE</p></li>
+<li class="listitem"><p>GNU_CONFIGURE_INFODIR</p></li>
+<li class="listitem"><p>GNU_CONFIGURE_MANDIR</p></li>
+<li class="listitem"><p>GNU_CONFIGURE_STRICT</p></li>
+<li class="listitem"><p>GO_BUILD_PATTERN</p></li>
+<li class="listitem"><p>GO_DIST_BASE</p></li>
+<li class="listitem"><p>GO_SRCPATH</p></li>
+<li class="listitem"><p>GROUP_SPECIFIC_PKGS</p></li>
+<li class="listitem"><p>GRUB_NETWORK_CARDS</p></li>
+<li class="listitem"><p>GRUB_PRESET_COMMAND</p></li>
+<li class="listitem"><p>GRUB_SCAN_ARGS</p></li>
+<li class="listitem"><p>GZIP</p></li>
+<li class="listitem"><p>HASKELL_COMPILER</p></li>
+<li class="listitem"><p>HASKELL_ENABLE_HADDOCK_DOCUMENTATION</p></li>
+<li class="listitem"><p>HASKELL_ENABLE_LIBRARY_PROFILING</p></li>
+<li class="listitem"><p>HASKELL_ENABLE_SHARED_LIBRARY</p></li>
+<li class="listitem"><p>HAS_CONFIGURE</p></li>
+<li class="listitem"><p>HEADER_TEMPLATES</p></li>
+<li class="listitem"><p>HG_REPO</p></li>
+<li class="listitem"><p>HG_REPOSITORIES</p></li>
+<li class="listitem"><p>HG_TAG</p></li>
+<li class="listitem"><p>HOST_PKGTOOLS_ARGS</p></li>
+<li class="listitem"><p>HOST_SPECIFIC_PKGS</p></li>
+<li class="listitem"><p>HOWL_GROUP</p></li>
+<li class="listitem"><p>HOWL_USER</p></li>
+<li class="listitem"><p>ICCBASE</p></li>
+<li class="listitem"><p>ICECAST_CHROOTDIR</p></li>
+<li class="listitem"><p>ICON_THEMES</p></li>
+<li class="listitem"><p>IDOBASE</p></li>
+<li class="listitem"><p>IGNORE_CCACHE</p></li>
+<li class="listitem"><p>IGNORE_INFO_DIRS</p></li>
+<li class="listitem"><p>IGNORE_INTERACTIVE_FETCH</p></li>
+<li class="listitem"><p>IMAKE</p></li>
+<li class="listitem"><p>IMAKEOPTS</p></li>
+<li class="listitem"><p>IMAKE_MAKE</p></li>
+<li class="listitem"><p>IMAKE_MANINSTALL</p></li>
+<li class="listitem"><p>IMAP_UW_CCLIENT_MBOX_FMT</p></li>
+<li class="listitem"><p>IMDICTDIR</p></li>
+<li class="listitem"><p>INCOMPAT_CURSES</p></li>
+<li class="listitem"><p>INFO_DIR</p></li>
+<li class="listitem"><p>INFO_FILES</p></li>
+<li class="listitem"><p>INFO_FILES_VERBOSE</p></li>
+<li class="listitem"><p>INFO_MSG</p></li>
+<li class="listitem"><p>INIT_SYSTEM</p></li>
+<li class="listitem"><p>INN_DATA_DIR</p></li>
+<li class="listitem"><p>INN_GROUP</p></li>
+<li class="listitem"><p>INN_USER</p></li>
+<li class="listitem"><p>INSTALLATION_DIRS</p></li>
+<li class="listitem"><p>INSTALLATION_DIRS_FROM_PLIST</p></li>
+<li class="listitem"><p>INSTALL_ENV</p></li>
+<li class="listitem"><p>INSTALL_SH_OVERRIDE</p></li>
+<li class="listitem"><p>INSTALL_SRC</p></li>
+<li class="listitem"><p>INSTALL_TEMPLATES</p></li>
+<li class="listitem"><p>INSTALL_UNSTRIPPED</p></li>
+<li class="listitem"><p>IRCD_HYBRID_IRC_GROUP</p></li>
+<li class="listitem"><p>IRCD_HYBRID_IRC_USER</p></li>
+<li class="listitem"><p>IRCD_HYBRID_MAXCONN</p></li>
+<li class="listitem"><p>IRCD_HYBRID_NICLEN</p></li>
+<li class="listitem"><p>IRCD_HYBRID_SYSLOG_EVENTS</p></li>
+<li class="listitem"><p>IRCD_HYBRID_SYSLOG_FACILITY</p></li>
+<li class="listitem"><p>IRCD_HYBRID_TOPICLEN</p></li>
+<li class="listitem"><p>IRIX</p></li>
+<li class="listitem"><p>IRRD_USE_PGP</p></li>
+<li class="listitem"><p>JABBERD_GROUP</p></li>
+<li class="listitem"><p>JABBERD_LOGDIR</p></li>
+<li class="listitem"><p>JABBERD_PIDDIR</p></li>
+<li class="listitem"><p>JABBERD_SPOOLDIR</p></li>
+<li class="listitem"><p>JABBERD_USER</p></li>
+<li class="listitem"><p>JAKARTA_HOME</p></li>
+<li class="listitem"><p>JAVA_APP_PATH</p></li>
+<li class="listitem"><p>JAVA_APP_TARGETS</p></li>
+<li class="listitem"><p>JAVA_BINPREFIX</p></li>
+<li class="listitem"><p>JAVA_CLASSPATH</p></li>
+<li class="listitem"><p>JAVA_HOME</p></li>
+<li class="listitem"><p>JAVA_LD_LIBRARY_PATH</p></li>
+<li class="listitem"><p>JAVA_NAME</p></li>
+<li class="listitem"><p>JAVA_UNLIMIT</p></li>
+<li class="listitem"><p>JAVA_WRAPPERS</p></li>
+<li class="listitem"><p>JPEG_ACCEPTED</p></li>
+<li class="listitem"><p>JPEG_DEFAULT</p></li>
+<li class="listitem"><p>KERBEROS</p></li>
+<li class="listitem"><p>KERMIT_SUID_UUCP</p></li>
+<li class="listitem"><p>KJS_USE_PCRE</p></li>
+<li class="listitem"><p>KNEWS_DOMAIN_FILE</p></li>
+<li class="listitem"><p>KNEWS_DOMAIN_NAME</p></li>
+<li class="listitem"><p>KRB5_ACCEPTED</p></li>
+<li class="listitem"><p>KRB5_DEFAULT</p></li>
+<li class="listitem"><p>LANGUAGES</p></li>
+<li class="listitem"><p>LATEX2HTML_ICONPATH</p></li>
+<li class="listitem"><p>LDCONFIG_ADD_CMD</p></li>
+<li class="listitem"><p>LDCONFIG_REMOVE_CMD</p></li>
+<li class="listitem"><p>LEAFNODE_DATA_DIR</p></li>
+<li class="listitem"><p>LEAFNODE_GROUP</p></li>
+<li class="listitem"><p>LEAFNODE_USER</p></li>
+<li class="listitem"><p>LIBDVDCSS_HOMEPAGE</p></li>
+<li class="listitem"><p>LIBDVDCSS_MASTER_SITES</p></li>
+<li class="listitem"><p>LIBTOOL</p></li>
+<li class="listitem"><p>LIBTOOLIZE_PLIST</p></li>
+<li class="listitem"><p>LIBTOOL_M4_OVERRIDE</p></li>
+<li class="listitem"><p>LIBUSB_TYPE</p></li>
+<li class="listitem"><p>LICENSE</p></li>
+<li class="listitem"><p>LINKER_RPATH_FLAG</p></li>
+<li class="listitem"><p>LINK_RPATH_FLAG</p></li>
+<li class="listitem"><p>LINUX_BASE_NODEPS</p></li>
+<li class="listitem"><p>LINUX_BASE_PREFERRED</p></li>
+<li class="listitem"><p>LINUX_BASE_REQUIRED</p></li>
+<li class="listitem"><p>LINUX_LOCALES</p></li>
+<li class="listitem"><p>LOCALBASE</p></li>
+<li class="listitem"><p>LOCALBASE_LOCKTYPE</p></li>
+<li class="listitem"><p>LOCALPATCHES</p></li>
+<li class="listitem"><p>LOVE_DATA</p></li>
+<li class="listitem"><p>LOVE_GAME</p></li>
+<li class="listitem"><p>LOVE_VERSION</p></li>
+<li class="listitem"><p>LP64PLATFORMS</p></li>
+<li class="listitem"><p>MACHINE_PLATFORM</p></li>
+<li class="listitem"><p>MAILAGENT_DOMAIN</p></li>
+<li class="listitem"><p>MAILAGENT_EMAIL</p></li>
+<li class="listitem"><p>MAILAGENT_FQDN</p></li>
+<li class="listitem"><p>MAILAGENT_ORGANIZATION</p></li>
+<li class="listitem"><p>MAJORDOMO_HOMEDIR</p></li>
+<li class="listitem"><p>MAJOR_OS_VERSION</p></li>
+<li class="listitem"><p>MAKEINFO_ARGS</p></li>
+<li class="listitem"><p>MAKE_DIRS</p></li>
+<li class="listitem"><p>MAKE_DIRS_PERMS</p></li>
+<li class="listitem"><p>MAKE_ENV</p></li>
+<li class="listitem"><p>MAKE_FILE</p></li>
+<li class="listitem"><p>MAKE_FLAGS</p></li>
+<li class="listitem"><p>MAKE_JOBS</p></li>
+<li class="listitem"><p>MAKE_JOBS_SAFE</p></li>
+<li class="listitem"><p>MAKE_PROGRAM</p></li>
+<li class="listitem"><p>MANINSTALL</p></li>
+<li class="listitem"><p>MANZ</p></li>
+<li class="listitem"><p>MASTER_SITES</p></li>
+<li class="listitem"><p>MASTER_SITE_BACKUP</p></li>
+<li class="listitem"><p>MASTER_SITE_CYGWIN</p></li>
+<li class="listitem"><p>MASTER_SITE_GNOME</p></li>
+<li class="listitem"><p>MASTER_SITE_GNU</p></li>
+<li class="listitem"><p>MASTER_SITE_LOCAL</p></li>
+<li class="listitem"><p>MASTER_SITE_MOZILLA</p></li>
+<li class="listitem"><p>MASTER_SITE_OPENOFFICE</p></li>
+<li class="listitem"><p>MASTER_SITE_OVERRIDE</p></li>
+<li class="listitem"><p>MASTER_SITE_PERL_CPAN</p></li>
+<li class="listitem"><p>MASTER_SITE_SUNSITE</p></li>
+<li class="listitem"><p>MASTER_SITE_SUSE</p></li>
+<li class="listitem"><p>MASTER_SITE_TEX_CTAN</p></li>
+<li class="listitem"><p>MASTER_SITE_XCONTRIB</p></li>
+<li class="listitem"><p>MASTER_SITE_XEMACS</p></li>
+<li class="listitem"><p>MASTER_SORT</p></li>
+<li class="listitem"><p>MASTER_SORT_RANDOM</p></li>
+<li class="listitem"><p>MASTER_SORT_REGEX</p></li>
+<li class="listitem"><p>MECAB_CHARSET</p></li>
+<li class="listitem"><p>MEDIATOMB_GROUP</p></li>
+<li class="listitem"><p>MEDIATOMB_USER</p></li>
+<li class="listitem"><p>MIPSPROBASE</p></li>
+<li class="listitem"><p>MIREDO_GROUP</p></li>
+<li class="listitem"><p>MIREDO_USER</p></li>
+<li class="listitem"><p>MISSING_FEATURES</p></li>
+<li class="listitem"><p>MKDIR</p></li>
+<li class="listitem"><p>MLDONKEY_GROUP</p></li>
+<li class="listitem"><p>MLDONKEY_HOME</p></li>
+<li class="listitem"><p>MLDONKEY_USER</p></li>
+<li class="listitem"><p>MONOTONE_GROUP</p></li>
+<li class="listitem"><p>MONOTONE_USER</p></li>
+<li class="listitem"><p>MOTIFBASE</p></li>
+<li class="listitem"><p>MOTIF_TYPE</p></li>
+<li class="listitem"><p>MOTIF_TYPE_DEFAULT</p></li>
+<li class="listitem"><p>MPI_TYPE</p></li>
+<li class="listitem"><p>MSGFMT_STRIP_MSGCTXT</p></li>
+<li class="listitem"><p>MSGFMT_STRIP_MSGID_PLURAL</p></li>
+<li class="listitem"><p>MTOOLS_ENABLE_FLOPPYD</p></li>
+<li class="listitem"><p>MUST</p></li>
+<li class="listitem"><p>MV</p></li>
+<li class="listitem"><p>MYSQL_CHARSET</p></li>
+<li class="listitem"><p>MYSQL_DATADIR</p></li>
+<li class="listitem"><p>MYSQL_EXTRA_CHARSET</p></li>
+<li class="listitem"><p>MYSQL_GROUP</p></li>
+<li class="listitem"><p>MYSQL_PKGSRCDIR</p></li>
+<li class="listitem"><p>MYSQL_USER</p></li>
+<li class="listitem"><p>MYSQL_VERSIONS_ACCEPTED</p></li>
+<li class="listitem"><p>MYSQL_VERSION_DEFAULT</p></li>
+<li class="listitem"><p>NAGIOSCMD_GROUP</p></li>
+<li class="listitem"><p>NAGIOSDIR</p></li>
+<li class="listitem"><p>NAGIOS_GROUP</p></li>
+<li class="listitem"><p>NAGIOS_USER</p></li>
+<li class="listitem"><p>NATIVE_APPEND_ABI</p></li>
+<li class="listitem"><p>NATIVE_APPEND_ELF</p></li>
+<li class="listitem"><p>NATIVE_EXEC_FMT</p></li>
+<li class="listitem"><p>NATIVE_MACHINE_PLATFORM</p></li>
+<li class="listitem"><p>NATIVE_OBJECT_FMT</p></li>
+<li class="listitem"><p>NBPAX_PROGRAM_PREFIX</p></li>
+<li class="listitem"><p>NETBSD_LOGIN_NAME</p></li>
+<li class="listitem"><p>NMH_EDITOR</p></li>
+<li class="listitem"><p>NMH_MTA</p></li>
+<li class="listitem"><p>NMH_PAGER</p></li>
+<li class="listitem"><p>NOLOGIN</p></li>
+<li class="listitem"><p>NONZERO_FILESIZE_P</p></li>
+<li class="listitem"><p>NOTE</p></li>
+<li class="listitem"><p>NOT_FOR_PLATFORM</p></li>
+<li class="listitem"><p>NOT_PAX_ASLR_SAFE</p></li>
+<li class="listitem"><p>NOT_PAX_MPROTECT_SAFE</p></li>
+<li class="listitem"><p>NO_BUILD</p></li>
+<li class="listitem"><p>NO_CHECKSUM</p></li>
+<li class="listitem"><p>NO_CONFIGURE</p></li>
+<li class="listitem"><p>NO_SKIP</p></li>
+<li class="listitem"><p>NS_PREFERRED</p></li>
+<li class="listitem"><p>NULLMAILER_GROUP</p></li>
+<li class="listitem"><p>NULLMAILER_USER</p></li>
+<li class="listitem"><p>OASIS</p></li>
+<li class="listitem"><p>OASIS_BUILD_ARGS</p></li>
+<li class="listitem"><p>OBJHOSTNAME</p></li>
+<li class="listitem"><p>OBJMACHINE</p></li>
+<li class="listitem"><p>OCAML_FINDLIB_DIRS</p></li>
+<li class="listitem"><p>OCAML_FINDLIB_REGISTER</p></li>
+<li class="listitem"><p>OCAML_FINDLIB_REGISTER_VERBOSE</p></li>
+<li class="listitem"><p>OCAML_SITELIBDIR</p></li>
+<li class="listitem"><p>OCAML_TOPKG_DOCDIR</p></li>
+<li class="listitem"><p>OCAML_USE_DUNE</p></li>
+<li class="listitem"><p>OCAML_USE_FINDLIB</p></li>
+<li class="listitem"><p>OCAML_USE_JBUILDER</p></li>
+<li class="listitem"><p>OCAML_USE_OASIS</p></li>
+<li class="listitem"><p>OCAML_USE_OASIS_DYNRUN</p></li>
+<li class="listitem"><p>OCAML_USE_OPAM</p></li>
+<li class="listitem"><p>OCAML_USE_OPT_COMPILER</p></li>
+<li class="listitem"><p>OCAML_USE_TOPKG</p></li>
+<li class="listitem"><p>OMF</p></li>
+<li class="listitem"><p>ONLY_FOR_COMPILER</p></li>
+<li class="listitem"><p>ONLY_FOR_PLATFORM</p></li>
+<li class="listitem"><p>OPENSSH_CHROOT</p></li>
+<li class="listitem"><p>OPENSSH_GROUP</p></li>
+<li class="listitem"><p>OPENSSH_USER</p></li>
+<li class="listitem"><p>OPSYS</p></li>
+<li class="listitem"><p>OPSYS_EMULDIR</p></li>
+<li class="listitem"><p>OSS_TYPE</p></li>
+<li class="listitem"><p>OSX</p></li>
+<li class="listitem"><p>OSX_TOLERATE_SDK_SKEW</p></li>
+<li class="listitem"><p>OS_HAVE_ALSA</p></li>
+<li class="listitem"><p>OS_HAVE_RCD</p></li>
+<li class="listitem"><p>OS_VARIANT</p></li>
+<li class="listitem"><p>OS_VERSION</p></li>
+<li class="listitem"><p>OTF_FONTS_DIR</p></li>
+<li class="listitem"><p>OVERRIDE_DIRDEPTH</p></li>
+<li class="listitem"><p>OVERRIDE_GEMSPEC</p></li>
+<li class="listitem"><p>OVERRIDE_GNU_CONFIG_SCRIPTS</p></li>
+<li class="listitem"><p>OVERRIDE_ROCKSPEC</p></li>
+<li class="listitem"><p>OWN_DIRS</p></li>
+<li class="listitem"><p>OWN_DIRS_PERMS</p></li>
+<li class="listitem"><p>P4GROUP</p></li>
+<li class="listitem"><p>P4PORT</p></li>
+<li class="listitem"><p>P4ROOT</p></li>
+<li class="listitem"><p>P4USER</p></li>
+<li class="listitem"><p>PACKAGES</p></li>
+<li class="listitem"><p>PALMOS_DEFAULT_SDK</p></li>
+<li class="listitem"><p>PAMBASE</p></li>
+<li class="listitem"><p>PAM_DEFAULT</p></li>
+<li class="listitem"><p>PAPERSIZE</p></li>
+<li class="listitem"><p>PASSIVE_FETCH</p></li>
+<li class="listitem"><p>PATCHDIR</p></li>
+<li class="listitem"><p>PATCHFILES</p></li>
+<li class="listitem"><p>PATCH_ARGS</p></li>
+<li class="listitem"><p>PATCH_DEBUG</p></li>
+<li class="listitem"><p>PATCH_DIST_ARGS</p></li>
+<li class="listitem"><p>PATCH_DIST_CAT</p></li>
+<li class="listitem"><p>PATCH_DIST_STRIP</p></li>
+<li class="listitem"><p>PATCH_FUZZ_FACTOR</p></li>
+<li class="listitem"><p>PATCH_STRIP</p></li>
+<li class="listitem"><p>PATH</p></li>
+<li class="listitem"><p>PCCBASE</p></li>
+<li class="listitem"><p>PEAR</p></li>
+<li class="listitem"><p>PEAR_CHANNEL</p></li>
+<li class="listitem"><p>PEAR_CHANNEL_ALIAS</p></li>
+<li class="listitem"><p>PEAR_CHANNEL_VERSION</p></li>
+<li class="listitem"><p>PEAR_CMD</p></li>
+<li class="listitem"><p>PEAR_LIB</p></li>
+<li class="listitem"><p>PEAR_PACKAGE_XML</p></li>
+<li class="listitem"><p>PERL5</p></li>
+<li class="listitem"><p>PERL5_CONFIGURE</p></li>
+<li class="listitem"><p>PERL5_CONFIGURE_DIRS</p></li>
+<li class="listitem"><p>PERL5_LDFLAGS</p></li>
+<li class="listitem"><p>PERL5_LICENSE</p></li>
+<li class="listitem"><p>PERL5_MODULE_TYPE</p></li>
+<li class="listitem"><p>PERL5_PACKLIST</p></li>
+<li class="listitem"><p>PERL5_PACKLIST_DIR</p></li>
+<li class="listitem"><p>PERL5_PERLBASE</p></li>
+<li class="listitem"><p>PERL5_SITEBASE</p></li>
+<li class="listitem"><p>PERL5_USE_PACKLIST</p></li>
+<li class="listitem"><p>PERL5_VENDORBASE</p></li>
+<li class="listitem"><p>PFCTL</p></li>
+<li class="listitem"><p>PFVAR_H</p></li>
+<li class="listitem"><p>PF_VERSION</p></li>
+<li class="listitem"><p>PGGROUP</p></li>
+<li class="listitem"><p>PGHOME</p></li>
+<li class="listitem"><p>PGPKGSRCDIR</p></li>
+<li class="listitem"><p>PGSQL_TYPE</p></li>
+<li class="listitem"><p>PGSQL_VERSIONS_ACCEPTED</p></li>
+<li class="listitem"><p>PGSQL_VERSION_DEFAULT</p></li>
+<li class="listitem"><p>PGUSER</p></li>
+<li class="listitem"><p>PG_LIB_EXT</p></li>
+<li class="listitem"><p>PHP</p></li>
+<li class="listitem"><p>PHPCOMMON_MK</p></li>
+<li class="listitem"><p>PHPPKGSRCDIR</p></li>
+<li class="listitem"><p>PHP_BASE_VERS</p></li>
+<li class="listitem"><p>PHP_CHECK_INSTALLED</p></li>
+<li class="listitem"><p>PHP_EXTENSION_DIR</p></li>
+<li class="listitem"><p>PHP_INITIAL_TEENY</p></li>
+<li class="listitem"><p>PHP_PKG_PREFIX</p></li>
+<li class="listitem"><p>PHP_VERSION</p></li>
+<li class="listitem"><p>PHP_VERSIONS_ACCEPTED</p></li>
+<li class="listitem"><p>PHP_VERSIONS_INCOMPATIBLE</p></li>
+<li class="listitem"><p>PHP_VERSION_DEFAULT</p></li>
+<li class="listitem"><p>PHP_VERSION_REQD</p></li>
+<li class="listitem"><p>PILRC_USE_GTK</p></li>
+<li class="listitem"><p>PKGCONFIG_BASE</p></li>
+<li class="listitem"><p>PKGCONFIG_FILE</p></li>
+<li class="listitem"><p>PKGCONFIG_OVERRIDE</p></li>
+<li class="listitem"><p>PKGCONFIG_OVERRIDE_STAGE</p></li>
+<li class="listitem"><p>PKGDIR</p></li>
+<li class="listitem"><p>PKGGNUDIR</p></li>
+<li class="listitem"><p>PKGINFODIR</p></li>
+<li class="listitem"><p>PKGLOCALEDIR</p></li>
+<li class="listitem"><p>PKGMANDIR</p></li>
+<li class="listitem"><p>PKGNAME</p></li>
+<li class="listitem"><p>PKGNAME_REQD</p></li>
+<li class="listitem"><p>PKGPATH</p></li>
+<li class="listitem"><p>PKGREVISION</p></li>
+<li class="listitem"><p>PKGSRC_CHANGES</p></li>
+<li class="listitem"><p>PKGSRC_COMPILER</p></li>
+<li class="listitem"><p>PKGSRC_KEEP_BIN_PKGS</p></li>
+<li class="listitem"><p>PKGSRC_LOCKTYPE</p></li>
+<li class="listitem"><p>PKGSRC_MAKE_ENV</p></li>
+<li class="listitem"><p>PKGSRC_MESSAGE_RECIPIENTS</p></li>
+<li class="listitem"><p>PKGSRC_MKPIE</p></li>
+<li class="listitem"><p>PKGSRC_MKREPRO</p></li>
+<li class="listitem"><p>PKGSRC_RUN_TEST</p></li>
+<li class="listitem"><p>PKGSRC_SETENV</p></li>
+<li class="listitem"><p>PKGSRC_SLEEPSECS</p></li>
+<li class="listitem"><p>PKGSRC_TODO</p></li>
+<li class="listitem"><p>PKGSRC_USE_CTF</p></li>
+<li class="listitem"><p>PKGSRC_USE_FORTIFY</p></li>
+<li class="listitem"><p>PKGSRC_USE_RELRO</p></li>
+<li class="listitem"><p>PKGSRC_USE_SSP</p></li>
+<li class="listitem"><p>PKGSRC_USE_STACK_CHECK</p></li>
+<li class="listitem"><p>PKGTASKS_DATAFILE</p></li>
+<li class="listitem"><p>PKGTOOLS_ARGS</p></li>
+<li class="listitem"><p>PKGTOOLS_ENV</p></li>
+<li class="listitem"><p>PKG_ALTERNATIVES</p></li>
+<li class="listitem"><p>PKG_APACHE</p></li>
+<li class="listitem"><p>PKG_APACHE_ACCEPTED</p></li>
+<li class="listitem"><p>PKG_APACHE_DEFAULT</p></li>
+<li class="listitem"><p>PKG_BEST_EXISTS</p></li>
+<li class="listitem"><p>PKG_BUILD_OPTIONS</p></li>
+<li class="listitem"><p>PKG_COMPRESSION</p></li>
+<li class="listitem"><p>PKG_CONFIG</p></li>
+<li class="listitem"><p>PKG_CONFIG_PERMS</p></li>
+<li class="listitem"><p>PKG_CREATE_USERGROUP</p></li>
+<li class="listitem"><p>PKG_DB_TMPDIR</p></li>
+<li class="listitem"><p>PKG_DEBUG_LEVEL</p></li>
+<li class="listitem"><p>PKG_DEFAULT_OPTIONS</p></li>
+<li class="listitem"><p>PKG_DESTDIR_SUPPORT</p></li>
+<li class="listitem"><p>PKG_DEVELOPER</p></li>
+<li class="listitem"><p>PKG_DISABLED_OPTIONS</p></li>
+<li class="listitem"><p>PKG_FATAL_ERRORS</p></li>
+<li class="listitem"><p>PKG_FC</p></li>
+<li class="listitem"><p>PKG_FILELIST_CMD</p></li>
+<li class="listitem"><p>PKG_GECOS</p></li>
+<li class="listitem"><p>PKG_GID</p></li>
+<li class="listitem"><p>PKG_GROUPS</p></li>
+<li class="listitem"><p>PKG_GROUPS_VARS</p></li>
+<li class="listitem"><p>PKG_HOME</p></li>
+<li class="listitem"><p>PKG_INIT_SCRIPTS</p></li>
+<li class="listitem"><p>PKG_JAVA_HOME</p></li>
+<li class="listitem"><p>PKG_JVM</p></li>
+<li class="listitem"><p>PKG_JVMS_ACCEPTED</p></li>
+<li class="listitem"><p>PKG_JVM_DEFAULT</p></li>
+<li class="listitem"><p>PKG_LEGACY_OPTIONS</p></li>
+<li class="listitem"><p>PKG_LIBTOOL</p></li>
+<li class="listitem"><p>PKG_OPTIONS</p></li>
+<li class="listitem"><p>PKG_OPTIONS_DEPRECATED_WARNINGS</p></li>
+<li class="listitem"><p>PKG_OPTIONS_LEGACY_OPTS</p></li>
+<li class="listitem"><p>PKG_OPTIONS_LEGACY_VARS</p></li>
+<li class="listitem"><p>PKG_OPTIONS_NONEMPTY_SETS</p></li>
+<li class="listitem"><p>PKG_OPTIONS_OPTIONAL_GROUPS</p></li>
+<li class="listitem"><p>PKG_OPTIONS_REQUIRED_GROUPS</p></li>
+<li class="listitem"><p>PKG_OPTIONS_VAR</p></li>
+<li class="listitem"><p>PKG_PHP</p></li>
+<li class="listitem"><p>PKG_PHP_MAJOR_VERS</p></li>
+<li class="listitem"><p>PKG_PHP_VERSION</p></li>
+<li class="listitem"><p>PKG_RCD_SCRIPTS</p></li>
+<li class="listitem"><p>PKG_REFCOUNT_DBDIR</p></li>
+<li class="listitem"><p>PKG_REGISTER_SHELLS</p></li>
+<li class="listitem"><p>PKG_RESUME_TRANSFERS</p></li>
+<li class="listitem"><p>PKG_SHELL</p></li>
+<li class="listitem"><p>PKG_SUGGESTED_OPTIONS</p></li>
+<li class="listitem"><p>PKG_SUPPORTED_OPTIONS</p></li>
+<li class="listitem"><p>PKG_SYSCONFBASE</p></li>
+<li class="listitem"><p>PKG_SYSCONFBASEDIR</p></li>
+<li class="listitem"><p>PKG_SYSCONFDIR</p></li>
+<li class="listitem"><p>PKG_SYSCONFDIR_PERMS</p></li>
+<li class="listitem"><p>PKG_SYSCONFSUBDIR</p></li>
+<li class="listitem"><p>PKG_SYSCONFVAR</p></li>
+<li class="listitem"><p>PKG_TOOLS_BIN</p></li>
+<li class="listitem"><p>PKG_UID</p></li>
+<li class="listitem"><p>PKG_UPDATE_FONTS_DB</p></li>
+<li class="listitem"><p>PKG_USERS</p></li>
+<li class="listitem"><p>PKG_USERS_VARS</p></li>
+<li class="listitem"><p>PKG_VERBOSE</p></li>
+<li class="listitem"><p>PLIST</p></li>
+<li class="listitem"><p>PLIST_AWK</p></li>
+<li class="listitem"><p>PLIST_AWK_ENV</p></li>
+<li class="listitem"><p>PLIST_SRC</p></li>
+<li class="listitem"><p>PLIST_SUBST</p></li>
+<li class="listitem"><p>PLIST_TYPE</p></li>
+<li class="listitem"><p>PLIST_VARS</p></li>
+<li class="listitem"><p>POPTOP_USE_MPPE</p></li>
+<li class="listitem"><p>POST_FETCH_HOOK</p></li>
+<li class="listitem"><p>PREFER</p></li>
+<li class="listitem"><p>PREFER_NATIVE</p></li>
+<li class="listitem"><p>PREFER_NATIVE_PTHREADS</p></li>
+<li class="listitem"><p>PREFER_PKGSRC</p></li>
+<li class="listitem"><p>PREFIX</p></li>
+<li class="listitem"><p>PREPEND_PATH</p></li>
+<li class="listitem"><p>PRE_ROOT_CMD</p></li>
+<li class="listitem"><p>PRIVILEGED_STAGES</p></li>
+<li class="listitem"><p>PS</p></li>
+<li class="listitem"><p>PTHREAD_AUTO_VARS</p></li>
+<li class="listitem"><p>PTHREAD_CFLAGS</p></li>
+<li class="listitem"><p>PTHREAD_LDFLAGS</p></li>
+<li class="listitem"><p>PTHREAD_LIBS</p></li>
+<li class="listitem"><p>PTHREAD_OPTS</p></li>
+<li class="listitem"><p>PTHREAD_TYPE</p></li>
+<li class="listitem"><p>PVM_SSH</p></li>
+<li class="listitem"><p>PYPKGPREFIX</p></li>
+<li class="listitem"><p>PYTHON_FOR_BUILD_ONLY</p></li>
+<li class="listitem"><p>PYTHON_SELF_CONFLICT</p></li>
+<li class="listitem"><p>PYTHON_VERSIONED_DEPENDENCIES</p></li>
+<li class="listitem"><p>PYTHON_VERSIONS_ACCEPTED</p></li>
+<li class="listitem"><p>PYTHON_VERSIONS_INCOMPATIBLE</p></li>
+<li class="listitem"><p>PYTHON_VERSION_DEFAULT</p></li>
+<li class="listitem"><p>PYTHON_VERSION_REQD</p></li>
+<li class="listitem"><p>PYVERSSUFFIX</p></li>
+<li class="listitem"><p>PY_NO_EGG</p></li>
+<li class="listitem"><p>QMAILDIR</p></li>
+<li class="listitem"><p>QMAIL_ALIAS_USER</p></li>
+<li class="listitem"><p>QMAIL_DAEMON_USER</p></li>
+<li class="listitem"><p>QMAIL_LOG_USER</p></li>
+<li class="listitem"><p>QMAIL_NOFILES_GROUP</p></li>
+<li class="listitem"><p>QMAIL_PASSWD_USER</p></li>
+<li class="listitem"><p>QMAIL_QMAIL_GROUP</p></li>
+<li class="listitem"><p>QMAIL_QUEUE_DIR</p></li>
+<li class="listitem"><p>QMAIL_QUEUE_EXTRA</p></li>
+<li class="listitem"><p>QMAIL_QUEUE_USER</p></li>
+<li class="listitem"><p>QMAIL_REMOTE_USER</p></li>
+<li class="listitem"><p>QMAIL_ROOT_USER</p></li>
+<li class="listitem"><p>QMAIL_SEND_USER</p></li>
+<li class="listitem"><p>QPOPPER_FAC</p></li>
+<li class="listitem"><p>QPOPPER_SPOOL_DIR</p></li>
+<li class="listitem"><p>QPOPPER_USER</p></li>
+<li class="listitem"><p>RAKE_NAME</p></li>
+<li class="listitem"><p>RASMOL_DEPTH</p></li>
+<li class="listitem"><p>RCD_DIR</p></li>
+<li class="listitem"><p>RCD_ORDER</p></li>
+<li class="listitem"><p>RCD_SCRIPTS</p></li>
+<li class="listitem"><p>RCD_SCRIPTS_DIR</p></li>
+<li class="listitem"><p>RCD_SCRIPTS_EXAMPLEDIR</p></li>
+<li class="listitem"><p>RCD_SCRIPTS_MODE</p></li>
+<li class="listitem"><p>RCD_SCRIPTS_SHELL</p></li>
+<li class="listitem"><p>RCD_SCRIPT_SRC</p></li>
+<li class="listitem"><p>RCD_SUBR</p></li>
+<li class="listitem"><p>RDOC</p></li>
+<li class="listitem"><p>READLINE_DEFAULT</p></li>
+<li class="listitem"><p>READLINE_TYPE</p></li>
+<li class="listitem"><p>REAL_ROOT_GROUP</p></li>
+<li class="listitem"><p>REAL_ROOT_USER</p></li>
+<li class="listitem"><p>RECURSIVE_MAKE</p></li>
+<li class="listitem"><p>RELAY_CTRL_DIR</p></li>
+<li class="listitem"><p>REPLACE_AWK</p></li>
+<li class="listitem"><p>REPLACE_BASH</p></li>
+<li class="listitem"><p>REPLACE_CSH</p></li>
+<li class="listitem"><p>REPLACE_KSH</p></li>
+<li class="listitem"><p>REPLACE_PERL</p></li>
+<li class="listitem"><p>REPLACE_PERL6</p></li>
+<li class="listitem"><p>REPLACE_PYTHON</p></li>
+<li class="listitem"><p>REPLACE_RUBY</p></li>
+<li class="listitem"><p>REPLACE_RUBY_DIRS</p></li>
+<li class="listitem"><p>REPLACE_RUBY_PAT</p></li>
+<li class="listitem"><p>REPLACE_SH</p></li>
+<li class="listitem"><p>REPLACE_TEXLUA</p></li>
+<li class="listitem"><p>REQD_DIRS</p></li>
+<li class="listitem"><p>REQD_DIRS_PERMS</p></li>
+<li class="listitem"><p>REQD_FILES</p></li>
+<li class="listitem"><p>REQD_FILES_MODE</p></li>
+<li class="listitem"><p>REQD_FILES_PERMS</p></li>
+<li class="listitem"><p>RESOLV_AUTO_VARS</p></li>
+<li class="listitem"><p>RESOLV_LDFLAGS</p></li>
+<li class="listitem"><p>RESOLV_LIBS</p></li>
+<li class="listitem"><p>RM</p></li>
+<li class="listitem"><p>ROCKSPEC_NAME</p></li>
+<li class="listitem"><p>ROCKSPEC_SPECFILE</p></li>
+<li class="listitem"><p>ROOT_CMD</p></li>
+<li class="listitem"><p>ROOT_GROUP</p></li>
+<li class="listitem"><p>ROOT_USER</p></li>
+<li class="listitem"><p>RPCGEN</p></li>
+<li class="listitem"><p>RPM</p></li>
+<li class="listitem"><p>RPM2PKG_PLIST</p></li>
+<li class="listitem"><p>RPM2PKG_PREFIX</p></li>
+<li class="listitem"><p>RPM2PKG_STAGE</p></li>
+<li class="listitem"><p>RPM2PKG_STRIP</p></li>
+<li class="listitem"><p>RPM2PKG_SUBPREFIX</p></li>
+<li class="listitem"><p>RPMFILES</p></li>
+<li class="listitem"><p>RPMIGNOREPATH</p></li>
+<li class="listitem"><p>RPM_DB_PREFIX</p></li>
+<li class="listitem"><p>RSSH_CVS_PATH</p></li>
+<li class="listitem"><p>RSSH_RDIST_PATH</p></li>
+<li class="listitem"><p>RSSH_RSYNC_PATH</p></li>
+<li class="listitem"><p>RSSH_SCP_PATH</p></li>
+<li class="listitem"><p>RSSH_SFTP_SERVER_PATH</p></li>
+<li class="listitem"><p>RUBY</p></li>
+<li class="listitem"><p>RUBYGEM</p></li>
+<li class="listitem"><p>RUBYGEM_NAME</p></li>
+<li class="listitem"><p>RUBYGEM_OPTIONS</p></li>
+<li class="listitem"><p>RUBY_ABI_VERSION</p></li>
+<li class="listitem"><p>RUBY_ARCH</p></li>
+<li class="listitem"><p>RUBY_ARCHINC</p></li>
+<li class="listitem"><p>RUBY_ARCHLIB</p></li>
+<li class="listitem"><p>RUBY_BASE</p></li>
+<li class="listitem"><p>RUBY_BASERIDIR</p></li>
+<li class="listitem"><p>RUBY_BUILD_RDOC</p></li>
+<li class="listitem"><p>RUBY_BUILD_RI</p></li>
+<li class="listitem"><p>RUBY_DLEXT</p></li>
+<li class="listitem"><p>RUBY_DOC</p></li>
+<li class="listitem"><p>RUBY_DYNAMIC_DIRS</p></li>
+<li class="listitem"><p>RUBY_EG</p></li>
+<li class="listitem"><p>RUBY_ENCODING_ARG</p></li>
+<li class="listitem"><p>RUBY_EXTCONF</p></li>
+<li class="listitem"><p>RUBY_EXTCONF_CHECK</p></li>
+<li class="listitem"><p>RUBY_EXTCONF_DEBUG</p></li>
+<li class="listitem"><p>RUBY_EXTCONF_MAKEFILE</p></li>
+<li class="listitem"><p>RUBY_GEM_BASE</p></li>
+<li class="listitem"><p>RUBY_INC</p></li>
+<li class="listitem"><p>RUBY_LIB</p></li>
+<li class="listitem"><p>RUBY_LIB_BASE</p></li>
+<li class="listitem"><p>RUBY_NAME</p></li>
+<li class="listitem"><p>RUBY_NOVERSION</p></li>
+<li class="listitem"><p>RUBY_PKGPREFIX</p></li>
+<li class="listitem"><p>RUBY_RAILS</p></li>
+<li class="listitem"><p>RUBY_RAILS42_VERSION</p></li>
+<li class="listitem"><p>RUBY_RAILS51_VERSION</p></li>
+<li class="listitem"><p>RUBY_RAILS52_VERSION</p></li>
+<li class="listitem"><p>RUBY_RAILS_ACCEPTED</p></li>
+<li class="listitem"><p>RUBY_RAILS_DEFAULT</p></li>
+<li class="listitem"><p>RUBY_RAILS_REQD</p></li>
+<li class="listitem"><p>RUBY_RAILS_STRICT_DEP</p></li>
+<li class="listitem"><p>RUBY_RIDIR</p></li>
+<li class="listitem"><p>RUBY_SETUP</p></li>
+<li class="listitem"><p>RUBY_SHLIB</p></li>
+<li class="listitem"><p>RUBY_SHLIBALIAS</p></li>
+<li class="listitem"><p>RUBY_SHLIBVER</p></li>
+<li class="listitem"><p>RUBY_SIMPLE_INSTALL</p></li>
+<li class="listitem"><p>RUBY_SITEARCHLIB</p></li>
+<li class="listitem"><p>RUBY_SITELIB</p></li>
+<li class="listitem"><p>RUBY_SITELIB_BASE</p></li>
+<li class="listitem"><p>RUBY_SITERIDIR</p></li>
+<li class="listitem"><p>RUBY_SLEXT</p></li>
+<li class="listitem"><p>RUBY_SRCDIR</p></li>
+<li class="listitem"><p>RUBY_STATICLIB</p></li>
+<li class="listitem"><p>RUBY_SUFFIX</p></li>
+<li class="listitem"><p>RUBY_SYSRIDIR</p></li>
+<li class="listitem"><p>RUBY_USE_PTHREAD</p></li>
+<li class="listitem"><p>RUBY_VENDORARCHLIB</p></li>
+<li class="listitem"><p>RUBY_VENDORLIB</p></li>
+<li class="listitem"><p>RUBY_VENDORLIB_BASE</p></li>
+<li class="listitem"><p>RUBY_VER</p></li>
+<li class="listitem"><p>RUBY_VERSION</p></li>
+<li class="listitem"><p>RUBY_VERSIONS_ACCEPTED</p></li>
+<li class="listitem"><p>RUBY_VERSION_DEFAULT</p></li>
+<li class="listitem"><p>RUBY_VERSION_REQD</p></li>
+<li class="listitem"><p>RUBY_VER_DIR</p></li>
+<li class="listitem"><p>RUN</p></li>
+<li class="listitem"><p>RUN_LDCONFIG</p></li>
+<li class="listitem"><p>SAWFISH_THEMES</p></li>
+<li class="listitem"><p>SCO</p></li>
+<li class="listitem"><p>SCREWS_GROUP</p></li>
+<li class="listitem"><p>SCREWS_USER</p></li>
+<li class="listitem"><p>SCRIPTS_ENV</p></li>
+<li class="listitem"><p>SCROLLKEEPER_DATADIR</p></li>
+<li class="listitem"><p>SCROLLKEEPER_REBUILDDB</p></li>
+<li class="listitem"><p>SCROLLKEEPER_UPDATEDB</p></li>
+<li class="listitem"><p>SDIST_PAWD</p></li>
+<li class="listitem"><p>SERIAL_DEVICES</p></li>
+<li class="listitem"><p>SETGIDGAME</p></li>
+<li class="listitem"><p>SETGID_GAMES_PERMS</p></li>
+<li class="listitem"><p>SETUID_ROOT_PERMS</p></li>
+<li class="listitem"><p>SH</p></li>
+<li class="listitem"><p>SHLIB</p></li>
+<li class="listitem"><p>SHORTNAME</p></li>
+<li class="listitem"><p>SIGN_PACKAGES</p></li>
+<li class="listitem"><p>SILC_CLIENT_WITH_PERL</p></li>
+<li class="listitem"><p>SITE_SPECIFIC_PKGS</p></li>
+<li class="listitem"><p>SKIP_DEPENDS</p></li>
+<li class="listitem"><p>SKIP_PORTABILITY_CHECK</p></li>
+<li class="listitem"><p>SMF_INSTANCES</p></li>
+<li class="listitem"><p>SMF_MANIFEST</p></li>
+<li class="listitem"><p>SMF_METHODS</p></li>
+<li class="listitem"><p>SMF_METHOD_SHELL</p></li>
+<li class="listitem"><p>SMF_METHOD_SRC</p></li>
+<li class="listitem"><p>SMF_NAME</p></li>
+<li class="listitem"><p>SMF_PREFIX</p></li>
+<li class="listitem"><p>SMF_SRCDIR</p></li>
+<li class="listitem"><p>SNIPROXY_GROUP</p></li>
+<li class="listitem"><p>SNIPROXY_USER</p></li>
+<li class="listitem"><p>SOURCE_BUFFSIZE</p></li>
+<li class="listitem"><p>SPECIAL_PERMS</p></li>
+<li class="listitem"><p>SPECIFIC_PKGS</p></li>
+<li class="listitem"><p>SSH_SUID</p></li>
+<li class="listitem"><p>SSYNC_PAWD</p></li>
+<li class="listitem"><p>STEP_MSG</p></li>
+<li class="listitem"><p>STRIP</p></li>
+<li class="listitem"><p>STRIP_DBG</p></li>
+<li class="listitem"><p>STRIP_DEBUG</p></li>
+<li class="listitem"><p>STRIP_DEBUG_SUPPORTED</p></li>
+<li class="listitem"><p>STRIP_FILES_SKIP</p></li>
+<li class="listitem"><p>SU</p></li>
+<li class="listitem"><p>SUBDIR</p></li>
+<li class="listitem"><p>SUBST_CLASSES</p></li>
+<li class="listitem"><p>SUBST_FILES</p></li>
+<li class="listitem"><p>SUBST_FILTER_CMD</p></li>
+<li class="listitem"><p>SUBST_MESSAGE</p></li>
+<li class="listitem"><p>SUBST_SED</p></li>
+<li class="listitem"><p>SUBST_SHOW_DIFF</p></li>
+<li class="listitem"><p>SUBST_SKIP_TEXT_CHECK</p></li>
+<li class="listitem"><p>SUBST_STAGE</p></li>
+<li class="listitem"><p>SUBST_VARS</p></li>
+<li class="listitem"><p>SUNWSPROBASE</p></li>
+<li class="listitem"><p>SUSE_PREFER</p></li>
+<li class="listitem"><p>SU_CMD</p></li>
+<li class="listitem"><p>SVN_EXTRACTDIR</p></li>
+<li class="listitem"><p>SVN_REPO</p></li>
+<li class="listitem"><p>SVN_REPOSITORIES</p></li>
+<li class="listitem"><p>SVN_REVISION</p></li>
+<li class="listitem"><p>TERMCAP_TYPE</p></li>
+<li class="listitem"><p>TERMINFO_DEFAULT</p></li>
+<li class="listitem"><p>TERMINFO_TYPE</p></li>
+<li class="listitem"><p>TEST</p></li>
+<li class="listitem"><p>TEST_DIRS</p></li>
+<li class="listitem"><p>TEST_ENV</p></li>
+<li class="listitem"><p>TEST_MAKE_CMD</p></li>
+<li class="listitem"><p>TEST_MAKE_FLAGS</p></li>
+<li class="listitem"><p>TEST_TARGET</p></li>
+<li class="listitem"><p>TEXLIVE_IGNORE_PATTERNS</p></li>
+<li class="listitem"><p>TEXLIVE_REV</p></li>
+<li class="listitem"><p>TEXMFSITE</p></li>
+<li class="listitem"><p>TEX_FORMATS</p></li>
+<li class="listitem"><p>TEX_HYPHEN_DAT</p></li>
+<li class="listitem"><p>TEX_HYPHEN_DEF</p></li>
+<li class="listitem"><p>TEX_TEXMF_DIRS</p></li>
+<li class="listitem"><p>THTTPD_LOG_FACILITY</p></li>
+<li class="listitem"><p>TO</p></li>
+<li class="listitem"><p>TOOLS_ALIASES</p></li>
+<li class="listitem"><p>TOOLS_ARGS</p></li>
+<li class="listitem"><p>TOOLS_BROKEN</p></li>
+<li class="listitem"><p>TOOLS_CMD</p></li>
+<li class="listitem"><p>TOOLS_CREATE</p></li>
+<li class="listitem"><p>TOOLS_DIR</p></li>
+<li class="listitem"><p>TOOLS_FAIL</p></li>
+<li class="listitem"><p>TOOLS_GNU_MISSING</p></li>
+<li class="listitem"><p>TOOLS_LDCONFIG</p></li>
+<li class="listitem"><p>TOOLS_NOOP</p></li>
+<li class="listitem"><p>TOOLS_PATH</p></li>
+<li class="listitem"><p>TOOLS_SCRIPT</p></li>
+<li class="listitem"><p>TTF_FONTDIR</p></li>
+<li class="listitem"><p>TTF_FONTS_DIR</p></li>
+<li class="listitem"><p>TYPE</p></li>
+<li class="listitem"><p>UAC_REQD_EXECS</p></li>
+<li class="listitem"><p>UCSPI_SSL_GROUP</p></li>
+<li class="listitem"><p>UCSPI_SSL_USER</p></li>
+<li class="listitem"><p>UNLIMIT_RESOURCES</p></li>
+<li class="listitem"><p>UNPRIVILEGED</p></li>
+<li class="listitem"><p>UNPRIVILEGED_GROUP</p></li>
+<li class="listitem"><p>UNPRIVILEGED_GROUPS</p></li>
+<li class="listitem"><p>UNPRIVILEGED_USER</p></li>
+<li class="listitem"><p>UNWRAP_FILES</p></li>
+<li class="listitem"><p>UNWRAP_PATTERNS</p></li>
+<li class="listitem"><p>UPDATE_GEMSPEC</p></li>
+<li class="listitem"><p>UPDATE_TARGET</p></li>
+<li class="listitem"><p>URI</p></li>
+<li class="listitem"><p>USA</p></li>
+<li class="listitem"><p>USERGROUP_PHASE</p></li>
+<li class="listitem"><p>USERPPP_GROUP</p></li>
+<li class="listitem"><p>USER_SPECIFIC_PKGS</p></li>
+<li class="listitem"><p>USE_ABI_DEPENDS</p></li>
+<li class="listitem"><p>USE_APR</p></li>
+<li class="listitem"><p>USE_BSD_MAKEFILE</p></li>
+<li class="listitem"><p>USE_BUILTIN</p></li>
+<li class="listitem"><p>USE_CROSS_COMPILE</p></li>
+<li class="listitem"><p>USE_CURSES</p></li>
+<li class="listitem"><p>USE_CWRAPPERS</p></li>
+<li class="listitem"><p>USE_DB185</p></li>
+<li class="listitem"><p>USE_FEATURES</p></li>
+<li class="listitem"><p>USE_GAMESGROUP</p></li>
+<li class="listitem"><p>USE_GCC_RUNTIME</p></li>
+<li class="listitem"><p>USE_IMAKE</p></li>
+<li class="listitem"><p>USE_JAVA</p></li>
+<li class="listitem"><p>USE_JAVA2</p></li>
+<li class="listitem"><p>USE_LANGUAGES</p></li>
+<li class="listitem"><p>USE_LIBTOOL</p></li>
+<li class="listitem"><p>USE_NATIVE_GCC</p></li>
+<li class="listitem"><p>USE_NETBSD_REPO</p></li>
+<li class="listitem"><p>USE_PKGSRC_GCC</p></li>
+<li class="listitem"><p>USE_PKGSRC_GCC_RUNTIME</p></li>
+<li class="listitem"><p>USE_PKGTASKS</p></li>
+<li class="listitem"><p>USE_RUBY_EXTCONF</p></li>
+<li class="listitem"><p>USE_RUBY_INSTALL</p></li>
+<li class="listitem"><p>USE_RUBY_SETUP</p></li>
+<li class="listitem"><p>USE_RUBY_SETUP_PKG</p></li>
+<li class="listitem"><p>USE_TOOLS</p></li>
+<li class="listitem"><p>UUCP_GROUP</p></li>
+<li class="listitem"><p>UUCP_USER</p></li>
+<li class="listitem"><p>VARBASE</p></li>
+<li class="listitem"><p>VARNAME</p></li>
+<li class="listitem"><p>VIM_EXTRA_OPTS</p></li>
+<li class="listitem"><p>WARNING_MSG</p></li>
+<li class="listitem"><p>WCALC_CGIDIR</p></li>
+<li class="listitem"><p>WCALC_CGIPATH</p></li>
+<li class="listitem"><p>WCALC_HTMLDIR</p></li>
+<li class="listitem"><p>WCALC_HTMLPATH</p></li>
+<li class="listitem"><p>WDM_MANAGERS</p></li>
+<li class="listitem"><p>WRAPPER_REORDER_CMDS</p></li>
+<li class="listitem"><p>WRKDIR</p></li>
+<li class="listitem"><p>WRKDIR_BASENAME</p></li>
+<li class="listitem"><p>WRKDIR_LOCKTYPE</p></li>
+<li class="listitem"><p>WRKLOG</p></li>
+<li class="listitem"><p>WRKOBJDIR</p></li>
+<li class="listitem"><p>WRKSRC</p></li>
+<li class="listitem"><p>WXGTK_ACCEPTED</p></li>
+<li class="listitem"><p>WXGTK_DEFAULT</p></li>
+<li class="listitem"><p>X10_PORT</p></li>
+<li class="listitem"><p>X11</p></li>
+<li class="listitem"><p>X11BASE</p></li>
+<li class="listitem"><p>X11_PKGSRCDIR</p></li>
+<li class="listitem"><p>X11_TYPE</p></li>
+<li class="listitem"><p>X509_CERTIFICATE</p></li>
+<li class="listitem"><p>X509_KEY</p></li>
+<li class="listitem"><p>XAW_TYPE</p></li>
+<li class="listitem"><p>XLOCK_DEFAULT_MODE</p></li>
+<li class="listitem"><p>XMKMF_FLAGS</p></li>
+<li class="listitem"><p>XXX</p></li>
+<li class="listitem"><p>XXXX</p></li>
+<li class="listitem"><p>YES</p></li>
+<li class="listitem"><p>ZERO_FILESIZE_P</p></li>
+<li class="listitem"><p>ZSH_STATIC</p></li>
+<li class="listitem"><p>__stdc__</p></li>
+<li class="listitem"><p>_vargroups</p></li>
+<li class="listitem"><p>add</p></li>
+<li class="listitem"><p>all</p></li>
+<li class="listitem"><p>alternatives</p></li>
+<li class="listitem"><p>aslr</p></li>
+<li class="listitem"><p>asprintf</p></li>
+<li class="listitem"><p>autoconf</p></li>
+<li class="listitem"><p>automake</p></li>
+<li class="listitem"><p>autoreconf</p></li>
+<li class="listitem"><p>awk</p></li>
+<li class="listitem"><p>bash</p></li>
+<li class="listitem"><p>big-endian</p></li>
+<li class="listitem"><p>bin-install</p></li>
+<li class="listitem"><p>binpkg-list</p></li>
+<li class="listitem"><p>bootstrap-depends</p></li>
+<li class="listitem"><p>broken</p></li>
+<li class="listitem"><p>broken_on_platform</p></li>
+<li class="listitem"><p>build</p></li>
+<li class="listitem"><p>build-env</p></li>
+<li class="listitem"><p>buildlink-directories</p></li>
+<li class="listitem"><p>buildlink-oss-soundcard-h</p></li>
+<li class="listitem"><p>c</p></li>
+<li class="listitem"><p>c++</p></li>
+<li class="listitem"><p>ccache</p></li>
+<li class="listitem"><p>cce</p></li>
+<li class="listitem"><p>cdefs</p></li>
+<li class="listitem"><p>changes</p></li>
+<li class="listitem"><p>changes-entry</p></li>
+<li class="listitem"><p>changes-entry-noupdate</p></li>
+<li class="listitem"><p>check</p></li>
+<li class="listitem"><p>check-clean</p></li>
+<li class="listitem"><p>check-files</p></li>
+<li class="listitem"><p>check-files-clean</p></li>
+<li class="listitem"><p>check-vulnerable</p></li>
+<li class="listitem"><p>checksum</p></li>
+<li class="listitem"><p>checksum-phase</p></li>
+<li class="listitem"><p>clean</p></li>
+<li class="listitem"><p>clean-depends</p></li>
+<li class="listitem"><p>cleandir</p></li>
+<li class="listitem"><p>commit</p></li>
+<li class="listitem"><p>commit-changes-entry</p></li>
+<li class="listitem"><p>compact</p></li>
+<li class="listitem"><p>compiler</p></li>
+<li class="listitem"><p>conf</p></li>
+<li class="listitem"><p>config.guess</p></li>
+<li class="listitem"><p>config.sub</p></li>
+<li class="listitem"><p>configuration</p></li>
+<li class="listitem"><p>configure</p></li>
+<li class="listitem"><p>configure-help</p></li>
+<li class="listitem"><p>configure_args</p></li>
+<li class="listitem"><p>cputime</p></li>
+<li class="listitem"><p>create-usergroup</p></li>
+<li class="listitem"><p>csh</p></li>
+<li class="listitem"><p>ctf</p></li>
+<li class="listitem"><p>cvs</p></li>
+<li class="listitem"><p>debug</p></li>
+<li class="listitem"><p>declaration</p></li>
+<li class="listitem"><p>declare</p></li>
+<li class="listitem"><p>defined</p></li>
+<li class="listitem"><p>depend</p></li>
+<li class="listitem"><p>dependencies</p></li>
+<li class="listitem"><p>depends</p></li>
+<li class="listitem"><p>depends-checksum</p></li>
+<li class="listitem"><p>depends-fetch</p></li>
+<li class="listitem"><p>describe</p></li>
+<li class="listitem"><p>destdir</p></li>
+<li class="listitem"><p>distclean</p></li>
+<li class="listitem"><p>distinfo</p></li>
+<li class="listitem"><p>dl</p></li>
+<li class="listitem"><p>dlopen</p></li>
+<li class="listitem"><p>do-build</p></li>
+<li class="listitem"><p>do-buildlink</p></li>
+<li class="listitem"><p>do-clean</p></li>
+<li class="listitem"><p>do-configure-post-hook</p></li>
+<li class="listitem"><p>do-extract</p></li>
+<li class="listitem"><p>do-fetch</p></li>
+<li class="listitem"><p>do-install</p></li>
+<li class="listitem"><p>emul</p></li>
+<li class="listitem"><p>emulation</p></li>
+<li class="listitem"><p>emulator</p></li>
+<li class="listitem"><p>endian</p></li>
+<li class="listitem"><p>enomem</p></li>
+<li class="listitem"><p>err</p></li>
+<li class="listitem"><p>errx</p></li>
+<li class="listitem"><p>etc</p></li>
+<li class="listitem"><p>feature</p></li>
+<li class="listitem"><p>features</p></li>
+<li class="listitem"><p>fetch</p></li>
+<li class="listitem"><p>fetch-list</p></li>
+<li class="listitem"><p>follows</p></li>
+<li class="listitem"><p>forbids</p></li>
+<li class="listitem"><p>form</p></li>
+<li class="listitem"><p>format</p></li>
+<li class="listitem"><p>fortify</p></li>
+<li class="listitem"><p>fortify_source</p></li>
+<li class="listitem"><p>fossil</p></li>
+<li class="listitem"><p>friend</p></li>
+<li class="listitem"><p>from</p></li>
+<li class="listitem"><p>fts</p></li>
+<li class="listitem"><p>fts_close</p></li>
+<li class="listitem"><p>fts_open</p></li>
+<li class="listitem"><p>fts_read</p></li>
+<li class="listitem"><p>fts_set</p></li>
+<li class="listitem"><p>full</p></li>
+<li class="listitem"><p>gcc</p></li>
+<li class="listitem"><p>getopt_long</p></li>
+<li class="listitem"><p>getprogname</p></li>
+<li class="listitem"><p>gettext</p></li>
+<li class="listitem"><p>git</p></li>
+<li class="listitem"><p>github</p></li>
+<li class="listitem"><p>glob</p></li>
+<li class="listitem"><p>gnu</p></li>
+<li class="listitem"><p>go</p></li>
+<li class="listitem"><p>golang</p></li>
+<li class="listitem"><p>guess-license</p></li>
+<li class="listitem"><p>hashbang</p></li>
+<li class="listitem"><p>heimdal</p></li>
+<li class="listitem"><p>help</p></li>
+<li class="listitem"><p>hg</p></li>
+<li class="listitem"><p>imake</p></li>
+<li class="listitem"><p>increment</p></li>
+<li class="listitem"><p>interp</p></li>
+<li class="listitem"><p>interpreter</p></li>
+<li class="listitem"><p>intl</p></li>
+<li class="listitem"><p>iso</p></li>
+<li class="listitem"><p>kerberos</p></li>
+<li class="listitem"><p>krb</p></li>
+<li class="listitem"><p>krb5</p></li>
+<li class="listitem"><p>ksh</p></li>
+<li class="listitem"><p>latex</p></li>
+<li class="listitem"><p>libnbcompat</p></li>
+<li class="listitem"><p>libs</p></li>
+<li class="listitem"><p>libtool</p></li>
+<li class="listitem"><p>licence</p></li>
+<li class="listitem"><p>license</p></li>
+<li class="listitem"><p>lintl</p></li>
+<li class="listitem"><p>little-endian</p></li>
+<li class="listitem"><p>lock</p></li>
+<li class="listitem"><p>locking</p></li>
+<li class="listitem"><p>lvalue</p></li>
+<li class="listitem"><p>make</p></li>
+<li class="listitem"><p>makesum</p></li>
+<li class="listitem"><p>memory</p></li>
+<li class="listitem"><p>mercurial</p></li>
+<li class="listitem"><p>meta</p></li>
+<li class="listitem"><p>meta-package</p></li>
+<li class="listitem"><p>meta_package</p></li>
+<li class="listitem"><p>mit-krb5</p></li>
+<li class="listitem"><p>mk.conf</p></li>
+<li class="listitem"><p>mount</p></li>
+<li class="listitem"><p>mprotect</p></li>
+<li class="listitem"><p>mremap</p></li>
+<li class="listitem"><p>nb</p></li>
+<li class="listitem"><p>nbcompat</p></li>
+<li class="listitem"><p>no</p></li>
+<li class="listitem"><p>obstack</p></li>
+<li class="listitem"><p>obstack_ptr_grow</p></li>
+<li class="listitem"><p>occurs</p></li>
+<li class="listitem"><p>only</p></li>
+<li class="listitem"><p>options</p></li>
+<li class="listitem"><p>options.mk</p></li>
+<li class="listitem"><p>order</p></li>
+<li class="listitem"><p>override</p></li>
+<li class="listitem"><p>override-intltool</p></li>
+<li class="listitem"><p>override-message-intltool</p></li>
+<li class="listitem"><p>package</p></li>
+<li class="listitem"><p>parallel</p></li>
+<li class="listitem"><p>partial</p></li>
+<li class="listitem"><p>path</p></li>
+<li class="listitem"><p>pax</p></li>
+<li class="listitem"><p>paxctl</p></li>
+<li class="listitem"><p>pbulk-index</p></li>
+<li class="listitem"><p>pc</p></li>
+<li class="listitem"><p>perl</p></li>
+<li class="listitem"><p>perl5</p></li>
+<li class="listitem"><p>perms</p></li>
+<li class="listitem"><p>php</p></li>
+<li class="listitem"><p>pkg-build-options</p></li>
+<li class="listitem"><p>pkg-config</p></li>
+<li class="listitem"><p>pkg_build_options</p></li>
+<li class="listitem"><p>platform</p></li>
+<li class="listitem"><p>plist</p></li>
+<li class="listitem"><p>post-extract</p></li>
+<li class="listitem"><p>post-fetch</p></li>
+<li class="listitem"><p>post-wrapper</p></li>
+<li class="listitem"><p>pre-configure</p></li>
+<li class="listitem"><p>pre-extract</p></li>
+<li class="listitem"><p>pre-fetch</p></li>
+<li class="listitem"><p>print-plist</p></li>
+<li class="listitem"><p>print-summary-data</p></li>
+<li class="listitem"><p>privileged-install-hook</p></li>
+<li class="listitem"><p>pypi</p></li>
+<li class="listitem"><p>python</p></li>
+<li class="listitem"><p>readme-all</p></li>
+<li class="listitem"><p>regcomp</p></li>
+<li class="listitem"><p>relro</p></li>
+<li class="listitem"><p>rename</p></li>
+<li class="listitem"><p>reorder</p></li>
+<li class="listitem"><p>replace</p></li>
+<li class="listitem"><p>replace_interpreter</p></li>
+<li class="listitem"><p>reproducible</p></li>
+<li class="listitem"><p>resolv</p></li>
+<li class="listitem"><p>root</p></li>
+<li class="listitem"><p>ruby</p></li>
+<li class="listitem"><p>setenv</p></li>
+<li class="listitem"><p>setgid</p></li>
+<li class="listitem"><p>setprogname</p></li>
+<li class="listitem"><p>setuid</p></li>
+<li class="listitem"><p>sh</p></li>
+<li class="listitem"><p>show</p></li>
+<li class="listitem"><p>show-all</p></li>
+<li class="listitem"><p>show-build-defs</p></li>
+<li class="listitem"><p>show-depends</p></li>
+<li class="listitem"><p>show-deps</p></li>
+<li class="listitem"><p>show-distfiles</p></li>
+<li class="listitem"><p>show-downlevel</p></li>
+<li class="listitem"><p>show-subdir-var</p></li>
+<li class="listitem"><p>show-tools</p></li>
+<li class="listitem"><p>show-var</p></li>
+<li class="listitem"><p>show-vars</p></li>
+<li class="listitem"><p>snprintf</p></li>
+<li class="listitem"><p>ssp</p></li>
+<li class="listitem"><p>st_mode</p></li>
+<li class="listitem"><p>stage-install</p></li>
+<li class="listitem"><p>strip</p></li>
+<li class="listitem"><p>strong</p></li>
+<li class="listitem"><p>subst</p></li>
+<li class="listitem"><p>subversion</p></li>
+<li class="listitem"><p>sun</p></li>
+<li class="listitem"><p>sunpro</p></li>
+<li class="listitem"><p>sunwspro</p></li>
+<li class="listitem"><p>svn</p></li>
+<li class="listitem"><p>test</p></li>
+<li class="listitem"><p>tex</p></li>
+<li class="listitem"><p>texlive</p></li>
+<li class="listitem"><p>tmp</p></li>
+<li class="listitem"><p>tool</p></li>
+<li class="listitem"><p>tools</p></li>
+<li class="listitem"><p>tools-libtool-m4-override</p></li>
+<li class="listitem"><p>type</p></li>
+<li class="listitem"><p>ulimit</p></li>
+<li class="listitem"><p>undefined</p></li>
+<li class="listitem"><p>undo-replace</p></li>
+<li class="listitem"><p>unlimit</p></li>
+<li class="listitem"><p>unprivileged</p></li>
+<li class="listitem"><p>unprivileged-install-hook</p></li>
+<li class="listitem"><p>unstripped</p></li>
+<li class="listitem"><p>update</p></li>
+<li class="listitem"><p>upload</p></li>
+<li class="listitem"><p>upload-distfiles</p></li>
+<li class="listitem"><p>usage</p></li>
+<li class="listitem"><p>use_tools</p></li>
+<li class="listitem"><p>user</p></li>
+<li class="listitem"><p>utimes</p></li>
+<li class="listitem"><p>vasprintf</p></li>
+<li class="listitem"><p>verbose</p></li>
+<li class="listitem"><p>vsnprintf</p></li>
+<li class="listitem"><p>warn</p></li>
+<li class="listitem"><p>warning</p></li>
+<li class="listitem"><p>warnings</p></li>
+<li class="listitem"><p>warnx</p></li>
+<li class="listitem"><p>weak</p></li>
+<li class="listitem"><p>work</p></li>
+<li class="listitem"><p>wrapper</p></li>
+<li class="listitem"><p>yes</p></li>
+</ul></div>
+</div>
+<div class="appendix">
+<div class="titlepage"><div><div><h1 class="title">
+<a name="editing"></a>Appendix�E.�Editing guidelines for the pkgsrc guide</h1></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl class="toc">
-<dt><span class="sect1"><a href="#targets">D.1. Make targets</a></span></dt>
-<dt><span class="sect1"><a href="#procedure">D.2. Procedure</a></span></dt>
+<dt><span class="sect1"><a href="#targets">E.1. Make targets</a></span></dt>
+<dt><span class="sect1"><a href="#procedure">E.2. Procedure</a></span></dt>
 </dl>
 </div>
 <p>This section contains information on editing the pkgsrc
        guide itself.</p>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="targets"></a>D.1.�Make targets</h2></div></div></div>
+<a name="targets"></a>E.1.�Make targets</h2></div></div></div>
 <p>The pkgsrc guide's source code is stored in
        <code class="filename">pkgsrc/doc/guide/files</code>, and several files
        are created from it:</p>
@@ -10342,7 +11747,7 @@ source packages</h2></div></div></div>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="procedure"></a>D.2.�Procedure</h2></div></div></div>
+<a name="procedure"></a>E.2.�Procedure</h2></div></div></div>
 <p>The procedure to edit the pkgsrc guide is:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p>Make sure you have the packages needed to

Index: pkgsrc/doc/pkgsrc.txt
diff -u pkgsrc/doc/pkgsrc.txt:1.264 pkgsrc/doc/pkgsrc.txt:1.265
--- pkgsrc/doc/pkgsrc.txt:1.264 Fri Apr 19 13:46:39 2019
+++ pkgsrc/doc/pkgsrc.txt       Sun Apr 28 15:22:38 2019
@@ -14,7 +14,7 @@ The pkgsrc Developers
 
 Copyright   1994-2019 The NetBSD Foundation, Inc
 
-$NetBSD: pkgsrc.xml,v 1.33 2019/01/01 02:50:23 jnemeth Exp $
+$NetBSD: pkgsrc.xml,v 1.34 2019/04/28 13:41:18 rillig Exp $
 
 Abstract
 
@@ -43,363 +43,365 @@ Table of Contents
 
 I. The pkgsrc user's guide
 
-    2. Where to get pkgsrc and how to keep it up-to-date
+    2. Getting help
+    3. Where to get pkgsrc and how to keep it up-to-date
 
-        2.1. Getting pkgsrc for the first time
+        3.1. Getting pkgsrc for the first time
 
-            2.1.1. As tar archive
-            2.1.2. Via anonymous CVS
+            3.1.1. As tar archive
+            3.1.2. Via anonymous CVS
 
-        2.2. Keeping pkgsrc up-to-date
+        3.2. Keeping pkgsrc up-to-date
 
-            2.2.1. Via tar files
-            2.2.2. Via CVS
+            3.2.1. Via tar files
+            3.2.2. Via CVS
 
-    3. Using pkgsrc on systems other than NetBSD
+    4. Using pkgsrc on systems other than NetBSD
 
-        3.1. Binary distribution
-        3.2. Bootstrapping pkgsrc
+        4.1. Binary distribution
+        4.2. Bootstrapping pkgsrc
 
-    4. Using pkgsrc
+    5. Using pkgsrc
 
-        4.1. Using binary packages
+        5.1. Using binary packages
 
-            4.1.1. Finding binary packages
-            4.1.2. Installing binary packages
-            4.1.3. Deinstalling packages
-            4.1.4. Getting information about installed packages
-            4.1.5. Checking for security vulnerabilities in installed packages
-            4.1.6. Finding if newer versions of your installed packages are in
+            5.1.1. Finding binary packages
+            5.1.2. Installing binary packages
+            5.1.3. Deinstalling packages
+            5.1.4. Getting information about installed packages
+            5.1.5. Checking for security vulnerabilities in installed packages
+            5.1.6. Finding if newer versions of your installed packages are in
                 pkgsrc
-            4.1.7. Other administrative functions
+            5.1.7. Other administrative functions
 
-        4.2. Building packages from source
+        5.2. Building packages from source
 
-            4.2.1. Requirements
-            4.2.2. Fetching distfiles
-            4.2.3. How to build and install
+            5.2.1. Requirements
+            5.2.2. Fetching distfiles
+            5.2.3. How to build and install
 
-    5. Configuring pkgsrc
+    6. Configuring pkgsrc
 
-        5.1. General configuration
-        5.2. Variables affecting the build process
-        5.3. Variables affecting the installation process
-        5.4. Selecting and configuring the compiler
+        6.1. General configuration
+        6.2. Variables affecting the build process
+        6.3. Variables affecting the installation process
+        6.4. Selecting and configuring the compiler
 
-            5.4.1. Selecting the compiler
-            5.4.2. Additional flags to the compiler (CFLAGS)
-            5.4.3. Additional flags to the linker (LDFLAGS)
+            6.4.1. Selecting the compiler
+            6.4.2. Additional flags to the compiler (CFLAGS)
+            6.4.3. Additional flags to the linker (LDFLAGS)
 
-        5.5. Developer/advanced settings
-        5.6. Selecting Build Options
+        6.5. Developer/advanced settings
+        6.6. Selecting Build Options
 
-    6. Creating binary packages
+    7. Creating binary packages
 
-        6.1. Building a single binary package
-        6.2. Settings for creation of binary packages
+        7.1. Building a single binary package
+        7.2. Settings for creation of binary packages
 
-    7. Creating binary packages for everything in pkgsrc (bulk builds)
+    8. Creating binary packages for everything in pkgsrc (bulk builds)
 
-        7.1. Preparations
-        7.2. Running a pbulk-style bulk build
+        8.1. Preparations
+        8.2. Running a pbulk-style bulk build
 
-            7.2.1. Configuration
+            8.2.1. Configuration
 
-        7.3. Requirements of a full bulk build
-        7.4. Creating a multiple CD-ROM packages collection
+        8.3. Requirements of a full bulk build
+        8.4. Creating a multiple CD-ROM packages collection
 
-            7.4.1. Example of cdpack
+            8.4.1. Example of cdpack
 
-    8. Directory layout of the installed files
+    9. Directory layout of the installed files
 
-        8.1. File system layout in ${LOCALBASE}
-        8.2. File system layout in ${VARBASE}
+        9.1. File system layout in ${LOCALBASE}
+        9.2. File system layout in ${VARBASE}
 
-    9. Frequently Asked Questions
+    10. Frequently Asked Questions
 
-        9.1. Are there any mailing lists for pkg-related discussion?
-        9.2. Utilities for package management (pkgtools)
-        9.3. How to use pkgsrc as non-root
-        9.4. How to resume transfers when fetching distfiles?
-        9.5. How can I install/use modular X.org from pkgsrc?
-        9.6. How to fetch files from behind a firewall
-        9.7. How to fetch files from HTTPS sites
-        9.8. How do I tell make fetch to do passive FTP?
-        9.9. How to fetch all distfiles at once
-        9.10. What does "Don't know how to make /usr/share/tmac/tmac.andoc"
+        10.1. Are there any mailing lists for pkg-related discussion?
+        10.2. Utilities for package management (pkgtools)
+        10.3. How to use pkgsrc as non-root
+        10.4. How to resume transfers when fetching distfiles?
+        10.5. How can I install/use modular X.org from pkgsrc?
+        10.6. How to fetch files from behind a firewall
+        10.7. How to fetch files from HTTPS sites
+        10.8. How do I tell make fetch to do passive FTP?
+        10.9. How to fetch all distfiles at once
+        10.10. What does "Don't know how to make /usr/share/tmac/tmac.andoc"
             mean?
-        9.11. What does "Could not find bsd.own.mk" mean?
-        9.12. Using 'sudo' with pkgsrc
-        9.13. How do I change the location of configuration files?
-        9.14. Automated security checks
-        9.15. Why do some packages ignore my CFLAGS?
-        9.16. A package does not build. What shall I do?
-        9.17. What does "Makefile appears to contain unresolved cvs/rcs/???
+        10.11. What does "Could not find bsd.own.mk" mean?
+        10.12. Using 'sudo' with pkgsrc
+        10.13. How do I change the location of configuration files?
+        10.14. Automated security checks
+        10.15. Why do some packages ignore my CFLAGS?
+        10.16. A package does not build. What shall I do?
+        10.17. What does "Makefile appears to contain unresolved cvs/rcs/???
             merge conflicts" mean?
 
 II. The pkgsrc developer's guide
 
-    10. Creating a new pkgsrc package from scratch
+    11. Getting help
+    12. Creating a new pkgsrc package from scratch
 
-        10.1. Common types of packages
+        12.1. Common types of packages
 
-            10.1.1. Perl modules
-            10.1.2. Python modules and programs
+            12.1.1. Perl modules
+            12.1.2. Python modules and programs
 
-        10.2. Examples
+        12.2. Examples
 
-            10.2.1. How the www/nvu package came into pkgsrc
+            12.2.1. How the www/nvu package came into pkgsrc
 
-    11. Package components - files, directories and contents
+    13. Package components - files, directories and contents
 
-        11.1. Makefile
-        11.2. distinfo
-        11.3. patches/*
+        13.1. Makefile
+        13.2. distinfo
+        13.3. patches/*
 
-            11.3.1. Structure of a single patch file
-            11.3.2. Creating patch files
-            11.3.3. Sources where the patch files come from
-            11.3.4. Patching guidelines
-            11.3.5. Feedback to the author
+            13.3.1. Structure of a single patch file
+            13.3.2. Creating patch files
+            13.3.3. Sources where the patch files come from
+            13.3.4. Patching guidelines
+            13.3.5. Feedback to the author
 
-        11.4. Other mandatory files
-        11.5. Optional files
+        13.4. Other mandatory files
+        13.5. Optional files
 
-            11.5.1. Files affecting the binary package
-            11.5.2. Files affecting the build process
-            11.5.3. Files affecting nothing at all
+            13.5.1. Files affecting the binary package
+            13.5.2. Files affecting the build process
+            13.5.3. Files affecting nothing at all
 
-        11.6. work*
-        11.7. files/*
+        13.6. work*
+        13.7. files/*
 
-    12. Programming in Makefiles
+    14. Programming in Makefiles
 
-        12.1. Caveats
-        12.2. Makefile variables
+        14.1. Caveats
+        14.2. Makefile variables
 
-            12.2.1. Naming conventions
+            14.2.1. Naming conventions
 
-        12.3. Code snippets
+        14.3. Code snippets
 
-            12.3.1. Adding things to a list
-            12.3.2. Echoing a string exactly as-is
-            12.3.3. Passing CFLAGS to GNU configure scripts
-            12.3.4. Handling possibly empty variables
+            14.3.1. Adding things to a list
+            14.3.2. Echoing a string exactly as-is
+            14.3.3. Passing CFLAGS to GNU configure scripts
+            14.3.4. Handling possibly empty variables
 
-    13. PLIST issues
+    15. PLIST issues
 
-        13.1. RCS ID
-        13.2. Semi-automatic PLIST generation
-        13.3. Tweaking output of make print-PLIST
-        13.4. Variable substitution in PLIST
-        13.5. Man page compression
-        13.6. Changing PLIST source with PLIST_SRC
-        13.7. Platform-specific and differing PLISTs
-        13.8. Build-specific PLISTs
-        13.9. Sharing directories between packages
+        15.1. RCS ID
+        15.2. Semi-automatic PLIST generation
+        15.3. Tweaking output of make print-PLIST
+        15.4. Variable substitution in PLIST
+        15.5. Man page compression
+        15.6. Changing PLIST source with PLIST_SRC
+        15.7. Platform-specific and differing PLISTs
+        15.8. Build-specific PLISTs
+        15.9. Sharing directories between packages
 
-    14. Buildlink methodology
+    16. Buildlink methodology
 
-        14.1. Converting packages to use buildlink3
-        14.2. Writing buildlink3.mk files
+        16.1. Converting packages to use buildlink3
+        16.2. Writing buildlink3.mk files
 
-            14.2.1. Anatomy of a buildlink3.mk file
-            14.2.2. Updating BUILDLINK_API_DEPENDS.pkg and
+            16.2.1. Anatomy of a buildlink3.mk file
+            16.2.2. Updating BUILDLINK_API_DEPENDS.pkg and
                 BUILDLINK_ABI_DEPENDS.pkg in buildlink3.mk files
 
-        14.3. Writing builtin.mk files
+        16.3. Writing builtin.mk files
 
-            14.3.1. Anatomy of a builtin.mk file
-            14.3.2. Global preferences for native or pkgsrc software
+            16.3.1. Anatomy of a builtin.mk file
+            16.3.2. Global preferences for native or pkgsrc software
 
-    15. The pkginstall framework
+    17. The pkginstall framework
 
-        15.1. Files and directories outside the installation prefix
+        17.1. Files and directories outside the installation prefix
 
-            15.1.1. Directory manipulation
-            15.1.2. File manipulation
+            17.1.1. Directory manipulation
+            17.1.2. File manipulation
 
-        15.2. Configuration files
+        17.2. Configuration files
 
-            15.2.1. How PKG_SYSCONFDIR is set
-            15.2.2. Telling the software where configuration files are
-            15.2.3. Patching installations
-            15.2.4. Disabling handling of configuration files
+            17.2.1. How PKG_SYSCONFDIR is set
+            17.2.2. Telling the software where configuration files are
+            17.2.3. Patching installations
+            17.2.4. Disabling handling of configuration files
 
-        15.3. System startup scripts
+        17.3. System startup scripts
 
-            15.3.1. Disabling handling of system startup scripts
+            17.3.1. Disabling handling of system startup scripts
 
-        15.4. System users and groups
-        15.5. System shells
+        17.4. System users and groups
+        17.5. System shells
 
-            15.5.1. Disabling shell registration
+            17.5.1. Disabling shell registration
 
-        15.6. Fonts
+        17.6. Fonts
 
-            15.6.1. Disabling automatic update of the fonts databases
+            17.6.1. Disabling automatic update of the fonts databases
 
-    16. Options handling
+    18. Options handling
 
-        16.1. Global default options
-        16.2. Converting packages to use bsd.options.mk
-        16.3. Option Names
-        16.4. Determining the options of dependencies
+        18.1. Global default options
+        18.2. Converting packages to use bsd.options.mk
+        18.3. Option Names
+        18.4. Determining the options of dependencies
 
-    17. The build process
+    19. The build process
 
-        17.1. Introduction
-        17.2. Program location
-        17.3. Directories used during the build process
-        17.4. Running a phase
-        17.5. The fetch phase
+        19.1. Introduction
+        19.2. Program location
+        19.3. Directories used during the build process
+        19.4. Running a phase
+        19.5. The fetch phase
 
-            17.5.1. What to fetch and where to get it from
-            17.5.2. How are the files fetched?
+            19.5.1. What to fetch and where to get it from
+            19.5.2. How are the files fetched?
 
-        17.6. The checksum phase
-        17.7. The extract phase
-        17.8. The patch phase
-        17.9. The tools phase
-        17.10. The wrapper phase
-        17.11. The configure phase
-        17.12. The build phase
-        17.13. The test phase
-        17.14. The install phase
-        17.15. The package phase
-        17.16. Cleaning up
-        17.17. Other helpful targets
+        19.6. The checksum phase
+        19.7. The extract phase
+        19.8. The patch phase
+        19.9. The tools phase
+        19.10. The wrapper phase
+        19.11. The configure phase
+        19.12. The build phase
+        19.13. The test phase
+        19.14. The install phase
+        19.15. The package phase
+        19.16. Cleaning up
+        19.17. Other helpful targets
 
-    18. Tools needed for building or running
+    20. Tools needed for building or running
 
-        18.1. Tools for pkgsrc builds
-        18.2. Tools needed by packages
-        18.3. Tools provided by platforms
+        20.1. Tools for pkgsrc builds
+        20.2. Tools needed by packages
+        20.3. Tools provided by platforms
 
-    19. Making your package work
+    21. Making your package work
 
-        19.1. General operation
+        21.1. General operation
 
-            19.1.1. How to pull in user-settable variables from mk.conf
-            19.1.2. User interaction
-            19.1.3. Handling licenses
-            19.1.4. Restricted packages
-            19.1.5. Handling dependencies
-            19.1.6. Handling conflicts with other packages
-            19.1.7. Packages that cannot or should not be built
-            19.1.8. Packages which should not be deleted, once installed
-            19.1.9. Handling packages with security problems
-            19.1.10. How to handle incrementing versions when fixing an
+            21.1.1. How to pull in user-settable variables from mk.conf
+            21.1.2. User interaction
+            21.1.3. Handling licenses
+            21.1.4. Restricted packages
+            21.1.5. Handling dependencies
+            21.1.6. Handling conflicts with other packages
+            21.1.7. Packages that cannot or should not be built
+            21.1.8. Packages which should not be deleted, once installed
+            21.1.9. Handling packages with security problems
+            21.1.10. How to handle incrementing versions when fixing an
                 existing package
-            19.1.11. Substituting variable text in the package files (the SUBST
+            21.1.11. Substituting variable text in the package files (the SUBST
                 framework)
 
-        19.2. The fetch phase
+        21.2. The fetch phase
 
-            19.2.1. Packages whose distfiles aren't available for plain
+            21.2.1. Packages whose distfiles aren't available for plain
                 downloading
-            19.2.2. How to handle modified distfiles with the 'old' name
-            19.2.3. Packages hosted on github.com
+            21.2.2. How to handle modified distfiles with the 'old' name
+            21.2.3. Packages hosted on github.com
 
-        19.3. The configure phase
+        21.3. The configure phase
 
-            19.3.1. Shared libraries - libtool
-            19.3.2. Using libtool on GNU packages that already support libtool
-            19.3.3. GNU Autoconf/Automake
-
-        19.4. Programming languages
-
-            19.4.1. C, C++, and Fortran
-            19.4.2. Java
-            19.4.3. Packages containing perl scripts
-            19.4.4. Packages containing shell scripts
-            19.4.5. Other programming languages
-
-        19.5. The build phase
-
-            19.5.1. Compiling C and C++ code conditionally
-            19.5.2. How to handle compiler bugs
-            19.5.3. Undefined reference to "..."
-            19.5.4. Running out of memory
-
-        19.6. The install phase
-
-            19.6.1. Creating needed directories
-            19.6.2. Where to install documentation
-            19.6.3. Installing highscore files
-            19.6.4. Adding DESTDIR support to packages
-            19.6.5. Packages with hardcoded paths to other interpreters
-            19.6.6. Packages installing perl modules
-            19.6.7. Packages installing info files
-            19.6.8. Packages installing man pages
-            19.6.9. Packages installing GConf data files
-            19.6.10. Packages installing scrollkeeper/rarian data files
-            19.6.11. Packages installing X11 fonts
-            19.6.12. Packages installing GTK2 modules
-            19.6.13. Packages installing SGML or XML data
-            19.6.14. Packages installing extensions to the MIME database
-            19.6.15. Packages using intltool
-            19.6.16. Packages installing startup scripts
-            19.6.17. Packages installing TeX modules
-            19.6.18. Packages supporting running binaries in emulation
-            19.6.19. Packages installing hicolor theme icons
-            19.6.20. Packages installing desktop files
-
-        19.7. Marking packages as having problems
-
-    20. Debugging
-    21. Submitting and Committing
-
-        21.1. Submitting binary packages
-        21.2. Submitting source packages (for non-NetBSD-developers)
-        21.3. General notes when adding, updating, or removing packages
-        21.4. Commit Messages
-        21.5. Committing: Adding a package to CVS
-        21.6. Updating a package to a newer version
-        21.7. Renaming a package in pkgsrc
-        21.8. Moving a package in pkgsrc
-
-    22. Frequently Asked Questions
-    23. GNOME packaging and porting
-
-        23.1. Meta packages
-        23.2. Packaging a GNOME application
-        23.3. Updating GNOME to a newer version
-        23.4. Patching guidelines
+            21.3.1. Shared libraries - libtool
+            21.3.2. Using libtool on GNU packages that already support libtool
+            21.3.3. GNU Autoconf/Automake
+
+        21.4. Programming languages
+
+            21.4.1. C, C++, and Fortran
+            21.4.2. Java
+            21.4.3. Packages containing perl scripts
+            21.4.4. Packages containing shell scripts
+            21.4.5. Other programming languages
+
+        21.5. The build phase
+
+            21.5.1. Compiling C and C++ code conditionally
+            21.5.2. How to handle compiler bugs
+            21.5.3. Undefined reference to "..."
+            21.5.4. Running out of memory
+
+        21.6. The install phase
+
+            21.6.1. Creating needed directories
+            21.6.2. Where to install documentation
+            21.6.3. Installing highscore files
+            21.6.4. Adding DESTDIR support to packages
+            21.6.5. Packages with hardcoded paths to other interpreters
+            21.6.6. Packages installing perl modules
+            21.6.7. Packages installing info files
+            21.6.8. Packages installing man pages
+            21.6.9. Packages installing GConf data files
+            21.6.10. Packages installing scrollkeeper/rarian data files
+            21.6.11. Packages installing X11 fonts
+            21.6.12. Packages installing GTK2 modules
+            21.6.13. Packages installing SGML or XML data
+            21.6.14. Packages installing extensions to the MIME database
+            21.6.15. Packages using intltool
+            21.6.16. Packages installing startup scripts
+            21.6.17. Packages installing TeX modules
+            21.6.18. Packages supporting running binaries in emulation
+            21.6.19. Packages installing hicolor theme icons
+            21.6.20. Packages installing desktop files
+
+        21.7. Marking packages as having problems
+
+    22. Debugging
+    23. Submitting and Committing
+
+        23.1. Submitting binary packages
+        23.2. Submitting source packages (for non-NetBSD-developers)
+        23.3. General notes when adding, updating, or removing packages
+        23.4. Commit Messages
+        23.5. Committing: Adding a package to CVS
+        23.6. Updating a package to a newer version
+        23.7. Renaming a package in pkgsrc
+        23.8. Moving a package in pkgsrc
+
+    24. Frequently Asked Questions
+    25. GNOME packaging and porting
+
+        25.1. Meta packages
+        25.2. Packaging a GNOME application
+        25.3. Updating GNOME to a newer version
+        25.4. Patching guidelines
 
 III. The pkgsrc infrastructure internals
 
-    24. Design of the pkgsrc infrastructure
+    26. Design of the pkgsrc infrastructure
 
-        24.1. The meaning of variable definitions
-        24.2. Avoiding problems before they arise
-        24.3. Variable evaluation
+        26.1. The meaning of variable definitions
+        26.2. Avoiding problems before they arise
+        26.3. Variable evaluation
 
-            24.3.1. At load time
-            24.3.2. At runtime
+            26.3.1. At load time
+            26.3.2. At runtime
 
-        24.4. How can variables be specified?
-        24.5. Designing interfaces for Makefile fragments
+        26.4. How can variables be specified?
+        26.5. Designing interfaces for Makefile fragments
 
-            24.5.1. Procedures with parameters
-            24.5.2. Actions taken on behalf of parameters
+            26.5.1. Procedures with parameters
+            26.5.2. Actions taken on behalf of parameters
 
-        24.6. The order in which files are loaded
+        26.6. The order in which files are loaded
 
-            24.6.1. The order in bsd.prefs.mk
-            24.6.2. The order in bsd.pkg.mk
+            26.6.1. The order in bsd.prefs.mk
+            26.6.2. The order in bsd.pkg.mk
 
-    25. Regression tests
+    27. Regression tests
 
-        25.1. Running the regression tests
-        25.2. Adding a new regression test
+        27.1. Running the regression tests
+        27.2. Adding a new regression test
 
-            25.2.1. Overridable functions
-            25.2.2. Helper functions
+            27.2.1. Overridable functions
+            27.2.2. Helper functions
 
-    26. Porting pkgsrc
+    28. Porting pkgsrc
 
-        26.1. Porting pkgsrc to a new operating system
+        28.1. Porting pkgsrc to a new operating system
 
 A. A simple example package: bison
 
@@ -425,16 +427,17 @@ C. Directory layout of the pkgsrc FTP se
     C.4. reports: Bulk build reports
     C.5. current, stable, pkgsrc-20xxQy: source packages
 
-D. Editing guidelines for the pkgsrc guide
+D. Help topics
+E. Editing guidelines for the pkgsrc guide
 
-    D.1. Make targets
-    D.2. Procedure
+    E.1. Make targets
+    E.2. Procedure
 
 List of Tables
 
 1.1. Platforms supported by pkgsrc
-11.1. Patching examples
-23.1. PLIST handling for GNOME packages
+13.1. Patching examples
+25.1. PLIST handling for GNOME packages
 
 Chapter 1. What is pkgsrc?
 
@@ -678,112 +681,132 @@ Part I. The pkgsrc user's guide
 
 Table of Contents
 
-2. Where to get pkgsrc and how to keep it up-to-date
+2. Getting help
+3. Where to get pkgsrc and how to keep it up-to-date
 
-    2.1. Getting pkgsrc for the first time
+    3.1. Getting pkgsrc for the first time
 
-        2.1.1. As tar archive
-        2.1.2. Via anonymous CVS
+        3.1.1. As tar archive
+        3.1.2. Via anonymous CVS
 
-    2.2. Keeping pkgsrc up-to-date
+    3.2. Keeping pkgsrc up-to-date
 
-        2.2.1. Via tar files
-        2.2.2. Via CVS
+        3.2.1. Via tar files
+        3.2.2. Via CVS
 
-3. Using pkgsrc on systems other than NetBSD
+4. Using pkgsrc on systems other than NetBSD
 
-    3.1. Binary distribution
-    3.2. Bootstrapping pkgsrc
+    4.1. Binary distribution
+    4.2. Bootstrapping pkgsrc
 
-4. Using pkgsrc
+5. Using pkgsrc
 
-    4.1. Using binary packages
+    5.1. Using binary packages
 
-        4.1.1. Finding binary packages
-        4.1.2. Installing binary packages
-        4.1.3. Deinstalling packages
-        4.1.4. Getting information about installed packages
-        4.1.5. Checking for security vulnerabilities in installed packages
-        4.1.6. Finding if newer versions of your installed packages are in
+        5.1.1. Finding binary packages
+        5.1.2. Installing binary packages
+        5.1.3. Deinstalling packages
+        5.1.4. Getting information about installed packages
+        5.1.5. Checking for security vulnerabilities in installed packages
+        5.1.6. Finding if newer versions of your installed packages are in
             pkgsrc
-        4.1.7. Other administrative functions
+        5.1.7. Other administrative functions
 
-    4.2. Building packages from source
+    5.2. Building packages from source
 
-        4.2.1. Requirements
-        4.2.2. Fetching distfiles
-        4.2.3. How to build and install
+        5.2.1. Requirements
+        5.2.2. Fetching distfiles
+        5.2.3. How to build and install
 
-5. Configuring pkgsrc
+6. Configuring pkgsrc
 
-    5.1. General configuration
-    5.2. Variables affecting the build process
-    5.3. Variables affecting the installation process
-    5.4. Selecting and configuring the compiler
+    6.1. General configuration
+    6.2. Variables affecting the build process
+    6.3. Variables affecting the installation process
+    6.4. Selecting and configuring the compiler
 
-        5.4.1. Selecting the compiler
-        5.4.2. Additional flags to the compiler (CFLAGS)
-        5.4.3. Additional flags to the linker (LDFLAGS)
+        6.4.1. Selecting the compiler
+        6.4.2. Additional flags to the compiler (CFLAGS)
+        6.4.3. Additional flags to the linker (LDFLAGS)
 
-    5.5. Developer/advanced settings
-    5.6. Selecting Build Options
+    6.5. Developer/advanced settings
+    6.6. Selecting Build Options
 
-6. Creating binary packages
+7. Creating binary packages
 
-    6.1. Building a single binary package
-    6.2. Settings for creation of binary packages
+    7.1. Building a single binary package
+    7.2. Settings for creation of binary packages
 
-7. Creating binary packages for everything in pkgsrc (bulk builds)
+8. Creating binary packages for everything in pkgsrc (bulk builds)
 
-    7.1. Preparations
-    7.2. Running a pbulk-style bulk build
+    8.1. Preparations
+    8.2. Running a pbulk-style bulk build
 
-        7.2.1. Configuration
+        8.2.1. Configuration
 
-    7.3. Requirements of a full bulk build
-    7.4. Creating a multiple CD-ROM packages collection
+    8.3. Requirements of a full bulk build
+    8.4. Creating a multiple CD-ROM packages collection
 
-        7.4.1. Example of cdpack
+        8.4.1. Example of cdpack
 
-8. Directory layout of the installed files
+9. Directory layout of the installed files
 
-    8.1. File system layout in ${LOCALBASE}
-    8.2. File system layout in ${VARBASE}
+    9.1. File system layout in ${LOCALBASE}
+    9.2. File system layout in ${VARBASE}
 
-9. Frequently Asked Questions
+10. Frequently Asked Questions
 
-    9.1. Are there any mailing lists for pkg-related discussion?
-    9.2. Utilities for package management (pkgtools)
-    9.3. How to use pkgsrc as non-root
-    9.4. How to resume transfers when fetching distfiles?
-    9.5. How can I install/use modular X.org from pkgsrc?
-    9.6. How to fetch files from behind a firewall
-    9.7. How to fetch files from HTTPS sites
-    9.8. How do I tell make fetch to do passive FTP?
-    9.9. How to fetch all distfiles at once
-    9.10. What does "Don't know how to make /usr/share/tmac/tmac.andoc" mean?
-    9.11. What does "Could not find bsd.own.mk" mean?
-    9.12. Using 'sudo' with pkgsrc
-    9.13. How do I change the location of configuration files?
-    9.14. Automated security checks
-    9.15. Why do some packages ignore my CFLAGS?
-    9.16. A package does not build. What shall I do?
-    9.17. What does "Makefile appears to contain unresolved cvs/rcs/??? merge
+    10.1. Are there any mailing lists for pkg-related discussion?
+    10.2. Utilities for package management (pkgtools)
+    10.3. How to use pkgsrc as non-root
+    10.4. How to resume transfers when fetching distfiles?
+    10.5. How can I install/use modular X.org from pkgsrc?
+    10.6. How to fetch files from behind a firewall
+    10.7. How to fetch files from HTTPS sites
+    10.8. How do I tell make fetch to do passive FTP?
+    10.9. How to fetch all distfiles at once
+    10.10. What does "Don't know how to make /usr/share/tmac/tmac.andoc" mean?
+    10.11. What does "Could not find bsd.own.mk" mean?
+    10.12. Using 'sudo' with pkgsrc
+    10.13. How do I change the location of configuration files?
+    10.14. Automated security checks
+    10.15. Why do some packages ignore my CFLAGS?
+    10.16. A package does not build. What shall I do?
+    10.17. What does "Makefile appears to contain unresolved cvs/rcs/??? merge
         conflicts" mean?
 
-Chapter 2. Where to get pkgsrc and how to keep it up-to-date
+Chapter 2. Getting help
+
+To get help when using pkgsrc, the definitive source is this document, the
+pkgsrc guide. If you don't find anything here, there are alternatives:
+
+  * The built-in pkgsrc help, which is available after bootstrapping pkgsrc.
+    Run bmake help topic=? to get help for any topic, such as a variable name
+    like BUILD_DEFS, a make target like do-build, a missing C or C++ function
+    like strcasecmp or any other topic.
+
+    The available help topics are listed in Appendix D, Help topics.
+
+  * The pkgsrc-users mailing list, to which you can subscribe and then ask your
+    questions.
+
+  * The #pkgsrc IRC channel, which is accessible via a web browser or by using
+    a specialized chat program such as XChat. Pick any user name and join the
+    channel #pkgsrc.
+
+Chapter 3. Where to get pkgsrc and how to keep it up-to-date
 
 Table of Contents
 
-2.1. Getting pkgsrc for the first time
+3.1. Getting pkgsrc for the first time
 
-    2.1.1. As tar archive
-    2.1.2. Via anonymous CVS
+    3.1.1. As tar archive
+    3.1.2. Via anonymous CVS
 
-2.2. Keeping pkgsrc up-to-date
+3.2. Keeping pkgsrc up-to-date
 
-    2.2.1. Via tar files
-    2.2.2. Via CVS
+    3.2.1. Via tar files
+    3.2.2. Via CVS
 
 Before you download and extract the files, you need to decide where you want to
 extract them. When using pkgsrc as root user, pkgsrc is usually installed in /
@@ -793,7 +816,7 @@ contain white-space or other characters 
 shell and some other programs. A safe bet is to use only letters, digits,
 underscores and dashes.
 
-2.1. Getting pkgsrc for the first time
+3.1. Getting pkgsrc for the first time
 
 Before you download any pkgsrc files, you should decide whether you want the 
 current branch or the stable branch. The latter is forked on a quarterly basis
@@ -807,7 +830,7 @@ a tar file or via CVS. Both ways are des
 Note that tar archive contains CVS working copy. Thus you can switch to using
 CVS at any later time.
 
-2.1.1. As tar archive
+3.1.1. As tar archive
 
 The primary download location for all pkgsrc files is https://cdn.NetBSD.org/
 pub/pkgsrc/ or ftp://ftp.NetBSD.org/pub/pkgsrc/ (it points to the same
@@ -843,7 +866,7 @@ To download pkgsrc-current, run:
 
 $ ftp ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc.tar.gz
 
-2.1.2. Via anonymous CVS
+3.1.2. Via anonymous CVS
 
 To fetch a specific pkgsrc stable branch, run:
 
@@ -885,13 +908,13 @@ diff -upN
 rdiff -u
 release -d
 
-2.2. Keeping pkgsrc up-to-date
+3.2. Keeping pkgsrc up-to-date
 
 The preferred way to keep pkgsrc up-to-date is via CVS (which also works if you
 have first installed it via a tar file). It saves bandwidth and hard disk
 activity, compared to downloading the tar file again.
 
-2.2.1. Via tar files
+3.2.1. Via tar files
 
 Warning
 
@@ -905,14 +928,14 @@ strongly recommended.
 Note that by default the distfiles and the binary packages are saved in the
 pkgsrc tree, so don't forget to rescue them before updating. You can also
 configure pkgsrc to store distfiles and packages in directories outside the
-pkgsrc tree by setting the DISTDIR and PACKAGES variables. See Chapter 5, 
+pkgsrc tree by setting the DISTDIR and PACKAGES variables. See Chapter 6, 
 Configuring pkgsrc for the details.
 
 To update pkgsrc from a tar file, download the tar file as explained above.
 Then, make sure that you have not made any changes to the files in the pkgsrc
 directory. Remove the pkgsrc directory and extract the new tar file. Done.
 
-2.2.2. Via CVS
+3.2.2. Via CVS
 
 To update pkgsrc via CVS, change to the pkgsrc directory and run cvs:
 
@@ -923,7 +946,7 @@ described above. E.g.:
 
 $ cd /usr/pkgsrc && env CVS_RSH=ssh cvs up -dP
 
-2.2.2.1. Switching between different pkgsrc branches
+3.2.2.1. Switching between different pkgsrc branches
 
 When updating pkgsrc, the CVS program keeps track of the branch you selected.
 But if you, for whatever reason, want to switch from the stable branch to the
@@ -931,7 +954,7 @@ current one, you can do it by adding the
 keyword. To switch from the current branch back to the stable branch, add the "
 -rpkgsrc-2019Q1" option.
 
-2.2.2.2. What happens to my changes when updating?
+3.2.2.2. What happens to my changes when updating?
 
 When you update pkgsrc, the CVS program will only touch those files that are
 registered in the CVS repository. That means that any packages that you created
@@ -939,18 +962,18 @@ on your own will stay unmodified. If you
 later updates will try to merge your changes with those that have been done by
 others. See the CVS manual, chapter "update" for details.
 
-Chapter 3. Using pkgsrc on systems other than NetBSD
+Chapter 4. Using pkgsrc on systems other than NetBSD
 
 Table of Contents
 
-3.1. Binary distribution
-3.2. Bootstrapping pkgsrc
+4.1. Binary distribution
+4.2. Bootstrapping pkgsrc
 
-3.1. Binary distribution
+4.1. Binary distribution
 
-See Section 4.1, "Using binary packages".
+See Section 5.1, "Using binary packages".
 
-3.2. Bootstrapping pkgsrc
+4.2. Bootstrapping pkgsrc
 
 pkgsrc can be bootstrapped for use in two different modes: privileged and
 unprivileged one. In unprivileged mode in contrast to privileged one all
@@ -987,25 +1010,25 @@ It is possible to bootstrap multiple ins
 directories. Use bmake corresponding to the installation you're working with to
 build and install packages.
 
-Chapter 4. Using pkgsrc
+Chapter 5. Using pkgsrc
 
 Table of Contents
 
-4.1. Using binary packages
+5.1. Using binary packages
 
-    4.1.1. Finding binary packages
-    4.1.2. Installing binary packages
-    4.1.3. Deinstalling packages
-    4.1.4. Getting information about installed packages
-    4.1.5. Checking for security vulnerabilities in installed packages
-    4.1.6. Finding if newer versions of your installed packages are in pkgsrc
-    4.1.7. Other administrative functions
-
-4.2. Building packages from source
-
-    4.2.1. Requirements
-    4.2.2. Fetching distfiles
-    4.2.3. How to build and install
+    5.1.1. Finding binary packages
+    5.1.2. Installing binary packages
+    5.1.3. Deinstalling packages
+    5.1.4. Getting information about installed packages
+    5.1.5. Checking for security vulnerabilities in installed packages
+    5.1.6. Finding if newer versions of your installed packages are in pkgsrc
+    5.1.7. Other administrative functions
+
+5.2. Building packages from source
+
+    5.2.1. Requirements
+    5.2.2. Fetching distfiles
+    5.2.3. How to build and install
 
 Basically, there are two ways of using pkgsrc. The first is to only install the
 package tools and to use binary packages that someone else has prepared. This
@@ -1013,7 +1036,7 @@ is the "pkg" in pkgsrc. The second way i
 Then you are able to build your own packages, and you can still use binary
 packages from someone else.
 
-4.1. Using binary packages
+5.1. Using binary packages
 
 On the cdn.NetBSD.org site and mirrors, there are collections of binary
 packages, ready to be installed. These binary packages have been built using
@@ -1028,9 +1051,9 @@ the default settings for the directories
 
 If you cannot use these directories for whatever reasons (maybe because you're
 not root), you cannot use these binary packages, but have to build the packages
-yourself, which is explained in Section 3.2, "Bootstrapping pkgsrc".
+yourself, which is explained in Section 4.2, "Bootstrapping pkgsrc".
 
-4.1.1. Finding binary packages
+5.1.1. Finding binary packages
 
 To install binary packages, you first need to know from where to get them. The
 first place where you should look is on the main pkgsrc FTP server in the
@@ -1048,7 +1071,7 @@ operating system already provides those 
 in the / directory. It will create the directories /usr/pkg (containing the
 tools for managing binary packages and the database of installed packages).
 
-4.1.2. Installing binary packages
+5.1.2. Installing binary packages
 
 In the directory from the last section, there is a subdirectory called All/,
 which contains all the binary packages that are available for the platform,
@@ -1082,7 +1105,7 @@ that the vulnerabilities are acceptable 
 After you've installed packages, be sure to have /usr/pkg/bin and /usr/pkg/sbin
 in your PATH so you can actually start the just installed program.
 
-4.1.3. Deinstalling packages
+5.1.3. Deinstalling packages
 
 To deinstall a package, it does not matter whether it was installed from source
 code or from a binary package. The pkg_delete command does not know it anyway.
@@ -1100,12 +1123,12 @@ package in question and then removes the
 will remove jpeg and all the packages that used it; this allows upgrading the
 jpeg package.
 
-4.1.4. Getting information about installed packages
+5.1.4. Getting information about installed packages
 
 The pkg_info shows information about installed packages or binary package
 files.
 
-4.1.5. Checking for security vulnerabilities in installed packages
+5.1.5. Checking for security vulnerabilities in installed packages
 
 The NetBSD Security-Officer and Packages Groups maintain a list of known
 security vulnerabilities to packages which are (or have been) included in
@@ -1152,7 +1175,7 @@ check_pkg_vulnerabilities=YES
 
 see daily.conf(5) and security.conf(5) for more details.
 
-4.1.6. Finding if newer versions of your installed packages are in pkgsrc
+5.1.6. Finding if newer versions of your installed packages are in pkgsrc
 
 Install pkgtools/lintpkgsrc and run lintpkgsrc with the "-i" argument to check
 if your packages are up-to-date, e.g.
@@ -1165,11 +1188,11 @@ Version mismatch: 'tcsh' 6.09.00 vs 6.10
 You can then use make update to update the package on your system and rebuild
 any dependencies.
 
-4.1.7. Other administrative functions
+5.1.7. Other administrative functions
 
 The pkg_admin executes various administrative functions on the package system.
 
-4.2. Building packages from source
+5.2. Building packages from source
 
 After obtaining pkgsrc, the pkgsrc directory now contains a set of packages,
 organized into categories. You can browse the online index of packages, or run 
@@ -1185,14 +1208,14 @@ The rest of this chapter assumes that th
 is not, see Part II, "The pkgsrc developer's guide" for instructions how to
 create your own packages.
 
-4.2.1. Requirements
+5.2.1. Requirements
 
 To build packages from source, you need a working C compiler. On NetBSD, you
 need to install the "comp" and the "text" distribution sets. If you want to
 build X11-related packages, the "xbase" and "xcomp" distribution sets are
 required, too.
 
-4.2.2. Fetching distfiles
+5.2.2. Fetching distfiles
 
 The first step for building a package is downloading the distfiles (i.e. the
 unmodified source). If they have not yet been downloaded, pkgsrc will fetch
@@ -1235,7 +1258,7 @@ which will output and run a set of shell
 into the distfiles directory. You can also choose to download the files
 manually.
 
-4.2.3. How to build and install
+5.2.3. How to build and install
 
 Once the software has downloaded, any patches will be applied, then it will be
 compiled for you. This may take some time depending on your computer, and how
@@ -1338,21 +1361,21 @@ miserably. Note also that precompiled bi
 the default LOCALBASE of /usr/pkg, and that you should not install any if you
 use a non-standard LOCALBASE.
 
-Chapter 5. Configuring pkgsrc
+Chapter 6. Configuring pkgsrc
 
 Table of Contents
 
-5.1. General configuration
-5.2. Variables affecting the build process
-5.3. Variables affecting the installation process
-5.4. Selecting and configuring the compiler
-
-    5.4.1. Selecting the compiler
-    5.4.2. Additional flags to the compiler (CFLAGS)
-    5.4.3. Additional flags to the linker (LDFLAGS)
+6.1. General configuration
+6.2. Variables affecting the build process
+6.3. Variables affecting the installation process
+6.4. Selecting and configuring the compiler
+
+    6.4.1. Selecting the compiler
+    6.4.2. Additional flags to the compiler (CFLAGS)
+    6.4.3. Additional flags to the linker (LDFLAGS)
 
-5.5. Developer/advanced settings
-5.6. Selecting Build Options
+6.5. Developer/advanced settings
+6.6. Selecting Build Options
 
 The whole pkgsrc system is configured in a single file, usually called mk.conf.
 In which directory pkgsrc looks for that file depends on the installation. On
@@ -1365,7 +1388,7 @@ The whole pkgsrc configuration is done b
 that you can define all kinds of variables, and no special error checking (for
 example for spelling mistakes) takes place.
 
-5.1. General configuration
+6.1. General configuration
 
 The following variables apply to all pkgsrc packages. A complete list of the
 variables that can be configured by the user is available in mk/defaults/
@@ -1403,7 +1426,7 @@ mk.conf, together with some comments tha
     simple enough, the error message will include specific instructions on how
     to change this variable.
 
-5.2. Variables affecting the build process
+6.2. Variables affecting the build process
 
   * PACKAGES: The top level directory for the binary packages. The default is $
     {PKGSRCDIR}/packages.
@@ -1417,13 +1440,13 @@ mk.conf, together with some comments tha
     tree. It is possible to have many pkgsrc tree instances.)
 
   * LOCALPATCHES: Directory for local patches that aren't part of pkgsrc. See
-    Section 11.3, "patches/*" for more information.
+    Section 13.3, "patches/*" for more information.
 
   * PKGMAKECONF: Location of the mk.conf file used by a package's BSD-style
     Makefile. If this is not set, MAKECONF is set to /dev/null to avoid picking
     up settings used by builds in /usr/src.
 
-5.3. Variables affecting the installation process
+6.3. Variables affecting the installation process
 
   * PKGSRC_KEEP_BIN_PKGSRC: By default, binary packages of built packages are
     preserved in ${PACKAGES}/All. Setting this variable to "no" prevents this.
@@ -1464,9 +1487,9 @@ Then, as a simple user
 
 $ make clean
 
-5.4. Selecting and configuring the compiler
+6.4. Selecting and configuring the compiler
 
-5.4.1. Selecting the compiler
+6.4.1. Selecting the compiler
 
 By default, pkgsrc will use GCC to build packages. This may be overridden by
 setting the following variables in /etc/mk.conf:
@@ -1528,7 +1551,7 @@ GFORTRAN_VERSION:
     If PKGSRC_FORTRAN= gfortran is used, this option specifies which version to
     use.
 
-5.4.2. Additional flags to the compiler (CFLAGS)
+6.4.2. Additional flags to the compiler (CFLAGS)
 
 If you wish to set the CFLAGS variable, please make sure to use the += operator
 instead of the = operator:
@@ -1539,7 +1562,7 @@ Using CFLAGS= (i.e. without the "+") may
 need to add their own flags. You may want to take a look at the devel/cpuflags
 package if you're interested in optimization specifically for the current CPU.
 
-5.4.3. Additional flags to the linker (LDFLAGS)
+6.4.3. Additional flags to the linker (LDFLAGS)
 
 If you want to pass flags to the linker, both in the configure step and the
 build step, you can do this in two ways. Either set LDFLAGS or LIBS. The
@@ -1551,7 +1574,7 @@ settings, use the += operator:
 
 LDFLAGS+=        -your -linkerflags
 
-5.5. Developer/advanced settings
+6.5. Developer/advanced settings
 
   * PKG_DEVELOPER: Run some sanity checks that package developers want:
 
@@ -1566,7 +1589,7 @@ LDFLAGS+=        -your -linkerflags
     invocation, and the value 2 will display both the shell commands before
     their invocation, as well as their actual execution progress with set -x.
 
-5.6. Selecting Build Options
+6.6. Selecting Build Options
 
 Some packages have build time options, usually to select between different
 dependencies, enable optional support for big dependencies or enable
@@ -1629,14 +1652,14 @@ automatically. A warning is issued to pr
 the options framework directly. Support for the legacy variables will be
 removed eventually.
 
-Chapter 6. Creating binary packages
+Chapter 7. Creating binary packages
 
 Table of Contents
 
-6.1. Building a single binary package
-6.2. Settings for creation of binary packages
+7.1. Building a single binary package
+7.2. Settings for creation of binary packages
 
-6.1. Building a single binary package
+7.1. Building a single binary package
 
 Once you have built and installed a package, you can create a binary package
 which can be installed on another system with pkg_add(1). This saves having to
@@ -1656,26 +1679,26 @@ manipulate it. Binary packages are creat
 in the form of a gzipped tar file. See Section B.2, "Packaging figlet" for a
 continuation of the above misc/figlet example.
 
-See Chapter 21, Submitting and Committing for information on how to submit such
+See Chapter 23, Submitting and Committing for information on how to submit such
 a binary package.
 
-6.2. Settings for creation of binary packages
+7.2. Settings for creation of binary packages
 
-See Section 17.17, "Other helpful targets".
+See Section 19.17, "Other helpful targets".
 
-Chapter 7. Creating binary packages for everything in pkgsrc (bulk builds)
+Chapter 8. Creating binary packages for everything in pkgsrc (bulk builds)
 
 Table of Contents
 
-7.1. Preparations
-7.2. Running a pbulk-style bulk build
+8.1. Preparations
+8.2. Running a pbulk-style bulk build
 
-    7.2.1. Configuration
+    8.2.1. Configuration
 
-7.3. Requirements of a full bulk build
-7.4. Creating a multiple CD-ROM packages collection
+8.3. Requirements of a full bulk build
+8.4. Creating a multiple CD-ROM packages collection
 
-    7.4.1. Example of cdpack
+    8.4.1. Example of cdpack
 
 For a number of reasons you may want to build binary packages for a large
 selected set of packages in pkgsrc or even for all pkgsrc packages. For
@@ -1686,7 +1709,7 @@ onto production system. There is a way o
 bulk build system, or pbulk ("p" stands for "parallel"). This chapter describes
 how to set it up.
 
-7.1. Preparations
+8.1. Preparations
 
 First of all, you have to decide whether you build all packages or a limited
 set of them. Full bulk builds usually consume a lot more resources, both space
@@ -1705,7 +1728,7 @@ effect this makes sure that bulk builds 
 There have been numerous cases where certain packages tried to install files
 outside the LOCALBASE or wanted to edit some files in /etc.
 
-7.2. Running a pbulk-style bulk build
+8.2. Running a pbulk-style bulk build
 
 Running a pbulk-style bulk build works roughly as follows:
 
@@ -1714,7 +1737,7 @@ Running a pbulk-style bulk build works r
   * Then, build each of the packages from a clean installation directory using
     the infrastructure.
 
-7.2.1. Configuration
+8.2.1. Configuration
 
 To simplify configuration, we provide the helper script mk/pbulk/pbulk.sh.
 
@@ -1774,7 +1797,7 @@ Note
 The pbulk.sh script supports running unprivileged bulk build and helps
 configuring distributed bulk builds.
 
-7.3. Requirements of a full bulk build
+8.3. Requirements of a full bulk build
 
 A complete bulk build requires lots of disk space. Some of the disk space can
 be read-only, some other must be writable. Some can be on remote filesystems
@@ -1793,7 +1816,7 @@ others must survive a sudden reboot.
 
   * 5 GB for temporary files (read-write, local, temporary)
 
-7.4. Creating a multiple CD-ROM packages collection
+8.4. Creating a multiple CD-ROM packages collection
 
 After your pkgsrc bulk-build has completed, you may wish to create a CD-ROM set
 of the resulting binary packages to assist in installing packages on other
@@ -1801,7 +1824,7 @@ machines. The pkgtools/cdpack package pr
 ISO 9660 images. cdpack arranges the packages on the CD-ROMs in a way that
 keeps all the dependencies for a given package on the same CD as that package.
 
-7.4.1. Example of cdpack
+8.4.1. Example of cdpack
 
 Complete documentation for cdpack is found in the cdpack(1) man page. The
 following short example assumes that the binary packages are left in /usr/
@@ -1833,12 +1856,12 @@ Now create the images:
 Each image will contain README, COPYING, and bin/myscript in their root
 directories.
 
-Chapter 8. Directory layout of the installed files
+Chapter 9. Directory layout of the installed files
 
 Table of Contents
 
-8.1. File system layout in ${LOCALBASE}
-8.2. File system layout in ${VARBASE}
+9.1. File system layout in ${LOCALBASE}
+9.2. File system layout in ${VARBASE}
 
 The files that are installed by pkgsrc are organized in a way that is similar
 to what you find in the /usr directory of the base system. But some details are
@@ -1877,7 +1900,7 @@ below.
   * PKG_SYSCONFDIR corresponds to /etc in the base system. It contains
     configuration files of the packages, as well as pkgsrc's mk.conf itself.
 
-8.1. File system layout in ${LOCALBASE}
+9.1. File system layout in ${LOCALBASE}
 
 The following directories exist in a typical pkgsrc installation in $
 {LOCALBASE}.
@@ -1954,7 +1977,7 @@ var (the usual location of ${VARBASE})
 
     Contains files that may be modified after installation.
 
-8.2. File system layout in ${VARBASE}
+9.2. File system layout in ${VARBASE}
 
 db/pkg (the usual location of ${PKG_DBDIR})
 
@@ -1972,34 +1995,34 @@ run
 
     Contains informational files about daemons that are currently running.
 
-Chapter 9. Frequently Asked Questions
+Chapter 10. Frequently Asked Questions
 
 Table of Contents
 
-9.1. Are there any mailing lists for pkg-related discussion?
-9.2. Utilities for package management (pkgtools)
-9.3. How to use pkgsrc as non-root
-9.4. How to resume transfers when fetching distfiles?
-9.5. How can I install/use modular X.org from pkgsrc?
-9.6. How to fetch files from behind a firewall
-9.7. How to fetch files from HTTPS sites
-9.8. How do I tell make fetch to do passive FTP?
-9.9. How to fetch all distfiles at once
-9.10. What does "Don't know how to make /usr/share/tmac/tmac.andoc" mean?
-9.11. What does "Could not find bsd.own.mk" mean?
-9.12. Using 'sudo' with pkgsrc
-9.13. How do I change the location of configuration files?
-9.14. Automated security checks
-9.15. Why do some packages ignore my CFLAGS?
-9.16. A package does not build. What shall I do?
-9.17. What does "Makefile appears to contain unresolved cvs/rcs/??? merge
+10.1. Are there any mailing lists for pkg-related discussion?
+10.2. Utilities for package management (pkgtools)
+10.3. How to use pkgsrc as non-root
+10.4. How to resume transfers when fetching distfiles?
+10.5. How can I install/use modular X.org from pkgsrc?
+10.6. How to fetch files from behind a firewall
+10.7. How to fetch files from HTTPS sites
+10.8. How do I tell make fetch to do passive FTP?
+10.9. How to fetch all distfiles at once
+10.10. What does "Don't know how to make /usr/share/tmac/tmac.andoc" mean?
+10.11. What does "Could not find bsd.own.mk" mean?
+10.12. Using 'sudo' with pkgsrc
+10.13. How do I change the location of configuration files?
+10.14. Automated security checks
+10.15. Why do some packages ignore my CFLAGS?
+10.16. A package does not build. What shall I do?
+10.17. What does "Makefile appears to contain unresolved cvs/rcs/??? merge
     conflicts" mean?
 
 This section contains hints, tips & tricks on special things in pkgsrc that we
 didn't find a better place for in the previous chapters, and it contains items
 for both pkgsrc users and developers.
 
-9.1. Are there any mailing lists for pkg-related discussion?
+10.1. Are there any mailing lists for pkg-related discussion?
 
 The following mailing lists may be of interest to pkgsrc users:
 
@@ -2026,7 +2049,7 @@ To subscribe, do:
 Archives for all these mailing lists are available from http://
 mail-index.NetBSD.org/.
 
-9.2. Utilities for package management (pkgtools)
+10.2. Utilities for package management (pkgtools)
 
 The directory pkgsrc/pkgtools contains a number of useful utilities for both
 users and developers of pkgsrc. This section attempts only to make the reader
@@ -2094,10 +2117,10 @@ Utilities for people maintaining pkgsrc 
 
   * pkgtools/libkver: Spoof kernel version for chrooted cross builds.
 
-9.3. How to use pkgsrc as non-root
+10.3. How to use pkgsrc as non-root
 
 To install packages from source as a non-root user, download pkgsrc as
-described in Chapter 2, Where to get pkgsrc and how to keep it up-to-date, cd
+described in Chapter 3, Where to get pkgsrc and how to keep it up-to-date, cd
 into that directory and run the command ./bootstrap/bootstrap --unprivileged.
 
 This will install the binary part of pkgsrc to ~/pkg and put the pkgsrc
@@ -2105,7 +2128,7 @@ configuration mk.conf into ~/pkg/etc.
 
 For more details, see mk/unprivileged.mk.
 
-9.4. How to resume transfers when fetching distfiles?
+10.4. How to resume transfers when fetching distfiles?
 
 By default, resuming transfers in pkgsrc is disabled, but you can enable this
 feature by adding the option PKG_RESUME_TRANSFERS=YES into mk.conf. If, during
@@ -2123,7 +2146,7 @@ like:
 
 FETCH_USING=    wget
 
-9.5. How can I install/use modular X.org from pkgsrc?
+10.5. How can I install/use modular X.org from pkgsrc?
 
 If you want to use modular X.org from pkgsrc instead of your system's own X11
 (/usr/X11R6, /usr/openwin, ...) you will have to add the following line into
@@ -2131,7 +2154,7 @@ mk.conf:
 
 X11_TYPE=modular
 
-9.6. How to fetch files from behind a firewall
+10.6. How to fetch files from behind a firewall
 
 If you are sitting behind a firewall which does not allow direct connections to
 Internet hosts (i.e. non-NAT), you may specify the relevant proxy hosts. This
@@ -2142,7 +2165,7 @@ the proxy port number. So the proxy envi
 ftp_proxy=ftp://orpheus.amdahl.com:80/
 http_proxy=http://orpheus.amdahl.com:80/
 
-9.7. How to fetch files from HTTPS sites
+10.7. How to fetch files from HTTPS sites
 
 Some fetch tools are not prepared to support HTTPS by default (for example, the
 one in NetBSD 6.0), or the one installed by the pkgsrc bootstrap (to avoid an
@@ -2154,7 +2177,7 @@ pkgsrc-current. In that case, set FETCH_
 "wget", which are both compiled with HTTPS support by default. Of course, these
 tools need to be installed before you can use them this way.
 
-9.8. How do I tell make fetch to do passive FTP?
+10.8. How do I tell make fetch to do passive FTP?
 
 This depends on which utility is used to retrieve distfiles. From bsd.pkg.mk,
 FETCH_CMD is assigned the first available command from the following list:
@@ -2171,7 +2194,7 @@ following to your mk.conf file: PASSIVE_
 Having that option present will prevent /usr/bin/ftp from falling back to
 active transfers.
 
-9.9. How to fetch all distfiles at once
+10.9. How to fetch all distfiles at once
 
 You would like to download all the distfiles in a single batch from work or
 university, where you can't run a make fetch. There is an archive of distfiles
@@ -2206,7 +2229,7 @@ everything by running:
 
 % make fetch NO_SKIP=yes
 
-9.10. What does "Don't know how to make /usr/share/tmac/tmac.andoc" mean?
+10.10. What does "Don't know how to make /usr/share/tmac/tmac.andoc" mean?
 
 When compiling the pkgtools/pkg_install package, you get the error from make
 that it doesn't know how to make /usr/share/tmac/tmac.andoc? This indicates
@@ -2216,7 +2239,7 @@ distribution on your machine. It is reco
 In the case of the pkgtools/pkg_install package, you can get away with setting
 NOMAN=YES either in the environment or in mk.conf.
 
-9.11. What does "Could not find bsd.own.mk" mean?
+10.11. What does "Could not find bsd.own.mk" mean?
 
 You didn't install the compiler set, comp.tgz, when you installed your NetBSD
 machine. Please get and install it, by extracting it in /:
@@ -2227,7 +2250,7 @@ machine. Please get and install it, by e
 comp.tgz is part of every NetBSD release. Get the one that corresponds to your
 release (determine via uname -r).
 
-9.12. Using 'sudo' with pkgsrc
+10.12. Using 'sudo' with pkgsrc
 
 When installing packages as non-root user and using the just-in-time su(1)
 feature of pkgsrc, it can become annoying to type in the root password for each
@@ -2240,7 +2263,7 @@ mk.conf, somewhere after the definition 
 SU_CMD=        ${LOCALBASE}/bin/sudo /bin/sh -c
 .endif
 
-9.13. How do I change the location of configuration files?
+10.13. How do I change the location of configuration files?
 
 As the system administrator, you can choose where configuration files are
 installed. The default settings make all these files go into ${PREFIX}/etc or
@@ -2260,7 +2283,7 @@ of PKGBASE.
 Note that after changing these settings, you must rebuild and reinstall any
 affected packages.
 
-9.14. Automated security checks
+10.14. Automated security checks
 
 Please be aware that there can often be bugs in third-party software, and some
 of these bugs can leave a machine vulnerable to exploitation by attackers. In
@@ -2281,14 +2304,14 @@ following two tools (installed as part o
     by output to stdout, including a description of the type of vulnerability,
     and a URL containing more information.
 
-Use of these tools is strongly recommended! See Section 4.1.5, "Checking for
+Use of these tools is strongly recommended! See Section 5.1.5, "Checking for
 security vulnerabilities in installed packages" for instructions on how to
 automate checking and reporting.
 
 If this database is installed, pkgsrc builds will use it to perform a security
 check before building any package.
 
-9.15. Why do some packages ignore my CFLAGS?
+10.15. Why do some packages ignore my CFLAGS?
 
 When you add your own preferences to the CFLAGS variable in your mk.conf, these
 flags are passed in environment variables to the ./configure scripts and to
@@ -2302,7 +2325,7 @@ Usually you can remove these lines. But 
 write so bad code that it only works for the specific combination of CFLAGS
 they have chosen.
 
-9.16. A package does not build. What shall I do?
+10.16. A package does not build. What shall I do?
 
  1. Make sure that your copy of pkgsrc is consistent. A case that occurs often
     is that people only update pkgsrc in parts, because of performance reasons.
@@ -2317,11 +2340,11 @@ they have chosen.
     make clean clean-depends to verify this.
 
  4. If you are a package developer who wants to invest some work, have a look
-    at Chapter 19, Making your package work.
+    at Chapter 21, Making your package work.
 
  5. If the problem still exists, write a mail to the pkgsrc-users mailing list.
 
-9.17. What does "Makefile appears to contain unresolved cvs/rcs/??? merge
+10.17. What does "Makefile appears to contain unresolved cvs/rcs/??? merge
 conflicts" mean?
 
 You have modified a file from pkgsrc, and someone else has modified that same
@@ -2342,245 +2365,265 @@ more like a reference manual for pkgsrc.
 
 Table of Contents
 
-10. Creating a new pkgsrc package from scratch
+11. Getting help
+12. Creating a new pkgsrc package from scratch
 
-    10.1. Common types of packages
+    12.1. Common types of packages
 
-        10.1.1. Perl modules
-        10.1.2. Python modules and programs
+        12.1.1. Perl modules
+        12.1.2. Python modules and programs
 
-    10.2. Examples
+    12.2. Examples
 
-        10.2.1. How the www/nvu package came into pkgsrc
+        12.2.1. How the www/nvu package came into pkgsrc
 
-11. Package components - files, directories and contents
+13. Package components - files, directories and contents
 
-    11.1. Makefile
-    11.2. distinfo
-    11.3. patches/*
+    13.1. Makefile
+    13.2. distinfo
+    13.3. patches/*
 
-        11.3.1. Structure of a single patch file
-        11.3.2. Creating patch files
-        11.3.3. Sources where the patch files come from
-        11.3.4. Patching guidelines
-        11.3.5. Feedback to the author
+        13.3.1. Structure of a single patch file
+        13.3.2. Creating patch files
+        13.3.3. Sources where the patch files come from
+        13.3.4. Patching guidelines
+        13.3.5. Feedback to the author
 
-    11.4. Other mandatory files
-    11.5. Optional files
+    13.4. Other mandatory files
+    13.5. Optional files
 
-        11.5.1. Files affecting the binary package
-        11.5.2. Files affecting the build process
-        11.5.3. Files affecting nothing at all
+        13.5.1. Files affecting the binary package
+        13.5.2. Files affecting the build process
+        13.5.3. Files affecting nothing at all
 
-    11.6. work*
-    11.7. files/*
+    13.6. work*
+    13.7. files/*
 
-12. Programming in Makefiles
+14. Programming in Makefiles
 
-    12.1. Caveats
-    12.2. Makefile variables
+    14.1. Caveats
+    14.2. Makefile variables
 
-        12.2.1. Naming conventions
+        14.2.1. Naming conventions
 
-    12.3. Code snippets
+    14.3. Code snippets
 
-        12.3.1. Adding things to a list
-        12.3.2. Echoing a string exactly as-is
-        12.3.3. Passing CFLAGS to GNU configure scripts
-        12.3.4. Handling possibly empty variables
+        14.3.1. Adding things to a list
+        14.3.2. Echoing a string exactly as-is
+        14.3.3. Passing CFLAGS to GNU configure scripts
+        14.3.4. Handling possibly empty variables
 
-13. PLIST issues
+15. PLIST issues
 
-    13.1. RCS ID
-    13.2. Semi-automatic PLIST generation
-    13.3. Tweaking output of make print-PLIST
-    13.4. Variable substitution in PLIST
-    13.5. Man page compression
-    13.6. Changing PLIST source with PLIST_SRC
-    13.7. Platform-specific and differing PLISTs
-    13.8. Build-specific PLISTs
-    13.9. Sharing directories between packages
+    15.1. RCS ID
+    15.2. Semi-automatic PLIST generation
+    15.3. Tweaking output of make print-PLIST
+    15.4. Variable substitution in PLIST
+    15.5. Man page compression
+    15.6. Changing PLIST source with PLIST_SRC
+    15.7. Platform-specific and differing PLISTs
+    15.8. Build-specific PLISTs
+    15.9. Sharing directories between packages
 
-14. Buildlink methodology
+16. Buildlink methodology
 
-    14.1. Converting packages to use buildlink3
-    14.2. Writing buildlink3.mk files
+    16.1. Converting packages to use buildlink3
+    16.2. Writing buildlink3.mk files
 
-        14.2.1. Anatomy of a buildlink3.mk file
-        14.2.2. Updating BUILDLINK_API_DEPENDS.pkg and BUILDLINK_ABI_DEPENDS.
+        16.2.1. Anatomy of a buildlink3.mk file
+        16.2.2. Updating BUILDLINK_API_DEPENDS.pkg and BUILDLINK_ABI_DEPENDS.
             pkg in buildlink3.mk files
 
-    14.3. Writing builtin.mk files
+    16.3. Writing builtin.mk files
 
-        14.3.1. Anatomy of a builtin.mk file
-        14.3.2. Global preferences for native or pkgsrc software
+        16.3.1. Anatomy of a builtin.mk file
+        16.3.2. Global preferences for native or pkgsrc software
 
-15. The pkginstall framework
+17. The pkginstall framework
 
-    15.1. Files and directories outside the installation prefix
+    17.1. Files and directories outside the installation prefix
 
-        15.1.1. Directory manipulation
-        15.1.2. File manipulation
+        17.1.1. Directory manipulation
+        17.1.2. File manipulation
 
-    15.2. Configuration files
+    17.2. Configuration files
 
-        15.2.1. How PKG_SYSCONFDIR is set
-        15.2.2. Telling the software where configuration files are
-        15.2.3. Patching installations
-        15.2.4. Disabling handling of configuration files
+        17.2.1. How PKG_SYSCONFDIR is set
+        17.2.2. Telling the software where configuration files are
+        17.2.3. Patching installations
+        17.2.4. Disabling handling of configuration files
 
-    15.3. System startup scripts
+    17.3. System startup scripts
 
-        15.3.1. Disabling handling of system startup scripts
+        17.3.1. Disabling handling of system startup scripts
 
-    15.4. System users and groups
-    15.5. System shells
+    17.4. System users and groups
+    17.5. System shells
 
-        15.5.1. Disabling shell registration
+        17.5.1. Disabling shell registration
 
-    15.6. Fonts
+    17.6. Fonts
 
-        15.6.1. Disabling automatic update of the fonts databases
+        17.6.1. Disabling automatic update of the fonts databases
 
-16. Options handling
+18. Options handling
 
-    16.1. Global default options
-    16.2. Converting packages to use bsd.options.mk
-    16.3. Option Names
-    16.4. Determining the options of dependencies
+    18.1. Global default options
+    18.2. Converting packages to use bsd.options.mk
+    18.3. Option Names
+    18.4. Determining the options of dependencies
 
-17. The build process
+19. The build process
 
-    17.1. Introduction
-    17.2. Program location
-    17.3. Directories used during the build process
-    17.4. Running a phase
-    17.5. The fetch phase
+    19.1. Introduction
+    19.2. Program location
+    19.3. Directories used during the build process
+    19.4. Running a phase
+    19.5. The fetch phase
 
-        17.5.1. What to fetch and where to get it from
-        17.5.2. How are the files fetched?
+        19.5.1. What to fetch and where to get it from
+        19.5.2. How are the files fetched?
 
-    17.6. The checksum phase
-    17.7. The extract phase
-    17.8. The patch phase
-    17.9. The tools phase
-    17.10. The wrapper phase
-    17.11. The configure phase
-    17.12. The build phase
-    17.13. The test phase
-    17.14. The install phase
-    17.15. The package phase
-    17.16. Cleaning up
-    17.17. Other helpful targets
+    19.6. The checksum phase
+    19.7. The extract phase
+    19.8. The patch phase
+    19.9. The tools phase
+    19.10. The wrapper phase
+    19.11. The configure phase
+    19.12. The build phase
+    19.13. The test phase
+    19.14. The install phase
+    19.15. The package phase
+    19.16. Cleaning up
+    19.17. Other helpful targets
 
-18. Tools needed for building or running
+20. Tools needed for building or running
 
-    18.1. Tools for pkgsrc builds
-    18.2. Tools needed by packages
-    18.3. Tools provided by platforms
+    20.1. Tools for pkgsrc builds
+    20.2. Tools needed by packages
+    20.3. Tools provided by platforms
 
-19. Making your package work
+21. Making your package work
 
-    19.1. General operation
+    21.1. General operation
 
-        19.1.1. How to pull in user-settable variables from mk.conf
-        19.1.2. User interaction
-        19.1.3. Handling licenses
-        19.1.4. Restricted packages
-        19.1.5. Handling dependencies
-        19.1.6. Handling conflicts with other packages
-        19.1.7. Packages that cannot or should not be built
-        19.1.8. Packages which should not be deleted, once installed
-        19.1.9. Handling packages with security problems
-        19.1.10. How to handle incrementing versions when fixing an existing
+        21.1.1. How to pull in user-settable variables from mk.conf
+        21.1.2. User interaction
+        21.1.3. Handling licenses
+        21.1.4. Restricted packages
+        21.1.5. Handling dependencies
+        21.1.6. Handling conflicts with other packages
+        21.1.7. Packages that cannot or should not be built
+        21.1.8. Packages which should not be deleted, once installed
+        21.1.9. Handling packages with security problems
+        21.1.10. How to handle incrementing versions when fixing an existing
             package
-        19.1.11. Substituting variable text in the package files (the SUBST
+        21.1.11. Substituting variable text in the package files (the SUBST
             framework)
 
-    19.2. The fetch phase
+    21.2. The fetch phase
 
-        19.2.1. Packages whose distfiles aren't available for plain downloading
-        19.2.2. How to handle modified distfiles with the 'old' name
-        19.2.3. Packages hosted on github.com
-
-    19.3. The configure phase
-
-        19.3.1. Shared libraries - libtool
-        19.3.2. Using libtool on GNU packages that already support libtool
-        19.3.3. GNU Autoconf/Automake
-
-    19.4. Programming languages
-
-        19.4.1. C, C++, and Fortran
-        19.4.2. Java
-        19.4.3. Packages containing perl scripts
-        19.4.4. Packages containing shell scripts
-        19.4.5. Other programming languages
-
-    19.5. The build phase
-
-        19.5.1. Compiling C and C++ code conditionally
-        19.5.2. How to handle compiler bugs
-        19.5.3. Undefined reference to "..."
-        19.5.4. Running out of memory
-
-    19.6. The install phase
-
-        19.6.1. Creating needed directories
-        19.6.2. Where to install documentation
-        19.6.3. Installing highscore files
-        19.6.4. Adding DESTDIR support to packages
-        19.6.5. Packages with hardcoded paths to other interpreters
-        19.6.6. Packages installing perl modules
-        19.6.7. Packages installing info files
-        19.6.8. Packages installing man pages
-        19.6.9. Packages installing GConf data files
-        19.6.10. Packages installing scrollkeeper/rarian data files
-        19.6.11. Packages installing X11 fonts
-        19.6.12. Packages installing GTK2 modules
-        19.6.13. Packages installing SGML or XML data
-        19.6.14. Packages installing extensions to the MIME database
-        19.6.15. Packages using intltool
-        19.6.16. Packages installing startup scripts
-        19.6.17. Packages installing TeX modules
-        19.6.18. Packages supporting running binaries in emulation
-        19.6.19. Packages installing hicolor theme icons
-        19.6.20. Packages installing desktop files
-
-    19.7. Marking packages as having problems
-
-20. Debugging
-21. Submitting and Committing
-
-    21.1. Submitting binary packages
-    21.2. Submitting source packages (for non-NetBSD-developers)
-    21.3. General notes when adding, updating, or removing packages
-    21.4. Commit Messages
-    21.5. Committing: Adding a package to CVS
-    21.6. Updating a package to a newer version
-    21.7. Renaming a package in pkgsrc
-    21.8. Moving a package in pkgsrc
-
-22. Frequently Asked Questions
-23. GNOME packaging and porting
-
-    23.1. Meta packages
-    23.2. Packaging a GNOME application
-    23.3. Updating GNOME to a newer version
-    23.4. Patching guidelines
+        21.2.1. Packages whose distfiles aren't available for plain downloading
+        21.2.2. How to handle modified distfiles with the 'old' name
+        21.2.3. Packages hosted on github.com
+
+    21.3. The configure phase
+
+        21.3.1. Shared libraries - libtool
+        21.3.2. Using libtool on GNU packages that already support libtool
+        21.3.3. GNU Autoconf/Automake
+
+    21.4. Programming languages
+
+        21.4.1. C, C++, and Fortran
+        21.4.2. Java
+        21.4.3. Packages containing perl scripts
+        21.4.4. Packages containing shell scripts
+        21.4.5. Other programming languages
+
+    21.5. The build phase
+
+        21.5.1. Compiling C and C++ code conditionally
+        21.5.2. How to handle compiler bugs
+        21.5.3. Undefined reference to "..."
+        21.5.4. Running out of memory
+
+    21.6. The install phase
+
+        21.6.1. Creating needed directories
+        21.6.2. Where to install documentation
+        21.6.3. Installing highscore files
+        21.6.4. Adding DESTDIR support to packages
+        21.6.5. Packages with hardcoded paths to other interpreters
+        21.6.6. Packages installing perl modules
+        21.6.7. Packages installing info files
+        21.6.8. Packages installing man pages
+        21.6.9. Packages installing GConf data files
+        21.6.10. Packages installing scrollkeeper/rarian data files
+        21.6.11. Packages installing X11 fonts
+        21.6.12. Packages installing GTK2 modules
+        21.6.13. Packages installing SGML or XML data
+        21.6.14. Packages installing extensions to the MIME database
+        21.6.15. Packages using intltool
+        21.6.16. Packages installing startup scripts
+        21.6.17. Packages installing TeX modules
+        21.6.18. Packages supporting running binaries in emulation
+        21.6.19. Packages installing hicolor theme icons
+        21.6.20. Packages installing desktop files
+
+    21.7. Marking packages as having problems
+
+22. Debugging
+23. Submitting and Committing
+
+    23.1. Submitting binary packages
+    23.2. Submitting source packages (for non-NetBSD-developers)
+    23.3. General notes when adding, updating, or removing packages
+    23.4. Commit Messages
+    23.5. Committing: Adding a package to CVS
+    23.6. Updating a package to a newer version
+    23.7. Renaming a package in pkgsrc
+    23.8. Moving a package in pkgsrc
+
+24. Frequently Asked Questions
+25. GNOME packaging and porting
+
+    25.1. Meta packages
+    25.2. Packaging a GNOME application
+    25.3. Updating GNOME to a newer version
+    25.4. Patching guidelines
+
+Chapter 11. Getting help
+
+To get help when developing pkgsrc, the definitive source is this document, the
+pkgsrc guide. If you don't find anything here, there are alternatives:
+
+  * The built-in pkgsrc help, which is available after bootstrapping pkgsrc.
+    Run bmake help topic=? to get help for any topic, such as a variable name
+    like BUILD_DEFS, a make target like do-build, a missing C or C++ function
+    like strcasecmp or any other topic.
+
+    The available help topics are listed in Appendix D, Help topics.
+
+  * The tech-pkg mailing list, to which you can subscribe and then ask your
+    questions.
+
+  * The #pkgsrc IRC channel, which is accessible via a web browser or by using
+    a specialized chat program such as XChat. Pick any user name and join the
+    channel #pkgsrc.
 
-Chapter 10. Creating a new pkgsrc package from scratch
+Chapter 12. Creating a new pkgsrc package from scratch
 
 Table of Contents
 
-10.1. Common types of packages
+12.1. Common types of packages
 
-    10.1.1. Perl modules
-    10.1.2. Python modules and programs
+    12.1.1. Perl modules
+    12.1.2. Python modules and programs
 
-10.2. Examples
+12.2. Examples
 
-    10.2.1. How the www/nvu package came into pkgsrc
+    12.2.1. How the www/nvu package came into pkgsrc
 
 When you find a package that is not yet in pkgsrc, you most likely have a URL
 from where you can download the source code. Starting with this URL, creating a
@@ -2631,7 +2674,7 @@ package involves only a few steps.
     pkglint --explain or pkglint -e, which outputs additional explanations.
 
  6. In many cases the package is not yet ready to build. You can find
-    instructions for the most common cases in the next section, Section 10.1,
+    instructions for the most common cases in the next section, Section 12.1,
     "Common types of packages". After you have followed the instructions over
     there, you can hopefully continue here.
 
@@ -2641,7 +2684,7 @@ package involves only a few steps.
     edited the Makefile.
 
  8. Now, run bmake to build the package. For the various things that can go
-    wrong in this phase, consult Chapter 19, Making your package work.
+    wrong in this phase, consult Chapter 21, Making your package work.
 
  9. When the package builds fine, the next step is to install the package. Run 
     bmake install and hope that everything works.
@@ -2661,14 +2704,14 @@ package involves only a few steps.
 13. Run bmake package to create a binary package from the set of installed
     files.
 
-10.1. Common types of packages
+12.1. Common types of packages
 
-10.1.1. Perl modules
+12.1.1. Perl modules
 
 Simple Perl modules are handled automatically by url2pkg, including
 dependencies.
 
-10.1.2. Python modules and programs
+12.1.2. Python modules and programs
 
 Python modules and programs packages are easily created using a set of
 predefined variables.
@@ -2712,11 +2755,11 @@ PYTHON_VERSIONED_DEPENDENCIES=dialog
 
 Look inside versioned_dependencies.mk for a list of supported packages.
 
-10.2. Examples
+12.2. Examples
 
-10.2.1. How the www/nvu package came into pkgsrc
+12.2.1. How the www/nvu package came into pkgsrc
 
-10.2.1.1. The initial package
+12.2.1.1. The initial package
 
 Looking at the file pkgsrc/doc/TODO, I saw that the "nvu" package has not yet
 been imported into pkgsrc. As the description says it has to do with the web,
@@ -2777,7 +2820,7 @@ Remember to correct CATEGORIES, HOMEPAGE
 
 Good luck! (See pkgsrc/doc/pkgsrc.txt for some more help :-)
 
-10.2.1.2. Fixing all kinds of problems to make the package work
+12.2.1.2. Fixing all kinds of problems to make the package work
 
 Now that the package has been extracted, let's see what's inside it. The
 package has a README.txt, but that only says something about mozilla, so it's
@@ -2900,7 +2943,7 @@ looked up in www/seamonkey which patch f
 copied them to the patches directory. Then I retried, fixed the patches so that
 they applied cleanly and retried again. This time, everything worked.
 
-10.2.1.3. Installing the package
+12.2.1.3. Installing the package
 
 $ bmake CHECK_FILES=no install
 [...]
@@ -2908,34 +2951,34 @@ $ bmake print-PLIST >PLIST
 $ bmake deinstall
 $ bmake install
 
-Chapter 11. Package components - files, directories and contents
+Chapter 13. Package components - files, directories and contents
 
 Table of Contents
 
-11.1. Makefile
-11.2. distinfo
-11.3. patches/*
-
-    11.3.1. Structure of a single patch file
-    11.3.2. Creating patch files
-    11.3.3. Sources where the patch files come from
-    11.3.4. Patching guidelines
-    11.3.5. Feedback to the author
-
-11.4. Other mandatory files
-11.5. Optional files
-
-    11.5.1. Files affecting the binary package
-    11.5.2. Files affecting the build process
-    11.5.3. Files affecting nothing at all
+13.1. Makefile
+13.2. distinfo
+13.3. patches/*
+
+    13.3.1. Structure of a single patch file
+    13.3.2. Creating patch files
+    13.3.3. Sources where the patch files come from
+    13.3.4. Patching guidelines
+    13.3.5. Feedback to the author
+
+13.4. Other mandatory files
+13.5. Optional files
+
+    13.5.1. Files affecting the binary package
+    13.5.2. Files affecting the build process
+    13.5.3. Files affecting nothing at all
 
-11.6. work*
-11.7. files/*
+13.6. work*
+13.7. files/*
 
 Whenever you're preparing a package, there are a number of files involved which
 are described in the following sections.
 
-11.1. Makefile
+13.1. Makefile
 
 Building, installation and creation of a binary package are all controlled by
 the package's Makefile. The Makefile describes various things about a package,
@@ -2974,7 +3017,7 @@ mostly historical and has no further mea
     converters    games         mbone         print         x11
 
   * MASTER_SITES, DYNAMIC_MASTER_SITES, DIST_SUBDIR, EXTRACT_SUFX and DISTFILES
-    are discussed in detail in Section 17.5, "The fetch phase".
+    are discussed in detail in Section 19.5, "The fetch phase".
 
 The second section contains information about separately downloaded patches, if
 any.
@@ -3010,7 +3053,7 @@ The third section contains the following
     package name).
 
   * LICENSE indicates the license(s) applicable for the package. See
-    Section 19.1.3, "Handling licenses" for further details.
+    Section 21.1.3, "Handling licenses" for further details.
 
 Other variables that affect the build:
 
@@ -3044,10 +3087,10 @@ Please pay attention to the following go
 
   * Replace /usr/local with "${PREFIX}" in all files (see patches, below).
 
-  * If the package installs any info files, see Section 19.6.7, "Packages
+  * If the package installs any info files, see Section 21.6.7, "Packages
     installing info files".
 
-11.2. distinfo
+13.2. distinfo
 
 The distinfo file contains the message digest, or checksum, of each distfile
 needed for the package. This ensures that the distfiles retrieved from the
@@ -3057,7 +3100,7 @@ protected using three different message 
 SHA512), as well as the file size.
 
 The distinfo file also contains the checksums for all the patches found in the
-patches directory (see Section 11.3, "patches/*"). These checksums ensure that
+patches directory (see Section 13.3, "patches/*"). These checksums ensure that
 patches are only applied intentionally and that they don't accidentally change,
 e.g. when merging different changes together. They also make sure that new
 patches are actually added to CVS and old ones are removed. Too see whether the
@@ -3070,7 +3113,7 @@ example lang/openjdk7. These are kept in
 be taken when upgrading such a package to ensure distfile information is not
 lost.
 
-11.3. patches/*
+13.3. patches/*
 
 Some packages don't work out-of-the box on the various platforms that are
 supported by pkgsrc. These packages need to be patched to make them work. The
@@ -3079,7 +3122,7 @@ patch files can be found in the patches/
 In the patch phase, these patches are applied to the files in WRKSRC directory
 after extracting them, in alphabetic order.
 
-11.3.1. Structure of a single patch file
+13.3.1. Structure of a single patch file
 
 The patch-* files should be in diff -bu format, and apply without a fuzz to
 avoid problems. (To force patches to apply with fuzz you can set
@@ -3103,7 +3146,7 @@ application can make some use of the pat
 the upstream developers, since we generally want that they accept our patches,
 so we have less work in the future.
 
-11.3.2. Creating patch files
+13.3.2. Creating patch files
 
 One important thing to mention is to pay attention that no RCS IDs get stored
 in the patch files, as these will cause problems when later checked into the
@@ -3119,7 +3162,7 @@ patchdiff. The files in patches are repl
 if you want to take all the changes.
 
 When you have finished a package, remember to generate the checksums for the
-patch files by using the make makepatchsum command, see Section 11.2,
+patch files by using the make makepatchsum command, see Section 13.2,
 "distinfo".
 
 When adding a patch that corrects a problem in the distfile (rather than e.g.
@@ -3133,7 +3176,7 @@ convention patch-[a-z][a-z], but new pat
 the filename. mkpatches included in pkgtools/pkgdiff takes care of the name
 automatically.
 
-11.3.3. Sources where the patch files come from
+13.3.3. Sources where the patch files come from
 
 If you want to share patches between multiple packages in pkgsrc, e.g. because
 they use the same distfiles, set PATCHDIR to the path where the patch files can
@@ -3153,7 +3196,7 @@ for pkgsrc/graphics/png, keep it in $LOC
 files in the named directory are expected to be patch files, and they are
 applied after pkgsrc patches are applied.
 
-11.3.4. Patching guidelines
+13.3.4. Patching guidelines
 
 When fixing a portability issue in the code do not use preprocessor magic to
 check for the current operating system nor platform. Doing so hurts portability
@@ -3177,7 +3220,7 @@ doesn't work unless it is right!
 
 Some typical examples:
 
-Table 11.1. Patching examples
+Table 13.1. Patching examples
 
 +-------------------------------------------------------------------------------------------+
 |  Where  |        Incorrect         |                       Correct                        |
@@ -3204,7 +3247,7 @@ Table 11.1. Patching examples
 +-------------------------------------------------------------------------------------------+
 
 
-11.3.5. Feedback to the author
+13.3.5. Feedback to the author
 
 Always, always, always feed back any portability fixes or improvements you do
 to a package to the mainstream developers. This is the only way to get their
@@ -3224,7 +3267,7 @@ patch comment.
 
 Support the idea of free software!
 
-11.4. Other mandatory files
+13.4. Other mandatory files
 
 DESCR
 
@@ -3238,12 +3281,12 @@ PLIST
     This file governs the files that are installed on your system: all the
     binaries, manual pages, etc. There are other directives which may be
     entered in this file, to control the creation and deletion of directories,
-    and the location of inserted files. See Chapter 13, PLIST issues for more
+    and the location of inserted files. See Chapter 15, PLIST issues for more
     information.
 
-11.5. Optional files
+13.5. Optional files
 
-11.5.1. Files affecting the binary package
+13.5.1. Files affecting the binary package
 
 INSTALL
 
@@ -3251,7 +3294,7 @@ INSTALL
     extraction and before files are moved in place, the second time after the
     files to install are moved in place. This can be used to do any custom
     procedures not possible with @exec commands in PLIST. See pkg_add(1) and
-    pkg_create(1) for more information. See also Section 15.1, "Files and
+    pkg_create(1) for more information. See also Section 17.1, "Files and
     directories outside the installation prefix". Please note that you can
     modify variables in it easily by using FILES_SUBST in the package's
     Makefile:
@@ -3298,7 +3341,7 @@ ALTERNATIVES
     Each line of the file contains two filenames, first the wrapper and then
     the alternative provided by the package. Both paths are relative to PREFIX.
 
-11.5.2. Files affecting the build process
+13.5.2. Files affecting the build process
 
 Makefile.common
 
@@ -3311,7 +3354,7 @@ Makefile.common
 buildlink3.mk
 
     This file contains the dependency information for the buildlink3 framework
-    (see Chapter 14, Buildlink methodology).
+    (see Chapter 16, Buildlink methodology).
 
 hacks.mk
 
@@ -3322,11 +3365,11 @@ hacks.mk
 options.mk
 
     This file contains the code for the package-specific options (see
-    Chapter 16, Options handling) that can be selected by the user. If a
+    Chapter 18, Options handling) that can be selected by the user. If a
     package has only one or two options, it is equally acceptable to put the
     code directly into the Makefile.
 
-11.5.3. Files affecting nothing at all
+13.5.3. Files affecting nothing at all
 
 README*
 
@@ -3338,7 +3381,7 @@ TODO
     This file contains things that need to be done to make the package even
     better.
 
-11.6. work*
+13.6. work*
 
 When you type make, the distribution files are unpacked into the directory
 denoted by WRKDIR. It can be removed by running make clean. Besides the
@@ -3346,7 +3389,7 @@ sources, this directory is also used to 
 directory gets removed completely on clean. The default is ${.CURDIR}/work or $
 {.CURDIR}/work.${MACHINE_ARCH} if OBJMACHINE is set.
 
-11.7. files/*
+13.7. files/*
 
 If you have any files that you wish to be placed in the package prior to
 configuration or building, you could place these files here and use a ${CP}
@@ -3359,37 +3402,36 @@ variable to point to the other package's
 
 FILESDIR=${.CURDIR}/../xemacs/files
 
-Chapter 12. Programming in Makefiles
+Chapter 14. Programming in Makefiles
 
 Table of Contents
 
-12.1. Caveats
-12.2. Makefile variables
+14.1. Caveats
+14.2. Makefile variables
 
-    12.2.1. Naming conventions
+    14.2.1. Naming conventions
 
-12.3. Code snippets
+14.3. Code snippets
 
-    12.3.1. Adding things to a list
-    12.3.2. Echoing a string exactly as-is
-    12.3.3. Passing CFLAGS to GNU configure scripts
-    12.3.4. Handling possibly empty variables
+    14.3.1. Adding things to a list
+    14.3.2. Echoing a string exactly as-is
+    14.3.3. Passing CFLAGS to GNU configure scripts
+    14.3.4. Handling possibly empty variables
 
 Pkgsrc consists of many Makefile fragments, each of which forms a well-defined
 part of the pkgsrc system. Using the make(1) system as a programming language
 for a big system like pkgsrc requires some discipline to keep the code correct
 and understandable.
 
-The basic ingredients for Makefile programming are variables (which are
-actually macros) and shell commands. Among these shell commands may even be
-more complex ones like awk(1) programs. To make sure that every shell command
-runs as intended it is necessary to quote all variables correctly when they are
-used.
+The basic ingredients for Makefile programming are variables and shell
+commands. Among these shell commands may even be more complex ones like awk(1)
+programs. To make sure that every shell command runs as intended it is
+necessary to quote all variables correctly when they are used.
 
-This chapter describes some patterns, that appear quite often in Makefiles,
+This chapter describes some patterns that appear quite often in Makefiles,
 including the pitfalls that come along with them.
 
-12.1. Caveats
+14.1. Caveats
 
   * When you are creating a file as a target of a rule, always write the data
     to a temporary file first and finally rename that file. Otherwise there
@@ -3414,65 +3456,46 @@ including the pitfalls that come along w
 
     You might remember that make(1) sometimes removes ${.TARGET} in case of
     error, but this only happens when it is interrupted, for example by
-    pressing ^C. This does not happen when one of the commands fails (like
+    pressing Ctrl+C. This does not happen when one of the commands fails (like
     false(1) above).
 
-12.2. Makefile variables
+14.2. Makefile variables
 
 Makefile variables contain strings that can be processed using the five
-operators ``='', ``+='', ``?='', ``:='', and ``!='', which are described in the
-make(1) man page.
+operators =, +=, ?=, := and !=, which are described in the make(1) man page.
 
-When a variable's value is parsed from a Makefile, the hash character ``#'' and
-the backslash character ``\'' are handled specially. If a backslash is followed
-by a newline, any whitespace immediately in front of the backslash, the
-backslash, the newline, and any whitespace immediately behind the newline are
-replaced with a single space. A backslash character and an immediately
-following hash character are replaced with a single hash character. Otherwise,
-the backslash is passed as is. In a variable assignment, any hash character
-that is not preceded by a backslash starts a comment that continues up to the
-end of the logical line.
+When a variable's value is parsed from a Makefile, the hash character # and the
+backslash character \ are handled specially. If a backslash is the last
+character in a line, that backslash is removed from the line and the line
+continues with the next line of the file.
+
+The # character starts a comment that reaches until the end of the line. To get
+an actual # character, such as in a URL, write \# instead.
 
 The evaluation of variables either happens immediately or lazy. It happens
-immediately when the variable occurs on the right-hand side of the ``:='' or
-the ``!='' operator, in a .if condition or a .for loop. In the other cases, it
-is evaluated lazily.
+immediately when the variable occurs on the right-hand side of the := or the !=
+operator, in a .if condition or a .for loop. In the other cases, it is
+evaluated lazily.
 
 Some of the modifiers split the string into words and then operate on the
 words, others operate on the string as a whole. When a string is split into
-words, it is split like in sh(1).
-
-There are several types of variables that should be handled differently.
-Strings and two types of lists.
+words, double quotes and single quotes are interpreted as delimiters, just like
+in sh(1).
 
-  * Strings can contain arbitrary characters. Nevertheless, you should restrict
-    yourself to only using printable characters. Examples are PREFIX and
-    COMMENT.
-
-  * Internal lists are lists that are never exported to any shell command.
-    Their elements are separated by whitespace. Therefore, the elements
-    themselves cannot have embedded whitespace. Any other characters are
-    allowed. Internal lists can be used in .for loops. Examples are DEPENDS and
-    BUILD_DEPENDS.
-
-  * External lists are lists that may be exported to a shell command. Their
-    elements can contain any characters, including whitespace. That's why they
-    cannot be used in .for loops. Examples are DISTFILES and MASTER_SITES.
-
-12.2.1. Naming conventions
+14.2.1. Naming conventions
 
   * All variable names starting with an underscore are reserved for use by the
-    pkgsrc infrastructure. They shall not be used by package Makefiles.
+    pkgsrc infrastructure. They shall not be used by packages.
 
   * In .for loops you should use lowercase variable names for the iteration
     variables.
 
-  * All list variables should have a ``plural'' name, e.g. PKG_OPTIONS or
+  * All list variables should have a plural name, such as PKG_OPTIONS or
     DISTFILES.
 
-12.3. Code snippets
+14.3. Code snippets
 
-12.3.1. Adding things to a list
+14.3.1. Adding things to a list
 
 When adding a string that possibly contains whitespace or quotes to a list
 (example 1), it must be quoted using the :Q modifier.
@@ -3487,7 +3510,7 @@ ANOTHER_LIST=   a=b c=d
 LIST+=          ${STRING:Q}       # 1
 LIST+=          ${ANOTHER_LIST}   # 2
 
-12.3.2. Echoing a string exactly as-is
+14.3.2. Echoing a string exactly as-is
 
 Echoing a string containing special characters needs special work.
 
@@ -3516,7 +3539,7 @@ doesn't make a difference, but other pro
 In example 4, the EXAMPLE_ENV does not need to be quoted because the quoting
 has already been done when adding elements to the list.
 
-12.3.3. Passing CFLAGS to GNU configure scripts
+14.3.3. Passing CFLAGS to GNU configure scripts
 
 When passing CFLAGS or similar variables to a GNU-style configure script
 (especially those that call other configure scripts), it must not have leading
@@ -3537,7 +3560,7 @@ all:
 In this example, CPPFLAGS has both leading and trailing whitespace because the
 += operator always adds a space.
 
-12.3.4. Handling possibly empty variables
+14.3.4. Handling possibly empty variables
 
 When a possibly empty variable is used in a shell program, it may lead to a
 syntax error.
@@ -3571,25 +3594,25 @@ install-examples:
         echo "Installing ${egfile}"
 .endfor
 
-This variant only works when EGFILES does not contain filenames with spaces,
-since the .for loop splits on simple whitespace.
+If one of the filenames contains special characters, it should be enclosed in
+single or double quotes.
 
 To have a shell command test whether a make variable is empty, use the
 following code: ${TEST} -z ${POSSIBLY_EMPTY:Q}"".
 
-Chapter 13. PLIST issues
+Chapter 15. PLIST issues
 
 Table of Contents
 
-13.1. RCS ID
-13.2. Semi-automatic PLIST generation
-13.3. Tweaking output of make print-PLIST
-13.4. Variable substitution in PLIST
-13.5. Man page compression
-13.6. Changing PLIST source with PLIST_SRC
-13.7. Platform-specific and differing PLISTs
-13.8. Build-specific PLISTs
-13.9. Sharing directories between packages
+15.1. RCS ID
+15.2. Semi-automatic PLIST generation
+15.3. Tweaking output of make print-PLIST
+15.4. Variable substitution in PLIST
+15.5. Man page compression
+15.6. Changing PLIST source with PLIST_SRC
+15.7. Platform-specific and differing PLISTs
+15.8. Build-specific PLISTs
+15.9. Sharing directories between packages
 
 The PLIST file contains a package's "packing list", i.e. a list of files that
 belong to the package (relative to the ${PREFIX} directory it's been installed
@@ -3597,7 +3620,7 @@ in) plus some additional statements - se
 list. This chapter addresses some issues that need attention when dealing with
 the PLIST file (or files, see below!).
 
-13.1. RCS ID
+15.1. RCS ID
 
 Be sure to add a RCS ID line as the first thing in any PLIST file you write:
 
@@ -3607,13 +3630,13 @@ An artificial space has been added betwe
 here to prevent CVS expanding to the filename of the guide. When adding the RCS
 ID the space should be omitted.
 
-13.2. Semi-automatic PLIST generation
+15.2. Semi-automatic PLIST generation
 
 You can use the make print-PLIST command to output a PLIST that matches any new
-files since the package was extracted. See Section 17.17, "Other helpful
+files since the package was extracted. See Section 19.17, "Other helpful
 targets" for more information on this target.
 
-13.3. Tweaking output of make print-PLIST
+15.3. Tweaking output of make print-PLIST
 
 The PRINT_PLIST_AWK variable takes a set of AWK patterns and actions that are
 used to filter the output of print-PLIST. You can append any chunk of AWK
@@ -3624,7 +3647,7 @@ resulting PLIST:
 
 PRINT_PLIST_AWK+=       /^libdata\/foo/ { next; }
 
-13.4. Variable substitution in PLIST
+15.4. Variable substitution in PLIST
 
 A number of variables are substituted automatically in PLISTs when a package is
 installed on a system. This includes the following variables:
@@ -3661,7 +3684,7 @@ PLIST_SUBST should help.
 
 If you want to change other variables not listed above, you can add variables
 and their expansions to this variable in the following way, similar to
-MESSAGE_SUBST (see Section 11.5, "Optional files"):
+MESSAGE_SUBST (see Section 13.5, "Optional files"):
 
 PLIST_SUBST+=   SOMEVAR="somevalue"
 
@@ -3691,7 +3714,7 @@ An artificial space has been added betwe
 here to prevent CVS expanding to the filename of the guide. When adding the RCS
 ID the space should be ommited.
 
-13.5. Man page compression
+15.5. Man page compression
 
 Man pages should be installed in compressed form if MANZ is set (in
 bsd.own.mk), and uncompressed otherwise. To handle this in the PLIST file, the
@@ -3699,14 +3722,14 @@ suffix ".gz" is appended/removed automat
 and MANCOMPRESSED being set or not, see above for details. This modification of
 the PLIST file is done on a copy of it, not PLIST itself.
 
-13.6. Changing PLIST source with PLIST_SRC
+15.6. Changing PLIST source with PLIST_SRC
 
 To use one or more files as source for the PLIST used in generating the binary
 package, set the variable PLIST_SRC to the names of that file(s). The files are
 later concatenated using cat(1), and the order of things is important. The
 default for PLIST_SRC is ${PKGDIR}/PLIST.
 
-13.7. Platform-specific and differing PLISTs
+15.7. Platform-specific and differing PLISTs
 
 Some packages decide to install a different set of files based on the operating
 system being used. These differences can be automatically handled by using the
@@ -3722,7 +3745,7 @@ following files:
 
   * PLIST.common_end
 
-13.8. Build-specific PLISTs
+15.8. Build-specific PLISTs
 
 Some packages decide to generate hard-to-guess file names during installation
 that are hard to wire down.
@@ -3737,7 +3760,7 @@ GENERATE_PLIST+=        ${ECHO} bin/${DI
 
 which will append something like bin/xemacs-21.4.23-54e8ea71.dmp to the PLIST.
 
-13.9. Sharing directories between packages
+15.9. Sharing directories between packages
 
 A "shared directory" is a directory where multiple (and unrelated) packages
 install files. These directories were problematic because you had to add
@@ -3755,21 +3778,21 @@ installation as usual, and also add an e
 
 or take a look at MAKE_DIRS and OWN_DIRS.
 
-Chapter 14. Buildlink methodology
+Chapter 16. Buildlink methodology
 
 Table of Contents
 
-14.1. Converting packages to use buildlink3
-14.2. Writing buildlink3.mk files
+16.1. Converting packages to use buildlink3
+16.2. Writing buildlink3.mk files
 
-    14.2.1. Anatomy of a buildlink3.mk file
-    14.2.2. Updating BUILDLINK_API_DEPENDS.pkg and BUILDLINK_ABI_DEPENDS.pkg in
+    16.2.1. Anatomy of a buildlink3.mk file
+    16.2.2. Updating BUILDLINK_API_DEPENDS.pkg and BUILDLINK_ABI_DEPENDS.pkg in
         buildlink3.mk files
 
-14.3. Writing builtin.mk files
+16.3. Writing builtin.mk files
 
-    14.3.1. Anatomy of a builtin.mk file
-    14.3.2. Global preferences for native or pkgsrc software
+    16.3.1. Anatomy of a builtin.mk file
+    16.3.2. Global preferences for native or pkgsrc software
 
 Buildlink is a framework in pkgsrc that controls what headers and libraries are
 seen by a package's configure and build processes. This is implemented in a two
@@ -3790,7 +3813,7 @@ note that the normal system header and l
 lib, etc., are always searched -- buildlink3 is designed to insulate the
 package build from non-system-supplied software.
 
-14.1. Converting packages to use buildlink3
+16.1. Converting packages to use buildlink3
 
 The process of converting packages to use the buildlink3 framework ("bl3ifying"
 ) is fairly straightforward. The things to keep in mind are:
@@ -3863,7 +3886,7 @@ issues:
 The comments in those buildlink3.mk files provide a more complete description
 of how to use them properly.
 
-14.2. Writing buildlink3.mk files
+16.2. Writing buildlink3.mk files
 
 A package's buildlink3.mk file is included by Makefiles to indicate the need to
 compile and link against header files and libraries provided by the package. A
@@ -3879,7 +3902,7 @@ following command will generate a good s
 % createbuildlink >buildlink3.mk
 
 
-14.2.1. Anatomy of a buildlink3.mk file
+16.2.1. Anatomy of a buildlink3.mk file
 
 The following real-life example buildlink3.mk is taken from pkgsrc/graphics/
 tiff:
@@ -3979,7 +4002,7 @@ included:
     pulls in the X libraries, so they will show up in the ldd output, while on
     others (like OS X) it won't. ldd output can thus only be used as a hint.
 
-14.2.2. Updating BUILDLINK_API_DEPENDS.pkg and BUILDLINK_ABI_DEPENDS.pkg in
+16.2.2. Updating BUILDLINK_API_DEPENDS.pkg and BUILDLINK_ABI_DEPENDS.pkg in
 buildlink3.mk files
 
 These two variables differ in that one describes source compatibility (API) and
@@ -3999,7 +4022,7 @@ buildlink3.mk files, their BUILDLINK_ABI
 needed so pkgsrc will require the correct package dependency and not settle for
 an older one when building the source.
 
-See Section 19.1.5, "Handling dependencies" for more information about
+See Section 21.1.5, "Handling dependencies" for more information about
 dependencies on other packages, including the BUILDLINK_ABI_DEPENDS and
 ABI_DEPENDS definitions.
 
@@ -4011,7 +4034,7 @@ dependencies.
 Also it is not needed to set BUILDLINK_ABI_DEPENDS.pkg when it is identical to
 BUILDLINK_API_DEPENDS.pkg.
 
-14.3. Writing builtin.mk files
+16.3. Writing builtin.mk files
 
 Some packages in pkgsrc install headers and libraries that coincide with
 headers and libraries present in the base system. Aside from a buildlink3.mk
@@ -4029,7 +4052,7 @@ The only requirements of a builtin.mk fi
  3. It should be written to allow multiple inclusion. This is very important
     and takes careful attention to Makefile coding.
 
-14.3.1. Anatomy of a builtin.mk file
+16.3.1. Anatomy of a builtin.mk file
 
 The following is the recommended template for builtin.mk files:
 
@@ -4094,7 +4117,7 @@ the value of USE_BUILTIN.pkg set in the 
 includes, e.g., adding additional dependency restrictions and listing
 additional files to symlink into ${BUILDLINK_DIR} (via BUILDLINK_FILES.pkg).
 
-14.3.2. Global preferences for native or pkgsrc software
+16.3.2. Global preferences for native or pkgsrc software
 
 When building packages, it's possible to choose whether to set a global
 preference for using either the built-in (native) version or the pkgsrc version
@@ -4122,34 +4145,34 @@ other.
 
 # ./bootstrap --prefer-pkgsrc yes
 
-Chapter 15. The pkginstall framework
+Chapter 17. The pkginstall framework
 
 Table of Contents
 
-15.1. Files and directories outside the installation prefix
+17.1. Files and directories outside the installation prefix
 
-    15.1.1. Directory manipulation
-    15.1.2. File manipulation
+    17.1.1. Directory manipulation
+    17.1.2. File manipulation
 
-15.2. Configuration files
+17.2. Configuration files
 
-    15.2.1. How PKG_SYSCONFDIR is set
-    15.2.2. Telling the software where configuration files are
-    15.2.3. Patching installations
-    15.2.4. Disabling handling of configuration files
+    17.2.1. How PKG_SYSCONFDIR is set
+    17.2.2. Telling the software where configuration files are
+    17.2.3. Patching installations
+    17.2.4. Disabling handling of configuration files
 
-15.3. System startup scripts
+17.3. System startup scripts
 
-    15.3.1. Disabling handling of system startup scripts
+    17.3.1. Disabling handling of system startup scripts
 
-15.4. System users and groups
-15.5. System shells
+17.4. System users and groups
+17.5. System shells
 
-    15.5.1. Disabling shell registration
+    17.5.1. Disabling shell registration
 
-15.6. Fonts
+17.6. Fonts
 
-    15.6.1. Disabling automatic update of the fonts databases
+    17.6.1. Disabling automatic update of the fonts databases
 
 This chapter describes the framework known as pkginstall, whose key features
 are:
@@ -4178,7 +4201,7 @@ itself could be unavailable). Therefore,
 items described above is by means of the installation scripts, which are
 automatically generated by pkginstall.
 
-15.1. Files and directories outside the installation prefix
+17.1. Files and directories outside the installation prefix
 
 As you already know, the PLIST file holds a list of files and directories that
 belong to a package. The names used in it are relative to the installation
@@ -4207,7 +4230,7 @@ scripts to abstract the manipulation of 
 variables set in the package's Makefile. The rest of this section describes
 these variables.
 
-15.1.1. Directory manipulation
+17.1.1. Directory manipulation
 
 The following variables can be set to request the creation of directories
 anywhere in the file system:
@@ -4232,7 +4255,7 @@ anywhere in the file system:
     The difference between the two is exactly the same as their non-PERMS
     counterparts.
 
-15.1.2. File manipulation
+17.1.2. File manipulation
 
 Creating non-empty files outside the installation prefix is tricky because the
 PLIST forces all files to be inside it. To overcome this problem, the only
@@ -4263,7 +4286,7 @@ handle files outside the installation pr
     The difference between the two is exactly the same as their non-PERMS
     counterparts.
 
-15.2. Configuration files
+17.2. Configuration files
 
 Configuration files are special in the sense that they are installed in their
 own specific directory, PKG_SYSCONFDIR, and need special treatment during
@@ -4274,7 +4297,7 @@ if and only if they didn't exist before.
 they have local modifications. This ensures that administrators never lose any
 custom changes they may have made.
 
-15.2.1. How PKG_SYSCONFDIR is set
+17.2.1. How PKG_SYSCONFDIR is set
 
 As said before, the PKG_SYSCONFDIR variable specifies where configuration files
 shall be installed. Its contents are set based upon the following variables:
@@ -4314,11 +4337,11 @@ basically the following:
  3. Otherwise, it is set to ${PKG_SYSCONFBASE}.
 
 It is worth mentioning that ${PKG_SYSCONFDIR} is automatically added to
-OWN_DIRS. See Section 15.1.1, "Directory manipulation" what this means. This
+OWN_DIRS. See Section 17.1.1, "Directory manipulation" what this means. This
 does not apply to subdirectories of ${PKG_SYSCONFDIR}, they still have to be
 created with OWN_DIRS or MAKE_DIRS.
 
-15.2.2. Telling the software where configuration files are
+17.2.2. Telling the software where configuration files are
 
 Given that pkgsrc (and users!) expect configuration files to be in a known
 place, you need to teach each package where it shall install its files. In some
@@ -4332,7 +4355,7 @@ Note that this specifies where the packa
 files, not where they will be originally installed (although the difference is
 never explicit, unfortunately).
 
-15.2.3. Patching installations
+17.2.3. Patching installations
 
 As said before, pkginstall automatically handles configuration files. This
 means that the packages themselves must not touch the contents of $
@@ -4349,7 +4372,7 @@ Once the required configuration files ar
 hierarchy), the pkginstall framework can use them as master copies during the
 package installation to update what is in ${PKG_SYSCONFDIR}. To achieve this,
 the variables CONF_FILES and CONF_FILES_PERMS are used. Check out
-Section 15.1.2, "File manipulation" for information about their syntax and
+Section 17.1.2, "File manipulation" for information about their syntax and
 their purpose. Here is an example, taken from the mail/mutt package:
 
 EGDIR=        ${PREFIX}/share/doc/mutt/samples
@@ -4358,16 +4381,16 @@ CONF_FILES=   ${EGDIR}/Muttrc ${PKG_SYSC
 Note that the EGDIR variable is specific to that package and has no meaning
 outside it.
 
-15.2.4. Disabling handling of configuration files
+17.2.4. Disabling handling of configuration files
 
 The automatic copying of config files can be toggled by setting the environment
 variable PKG_CONFIG prior to package installation.
 
-15.3. System startup scripts
+17.3. System startup scripts
 
 System startup scripts are special files because they must be installed in a
 place known by the underlying OS, usually outside the installation prefix.
-Therefore, the same rules described in Section 15.1, "Files and directories
+Therefore, the same rules described in Section 17.1, "Files and directories
 outside the installation prefix" apply, and the same solutions can be used.
 However, pkginstall provides a special mechanism to handle these files.
 
@@ -4395,14 +4418,14 @@ automated fashion:
  3. Add code to the installation scripts to copy the startup script from the
     examples hierarchy into the system-wide startup scripts directory.
 
-15.3.1. Disabling handling of system startup scripts
+17.3.1. Disabling handling of system startup scripts
 
 The automatic copying of config files can be toggled by setting the environment
 variable PKG_RCD_SCRIPTS prior to package installation. Note that the scripts
 will be always copied inside the examples hierarchy, ${PREFIX}/share/examples/
 rc.d/, no matter what the value of this variable is.
 
-15.4. System users and groups
+17.4. System users and groups
 
 If a package needs to create special users and/or groups during installation,
 it can do so by using the pkginstall framework.
@@ -4431,7 +4454,7 @@ the phase before which the users and gro
 numeric UIDs and GIDs of the created users and groups are automatically
 hardcoded into the final installation scripts.
 
-15.5. System shells
+17.5. System shells
 
 Packages that install system shells should register them in the shell database,
 /etc/shells, to make things easier to the administrator. This must be done from
@@ -4445,12 +4468,12 @@ shells/zsh:
 
 PKG_SHELL=      ${PREFIX}/bin/zsh
 
-15.5.1. Disabling shell registration
+17.5.1. Disabling shell registration
 
 The automatic registration of shell interpreters can be disabled by the
 administrator by setting the PKG_REGISTER_SHELLS environment variable to NO.
 
-15.6. Fonts
+17.6. Fonts
 
 Packages that install X11 fonts should update the database files that index the
 fonts within each fonts directory. This can easily be accomplished within the
@@ -4466,19 +4489,19 @@ example, taken from fonts/dbz-ttf:
 
 FONTS_DIRS.ttf= ${PREFIX}/share/fonts/X11/TTF
 
-15.6.1. Disabling automatic update of the fonts databases
+17.6.1. Disabling automatic update of the fonts databases
 
 The automatic update of fonts databases can be disabled by the administrator by
 setting the PKG_UPDATE_FONTS_DB environment variable to NO.
 
-Chapter 16. Options handling
+Chapter 18. Options handling
 
 Table of Contents
 
-16.1. Global default options
-16.2. Converting packages to use bsd.options.mk
-16.3. Option Names
-16.4. Determining the options of dependencies
+18.1. Global default options
+18.2. Converting packages to use bsd.options.mk
+18.3. Option Names
+18.4. Determining the options of dependencies
 
 Many packages have the ability to be built to support different sets of
 features. bsd.options.mk is a framework in pkgsrc that provides generic
@@ -4515,13 +4538,13 @@ A further consideration is licensing. No
 non-free dependencies (especially plugins) should almost always be split if
 feasible.
 
-16.1. Global default options
+18.1. Global default options
 
 Global default options are listed in PKG_DEFAULT_OPTIONS, which is a list of
 the options that should be built into every package if that option is
 supported. This variable should be set in mk.conf.
 
-16.2. Converting packages to use bsd.options.mk
+18.2. Converting packages to use bsd.options.mk
 
 The following example shows how bsd.options.mk should be used by the
 hypothetical ``wibble'' package, either in the package Makefile, or in a file,
@@ -4639,7 +4662,7 @@ PKG_OPTIONS:
 
 .if !empty(PKG_OPTIONS:Moption)
 
-16.3. Option Names
+18.3. Option Names
 
 Options that enable similar features in different packages (like optional
 support for a library) should use a common name in all packages that support it
@@ -4660,7 +4683,7 @@ description. The description should be a
 uppercase letter and ending with a period) that describes what enabling the
 option does. E. g. "Enable ispell support." The file is sorted by option names.
 
-16.4. Determining the options of dependencies
+18.4. Determining the options of dependencies
 
 When writing buildlink3.mk files, it is often necessary to list different
 dependencies based on the options with which the package was built. For
@@ -4679,33 +4702,33 @@ PKG_BUILD_OPTIONS.libpurple to the build
 which can then be queried like PKG_OPTIONS in the options.mk file. See the file
 pkg-build-options.mk for more details.
 
-Chapter 17. The build process
+Chapter 19. The build process
 
 Table of Contents
 
-17.1. Introduction
-17.2. Program location
-17.3. Directories used during the build process
-17.4. Running a phase
-17.5. The fetch phase
-
-    17.5.1. What to fetch and where to get it from
-    17.5.2. How are the files fetched?
-
-17.6. The checksum phase
-17.7. The extract phase
-17.8. The patch phase
-17.9. The tools phase
-17.10. The wrapper phase
-17.11. The configure phase
-17.12. The build phase
-17.13. The test phase
-17.14. The install phase
-17.15. The package phase
-17.16. Cleaning up
-17.17. Other helpful targets
+19.1. Introduction
+19.2. Program location
+19.3. Directories used during the build process
+19.4. Running a phase
+19.5. The fetch phase
+
+    19.5.1. What to fetch and where to get it from
+    19.5.2. How are the files fetched?
+
+19.6. The checksum phase
+19.7. The extract phase
+19.8. The patch phase
+19.9. The tools phase
+19.10. The wrapper phase
+19.11. The configure phase
+19.12. The build phase
+19.13. The test phase
+19.14. The install phase
+19.15. The package phase
+19.16. Cleaning up
+19.17. Other helpful targets
 
-17.1. Introduction
+19.1. Introduction
 
 This chapter gives a detailed description on how a package is built. Building a
 package is separated into different phases (for example fetch, build, install),
@@ -4727,7 +4750,7 @@ To get more details about what is happen
 PKG_VERBOSE variable, or the PATCH_DEBUG variable if you are just interested in
 more details about the patch step.
 
-17.2. Program location
+19.2. Program location
 
 Before outlining the process performed by the NetBSD package system in the next
 section, here's a brief discussion on where programs are installed, and which
@@ -4737,7 +4760,7 @@ The automatic variable PREFIX indicates 
 shall be installed. It is usually set to LOCALBASE (/usr/pkg), or CROSSBASE for
 pkgs in the cross category. The value of PREFIX needs to be put into the
 various places in the program's source where paths to these files are encoded.
-See Section 11.3, "patches/*" and Section 19.3.1, "Shared libraries - libtool"
+See Section 13.3, "patches/*" and Section 21.3.1, "Shared libraries - libtool"
 for more details.
 
 When choosing which of these variables to use, follow the following rules:
@@ -4764,7 +4787,7 @@ When choosing which of these variables t
     the exception that manual pages go into ${PREFIX}/man, not ${PREFIX}/share/
     man.
 
-17.3. Directories used during the build process
+19.3. Directories used during the build process
 
 When building a package, various directories are used to store source files,
 temporary files, pkgsrc-internal files, and so on. These directories are
@@ -4809,7 +4832,7 @@ created in the pkgsrc entry's directory.
 pkgsrc trees behave in a read-only manner, then the value of
 CREATE_WRKDIR_SYMLINK should be set to no.
 
-17.4. Running a phase
+19.4. Running a phase
 
 You can run a particular phase by typing make phase, where phase is the name of
 the phase. This will automatically run all phases that are required for this
@@ -4817,13 +4840,13 @@ phase. The default phase is build, that 
 parameters in a package directory, the package will be built, but not
 installed.
 
-17.5. The fetch phase
+19.5. The fetch phase
 
 The first step in building a package is to fetch the distribution files
 (distfiles) from the sites that are providing them. This is the task of the 
 fetch phase.
 
-17.5.1. What to fetch and where to get it from
+19.5.1. What to fetch and where to get it from
 
 In simple cases, MASTER_SITES defines all URLs from where the distfile, whose
 name is derived from the DISTNAME variable, is fetched. The more complicated
@@ -4920,7 +4943,7 @@ MASTER_SITES=   ${MASTER_SITE_SOURCEFORG
 
 Note the trailing slash after the subdirectory name.
 
-17.5.2. How are the files fetched?
+19.5.2. How are the files fetched?
 
 The fetch phase makes sure that all the distfiles exist in a local directory
 (DISTDIR, which can be set by the pkgsrc user). If the files do not exist, they
@@ -4943,7 +4966,7 @@ target to mirror the distfiles, if they 
 setting NO_SRC_ON_FTP (usually to "${RESTRICTED}") will not have their
 distfiles mirrored.
 
-17.6. The checksum phase
+19.6. The checksum phase
 
 After the distfile(s) are fetched, their checksum is generated and compared
 with the checksums stored in the distinfo file. If the checksums don't match,
@@ -4951,7 +4974,7 @@ the build is aborted. This is to ensure 
 and that the distfile wasn't changed, e.g. by some malign force, deliberately
 changed distfiles on the master distribution site or network lossage.
 
-17.7. The extract phase
+19.7. The extract phase
 
 When the distfiles are present on the local system, they need to be extracted,
 as they usually come in the form of some compressed archive format.
@@ -4985,25 +5008,25 @@ file that is going to be extracted.
 And if that still does not suffice, you can override the do-extract target in
 the package Makefile.
 
-17.8. The patch phase
+19.8. The patch phase
 
 After extraction, all the patches named by the PATCHFILES, those present in the
 patches subdirectory of the package as well as in $LOCALPATCHES/$PKGPATH (e.g.
 /usr/local/patches/graphics/png) are applied. Patchfiles ending in .Z or .gz
 are uncompressed before they are applied, files ending in .orig or .rej are
 ignored. Any special options to patch(1) can be handed in PATCH_DIST_ARGS. See
-Section 11.3, "patches/*" for more details.
+Section 13.3, "patches/*" for more details.
 
 By default patch(1) is given special args to make it fail if the patches apply
 with some lines of fuzz. Please fix (regen) the patches so that they apply
 cleanly. The rationale behind this is that patches that don't apply cleanly may
 end up being applied in the wrong place, and cause severe harm there.
 
-17.9. The tools phase
+19.9. The tools phase
 
-This is covered in Chapter 18, Tools needed for building or running.
+This is covered in Chapter 20, Tools needed for building or running.
 
-17.10. The wrapper phase
+19.10. The wrapper phase
 
 This phase creates wrapper programs for the compilers and linkers. The
 following variables can be used to tweak the wrappers.
@@ -5033,7 +5056,7 @@ WRAPPER_TRANSFORM_CMDS
 
     A list of transformation commands. [TODO: investigate further]
 
-17.11. The configure phase
+19.11. The configure phase
 
 Most pieces of software need information on the header files, system calls, and
 library routines which are available on the platform they run on. The process
@@ -5077,7 +5100,7 @@ CONFIGURE_DIRS)
 
 If there is no configure step at all, set NO_CONFIGURE to "yes".
 
-17.12. The build phase
+19.12. The build phase
 
 For building a package, a rough equivalent of the following code is executed.
 
@@ -5101,11 +5124,11 @@ defaults to "all".
 
 If there is no build step at all, set NO_BUILD to "yes".
 
-17.13. The test phase
+19.13. The test phase
 
 [TODO]
 
-17.14. The install phase
+19.14. The install phase
 
 Once the build stage has completed, the final step is to install the software
 in public directories, so users can access the programs and files.
@@ -5202,7 +5225,7 @@ INSTALLATION_DIRS
 In the rare cases that a package shouldn't install anything, set NO_INSTALL to 
 "yes". This is mostly relevant for packages in the regress category.
 
-17.15. The package phase
+19.15. The package phase
 
 Once the install stage has completed, a binary package of the installed files
 can be built. These binary packages can be used for quick installation without
@@ -5212,13 +5235,13 @@ By default, the binary packages are crea
 created in ${PACKAGES}/category, one for each category in the CATEGORIES
 variable. PACKAGES defaults to pkgsrc/packages.
 
-17.16. Cleaning up
+19.16. Cleaning up
 
 Once you're finished with a package, you can clean the work directory by
 running make clean. If you want to clean the work directories of all
 dependencies too, use make clean-depends.
 
-17.17. Other helpful targets
+19.17. Other helpful targets
 
 pre/post-*
 
@@ -5488,14 +5511,14 @@ print-PLIST
     file access times, be sure to add these files manually to your PLIST, as
     the "find -newer" command used by this target won't catch them!
 
-    See Section 13.3, "Tweaking output of make print-PLIST" for more
+    See Section 15.3, "Tweaking output of make print-PLIST" for more
     information on this target.
 
 bulk-package
 
     Used to do bulk builds. If an appropriate binary package already exists, no
     action is taken. If not, this target will compile, install and package it
-    (and its depends, if PKG_DEPENDS is set properly. See Chapter 7, Creating
+    (and its depends, if PKG_DEPENDS is set properly. See Chapter 8, Creating
     binary packages for everything in pkgsrc (bulk builds)). After creating the
     binary package, the sources, the just-installed package and its required
     packages are removed, preserving free disk space.
@@ -5520,13 +5543,13 @@ bulk-install
 
     Beware that this target may deinstall all packages installed on a system!
 
-Chapter 18. Tools needed for building or running
+Chapter 20. Tools needed for building or running
 
 Table of Contents
 
-18.1. Tools for pkgsrc builds
-18.2. Tools needed by packages
-18.3. Tools provided by platforms
+20.1. Tools for pkgsrc builds
+20.2. Tools needed by packages
+20.3. Tools provided by platforms
 
 The USE_TOOLS definition is used both internally by pkgsrc and also for
 individual packages to define what commands are needed for building a package
@@ -5547,7 +5570,7 @@ package may need GNU awk, bison (instead
 
 The tools used by a package can be listed by running make show-tools.
 
-18.1. Tools for pkgsrc builds
+20.1. Tools for pkgsrc builds
 
 The default set of tools used by pkgsrc is defined in bsd.pkg.mk. This includes
 standard Unix tools, such as: cat, awk, chmod, test, and so on. These can be
@@ -5556,7 +5579,7 @@ seen by running: make show-var VARNAME=U
 If a package needs a specific program to build then the USE_TOOLS variable can
 be used to define the tools needed.
 
-18.2. Tools needed by packages
+20.2. Tools needed by packages
 
 In the following examples, the :run means that it is needed at run-time (and
 becomes a DEPENDS). The default is a build dependency which can be set with
@@ -5572,7 +5595,7 @@ could be "/bin/bash" on Linux systems.
 If you always need a pkgsrc version of the tool at run-time, then just use
 DEPENDS instead.
 
-18.3. Tools provided by platforms
+20.3. Tools provided by platforms
 
 When improving or porting pkgsrc to a new platform, have a look at (or create)
 the corresponding platform specific make file fragment under pkgsrc/mk/tools/
@@ -5586,86 +5609,86 @@ TOOLS_PLATFORM.bzcat?=          /usr/bin
 
 TOOLS_PLATFORM.true?=           true                    # shell builtin
 
-Chapter 19. Making your package work
+Chapter 21. Making your package work
 
 Table of Contents
 
-19.1. General operation
+21.1. General operation
 
-    19.1.1. How to pull in user-settable variables from mk.conf
-    19.1.2. User interaction
-    19.1.3. Handling licenses
-    19.1.4. Restricted packages
-    19.1.5. Handling dependencies
-    19.1.6. Handling conflicts with other packages
-    19.1.7. Packages that cannot or should not be built
-    19.1.8. Packages which should not be deleted, once installed
-    19.1.9. Handling packages with security problems
-    19.1.10. How to handle incrementing versions when fixing an existing
+    21.1.1. How to pull in user-settable variables from mk.conf
+    21.1.2. User interaction
+    21.1.3. Handling licenses
+    21.1.4. Restricted packages
+    21.1.5. Handling dependencies
+    21.1.6. Handling conflicts with other packages
+    21.1.7. Packages that cannot or should not be built
+    21.1.8. Packages which should not be deleted, once installed
+    21.1.9. Handling packages with security problems
+    21.1.10. How to handle incrementing versions when fixing an existing
         package
-    19.1.11. Substituting variable text in the package files (the SUBST
+    21.1.11. Substituting variable text in the package files (the SUBST
         framework)
 
-19.2. The fetch phase
+21.2. The fetch phase
 
-    19.2.1. Packages whose distfiles aren't available for plain downloading
-    19.2.2. How to handle modified distfiles with the 'old' name
-    19.2.3. Packages hosted on github.com
-
-19.3. The configure phase
-
-    19.3.1. Shared libraries - libtool
-    19.3.2. Using libtool on GNU packages that already support libtool
-    19.3.3. GNU Autoconf/Automake
-
-19.4. Programming languages
-
-    19.4.1. C, C++, and Fortran
-    19.4.2. Java
-    19.4.3. Packages containing perl scripts
-    19.4.4. Packages containing shell scripts
-    19.4.5. Other programming languages
-
-19.5. The build phase
-
-    19.5.1. Compiling C and C++ code conditionally
-    19.5.2. How to handle compiler bugs
-    19.5.3. Undefined reference to "..."
-    19.5.4. Running out of memory
-
-19.6. The install phase
-
-    19.6.1. Creating needed directories
-    19.6.2. Where to install documentation
-    19.6.3. Installing highscore files
-    19.6.4. Adding DESTDIR support to packages
-    19.6.5. Packages with hardcoded paths to other interpreters
-    19.6.6. Packages installing perl modules
-    19.6.7. Packages installing info files
-    19.6.8. Packages installing man pages
-    19.6.9. Packages installing GConf data files
-    19.6.10. Packages installing scrollkeeper/rarian data files
-    19.6.11. Packages installing X11 fonts
-    19.6.12. Packages installing GTK2 modules
-    19.6.13. Packages installing SGML or XML data
-    19.6.14. Packages installing extensions to the MIME database
-    19.6.15. Packages using intltool
-    19.6.16. Packages installing startup scripts
-    19.6.17. Packages installing TeX modules
-    19.6.18. Packages supporting running binaries in emulation
-    19.6.19. Packages installing hicolor theme icons
-    19.6.20. Packages installing desktop files
+    21.2.1. Packages whose distfiles aren't available for plain downloading
+    21.2.2. How to handle modified distfiles with the 'old' name
+    21.2.3. Packages hosted on github.com
+
+21.3. The configure phase
+
+    21.3.1. Shared libraries - libtool
+    21.3.2. Using libtool on GNU packages that already support libtool
+    21.3.3. GNU Autoconf/Automake
+
+21.4. Programming languages
+
+    21.4.1. C, C++, and Fortran
+    21.4.2. Java
+    21.4.3. Packages containing perl scripts
+    21.4.4. Packages containing shell scripts
+    21.4.5. Other programming languages
+
+21.5. The build phase
+
+    21.5.1. Compiling C and C++ code conditionally
+    21.5.2. How to handle compiler bugs
+    21.5.3. Undefined reference to "..."
+    21.5.4. Running out of memory
+
+21.6. The install phase
+
+    21.6.1. Creating needed directories
+    21.6.2. Where to install documentation
+    21.6.3. Installing highscore files
+    21.6.4. Adding DESTDIR support to packages
+    21.6.5. Packages with hardcoded paths to other interpreters
+    21.6.6. Packages installing perl modules
+    21.6.7. Packages installing info files
+    21.6.8. Packages installing man pages
+    21.6.9. Packages installing GConf data files
+    21.6.10. Packages installing scrollkeeper/rarian data files
+    21.6.11. Packages installing X11 fonts
+    21.6.12. Packages installing GTK2 modules
+    21.6.13. Packages installing SGML or XML data
+    21.6.14. Packages installing extensions to the MIME database
+    21.6.15. Packages using intltool
+    21.6.16. Packages installing startup scripts
+    21.6.17. Packages installing TeX modules
+    21.6.18. Packages supporting running binaries in emulation
+    21.6.19. Packages installing hicolor theme icons
+    21.6.20. Packages installing desktop files
 
-19.7. Marking packages as having problems
+21.7. Marking packages as having problems
 
-19.1. General operation
+21.1. General operation
 
 One appealing feature of pkgsrc is that it runs on many different platforms. As
 a result, it is important to ensure, where possible, that packages in pkgsrc
 are portable. This chapter mentions some particular details you should pay
 attention to while working on pkgsrc.
 
-19.1.1. How to pull in user-settable variables from mk.conf
+21.1.1. How to pull in user-settable variables from mk.conf
 
 The pkgsrc user can configure pkgsrc by overriding several variables in the
 file pointed to by MAKECONF, which is mk.conf by default. When you want to use
@@ -5686,7 +5709,7 @@ Note
 To check whether a variable can be used at load time, run pkglint -Wall on your
 package.
 
-19.1.2. User interaction
+21.1.2. User interaction
 
 Occasionally, packages require interaction from the user, and this can be in a
 number of ways:
@@ -5710,7 +5733,7 @@ INTERACTIVE_STAGE=      configure instal
 The user can then decide to skip this package by setting the BATCH variable.
 Packages that require interaction are also excluded from bulk builds.
 
-19.1.3. Handling licenses
+21.1.3. Handling licenses
 
 Authors of software can choose the licence under which software can be copied.
 The Free Software Foundation has declared some licenses "Free", and the Open
@@ -5763,7 +5786,7 @@ Another problem with such usage is that 
 pkgsrc to proceed for a single package without also telling pkgsrc to proceed
 for all packages with that tag.
 
-19.1.3.1. Adding a package with a new license
+21.1.3.1. Adding a package with a new license
 
 When adding a package with a new license, the following steps are required:
 
@@ -5780,7 +5803,7 @@ When adding a package with a new license
  2. The license text should be added to pkgsrc/licenses for displaying. A list
     of known licenses can be seen in this directory.
 
-19.1.3.2. Change to the license
+21.1.3.2. Change to the license
 
 When the license changes (in a way other than formatting), make sure that the
 new license has a different name (e.g., append the version number if it exists,
@@ -5790,7 +5813,7 @@ under the new licenses. The higher-level
 licenses for reasonableness; the only test is a mechanistic test of whether a
 particular text has been approved by either of two bodies (FSF or OSI).
 
-19.1.4. Restricted packages
+21.1.4. Restricted packages
 
 Some licenses restrict how software may be re-distributed. By declaring the
 restrictions, package tools can automatically refrain from e.g. placing binary
@@ -5845,13 +5868,13 @@ not distributable and cannot be obtained
 branch. Packages with manual/interactive fetch must have a maintainer and it is
 his/her responsibility to ensure this.
 
-19.1.5. Handling dependencies
+21.1.5. Handling dependencies
 
 Your package may depend on some other package being present - and there are
 various ways of expressing this dependency. pkgsrc supports the BUILD_DEPENDS
 and DEPENDS definitions, the USE_TOOLS definition, as well as dependencies via
 buildlink3.mk, which is the preferred way to handle dependencies, and which
-uses the variables named above. See Chapter 14, Buildlink methodology for more
+uses the variables named above. See Chapter 16, Buildlink methodology for more
 information.
 
 The basic difference between the two variables is as follows: The DEPENDS
@@ -5920,7 +5943,7 @@ version numbers recognized by pkg_info(1
     section of the pkgsrc guide.
 
     For security fixes, please update the package vulnerabilities file. See
-    Section 19.1.9, "Handling packages with security problems" for more
+    Section 21.1.9, "Handling packages with security problems" for more
     information.
 
 If your package needs files from another package to build, add the relevant
@@ -5928,7 +5951,7 @@ distribution files to DISTFILES, so they
 the print/ghostscript package for an example. (It relies on the jpeg sources
 being present in source form during the build.)
 
-19.1.6. Handling conflicts with other packages
+21.1.6. Handling conflicts with other packages
 
 Your package may conflict with other packages a user might already have
 installed on his system, e.g. if your package installs the same set of files as
@@ -5958,7 +5981,7 @@ is known that packages conflict with eac
 exported in pkg_summary(5) files and consumed by binary package managers to
 inform users that packages cannot be installed onto the target system.
 
-19.1.7. Packages that cannot or should not be built
+21.1.7. Packages that cannot or should not be built
 
 There are several reasons why a package might be instructed to not build under
 certain circumstances. If the package builds and runs on most platforms, the
@@ -5987,7 +6010,7 @@ functionality already provided by the sy
 descriptive message. If the package should fail because some preconditions are
 not met, set PKG_FAIL_REASON to a descriptive message.
 
-19.1.8. Packages which should not be deleted, once installed
+21.1.8. Packages which should not be deleted, once installed
 
 To ensure that a package may not be deleted, once it has been installed, the
 PKG_PRESERVE definition should be set in the package Makefile. This will be
@@ -5995,7 +6018,7 @@ carried into any binary package that is 
 preserved" package will not be deleted using pkg_delete(1) unless the "-f"
 option is used.
 
-19.1.9. Handling packages with security problems
+21.1.9. Handling packages with security problems
 
 When a vulnerability is found, this should be noted in localsrc/security/
 advisories/pkg-vulnerabilities, and after committing that file, ask
@@ -6012,7 +6035,7 @@ submit a pullup request!
 Binary packages already on ftp.NetBSD.org will be handled semi-automatically by
 a weekly cron job.
 
-19.1.10. How to handle incrementing versions when fixing an existing package
+21.1.10. How to handle incrementing versions when fixing an existing package
 
 When making fixes to an existing package it can be useful to change the version
 number in PKGNAME. To avoid conflicting with future versions by the original
@@ -6061,7 +6084,7 @@ Examples of changes that do merit an inc
 
 PKGREVISION must also be incremented when dependencies have ABI changes.
 
-19.1.11. Substituting variable text in the package files (the SUBST framework)
+21.1.11. Substituting variable text in the package files (the SUBST framework)
 
 When you want to replace the same text in multiple files or when the
 replacement text varies, patches alone cannot help. This is where the SUBST
@@ -6111,9 +6134,9 @@ blocks look uniform.
 There are some more variables, but they are so seldomly used that they are only
 documented in the mk/subst.mk file.
 
-19.2. The fetch phase
+21.2. The fetch phase
 
-19.2.1. Packages whose distfiles aren't available for plain downloading
+21.2.1. Packages whose distfiles aren't available for plain downloading
 
 If you need to download from a dynamic URL you can set DYNAMIC_MASTER_SITES and
 a make fetch will call files/getsite.sh with the name of each file to download
@@ -6129,7 +6152,7 @@ FETCH_MESSAGE=  "Please download the fil
 FETCH_MESSAGE+= "    "${DISTFILES:Q}
 FETCH_MESSAGE+= "manually from "${MASTER_SITES:Q}"."
 
-19.2.2. How to handle modified distfiles with the 'old' name
+21.2.2. How to handle modified distfiles with the 'old' name
 
 Sometimes authors of a software package make some modifications after the
 software was released, and they put up a new distfile without changing the
@@ -6144,7 +6167,7 @@ Then, the correct way to work around thi
 directory name, usually based on PKGNAME_NOREV (but take care with python or
 ruby packages, where PKGNAME includes a variable prefix). All DISTFILES and
 PATCHFILES for this package will be put in that subdirectory of the local
-distfiles directory. (See Section 19.1.10, "How to handle incrementing versions
+distfiles directory. (See Section 21.1.10, "How to handle incrementing versions
 when fixing an existing package" for more details.) In case this happens more
 often, PKGNAME can be used (thus including the nbX suffix) or a date stamp can
 be appended, like ${PKGNAME_NOREV}-YYYYMMDD.
@@ -6161,13 +6184,13 @@ installed package is different. Furtherm
 seems appropriate telling them that changing distfiles after releases without
 changing the file names is not good practice.
 
-19.2.3. Packages hosted on github.com
+21.2.3. Packages hosted on github.com
 
 Helper methods exist for packages hosted on github.com which will often have
 distfile names that clash with other packages, for example 1.0.tar.gz. Use one
 of the three recipes from below:
 
-19.2.3.1. Fetch based on a tagged release
+21.2.3.1. Fetch based on a tagged release
 
 If your distfile URL looks similar to http://github.com/username/exampleproject
 /archive/v1.0.zip, then you are packaging a tagged release.
@@ -6178,7 +6201,7 @@ MASTER_SITES=   ${MASTER_SITE_GITHUB:=us
 GITHUB_TAG=     v${PKGVERSION_NOREV}
 EXTRACT_SUFX=   .zip
 
-19.2.3.2. Fetch based on a specific commit
+21.2.3.2. Fetch based on a specific commit
 
 If your distfile URL looks similar to http://github.com/example/example/archive
 /988881adc9fc3655077dc2d4d757d480b5ea0e11.tar.gz, then you are packaging a
@@ -6189,7 +6212,7 @@ MASTER_SITES=   ${MASTER_SITE_GITHUB:=ex
 #GITHUB_PROJECT=        # can be omitted if same as DISTNAME
 GITHUB_TAG=     988881adc9fc3655077dc2d4d757d480b5ea0e11
 
-19.2.3.3. Fetch based on release
+21.2.3.3. Fetch based on release
 
 If your distfile URL looks similar to http://github.com/username/exampleproject
 /releases/download/rel-1.6/offensive-1.6.zip, then you are packaging a release.
@@ -6201,9 +6224,9 @@ GITHUB_PROJECT= exampleproject
 GITHUB_RELEASE= rel-${PKGVERSION_NOREV} # usually just set this to ${DISTNAME}
 EXTRACT_SUFX=   .zip
 
-19.3. The configure phase
+21.3. The configure phase
 
-19.3.1. Shared libraries - libtool
+21.3.1. Shared libraries - libtool
 
 pkgsrc supports many different machines, with different object formats like
 a.out and ELF, and varying abilities to do shared library and dynamic loading
@@ -6301,7 +6324,7 @@ Here's how to use libtool in a package i
  7. In your PLIST, include only the .la file (this is a change from previous
     behaviour).
 
-19.3.2. Using libtool on GNU packages that already support libtool
+21.3.2. Using libtool on GNU packages that already support libtool
 
 Add USE_LIBTOOL=yes to the package Makefile. This will override the package's
 own libtool in most cases. For older libtool using packages, libtool is made by
@@ -6335,7 +6358,7 @@ in some circumstances. Some of the more 
     The function lt_dlinit() should be called and the macro
     LTDL_SET_PRELOADED_SYMBOLS included in executables.
 
-19.3.3. GNU Autoconf/Automake
+21.3.3. GNU Autoconf/Automake
 
 If a package needs GNU autoconf or automake to be executed to regenerate the
 configure script and Makefile.in makefile templates, then they should be
@@ -6372,13 +6395,13 @@ automake sequence. This is prevented by 
 stage. If this causes problems with your package you can set AUTOMAKE_OVERRIDE=
 NO in the package Makefile.
 
-19.4. Programming languages
+21.4. Programming languages
 
-19.4.1. C, C++, and Fortran
+21.4.1. C, C++, and Fortran
 
 Compilers for the C, C++, and Fortran languages comes with the NetBSD base
 system. By default, pkgsrc assumes that a package is written in C and will hide
-all other compilers (via the wrapper framework, see Chapter 14, Buildlink
+all other compilers (via the wrapper framework, see Chapter 16, Buildlink
 methodology).
 
 To declare which language's compiler a package needs, set the USE_LANGUAGES
@@ -6386,7 +6409,7 @@ variable. Allowed values currently are "
 combination). The default is "c". Packages using GNU configure scripts, even if
 written in C++, usually need a C compiler for the configure phase.
 
-19.4.2. Java
+21.4.2. Java
 
 If a program is written in Java, use the Java framework in pkgsrc. The package
 must include ../../mk/java-vm.mk. This Makefile fragment provides the following
@@ -6405,7 +6428,7 @@ variables:
     implementation dependency. It may be used to set JAVA_HOME to a good value
     if the program needs this variable to be defined.
 
-19.4.3. Packages containing perl scripts
+21.4.3. Packages containing perl scripts
 
 If your package contains interpreted perl scripts, add "perl" to the USE_TOOLS
 variable and set REPLACE_PERL to ensure that the proper interpreter path is
@@ -6416,10 +6439,10 @@ replaced with the full path to the perl 
 If a particular version of perl is needed, set the PERL5_REQD variable to the
 version number. The default is "5.0".
 
-See Section 19.6.6, "Packages installing perl modules" for information about
+See Section 21.6.6, "Packages installing perl modules" for information about
 handling perl modules.
 
-19.4.4. Packages containing shell scripts
+21.4.4. Packages containing shell scripts
 
 REPLACE_SH, REPLACE_BASH, REPLACE_CSH, and REPLACE_KSH can be used to replace
 shell hash bangs in files. Please use the appropriate one, prefering REPLACE_SH
@@ -6428,13 +6451,13 @@ relative to WRKSRC, that you want adjust
 shell in a she-bang line will be replaced with the full path to the shell
 executable. When using REPLACE_BASH, don't forget to add bash to USE_TOOLS.
 
-19.4.5. Other programming languages
+21.4.5. Other programming languages
 
 Currently, there is no special handling for other languages in pkgsrc. If a
 compiler package provides a buildlink3.mk file, include that, otherwise just
 add a (build) dependency on the appropriate compiler package.
 
-19.5. The build phase
+21.5. The build phase
 
 The most common failures when building a package are that some platforms do not
 provide certain header files, functions or libraries, or they provide the
@@ -6442,7 +6465,7 @@ functions in a library that the original
 around this, you can rewrite the source code in most cases so that it does not
 use the missing functions or provides a replacement function.
 
-19.5.1. Compiling C and C++ code conditionally
+21.5.1. Compiling C and C++ code conditionally
 
 If a package already comes with a GNU configure script, the preferred way to
 fix the build failure is to change the configure script, not the code. In the
@@ -6459,7 +6482,7 @@ the compiler that is used. For example, 
 code on Solaris, don't use __sun__, as the SunPro compiler does not define it.
 Use __sun instead.
 
-19.5.1.1. C preprocessor macros to identify the operating system
+21.5.1.1. C preprocessor macros to identify the operating system
 
 To distinguish between 4.4 BSD-derived systems and the rest of the world, you
 should use the following code.
@@ -6488,20 +6511,20 @@ NetBSD      __NetBSD__
 OpenBSD     __OpenBSD__
 Solaris     sun, __sun
 
-19.5.1.2. C preprocessor macros to identify the hardware architecture
+21.5.1.2. C preprocessor macros to identify the hardware architecture
 
 i386        i386, __i386, __i386__
 MIPS        __mips
 SPARC       sparc, __sparc
 
-19.5.1.3. C preprocessor macros to identify the compiler
+21.5.1.3. C preprocessor macros to identify the compiler
 
 GCC         __GNUC__ (major version), __GNUC_MINOR__
 MIPSpro     _COMPILER_VERSION (0x741 for MIPSpro 7.41)
 SunPro      __SUNPRO_C (0x570 for Sun C 5.7)
 SunPro C++  __SUNPRO_CC (0x580 for Sun C++ 5.8)
 
-19.5.2. How to handle compiler bugs
+21.5.2. How to handle compiler bugs
 
 Some source files trigger bugs in the compiler, based on combinations of
 compiler version and architecture and almost always relation to optimisation
@@ -6516,7 +6539,7 @@ technology has matured. If you still nee
 workaround, please do so in the file hacks.mk and describe the symptom and
 compiler version as detailed as possible.
 
-19.5.3. Undefined reference to "..."
+21.5.3. Undefined reference to "..."
 
 This error message often means that a package did not link to a shared library
 it needs. The following functions are known to cause this error message over
@@ -6543,7 +6566,7 @@ and over.
 To fix these linker errors, it is often sufficient to say LIBS.OperatingSystem+
 = -lfoo to the package Makefile and then say bmake clean; bmake.
 
-19.5.3.1. Special issue: The SunPro compiler
+21.5.3.1. Special issue: The SunPro compiler
 
 When you are using the SunPro compiler, there is another possibility. That
 compiler cannot handle the following code:
@@ -6565,7 +6588,7 @@ It generates the code for inline_func ev
 code then refers to extern_func, which can usually not be resolved. To solve
 this problem you can try to tell the package to disable inlining of functions.
 
-19.5.4. Running out of memory
+21.5.4. Running out of memory
 
 Sometimes packages fail to build because the compiler runs into an operating
 system specific soft limit. With the UNLIMIT_RESOURCES variable pkgsrc can be
@@ -6575,9 +6598,9 @@ this variable is similar to running the 
 the maximum data segment size or maximum stack size of a process, respectively,
 to their hard limits.
 
-19.6. The install phase
+21.6. The install phase
 
-19.6.1. Creating needed directories
+21.6.1. Creating needed directories
 
 The BSD-compatible install supplied with some operating systems cannot create
 more than one directory at a time. As such, you should call ${INSTALL_*_DIR}
@@ -6589,7 +6612,7 @@ ${INSTALL_DATA_DIR} ${PREFIX}/dir2
 You can also just append "dir1 dir2" to the INSTALLATION_DIRS variable, which
 will automatically do the right thing.
 
-19.6.2. Where to install documentation
+21.6.2. Where to install documentation
 
 In general, documentation should be installed into ${PREFIX}/share/doc/$
 {PKGBASE} or ${PREFIX}/share/doc/${PKGNAME} (the latter includes the version
@@ -6610,7 +6633,7 @@ then, no additional subdirectory level i
 achieved by using "--with-html-dir=${PREFIX}/share/doc". ${PREFIX}/share/
 gtk-doc is preferred though.)
 
-19.6.3. Installing highscore files
+21.6.3. Installing highscore files
 
 Certain packages, most of them in the games category, install a score file that
 allows all users on the system to record their highscores. In order for this to
@@ -6643,7 +6666,7 @@ A package should therefore never hard co
 but rely on *_PERMS as described above or alternatively on INSTALL_GAME,
 INSTALL_GAME_DATA and INSTALL_GAME_DIR to set these correctly.
 
-19.6.4. Adding DESTDIR support to packages
+21.6.4. Adding DESTDIR support to packages
 
 DESTDIR support means that a package installs into a staging directory, not the
 final location of the files. Then a binary package is created which can be used
@@ -6665,7 +6688,7 @@ as root ("destdir") or the package can i
 
   * In general, packages should support UNPRIVILEGED to be able to use DESTDIR.
 
-19.6.5. Packages with hardcoded paths to other interpreters
+21.6.5. Packages with hardcoded paths to other interpreters
 
 Your package may also contain scripts with hardcoded paths to other
 interpreters besides (or as well as) perl. To correct the full pathname to the
@@ -6682,7 +6705,7 @@ Note
 
 Before March 2006, these variables were called _REPLACE.* and _REPLACE_FILES.*.
 
-19.6.6. Packages installing perl modules
+21.6.6. Packages installing perl modules
 
 Makefiles of packages providing perl5 modules should include the Makefile
 fragment ../../lang/perl5/module.mk. It provides a do-configure target for the
@@ -6706,7 +6729,7 @@ PERL5_, e.g. PERL5_INSTALLARCHLIB and ma
 have a packlist. These variables are also substituted for in the PLIST as
 uppercase prefixed with PERL5_SUB_.
 
-19.6.7. Packages installing info files
+21.6.7. Packages installing info files
 
 Some packages install info files or use the "makeinfo" or "install-info"
 commands. INFO_FILES should be defined in the package Makefile so that INSTALL
@@ -6741,7 +6764,7 @@ message. The script overriding makeinfo 
 value of TEXINFO_REQD either runs the appropriate makeinfo command or exit on
 error.
 
-19.6.8. Packages installing man pages
+21.6.8. Packages installing man pages
 
 All packages that install manual pages should install them into the same
 directory, so that there is one common place to look for them. In pkgsrc, this
@@ -6766,10 +6789,10 @@ Packages that use GNU_CONFIGURE but do n
 CONFIGURE_HAS_MANDIR to "no". Or if the ./configure script uses a non-standard
 use of --mandir, you can set GNU_CONFIGURE_MANDIR as needed.
 
-See Section 13.5, "Man page compression" for information on installation of
+See Section 15.5, "Man page compression" for information on installation of
 compressed manual pages.
 
-19.6.9. Packages installing GConf data files
+21.6.9. Packages installing GConf data files
 
 If a package installs .schemas or .entries files, used by GConf, you need to
 take some extra steps to make sure they get registered in the database:
@@ -6785,7 +6808,7 @@ take some extra steps to make sure they 
     manually patch the package.
 
  3. Check the PLIST and remove any entries under the etc/gconf directory, as
-    they will be handled automatically. See Section 9.13, "How do I change the
+    they will be handled automatically. See Section 10.13, "How do I change the
     location of configuration files?" for more information.
 
  4. Define the GCONF_SCHEMAS variable in your Makefile with a list of all
@@ -6796,7 +6819,7 @@ take some extra steps to make sure they 
     .entries files installed by the package, if any. Names must not contain any
     directories in them.
 
-19.6.10. Packages installing scrollkeeper/rarian data files
+21.6.10. Packages installing scrollkeeper/rarian data files
 
 If a package installs .omf files, used by scrollkeeper/rarian, you need to take
 some extra steps to make sure they get registered in the database:
@@ -6812,7 +6835,7 @@ some extra steps to make sure they get r
  3. Remove the share/omf directory from the PLIST. It will be handled by
     rarian. (make print-PLIST does this automatically.)
 
-19.6.11. Packages installing X11 fonts
+21.6.11. Packages installing X11 fonts
 
 If a package installs font files, you will need to rebuild the fonts database
 in the directory where they get installed at installation and deinstallation
@@ -6826,7 +6849,7 @@ Note that you should not create new dire
 standard ones to avoid that the user needs to manually configure his X server
 to find them.
 
-19.6.12. Packages installing GTK2 modules
+21.6.12. Packages installing GTK2 modules
 
 If a package installs GTK2 immodules or loaders, you need to take some extra
 steps to get them registered in the GTK2 database properly:
@@ -6849,7 +6872,7 @@ steps to get them registered in the GTK2
  5. Check the PLIST and remove any entries under the libdata/gtk-2.0 directory,
     as they will be handled automatically.
 
-19.6.13. Packages installing SGML or XML data
+21.6.13. Packages installing SGML or XML data
 
 If a package installs SGML or XML data files that need to be registered in
 system-wide catalogs (like DTDs, sub-catalogs, etc.), you need to take some
@@ -6875,7 +6898,7 @@ extra steps:
     (specifically, arguments recognized by the 'add' action). Note that you
     will normally not use this variable.
 
-19.6.14. Packages installing extensions to the MIME database
+21.6.14. Packages installing extensions to the MIME database
 
 If a package provides extensions to the MIME database by installing .xml files
 inside ${PREFIX}/share/mime/packages, you need to take some extra steps to
@@ -6896,7 +6919,7 @@ ensure that the database is kept consist
  3. Remove any share/mime/* directories from the PLIST. They will be handled by
     the shared-mime-info package.
 
-19.6.15. Packages using intltool
+21.6.15. Packages using intltool
 
 If a package uses intltool during its build, add intltool to the USE_TOOLS,
 which forces it to use the intltool package provided by pkgsrc, instead of the
@@ -6906,7 +6929,7 @@ This tracks intltool's build-time depend
 version; this way, the package benefits of any bug fixes that may have appeared
 since it was released.
 
-19.6.16. Packages installing startup scripts
+21.6.16. Packages installing startup scripts
 
 If a package contains a rc.d script, it won't be copied into the startup
 directory by default, but you can enable it, by adding the option
@@ -6914,7 +6937,7 @@ PKG_RCD_SCRIPTS=YES in mk.conf. This opt
 rc.d when a package is installed, and it will automatically remove the scripts
 when the package is deinstalled.
 
-19.6.17. Packages installing TeX modules
+21.6.17. Packages installing TeX modules
 
 If a package installs TeX packages into the texmf tree, the ls-R database of
 the tree needs to be updated.
@@ -6940,7 +6963,7 @@ into ${PREFIX}/share/texmf-dist, not ${P
  3. Make sure that none of ls-R databases are included in PLIST, as they will
     be removed only by the kpathsea package.
 
-19.6.18. Packages supporting running binaries in emulation
+21.6.18. Packages supporting running binaries in emulation
 
 There are some packages that provide libraries and executables for running
 binaries from a one operating system on a different one (if the latter supports
@@ -6954,7 +6977,7 @@ linker. Since the standard dynamic linke
 packages, because the libraries used by the emulation are not in the standard
 directories.
 
-19.6.19. Packages installing hicolor theme icons
+21.6.19. Packages installing hicolor theme icons
 
 If a package installs images under the share/icons/hicolor and/or updates the
 share/icons/hicolor/icon-theme.cache database, you need to take some extra
@@ -6971,7 +6994,7 @@ that the cache database is rebuilt:
 The best way to verify that the PLIST is correct with respect to the last two
 points is to regenerate it using make print-PLIST.
 
-19.6.20. Packages installing desktop files
+21.6.20. Packages installing desktop files
 
 If a package installs .desktop files under share/applications and these include
 MIME information (MimeType key), you need to take extra steps to ensure that
@@ -6985,7 +7008,7 @@ they are registered into the MIME databa
 The best way to verify that the PLIST is correct with respect to the last point
 is to regenerate it using make print-PLIST.
 
-19.7. Marking packages as having problems
+21.7. Marking packages as having problems
 
 In some cases one does not have the time to solve a problem immediately. In
 this case, one can plainly mark a package as broken. For this, one just sets
@@ -6995,7 +7018,7 @@ shown this message, and the build will n
 
 BROKEN packages are removed from pkgsrc in irregular intervals.
 
-Chapter 20. Debugging
+Chapter 22. Debugging
 
 To check out all the gotchas when building a package, here are the steps that I
 do in order to get a package working. Please note this is basically the same as
@@ -7033,7 +7056,7 @@ what was explained in the previous secti
     that shouldn't be, especially during the build phase. mkpatches, patchdiff
     and pkgvi are from the pkgtools/pkgdiff package.
 
-  * Look at the Makefile, fix if necessary; see Section 11.1, "Makefile".
+  * Look at the Makefile, fix if necessary; see Section 13.1, "Makefile".
 
   * Generate a PLIST:
 
@@ -7074,35 +7097,35 @@ what was explained in the previous secti
 
     # pkglint
 
-  * Submit (or commit, if you have cvs access); see Chapter 21, Submitting and
+  * Submit (or commit, if you have cvs access); see Chapter 23, Submitting and
     Committing.
 
-Chapter 21. Submitting and Committing
+Chapter 23. Submitting and Committing
 
 Table of Contents
 
-21.1. Submitting binary packages
-21.2. Submitting source packages (for non-NetBSD-developers)
-21.3. General notes when adding, updating, or removing packages
-21.4. Commit Messages
-21.5. Committing: Adding a package to CVS
-21.6. Updating a package to a newer version
-21.7. Renaming a package in pkgsrc
-21.8. Moving a package in pkgsrc
+23.1. Submitting binary packages
+23.2. Submitting source packages (for non-NetBSD-developers)
+23.3. General notes when adding, updating, or removing packages
+23.4. Commit Messages
+23.5. Committing: Adding a package to CVS
+23.6. Updating a package to a newer version
+23.7. Renaming a package in pkgsrc
+23.8. Moving a package in pkgsrc
 
-21.1. Submitting binary packages
+23.1. Submitting binary packages
 
 Our policy is that we accept binaries only from pkgsrc developers to guarantee
 that the packages don't contain any trojan horses etc. This is not to annoy
 anyone but rather to protect our users! You're still free to put up your
 home-made binary packages and tell the world where to get them. NetBSD
-developers doing bulk builds and wanting to upload them please see Chapter 7, 
+developers doing bulk builds and wanting to upload them please see Chapter 8, 
 Creating binary packages for everything in pkgsrc (bulk builds).
 
-21.2. Submitting source packages (for non-NetBSD-developers)
+23.2. Submitting source packages (for non-NetBSD-developers)
 
 First, check that your package is complete, compiles and runs well; see
-Chapter 20, Debugging and the rest of this document. Next, generate an
+Chapter 22, Debugging and the rest of this document. Next, generate an
 uuencoded gzipped tar(1) archive that contains all files that make up the
 package. Finally, send this package to the pkgsrc bug tracking system, either
 with the send-pr(1) command, or if you don't have that, go to the web page
@@ -7122,7 +7145,7 @@ it's easier for us to track things that 
 Alternatively, you can also import new packages into pkgsrc-wip ("pkgsrc
 work-in-progress"); see the homepage at http://pkgsrc.org/wip/ for details.
 
-21.3. General notes when adding, updating, or removing packages
+23.3. General notes when adding, updating, or removing packages
 
 Please note all package additions, updates, moves, and removals in pkgsrc/doc/
 CHANGES-YYYY. It's very important to keep this file up to date and conforming
@@ -7150,7 +7173,7 @@ commit-changes-entry! If you are not usi
 cvs.NetBSD.org, but e.g. a local copy of the repository, you can set
 USE_NETBSD_REPO=yes. This makes the cvs commands use the main repository.
 
-21.4. Commit Messages
+23.4. Commit Messages
 
 For several years, there have been mirrors of pkgsrc in fossil, git, and hg.
 Standard practise when using these tools is to make the first line of a commit
@@ -7185,7 +7208,7 @@ Here is another example:
 Commit messages are final: no "cvs admin" is allowed on the pkgsrc repository
 to change commit messages.
 
-21.5. Committing: Adding a package to CVS
+23.5. Committing: Adding a package to CVS
 
 This section is only of interest for pkgsrc developers with write access to the
 pkgsrc repository.
@@ -7216,7 +7239,7 @@ Also mention the new package in pkgsrc/d
 Previously, "cvs import" was suggested, but it was much easier to get wrong
 than "cvs add".
 
-21.6. Updating a package to a newer version
+23.6. Updating a package to a newer version
 
 Please always put a concise, appropriate and relevant summary of the changes
 between old and new versions into the commit log when updating a package. There
@@ -7241,7 +7264,7 @@ which pkgsrc is used. Please use your ju
 pkgsrc, and bear in mind that stability is to be preferred above new and
 possibly untested features.
 
-21.7. Renaming a package in pkgsrc
+23.7. Renaming a package in pkgsrc
 
 Renaming packages is not recommended.
 
@@ -7256,7 +7279,7 @@ Note that "successor" in the CHANGES-YYY
 supersedes, as that successor may not be an exact replacement but is a
 suggestion for the replaced functionality.
 
-21.8. Moving a package in pkgsrc
+23.8. Moving a package in pkgsrc
 
 It is preferred that packages are not renamed or moved, but if needed please
 follow these steps.
@@ -7304,57 +7327,57 @@ follow these steps.
 
     (and any packages from step 5, of course).
 
-Chapter 22. Frequently Asked Questions
+Chapter 24. Frequently Asked Questions
 
 This section contains the answers to questions that may arise when you are
 writing a package. If you don't find your question answered here, first have a
 look in the other chapters, and if you still don't have the answer, ask on the
 pkgsrc-users mailing list.
 
-22.1. What is the difference between MAKEFLAGS, .MAKEFLAGS and MAKE_FLAGS?
-22.2. What is the difference between MAKE, GMAKE and MAKE_PROGRAM?
-22.3. What is the difference between CC, PKG_CC and PKGSRC_COMPILER?
-22.4. What is the difference between BUILDLINK_LDFLAGS, BUILDLINK_LDADD and
+24.1. What is the difference between MAKEFLAGS, .MAKEFLAGS and MAKE_FLAGS?
+24.2. What is the difference between MAKE, GMAKE and MAKE_PROGRAM?
+24.3. What is the difference between CC, PKG_CC and PKGSRC_COMPILER?
+24.4. What is the difference between BUILDLINK_LDFLAGS, BUILDLINK_LDADD and
     BUILDLINK_LIBS?
-22.5. Why does make show-var VARNAME=BUILDLINK_PREFIX.foo say it's empty?
-22.6. What does ${MASTER_SITE_SOURCEFORGE:=package/} mean? I don't understand
+24.5. Why does make show-var VARNAME=BUILDLINK_PREFIX.foo say it's empty?
+24.6. What does ${MASTER_SITE_SOURCEFORGE:=package/} mean? I don't understand
     the := inside it.
-22.7. Which mailing lists are there for package developers?
-22.8. Where is the pkgsrc documentation?
-22.9. I have a little time to kill. What shall I do?
+24.7. Which mailing lists are there for package developers?
+24.8. Where is the pkgsrc documentation?
+24.9. I have a little time to kill. What shall I do?
 
-22.1. What is the difference between MAKEFLAGS, .MAKEFLAGS and MAKE_FLAGS?
+24.1. What is the difference between MAKEFLAGS, .MAKEFLAGS and MAKE_FLAGS?
 
       MAKEFLAGS are the flags passed to the pkgsrc-internal invocations of make
       (1), while MAKE_FLAGS are the flags that are passed to the MAKE_PROGRAM
       when building the package. [FIXME: What is .MAKEFLAGS for?]
 
-22.2. What is the difference between MAKE, GMAKE and MAKE_PROGRAM?
+24.2. What is the difference between MAKE, GMAKE and MAKE_PROGRAM?
 
       MAKE is the path to the make(1) program that is used in the pkgsrc
       infrastructure. GMAKE is the path to GNU Make, but you need to say
       USE_TOOLS+=gmake to use that. MAKE_PROGRAM is the path to the Make
       program that is used for building the package.
 
-22.3. What is the difference between CC, PKG_CC and PKGSRC_COMPILER?
+24.3. What is the difference between CC, PKG_CC and PKGSRC_COMPILER?
 
       CC is the path to the real C compiler, which can be configured by the
       pkgsrc user. PKG_CC is the path to the compiler wrapper. PKGSRC_COMPILER
       is not a path to a compiler, but the type of compiler that should be
       used. See mk/compiler.mk for more information about the latter variable.
 
-22.4. What is the difference between BUILDLINK_LDFLAGS, BUILDLINK_LDADD and
+24.4. What is the difference between BUILDLINK_LDFLAGS, BUILDLINK_LDADD and
       BUILDLINK_LIBS?
 
       [FIXME]
 
-22.5. Why does make show-var VARNAME=BUILDLINK_PREFIX.foo say it's empty?
+24.5. Why does make show-var VARNAME=BUILDLINK_PREFIX.foo say it's empty?
 
       For optimization reasons, some variables are only available in the "
       wrapper" phase and later. To "simulate" the wrapper phase, append 
       PKG_PHASE=wrapper to the above command.
 
-22.6. What does ${MASTER_SITE_SOURCEFORGE:=package/} mean? I don't understand
+24.6. What does ${MASTER_SITE_SOURCEFORGE:=package/} mean? I don't understand
       the := inside it.
 
       The := is not really an assignment operator, although it looks like it.
@@ -7364,7 +7387,7 @@ pkgsrc-users mailing list.
       string and new_string is package/. That's where the : and the = fall
       together.
 
-22.7. Which mailing lists are there for package developers?
+24.7. Which mailing lists are there for package developers?
 
       tech-pkg
 
@@ -7381,7 +7404,7 @@ pkgsrc-users mailing list.
           Please do not report your bugs here directly; use one of the other
           mailing lists.
 
-22.8. Where is the pkgsrc documentation?
+24.8. Where is the pkgsrc documentation?
 
       There are many places where you can find documentation about pkgsrc:
 
@@ -7415,7 +7438,7 @@ pkgsrc-users mailing list.
           others can find your questions later (see above). To be sure that the
           developer in charge reads the mail, you may CC him or her.
 
-22.9. I have a little time to kill. What shall I do?
+24.9. I have a little time to kill. What shall I do?
 
       This is not really an FAQ yet, but here's the answer anyway.
 
@@ -7430,14 +7453,14 @@ pkgsrc-users mailing list.
         * Review packages for which review was requested on the tech-pkg
           mailing list.
 
-Chapter 23. GNOME packaging and porting
+Chapter 25. GNOME packaging and porting
 
 Table of Contents
 
-23.1. Meta packages
-23.2. Packaging a GNOME application
-23.3. Updating GNOME to a newer version
-23.4. Patching guidelines
+25.1. Meta packages
+25.2. Packaging a GNOME application
+25.3. Updating GNOME to a newer version
+25.4. Patching guidelines
 
 Quoting GNOME's web site:
 
@@ -7471,7 +7494,7 @@ willing to learn new exciting stuff, ple
 list! There is still a long way to go to get a fully-functional GNOME desktop
 under NetBSD and we need your help to achieve it!
 
-23.1. Meta packages
+25.1. Meta packages
 
 pkgsrc includes three GNOME-related meta packages:
 
@@ -7500,7 +7523,7 @@ updates: a package may depend on other p
 listed after it. It is very important to keep this order to ease updates so... 
 do not change it to alphabetical sorting!
 
-23.2. Packaging a GNOME application
+25.2. Packaging a GNOME application
 
 Almost all GNOME applications are written in C and use a common set of tools as
 their build system. Things get different with the new bindings to other
@@ -7555,30 +7578,30 @@ directories or files. For each of them, 
 After applying the solution be sure to regenerate the package's file list with 
 make print-PLIST and ensure it is correct.
 
-Table 23.1. PLIST handling for GNOME packages
+Table 25.1. PLIST handling for GNOME packages
 
 +-----------------------------------------------------------------------------+
 |             If the package...             |             Then...             |
 |-------------------------------------------+---------------------------------|
-|                                           |See Section 19.6.10, "Packages   |
+|                                           |See Section 21.6.10, "Packages   |
 |Installs OMF files under share/omf.        |installing scrollkeeper/rarian   |
 |                                           |data files".                     |
 |-------------------------------------------+---------------------------------|
-|Installs icons under the share/icons/      |See Section 19.6.19, "Packages   |
+|Installs icons under the share/icons/      |See Section 21.6.19, "Packages   |
 |hicolor hierarchy or updates share/icons/  |installing hicolor theme icons". |
 |hicolor/icon-theme.cache.                  |                                 |
 |-------------------------------------------+---------------------------------|
-|                                           |See Section 19.6.14, "Packages   |
+|                                           |See Section 21.6.14, "Packages   |
 |Installs files under share/mime/packages.  |installing extensions to the MIME|
 |                                           |database".                       |
 |-------------------------------------------+---------------------------------|
-|Installs .desktop files under share/       |See Section 19.6.20, "Packages   |
+|Installs .desktop files under share/       |See Section 21.6.20, "Packages   |
 |applications and these include MIME        |installing desktop files".       |
 |information.                               |                                 |
 +-----------------------------------------------------------------------------+
 
 
-23.3. Updating GNOME to a newer version
+25.3. Updating GNOME to a newer version
 
 When seeing GNOME as a whole, there are two kinds of updates:
 
@@ -7655,12 +7678,12 @@ In order to update the GNOME components 
     package updates and all the corresponding changes to the doc/CHANGES-<YEAR>
     and pkgsrc/doc/TODO files.
 
-23.4. Patching guidelines
+25.4. Patching guidelines
 
 GNOME is a very big component in pkgsrc which approaches 100 packages. Please,
 it is very important that you always, always, always feed back any portability
 fixes you do to a GNOME package to the mainstream developers (see
-Section 11.3.5, "Feedback to the author"). This is the only way to get their
+Section 13.3.5, "Feedback to the author"). This is the only way to get their
 attention on portability issues and to ensure that future versions can be built
 out-of-the box on NetBSD. The less custom patches in pkgsrc, the easier further
 updates are. Those developers in charge of issuing major GNOME updates will be
@@ -7677,7 +7700,7 @@ Also, please avoid using preprocessor ma
 the FreeBSD GNOME people are doing a great job in porting GNOME to their
 operating system, the official GNOME sources are now plagued by conditionals
 that check for __FreeBSD__ and similar macros. This hurts portability. Please
-see our patching guidelines (Section 11.3.4, "Patching guidelines") for more
+see our patching guidelines (Section 13.3.4, "Patching guidelines") for more
 details.
 
 Part III. The pkgsrc infrastructure internals
@@ -7688,65 +7711,65 @@ maintainer should not need anything from
 
 Table of Contents
 
-24. Design of the pkgsrc infrastructure
+26. Design of the pkgsrc infrastructure
 
-    24.1. The meaning of variable definitions
-    24.2. Avoiding problems before they arise
-    24.3. Variable evaluation
+    26.1. The meaning of variable definitions
+    26.2. Avoiding problems before they arise
+    26.3. Variable evaluation
 
-        24.3.1. At load time
-        24.3.2. At runtime
+        26.3.1. At load time
+        26.3.2. At runtime
 
-    24.4. How can variables be specified?
-    24.5. Designing interfaces for Makefile fragments
+    26.4. How can variables be specified?
+    26.5. Designing interfaces for Makefile fragments
 
-        24.5.1. Procedures with parameters
-        24.5.2. Actions taken on behalf of parameters
+        26.5.1. Procedures with parameters
+        26.5.2. Actions taken on behalf of parameters
 
-    24.6. The order in which files are loaded
+    26.6. The order in which files are loaded
 
-        24.6.1. The order in bsd.prefs.mk
-        24.6.2. The order in bsd.pkg.mk
+        26.6.1. The order in bsd.prefs.mk
+        26.6.2. The order in bsd.pkg.mk
 
-25. Regression tests
+27. Regression tests
 
-    25.1. Running the regression tests
-    25.2. Adding a new regression test
+    27.1. Running the regression tests
+    27.2. Adding a new regression test
 
-        25.2.1. Overridable functions
-        25.2.2. Helper functions
+        27.2.1. Overridable functions
+        27.2.2. Helper functions
 
-26. Porting pkgsrc
+28. Porting pkgsrc
 
-    26.1. Porting pkgsrc to a new operating system
+    28.1. Porting pkgsrc to a new operating system
 
-Chapter 24. Design of the pkgsrc infrastructure
+Chapter 26. Design of the pkgsrc infrastructure
 
 Table of Contents
 
-24.1. The meaning of variable definitions
-24.2. Avoiding problems before they arise
-24.3. Variable evaluation
+26.1. The meaning of variable definitions
+26.2. Avoiding problems before they arise
+26.3. Variable evaluation
 
-    24.3.1. At load time
-    24.3.2. At runtime
+    26.3.1. At load time
+    26.3.2. At runtime
 
-24.4. How can variables be specified?
-24.5. Designing interfaces for Makefile fragments
+26.4. How can variables be specified?
+26.5. Designing interfaces for Makefile fragments
 
-    24.5.1. Procedures with parameters
-    24.5.2. Actions taken on behalf of parameters
+    26.5.1. Procedures with parameters
+    26.5.2. Actions taken on behalf of parameters
 
-24.6. The order in which files are loaded
+26.6. The order in which files are loaded
 
-    24.6.1. The order in bsd.prefs.mk
-    24.6.2. The order in bsd.pkg.mk
+    26.6.1. The order in bsd.prefs.mk
+    26.6.2. The order in bsd.pkg.mk
 
 The pkgsrc infrastructure consists of many small Makefile fragments. Each such
 fragment needs a properly specified interface. This chapter explains how such
 an interface looks like.
 
-24.1. The meaning of variable definitions
+26.1. The meaning of variable definitions
 
 Whenever a variable is defined in the pkgsrc infrastructure, the location and
 the way of definition provide much information about the intended use of that
@@ -7773,7 +7796,7 @@ Note
 These conventions are currently not applied consistently to the complete pkgsrc
 infrastructure.
 
-24.2. Avoiding problems before they arise
+26.2. Avoiding problems before they arise
 
 All variables that contain lists of things should default to being empty. Two
 examples that do not follow this rule are USE_LANGUAGES and DISTFILES. These
@@ -7790,9 +7813,9 @@ package Makefiles. Similarly for USE_LAN
 value ("c") is so short that it doesn't stand out. Nevertheless it is mentioned
 in many files.
 
-24.3. Variable evaluation
+26.3. Variable evaluation
 
-24.3.1. At load time
+26.3.1. At load time
 
 Variable evaluation takes place either at load time or at runtime, depending on
 the context in which they occur. The contexts where variables are evaluated at
@@ -7827,26 +7850,26 @@ paragraph, the -Wall is appended to the 
 appear in CONFIGURE_ARGS. In actual code, the three paragraphs from above
 typically occur in completely unrelated files.
 
-24.3.2. At runtime
+26.3.2. At runtime
 
 After all the files have been loaded, the values of the variables cannot be
 changed anymore. Variables that are used in the shell commands are expanded at
 this point.
 
-24.4. How can variables be specified?
+26.4. How can variables be specified?
 
 There are many ways in which the definition and use of a variable can be
 restricted in order to detect bugs and violations of the (mostly unwritten)
 policies. A package can be checked with pkglint -Wall to see whether it meets
 these rules.
 
-24.5. Designing interfaces for Makefile fragments
+26.5. Designing interfaces for Makefile fragments
 
 Most of the .mk files fall into one of the following classes. Cases where a
 file falls into more than one class should be avoided as it often leads to
 subtle bugs.
 
-24.5.1. Procedures with parameters
+26.5.1. Procedures with parameters
 
 In a traditional imperative programming language some of the .mk files could be
 described as procedures. They take some input parameters and?after
@@ -7874,7 +7897,7 @@ Examples for procedures are mk/bsd.optio
 To express that the parameters are evaluated at load time, they should be
 assigned using the := operator, which should be used only for this purpose.
 
-24.5.2. Actions taken on behalf of parameters
+26.5.2. Actions taken on behalf of parameters
 
 Action files take some input parameters and may define runtime variables. They
 shall not define loadtime variables. There are action files that are included
@@ -7883,7 +7906,7 @@ explicitly.
 
 An example for action files is mk/subst.mk.
 
-24.6. The order in which files are loaded
+26.6. The order in which files are loaded
 
 Package Makefiles usually consist of a set of variable definitions, and include
 the file ../../mk/bsd.pkg.mk in the very last line. Before that, they may also
@@ -7895,7 +7918,7 @@ the files are loaded matters.
 This section describes at which point the various files are loaded and gives
 reasons for that order.
 
-24.6.1. The order in bsd.prefs.mk
+26.6.1. The order in bsd.prefs.mk
 
 The very first action in bsd.prefs.mk is to define some essential variables
 like OPSYS, OS_VERSION and MACHINE_ARCH.
@@ -7915,7 +7938,7 @@ As the last steps, some essential variab
 system flavor are loaded, as well as the variables that have been cached in
 earlier phases of a package build.
 
-24.6.2. The order in bsd.pkg.mk
+26.6.2. The order in bsd.pkg.mk
 
 First, bsd.prefs.mk is loaded.
 
@@ -7942,15 +7965,15 @@ execution, though the actual order shoul
 At last, some more files are included that don't set any interesting variables
 but rather just define make targets to be executed.
 
-Chapter 25. Regression tests
+Chapter 27. Regression tests
 
 Table of Contents
 
-25.1. Running the regression tests
-25.2. Adding a new regression test
+27.1. Running the regression tests
+27.2. Adding a new regression test
 
-    25.2.1. Overridable functions
-    25.2.2. Helper functions
+    27.2.1. Overridable functions
+    27.2.2. Helper functions
 
 The pkgsrc infrastructure consists of a large codebase, and there are many
 corners where every little bit of a file is well thought out, making pkgsrc
@@ -7959,20 +7982,20 @@ changes from breaking anything, a suite 
 with every important part of the pkgsrc infrastructure. This chapter describes
 how regression tests work in pkgsrc and how you can add new tests.
 
-25.1. Running the regression tests
+27.1. Running the regression tests
 
 You first need to install the pkgtools/pkg_regress package, which provides the 
 pkg_regress command. Then you can simply run that command, which will run all
 tests in the regress category.
 
-25.2. Adding a new regression test
+27.2. Adding a new regression test
 
 Every directory in the regress category that contains a file called spec is
 considered a regression test. This file is a shell program that is included by
 the pkg_regress command. The following functions can be overridden to suit your
 needs.
 
-25.2.1. Overridable functions
+27.2.1. Overridable functions
 
 These functions do not take any parameters. Although they are called in "set -e
 " mode, they don't stop at the first failing command. See this StackOverflow
@@ -8014,7 +8037,7 @@ do_cleanup
     This function cleans everything up after the test has been run. By default
     it does nothing.
 
-25.2.2. Helper functions
+27.2.2. Helper functions
 
 exit_status expected
 
@@ -8036,17 +8059,17 @@ output_prohibit(regex...)
     () does not match the extended regular expression. If any of the regular
     expressions matches, the test will fail.
 
-Chapter 26. Porting pkgsrc
+Chapter 28. Porting pkgsrc
 
 Table of Contents
 
-26.1. Porting pkgsrc to a new operating system
+28.1. Porting pkgsrc to a new operating system
 
 The pkgsrc system has already been ported to many operating systems, hardware
 architectures and compilers. This chapter explains the necessary steps to make
 pkgsrc even more portable.
 
-26.1. Porting pkgsrc to a new operating system
+28.1. Porting pkgsrc to a new operating system
 
 To port pkgsrc to a new operating system (called MyOS in this example), you
 need to touch the following files:
@@ -8149,7 +8172,7 @@ Create the directory where the package l
 # cd bison
 # mkdir patches
 
-Create Makefile, DESCR and PLIST (see Chapter 11, Package components - files,
+Create Makefile, DESCR and PLIST (see Chapter 13, Package components - files,
 directories and contents) then continue with fetching the distfile:
 
 # make fetch
@@ -8460,16 +8483,2727 @@ branch of the CVS repository. In these d
 called pkgsrc-20xxQy.tar.{bz,gz,xz}, which contains the state of pkgsrc when it
 was branched.
 
-Appendix D. Editing guidelines for the pkgsrc guide
+Appendix D. Help topics
+
+The following list contains all help topics that are available when running 
+bmake help topic=:index.
+
+  * #!
+
+  * -lintl
+
+  * 64bit
+
+  * ABI
+
+  * ACCEPTABLE_LICENSES
+
+  * ACROREAD_FONTPATH
+
+  * ADDITIONAL
+
+  * AFAIK
+
+  * AIX
+
+  * ALLOW_VULNERABLE_PACKAGES
+
+  * ALL_ENV
+
+  * ALSA_PC
+
+  * ALTERNATIVES_SRC
+
+  * AMANDA_TMP
+
+  * AMANDA_USER
+
+  * AMANDA_VAR
+
+  * APACHE_GROUP
+
+  * APACHE_MODULE_NAME
+
+  * APACHE_MODULE_SRC
+
+  * APACHE_MODULE_SRCDIR
+
+  * APACHE_PKG_PREFIX
+
+  * APACHE_SUEXEC_CONFIGURE_ARGS
+
+  * APACHE_SUEXEC_DOCROOT
+
+  * APACHE_USER
+
+  * APPEND_ABI
+
+  * APPEND_ELF
+
+  * ARLA_CACHE
+
+  * AUDIT_PACKAGES_FLAGS
+
+  * AUTOCONF_REQD
+
+  * AUTOMAKE_OVERRIDE
+
+  * AUTOMAKE_REQD
+
+  * AUTO_MKDIRS
+
+  * BDB185_DEFAULT
+
+  * BDBBASE
+
+  * BDB_ACCEPTED
+
+  * BDB_DEFAULT
+
+  * BDB_LIBS
+
+  * BDB_TYPE
+
+  * BIND_DIR
+
+  * BIND_GROUP
+
+  * BIND_USER
+
+  * BINPKG_SITES
+
+  * BIN_INSTALL_FLAGS
+
+  * BISON_PKGDATADIR
+
+  * BOOTSTRAP_DEPENDS
+
+  * BOOTSTRAP_SETUPTOOLS
+
+  * BROKEN
+
+  * BROKEN_EXCEPT_ON_PLATFORM
+
+  * BROKEN_ON_PLATFORM
+
+  * BSDSRCDIR
+
+  * BSDXSRCDIR
+
+  * BSD_MAKE_ENV
+
+  * BUILDLINK_AUTO_DIRS
+
+  * BUILDLINK_AUTO_VARS
+
+  * BUILDLINK_CFLAGS
+
+  * BUILDLINK_CONTENTS_FILTER
+
+  * BUILDLINK_CPPFLAGS
+
+  * BUILDLINK_DEPMETHOD
+
+  * BUILDLINK_FILES
+
+  * BUILDLINK_FILES_CMD
+
+  * BUILDLINK_FNAME_TRANSFORM
+
+  * BUILDLINK_LDFLAGS
+
+  * BUILDLINK_LIBS
+
+  * BUILDLINK_OPSYS_SUPPORT_PTHREAD
+
+  * BUILDLINK_PKGNAME
+
+  * BUILDLINK_PREFIX
+
+  * BUILDLINK_RPATHDIRS
+
+  * BUILDLINK_TREE
+
+  * BUILD_DEFS
+
+  * BUILD_DEFS_EFFECTS
+
+  * BUILD_DIRS
+
+  * BUILD_ENV_SHELL
+
+  * BUILD_MAKE_CMD
+
+  * BUILD_MAKE_FLAGS
+
+  * BUILD_TARGET
+
+  * BUILTIN_FIND_FILES
+
+  * BUILTIN_FIND_FILES_VAR
+
+  * BUILTIN_FIND_GREP
+
+  * BUILTIN_FIND_HEADERS
+
+  * BUILTIN_FIND_HEADERS_VAR
+
+  * BUILTIN_PKG
+
+  * BUILTIN_TEST_CURSES_DEFINES
+
+  * BUILTIN_TEST_CURSES_FUNCS
+
+  * BUILTIN_VERSION_SCRIPT
+
+  * BUILTIN_X11_TYPE
+
+  * BUILTIN_X11_VERSION
+
+  * CACTI_GROUP
+
+  * CACTI_USER
+
+  * CANNA_GROUP
+
+  * CANNA_USER
+
+  * CAT
+
+  * CCACHE_BASE
+
+  * CCACHE_DIR
+
+  * CCACHE_LOGFILE
+
+  * CC_VERSION
+
+  * CC_VERSION_STRING
+
+  * CDRECORD_CONF
+
+  * CDROM_PKG_URL_DIR
+
+  * CDROM_PKG_URL_HOST
+
+  * CHECKOUT_DATE
+
+  * CHECK_FAKEHOME
+
+  * CHECK_FILES
+
+  * CHECK_FILES_SKIP
+
+  * CHECK_FILES_STRICT
+
+  * CHECK_HEADERS
+
+  * CHECK_HEADERS_SKIP
+
+  * CHECK_INTERPRETER
+
+  * CHECK_INTERPRETER_SKIP
+
+  * CHECK_PERMS
+
+  * CHECK_PERMS_AUTOFIX
+
+  * CHECK_PERMS_SKIP
+
+  * CHECK_PORTABILITY
+
+  * CHECK_PORTABILITY_SKIP
+
+  * CHECK_RELRO
+
+  * CHECK_RELRO_SKIP
+
+  * CHECK_RELRO_SUPPORTED
+
+  * CHECK_SHLIBS
+
+  * CHECK_SHLIBS_BLACKLIST
+
+  * CHECK_SHLIBS_SKIP
+
+  * CHECK_SHLIBS_SUPPORTED
+
+  * CHECK_SSP
+
+  * CHECK_SSP_SKIP
+
+  * CHECK_SSP_SUPPORTED
+
+  * CHECK_STRIPPED
+
+  * CHECK_STRIPPED_SKIP
+
+  * CHECK_WRKREF
+
+  * CHECK_WRKREF_EXTRA_DIRS
+
+  * CHECK_WRKREF_SKIP
+
+  * CLAMAV_DBDIR
+
+  * CLAMAV_GROUP
+
+  * CLAMAV_USER
+
+  * CLANGBASE
+
+  * CLEANDEPENDS
+
+  * CMAKE_DEPENDENCIES_REWRITE
+
+  * CMAKE_INSTALL_PREFIX
+
+  * CMAKE_MODULE_PATH_OVERRIDE
+
+  * CMAKE_PKGSRC_BUILD_FLAGS
+
+  * CMAKE_PREFIX_PATH
+
+  * CMAKE_USE_GNU_INSTALL_DIRS
+
+  * COMMON_LISP_DOCFILES
+
+  * COMMON_LISP_EXAMPLES
+
+  * COMMON_LISP_EXTRAFILES
+
+  * COMMON_LISP_PACKAGES
+
+  * COMMON_LISP_SYSTEM
+
+  * COMPILER_RPATH_FLAG
+
+  * COMPILER_USE_SYMLINKS
+
+  * CONFIGURE_ARGS
+
+  * CONFIGURE_DIRS
+
+  * CONFIGURE_ENV
+
+  * CONFIGURE_HAS_INFODIR
+
+  * CONFIGURE_HAS_MANDIR
+
+  * CONFIGURE_SCRIPT
+
+  * CONFIG_SHELL
+
+  * CONFIG_SHELL_FLAGS
+
+  * CONF_FILES
+
+  * CONF_FILES_MODE
+
+  * CONF_FILES_PERMS
+
+  * CONSERVER_DEFAULTHOST
+
+  * CONSERVER_DEFAULTPORT
+
+  * CP
+
+  * CPP
+
+  * CPP_PRECOMP_FLAGS
+
+  * CREATE_WRKDIR_SYMLINK
+
+  * CROSSBASE
+
+  * CTFCONVERT
+
+  * CTF_FILES_SKIP
+
+  * CTF_SUPPORTED
+
+  * CTYPE
+
+  * CUPS_GROUP
+
+  * CUPS_SYSTEM_GROUPS
+
+  * CUPS_USER
+
+  * CURSES_DEFAULT
+
+  * CURSES_TYPE
+
+  * CVS_EXTRACTDIR
+
+  * CVS_MODULE
+
+  * CVS_PROJECT
+
+  * CVS_REPOSITORIES
+
+  * CVS_ROOT
+
+  * CVS_ROOT_GNU
+
+  * CVS_ROOT_NONGNU
+
+  * CVS_ROOT_SOURCEFORGE
+
+  * CVS_TAG
+
+  * CXX
+
+  * CYRUS_GROUP
+
+  * CYRUS_IDLE
+
+  * CYRUS_USER
+
+  * DAEMONTOOLS_GROUP
+
+  * DAEMONTOOLS_LOG_USER
+
+  * DBUS_GROUP
+
+  * DBUS_USER
+
+  * DEFANG_GROUP
+
+  * DEFANG_USER
+
+  * DEFAULT_ACCEPTABLE_LICENSES
+
+  * DEFAULT_DISTFILES
+
+  * DEFAULT_IRC_SERVER
+
+  * DEFAULT_SERIAL_DEVICE
+
+  * DEF_UMASK
+
+  * DEINSTALLDEPENDS
+
+  * DEINSTALL_SRC
+
+  * DEINSTALL_TEMPLATES
+
+  * DELAYED_ERROR_MSG
+
+  * DELAYED_WARNING_MSG
+
+  * DEPENDS_TARGET
+
+  * DEPENDS_TYPE
+
+  * DESTDIR
+
+  * DESTDIR_VARNAME
+
+  * DIALER_GROUP
+
+  * DIGEST_REQD
+
+  * DISTDIR
+
+  * DISTFILES
+
+  * DISTINFO_FILE
+
+  * DISTNAME
+
+  * DIST_PATH
+
+  * DIST_SUBDIR
+
+  * DJBDNS_AXFR_USER
+
+  * DJBDNS_CACHE_USER
+
+  * DJBDNS_DJBDNS_GROUP
+
+  * DJBDNS_LOG_USER
+
+  * DJBDNS_RBL_USER
+
+  * DJBDNS_TINY_USER
+
+  * DLOPEN_REQUIRE_PTHREADS
+
+  * DL_AUTO_VARS
+
+  * DL_CFLAGS
+
+  * DL_LDFLAGS
+
+  * DL_LIBS
+
+  * DNS
+
+  * DOWNLOADED_DISTFILE
+
+  * DT_LAYOUT
+
+  * DYNAMIC_SITES_CMD
+
+  * DYNAMIC_SITES_SCRIPT
+
+  * ECHO
+
+  * ECHO_N
+
+  * ELK_GUI
+
+  * EMACS_TYPE
+
+  * EMULDIR
+
+  * EMULSUBDIR
+
+  * EMULSUBDIRSLASH
+
+  * EMUL_ARCH
+
+  * EMUL_DISTRO
+
+  * EMUL_EXEC_FMT
+
+  * EMUL_IS_NATIVE
+
+  * EMUL_MODULES
+
+  * EMUL_OPSYS
+
+  * EMUL_PKG_FMT
+
+  * EMUL_PLATFORM
+
+  * EMUL_PLATFORMS
+
+  * EMUL_PREFER
+
+  * EMUL_REQD
+
+  * EMUL_TYPE
+
+  * ERROR_MSG
+
+  * EXIM_GROUP
+
+  * EXIM_USER
+
+  * EXPORT_SYMBOLS_LDFLAGS
+
+  * EXTRACTOR
+
+  * EXTRACT_CMD
+
+  * EXTRACT_CMD_DEFAULT
+
+  * EXTRACT_DIR
+
+  * EXTRACT_ELEMENTS
+
+  * EXTRACT_ENV
+
+  * EXTRACT_ONLY
+
+  * EXTRACT_OPTS
+
+  * EXTRACT_SUFX
+
+  * EXTRACT_USING
+
+  * FAILOVER_FETCH
+
+  * FAIL_MSG
+
+  * FAKE_NCURSES
+
+  * FAM
+
+  * FAM_ACCEPTED
+
+  * FAM_DEFAULT
+
+  * FAM_SERVER
+
+  * FCPATH
+
+  * FEATURE_CPPFLAGS
+
+  * FEATURE_LDFLAGS
+
+  * FEATURE_LIBS
+
+  * FETCH_AFTER_ARGS
+
+  * FETCH_BEFORE_ARGS
+
+  * FETCH_CMD
+
+  * FETCH_OUTPUT_ARGS
+
+  * FETCH_PROXY
+
+  * FETCH_RESUME_ARGS
+
+  * FETCH_USING
+
+  * FILES_SUBST
+
+  * FILES_SUBST_SED
+
+  * FIX_SYSTEM_HEADERS
+
+  * FLUXBOX_USE_GNOME
+
+  * FLUXBOX_USE_KDE
+
+  * FLUXBOX_USE_XFT
+
+  * FLUXBOX_USE_XINERAMA
+
+  * FONTDIR
+
+  * FONTS_DIRS
+
+  * FONTS_VERBOSE
+
+  * FOO_HACKS_MK
+
+  * FOSSIL_EXTRACTDIR
+
+  * FOSSIL_REPO
+
+  * FOSSIL_REPOSITORIES
+
+  * FOSSIL_VERSION
+
+  * FOX_USE_XUNICODE
+
+  * FREEWNN_GROUP
+
+  * FREEWNN_USER
+
+  * FTP_PKG_URL_DIR
+
+  * FTP_PKG_URL_HOST
+
+  * GAMEDATAMODE
+
+  * GAMEDATA_PERMS
+
+  * GAMEDIRMODE
+
+  * GAMEDIR_PERMS
+
+  * GAMEGRP
+
+  * GAMEMODE
+
+  * GAMEOWN
+
+  * GAMES_GROUP
+
+  * GAMES_USER
+
+  * GCC
+
+  * GCCBASE
+
+  * GCC_REQD
+
+  * GCC_VERSION_SUFFIX
+
+  * GEM_BUILD
+
+  * GEM_CLEANBUILD
+
+  * GEM_CLEANBUILD_EXTENSIONS
+
+  * GEM_DOCDIR
+
+  * GEM_EXTSDIR
+
+  * GEM_HOME
+
+  * GEM_LIBDIR
+
+  * GEM_NAME
+
+  * GEM_PATH
+
+  * GEM_SPECFILE
+
+  * GENERATE_PLIST
+
+  * GHOSTSCRIPT_REQD
+
+  * GITHUB_PROJECT
+
+  * GITHUB_RELEASE
+
+  * GITHUB_TAG
+
+  * GITHUB_TYPE
+
+  * GIT_BRANCH
+
+  * GIT_ENV
+
+  * GIT_EXTRACTDIR
+
+  * GIT_REPO
+
+  * GIT_REPOSITORIES
+
+  * GIT_REVISION
+
+  * GIT_TAG
+
+  * GNU
+
+  * GNU_CONFIGURE
+
+  * GNU_CONFIGURE_INFODIR
+
+  * GNU_CONFIGURE_MANDIR
+
+  * GNU_CONFIGURE_STRICT
+
+  * GO_BUILD_PATTERN
+
+  * GO_DIST_BASE
+
+  * GO_SRCPATH
+
+  * GROUP_SPECIFIC_PKGS
+
+  * GRUB_NETWORK_CARDS
+
+  * GRUB_PRESET_COMMAND
+
+  * GRUB_SCAN_ARGS
+
+  * GZIP
+
+  * HASKELL_COMPILER
+
+  * HASKELL_ENABLE_HADDOCK_DOCUMENTATION
+
+  * HASKELL_ENABLE_LIBRARY_PROFILING
+
+  * HASKELL_ENABLE_SHARED_LIBRARY
+
+  * HAS_CONFIGURE
+
+  * HEADER_TEMPLATES
+
+  * HG_REPO
+
+  * HG_REPOSITORIES
+
+  * HG_TAG
+
+  * HOST_PKGTOOLS_ARGS
+
+  * HOST_SPECIFIC_PKGS
+
+  * HOWL_GROUP
+
+  * HOWL_USER
+
+  * ICCBASE
+
+  * ICECAST_CHROOTDIR
+
+  * ICON_THEMES
+
+  * IDOBASE
+
+  * IGNORE_CCACHE
+
+  * IGNORE_INFO_DIRS
+
+  * IGNORE_INTERACTIVE_FETCH
+
+  * IMAKE
+
+  * IMAKEOPTS
+
+  * IMAKE_MAKE
+
+  * IMAKE_MANINSTALL
+
+  * IMAP_UW_CCLIENT_MBOX_FMT
+
+  * IMDICTDIR
+
+  * INCOMPAT_CURSES
+
+  * INFO_DIR
+
+  * INFO_FILES
+
+  * INFO_FILES_VERBOSE
+
+  * INFO_MSG
+
+  * INIT_SYSTEM
+
+  * INN_DATA_DIR
+
+  * INN_GROUP
+
+  * INN_USER
+
+  * INSTALLATION_DIRS
+
+  * INSTALLATION_DIRS_FROM_PLIST
+
+  * INSTALL_ENV
+
+  * INSTALL_SH_OVERRIDE
+
+  * INSTALL_SRC
+
+  * INSTALL_TEMPLATES
+
+  * INSTALL_UNSTRIPPED
+
+  * IRCD_HYBRID_IRC_GROUP
+
+  * IRCD_HYBRID_IRC_USER
+
+  * IRCD_HYBRID_MAXCONN
+
+  * IRCD_HYBRID_NICLEN
+
+  * IRCD_HYBRID_SYSLOG_EVENTS
+
+  * IRCD_HYBRID_SYSLOG_FACILITY
+
+  * IRCD_HYBRID_TOPICLEN
+
+  * IRIX
+
+  * IRRD_USE_PGP
+
+  * JABBERD_GROUP
+
+  * JABBERD_LOGDIR
+
+  * JABBERD_PIDDIR
+
+  * JABBERD_SPOOLDIR
+
+  * JABBERD_USER
+
+  * JAKARTA_HOME
+
+  * JAVA_APP_PATH
+
+  * JAVA_APP_TARGETS
+
+  * JAVA_BINPREFIX
+
+  * JAVA_CLASSPATH
+
+  * JAVA_HOME
+
+  * JAVA_LD_LIBRARY_PATH
+
+  * JAVA_NAME
+
+  * JAVA_UNLIMIT
+
+  * JAVA_WRAPPERS
+
+  * JPEG_ACCEPTED
+
+  * JPEG_DEFAULT
+
+  * KERBEROS
+
+  * KERMIT_SUID_UUCP
+
+  * KJS_USE_PCRE
+
+  * KNEWS_DOMAIN_FILE
+
+  * KNEWS_DOMAIN_NAME
+
+  * KRB5_ACCEPTED
+
+  * KRB5_DEFAULT
+
+  * LANGUAGES
+
+  * LATEX2HTML_ICONPATH
+
+  * LDCONFIG_ADD_CMD
+
+  * LDCONFIG_REMOVE_CMD
+
+  * LEAFNODE_DATA_DIR
+
+  * LEAFNODE_GROUP
+
+  * LEAFNODE_USER
+
+  * LIBDVDCSS_HOMEPAGE
+
+  * LIBDVDCSS_MASTER_SITES
+
+  * LIBTOOL
+
+  * LIBTOOLIZE_PLIST
+
+  * LIBTOOL_M4_OVERRIDE
+
+  * LIBUSB_TYPE
+
+  * LICENSE
+
+  * LINKER_RPATH_FLAG
+
+  * LINK_RPATH_FLAG
+
+  * LINUX_BASE_NODEPS
+
+  * LINUX_BASE_PREFERRED
+
+  * LINUX_BASE_REQUIRED
+
+  * LINUX_LOCALES
+
+  * LOCALBASE
+
+  * LOCALBASE_LOCKTYPE
+
+  * LOCALPATCHES
+
+  * LOVE_DATA
+
+  * LOVE_GAME
+
+  * LOVE_VERSION
+
+  * LP64PLATFORMS
+
+  * MACHINE_PLATFORM
+
+  * MAILAGENT_DOMAIN
+
+  * MAILAGENT_EMAIL
+
+  * MAILAGENT_FQDN
+
+  * MAILAGENT_ORGANIZATION
+
+  * MAJORDOMO_HOMEDIR
+
+  * MAJOR_OS_VERSION
+
+  * MAKEINFO_ARGS
+
+  * MAKE_DIRS
+
+  * MAKE_DIRS_PERMS
+
+  * MAKE_ENV
+
+  * MAKE_FILE
+
+  * MAKE_FLAGS
+
+  * MAKE_JOBS
+
+  * MAKE_JOBS_SAFE
+
+  * MAKE_PROGRAM
+
+  * MANINSTALL
+
+  * MANZ
+
+  * MASTER_SITES
+
+  * MASTER_SITE_BACKUP
+
+  * MASTER_SITE_CYGWIN
+
+  * MASTER_SITE_GNOME
+
+  * MASTER_SITE_GNU
+
+  * MASTER_SITE_LOCAL
+
+  * MASTER_SITE_MOZILLA
+
+  * MASTER_SITE_OPENOFFICE
+
+  * MASTER_SITE_OVERRIDE
+
+  * MASTER_SITE_PERL_CPAN
+
+  * MASTER_SITE_SUNSITE
+
+  * MASTER_SITE_SUSE
+
+  * MASTER_SITE_TEX_CTAN
+
+  * MASTER_SITE_XCONTRIB
+
+  * MASTER_SITE_XEMACS
+
+  * MASTER_SORT
+
+  * MASTER_SORT_RANDOM
+
+  * MASTER_SORT_REGEX
+
+  * MECAB_CHARSET
+
+  * MEDIATOMB_GROUP
+
+  * MEDIATOMB_USER
+
+  * MIPSPROBASE
+
+  * MIREDO_GROUP
+
+  * MIREDO_USER
+
+  * MISSING_FEATURES
+
+  * MKDIR
+
+  * MLDONKEY_GROUP
+
+  * MLDONKEY_HOME
+
+  * MLDONKEY_USER
+
+  * MONOTONE_GROUP
+
+  * MONOTONE_USER
+
+  * MOTIFBASE
+
+  * MOTIF_TYPE
+
+  * MOTIF_TYPE_DEFAULT
+
+  * MPI_TYPE
+
+  * MSGFMT_STRIP_MSGCTXT
+
+  * MSGFMT_STRIP_MSGID_PLURAL
+
+  * MTOOLS_ENABLE_FLOPPYD
+
+  * MUST
+
+  * MV
+
+  * MYSQL_CHARSET
+
+  * MYSQL_DATADIR
+
+  * MYSQL_EXTRA_CHARSET
+
+  * MYSQL_GROUP
+
+  * MYSQL_PKGSRCDIR
+
+  * MYSQL_USER
+
+  * MYSQL_VERSIONS_ACCEPTED
+
+  * MYSQL_VERSION_DEFAULT
+
+  * NAGIOSCMD_GROUP
+
+  * NAGIOSDIR
+
+  * NAGIOS_GROUP
+
+  * NAGIOS_USER
+
+  * NATIVE_APPEND_ABI
+
+  * NATIVE_APPEND_ELF
+
+  * NATIVE_EXEC_FMT
+
+  * NATIVE_MACHINE_PLATFORM
+
+  * NATIVE_OBJECT_FMT
+
+  * NBPAX_PROGRAM_PREFIX
+
+  * NETBSD_LOGIN_NAME
+
+  * NMH_EDITOR
+
+  * NMH_MTA
+
+  * NMH_PAGER
+
+  * NOLOGIN
+
+  * NONZERO_FILESIZE_P
+
+  * NOTE
+
+  * NOT_FOR_PLATFORM
+
+  * NOT_PAX_ASLR_SAFE
+
+  * NOT_PAX_MPROTECT_SAFE
+
+  * NO_BUILD
+
+  * NO_CHECKSUM
+
+  * NO_CONFIGURE
+
+  * NO_SKIP
+
+  * NS_PREFERRED
+
+  * NULLMAILER_GROUP
+
+  * NULLMAILER_USER
+
+  * OASIS
+
+  * OASIS_BUILD_ARGS
+
+  * OBJHOSTNAME
+
+  * OBJMACHINE
+
+  * OCAML_FINDLIB_DIRS
+
+  * OCAML_FINDLIB_REGISTER
+
+  * OCAML_FINDLIB_REGISTER_VERBOSE
+
+  * OCAML_SITELIBDIR
+
+  * OCAML_TOPKG_DOCDIR
+
+  * OCAML_USE_DUNE
+
+  * OCAML_USE_FINDLIB
+
+  * OCAML_USE_JBUILDER
+
+  * OCAML_USE_OASIS
+
+  * OCAML_USE_OASIS_DYNRUN
+
+  * OCAML_USE_OPAM
+
+  * OCAML_USE_OPT_COMPILER
+
+  * OCAML_USE_TOPKG
+
+  * OMF
+
+  * ONLY_FOR_COMPILER
+
+  * ONLY_FOR_PLATFORM
+
+  * OPENSSH_CHROOT
+
+  * OPENSSH_GROUP
+
+  * OPENSSH_USER
+
+  * OPSYS
+
+  * OPSYS_EMULDIR
+
+  * OSS_TYPE
+
+  * OSX
+
+  * OSX_TOLERATE_SDK_SKEW
+
+  * OS_HAVE_ALSA
+
+  * OS_HAVE_RCD
+
+  * OS_VARIANT
+
+  * OS_VERSION
+
+  * OTF_FONTS_DIR
+
+  * OVERRIDE_DIRDEPTH
+
+  * OVERRIDE_GEMSPEC
+
+  * OVERRIDE_GNU_CONFIG_SCRIPTS
+
+  * OVERRIDE_ROCKSPEC
+
+  * OWN_DIRS
+
+  * OWN_DIRS_PERMS
+
+  * P4GROUP
+
+  * P4PORT
+
+  * P4ROOT
+
+  * P4USER
+
+  * PACKAGES
+
+  * PALMOS_DEFAULT_SDK
+
+  * PAMBASE
+
+  * PAM_DEFAULT
+
+  * PAPERSIZE
+
+  * PASSIVE_FETCH
+
+  * PATCHDIR
+
+  * PATCHFILES
+
+  * PATCH_ARGS
+
+  * PATCH_DEBUG
+
+  * PATCH_DIST_ARGS
+
+  * PATCH_DIST_CAT
+
+  * PATCH_DIST_STRIP
+
+  * PATCH_FUZZ_FACTOR
+
+  * PATCH_STRIP
+
+  * PATH
+
+  * PCCBASE
+
+  * PEAR
+
+  * PEAR_CHANNEL
+
+  * PEAR_CHANNEL_ALIAS
+
+  * PEAR_CHANNEL_VERSION
+
+  * PEAR_CMD
+
+  * PEAR_LIB
+
+  * PEAR_PACKAGE_XML
+
+  * PERL5
+
+  * PERL5_CONFIGURE
+
+  * PERL5_CONFIGURE_DIRS
+
+  * PERL5_LDFLAGS
+
+  * PERL5_LICENSE
+
+  * PERL5_MODULE_TYPE
+
+  * PERL5_PACKLIST
+
+  * PERL5_PACKLIST_DIR
+
+  * PERL5_PERLBASE
+
+  * PERL5_SITEBASE
+
+  * PERL5_USE_PACKLIST
+
+  * PERL5_VENDORBASE
+
+  * PFCTL
+
+  * PFVAR_H
+
+  * PF_VERSION
+
+  * PGGROUP
+
+  * PGHOME
+
+  * PGPKGSRCDIR
+
+  * PGSQL_TYPE
+
+  * PGSQL_VERSIONS_ACCEPTED
+
+  * PGSQL_VERSION_DEFAULT
+
+  * PGUSER
+
+  * PG_LIB_EXT
+
+  * PHP
+
+  * PHPCOMMON_MK
+
+  * PHPPKGSRCDIR
+
+  * PHP_BASE_VERS
+
+  * PHP_CHECK_INSTALLED
+
+  * PHP_EXTENSION_DIR
+
+  * PHP_INITIAL_TEENY
+
+  * PHP_PKG_PREFIX
+
+  * PHP_VERSION
+
+  * PHP_VERSIONS_ACCEPTED
+
+  * PHP_VERSIONS_INCOMPATIBLE
+
+  * PHP_VERSION_DEFAULT
+
+  * PHP_VERSION_REQD
+
+  * PILRC_USE_GTK
+
+  * PKGCONFIG_BASE
+
+  * PKGCONFIG_FILE
+
+  * PKGCONFIG_OVERRIDE
+
+  * PKGCONFIG_OVERRIDE_STAGE
+
+  * PKGDIR
+
+  * PKGGNUDIR
+
+  * PKGINFODIR
+
+  * PKGLOCALEDIR
+
+  * PKGMANDIR
+
+  * PKGNAME
+
+  * PKGNAME_REQD
+
+  * PKGPATH
+
+  * PKGREVISION
+
+  * PKGSRC_CHANGES
+
+  * PKGSRC_COMPILER
+
+  * PKGSRC_KEEP_BIN_PKGS
+
+  * PKGSRC_LOCKTYPE
+
+  * PKGSRC_MAKE_ENV
+
+  * PKGSRC_MESSAGE_RECIPIENTS
+
+  * PKGSRC_MKPIE
+
+  * PKGSRC_MKREPRO
+
+  * PKGSRC_RUN_TEST
+
+  * PKGSRC_SETENV
+
+  * PKGSRC_SLEEPSECS
+
+  * PKGSRC_TODO
+
+  * PKGSRC_USE_CTF
+
+  * PKGSRC_USE_FORTIFY
+
+  * PKGSRC_USE_RELRO
+
+  * PKGSRC_USE_SSP
+
+  * PKGSRC_USE_STACK_CHECK
+
+  * PKGTASKS_DATAFILE
+
+  * PKGTOOLS_ARGS
+
+  * PKGTOOLS_ENV
+
+  * PKG_ALTERNATIVES
+
+  * PKG_APACHE
+
+  * PKG_APACHE_ACCEPTED
+
+  * PKG_APACHE_DEFAULT
+
+  * PKG_BEST_EXISTS
+
+  * PKG_BUILD_OPTIONS
+
+  * PKG_COMPRESSION
+
+  * PKG_CONFIG
+
+  * PKG_CONFIG_PERMS
+
+  * PKG_CREATE_USERGROUP
+
+  * PKG_DB_TMPDIR
+
+  * PKG_DEBUG_LEVEL
+
+  * PKG_DEFAULT_OPTIONS
+
+  * PKG_DESTDIR_SUPPORT
+
+  * PKG_DEVELOPER
+
+  * PKG_DISABLED_OPTIONS
+
+  * PKG_FATAL_ERRORS
+
+  * PKG_FC
+
+  * PKG_FILELIST_CMD
+
+  * PKG_GECOS
+
+  * PKG_GID
+
+  * PKG_GROUPS
+
+  * PKG_GROUPS_VARS
+
+  * PKG_HOME
+
+  * PKG_INIT_SCRIPTS
+
+  * PKG_JAVA_HOME
+
+  * PKG_JVM
+
+  * PKG_JVMS_ACCEPTED
+
+  * PKG_JVM_DEFAULT
+
+  * PKG_LEGACY_OPTIONS
+
+  * PKG_LIBTOOL
+
+  * PKG_OPTIONS
+
+  * PKG_OPTIONS_DEPRECATED_WARNINGS
+
+  * PKG_OPTIONS_LEGACY_OPTS
+
+  * PKG_OPTIONS_LEGACY_VARS
+
+  * PKG_OPTIONS_NONEMPTY_SETS
+
+  * PKG_OPTIONS_OPTIONAL_GROUPS
+
+  * PKG_OPTIONS_REQUIRED_GROUPS
+
+  * PKG_OPTIONS_VAR
+
+  * PKG_PHP
+
+  * PKG_PHP_MAJOR_VERS
+
+  * PKG_PHP_VERSION
+
+  * PKG_RCD_SCRIPTS
+
+  * PKG_REFCOUNT_DBDIR
+
+  * PKG_REGISTER_SHELLS
+
+  * PKG_RESUME_TRANSFERS
+
+  * PKG_SHELL
+
+  * PKG_SUGGESTED_OPTIONS
+
+  * PKG_SUPPORTED_OPTIONS
+
+  * PKG_SYSCONFBASE
+
+  * PKG_SYSCONFBASEDIR
+
+  * PKG_SYSCONFDIR
+
+  * PKG_SYSCONFDIR_PERMS
+
+  * PKG_SYSCONFSUBDIR
+
+  * PKG_SYSCONFVAR
+
+  * PKG_TOOLS_BIN
+
+  * PKG_UID
+
+  * PKG_UPDATE_FONTS_DB
+
+  * PKG_USERS
+
+  * PKG_USERS_VARS
+
+  * PKG_VERBOSE
+
+  * PLIST
+
+  * PLIST_AWK
+
+  * PLIST_AWK_ENV
+
+  * PLIST_SRC
+
+  * PLIST_SUBST
+
+  * PLIST_TYPE
+
+  * PLIST_VARS
+
+  * POPTOP_USE_MPPE
+
+  * POST_FETCH_HOOK
+
+  * PREFER
+
+  * PREFER_NATIVE
+
+  * PREFER_NATIVE_PTHREADS
+
+  * PREFER_PKGSRC
+
+  * PREFIX
+
+  * PREPEND_PATH
+
+  * PRE_ROOT_CMD
+
+  * PRIVILEGED_STAGES
+
+  * PS
+
+  * PTHREAD_AUTO_VARS
+
+  * PTHREAD_CFLAGS
+
+  * PTHREAD_LDFLAGS
+
+  * PTHREAD_LIBS
+
+  * PTHREAD_OPTS
+
+  * PTHREAD_TYPE
+
+  * PVM_SSH
+
+  * PYPKGPREFIX
+
+  * PYTHON_FOR_BUILD_ONLY
+
+  * PYTHON_SELF_CONFLICT
+
+  * PYTHON_VERSIONED_DEPENDENCIES
+
+  * PYTHON_VERSIONS_ACCEPTED
+
+  * PYTHON_VERSIONS_INCOMPATIBLE
+
+  * PYTHON_VERSION_DEFAULT
+
+  * PYTHON_VERSION_REQD
+
+  * PYVERSSUFFIX
+
+  * PY_NO_EGG
+
+  * QMAILDIR
+
+  * QMAIL_ALIAS_USER
+
+  * QMAIL_DAEMON_USER
+
+  * QMAIL_LOG_USER
+
+  * QMAIL_NOFILES_GROUP
+
+  * QMAIL_PASSWD_USER
+
+  * QMAIL_QMAIL_GROUP
+
+  * QMAIL_QUEUE_DIR
+
+  * QMAIL_QUEUE_EXTRA
+
+  * QMAIL_QUEUE_USER
+
+  * QMAIL_REMOTE_USER
+
+  * QMAIL_ROOT_USER
+
+  * QMAIL_SEND_USER
+
+  * QPOPPER_FAC
+
+  * QPOPPER_SPOOL_DIR
+
+  * QPOPPER_USER
+
+  * RAKE_NAME
+
+  * RASMOL_DEPTH
+
+  * RCD_DIR
+
+  * RCD_ORDER
+
+  * RCD_SCRIPTS
+
+  * RCD_SCRIPTS_DIR
+
+  * RCD_SCRIPTS_EXAMPLEDIR
+
+  * RCD_SCRIPTS_MODE
+
+  * RCD_SCRIPTS_SHELL
+
+  * RCD_SCRIPT_SRC
+
+  * RCD_SUBR
+
+  * RDOC
+
+  * READLINE_DEFAULT
+
+  * READLINE_TYPE
+
+  * REAL_ROOT_GROUP
+
+  * REAL_ROOT_USER
+
+  * RECURSIVE_MAKE
+
+  * RELAY_CTRL_DIR
+
+  * REPLACE_AWK
+
+  * REPLACE_BASH
+
+  * REPLACE_CSH
+
+  * REPLACE_KSH
+
+  * REPLACE_PERL
+
+  * REPLACE_PERL6
+
+  * REPLACE_PYTHON
+
+  * REPLACE_RUBY
+
+  * REPLACE_RUBY_DIRS
+
+  * REPLACE_RUBY_PAT
+
+  * REPLACE_SH
+
+  * REPLACE_TEXLUA
+
+  * REQD_DIRS
+
+  * REQD_DIRS_PERMS
+
+  * REQD_FILES
+
+  * REQD_FILES_MODE
+
+  * REQD_FILES_PERMS
+
+  * RESOLV_AUTO_VARS
+
+  * RESOLV_LDFLAGS
+
+  * RESOLV_LIBS
+
+  * RM
+
+  * ROCKSPEC_NAME
+
+  * ROCKSPEC_SPECFILE
+
+  * ROOT_CMD
+
+  * ROOT_GROUP
+
+  * ROOT_USER
+
+  * RPCGEN
+
+  * RPM
+
+  * RPM2PKG_PLIST
+
+  * RPM2PKG_PREFIX
+
+  * RPM2PKG_STAGE
+
+  * RPM2PKG_STRIP
+
+  * RPM2PKG_SUBPREFIX
+
+  * RPMFILES
+
+  * RPMIGNOREPATH
+
+  * RPM_DB_PREFIX
+
+  * RSSH_CVS_PATH
+
+  * RSSH_RDIST_PATH
+
+  * RSSH_RSYNC_PATH
+
+  * RSSH_SCP_PATH
+
+  * RSSH_SFTP_SERVER_PATH
+
+  * RUBY
+
+  * RUBYGEM
+
+  * RUBYGEM_NAME
+
+  * RUBYGEM_OPTIONS
+
+  * RUBY_ABI_VERSION
+
+  * RUBY_ARCH
+
+  * RUBY_ARCHINC
+
+  * RUBY_ARCHLIB
+
+  * RUBY_BASE
+
+  * RUBY_BASERIDIR
+
+  * RUBY_BUILD_RDOC
+
+  * RUBY_BUILD_RI
+
+  * RUBY_DLEXT
+
+  * RUBY_DOC
+
+  * RUBY_DYNAMIC_DIRS
+
+  * RUBY_EG
+
+  * RUBY_ENCODING_ARG
+
+  * RUBY_EXTCONF
+
+  * RUBY_EXTCONF_CHECK
+
+  * RUBY_EXTCONF_DEBUG
+
+  * RUBY_EXTCONF_MAKEFILE
+
+  * RUBY_GEM_BASE
+
+  * RUBY_INC
+
+  * RUBY_LIB
+
+  * RUBY_LIB_BASE
+
+  * RUBY_NAME
+
+  * RUBY_NOVERSION
+
+  * RUBY_PKGPREFIX
+
+  * RUBY_RAILS
+
+  * RUBY_RAILS42_VERSION
+
+  * RUBY_RAILS51_VERSION
+
+  * RUBY_RAILS52_VERSION
+
+  * RUBY_RAILS_ACCEPTED
+
+  * RUBY_RAILS_DEFAULT
+
+  * RUBY_RAILS_REQD
+
+  * RUBY_RAILS_STRICT_DEP
+
+  * RUBY_RIDIR
+
+  * RUBY_SETUP
+
+  * RUBY_SHLIB
+
+  * RUBY_SHLIBALIAS
+
+  * RUBY_SHLIBVER
+
+  * RUBY_SIMPLE_INSTALL
+
+  * RUBY_SITEARCHLIB
+
+  * RUBY_SITELIB
+
+  * RUBY_SITELIB_BASE
+
+  * RUBY_SITERIDIR
+
+  * RUBY_SLEXT
+
+  * RUBY_SRCDIR
+
+  * RUBY_STATICLIB
+
+  * RUBY_SUFFIX
+
+  * RUBY_SYSRIDIR
+
+  * RUBY_USE_PTHREAD
+
+  * RUBY_VENDORARCHLIB
+
+  * RUBY_VENDORLIB
+
+  * RUBY_VENDORLIB_BASE
+
+  * RUBY_VER
+
+  * RUBY_VERSION
+
+  * RUBY_VERSIONS_ACCEPTED
+
+  * RUBY_VERSION_DEFAULT
+
+  * RUBY_VERSION_REQD
+
+  * RUBY_VER_DIR
+
+  * RUN
+
+  * RUN_LDCONFIG
+
+  * SAWFISH_THEMES
+
+  * SCO
+
+  * SCREWS_GROUP
+
+  * SCREWS_USER
+
+  * SCRIPTS_ENV
+
+  * SCROLLKEEPER_DATADIR
+
+  * SCROLLKEEPER_REBUILDDB
+
+  * SCROLLKEEPER_UPDATEDB
+
+  * SDIST_PAWD
+
+  * SERIAL_DEVICES
+
+  * SETGIDGAME
+
+  * SETGID_GAMES_PERMS
+
+  * SETUID_ROOT_PERMS
+
+  * SH
+
+  * SHLIB
+
+  * SHORTNAME
+
+  * SIGN_PACKAGES
+
+  * SILC_CLIENT_WITH_PERL
+
+  * SITE_SPECIFIC_PKGS
+
+  * SKIP_DEPENDS
+
+  * SKIP_PORTABILITY_CHECK
+
+  * SMF_INSTANCES
+
+  * SMF_MANIFEST
+
+  * SMF_METHODS
+
+  * SMF_METHOD_SHELL
+
+  * SMF_METHOD_SRC
+
+  * SMF_NAME
+
+  * SMF_PREFIX
+
+  * SMF_SRCDIR
+
+  * SNIPROXY_GROUP
+
+  * SNIPROXY_USER
+
+  * SOURCE_BUFFSIZE
+
+  * SPECIAL_PERMS
+
+  * SPECIFIC_PKGS
+
+  * SSH_SUID
+
+  * SSYNC_PAWD
+
+  * STEP_MSG
+
+  * STRIP
+
+  * STRIP_DBG
+
+  * STRIP_DEBUG
+
+  * STRIP_DEBUG_SUPPORTED
+
+  * STRIP_FILES_SKIP
+
+  * SU
+
+  * SUBDIR
+
+  * SUBST_CLASSES
+
+  * SUBST_FILES
+
+  * SUBST_FILTER_CMD
+
+  * SUBST_MESSAGE
+
+  * SUBST_SED
+
+  * SUBST_SHOW_DIFF
+
+  * SUBST_SKIP_TEXT_CHECK
+
+  * SUBST_STAGE
+
+  * SUBST_VARS
+
+  * SUNWSPROBASE
+
+  * SUSE_PREFER
+
+  * SU_CMD
+
+  * SVN_EXTRACTDIR
+
+  * SVN_REPO
+
+  * SVN_REPOSITORIES
+
+  * SVN_REVISION
+
+  * TERMCAP_TYPE
+
+  * TERMINFO_DEFAULT
+
+  * TERMINFO_TYPE
+
+  * TEST
+
+  * TEST_DIRS
+
+  * TEST_ENV
+
+  * TEST_MAKE_CMD
+
+  * TEST_MAKE_FLAGS
+
+  * TEST_TARGET
+
+  * TEXLIVE_IGNORE_PATTERNS
+
+  * TEXLIVE_REV
+
+  * TEXMFSITE
+
+  * TEX_FORMATS
+
+  * TEX_HYPHEN_DAT
+
+  * TEX_HYPHEN_DEF
+
+  * TEX_TEXMF_DIRS
+
+  * THTTPD_LOG_FACILITY
+
+  * TO
+
+  * TOOLS_ALIASES
+
+  * TOOLS_ARGS
+
+  * TOOLS_BROKEN
+
+  * TOOLS_CMD
+
+  * TOOLS_CREATE
+
+  * TOOLS_DIR
+
+  * TOOLS_FAIL
+
+  * TOOLS_GNU_MISSING
+
+  * TOOLS_LDCONFIG
+
+  * TOOLS_NOOP
+
+  * TOOLS_PATH
+
+  * TOOLS_SCRIPT
+
+  * TTF_FONTDIR
+
+  * TTF_FONTS_DIR
+
+  * TYPE
+
+  * UAC_REQD_EXECS
+
+  * UCSPI_SSL_GROUP
+
+  * UCSPI_SSL_USER
+
+  * UNLIMIT_RESOURCES
+
+  * UNPRIVILEGED
+
+  * UNPRIVILEGED_GROUP
+
+  * UNPRIVILEGED_GROUPS
+
+  * UNPRIVILEGED_USER
+
+  * UNWRAP_FILES
+
+  * UNWRAP_PATTERNS
+
+  * UPDATE_GEMSPEC
+
+  * UPDATE_TARGET
+
+  * URI
+
+  * USA
+
+  * USERGROUP_PHASE
+
+  * USERPPP_GROUP
+
+  * USER_SPECIFIC_PKGS
+
+  * USE_ABI_DEPENDS
+
+  * USE_APR
+
+  * USE_BSD_MAKEFILE
+
+  * USE_BUILTIN
+
+  * USE_CROSS_COMPILE
+
+  * USE_CURSES
+
+  * USE_CWRAPPERS
+
+  * USE_DB185
+
+  * USE_FEATURES
+
+  * USE_GAMESGROUP
+
+  * USE_GCC_RUNTIME
+
+  * USE_IMAKE
+
+  * USE_JAVA
+
+  * USE_JAVA2
+
+  * USE_LANGUAGES
+
+  * USE_LIBTOOL
+
+  * USE_NATIVE_GCC
+
+  * USE_NETBSD_REPO
+
+  * USE_PKGSRC_GCC
+
+  * USE_PKGSRC_GCC_RUNTIME
+
+  * USE_PKGTASKS
+
+  * USE_RUBY_EXTCONF
+
+  * USE_RUBY_INSTALL
+
+  * USE_RUBY_SETUP
+
+  * USE_RUBY_SETUP_PKG
+
+  * USE_TOOLS
+
+  * UUCP_GROUP
+
+  * UUCP_USER
+
+  * VARBASE
+
+  * VARNAME
+
+  * VIM_EXTRA_OPTS
+
+  * WARNING_MSG
+
+  * WCALC_CGIDIR
+
+  * WCALC_CGIPATH
+
+  * WCALC_HTMLDIR
+
+  * WCALC_HTMLPATH
+
+  * WDM_MANAGERS
+
+  * WRAPPER_REORDER_CMDS
+
+  * WRKDIR
+
+  * WRKDIR_BASENAME
+
+  * WRKDIR_LOCKTYPE
+
+  * WRKLOG
+
+  * WRKOBJDIR
+
+  * WRKSRC
+
+  * WXGTK_ACCEPTED
+
+  * WXGTK_DEFAULT
+
+  * X10_PORT
+
+  * X11
+
+  * X11BASE
+
+  * X11_PKGSRCDIR
+
+  * X11_TYPE
+
+  * X509_CERTIFICATE
+
+  * X509_KEY
+
+  * XAW_TYPE
+
+  * XLOCK_DEFAULT_MODE
+
+  * XMKMF_FLAGS
+
+  * XXX
+
+  * XXXX
+
+  * YES
+
+  * ZERO_FILESIZE_P
+
+  * ZSH_STATIC
+
+  * __stdc__
+
+  * _vargroups
+
+  * add
+
+  * all
+
+  * alternatives
+
+  * aslr
+
+  * asprintf
+
+  * autoconf
+
+  * automake
+
+  * autoreconf
+
+  * awk
+
+  * bash
+
+  * big-endian
+
+  * bin-install
+
+  * binpkg-list
+
+  * bootstrap-depends
+
+  * broken
+
+  * broken_on_platform
+
+  * build
+
+  * build-env
+
+  * buildlink-directories
+
+  * buildlink-oss-soundcard-h
+
+  * c
+
+  * c++
+
+  * ccache
+
+  * cce
+
+  * cdefs
+
+  * changes
+
+  * changes-entry
+
+  * changes-entry-noupdate
+
+  * check
+
+  * check-clean
+
+  * check-files
+
+  * check-files-clean
+
+  * check-vulnerable
+
+  * checksum
+
+  * checksum-phase
+
+  * clean
+
+  * clean-depends
+
+  * cleandir
+
+  * commit
+
+  * commit-changes-entry
+
+  * compact
+
+  * compiler
+
+  * conf
+
+  * config.guess
+
+  * config.sub
+
+  * configuration
+
+  * configure
+
+  * configure-help
+
+  * configure_args
+
+  * cputime
+
+  * create-usergroup
+
+  * csh
+
+  * ctf
+
+  * cvs
+
+  * debug
+
+  * declaration
+
+  * declare
+
+  * defined
+
+  * depend
+
+  * dependencies
+
+  * depends
+
+  * depends-checksum
+
+  * depends-fetch
+
+  * describe
+
+  * destdir
+
+  * distclean
+
+  * distinfo
+
+  * dl
+
+  * dlopen
+
+  * do-build
+
+  * do-buildlink
+
+  * do-clean
+
+  * do-configure-post-hook
+
+  * do-extract
+
+  * do-fetch
+
+  * do-install
+
+  * emul
+
+  * emulation
+
+  * emulator
+
+  * endian
+
+  * enomem
+
+  * err
+
+  * errx
+
+  * etc
+
+  * feature
+
+  * features
+
+  * fetch
+
+  * fetch-list
+
+  * follows
+
+  * forbids
+
+  * form
+
+  * format
+
+  * fortify
+
+  * fortify_source
+
+  * fossil
+
+  * friend
+
+  * from
+
+  * fts
+
+  * fts_close
+
+  * fts_open
+
+  * fts_read
+
+  * fts_set
+
+  * full
+
+  * gcc
+
+  * getopt_long
+
+  * getprogname
+
+  * gettext
+
+  * git
+
+  * github
+
+  * glob
+
+  * gnu
+
+  * go
+
+  * golang
+
+  * guess-license
+
+  * hashbang
+
+  * heimdal
+
+  * help
+
+  * hg
+
+  * imake
+
+  * increment
+
+  * interp
+
+  * interpreter
+
+  * intl
+
+  * iso
+
+  * kerberos
+
+  * krb
+
+  * krb5
+
+  * ksh
+
+  * latex
+
+  * libnbcompat
+
+  * libs
+
+  * libtool
+
+  * licence
+
+  * license
+
+  * lintl
+
+  * little-endian
+
+  * lock
+
+  * locking
+
+  * lvalue
+
+  * make
+
+  * makesum
+
+  * memory
+
+  * mercurial
+
+  * meta
+
+  * meta-package
+
+  * meta_package
+
+  * mit-krb5
+
+  * mk.conf
+
+  * mount
+
+  * mprotect
+
+  * mremap
+
+  * nb
+
+  * nbcompat
+
+  * no
+
+  * obstack
+
+  * obstack_ptr_grow
+
+  * occurs
+
+  * only
+
+  * options
+
+  * options.mk
+
+  * order
+
+  * override
+
+  * override-intltool
+
+  * override-message-intltool
+
+  * package
+
+  * parallel
+
+  * partial
+
+  * path
+
+  * pax
+
+  * paxctl
+
+  * pbulk-index
+
+  * pc
+
+  * perl
+
+  * perl5
+
+  * perms
+
+  * php
+
+  * pkg-build-options
+
+  * pkg-config
+
+  * pkg_build_options
+
+  * platform
+
+  * plist
+
+  * post-extract
+
+  * post-fetch
+
+  * post-wrapper
+
+  * pre-configure
+
+  * pre-extract
+
+  * pre-fetch
+
+  * print-plist
+
+  * print-summary-data
+
+  * privileged-install-hook
+
+  * pypi
+
+  * python
+
+  * readme-all
+
+  * regcomp
+
+  * relro
+
+  * rename
+
+  * reorder
+
+  * replace
+
+  * replace_interpreter
+
+  * reproducible
+
+  * resolv
+
+  * root
+
+  * ruby
+
+  * setenv
+
+  * setgid
+
+  * setprogname
+
+  * setuid
+
+  * sh
+
+  * show
+
+  * show-all
+
+  * show-build-defs
+
+  * show-depends
+
+  * show-deps
+
+  * show-distfiles
+
+  * show-downlevel
+
+  * show-subdir-var
+
+  * show-tools
+
+  * show-var
+
+  * show-vars
+
+  * snprintf
+
+  * ssp
+
+  * st_mode
+
+  * stage-install
+
+  * strip
+
+  * strong
+
+  * subst
+
+  * subversion
+
+  * sun
+
+  * sunpro
+
+  * sunwspro
+
+  * svn
+
+  * test
+
+  * tex
+
+  * texlive
+
+  * tmp
+
+  * tool
+
+  * tools
+
+  * tools-libtool-m4-override
+
+  * type
+
+  * ulimit
+
+  * undefined
+
+  * undo-replace
+
+  * unlimit
+
+  * unprivileged
+
+  * unprivileged-install-hook
+
+  * unstripped
+
+  * update
+
+  * upload
+
+  * upload-distfiles
+
+  * usage
+
+  * use_tools
+
+  * user
+
+  * utimes
+
+  * vasprintf
+
+  * verbose
+
+  * vsnprintf
+
+  * warn
+
+  * warning
+
+  * warnings
+
+  * warnx
+
+  * weak
+
+  * work
+
+  * wrapper
+
+  * yes
+
+Appendix E. Editing guidelines for the pkgsrc guide
 
 Table of Contents
 
-D.1. Make targets
-D.2. Procedure
+E.1. Make targets
+E.2. Procedure
 
 This section contains information on editing the pkgsrc guide itself.
 
-D.1. Make targets
+E.1. Make targets
 
 The pkgsrc guide's source code is stored in pkgsrc/doc/guide/files, and several
 files are created from it:
@@ -8486,7 +11220,7 @@ files are created from it:
   * http://www.NetBSD.org/docs/pkgsrc/pkgsrc.ps: PostScript version of the
     pkgsrc guide.
 
-D.2. Procedure
+E.2. Procedure
 
 The procedure to edit the pkgsrc guide is:
 



Home | Main Index | Thread Index | Old Index