 @@ -72,32 +72,33 @@
 <dt><span class="sect2"><a href="#uptodate-tar">2.2.1. Via tar files</a></span></dt>
 <dt><span class="sect2"><a href="#uptodate-cvs">2.2.2. Via CVS</a></span></dt>
 </dl></dd>
 </dl></dd>
 <dt><span class="chapter"><a href="#platforms">3. Using pkgsrc on systems other than NetBSD</a></span></dt>
 <dd><dl>
 <dt><span class="sect1"><a href="#binarydist">3.1. Binary distribution</a></span></dt>
 <dt><span class="sect1"><a href="#bootstrapping-pkgsrc">3.2. Bootstrapping pkgsrc</a></span></dt>
 <dt><span class="sect1"><a href="#platform-specific-notes">3.3. Platform-specific notes</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#cygwin">3.3.1. Cygwin</a></span></dt>
 <dt><span class="sect2"><a href="#darwin">3.3.2. Darwin (Mac OS X)</a></span></dt>
 <dt><span class="sect2"><a href="#freebsd">3.3.3. FreeBSD</a></span></dt>
-<dt><span class="sect2"><a href="#interix">3.3.4. Interix</a></span></dt>
+<dt><span class="sect2"><a href="#gnukfreebsd">3.3.4. GNU/kFreeBSD</a></span></dt>
-<dt><span class="sect2"><a href="#irix">3.3.5. IRIX</a></span></dt>
+<dt><span class="sect2"><a href="#interix">3.3.5. Interix</a></span></dt>
-<dt><span class="sect2"><a href="#linux">3.3.6. Linux</a></span></dt>
+<dt><span class="sect2"><a href="#irix">3.3.6. IRIX</a></span></dt>
-<dt><span class="sect2"><a href="#mirbsd">3.3.7. MirBSD</a></span></dt>
+<dt><span class="sect2"><a href="#linux">3.3.7. Linux</a></span></dt>
-<dt><span class="sect2"><a href="#openbsd">3.3.8. OpenBSD</a></span></dt>
+<dt><span class="sect2"><a href="#mirbsd">3.3.8. MirBSD</a></span></dt>
-<dt><span class="sect2"><a href="#solaris">3.3.9. Solaris</a></span></dt>
+<dt><span class="sect2"><a href="#openbsd">3.3.9. OpenBSD</a></span></dt>
 <dt><span class="sect2"><a href="#solaris">3.3.10. Solaris</a></span></dt>
 </dl></dd>
 </dl></dd>
 <dt><span class="chapter"><a href="#using">4. Using pkgsrc</a></span></dt>
 <dd><dl>
 <dt><span class="sect1"><a href="#using-pkg">4.1. Using binary packages</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#finding-binary-packages">4.1.1. Finding binary packages</a></span></dt>
 <dt><span class="sect2"><a href="#installing-binary-packages">4.1.2. Installing binary packages</a></span></dt>
 <dt><span class="sect2"><a href="#using.pkg_delete">4.1.3. Deinstalling packages</a></span></dt>
 <dt><span class="sect2"><a href="#using.pkg_info">4.1.4. Getting information about installed packages</a></span></dt>
 <dt><span class="sect2"><a href="#vulnerabilities">4.1.5. Checking for security vulnerabilities in installed packages</a></span></dt>
 <dt><span class="sect2"><a href="#pkg_versions">4.1.6. Finding if newer versions of your installed packages are in pkgsrc</a></span></dt>
 <dt><span class="sect2"><a href="#using.pkg_admin">4.1.7. Other administrative functions</a></span></dt>
 @@ -669,26 +670,30 @@ minutes!
 </tr>
 <tr>
 <td><a class="ulink" href="http://www.mirbsd.org/" target="_top">MirBSD</a></td>
 <td align="center">Jan 2011</td>
 </tr>
 <tr>
 <td><a class="ulink" href="http://www.minix3.org/" target="_top">Minix3</a></td>
 <td align="center">Nov 2011</td>
 </tr>
 <tr>
 <td><a class="ulink" href="http://cygwin.com/" target="_top">Cygwin</a></td>
 <td align="center">Mar 2013</td>
 </tr>
 <tr>
 <td><a class="ulink" href="http://www.debian.org/ports/kfreebsd-gnu/" target="_top">GNU/kFreeBSD</a></td>
 <td align="center">Jul 2013</td>
 </tr>
 </tbody>
 </table></div>
 </div>
 <br class="table-break">
 </div>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="overview"></a>1.2.�Overview</h2></div></div></div>
 <p>This document is divided into three parts. The first,
 	<a class="link" href="#users-guide" title="Part�I.�The pkgsrc user's guide">The pkgsrc user's guide</a>,
 	describes how one can use one of the packages in the Package
 	Collection, either by installing a precompiled binary package,
 @@ -808,32 +813,33 @@ minutes!
 <dt><span class="sect2"><a href="#uptodate-tar">2.2.1. Via tar files</a></span></dt>
 <dt><span class="sect2"><a href="#uptodate-cvs">2.2.2. Via CVS</a></span></dt>
 </dl></dd>
 </dl></dd>
 <dt><span class="chapter"><a href="#platforms">3. Using pkgsrc on systems other than NetBSD</a></span></dt>
 <dd><dl>
 <dt><span class="sect1"><a href="#binarydist">3.1. Binary distribution</a></span></dt>
 <dt><span class="sect1"><a href="#bootstrapping-pkgsrc">3.2. Bootstrapping pkgsrc</a></span></dt>
 <dt><span class="sect1"><a href="#platform-specific-notes">3.3. Platform-specific notes</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#cygwin">3.3.1. Cygwin</a></span></dt>
 <dt><span class="sect2"><a href="#darwin">3.3.2. Darwin (Mac OS X)</a></span></dt>
 <dt><span class="sect2"><a href="#freebsd">3.3.3. FreeBSD</a></span></dt>
