regen

1 files changed, 59 insertions, 88 deletions

diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html
index 54ea6405cd2..1bbd8b01dfd 100644
--- a/doc/pkgsrc.html
+++ b/doc/pkgsrc.html
@@ -45,7 +45,7 @@
 </div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="chapter"><a href="#introduction">1. What is pkgsrc?</a></span></dt>
 <dd><dl>
 <dt><span class="sect1"><a href="#introduction-section">1.1. Introduction</a></span></dt>
@@ -484,7 +484,7 @@ source packages</a></span></dt>
 <a name="introduction"></a>Chapter 1. What is pkgsrc?</h1></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="sect1"><a href="#introduction-section">1.1. Introduction</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#why-pkgsrc">1.1.1. Why pkgsrc?</a></span></dt>
@@ -695,6 +695,11 @@ minutes!</p>
 <td align="center">Jul 2013</td>
 <td><a class="ulink" href="http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/bootstrap/README.GNUkFreeBSD" target="_top">README.GNUkFreeBSD</a></td>
 </tr>
+<tr>
+<td><a class="ulink" href="http://www.bitrig.org/" target="_top">Bitrig</a></td>
+<td align="center">Jun 2014</td>
+<td><a class="ulink" href="http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/bootstrap/README.Bitrig" target="_top">README.Bitrig</a></td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -811,7 +816,7 @@ minutes!</p>
 <a name="users-guide"></a>Part I. The pkgsrc user's guide</h1></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="chapter"><a href="#getting">2. Where to get pkgsrc and how to keep it up-to-date</a></span></dt>
 <dd><dl>
 <dt><span class="sect1"><a href="#getting-first">2.1. Getting pkgsrc for the first time</a></span></dt>
@@ -925,7 +930,7 @@ builds)</a></span></dt>
 <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 class="toc">
+<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>
@@ -1111,7 +1116,7 @@ release -d
 <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 class="toc">
+<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>
@@ -1688,7 +1693,7 @@ WRAPPER_SHELL=  ${LOCALBASE}/bin/bash
 <a name="using"></a>Chapter 4. Using pkgsrc</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<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>
@@ -2125,7 +2130,7 @@ Version mismatch: 'tcsh' 6.09.00 vs 6.10.00
 <a name="configuring"></a>Chapter 5. Configuring pkgsrc</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="sect1"><a href="#general-configuration">5.1. General configuration</a></span></dt>
 <dt><span class="sect1"><a href="#variables-affecting-build">5.2. Variables affecting the build process</a></span></dt>
 <dt><span class="sect1"><a href="#variables-affecting-installation">5.3. Variables affecting the installation process</a></span></dt>
@@ -2519,7 +2524,7 @@ PKG_OPTIONS.apache=     suexec </pre>
 <a name="binary"></a>Chapter 6. Creating binary packages</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="sect1"><a href="#building-a-single-binary-package">6.1. Building a single binary package</a></span></dt>
 <dt><span class="sect1"><a href="#settings-for-creationg-of-binary-packages">6.2. Settings for creation of binary packages</a></span></dt>
 </dl>
@@ -2562,7 +2567,7 @@ PKG_OPTIONS.apache=     suexec </pre>
 builds)</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="sect1"><a href="#bulk.pre">7.1. Preparations</a></span></dt>
 <dt><span class="sect1"><a href="#bulk.pbulk">7.2. Running a pbulk-style bulk build</a></span></dt>
 <dd><dl><dt><span class="sect2"><a href="#bulk.pbulk.conf">7.2.1. Configuration</a></span></dt></dl></dd>
@@ -2741,7 +2746,7 @@ temporary filesystems, others must survive a sudden reboot.</p>
 <a name="files"></a>Chapter 8. Directory layout of the installed files</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<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>
@@ -2882,7 +2887,7 @@ currently running.</p></dd>
 <a name="faq"></a>Chapter 9. Frequently Asked Questions</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="sect1"><a href="#mailing-list-pointers">9.1. Are there any mailing lists for pkg-related discussion?</a></span></dt>
 <dt><span class="sect1"><a href="#faq-pkgtools">9.2. Utilities for package management (pkgtools)</a></span></dt>
 <dt><span class="sect1"><a href="#non-root-pkgsrc">9.3. How to use pkgsrc as non-root</a></span></dt>
