 @@ -20,28 +20,28 @@
 </h3>
 <div class="affiliation"><div class="address"><p><code class="email">&lt;<a class="email" href="mailto:agc@NetBSD.org">agc@NetBSD.org</a>&gt;</code></p></div></div>
 </div>
 <div class="author">
 <h3 class="author">
 <span class="firstname">Hubert</span> <span class="surname">Feyrer</span>
 </h3>
 <div class="affiliation"><div class="address"><p><code class="email">&lt;<a class="email" href="mailto:hubertf@NetBSD.org">hubertf@NetBSD.org</a>&gt;</code></p></div></div>
 </div>
 <h3 class="corpauthor">
         The pkgsrc Developers
       </h3>
 </div></div>
-<div><p class="copyright">Copyright © 1994-2015 The NetBSD Foundation, Inc</p></div>
+<div><p class="copyright">Copyright © 1994-2014 The NetBSD Foundation, Inc</p></div>
-<div><p class="pubdate">$NetBSD: pkgsrc.xml,v 1.28 2015/01/01 05:19:02 jnemeth Exp $</p></div>
+<div><p class="pubdate">$NetBSD: pkgsrc.xml,v 1.27 2014/09/19 04:53:09 jnemeth Exp $</p></div>
 <div><div class="abstract">
 <p class="title"><b>Abstract</b></p>
 <p>pkgsrc is a centralized package management system for
 	Unix-like operating systems. This guide provides information for
 	users and developers of pkgsrc. It covers installation of binary
 	and source packages, creation of binary and source packages and
 	a high-level overview about the infrastructure.</p>
 </div></div>
 </div>
 <hr>
 </div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 @@ -138,43 +138,44 @@ builds)
 <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="#pkgviews-docs">9.2. Where's the pkgviews documentation?</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="#faq-pkgtools">9.3. Utilities for package management (pkgtools)</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="#non-root-pkgsrc">9.4. How to use pkgsrc as non-root</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="#resume-transfers">9.5. How to resume transfers when fetching distfiles?</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="#x.org-from-pkgsrc">9.6. How can I install/use modular X.org from pkgsrc?</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="#fetch-behind-firewall">9.7. How to fetch files from behind a firewall</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="#fetch-https">9.8. How to fetch files from HTTPS sites</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="#passive-ftp">9.9. 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="#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="#fetching-all-distfiles">9.10. How to fetch all distfiles at once</a></span></dt>
 <dt><span class="sect1"><a href="#tmac.andoc-missing">9.11. 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="#bsd.own.mk-missing">9.12. 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="#using-sudo-with-pkgsrc">9.13. 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="#faq.conf">9.14. 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="#audit-packages">9.15. 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-cflags">9.16. 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="#ufaq-fail">9.17. 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="#faq.rcs-conflicts">9.18. 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>
 <dd><dl>
 <dt><span class="sect1"><a href="#creating.common">10.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.kde-app">10.1.2. KDE3 applications</a></span></dt>
 <dt><span class="sect2"><a href="#creating.python-module">10.1.3. Python modules and programs</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#creating.examples">10.2. Examples</a></span></dt>
 @@ -865,43 +866,44 @@ builds)
 <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="#pkgviews-docs">9.2. Where's the pkgviews documentation?</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="#faq-pkgtools">9.3. Utilities for package management (pkgtools)</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="#non-root-pkgsrc">9.4. How to use pkgsrc as non-root</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="#resume-transfers">9.5. How to resume transfers when fetching distfiles?</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="#x.org-from-pkgsrc">9.6. How can I install/use modular X.org from pkgsrc?</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="#fetch-behind-firewall">9.7. How to fetch files from behind a firewall</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="#fetch-https">9.8. How to fetch files from HTTPS sites</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="#passive-ftp">9.9. 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="#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="#fetching-all-distfiles">9.10. How to fetch all distfiles at once</a></span></dt>
 <dt><span class="sect1"><a href="#tmac.andoc-missing">9.11. 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="#bsd.own.mk-missing">9.12. 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="#using-sudo-with-pkgsrc">9.13. 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="#faq.conf">9.14. 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="#audit-packages">9.15. 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-cflags">9.16. 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="#ufaq-fail">9.17. 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="#faq.rcs-conflicts">9.18. 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>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl>
 <dt><span class="sect1"><a href="#getting-first">2.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>
 @@ -2849,43 +2851,44 @@ files.
 <dt><span class="term"><code class="filename">run</code></span></dt>
 <dd><p>Contains informational files about daemons that are
 currently running.</p></dd>
 </dl></div>
 </div>
 </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>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <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="#pkgviews-docs">9.2. Where's the pkgviews documentation?</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="#faq-pkgtools">9.3. Utilities for package management (pkgtools)</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="#non-root-pkgsrc">9.4. How to use pkgsrc as non-root</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="#resume-transfers">9.5. How to resume transfers when fetching distfiles?</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="#x.org-from-pkgsrc">9.6. How can I install/use modular X.org from pkgsrc?</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="#fetch-behind-firewall">9.7. How to fetch files from behind a firewall</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="#fetch-https">9.8. How to fetch files from HTTPS sites</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="#passive-ftp">9.9. 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="#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="#fetching-all-distfiles">9.10. How to fetch all distfiles at once</a></span></dt>
 <dt><span class="sect1"><a href="#tmac.andoc-missing">9.11. 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="#bsd.own.mk-missing">9.12. 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="#using-sudo-with-pkgsrc">9.13. 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="#faq.conf">9.14. 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="#audit-packages">9.15. 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-cflags">9.16. 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="#ufaq-fail">9.17. 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="#faq.rcs-conflicts">9.18. 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
 pkgsrc that we didn't find a better place for in the previous chapters, and
 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>
 <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>:
 	  This is a general purpose list for most issues regarding
 	  pkgsrc, regardless of platform, e.g. soliciting user help
 @@ -2904,27 +2907,34 @@ it contains items for both pkgsrc users
 	  also available in digest form, meaning one daily message
 	  containing all commit messages for changes to the package
 	  source tree in that 24 hour period.</p></li>
 </ul></div>
 <p>To subscribe, do:</p>
 <pre class="programlisting">
 <code class="prompt">%</code> echo subscribe <em class="replaceable"><code>listname</code></em> | mail majordomo@NetBSD.org
 </pre>
 <p>Archives for all these mailing lists are available from
 <a class="ulink" href="http://mail-index.NetBSD.org/" target="_top">http://mail-index.NetBSD.org/</a>.</p>
 </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="pkgviews-docs"></a>9.2. Where's the pkgviews documentation?</h2></div></div></div>
 <p>Pkgviews is tightly integrated with buildlink.  You can find a
 pkgviews User's guide in
 <code class="filename">pkgsrc/mk/buildlink3/PKGVIEWS_UG</code>.</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="faq-pkgtools"></a>9.3. 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 the utilities and when
 they might be useful, and not to duplicate the documentation that comes
 with each package.</p>
 <p>Utilities used by pkgsrc (automatically installed when needed):</p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/pkgtools/x11-links/README.html" target="_top"><code class="filename">pkgtools/x11-links</code></a>:
       Symlinks for use by buildlink.</p></li></ul></div>
 <p>OS tool augmentation (automatically installed when needed):</p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p><a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/pkgtools/digest/README.html" target="_top"><code class="filename">pkgtools/digest</code></a>:
       Calculates various kinds of checksums (including SHA1).</p></li>
 <li class="listitem"><p><a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/pkgtools/libnbcompat/README.html" target="_top"><code class="filename">pkgtools/libnbcompat</code></a>:
 @@ -2980,138 +2990,138 @@ etc:
       converting to pkgsrc.</p></li>
 </ul></div>
 <p>Utilities for people maintaining pkgsrc (or: more obscure pkg
 utilities)</p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p><a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/pkgtools/pkg_comp/README.html" target="_top"><code class="filename">pkgtools/pkg_comp</code></a>: Build
       packages in a chrooted area.</p></li>
 <li class="listitem"><p><a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/pkgtools/libkver/README.html" target="_top"><code class="filename">pkgtools/libkver</code></a>: Spoof
       kernel version for chrooted cross builds.</p></li>
 </ul></div>
 </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>9.4. How to use pkgsrc as non-root</h2></div></div></div>
 <p>If you want to use pkgsrc as non-root user, you can set some
 variables to make pkgsrc work under these conditions.  At the very least,
 you need to set <code class="varname">UNPRIVILEGED</code> to <span class="quote">&#8220;<span class="quote">yes</span>&#8221;</span>; this
 will turn on unprivileged mode and set multiple related variables to allow
 installation of packages as non-root.</p>
 <p>In case the defaults are not enough, you may want to tune some other
 variables used.  For example, if the automatic user/group detection leads
 to incorrect values (or not the ones you would like to use), you can change
 them by setting <code class="varname">UNPRIVILEGED_USER</code> and
 <code class="varname">UNPRIVILEGED_GROUP</code> respectively.</p>
 <p>As regards bootstrapping, please note that the
 <span class="command"><strong>bootstrap</strong></span> script will ease non-root configuration when
 given the <span class="quote">&#8220;<span class="quote">--ignore-user-check</span>&#8221;</span> flag, as it will choose and
 use multiple default directories under <code class="filename">~/pkg</code> as the
 installation targets.  These directories can be overridden by the
 <span class="quote">&#8220;<span class="quote">--prefix</span>&#8221;</span> flag provided by the script, as well as some others
 that allow finer tuning of the tree layout.</p>
 </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>9.5. 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
 <a class="link" href="#mk.conf"><code class="filename">mk.conf</code></a>.  If, during a fetch step, an incomplete
 distfile is found, pkgsrc will try to resume it.</p>
 <p>You can also
 use a different program than the platform default program by changing the
 <code class="varname">FETCH_USING</code> variable.  You can specify the program by
 using of ftp, fetch, wget or curl.  Alternatively, fetching can be disabled
 by using the value manual.  A value of custom disables the system defaults
 and dependency tracking for the fetch program.  In that case you have to
 provide <code class="varname">FETCH_CMD</code>, <code class="varname">FETCH_BEFORE_ARGS</code>,
 <code class="varname">FETCH_RESUME_ARGS</code>, <code class="varname">FETCH_OUTPUT_ARGS</code>,
 <code class="varname">FETCH_AFTER_ARGS</code>.</p>
 <p>For example, if you want to use
 <code class="filename">wget</code> to download, you'll have to use something
 like:</p>
 <pre class="programlisting">
 FETCH_USING=	wget
 </pre>
 </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>9.6. 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
 <a class="link" href="#mk.conf"><code class="filename">mk.conf</code></a>:</p>
 <pre class="programlisting">
 X11_TYPE=modular
 </pre>
 <div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Note</h3>
 <p>The DragonFly operating system defaults to using modular X.org from pkgsrc.
 </p>
 </div>
 </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>9.7. 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
 form of a URL, e.g. in Amdahl, the machine
 <span class="quote">&#8220;<span class="quote">orpheus.amdahl.com</span>&#8221;</span> is one of the firewalls, and it uses
 port 80 as the proxy port number.  So the proxy environment variables
 are:</p>
 <pre class="programlisting">
 ftp_proxy=ftp://orpheus.amdahl.com:80/
 http_proxy=http://orpheus.amdahl.com:80/
 </pre>
 </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>9.8. 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
 dependency graph).</p>
 <p>Usually you won't notice, because distribution files are
 mirrored weekly to <span class="quote">&#8220;<span class="quote">ftp.NetBSD.org</span>&#8221;</span>, but that might not
 be often enough if you are following pkgsrc-current. In that case, set
 <code class="varname">FETCH_USING</code> in your <a class="link" href="#mk.conf"><code class="filename">mk.conf</code></a> file to
 <span class="quote">&#8220;<span class="quote">curl</span>&#8221;</span> or <span class="quote">&#8220;<span class="quote">wget</span>&#8221;</span>, which are both compiled
 with HTTPS support by default. Of course, these tools need to be
 installed before you can use them this way.</p>
 </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>9.9. 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>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p><code class="filename">${LOCALBASE}/bin/ftp</code></p></li>
 <li class="listitem"><p><code class="filename">/usr/bin/ftp</code></p></li>
 </ul></div>
 <p>On a default NetBSD installation, this will be
 <code class="filename">/usr/bin/ftp</code>, which automatically tries passive
 connections first, and falls back to active connections if the server
 refuses to do passive.  For the other tools, add the following to your
 <a class="link" href="#mk.conf"><code class="filename">mk.conf</code></a> file:
 <code class="varname">PASSIVE_FETCH=1</code>.</p>
 <p>Having that option present will prevent
 <code class="filename">/usr/bin/ftp</code> from falling back to active
 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>9.10. 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>,
 but downloading the entire directory may not be appropriate.</p>
 <p>The answer here is to do a <span class="command"><strong>make fetch-list</strong></span> in
 <code class="filename">/usr/pkgsrc</code> or one of its subdirectories, carry the
 resulting list to your machine at work/school and use it there.  If you
 don't have a NetBSD-compatible <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?ftp+1+NetBSD-5.0.1+i386"><span class="citerefentry"><span class="refentrytitle">ftp</span>(1)</span></a> (like tnftp) at work, don't
 forget to set <code class="varname">FETCH_CMD</code> to something that fetches a
 URL:</p>
 <p>At home:</p>
 <pre class="screen"><code class="prompt">%</code> <strong class="userinput"><code>cd /usr/pkgsrc</code></strong>
 <code class="prompt">%</code> <strong class="userinput"><code>make fetch-list FETCH_CMD=wget DISTDIR=/tmp/distfiles &gt;/tmp/fetch.sh</code></strong>
 @@ -3123,93 +3133,93 @@ home.
 <p>If you have a machine running NetBSD, and you want to get
 <span class="emphasis"><em>all</em></span> distfiles (even ones that aren't for your
 machine architecture), you can do so by using the above-mentioned
 <span class="command"><strong>make fetch-list</strong></span> approach, or fetch the distfiles
 directly by running:</p>
 <pre class="screen"><code class="prompt">%</code> <strong class="userinput"><code>make mirror-distfiles</code></strong></pre>
 <p>If you even decide to ignore
 <code class="varname">NO_{SRC,BIN}_ON_{FTP,CDROM}</code>, then you can get everything
 by running:</p>
 <pre class="screen"><code class="prompt">%</code> <strong class="userinput"><code>make fetch NO_SKIP=yes</code></strong></pre>
 </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>9.11. 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="ftp://ftp.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
 <code class="filename">/usr/share/tmac/tmac.andoc</code>? This indicates that
 you don't have installed the <span class="quote">&#8220;<span class="quote">text</span>&#8221;</span> set (nroff, ...) from
 the NetBSD base distribution on your machine.  It is recommended to do
 that to format man pages.</p>
 <p>In the case of the <a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/pkgtools/pkg_install/README.html" target="_top"><code class="filename">pkgtools/pkg_install</code></a> package, you
 can get away with setting <code class="varname">NOMAN=YES</code> either in the
 environment or in <a class="link" href="#mk.conf"><code class="filename">mk.conf</code></a>.</p>
 </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>9.12. 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>
 <pre class="screen"><code class="prompt">#</code> <strong class="userinput"><code>cd /</code></strong>
 <code class="prompt">#</code> <strong class="userinput"><code>tar --unlink -zxvpf .../comp.tgz</code></strong></pre>
 <p><code class="filename">comp.tgz</code> is part of every NetBSD release.  Get
 the one that corresponds to your release (determine via <span class="command"><strong>uname
 -r</strong></span>).</p>
 </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>9.13. 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+NetBSD-5.0.1+i386"><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
 package can be used, which does password caching over a limited time.  To
 use it, install sudo (either as binary package or from
 <a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/security/sudo/README.html" target="_top"><code class="filename">security/sudo</code></a>) and then put the
 following into your <a class="link" href="#mk.conf"><code class="filename">mk.conf</code></a>, somewhere
 <span class="emphasis"><em>after</em></span> the definition of the
 <code class="varname">LOCALBASE</code> variable:</p>
 <pre class="programlisting">
 .if exists(${LOCALBASE}/bin/sudo)
 SU_CMD=        ${LOCALBASE}/bin/sudo /bin/sh -c
 .endif
 </pre>
 </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>9.14. 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
 be suboptimal depending on your expectations (e.g., a read-only,
 NFS-exported <code class="varname">PREFIX</code> with a need of per-machine
 configuration of the provided packages).</p>
 <p>In order to change the defaults, you can modify the
 <code class="varname">PKG_SYSCONFBASE</code> variable (in
 <a class="link" href="#mk.conf"><code class="filename">mk.conf</code></a>) to point to your preferred configuration
 directory; some common examples include <code class="filename">/etc</code> or
 <code class="filename">/etc/pkg</code>.</p>
 <p>Furthermore, you can change this value on a per-package basis by
 setting the <code class="varname">PKG_SYSCONFDIR.${PKG_SYSCONFVAR}</code> variable.
 <code class="varname">PKG_SYSCONFVAR</code>'s value usually matches the name of the
 package you would like to modify, that is, the contents of
 <code class="varname">PKGBASE</code>.</p>
 <p>Note that after changing these settings, you must rebuild and
 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>9.15. 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
 maintains a database of known-exploits to packages which have at one time
 been included in pkgsrc.  The database can be downloaded automatically, and
 a security audit of all packages installed on a system can take place.  To
 do this, refer to the following two tools (installed as part of the
 <a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/pkgtools/pkg_install/README.html" target="_top"><code class="filename">pkgtools/pkg_install</code></a> package):</p>
 <div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem">
 <p><span class="command"><strong>pkg_admin fetch-pkg-vulnerabilities</strong></span>, an easy way to
     download a list of the security vulnerabilities information.  This list
     is kept up to date by the pkgsrc security team, and is distributed
 @@ -3222,70 +3232,70 @@ do this, refer to the following two tool
     including a description of the type of vulnerability, and a URL
     containing more information.</p></li>
 </ol></div>
 <p>Use of these tools is strongly recommended!  After
 <span class="quote">&#8220;<span class="quote">pkg_install</span>&#8221;</span> is installed, please read
 the package's message, which you can get by running <strong class="userinput"><code>pkg_info -D
 pkg_install</code></strong>.</p>
 <p>If this package is installed, pkgsrc builds will use it to
 perform a security check before building any package.  See <a class="xref" href="#variables-affecting-build" title="5.2. Variables affecting the build process">Section 5.2, &#8220;Variables affecting the build process&#8221;</a> for ways to control this
 check.</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>9.16. 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
 	environment variables to the <code class="filename">./configure</code>
 	scripts and to <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?make+1+NetBSD-5.0.1+i386"><span class="citerefentry"><span class="refentrytitle">make</span>(1)</span></a>. Some package authors ignore the
 	<code class="varname">CFLAGS</code> from the environment variable by
 	overriding them in the <code class="filename">Makefile</code>s of their
 	package.</p>
 <p>Currently there is no solution to this problem. If you
 	really need the package to use your <code class="varname">CFLAGS</code>
 	you should run <span class="command"><strong>make patch</strong></span> in the package
 	directory and then inspect any <code class="filename">Makefile</code> and
 	<code class="filename">Makefile.in</code> for whether they define
 	<code class="varname">CFLAGS</code> explicitly. Usually you can remove
 	these lines. But be aware that some <span class="quote">&#8220;<span class="quote">smart</span>&#8221;</span>
 	programmers write so bad code that it only works for the
 	specific combination of <code class="varname">CFLAGS</code> they have
 	chosen.</p>
 </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>9.17. 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
 	parts, because of performance reasons. Since pkgsrc is one large
 	system, not a collection of many small systems, there are
 	sometimes changes that only work when the whole pkgsrc tree is
 	updated.</p></li>
 <li class="step"><p>Make sure that you don't have any CVS conflicts.
 	Search for <span class="quote">&#8220;<span class="quote">&lt;&lt;&lt;&lt;&lt;&lt;</span>&#8221;</span> or
 	<span class="quote">&#8220;<span class="quote">&gt;&gt;&gt;&gt;&gt;&gt;</span>&#8221;</span> in all your pkgsrc
 	files.</p></li>
 <li class="step"><p>Make sure that you don't have old copies of the packages
 	extracted. Run <span class="command"><strong>make clean clean-depends</strong></span> to
 	verify this.</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>9.18. 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
 <code class="literal">cvs</code> command marked the conflicting changes in the
 file. Because of these markers, the file is no longer a valid
 <code class="filename">Makefile</code>.</p>
 <p>Have a look at that file, and if you don't need your local changes
 anymore, you can remove that file and run <span class="command"><strong>cvs -q update
 -dP</strong></span> in that directory to download the current version.</p>
 </div>
 </div>
 </div>
 <div class="part">
 @@ -5310,31 +5320,33 @@ BUILDLINK_TREE+=	-tiff
 	    (not shown above) is a shell pipeline that
 	    outputs to stdout a list of files relative to
 	    <code class="filename">${BUILDLINK_PREFIX.<em class="replaceable"><code>pkg</code></em>}</code>.
 	    The resulting files are to be symlinked
 	    into <code class="filename">${BUILDLINK_DIR}</code>.  By default,
 	    this takes the <code class="filename">+CONTENTS</code> of a
 	    <em class="replaceable"><code>pkg</code></em> and filters it through
 	    <code class="varname">${BUILDLINK_CONTENTS_FILTER.<em class="replaceable"><code>pkg</code></em>}</code>.</p></li>
 <li class="listitem"><p><code class="varname">BUILDLINK_CONTENTS_FILTER.<em class="replaceable"><code>pkg</code></em></code>
 	    (not shown above) is a filter command that filters
 	    <code class="filename">+CONTENTS</code> input into a list of files
 	    relative to
 	    <code class="filename">${BUILDLINK_PREFIX.<em class="replaceable"><code>pkg</code></em>}</code>
-	    on stdout.  By default,
+	    on stdout.  By default for overwrite packages,
 	    <code class="varname">BUILDLINK_CONTENTS_FILTER.<em class="replaceable"><code>pkg</code></em></code>
 	    outputs the contents of the <code class="filename">include</code>
 	    and <code class="filename">lib</code> directories in the package
-	    <code class="filename">+CONTENTS</code>.</p></li>
+	    <code class="filename">+CONTENTS</code>, and for pkgviews packages,
 	    it outputs any libtool archives in
 	    <code class="filename">lib</code> directories.</p></li>
 <li class="listitem"><p><code class="varname">BUILDLINK_FNAME_TRANSFORM.<em class="replaceable"><code>pkg</code></em></code>
 	    (not shown above) is a list of sed arguments used to
 	    transform the name of the source filename into a
 	    destination filename, e.g. <span class="command"><strong>-e
 	    "s|/curses.h|/ncurses.h|g"</strong></span>.</p></li>
 </ul></div>
 <p>This section can additionally include any
       <code class="filename">buildlink3.mk</code> needed for
       <em class="replaceable"><code>pkg</code></em>'s library dependencies.
       Including these <code class="filename">buildlink3.mk</code> files
       means that the headers and libraries for these
       dependencies are also symlinked into
       <code class="filename">${BUILDLINK_DIR}</code>
 @@ -7326,67 +7338,67 @@ the name of the common tools. For exampl
 .if exists(/usr/bin/bzcat)
 TOOLS_PLATFORM.bzcat?=          /usr/bin/bzcat
 .elif exists(/usr/bin/bzip2)
 TOOLS_PLATFORM.bzcat?=          /usr/bin/bzip2 -cd
 .endif
 TOOLS_PLATFORM.true?=           true                    # shell builtin
 </pre>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="tools.questions"></a>18.4. Questions regarding the tools</h2></div></div></div>
 <div class="qandaset">
-<a name="idm77719184"></a><dl>
+<a name="idm77799312"></a><dl>
 <dt>18.4.1. <a href="#tools.new">How do I add a new tool?</a>
 </dt>
 <dt>18.4.2. <a href="#tools.listall">How do I get a list of all available
 	tools?</a>
 </dt>
 <dt>18.4.3. <a href="#tools.used">How can I get a list of all the tools that a
 	package is using while being built? I want to know whether it
 	uses sed or not.</a>
 </dt>
 </dl>
 <table border="0" style="width: 100%;">
 <colgroup>
 <col align="left" width="1%">
 <col>
 </colgroup>
 <tbody>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.new"></a><a name="idm77718800"></a><p><b>18.4.1.</b></p>
+<a name="tools.new"></a><a name="idm77798928"></a><p><b>18.4.1.</b></p>
 </td>
 <td align="left" valign="top"><p>How do I add a new tool?</p></td>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
 <td align="left" valign="top"><p>TODO</p></td>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.listall"></a><a name="idm77717776"></a><p><b>18.4.2.</b></p>
+<a name="tools.listall"></a><a name="idm77797904"></a><p><b>18.4.2.</b></p>
 </td>
 <td align="left" valign="top"><p>How do I get a list of all available
 	tools?</p></td>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
 <td align="left" valign="top"><p>TODO</p></td>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.used"></a><a name="idm77716752"></a><p><b>18.4.3.</b></p>
+<a name="tools.used"></a><a name="idm77796752"></a><p><b>18.4.3.</b></p>
 </td>
 <td align="left" valign="top"><p>How can I get a list of all the tools that a
 	package is using while being built? I want to know whether it
 	uses sed or not.</p></td>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
 <td align="left" valign="top"><p>Currently, you can't. (TODO: But I want to be able
 	to do it.)</p></td>
 </tr>
 </tbody>
 </table>
 </div>
 @@ -7882,29 +7894,40 @@ DEPENDS+=	{perl>=5.10.0,p5-version-[0
 CONFLICTS=      baz-[0-9]*
     </pre>
 <p>and in <code class="filename">pkgsrc/foo/baz/Makefile</code>:</p>
 <pre class="programlisting">
 CONFLICTS=      bar-[0-9]*
     </pre>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="not-building-packages"></a>19.1.8. 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
-    should be noted with <code class="varname">NOT_FOR_PLATFORM</code>.  If
+    should be noted with <code class="varname">BROKEN_ON_PLATFORM</code>.  If
     the package builds and runs on a small handful of platforms,
-    set <code class="varname">ONLY_FOR_PLATFORM</code> instead.
+    set <code class="varname">BROKEN_EXCEPT_ON_PLATFORM</code> instead.
     Both <code class="varname">BROKEN_ON_PLATFORM</code> and
     <code class="varname">BROKEN_EXCEPT_ON_PLATFORM</code> are OS triples
     (OS-version-platform) that can use glob-style
     wildcards.</p>
 <p>If a package is not appropriate for some platforms (as
     oopposed to merely broken), a different set of variables should be
     used as this affects failure reporting and statistics.
     If the package is appropriate for most platforms, the exceptions
     should be noted with <code class="varname">NOT_FOR_PLATFORM</code>.  If
     the package is appropriate for only a small handful of platforms
     (often exactly one), set <code class="varname">ONLY_FOR_PLATFORM</code> instead.
     Both <code class="varname">ONLY_FOR_PLATFORM</code> and
     <code class="varname">NOT_FOR_PLATFORM</code> are OS triples
     (OS-version-platform) that can use glob-style
     wildcards.</p>
 <p>Some packages are tightly bound to a specific version of an
     operating system, e.g. LKMs or <a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/sysutils/lsof/README.html" target="_top"><code class="filename">sysutils/lsof</code></a>.  Such binary packages are not
     backwards compatible with other versions of the OS, and should be
     uploaded to a version specific directory on the FTP server.  Mark
     these packages by setting <code class="varname">OSVERSION_SPECIFIC</code> to
     <span class="quote">&#8220;<span class="quote">yes</span>&#8221;</span>.  This variable is not currently used by any of
     the package system internals, but may be used in the
     future.</p>
 <p>If the package should be skipped (for example, because it
 @@ -8462,26 +8485,27 @@ pre-configure:
 /* non-BSD-specific code goes here */
 #endif
 </pre>
 <p>If this distinction is not fine enough, you can also test
 	for the following macros.</p>
 <pre class="programlisting">
 Cygwin      __CYGWIN__
 DragonFly   __DragonFly__
 FreeBSD     __FreeBSD__
 Haiku       __HAIKU__
 Interix     __INTERIX
 IRIX        __sgi (TODO: get a definite source for this)
 Linux       linux, __linux, __linux__
 Mac OS X    __APPLE__
 MirBSD      __MirBSD__ (__OpenBSD__ is also defined)
 Minix3      __minix
 NetBSD      __NetBSD__
 OpenBSD     __OpenBSD__
 Solaris     sun, __sun
 </pre>
 </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>
 <pre class="programlisting">
 i386        i386, __i386, __i386__
 MIPS        __mips
 @@ -8871,27 +8895,27 @@ PERL5_PACKLIST= auto/Pg/.packlist
 	instead of its <code class="filename">buildlink3.mk</code> file.  This
 	takes care of rebuilding the GConf database at installation and
 	deinstallation time, and tells the package where to install
 	GConf data files using some standard configure arguments.  It
 	also disallows any access to the database directly from the
 	package.</p></li>
 <li class="listitem"><p>Ensure that the package installs its
 	<code class="filename">.schemas</code> files under
 	<code class="filename">${PREFIX}/share/gconf/schemas</code>.  If they get
 	installed under <code class="filename">${PREFIX}/etc</code>, you will
 	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="9.14. How do I change the location of configuration files?">Section 9.14, &#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
 	any.  Names must not contain any directories in them.</p></li>
 <li class="listitem"><p>Define the <code class="varname">GCONF_ENTRIES</code> variable in
 	your <code class="filename">Makefile</code> with a
 	list of all <code class="filename">.entries</code> files installed by the
 	package, if any. Names must not contain any directories in
 	them.</p></li>
 </ol></div>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
 @@ -9449,27 +9473,27 @@ place.
 </li>
 </ol></div>
 </div>
 </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>
 <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="idm77169424"></a><dl>
+<a name="idm77235344"></a><dl>
 <dt>22.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
 	MAKE, GMAKE and
 	MAKE_PROGRAM?</a>
 </dt>
 <dt>22.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
 @@ -9494,157 +9518,157 @@ place.
 </dt>
 <dt>22.9. <a href="#devfaq.too-much-time">I have a little time to kill.  What shall I
 do?</a>
 </dt>
 </dl>
 <table border="0" style="width: 100%;">
 <colgroup>
 <col align="left" width="1%">
 <col>
 </colgroup>
 <tbody>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.makeflags"></a><a name="idm77169040"></a><p><b>22.1.</b></p>
+<a name="devfaq.makeflags"></a><a name="idm77234960"></a><p><b>22.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
 	<code class="varname">MAKE_FLAGS</code>?</p></td>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
 <td align="left" valign="top"><p><code class="varname">MAKEFLAGS</code> are the flags passed
 	to the pkgsrc-internal invocations of <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?make+1+NetBSD-5.0.1+i386"><span class="citerefentry"><span class="refentrytitle">make</span>(1)</span></a>, while
 	<code class="varname">MAKE_FLAGS</code> are the flags that are passed to
 	the <code class="varname">MAKE_PROGRAM</code> when building the
 	package. [FIXME: What is .MAKEFLAGS for?]</p></td>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.make"></a><a name="idm77160848"></a><p><b>22.2.</b></p>
+<a name="devfaq.make"></a><a name="idm77230992"></a><p><b>22.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
 	<code class="varname">MAKE_PROGRAM</code>?</p></td>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
 <td align="left" valign="top"><p><code class="varname">MAKE</code> is the path to the
 	<a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?make+1+NetBSD-5.0.1+i386"><span class="citerefentry"><span class="refentrytitle">make</span>(1)</span></a> program that is used in the pkgsrc
 	infrastructure. <code class="varname">GMAKE</code> is the path to GNU
 	Make, but you need to say <code class="varname">USE_TOOLS+=gmake</code> to
 	use that. <code class="varname">MAKE_PROGRAM</code> is the path to the
 	Make program that is used for building the
 	package.</p></td>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.cc"></a><a name="idm77156496"></a><p><b>22.3.</b></p>
+<a name="devfaq.cc"></a><a name="idm77226512"></a><p><b>22.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
 	<code class="varname">PKGSRC_COMPILER</code>?</p></td>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
 <td align="left" valign="top"><p><code class="varname">CC</code> is the path to the real C
 	compiler, which can be configured by the pkgsrc user.
 	<code class="varname">PKG_CC</code> is the path to the compiler wrapper.
 	<code class="varname">PKGSRC_COMPILER</code> is <span class="emphasis"><em>not</em></span> a
 	path to a compiler, but the type of compiler that should be
 	used. See <code class="filename">mk/compiler.mk</code> for more
 	information about the latter variable.</p></td>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3flags"></a><a name="idm77152272"></a><p><b>22.4.</b></p>
+<a name="devfaq.bl3flags"></a><a name="idm77222416"></a><p><b>22.4.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
 	<code class="varname">BUILDLINK_LDFLAGS</code>,
 	<code class="varname">BUILDLINK_LDADD</code> and
 	<code class="varname">BUILDLINK_LIBS</code>?</p></td>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
 <td align="left" valign="top"><p>[FIXME]</p></td>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3prefix"></a><a name="idm77150096"></a><p><b>22.5.</b></p>
+<a name="devfaq.bl3prefix"></a><a name="idm77220240"></a><p><b>22.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>
 	say it's empty?</p></td>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
 <td align="left" valign="top"><p>For optimization reasons, some variables are only
 	available in the <span class="quote">&#8220;<span class="quote">wrapper</span>&#8221;</span> phase and later. To
 	<span class="quote">&#8220;<span class="quote">simulate</span>&#8221;</span> the wrapper phase, append
 	<span class="command"><strong>PKG_PHASE=wrapper</strong></span> to the above
 	command.</p></td>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.master_sites"></a><a name="idm77147024"></a><p><b>22.6.</b></p>
+<a name="devfaq.master_sites"></a><a name="idm77208848"></a><p><b>22.6.</b></p>
 </td>
 <td align="left" valign="top"><p>What does
 	<code class="literal">${MASTER_SITE_SOURCEFORGE:=package/}</code> mean? I
 	don't understand the <code class="literal">:=</code> inside
 	it.</p></td>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
 <td align="left" valign="top"><p>The <code class="literal">:=</code> is not really an
 	assignment operator, like you might expect at first sight.
 	Instead, it is a degenerate form of
 	<code class="literal">${LIST:<em class="replaceable"><code>old_string</code></em>=<em class="replaceable"><code>new_string</code></em>}</code>,
 	which is documented in the <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?make+1+NetBSD-5.0.1+i386"><span class="citerefentry"><span class="refentrytitle">make</span>(1)</span></a> man page and which you
 	may have seen as in <code class="literal">${SRCS:.c=.o}</code>. In the
 	case of <code class="varname">MASTER_SITE_*</code>,
 	<em class="replaceable"><code>old_string</code></em> is the empty string and
 	<em class="replaceable"><code>new_string</code></em> is
 	<code class="literal">package/</code>. That's where the
 	<code class="literal">:</code> and the <code class="literal">=</code> fall
 	together.</p></td>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.mailinglists"></a><a name="idm77130768"></a><p><b>22.7.</b></p>
+<a name="devfaq.mailinglists"></a><a name="idm77200784"></a><p><b>22.7.</b></p>
 </td>
 <td align="left" valign="top"><p>Which mailing lists are there for package
 	developers?</p></td>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
 <td align="left" valign="top"><div class="variablelist"><dl class="variablelist">
 <dt><span class="term"><a class="ulink" href="http://www.NetBSD.org/mailinglists/index.html#tech-pkg" target="_top">tech-pkg</a></span></dt>
 <dd><p>This is a list for technical discussions related
 	to pkgsrc development, e.g. soliciting feedback for changes to
 	pkgsrc infrastructure, proposed new features, questions related
 	to porting pkgsrc to a new platform, advice for maintaining a
 	package, patches that affect many packages, help requests moved
 	from pkgsrc-users when an infrastructure bug is found,
 	etc.</p></dd>
 <dt><span class="term"><a class="ulink" href="http://www.NetBSD.org/mailinglists/index.html#pkgsrc-bugs" target="_top">pkgsrc-bugs</a></span></dt>
 <dd><p>All bug reports in category "pkg" sent with
 	<a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?send-pr+1+NetBSD-5.0.1+i386"><span class="citerefentry"><span class="refentrytitle">send-pr</span>(1)</span></a> appear here. Please do not report your bugs here
 	directly; use one of the other mailing
 	lists.</p></dd>
 </dl></div></td>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.documentation"></a><a name="idm77126928"></a><p><b>22.8.</b></p>
+<a name="devfaq.documentation"></a><a name="idm77197072"></a><p><b>22.8.</b></p>
 </td>
 <td align="left" valign="top"><p>Where is the pkgsrc
 	documentation?</p></td>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
 <td align="left" valign="top">
 <p>There are many places where you can find
 	documentation about pkgsrc:</p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p>The pkgsrc guide (this document) is a collection
 	of chapters that explain large parts of pkgsrc, but some
 	chapters tend to be outdated. Which ones they are is hard to
 @@ -9672,27 +9696,27 @@ do?
 	documented</span>&#8221;</span>, that is the documentation exists only in the
 	mind of the developer who wrote the code. To get this
 	information, use the <span class="command"><strong>cvs annotate</strong></span> command
 	to see who has written it and ask on the
 	<code class="literal">tech-pkg</code> mailing list, so that 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.</p></li>
 </ul></div>
 </td>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.too-much-time"></a><a name="idm77120400"></a><p><b>22.9.</b></p>
+<a name="devfaq.too-much-time"></a><a name="idm77190544"></a><p><b>22.9.</b></p>
 </td>
 <td align="left" valign="top"><p>I have a little time to kill.  What shall I
 do?</p></td>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
 <td align="left" valign="top">
 <p>This is not really an FAQ yet, but here's the answer
 anyway.</p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p>Run <span class="command"><strong>pkg_chk -N</strong></span> (from the
     <a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/pkgtools/pkg_chk/README.html" target="_top"><code class="filename">pkgtools/pkg_chk</code></a> package).  It
     will tell you about newer versions of installed packages that are

 @@ -2,29 +2,29 @@ The pkgsrc guide
 Documentation on the NetBSD packages system
 Alistair Crooks
 <agc@NetBSD.org>
 Hubert Feyrer
 <hubertf@NetBSD.org>
 The pkgsrc Developers
-Copyright   1994-2015 The NetBSD Foundation, Inc
+Copyright   1994-2014 The NetBSD Foundation, Inc
-$NetBSD: pkgsrc.xml,v 1.28 2015/01/01 05:19:02 jnemeth Exp $
+$NetBSD: pkgsrc.xml,v 1.27 2014/09/19 04:53:09 jnemeth Exp $
 Abstract
 pkgsrc is a centralized package management system for Unix-like operating
 systems. This guide provides information for users and developers of pkgsrc. It
 covers installation of binary and source packages, creation of binary and
 source packages and a high-level overview about the infrastructure.
 -------------------------------------------------------------------------------
 Table of Contents
 . What is pkgsrc?
 @@ -121,43 +121,44 @@ I. The pkgsrc user's guide
 .3. Requirements of a full bulk build
 .4. Creating a multiple CD-ROM packages collection
 .4.1. Example of cdpack
 . Directory layout of the installed files
 .1. File system layout in ${LOCALBASE}
 .2. File system layout in ${VARBASE}
 . Frequently Asked Questions
 .1. Are there any mailing lists for pkg-related discussion?
-.2. Utilities for package management (pkgtools)
+.2. Where's the pkgviews documentation?
-.3. How to use pkgsrc as non-root
+.3. Utilities for package management (pkgtools)
-.4. How to resume transfers when fetching distfiles?
+.4. How to use pkgsrc as non-root
-.5. How can I install/use modular X.org from pkgsrc?
+.5. How to resume transfers when fetching distfiles?
-.6. How to fetch files from behind a firewall
+.6. How can I install/use modular X.org from pkgsrc?
-.7. How to fetch files from HTTPS sites
+.7. How to fetch files from behind a firewall
-.8. How do I tell make fetch to do passive FTP?
+.8. How to fetch files from HTTPS sites
-.9. How to fetch all distfiles at once
+.9. How do I tell make fetch to do passive FTP?
-.10. What does "Don't know how to make /usr/share/tmac/tmac.andoc"
+.10. How to fetch all distfiles at once
 .11. What does "Don't know how to make /usr/share/tmac/tmac.andoc"
             mean?
-.11. What does "Could not find bsd.own.mk" mean?
+.12. What does "Could not find bsd.own.mk" mean?
-.12. Using 'sudo' with pkgsrc
+.13. Using 'sudo' with pkgsrc
-.13. How do I change the location of configuration files?
+.14. How do I change the location of configuration files?
-.14. Automated security checks
+.15. Automated security checks
-.15. Why do some packages ignore my CFLAGS?
+.16. Why do some packages ignore my CFLAGS?
-.16. A package does not build. What shall I do?
+.17. A package does not build. What shall I do?
-.17. What does "Makefile appears to contain unresolved cvs/rcs/???
+.18. What does "Makefile appears to contain unresolved cvs/rcs/???
             merge conflicts" mean?
 II. The pkgsrc developer's guide
 . Creating a new pkgsrc package from scratch
 .1. Common types of packages
 .1.1. Perl modules
 .1.2. KDE3 applications
 .1.3. Python modules and programs
 .2. Examples
 @@ -765,42 +766,43 @@ Table of Contents
 .3. Requirements of a full bulk build
 .4. Creating a multiple CD-ROM packages collection
 .4.1. Example of cdpack
 . Directory layout of the installed files
 .1. File system layout in ${LOCALBASE}
 .2. File system layout in ${VARBASE}
 . Frequently Asked Questions
 .1. Are there any mailing lists for pkg-related discussion?
-.2. Utilities for package management (pkgtools)
+.2. Where's the pkgviews documentation?
-.3. How to use pkgsrc as non-root
+.3. Utilities for package management (pkgtools)
-.4. How to resume transfers when fetching distfiles?
+.4. How to use pkgsrc as non-root
-.5. How can I install/use modular X.org from pkgsrc?
+.5. How to resume transfers when fetching distfiles?
-.6. How to fetch files from behind a firewall
+.6. How can I install/use modular X.org from pkgsrc?
-.7. How to fetch files from HTTPS sites
+.7. How to fetch files from behind a firewall
-.8. How do I tell make fetch to do passive FTP?
+.8. How to fetch files from HTTPS sites
-.9. How to fetch all distfiles at once
+.9. How do I tell make fetch to do passive FTP?
-.10. What does "Don't know how to make /usr/share/tmac/tmac.andoc" mean?
+.10. How to fetch all distfiles at once
-.11. What does "Could not find bsd.own.mk" mean?
+.11. What does "Don't know how to make /usr/share/tmac/tmac.andoc" mean?
-.12. Using 'sudo' with pkgsrc
+.12. What does "Could not find bsd.own.mk" mean?
-.13. How do I change the location of configuration files?
+.13. Using 'sudo' with pkgsrc
-.14. Automated security checks
+.14. How do I change the location of configuration files?
-.15. Why do some packages ignore my CFLAGS?
+.15. Automated security checks
-.16. A package does not build. What shall I do?
+.16. Why do some packages ignore my CFLAGS?
-.17. What does "Makefile appears to contain unresolved cvs/rcs/??? merge
+.17. A package does not build. What shall I do?
 .18. 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
 Table of Contents
 .1. Getting pkgsrc for the first time
 .1.1. As tar archive
 .1.2. Via anonymous CVS
 .2. Keeping pkgsrc up-to-date
 @@ -2471,42 +2473,43 @@ games
 log
     Contains log files.
 run
     Contains informational files about daemons that are currently running.
 Chapter 9. Frequently Asked Questions
 Table of Contents
 .1. Are there any mailing lists for pkg-related discussion?
-.2. Utilities for package management (pkgtools)
+.2. Where's the pkgviews documentation?
-.3. How to use pkgsrc as non-root
+.3. Utilities for package management (pkgtools)
-.4. How to resume transfers when fetching distfiles?
+.4. How to use pkgsrc as non-root
-.5. How can I install/use modular X.org from pkgsrc?
+.5. How to resume transfers when fetching distfiles?
-.6. How to fetch files from behind a firewall
+.6. How can I install/use modular X.org from pkgsrc?
-.7. How to fetch files from HTTPS sites
+.7. How to fetch files from behind a firewall
-.8. How do I tell make fetch to do passive FTP?
+.8. How to fetch files from HTTPS sites
-.9. How to fetch all distfiles at once
+.9. How do I tell make fetch to do passive FTP?
-.10. What does "Don't know how to make /usr/share/tmac/tmac.andoc" mean?
+.10. How to fetch all distfiles at once
-.11. What does "Could not find bsd.own.mk" mean?
+.11. What does "Don't know how to make /usr/share/tmac/tmac.andoc" mean?
-.12. Using 'sudo' with pkgsrc
+.12. What does "Could not find bsd.own.mk" mean?
-.13. How do I change the location of configuration files?
+.13. Using 'sudo' with pkgsrc
-.14. Automated security checks
+.14. How do I change the location of configuration files?
-.15. Why do some packages ignore my CFLAGS?
+.15. Automated security checks
-.16. A package does not build. What shall I do?
+.16. Why do some packages ignore my CFLAGS?
-.17. What does "Makefile appears to contain unresolved cvs/rcs/??? merge
+.17. A package does not build. What shall I do?
 .18. 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.
 .1. Are there any mailing lists for pkg-related discussion?
 The following mailing lists may be of interest to pkgsrc users:
   * pkgsrc-users: This is a general purpose list for most issues regarding
     pkgsrc, regardless of platform, e.g. soliciting user help for pkgsrc
     configuration, unexpected build failures, using particular packages,
 @@ -2520,27 +2523,32 @@ The following mailing lists may be of in
   * pkgsrc-changes: This list is for those who are interested in getting a
     commit message for every change committed to pkgsrc. It is also available
     in digest form, meaning one daily message containing all commit messages
     for changes to the package source tree in that 24 hour period.
 To subscribe, do:
 % echo subscribe listname | mail majordomo@NetBSD.org
 Archives for all these mailing lists are available from http://
 mail-index.NetBSD.org/.
-.2. Utilities for package management (pkgtools)
+.2. Where's the pkgviews documentation?
 Pkgviews is tightly integrated with buildlink. You can find a pkgviews User's
 guide in pkgsrc/mk/buildlink3/PKGVIEWS_UG.
 .3. 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
 aware of the utilities and when they might be useful, and not to duplicate the
 documentation that comes with each package.
 Utilities used by pkgsrc (automatically installed when needed):
   * pkgtools/x11-links: Symlinks for use by buildlink.
 OS tool augmentation (automatically installed when needed):
   * pkgtools/digest: Calculates various kinds of checksums (including SHA1).
 @@ -2588,115 +2596,115 @@ Utilities for keeping track of installed
 Utilities for people maintaining or creating individual packages:
   * pkgtools/pkgdiff: Automate making and maintaining patches for a package
     (includes pkgdiff, pkgvi, mkpatches, etc.).
   * pkgtools/url2pkg: Aids in converting to pkgsrc.
 Utilities for people maintaining pkgsrc (or: more obscure pkg utilities)
   * pkgtools/pkg_comp: Build packages in a chrooted area.
   * pkgtools/libkver: Spoof kernel version for chrooted cross builds.
-.3. How to use pkgsrc as non-root
+.4. How to use pkgsrc as non-root
 If you want to use pkgsrc as non-root user, you can set some variables to make
 pkgsrc work under these conditions. At the very least, you need to set
 UNPRIVILEGED to "yes"; this will turn on unprivileged mode and set multiple
 related variables to allow installation of packages as non-root.
 In case the defaults are not enough, you may want to tune some other variables
 used. For example, if the automatic user/group detection leads to incorrect
 values (or not the ones you would like to use), you can change them by setting
 UNPRIVILEGED_USER and UNPRIVILEGED_GROUP respectively.
 As regards bootstrapping, please note that the bootstrap script will ease
 non-root configuration when given the "--ignore-user-check" flag, as it will
 choose and use multiple default directories under ~/pkg as the installation
 targets. These directories can be overridden by the "--prefix" flag provided by
 the script, as well as some others that allow finer tuning of the tree layout.
-.4. How to resume transfers when fetching distfiles?
+.5. 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
 a fetch step, an incomplete distfile is found, pkgsrc will try to resume it.
 You can also use a different program than the platform default program by
 changing the FETCH_USING variable. You can specify the program by using of ftp,
 fetch, wget or curl. Alternatively, fetching can be disabled by using the value
 manual. A value of custom disables the system defaults and dependency tracking
 for the fetch program. In that case you have to provide FETCH_CMD,
 FETCH_BEFORE_ARGS, FETCH_RESUME_ARGS, FETCH_OUTPUT_ARGS, FETCH_AFTER_ARGS.
 For example, if you want to use wget to download, you'll have to use something
 like:
 FETCH_USING=    wget
-.5. How can I install/use modular X.org from pkgsrc?
+.6. 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
 mk.conf:
 X11_TYPE=modular
 Note
 The DragonFly operating system defaults to using modular X.org from pkgsrc.
-.6. How to fetch files from behind a firewall
+.7. 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
 is done using an environment variable in the form of a URL, e.g. in Amdahl, the
 machine "orpheus.amdahl.com" is one of the firewalls, and it uses port 80 as
 the proxy port number. So the proxy environment variables are:
 ftp_proxy=ftp://orpheus.amdahl.com:80/
 http_proxy=http://orpheus.amdahl.com:80/
-.7. How to fetch files from HTTPS sites
+.8. 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
 openssl dependency that low in the dependency graph).
 Usually you won't notice, because distribution files are mirrored weekly to "
 ftp.NetBSD.org", but that might not be often enough if you are following
 pkgsrc-current. In that case, set FETCH_USING in your mk.conf file to "curl" or
 "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.
-.8. How do I tell make fetch to do passive FTP?
+.9. 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:
   * ${LOCALBASE}/bin/ftp
   * /usr/bin/ftp
 On a default NetBSD installation, this will be /usr/bin/ftp, which
 automatically tries passive connections first, and falls back to active
 connections if the server refuses to do passive. For the other tools, add the
 following to your mk.conf file: PASSIVE_FETCH=1.
 Having that option present will prevent /usr/bin/ftp from falling back to
 active transfers.
-.9. How to fetch all distfiles at once
+.10. 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
 on ftp.NetBSD.org, but downloading the entire directory may not be appropriate.
 The answer here is to do a make fetch-list in /usr/pkgsrc or one of its
 subdirectories, carry the resulting list to your machine at work/school and use
 it there. If you don't have a NetBSD-compatible ftp(1) (like tnftp) at work,
 don't forget to set FETCH_CMD to something that fetches a URL:
 At home:
 % cd /usr/pkgsrc
 @@ -2711,81 +2719,81 @@ then tar up /tmp/distfiles and take it h
 If you have a machine running NetBSD, and you want to get all distfiles (even
 ones that aren't for your machine architecture), you can do so by using the
 above-mentioned make fetch-list approach, or fetch the distfiles directly by
 running:
 % make mirror-distfiles
 If you even decide to ignore NO_{SRC,BIN}_ON_{FTP,CDROM}, then you can get
 everything by running:
 % make fetch NO_SKIP=yes
-.10. What does "Don't know how to make /usr/share/tmac/tmac.andoc" mean?
+.11. 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
 that you don't have installed the "text" set (nroff, ...) from the NetBSD base
 distribution on your machine. It is recommended to do that to format man pages.
 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.
-.11. What does "Could not find bsd.own.mk" mean?
+.12. 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 /:
 # cd /
 # tar --unlink -zxvpf .../comp.tgz
 comp.tgz is part of every NetBSD release. Get the one that corresponds to your
 release (determine via uname -r).
-.12. Using 'sudo' with pkgsrc
+.13. 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
 required package installed. To avoid this, the sudo package can be used, which
 does password caching over a limited time. To use it, install sudo (either as
 binary package or from security/sudo) and then put the following into your
 mk.conf, somewhere after the definition of the LOCALBASE variable:
 .if exists(${LOCALBASE}/bin/sudo)
 SU_CMD=        ${LOCALBASE}/bin/sudo /bin/sh -c
 .endif
-.13. How do I change the location of configuration files?
+.14. 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
 some of its subdirectories; this may be suboptimal depending on your
 expectations (e.g., a read-only, NFS-exported PREFIX with a need of per-machine
 configuration of the provided packages).
 In order to change the defaults, you can modify the PKG_SYSCONFBASE variable
 (in mk.conf) to point to your preferred configuration directory; some common
 examples include /etc or /etc/pkg.
 Furthermore, you can change this value on a per-package basis by setting the
 PKG_SYSCONFDIR.${PKG_SYSCONFVAR} variable. PKG_SYSCONFVAR's value usually
 matches the name of the package you would like to modify, that is, the contents
 of PKGBASE.
 Note that after changing these settings, you must rebuild and reinstall any
 affected packages.
-.14. Automated security checks
+.15. 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
 an effort to lessen the exposure, the NetBSD packages team maintains a database
 of known-exploits to packages which have at one time been included in pkgsrc.
 The database can be downloaded automatically, and a security audit of all
 packages installed on a system can take place. To do this, refer to the
 following two tools (installed as part of the pkgtools/pkg_install package):
 . pkg_admin fetch-pkg-vulnerabilities, an easy way to download a list of the
     security vulnerabilities information. This list is kept up to date by the
     pkgsrc security team, and is distributed from the NetBSD ftp server:
 @@ -2794,57 +2802,57 @@ following two tools (installed as part o
 . pkg_admin audit, an easy way to audit the current machine, checking each
     known vulnerability. If a vulnerable package is installed, it will be shown
     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! After "pkg_install" is installed,
 please read the package's message, which you can get by running pkg_info -D
 pkg_install.
 If this package is installed, pkgsrc builds will use it to perform a security
 check before building any package. See Section 5.2, "Variables affecting the
 build process" for ways to control this check.
-.15. Why do some packages ignore my CFLAGS?
+.16. 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
 make(1). Some package authors ignore the CFLAGS from the environment variable
 by overriding them in the Makefiles of their package.
 Currently there is no solution to this problem. If you really need the package
 to use your CFLAGS you should run make patch in the package directory and then
 inspect any Makefile and Makefile.in for whether they define CFLAGS explicitly.
 Usually you can remove these lines. But be aware that some "smart" programmers
 write so bad code that it only works for the specific combination of CFLAGS
 they have chosen.
-.16. A package does not build. What shall I do?
+.17. A package does not build. What shall I do?
 . 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.
     Since pkgsrc is one large system, not a collection of many small systems,
     there are sometimes changes that only work when the whole pkgsrc tree is
     updated.
 . Make sure that you don't have any CVS conflicts. Search for "<<<<<<" or "
     >>>>>>" in all your pkgsrc files.
 . Make sure that you don't have old copies of the packages extracted. Run
     make clean clean-depends to verify this.
 . If the problem still exists, write a mail to the pkgsrc-users mailing list.
-.17. What does "Makefile appears to contain unresolved cvs/rcs/??? merge
+.18. 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
 file afterwards in the CVS repository. Both changes are in the same region of
 the file, so when you updated pkgsrc, the cvs command marked the conflicting
 changes in the file. Because of these markers, the file is no longer a valid
 Makefile.
 Have a look at that file, and if you don't need your local changes anymore, you
 can remove that file and run cvs -q update -dP in that directory to download
 the current version.
 Part II. The pkgsrc developer's guide
 @@ -4500,29 +4508,30 @@ symlinking:
   * BUILDLINK_FILES.pkg (not shown above) is a shell glob pattern relative to $
     {BUILDLINK_PREFIX.pkg} to be symlinked into ${BUILDLINK_DIR}, e.g. include/
     *.h.
   * BUILDLINK_FILES_CMD.pkg (not shown above) is a shell pipeline that outputs
     to stdout a list of files relative to ${BUILDLINK_PREFIX.pkg}. The
     resulting files are to be symlinked into ${BUILDLINK_DIR}. By default, this
     takes the +CONTENTS of a pkg and filters it through $
     {BUILDLINK_CONTENTS_FILTER.pkg}.
   * BUILDLINK_CONTENTS_FILTER.pkg (not shown above) is a filter command that
     filters +CONTENTS input into a list of files relative to $
-    {BUILDLINK_PREFIX.pkg} on stdout. By default, BUILDLINK_CONTENTS_FILTER.pkg
+    {BUILDLINK_PREFIX.pkg} on stdout. By default for overwrite packages,
-    outputs the contents of the include and lib directories in the package
+    BUILDLINK_CONTENTS_FILTER.pkg outputs the contents of the include and lib
-    +CONTENTS.
+    directories in the package +CONTENTS, and for pkgviews packages, it outputs
     any libtool archives in lib directories.
   * BUILDLINK_FNAME_TRANSFORM.pkg (not shown above) is a list of sed arguments
     used to transform the name of the source filename into a destination
     filename, e.g. -e "s|/curses.h|/ncurses.h|g".
 This section can additionally include any buildlink3.mk needed for pkg's
 library dependencies. Including these buildlink3.mk files means that the
 headers and libraries for these dependencies are also symlinked into $
 {BUILDLINK_DIR} whenever the pkg buildlink3.mk file is included. Dependencies
 are only added for directly include buildlink3.mk files.
 When providing a buildlink3.mk and including other buildlink3.mk files in it,
 please only add necessary ones, i.e., those whose libraries or header files are
 @@ -6605,30 +6614,38 @@ set in foo/bar/Makefile:
 CONFLICTS=      baz-[0-9]*
 and in pkgsrc/foo/baz/Makefile:
 CONFLICTS=      bar-[0-9]*
 .1.8. 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
-exceptions should be noted with NOT_FOR_PLATFORM. If the package builds and
+exceptions should be noted with BROKEN_ON_PLATFORM. If the package builds and
-runs on a small handful of platforms, set ONLY_FOR_PLATFORM instead. Both
+runs on a small handful of platforms, set BROKEN_EXCEPT_ON_PLATFORM instead.
-ONLY_FOR_PLATFORM and NOT_FOR_PLATFORM are OS triples (OS-version-platform)
+Both BROKEN_ON_PLATFORM and BROKEN_EXCEPT_ON_PLATFORM are OS triples
-that can use glob-style wildcards.
+(OS-version-platform) that can use glob-style wildcards.
 If a package is not appropriate for some platforms (as oopposed to merely
 broken), a different set of variables should be used as this affects failure
 reporting and statistics. If the package is appropriate for most platforms, the
 exceptions should be noted with NOT_FOR_PLATFORM. If the package is appropriate
 for only a small handful of platforms (often exactly one), set
 ONLY_FOR_PLATFORM instead. Both ONLY_FOR_PLATFORM and NOT_FOR_PLATFORM are OS
 triples (OS-version-platform) that can use glob-style wildcards.
 Some packages are tightly bound to a specific version of an operating system,
 e.g. LKMs or sysutils/lsof. Such binary packages are not backwards compatible
 with other versions of the OS, and should be uploaded to a version specific
 directory on the FTP server. Mark these packages by setting OSVERSION_SPECIFIC
 to "yes". This variable is not currently used by any of the package system
 internals, but may be used in the future.
 If the package should be skipped (for example, because it provides
 functionality already provided by the system), set PKG_SKIP_REASON to a
 descriptive message. If the package should fail because some preconditions are
 not met, set PKG_FAIL_REASON to a descriptive message.
 @@ -7086,26 +7103,27 @@ should use the following code.
 /* non-BSD-specific code goes here */
 #endif
 If this distinction is not fine enough, you can also test for the following
 macros.
 Cygwin      __CYGWIN__
 DragonFly   __DragonFly__
 FreeBSD     __FreeBSD__
 Haiku       __HAIKU__
 Interix     __INTERIX
 IRIX        __sgi (TODO: get a definite source for this)
 Linux       linux, __linux, __linux__
 Mac OS X    __APPLE__
 MirBSD      __MirBSD__ (__OpenBSD__ is also defined)
 Minix3      __minix
 NetBSD      __NetBSD__
 OpenBSD     __OpenBSD__
 Solaris     sun, __sun
 .5.1.2. C preprocessor macros to identify the hardware architecture
 i386        i386, __i386, __i386__
 MIPS        __mips
 SPARC       sparc, __sparc
 .5.1.3. C preprocessor macros to identify the compiler
 @@ -7367,27 +7385,27 @@ If a package installs .schemas or .entri
 take some extra steps to make sure they get registered in the database:
 . Include ../../devel/GConf/schemas.mk instead of its buildlink3.mk file.
     This takes care of rebuilding the GConf database at installation and
     deinstallation time, and tells the package where to install GConf data
     files using some standard configure arguments. It also disallows any access
     to the database directly from the package.
 . Ensure that the package installs its .schemas files under ${PREFIX}/share/
     gconf/schemas. If they get installed under ${PREFIX}/etc, you will need to
     manually patch the package.
 . 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 9.14, "How do I change the
     location of configuration files?" for more information.
 . Define the GCONF_SCHEMAS variable in your Makefile with a list of all
     .schemas files installed by the package, if any. Names must not contain any
     directories in them.
 . Define the GCONF_ENTRIES variable in your Makefile with a list of all
     .entries files installed by the package, if any. Names must not contain any
     directories in them.
 .6.10. Packages installing scrollkeeper/rarian data files
 If a package installs .omf files, used by scrollkeeper/rarian, you need to take