-<dt><span class="sect2"><a href="#interix">3.3.4. Interix</a></span></dt>
+<dt><span class="sect2"><a href="#gnukfreebsd">3.3.4. GNU/kFreeBSD</a></span></dt>
-<dt><span class="sect2"><a href="#irix">3.3.5. IRIX</a></span></dt>
+<dt><span class="sect2"><a href="#interix">3.3.5. Interix</a></span></dt>
-<dt><span class="sect2"><a href="#linux">3.3.6. Linux</a></span></dt>
+<dt><span class="sect2"><a href="#irix">3.3.6. IRIX</a></span></dt>
-<dt><span class="sect2"><a href="#mirbsd">3.3.7. MirBSD</a></span></dt>
+<dt><span class="sect2"><a href="#linux">3.3.7. Linux</a></span></dt>
-<dt><span class="sect2"><a href="#openbsd">3.3.8. OpenBSD</a></span></dt>
+<dt><span class="sect2"><a href="#mirbsd">3.3.8. MirBSD</a></span></dt>
-<dt><span class="sect2"><a href="#solaris">3.3.9. Solaris</a></span></dt>
+<dt><span class="sect2"><a href="#openbsd">3.3.9. OpenBSD</a></span></dt>
 <dt><span class="sect2"><a href="#solaris">3.3.10. Solaris</a></span></dt>
 </dl></dd>
 </dl></dd>
 <dt><span class="chapter"><a href="#using">4. Using pkgsrc</a></span></dt>
 <dd><dl>
 <dt><span class="sect1"><a href="#using-pkg">4.1. Using binary packages</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#finding-binary-packages">4.1.1. Finding binary packages</a></span></dt>
 <dt><span class="sect2"><a href="#installing-binary-packages">4.1.2. Installing binary packages</a></span></dt>
 <dt><span class="sect2"><a href="#using.pkg_delete">4.1.3. Deinstalling packages</a></span></dt>
 <dt><span class="sect2"><a href="#using.pkg_info">4.1.4. Getting information about installed packages</a></span></dt>
 <dt><span class="sect2"><a href="#vulnerabilities">4.1.5. Checking for security vulnerabilities in installed packages</a></span></dt>
 <dt><span class="sect2"><a href="#pkg_versions">4.1.6. Finding if newer versions of your installed packages are in pkgsrc</a></span></dt>
 <dt><span class="sect2"><a href="#using.pkg_admin">4.1.7. Other administrative functions</a></span></dt>
 @@ -1108,32 +1114,33 @@ release -d
 <div class="chapter">
 <div class="titlepage"><div><div><h2 class="title">
 <a name="platforms"></a>Chapter�3.�Using pkgsrc on systems other than NetBSD</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
 <dl>
 <dt><span class="sect1"><a href="#binarydist">3.1. Binary distribution</a></span></dt>
 <dt><span class="sect1"><a href="#bootstrapping-pkgsrc">3.2. Bootstrapping pkgsrc</a></span></dt>
 <dt><span class="sect1"><a href="#platform-specific-notes">3.3. Platform-specific notes</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#cygwin">3.3.1. Cygwin</a></span></dt>
 <dt><span class="sect2"><a href="#darwin">3.3.2. Darwin (Mac OS X)</a></span></dt>
 <dt><span class="sect2"><a href="#freebsd">3.3.3. FreeBSD</a></span></dt>
-<dt><span class="sect2"><a href="#interix">3.3.4. Interix</a></span></dt>
+<dt><span class="sect2"><a href="#gnukfreebsd">3.3.4. GNU/kFreeBSD</a></span></dt>
-<dt><span class="sect2"><a href="#irix">3.3.5. IRIX</a></span></dt>
+<dt><span class="sect2"><a href="#interix">3.3.5. Interix</a></span></dt>
-<dt><span class="sect2"><a href="#linux">3.3.6. Linux</a></span></dt>
+<dt><span class="sect2"><a href="#irix">3.3.6. IRIX</a></span></dt>
-<dt><span class="sect2"><a href="#mirbsd">3.3.7. MirBSD</a></span></dt>
+<dt><span class="sect2"><a href="#linux">3.3.7. Linux</a></span></dt>
-<dt><span class="sect2"><a href="#openbsd">3.3.8. OpenBSD</a></span></dt>
+<dt><span class="sect2"><a href="#mirbsd">3.3.8. MirBSD</a></span></dt>
-<dt><span class="sect2"><a href="#solaris">3.3.9. Solaris</a></span></dt>
+<dt><span class="sect2"><a href="#openbsd">3.3.9. OpenBSD</a></span></dt>
 <dt><span class="sect2"><a href="#solaris">3.3.10. Solaris</a></span></dt>
 </dl></dd>
 </dl>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="binarydist"></a>3.1.�Binary distribution</h2></div></div></div>
 <p>See <a class="xref" href="#using-pkg" title="4.1.�Using binary packages">Section�4.1, &#8220;Using binary packages&#8221;</a>.</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="bootstrapping-pkgsrc"></a>3.2.�Bootstrapping pkgsrc</h2></div></div></div>
 <p>pkgsrc can be bootstrapped for use in two different modes:
     privileged and unprivileged one. In unprivileged mode in contrast
 @@ -1237,45 +1244,53 @@ release -d
 <code class="prompt">#</code> <strong class="userinput"><code>mv pkg_add pkg_add.orig</code></strong>
 <code class="prompt">#</code> <strong class="userinput"><code>mv pkg_create pkg_create.orig</code></strong>
 <code class="prompt">#</code> <strong class="userinput"><code>mv pkg_delete pkg_delete.orig</code></strong>
 <code class="prompt">#</code> <strong class="userinput"><code>mv pkg_info pkg_info.orig</code></strong>
 	  </pre>
 </li>
 <li class="listitem"><p>An example <a class="link" href="#mk.conf"><code class="filename">mk.conf</code></a> file will be placed in
 	  <code class="filename">/etc/mk.conf.example</code> file
 	  when you use the bootstrap script.</p></li>
 </ol></div>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="interix"></a>3.3.4.�Interix</h3></div></div></div>
+<a name="gnukfreebsd"></a>3.3.4.�GNU/kFreeBSD</h3></div></div></div>
 <p>Debian GNU/kFreeBSD is the only GNU/kFreeBSD distribution now.
       Debian GNU/kFreeBSD 7.0 or later is tested and supported.</p>
 <p> You should install ncurses (libncurses and libncurses-dev)
       packages.</p>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="interix"></a>3.3.5.�Interix</h3></div></div></div>
 <p>Interix is a POSIX-compatible subsystem for the Windows NT kernel,
       providing a Unix-like environment with a tighter kernel integration than
       available with Cygwin.  It is part of the Windows Services for Unix
       package, available for free for any licensed copy of Windows 2000, XP
       (not including XP Home), or 2003.  SFU can be downloaded from <a class="ulink" href="http://www.microsoft.com/windows/sfu/" target="_top">http://www.microsoft.com/windows/sfu/</a>.</p>
 <p>Services for Unix 3.5 has been tested.  3.0 or 3.1 may work, but
       are not officially supported.  (The main difference in 3.0/3.1 is lack
       of pthreads, but other parts of libc may also be lacking.)</p>
 <p>Services for Unix Applications (aka SUA) is an integrated
       component of Windows Server 2003 R2 (5.2), Windows Vista and
       Windows Server 2008 (6.0), Windows 7 and Windows Server 2008 R2
       (6.1).  As of this writing, the SUA's Interix 6.0 (32bit) and
 .1 (64bit) subsystems have been tested.  Other versions may
       work as well. The Interix 5.x subsystem has not yet been tested
       with pkgsrc.</p>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="platform.interix-sfu-install"></a>3.3.4.1.�When installing Interix/SFU</h4></div></div></div>