@@ -3324,7 +3329,7 @@ anymore, you can remove that file and run <span class="command"><strong>cvs -q u
 	like a reference manual for pkgsrc.</p>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<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>
@@ -3559,7 +3564,7 @@ anymore, you can remove that file and run <span class="command"><strong>cvs -q u
 <a name="creating"></a>Chapter 10. Creating a new pkgsrc package from scratch</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<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>
@@ -3958,7 +3963,7 @@ everything worked.</p>
 <a name="components"></a>Chapter 11. Package components - files, directories and contents</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="sect1"><a href="#components.Makefile">11.1. <code class="filename">Makefile</code></a></span></dt>
 <dt><span class="sect1"><a href="#components.distinfo">11.2. <code class="filename">distinfo</code></a></span></dt>
 <dt><span class="sect1"><a href="#components.patches">11.3. patches/*</a></span></dt>
@@ -4460,8 +4465,7 @@ MESSAGE_SUBST+=  SOMEVAR="somevalue"
 	    <code class="filename">MESSAGE</code>.  By default, substitution is
 	    performed for <code class="varname">PKGNAME</code>,
 	    <code class="varname">PKGBASE</code>, <code class="varname">PREFIX</code>,
-	    <code class="varname">LOCALBASE</code>, <code class="varname">X11PREFIX</code>,
-	    <code class="varname">X11BASE</code>,
+	    <code class="varname">LOCALBASE</code>, <code class="varname">X11BASE</code>,
 	    <code class="varname">PKG_SYSCONFDIR</code>,
 	    <code class="varname">ROOT_GROUP</code>, and
 	    <code class="varname">ROOT_USER</code>.</p>
@@ -4566,7 +4570,7 @@ FILESDIR=${.CURDIR}/../xemacs/files
 <a name="makefile"></a>Chapter 12. Programming in <code class="filename">Makefile</code>s</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="sect1"><a href="#makefile.style">12.1. Caveats</a></span></dt>
 <dt><span class="sect1"><a href="#makefile.variables">12.2. <code class="filename">Makefile</code> variables</a></span></dt>
 <dd><dl><dt><span class="sect2"><a href="#makefile.variables.names">12.2.1. Naming conventions</a></span></dt></dl></dd>
@@ -4892,7 +4896,7 @@ VAR:=   ${VAR:N${_othervar_:C/-//}}
 <a name="plist"></a>Chapter 13. PLIST issues</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="sect1"><a href="#rcs-id">13.1. RCS ID</a></span></dt>
 <dt><span class="sect1"><a href="#automatic-plist-generation">13.2. Semi-automatic <code class="filename">PLIST</code> generation</a></span></dt>
 <dt><span class="sect1"><a href="#print-PLIST">13.3. Tweaking output of <span class="command"><strong>make print-PLIST</strong></span></a></span></dt>
@@ -5112,7 +5116,7 @@ ${PLIST.foo}share/bar/foo.data
 <a name="buildlink"></a>Chapter 14. Buildlink methodology</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="sect1"><a href="#converting-to-buildlink3">14.1. Converting packages to use buildlink3</a></span></dt>
 <dt><span class="sect1"><a href="#creating-buildlink3.mk">14.2. Writing <code class="filename">buildlink3.mk</code> files</a></span></dt>
 <dd><dl>
@@ -5600,7 +5604,7 @@ PREFER_NATIVE=  getopt skey tcp_wrappers
 <a name="pkginstall"></a>Chapter 15. The pkginstall framework</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="sect1"><a href="#files-and-dirs-outside-prefix">15.1. Files and directories outside the installation prefix</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#dirs-outside-prefix">15.1.1. Directory manipulation</a></span></dt>
@@ -6003,7 +6007,7 @@ environment variable to <code class="literal">NO</code>.</p>
 <a name="options"></a>Chapter 16. Options handling</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="sect1"><a href="#global-default-options">16.1. Global default options</a></span></dt>
 <dt><span class="sect1"><a href="#converting-to-options">16.2. Converting packages to use <code class="filename">bsd.options.mk</code></a></span></dt>
 <dt><span class="sect1"><a href="#option-names">16.3. Option Names</a></span></dt>
@@ -6244,7 +6248,7 @@ details.</p>
 <a name="build"></a>Chapter 17. The build process</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="sect1"><a href="#build.intro">17.1. Introduction</a></span></dt>
 <dt><span class="sect1"><a href="#build.prefix">17.2. Program location</a></span></dt>
 <dt><span class="sect1"><a href="#build.builddirs">17.3. Directories used during the build process</a></span></dt>
@@ -6328,48 +6332,17 @@ details.</p>
 	distribution (from xsrc, etc.) is installed. When looking for
 	<span class="emphasis"><em>standard</em></span> X11 includes (not those
 	installed by a package), use <span class="quote">&#8220;<span class="quote">${X11BASE}</span>&#8221;</span>.</p></li>
+<li class="listitem"><p>X11-based packages using imake must set
+	<code class="varname">USE_IMAKE</code> to be installed correctly under
+	<code class="varname">LOCALBASE</code>.</p></li>
 <li class="listitem">
-<p>X11-based packages are special in that they may be
-	installed in either <code class="varname">X11BASE</code> or
-	<code class="varname">LOCALBASE</code>.</p>
-<p>Usually, X11 packages should be installed under
-	<code class="varname">LOCALBASE</code> whenever possible.  Note that you
-	will need to include
-	<code class="filename">../../mk/x11.buildlink3.mk</code> in them to
-	request the presence of X11 and to get the right compilation
-	flags.</p>
-<p>Even though, there are some packages that cannot be installed
-	under <code class="varname">LOCALBASE</code>: those that come with app-defaults
-	files. These packages are special and they must be placed under
-	<code class="varname">X11BASE</code>. To accomplish this, set either
-	<code class="varname">USE_X11BASE</code> or <code class="varname">USE_IMAKE</code> in
-	your package.</p>
-<p>Some notes: If you need
-	to find includes or libraries installed by a pkg that has
-	<code class="varname">USE_IMAKE</code> or <code class="varname">USE_X11BASE</code> in
-	its pkg <code class="filename">Makefile</code>, you need to look in
-	<span class="emphasis"><em>both</em></span> <code class="filename">${X11BASE}</code> and
-	<code class="filename">${LOCALBASE}</code>. To force installation of
-	all X11 packages in <code class="varname">LOCALBASE</code>, the
-	<a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/pkgtools/xpkgwedge/README.html" target="_top"><code class="filename">pkgtools/xpkgwedge</code></a> package
-	is enabled by default.</p>
-</li>
-<li class="listitem"><p><code class="varname">X11PREFIX</code> should be used to refer to
-	the installed location of an X11
-	package. <code class="varname">X11PREFIX</code> will be set to
-	<code class="varname">X11BASE</code> if xpkgwedge is not installed, and
-	to <code class="varname">LOCALBASE</code> if xpkgwedge is
-	installed.</p></li>
-<li class="listitem">
-<p>If xpkgwedge is installed, it is possible to have some
-	packages installed in <code class="varname">X11BASE</code> and some in
-	<code class="varname">LOCALBASE</code>.  To determine the prefix of an
+<p>To determine the prefix of an
 	installed package, the <code class="varname">EVAL_PREFIX</code>
 	definition can be used. It takes pairs in the format
 	<span class="quote">&#8220;<span class="quote">DIRNAME=&lt;package&gt;</span>&#8221;</span>, and 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>
 	variable <code class="varname">DIRNAME</code> will be set to the prefix
 	of the installed package &lt;package&gt;, or
-	<span class="quote">&#8220;<span class="quote">${X11PREFIX}</span>&#8221;</span> if the package is not
+	<span class="quote">&#8220;<span class="quote">${PREFIX}</span>&#8221;</span> if the package is not
 	installed.</p>
 <p>This is best illustrated by example.</p>
 <p>The following lines are taken from
@@ -6768,10 +6741,8 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site}${file} ${FETCH_AFTER_ARGS}
 <p>If the program uses an <code class="filename">Imakefile</code>
     for configuration, the appropriate steps can be invoked by
     setting <code class="varname">USE_IMAKE</code> to
-    <span class="quote">&#8220;<span class="quote">yes</span>&#8221;</span>. (If you only want the package installed in
-    <code class="varname">${X11PREFIX}</code> but xmkmf not being run, set
-    <code class="varname">USE_X11BASE</code> instead.)  You can add variables to
-    xmkmf's environment by adding them to the
+    <span class="quote">&#8220;<span class="quote">yes</span>&#8221;</span>.  If you only need xmkmf, add it to <code class="varname">USE_TOOLS</code>.
+    You can add variables to xmkmf's environment by adding them to the
     <code class="varname">SCRIPTS_ENV</code> variable.</p>
 <p>If the program uses <code class="filename">cmake</code>
     for configuration, the appropriate steps can be invoked by
@@ -7304,7 +7275,7 @@ builds)</i></a>).
 <a name="tools"></a>Chapter 18. Tools needed for building or running</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="sect1"><a href="#pkgsrc-tools">18.1. Tools for pkgsrc builds</a></span></dt>
 <dt><span class="sect1"><a href="#package-tools">18.2. Tools needed by packages</a></span></dt>
 <dt><span class="sect1"><a href="#platform-tools">18.3. Tools provided by platforms</a></span></dt>
@@ -7384,7 +7355,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 <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="idm79403536"></a><dl>
+<a name="idp2098580500"></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
@@ -7403,7 +7374,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 <tbody>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.new"></a><a name="idm79403152"></a><p><b>18.4.1.</b></p>
+<a name="tools.new"></a><a name="idp2098580836"></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>
@@ -7413,7 +7384,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.listall"></a><a name="idm79402128"></a><p><b>18.4.2.</b></p>
+<a name="tools.listall"></a><a name="idp2098581540"></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>
@@ -7424,7 +7395,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.used"></a><a name="idm79401104"></a><p><b>18.4.3.</b></p>
+<a name="tools.used"></a><a name="idp2098582292"></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
@@ -7445,7 +7416,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 <a name="fixes"></a>Chapter 19. Making your package work</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="sect1"><a href="#general-operation">19.1. General operation</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#portability-of-packages">19.1.1. Portability of packages</a></span></dt>
@@ -9350,7 +9321,7 @@ PERL5_PACKLIST= auto/Pg/.packlist
 <a name="submit"></a>Chapter 21. Submitting and Committing</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="sect1"><a href="#submitting-binary-packages">21.1. Submitting binary packages</a></span></dt>
 <dt><span class="sect1"><a href="#submitting-your-package">21.2. Submitting source packages (for non-NetBSD-developers)</a></span></dt>
 <dt><span class="sect1"><a href="#general-notes-for-changes">21.3. General notes when adding, updating, or removing packages</a></span></dt>
@@ -9572,7 +9543,7 @@ place.</p></li>
 	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="idm80933392"></a><dl>
+<a name="idp2098923732"></a><dl>
 <dt>22.1. <a href="#devfaq.makeflags">What is the difference between
 	MAKEFLAGS, .MAKEFLAGS and
 	MAKE_FLAGS?</a>
@@ -9617,7 +9588,7 @@ do?</a>
 <tbody>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.makeflags"></a><a name="idm80933008"></a><p><b>22.1.</b></p>
+<a name="devfaq.makeflags"></a><a name="idp2098922660"></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
@@ -9633,7 +9604,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.make"></a><a name="idm80928912"></a><p><b>22.2.</b></p>
+<a name="devfaq.make"></a><a name="idp2098926532"></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
@@ -9651,7 +9622,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.cc"></a><a name="idm80924560"></a><p><b>22.3.</b></p>
+<a name="devfaq.cc"></a><a name="idp2098929268"></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
@@ -9669,7 +9640,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3flags"></a><a name="idm80920336"></a><p><b>22.4.</b></p>
+<a name="devfaq.bl3flags"></a><a name="idp2098931972"></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>,
@@ -9682,7 +9653,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3prefix"></a><a name="idm80918160"></a><p><b>22.5.</b></p>
+<a name="devfaq.bl3prefix"></a><a name="idp2098933428"></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>
@@ -9698,7 +9669,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.master_sites"></a><a name="idm80915088"></a><p><b>22.6.</b></p>
+<a name="devfaq.master_sites"></a><a name="idp2098935636"></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
@@ -9722,7 +9693,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.mailinglists"></a><a name="idm80907024"></a><p><b>22.7.</b></p>
+<a name="devfaq.mailinglists"></a><a name="idp2098940932"></a><p><b>22.7.</b></p>
 </td>
 <td align="left" valign="top"><p>Which mailing lists are there for package
 	developers?</p></td>
@@ -9747,7 +9718,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.documentation"></a><a name="idm80903184"></a><p><b>22.8.</b></p>
+<a name="devfaq.documentation"></a><a name="idp2098943828"></a><p><b>22.8.</b></p>
 </td>
 <td align="left" valign="top"><p>Where is the pkgsrc
 	documentation?</p></td>
@@ -9795,7 +9766,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.too-much-time"></a><a name="idm80896656"></a><p><b>22.9.</b></p>
+<a name="devfaq.too-much-time"></a><a name="idp2098949220"></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>
@@ -9829,7 +9800,7 @@ anyway.</p>
 <a name="gnome"></a>Chapter 23. GNOME packaging and porting</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="sect1"><a href="#meta-packages">23.1. Meta packages</a></span></dt>
 <dt><span class="sect1"><a href="#new-package">23.2. Packaging a GNOME application</a></span></dt>
 <dt><span class="sect1"><a href="#full-update">23.3. Updating GNOME to a newer version</a></span></dt>
@@ -10130,7 +10101,7 @@ details.</p>
 	need anything from this part.</p>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="chapter"><a href="#infr.design">24. Design of the pkgsrc infrastructure</a></span></dt>
 <dd><dl>
 <dt><span class="sect1"><a href="#infr.vardef">24.1. The meaning of variable definitions</a></span></dt>
@@ -10175,7 +10146,7 @@ details.</p>
 <a name="infr.design"></a>Chapter 24. Design of the pkgsrc infrastructure</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="sect1"><a href="#infr.vardef">24.1. The meaning of variable definitions</a></span></dt>
 <dt><span class="sect1"><a href="#infr.vardef.problems">24.2. Avoiding problems before they arise</a></span></dt>
 <dt><span class="sect1"><a href="#infr.var">24.3. Variable evaluation</a></span></dt>
@@ -10448,7 +10419,7 @@ CFLAGS+=                -Wall
 <a name="regression"></a>Chapter 25. Regression tests</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="sect1"><a href="#regression.descr">25.1. The regression tests framework</a></span></dt>
 <dt><span class="sect1"><a href="#regression.run">25.2. Running the regression tests</a></span></dt>
 <dt><span class="sect1"><a href="#regression.new">25.3. Adding a new regression test</a></span></dt>
@@ -10543,7 +10514,7 @@ CFLAGS+=                -Wall
 <a name="porting"></a>Chapter 26. Porting pkgsrc</h2></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="sect1"><a href="#porting.opsys">26.1. Porting pkgsrc to a new operating system</a></span></dt>
 <dt><span class="sect1"><a href="#porting.compiler">26.2. Adding support for a new compiler</a></span></dt>
 </dl>
@@ -10597,7 +10568,7 @@ CFLAGS+=                -Wall
 <a name="examples"></a>Appendix A. A simple example package: bison</h1></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="sect1"><a href="#example-files">A.1. files</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#example-Makefile">A.1.1. Makefile</a></span></dt>
@@ -10788,7 +10759,7 @@ Creating gzip'd tar ball in '/u/pkgsrc/lang/bison/bison-1.25.tgz'</pre>
 <a name="logs"></a>Appendix B. Build logs</h1></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="sect1"><a href="#logs.building">B.1. Building figlet</a></span></dt>
 <dt><span class="sect1"><a href="#logs.package">B.2. Packaging figlet</a></span></dt>
 </dl>
@@ -10903,7 +10874,7 @@ Registering depends:.
 <a name="ftp-layout"></a>Appendix C. Directory layout of the pkgsrc FTP server</h1></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="sect1"><a href="#ftp-distfiles">C.1. <code class="filename">distfiles</code>: The distributed source files</a></span></dt>
 <dt><span class="sect1"><a href="#ftp-misc">C.2. <code class="filename">misc</code>: Miscellaneous things</a></span></dt>
 <dt><span class="sect1"><a href="#ftp-packages">C.3. <code class="filename">packages</code>: Binary packages</a></span></dt>
@@ -11011,7 +10982,7 @@ source packages</h2></div></div></div>
 <a name="editing"></a>Appendix D. Editing guidelines for the pkgsrc guide</h1></div></div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl class="toc">
+<dl>
 <dt><span class="sect1"><a href="#targets">D.1. Make targets</a></span></dt>
 <dt><span class="sect1"><a href="#procedure">D.2. Procedure</a></span></dt>
 </dl>