+<a name="platform.interix-sfu-install"></a>3.3.5.1.�When installing Interix/SFU</h4></div></div></div>
 <p>At an absolute minimum, the following packages must be installed from
 	the Windows Services for Unix 3.5 distribution in order to use pkgsrc:</p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p>Utilities -&gt; Base Utilities</p></li>
 <li class="listitem"><p>Interix GNU Components -&gt; (all)</p></li>
 <li class="listitem"><p>Remote Connectivity</p></li>
 <li class="listitem"><p>Interix SDK</p></li>
 </ul></div>
 <p>When using pkgsrc on Interix, DO NOT install the Utilities subcomponent
 	"UNIX Perl".  That is Perl 5.6 without shared module support, installed to
 	/usr/local, and will only cause confusion. Instead, install Perl 5.8 from
 	pkgsrc (or from a binary package).</p>
 <p>The Remote Connectivity subcomponent "Windows Remote Shell Service" does
 @@ -1296,73 +1311,73 @@ release -d
 <p>In addition to the hotfix noted above, it may be necessary to
 	disable Data Execution Prevention entirely to make Interix functional.
 	This may happen only with certain types of CPUs; the cause is not fully
 	understood at this time.  If gcc or other applications still segfault
 	repeatedly after installing one of the hotfixes note above, the
 	following option can be added to the appropriate "boot.ini" line on the
 	Windows boot drive:  /NoExecute=AlwaysOff
 	(WARNING, this will disable DEP completely, which may be a security
 	risk if applications are often run as a user in the Administrators
 	group!)</p>
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="platform.interix-sfu-postinstall"></a>3.3.4.2.�What to do if Interix/SFU is already installed</h4></div></div></div>
+<a name="platform.interix-sfu-postinstall"></a>3.3.5.2.�What to do if Interix/SFU is already installed</h4></div></div></div>
 <p>If SFU is already installed and you wish to alter these settings to work
 	with pkgsrc, note the following things.</p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p>To uninstall UNIX Perl, use Add/Remove Programs, select Microsoft
 	    Windows Services for UNIX, then click Change.  In the installer, choose
 	    Add or Remove, then uncheck Utilities-&gt;UNIX Perl.</p></li>
 <li class="listitem">
 <p>To enable case-sensitivity for the file system, run REGEDIT.EXE, and
 	    change the following registry key:</p>
 <p>HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\kernel</p>
 <p>Set the DWORD value "obcaseinsensitive" to 0; then reboot.</p>
 </li>
 <li class="listitem">
 <p>To enable setuid binaries (optional), run REGEDIT.EXE, and change the
 	    following registry key:</p>
 <p>HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Services for UNIX</p>
 <p>Set the DWORD value "EnableSetuidBinaries" to 1; then reboot.</p>
 </li>
 </ul></div>
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="platform.interix-notes"></a>3.3.4.3.�Important notes for using pkgsrc</h4></div></div></div>
+<a name="platform.interix-notes"></a>3.3.5.3.�Important notes for using pkgsrc</h4></div></div></div>
 <p>The package manager (either the pkgsrc "su" user, or the user
 	running "pkg_add") must be a member of the local Administrators
 	group.  Such a user must also be used to run the bootstrap.  This is
 	slightly relaxed from the normal pkgsrc requirement of "root".</p>
 <p>The package manager should use a umask of 002.  "make install" will
 	automatically complain if this is not the case.  This ensures that
 	directories written in /var/db/pkg are Administrators-group writeable.</p>
 <p>The popular Interix binary packages from http://www.interopsystems.com/
 	use an older version of pkgsrc's pkg_* tools.  Ideally, these should
 	NOT be used in conjunction with pkgsrc.  If you choose to use them at
 	the same time as the pkgsrc packages, ensure that you use the proper
 	pkg_* tools for each type of binary package.</p>
 <p>The TERM setting used for DOS-type console windows (including those
 	invoked by the csh and ksh startup shortcuts) is "interix".  Most systems
 	don't have a termcap/terminfo entry for it, but the following .termcap
 	entry provides adequate emulation in most cases:</p>
 <pre class="programlisting">
 interix:kP=\E[S:kN=\E[T:kH=\E[U:dc@:DC@:tc=pcansi:
 	</pre>
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="platform.interix-limits"></a>3.3.4.4.�Limitations of the Interix platform</h4></div></div></div>
+<a name="platform.interix-limits"></a>3.3.5.4.�Limitations of the Interix platform</h4></div></div></div>
 <p>Though Interix suffices as a familiar and flexible substitute
 	for a full Unix-like platform, it has some drawbacks that should
 	be noted for those desiring to make the most of Interix.</p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p><span class="strong"><strong>X11:</strong></span></p>
 <p>Interix comes with the standard set of X11R6 client libraries,
 	  and can run X11 based applications, but it does
 	  <span class="emphasis"><em>not</em></span> come with an X server.  Some options are
 	  <a class="ulink" href="http://www.starnet.com/products/xwin32/" target="_top">StarNet X-Win32</a>,
 	  <a class="ulink" href="http://connectivity.hummingbird.com/products/nc/exceed/" target="_top">Hummingbird Exceed</a>
 	  (available in a trimmed version for Interix from Interop Systems as the
 	  <a class="ulink" href="http://www.interopsystems.com/InteropXserver.htm" target="_top">Interop X Server</a>),
 @@ -1399,46 +1414,46 @@ interix:kP=\E[S:kN=\E[T:kH=\E[U:dc@:DC@:
 </li>
 <li class="listitem">
 <p><span class="strong"><strong>Tape drives:</strong></span></p>
 <p>Due to the same limitations as for CD-ROMs and SCSI devices, tape
 	  drives are also not directly accessible in Interix.  However,
 	  support is in work to make tape drive access possible by using
 	  Cygwin as a bridge (similarly to audio bridged via Cygwin's
 	  esound server).</p>
 </li>
 </ul></div>
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="platform.interix-knownissues"></a>3.3.4.5.�Known issues for pkgsrc on Interix</h4></div></div></div>
+<a name="platform.interix-knownissues"></a>3.3.5.5.�Known issues for pkgsrc on Interix</h4></div></div></div>
 <p>It is not necessary, in general, to have a "root" user on the
 	Windows system; any member of the local Administrators group will
 	suffice.  However, some packages currently assume that the user
 	named "root" is the privileged user.  To accommodate these, you
 	may create such a user; make sure it is in the local group
 	Administrators (or your language equivalent).</p>
 <p><span class="command"><strong>pkg_add</strong></span> creates directories of mode
 , not 0775, in <code class="filename">$PKG_DBDIR</code>.  For the
 	time being, install packages as the local Administrator (or
 	your language equivalent), or run the following command after
 	installing a package to work around the issue:</p>
 <pre class="screen">
 <code class="prompt">#</code> <strong class="userinput"><code>chmod -R g+w $PKG_DBDIR</code></strong>
 	</pre>
 </div>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="irix"></a>3.3.5.�IRIX</h3></div></div></div>
+<a name="irix"></a>3.3.6.�IRIX</h3></div></div></div>
 <p>You will need a working C compiler, either gcc or SGI's MIPS and MIPSpro
       compiler (cc/c89).  Please set the <code class="varname">CC</code> environment variable
       according to your preference.  If you do not have a license for the MIPSpro
       compiler suite, you can download a gcc tardist file from <a class="ulink" href="http://freeware.sgi.com/" target="_top">http://freeware.sgi.com/</a>.</p>
 <p>Please note that you will need IRIX 6.5.17 or higher, as this is the earliest
       version of IRIX providing support for <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?if_indextoname+3+NetBSD-5.0.1+i386"><span class="citerefentry"><span class="refentrytitle">if_indextoname</span>(3)</span></a>, <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?if_nametoindex+3+NetBSD-5.0.1+i386"><span class="citerefentry"><span class="refentrytitle">if_nametoindex</span>(3)</span></a>,
       etc.</p>
 <p>At this point in time, pkgsrc only supports one ABI at a time.  That is, you cannot
 	switch between the old 32-bit ABI, the new 32-bit ABI and the 64-bit ABI.  If
 	you start out using "abi=n32", that's what all your packages will be built
 	with.</p>
 <p>Therefore, please make sure that you have no conflicting
       <code class="varname">CFLAGS</code> in your environment or the
 @@ -1463,27 +1478,27 @@ PKGSRC_COMPILER=        mipspro
       in <a class="link" href="#mk.conf"><code class="filename">mk.conf</code></a>.  Otherwise, pkgsrc will assume you
       are using gcc and may end up passing invalid flags to the compiler.  Note that
       bootstrap should create an appropriate <code class="filename">mk.conf.example</code> by
       default.</p>
 <p>If you have both the MIPSPro compiler chain installed as well as gcc,
       but want to make sure that MIPSPro is used, please set your <code class="varname">PATH</code>
       to <span class="emphasis"><em>not</em></span> include the location of gcc (often
       <code class="filename">/usr/freeware/bin</code>), and (important) pass the
       '--preserve-path' flag.</p>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="linux"></a>3.3.6.�Linux</h3></div></div></div>
+<a name="linux"></a>3.3.7.�Linux</h3></div></div></div>
 <p>Some versions of Linux (for example Debian GNU/Linux) need
       either libtermcap or libcurses (libncurses).  Installing the
       distributions libncurses-dev package (or equivalent) should fix
       the problem.</p>
 <p>pkgsrc supports both gcc (GNU Compiler Collection) and icc
       (Intel C++ Compiler). gcc is the default. icc 8.0 and 8.1 on
       i386 have been tested.</p>
 <p>To bootstrap using icc, assuming the default icc installation
       directory:</p>
 <pre class="programlisting">
 env ICCBASE=/opt/intel/cc/10.1.008 ./bootstrap --compiler=icc
       </pre>
 <div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
 @@ -1506,50 +1521,50 @@ ICCBASE=                /opt/intel/cc/10
 <p>pkgsrc uses the static linking method of the runtime libraries
       provided by icc, so binaries can be run on other systems which do not
       have the shared libraries installed.</p>
 <p>Libtool, however, extracts a list of libraries from the
       <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?ld+1+NetBSD-5.0.1+i386"><span class="citerefentry"><span class="refentrytitle">ld</span>(1)</span></a> command run when linking a C++ shared library and
       records it, throwing away the -Bstatic and -Bdynamic options
       interspersed between the libraries.  This means that
       libtool-linked C++ shared libraries will have a runtime
       dependency on the icc libraries until this is fixed in
       libtool.</p>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="mirbsd"></a>3.3.7.�MirBSD</h3></div></div></div>
+<a name="mirbsd"></a>3.3.8.�MirBSD</h3></div></div></div>
 <p>pkgsrc has been tested on MirBSD #10-current (2011 and newer).
       Older versions might also work. Releases before #10 are not
       supported.</p>
 <p>The package tools of the (older) native ports tree,
       <a class="ulink" href="//www.mirbsd.org/ports.htm" target="_top">MirPorts</a>,
       have the same names as the ones used by pkgsrc. Care should be taken
       that the right tools are used. When installing packages from source,
       use the <code class="filename">bmake</code> command for pkgsrc and
       <code class="filename">mmake</code> for MirPorts.</p>
 <p>pkgsrc and MirPorts use the same location for the package
       database, <code class="filename">/var/db/pkg</code>. It is strongly recommended
       to use <code class="filename">/usr/pkg/db</code> instead, so that the pkgsrc
       tree is self-contained. This is also the default setting used in the
       binary package builds.</p>
 <p>Binary packages for MirBSD/i386 can be found on the pkgsrc ftp
       server. The bootstrap kit there already contains the
       <span class="command"><strong>pkgin</strong></span> package manager. See the
       <a class="ulink" href="https://www.mirbsd.org/pkgsrc.htm" target="_top">pkgsrc on MirOS</a>
       page for more details.</p>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="openbsd"></a>3.3.8.�OpenBSD</h3></div></div></div>
+<a name="openbsd"></a>3.3.9.�OpenBSD</h3></div></div></div>
 <p>OpenBSD 5.1 has been tested and supported,
       other versions may work.</p>
 <p>Care should be taken so that the tools that this kit installs do not conflict
       with the OpenBSD userland tools. There are several steps:</p>
 <div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem"><p>OpenBSD stores its ports pkg database in
 	  <code class="filename">/var/db/pkg</code>. It is therefore
 	  recommended that you choose a different location (e.g.
 	  <code class="filename">/usr/pkgdb</code>) by
 	  using the --pkgdbdir option to the bootstrap script.</p></li>
 <li class="listitem">
 <p>If you do not intend to use the OpenBSD ports tools, it's probably a
 	  good idea to move them out of the way to avoid confusion, e.g.</p>
 @@ -1570,59 +1585,59 @@ ICCBASE=                /opt/intel/cc/10
 	  of the file with:</p>
 <pre class="programlisting">
 .ifdef BSD_PKG_MK
 # pkgsrc stuff, e.g. insert defaults/mk.conf or similar here
 .else
 # OpenBSD stuff
 .endif
 	  </pre>
 </li>
 </ol></div>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="solaris"></a>3.3.9.�Solaris</h3></div></div></div>
+<a name="solaris"></a>3.3.10.�Solaris</h3></div></div></div>
 <p>Solaris 2.6 through 10 are supported on both x86 and sparc.
       You will need a working C compiler. Both gcc 4.5.3 and
       Sun WorkShop 5 have been tested.</p>
 <p>The following packages are required on Solaris 8 for the bootstrap
       process and to build packages.</p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p>SUNWsprot</p></li>
 <li class="listitem"><p>SUNWarc</p></li>
 <li class="listitem"><p>SUNWbtool</p></li>
 <li class="listitem"><p>SUNWtoo</p></li>
 <li class="listitem"><p>SUNWlibm</p></li>
 </ul></div>
 <p>Please note that the use of GNU binutils on Solaris is
       <span class="emphasis"><em>not</em></span> supported, as of June 2006.</p>
 <p>Whichever compiler you use, please ensure the compiler tools and
       your $prefix are in your <code class="varname">PATH</code>. This includes
       <code class="filename">/usr/ccs/{bin,lib}</code>
       and e.g. <code class="filename">/usr/pkg/{bin,sbin}</code>.</p>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="solaris-gcc-note"></a>3.3.9.1.�If you are using gcc</h4></div></div></div>
+<a name="solaris-gcc-note"></a>3.3.10.1.�If you are using gcc</h4></div></div></div>
 <p>It makes life much simpler if you only use the same gcc consistently
 	for building all packages.</p>
 <p>It is recommended that an external gcc be used only for bootstrapping,
 	then either build gcc from
 	<a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/lang/gcc46/README.html" target="_top"><code class="filename">lang/gcc46</code></a> or install a binary gcc
 	package, then remove gcc used during bootstrapping.</p>
 <p>Binary packages of gcc can be found through <a class="ulink" href="http://www.sunfreeware.com/" target="_top">http://www.sunfreeware.com/</a>.</p>
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="solaris-sun-workshop-note"></a>3.3.9.2.�If you are using Sun WorkShop</h4></div></div></div>
+<a name="solaris-sun-workshop-note"></a>3.3.10.2.�If you are using Sun WorkShop</h4></div></div></div>
 <p>You will need at least the following packages installed (from WorkShop
 .0)</p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p>SPROcc
 	  - Sun WorkShop Compiler C 5.0</p></li>
 <li class="listitem"><p>SPROcpl
 	  - Sun WorkShop Compiler C++ 5.0</p></li>
 <li class="listitem"><p>SPROild
 	  - Sun WorkShop Incremental Linker</p></li>
 <li class="listitem"><p>SPROlang
 	  - Sun WorkShop Compilers common components</p></li>
 </ul></div>
 <p>You should set the following variables in your
 @@ -1632,43 +1647,43 @@ CC=     cc
 CXX=    CC
 CPP=    cc -E
 CXXCPP= CC -E
 </pre>
 <div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Note</h3>
 <p>The <code class="varname">CPP</code> setting might break some
 	packages that use the C preprocessor for processing things other
 	than C source code.</p>
 </div>
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="solaris-sunpro-64"></a>3.3.9.3.�Building 64-bit binaries with SunPro</h4></div></div></div>
+<a name="solaris-sunpro-64"></a>3.3.10.3.�Building 64-bit binaries with SunPro</h4></div></div></div>
 <p>To build 64-bit packages, you just need to have the
 	following lines in your <a class="link" href="#mk.conf"><code class="filename">mk.conf</code></a> file:</p>
 <pre class="programlisting">
 PKGSRC_COMPILER=        sunpro
 ABI=                    64
 </pre>
 <div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Note</h3>
 <p>This setting has been tested for the SPARC
 	architecture. Intel and AMD machines need some more
 	work.</p>
 </div>
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="plat.sunos.problems"></a>3.3.9.4.�Common problems</h4></div></div></div>
+<a name="plat.sunos.problems"></a>3.3.10.4.�Common problems</h4></div></div></div>
 <p>Sometimes, when using <span class="command"><strong>libtool</strong></span>,
       <code class="filename">/bin/ksh</code> crashes with a segmentation fault.
       The workaround is to use another shell for the configure
       scripts, for example by installing <a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/shells/bash/README.html" target="_top"><code class="filename">shells/bash</code></a> and adding the following lines
       to your <a class="link" href="#mk.conf"><code class="filename">mk.conf</code></a>:</p>
 <pre class="programlisting">
 CONFIG_SHELL=   ${LOCALBASE}/bin/bash
 WRAPPER_SHELL=  ${LOCALBASE}/bin/bash
       </pre>
 <p>Then, rebuild the <a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/devel/libtool-base/README.html" target="_top"><code class="filename">devel/libtool-base</code></a> package.</p>
 </div>
 </div>
 </div>
 @@ -7682,67 +7697,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="idp140459939576832"></a><dl>
+<a name="idm77779760"></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="idp140459939577472"></a><p><b>18.4.1.</b></p>
+<a name="tools.new"></a><a name="idm77779376"></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="idp140459939578752"></a><p><b>18.4.2.</b></p>
+<a name="tools.listall"></a><a name="idm77778352"></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="idp140459939580048"></a><p><b>18.4.3.</b></p>
+<a name="tools.used"></a><a name="idm77777200"></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>
 @@ -9785,27 +9800,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="idp140459940175040"></a><dl>
+<a name="idm77224496"></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
 @@ -9830,157 +9845,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="idp140459940175696"></a><p><b>22.1.</b></p>
+<a name="devfaq.makeflags"></a><a name="idm77224112"></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="idp140459940180160"></a><p><b>22.2.</b></p>
+<a name="devfaq.make"></a><a name="idm77220016"></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="idp140459940185184"></a><p><b>22.3.</b></p>
+<a name="devfaq.cc"></a><a name="idm77215664"></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="idp140459940190064"></a><p><b>22.4.</b></p>
+<a name="devfaq.bl3flags"></a><a name="idm77211440"></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="idp140459940192688"></a><p><b>22.5.</b></p>
+<a name="devfaq.bl3prefix"></a><a name="idm77209264"></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="idp140459940196560"></a><p><b>22.6.</b></p>
+<a name="devfaq.master_sites"></a><a name="idm77206192"></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="idp140459940206176"></a><p><b>22.7.</b></p>
+<a name="devfaq.mailinglists"></a><a name="idm77198128"></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="idp140459940211088"></a><p><b>22.8.</b></p>
+<a name="devfaq.documentation"></a><a name="idm77194288"></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
 @@ -10008,27 +10023,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="idp140459940219968"></a><p><b>22.9.</b></p>
+<a name="devfaq.too-much-time"></a><a name="idm77179568"></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

 @@ -54,32 +54,33 @@ I. The pkgsrc user's guide
 .2.1. Via tar files
 .2.2. Via CVS
 . Using pkgsrc on systems other than NetBSD
 .1. Binary distribution
 .2. Bootstrapping pkgsrc
 .3. Platform-specific notes
 .3.1. Cygwin
 .3.2. Darwin (Mac OS X)
 .3.3. FreeBSD
-.3.4. Interix
+.3.4. GNU/kFreeBSD
-.3.5. IRIX
+.3.5. Interix
-.3.6. Linux
+.3.6. IRIX
-.3.7. MirBSD
+.3.7. Linux
-.3.8. OpenBSD
+.3.8. MirBSD
-.3.9. Solaris
+.3.9. OpenBSD
 .3.10. Solaris
 . Using pkgsrc
 .1. Using binary packages
 .1.1. Finding binary packages
 .1.2. Installing binary packages
 .1.3. Deinstalling packages
 .1.4. Getting information about installed packages
 .1.5. Checking for security vulnerabilities in installed packages
 .1.6. Finding if newer versions of your installed packages are in
                 pkgsrc
 .1.7. Other administrative functions
 @@ -586,26 +587,28 @@ Table 1.1. Platforms supported by pkgsrc
 |DragonFlyBSD                                 |     Oct 2004     |
 |---------------------------------------------+------------------|
 |OSF/1                                        |     Nov 2004     |
 |---------------------------------------------+------------------|
 |HP-UX                                        |     Apr 2007     |
 |---------------------------------------------+------------------|
 |Haiku                                        |     Sep 2010     |
 |---------------------------------------------+------------------|
 |MirBSD                                       |     Jan 2011     |
 |---------------------------------------------+------------------|
 |Minix3                                       |     Nov 2011     |
 |---------------------------------------------+------------------|
 |Cygwin                                       |     Mar 2013     |
 |---------------------------------------------+------------------|
 |GNU/kFreeBSD                                 |     Jul 2013     |
 +----------------------------------------------------------------+
 .2. Overview
 This document is divided into three parts. The first, The pkgsrc user's guide,
 describes how one can use one of the packages in the Package Collection, either
 by installing a precompiled binary package, or by building one's own copy using
 the NetBSD package system. The second part, The pkgsrc developer's guide,
 explains how to prepare a package so it can be easily built by other NetBSD
 users without knowing about the package's building details. The third part, The
 pkgsrc infrastructure internals is intended for those who want to understand
 how pkgsrc is implemented.
 @@ -707,32 +710,33 @@ Table of Contents
 .2.1. Via tar files
 .2.2. Via CVS
 . Using pkgsrc on systems other than NetBSD
 .1. Binary distribution
 .2. Bootstrapping pkgsrc
 .3. Platform-specific notes
 .3.1. Cygwin
 .3.2. Darwin (Mac OS X)
 .3.3. FreeBSD
-.3.4. Interix
+.3.4. GNU/kFreeBSD
-.3.5. IRIX
+.3.5. Interix
-.3.6. Linux
+.3.6. IRIX
-.3.7. MirBSD
+.3.7. Linux
-.3.8. OpenBSD
+.3.8. MirBSD
-.3.9. Solaris
+.3.9. OpenBSD
 .3.10. Solaris
 . Using pkgsrc
 .1. Using binary packages
 .1.1. Finding binary packages
 .1.2. Installing binary packages
 .1.3. Deinstalling packages
 .1.4. Getting information about installed packages
 .1.5. Checking for security vulnerabilities in installed packages
 .1.6. Finding if newer versions of your installed packages are in
             pkgsrc
 .1.7. Other administrative functions
 @@ -990,32 +994,33 @@ later updates will try to merge your cha
 others. See the CVS manual, chapter "update" for details.
 Chapter 3. Using pkgsrc on systems other than NetBSD
 Table of Contents
 .1. Binary distribution
 .2. Bootstrapping pkgsrc
 .3. Platform-specific notes
 .3.1. Cygwin
 .3.2. Darwin (Mac OS X)
 .3.3. FreeBSD
-.3.4. Interix
+.3.4. GNU/kFreeBSD
-.3.5. IRIX
+.3.5. Interix
-.3.6. Linux
+.3.6. IRIX
-.3.7. MirBSD
+.3.7. Linux
-.3.8. OpenBSD
+.3.8. MirBSD
-.3.9. Solaris
+.3.9. OpenBSD
 .3.10. Solaris
 .1. Binary distribution
 See Section 4.1, "Using binary packages".
 .2. Bootstrapping pkgsrc
 pkgsrc can be bootstrapped for use in two different modes: privileged and
 unprivileged one. In unprivileged mode in contrast to privileged one all
 programs are installed under one particular user and cannot utilise privileged
 operations (packages don't create special users and all special file
 permissions like setuid are ignored).
 @@ -1096,45 +1101,52 @@ with the FreeBSD userland tools. There a
 . If you do not intend to use the FreeBSD ports tools, it's probably a good
     idea to move them out of the way to avoid confusion, e.g.
     # cd /usr/sbin
     # mv pkg_add pkg_add.orig
     # mv pkg_create pkg_create.orig
     # mv pkg_delete pkg_delete.orig
     # mv pkg_info pkg_info.orig
 . An example mk.conf file will be placed in /etc/mk.conf.example file when
     you use the bootstrap script.
-.3.4. Interix
+.3.4. GNU/kFreeBSD
 Debian GNU/kFreeBSD is the only GNU/kFreeBSD distribution now. Debian GNU/
 kFreeBSD 7.0 or later is tested and supported.
 You should install ncurses (libncurses and libncurses-dev) packages.
 .3.5. Interix
 Interix is a POSIX-compatible subsystem for the Windows NT kernel, providing a
 Unix-like environment with a tighter kernel integration than available with
 Cygwin. It is part of the Windows Services for Unix package, available for free
 for any licensed copy of Windows 2000, XP (not including XP Home), or 2003. SFU
 can be downloaded from http://www.microsoft.com/windows/sfu/.
 Services for Unix 3.5 has been tested. 3.0 or 3.1 may work, but are not
 officially supported. (The main difference in 3.0/3.1 is lack of pthreads, but
 other parts of libc may also be lacking.)
 Services for Unix Applications (aka SUA) is an integrated component of Windows
 Server 2003 R2 (5.2), Windows Vista and Windows Server 2008 (6.0), Windows 7
 and Windows Server 2008 R2 (6.1). As of this writing, the SUA's Interix 6.0
 (32bit) and 6.1 (64bit) subsystems have been tested. Other versions may work as
 well. The Interix 5.x subsystem has not yet been tested with pkgsrc.
-.3.4.1. When installing Interix/SFU
+.3.5.1. When installing Interix/SFU
 At an absolute minimum, the following packages must be installed from the
 Windows Services for Unix 3.5 distribution in order to use pkgsrc:
   * Utilities -> Base Utilities
   * Interix GNU Components -> (all)
   * Remote Connectivity
   * Interix SDK
 When using pkgsrc on Interix, DO NOT install the Utilities subcomponent "UNIX
 @@ -1158,75 +1170,75 @@ PSXRUN.EXE, and PSXSS.EXE (899522 or new
 available from Microsoft through a support contract; however, Debian Interix
 Port has made most Interix hotfixes available for personal use from http://
 www.debian-interix.net/hotfixes/.
 In addition to the hotfix noted above, it may be necessary to disable Data
 Execution Prevention entirely to make Interix functional. This may happen only
 with certain types of CPUs; the cause is not fully understood at this time. If
 gcc or other applications still segfault repeatedly after installing one of the
 hotfixes note above, the following option can be added to the appropriate
 "boot.ini" line on the Windows boot drive: /NoExecute=AlwaysOff (WARNING, this
 will disable DEP completely, which may be a security risk if applications are
 often run as a user in the Administrators group!)
-.3.4.2. What to do if Interix/SFU is already installed
+.3.5.2. What to do if Interix/SFU is already installed
 If SFU is already installed and you wish to alter these settings to work with
 pkgsrc, note the following things.
   * To uninstall UNIX Perl, use Add/Remove Programs, select Microsoft Windows
     Services for UNIX, then click Change. In the installer, choose Add or
     Remove, then uncheck Utilities->UNIX Perl.
   * To enable case-sensitivity for the file system, run REGEDIT.EXE, and change
     the following registry key:
     HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\kernel
     Set the DWORD value "obcaseinsensitive" to 0; then reboot.
   * To enable setuid binaries (optional), run REGEDIT.EXE, and change the
     following registry key:
     HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Services for UNIX
     Set the DWORD value "EnableSetuidBinaries" to 1; then reboot.
-.3.4.3. Important notes for using pkgsrc
+.3.5.3. Important notes for using pkgsrc
 The package manager (either the pkgsrc "su" user, or the user running
 "pkg_add") must be a member of the local Administrators group. Such a user must
 also be used to run the bootstrap. This is slightly relaxed from the normal
 pkgsrc requirement of "root".
 The package manager should use a umask of 002. "make install" will
 automatically complain if this is not the case. This ensures that directories
 written in /var/db/pkg are Administrators-group writeable.
 The popular Interix binary packages from http://www.interopsystems.com/ use an
 older version of pkgsrc's pkg_* tools. Ideally, these should NOT be used in
 conjunction with pkgsrc. If you choose to use them at the same time as the
 pkgsrc packages, ensure that you use the proper pkg_* tools for each type of
 binary package.
 The TERM setting used for DOS-type console windows (including those invoked by
 the csh and ksh startup shortcuts) is "interix". Most systems don't have a
 termcap/terminfo entry for it, but the following .termcap entry provides
 adequate emulation in most cases:
 interix:kP=\E[S:kN=\E[T:kH=\E[U:dc@:DC@:tc=pcansi:
-.3.4.4. Limitations of the Interix platform
+.3.5.4. Limitations of the Interix platform
 Though Interix suffices as a familiar and flexible substitute for a full
 Unix-like platform, it has some drawbacks that should be noted for those
 desiring to make the most of Interix.
   * X11:
     Interix comes with the standard set of X11R6 client libraries, and can run
     X11 based applications, but it does not come with an X server. Some options
     are StarNet X-Win32, Hummingbird Exceed (available in a trimmed version for
     Interix from Interop Systems as the Interop X Server), and the free X11
     server included with Cygwin.
 @@ -1250,43 +1262,43 @@ desiring to make the most of Interix.
     Direct device access is not currently supported in Interix, so it is not
     currently possible to access CD/DVD drives, USB devices, or SCSI devices
     through non-filesystem means. Among other things, this makes it impossible
     to use Interix directly for CD/DVD burning.
   * Tape drives:
     Due to the same limitations as for CD-ROMs and SCSI devices, tape drives
     are also not directly accessible in Interix. However, support is in work to
     make tape drive access possible by using Cygwin as a bridge (similarly to
     audio bridged via Cygwin's esound server).
-.3.4.5. Known issues for pkgsrc on Interix
+.3.5.5. Known issues for pkgsrc on Interix
 It is not necessary, in general, to have a "root" user on the Windows system;
 any member of the local Administrators group will suffice. However, some
 packages currently assume that the user named "root" is the privileged user. To
 accommodate these, you may create such a user; make sure it is in the local
 group Administrators (or your language equivalent).
 pkg_add creates directories of mode 0755, not 0775, in $PKG_DBDIR. For the time
 being, install packages as the local Administrator (or your language
 equivalent), or run the following command after installing a package to work
 around the issue:
 # chmod -R g+w $PKG_DBDIR
-.3.5. IRIX
+.3.6. IRIX
 You will need a working C compiler, either gcc or SGI's MIPS and MIPSpro
 compiler (cc/c89). Please set the CC environment variable according to your
 preference. If you do not have a license for the MIPSpro compiler suite, you
 can download a gcc tardist file from http://freeware.sgi.com/.
 Please note that you will need IRIX 6.5.17 or higher, as this is the earliest
 version of IRIX providing support for if_indextoname(3), if_nametoindex(3),
 etc.
 At this point in time, pkgsrc only supports one ABI at a time. That is, you
 cannot switch between the old 32-bit ABI, the new 32-bit ABI and the 64-bit
 ABI. If you start out using "abi=n32", that's what all your packages will be
 @@ -1310,27 +1322,27 @@ If you are using SGI's MIPSPro compiler,
 PKGSRC_COMPILER=        mipspro
 in mk.conf. Otherwise, pkgsrc will assume you are using gcc and may end up
 passing invalid flags to the compiler. Note that bootstrap should create an
 appropriate mk.conf.example by default.
 If you have both the MIPSPro compiler chain installed as well as gcc, but want
 to make sure that MIPSPro is used, please set your PATH to not include the
 location of gcc (often /usr/freeware/bin), and (important) pass the
 '--preserve-path' flag.
-.3.6. Linux
+.3.7. Linux
 Some versions of Linux (for example Debian GNU/Linux) need either libtermcap or
 libcurses (libncurses). Installing the distributions libncurses-dev package (or
 equivalent) should fix the problem.
 pkgsrc supports both gcc (GNU Compiler Collection) and icc (Intel C++
 Compiler). gcc is the default. icc 8.0 and 8.1 on i386 have been tested.
 To bootstrap using icc, assuming the default icc installation directory:
 env ICCBASE=/opt/intel/cc/10.1.008 ./bootstrap --compiler=icc
 @@ -1352,46 +1364,46 @@ The pkgsrc default for ICCBASE is /opt/i
 directory for icc 8.0. If you are using a more recent version, be sure to set
 the correct path explicitly.
 pkgsrc uses the static linking method of the runtime libraries provided by icc,
 so binaries can be run on other systems which do not have the shared libraries
 installed.
 Libtool, however, extracts a list of libraries from the ld(1) command run when
 linking a C++ shared library and records it, throwing away the -Bstatic and
 -Bdynamic options interspersed between the libraries. This means that
 libtool-linked C++ shared libraries will have a runtime dependency on the icc
 libraries until this is fixed in libtool.
-.3.7. MirBSD
+.3.8. MirBSD
 pkgsrc has been tested on MirBSD #10-current (2011 and newer). Older versions
 might also work. Releases before #10 are not supported.
 The package tools of the (older) native ports tree, MirPorts, have the same
 names as the ones used by pkgsrc. Care should be taken that the right tools are
 used. When installing packages from source, use the bmake command for pkgsrc
 and mmake for MirPorts.
 pkgsrc and MirPorts use the same location for the package database, /var/db/
 pkg. It is strongly recommended to use /usr/pkg/db instead, so that the pkgsrc
 tree is self-contained. This is also the default setting used in the binary
 package builds.
 Binary packages for MirBSD/i386 can be found on the pkgsrc ftp server. The
 bootstrap kit there already contains the pkgin package manager. See the pkgsrc
 on MirOS page for more details.
-.3.8. OpenBSD
+.3.9. OpenBSD
 OpenBSD 5.1 has been tested and supported, other versions may work.
 Care should be taken so that the tools that this kit installs do not conflict
 with the OpenBSD userland tools. There are several steps:
 . OpenBSD stores its ports pkg database in /var/db/pkg. It is therefore
     recommended that you choose a different location (e.g. /usr/pkgdb) by using
     the --pkgdbdir option to the bootstrap script.
 . If you do not intend to use the OpenBSD ports tools, it's probably a good
     idea to move them out of the way to avoid confusion, e.g.
 @@ -1404,100 +1416,100 @@ with the OpenBSD userland tools. There a
 . An example mk.conf file will be placed in /etc/mk.conf.example file when
     you use the bootstrap script. OpenBSD's make program uses mk.conf as well.
     You can work around this by enclosing all the pkgsrc-specific parts of the
     file with:
     .ifdef BSD_PKG_MK
     # pkgsrc stuff, e.g. insert defaults/mk.conf or similar here
     .else
     # OpenBSD stuff
     .endif
-.3.9. Solaris
+.3.10. Solaris
 Solaris 2.6 through 10 are supported on both x86 and sparc. You will need a
 working C compiler. Both gcc 4.5.3 and Sun WorkShop 5 have been tested.
 The following packages are required on Solaris 8 for the bootstrap process and
 to build packages.
   * SUNWsprot
   * SUNWarc
   * SUNWbtool
   * SUNWtoo
   * SUNWlibm
 Please note that the use of GNU binutils on Solaris is not supported, as of
 June 2006.
 Whichever compiler you use, please ensure the compiler tools and your $prefix
 are in your PATH. This includes /usr/ccs/{bin,lib} and e.g. /usr/pkg/
 {bin,sbin}.
-.3.9.1. If you are using gcc
+.3.10.1. If you are using gcc
 It makes life much simpler if you only use the same gcc consistently for
 building all packages.
 It is recommended that an external gcc be used only for bootstrapping, then
 either build gcc from lang/gcc46 or install a binary gcc package, then remove
 gcc used during bootstrapping.
 Binary packages of gcc can be found through http://www.sunfreeware.com/.
-.3.9.2. If you are using Sun WorkShop
+.3.10.2. If you are using Sun WorkShop
 You will need at least the following packages installed (from WorkShop 5.0)
   * SPROcc - Sun WorkShop Compiler C 5.0
   * SPROcpl - Sun WorkShop Compiler C++ 5.0
   * SPROild - Sun WorkShop Incremental Linker
   * SPROlang - Sun WorkShop Compilers common components
 You should set the following variables in your mk.conf file:
 CC=     cc
 CXX=    CC
 CPP=    cc -E
 CXXCPP= CC -E
 Note
 The CPP setting might break some packages that use the C preprocessor for
 processing things other than C source code.
-.3.9.3. Building 64-bit binaries with SunPro
+.3.10.3. Building 64-bit binaries with SunPro
 To build 64-bit packages, you just need to have the following lines in your
 mk.conf file:
 PKGSRC_COMPILER=        sunpro
 ABI=                    64
 Note
 This setting has been tested for the SPARC architecture. Intel and AMD machines
 need some more work.
-.3.9.4. Common problems
+.3.10.4. Common problems
 Sometimes, when using libtool, /bin/ksh crashes with a segmentation fault. The
 workaround is to use another shell for the configure scripts, for example by
 installing shells/bash and adding the following lines to your mk.conf:
 CONFIG_SHELL=   ${LOCALBASE}/bin/bash
 WRAPPER_SHELL=  ${LOCALBASE}/bin/bash
 Then, rebuild the devel/libtool-base package.
 Chapter 4. Using pkgsrc