 @@ -323,35 +323,37 @@ builds)
 <dt><span class="sect2"><a href="#fixes.subst">21.1.11. Substituting variable text in the package files (the SUBST framework)</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#fixes.fetch">21.2. The <span class="emphasis"><em>fetch</em></span> phase</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#no-plain-download">21.2.1. Packages whose distfiles aren't available for plain downloading</a></span></dt>
 <dt><span class="sect2"><a href="#modified-distfiles-same-name">21.2.2. How to handle modified distfiles with the 'old' name</a></span></dt>
 <dt><span class="sect2"><a href="#build.fetch.github">21.2.3. Packages hosted on github.com</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#fixes.configure">21.3. The <span class="emphasis"><em>configure</em></span> phase</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#fixes.libtool">21.3.1. Shared libraries - libtool</a></span></dt>
 <dt><span class="sect2"><a href="#using-libtool">21.3.2. Using libtool on GNU packages that already support libtool</a></span></dt>
 <dt><span class="sect2"><a href="#autoconf-automake">21.3.3. GNU Autoconf/Automake</a></span></dt>
 <dt><span class="sect2"><a href="#meson">21.3.4. Meson / ninja</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#programming-languages">21.4. Programming languages</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#basic-programming-languages">21.4.1. C, C++, and Fortran</a></span></dt>
 <dt><span class="sect2"><a href="#java-programming-language">21.4.2. Java</a></span></dt>
 <dt><span class="sect2"><a href="#go-programming-language">21.4.3. Go</a></span></dt>
-<dt><span class="sect2"><a href="#perl-scripts">21.4.4. Packages containing Perl scripts</a></span></dt>
+<dt><span class="sect2"><a href="#rust-programming-language">21.4.4. Rust</a></span></dt>
-<dt><span class="sect2"><a href="#shell-scripts">21.4.5. Packages containing shell scripts</a></span></dt>
+<dt><span class="sect2"><a href="#perl-scripts">21.4.5. Packages containing Perl scripts</a></span></dt>
-<dt><span class="sect2"><a href="#other-programming-languages">21.4.6. Other programming languages</a></span></dt>
+<dt><span class="sect2"><a href="#shell-scripts">21.4.6. Packages containing shell scripts</a></span></dt>
 <dt><span class="sect2"><a href="#other-programming-languages">21.4.7. Other programming languages</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#fixes.build">21.5. The <span class="emphasis"><em>build</em></span> phase</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#fixes.build.cpp">21.5.1. Compiling C and C++ code conditionally</a></span></dt>
 <dt><span class="sect2"><a href="#compiler-bugs">21.5.2. How to handle compiler bugs</a></span></dt>
 <dt><span class="sect2"><a href="#fixes.build.header">21.5.3. No such file or directory</a></span></dt>
 <dt><span class="sect2"><a href="#undefined-reference">21.5.4. Undefined reference to <span class="quote">&#8220;<span class="quote">...</span>&#8221;</span></a></span></dt>
 <dt><span class="sect2"><a href="#out-of-memory">21.5.5. Running out of memory</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#fixes.install">21.6. The <span class="emphasis"><em>install</em></span> phase</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#install-scripts">21.6.1. Creating needed directories</a></span></dt>
 <dt><span class="sect2"><a href="#where-to-install-documentation">21.6.2. Where to install documentation</a></span></dt>
 @@ -3292,35 +3294,37 @@ anymore, you can remove that file and ru
 <dt><span class="sect2"><a href="#fixes.subst">21.1.11. Substituting variable text in the package files (the SUBST framework)</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#fixes.fetch">21.2. The <span class="emphasis"><em>fetch</em></span> phase</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#no-plain-download">21.2.1. Packages whose distfiles aren't available for plain downloading</a></span></dt>
 <dt><span class="sect2"><a href="#modified-distfiles-same-name">21.2.2. How to handle modified distfiles with the 'old' name</a></span></dt>
 <dt><span class="sect2"><a href="#build.fetch.github">21.2.3. Packages hosted on github.com</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#fixes.configure">21.3. The <span class="emphasis"><em>configure</em></span> phase</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#fixes.libtool">21.3.1. Shared libraries - libtool</a></span></dt>
 <dt><span class="sect2"><a href="#using-libtool">21.3.2. Using libtool on GNU packages that already support libtool</a></span></dt>
 <dt><span class="sect2"><a href="#autoconf-automake">21.3.3. GNU Autoconf/Automake</a></span></dt>
 <dt><span class="sect2"><a href="#meson">21.3.4. Meson / ninja</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#programming-languages">21.4. Programming languages</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#basic-programming-languages">21.4.1. C, C++, and Fortran</a></span></dt>
 <dt><span class="sect2"><a href="#java-programming-language">21.4.2. Java</a></span></dt>
 <dt><span class="sect2"><a href="#go-programming-language">21.4.3. Go</a></span></dt>
-<dt><span class="sect2"><a href="#perl-scripts">21.4.4. Packages containing Perl scripts</a></span></dt>
+<dt><span class="sect2"><a href="#rust-programming-language">21.4.4. Rust</a></span></dt>
-<dt><span class="sect2"><a href="#shell-scripts">21.4.5. Packages containing shell scripts</a></span></dt>
+<dt><span class="sect2"><a href="#perl-scripts">21.4.5. Packages containing Perl scripts</a></span></dt>
-<dt><span class="sect2"><a href="#other-programming-languages">21.4.6. Other programming languages</a></span></dt>
+<dt><span class="sect2"><a href="#shell-scripts">21.4.6. Packages containing shell scripts</a></span></dt>
 <dt><span class="sect2"><a href="#other-programming-languages">21.4.7. Other programming languages</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#fixes.build">21.5. The <span class="emphasis"><em>build</em></span> phase</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#fixes.build.cpp">21.5.1. Compiling C and C++ code conditionally</a></span></dt>
 <dt><span class="sect2"><a href="#compiler-bugs">21.5.2. How to handle compiler bugs</a></span></dt>
 <dt><span class="sect2"><a href="#fixes.build.header">21.5.3. No such file or directory</a></span></dt>
 <dt><span class="sect2"><a href="#undefined-reference">21.5.4. Undefined reference to <span class="quote">&#8220;<span class="quote">...</span>&#8221;</span></a></span></dt>
 <dt><span class="sect2"><a href="#out-of-memory">21.5.5. Running out of memory</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#fixes.install">21.6. The <span class="emphasis"><em>install</em></span> phase</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#install-scripts">21.6.1. Creating needed directories</a></span></dt>
 <dt><span class="sect2"><a href="#where-to-install-documentation">21.6.2. Where to install documentation</a></span></dt>
 @@ -4111,30 +4115,30 @@ FILESDIR=       ../../editors/xemacs/fil
     usually set to <code class="varname">LOCALBASE</code>
     (<code class="filename">/usr/pkg</code>), or <code class="varname">CROSSBASE</code>
     for pkgs in the <code class="filename">cross</code> category.  The value of
     <code class="varname">PREFIX</code> needs to be put
     into the various places in the program's source where paths to
     these files are encoded.  See <a class="xref" href="#components.patches" title="12.3.�patches/*">Section�12.3, &#8220;<code class="filename">patches/*</code>&#8221;</a> and <a class="xref" href="#fixes.libtool" title="21.3.1.�Shared libraries - libtool">Section�21.3.1, &#8220;Shared libraries - libtool&#8221;</a> for more details.</p>
 <p>When choosing which of these variables to use,
     follow the following rules:</p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p><code class="varname">PREFIX</code> always points to the location
 	where the current pkg will be installed.  When referring to a
 	pkg's own installation path, use
 	<span class="quote">&#8220;<span class="quote">${PREFIX}</span>&#8221;</span>.</p></li>
-<li class="listitem"><p><code class="varname">LOCALBASE</code> is where all non-X11 pkgs
+<li class="listitem"><p><code class="varname">LOCALBASE</code> is where all pkgs
 	are installed.  If you need to construct a -I or -L argument
 	to the compiler to find includes and libraries installed by
-	another non-X11 pkg, use <span class="quote">&#8220;<span class="quote">${LOCALBASE}</span>&#8221;</span>. The name
+	another pkg, use <span class="quote">&#8220;<span class="quote">${LOCALBASE}</span>&#8221;</span>. The name
 	<code class="varname">LOCALBASE</code> stems from FreeBSD, which
 	installed all packages in <code class="filename">/usr/local</code>. As
 	pkgsrc leaves <code class="filename">/usr/local</code> for the system
 	administrator, this variable is a misnomer.</p></li>
 <li class="listitem"><p><code class="varname">X11BASE</code> is where the actual X11
 	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>Within <code class="filename">${PREFIX}</code>, packages should
 	install files according to <a class="citerefentry" href="https://man.NetBSD.org/NetBSD-9.2/i386/hier.7"><span class="citerefentry"><span class="refentrytitle">hier</span>(7)</span></a>, with the exception that
 @@ -7127,28 +7131,28 @@ installation.
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="rcd-scripts"></a>20.3.�System startup scripts</h2></div></div></div>
 <p>System startup scripts are special files because they must be
 installed in a place known by the underlying OS, usually outside the
 installation prefix.  Therefore, the same rules described in <a class="xref" href="#files-and-dirs-outside-prefix" title="20.1.�Files and directories outside the installation prefix">Section�20.1, &#8220;Files and directories outside the installation prefix&#8221;</a> apply, and the same solutions
 can be used.  However, pkginstall provides a special mechanism to handle
 these files.</p>
 <p>In order to provide system startup scripts, the package has
 to:</p>
 <div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem"><p>Store the script inside <code class="filename">${FILESDIR}</code>, with
     the <code class="literal">.sh</code> suffix appended.  Considering the
-    <a href="https://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/print/cups/index.html" target="_top"><code class="filename">print/cups</code></a> package as an example, it has a
+    <a href="https://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/print/cups-base/index.html" target="_top"><code class="filename">print/cups-base</code></a> package as an example, it
-    <code class="filename">cupsd.sh</code> in its files directory.</p></li>
+    has a <code class="filename">cupsd.sh</code> in its files directory.</p></li>
 <li class="listitem">
 <p>Tell pkginstall to handle it, appending the name of the script,
     without its extension, to the <code class="varname">RCD_SCRIPTS</code> variable.
     Continuing the previous example:</p>
 <pre class="programlisting">
 RCD_SCRIPTS+=   cupsd
 </pre>
 </li>
 </ol></div>
 <p>Once this is done, pkginstall will do the following steps for each
 script in an automated fashion:</p>
 <div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem"><p>Process the file found in the files directory applying all the
-@@ -7281,35 +7285,37 @@ environment variable to
+<dt><span class="sect2"><a href="#fixes.subst">21.1.11. Substituting variable text in the package files (the SUBST framework)</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#fixes.fetch">21.2. The <span class="emphasis"><em>fetch</em></span> phase</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#no-plain-download">21.2.1. Packages whose distfiles aren't available for plain downloading</a></span></dt>
 <dt><span class="sect2"><a href="#modified-distfiles-same-name">21.2.2. How to handle modified distfiles with the 'old' name</a></span></dt>
 <dt><span class="sect2"><a href="#build.fetch.github">21.2.3. Packages hosted on github.com</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#fixes.configure">21.3. The <span class="emphasis"><em>configure</em></span> phase</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#fixes.libtool">21.3.1. Shared libraries - libtool</a></span></dt>
 <dt><span class="sect2"><a href="#using-libtool">21.3.2. Using libtool on GNU packages that already support libtool</a></span></dt>
 <dt><span class="sect2"><a href="#autoconf-automake">21.3.3. GNU Autoconf/Automake</a></span></dt>
 <dt><span class="sect2"><a href="#meson">21.3.4. Meson / ninja</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#programming-languages">21.4. Programming languages</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#basic-programming-languages">21.4.1. C, C++, and Fortran</a></span></dt>
 <dt><span class="sect2"><a href="#java-programming-language">21.4.2. Java</a></span></dt>
 <dt><span class="sect2"><a href="#go-programming-language">21.4.3. Go</a></span></dt>
-<dt><span class="sect2"><a href="#perl-scripts">21.4.4. Packages containing Perl scripts</a></span></dt>
+<dt><span class="sect2"><a href="#rust-programming-language">21.4.4. Rust</a></span></dt>
-<dt><span class="sect2"><a href="#shell-scripts">21.4.5. Packages containing shell scripts</a></span></dt>
+<dt><span class="sect2"><a href="#perl-scripts">21.4.5. Packages containing Perl scripts</a></span></dt>
-<dt><span class="sect2"><a href="#other-programming-languages">21.4.6. Other programming languages</a></span></dt>
+<dt><span class="sect2"><a href="#shell-scripts">21.4.6. Packages containing shell scripts</a></span></dt>
 <dt><span class="sect2"><a href="#other-programming-languages">21.4.7. Other programming languages</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#fixes.build">21.5. The <span class="emphasis"><em>build</em></span> phase</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#fixes.build.cpp">21.5.1. Compiling C and C++ code conditionally</a></span></dt>
 <dt><span class="sect2"><a href="#compiler-bugs">21.5.2. How to handle compiler bugs</a></span></dt>
 <dt><span class="sect2"><a href="#fixes.build.header">21.5.3. No such file or directory</a></span></dt>
 <dt><span class="sect2"><a href="#undefined-reference">21.5.4. Undefined reference to <span class="quote">&#8220;<span class="quote">...</span>&#8221;</span></a></span></dt>
 <dt><span class="sect2"><a href="#out-of-memory">21.5.5. Running out of memory</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#fixes.install">21.6. The <span class="emphasis"><em>install</em></span> phase</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#install-scripts">21.6.1. Creating needed directories</a></span></dt>
 <dt><span class="sect2"><a href="#where-to-install-documentation">21.6.2. Where to install documentation</a></span></dt>
 @@ -8412,87 +8418,127 @@ ${LIBTOOL} --mode=install ${BSD_INSTALL_
 <li class="listitem"><p>The -dlopen option is used when linking an executable.</p></li>
 </ol></div>
 </li>
 <li class="listitem"><p>The use of libltdl without the correct calls to initialisation routines.
 	The function lt_dlinit() should be called and the macro
 	<code class="varname">LTDL_SET_PRELOADED_SYMBOLS</code> included in
 	executables.</p></li>
 </ul></div>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="autoconf-automake"></a>21.3.3.�GNU Autoconf/Automake</h3></div></div></div>
 <p>If a package needs GNU autoconf or automake to be executed
-    to regenerate the configure script and Makefile.in makefile
+    to regenerate the
-    templates, then they should be executed in a pre-configure
+    <code class="filename">configure</code>
-    target.</p>
+    script and <code class="filename">Makefile.in</code> makefile
-<p>For packages that need only autoconf:</p>
+    templates from <code class="filename">configure.ac</code> and
     <code class="filename">Makefile.am</code>,
     then they should be executed in a pre-configure target:</p>
 <pre class="programlisting">
-AUTOCONF_REQD=  2.50            # if default version is not good enough
+USE_TOOLS+=	autoconf automake autoreconf
-USE_TOOLS+=     autoconf        # use "autoconf213" for autoconf-2.13
+GNU_CONFIGURE=	yes
 ...
 pre-configure:
-        cd ${WRKSRC} &amp;&amp; autoconf
+        set -e; cd ${WRKSRC} &amp;&amp; autoreconf -fi
 ...
 </pre>
 <p>and for packages that need automake and autoconf:</p>
 <pre class="programlisting">
 AUTOMAKE_REQD=  1.7.1           # if default version is not good enough
 USE_TOOLS+=     automake        # use "automake14" for automake-1.4
 ...
 pre-configure:
         set -e; cd ${WRKSRC}; \
         aclocal; autoheader; automake -a --foreign -i; autoconf
 ...
 </pre>
-<p>Packages which use GNU Automake will almost certainly
+<p>Packages which use GNU Automake will sometimes
-    require GNU Make.</p>
+    require GNU Make (<code class="literal">gmake</code> in
     <code class="varname">USE_TOOLS</code>),
     but not always.  Note that autoreconf
     only needs to be executed if <code class="filename">configure.ac</code>
     or Makefiles are modified, or <code class="filename">configure</code>
     is not present.</p>
 <p>There are times when the configure process makes
     additional changes to the generated files, which then causes
     the build process to try to re-execute the automake sequence.
     This is prevented by touching various files in the configure
     stage. If this causes problems with your package you can set
     <code class="varname">AUTOMAKE_OVERRIDE=NO</code> in the package
     Makefile.</p>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="meson"></a>21.3.4.�Meson / ninja</h3></div></div></div>
 <p>Packages using Meson to configure need to include:
 </p>
 <pre class="programlisting">
 .include "../../devel/meson/build.mk"
 </pre>
 <p>In nearly all cases (any program with dependencies),
     pkg-config needs to be added to
     <code class="varname">USE_TOOLS</code>.  If the package installs
     translation files for non-English languages, also
     add msgfmt and xgettext:
 </p>
 <pre class="programlisting">
 USE_TOOLS+=	pkg-config msgfmt xgettext
 </pre>
 <p>If any options need to be passed to Meson, use
     <code class="varname">MESON_ARGS</code> instead of
     <code class="varname">CONFIGURE_ARGS</code>:
 </p>
 <pre class="programlisting">
 MESON_ARGS+=	-Dx11=false
 </pre>
 </div>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="programming-languages"></a>21.4.�Programming languages</h2></div></div></div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="basic-programming-languages"></a>21.4.1.�C, C++, and Fortran</h3></div></div></div>
-<p>Compilers for the C, C++, and Fortran languages comes with
+<p>Compilers for the C and C++ languages comes with
     the NetBSD base system.  By default, pkgsrc assumes that a package
     is written in C and will hide all other compilers (via the wrapper
     framework, see <a class="xref" href="#buildlink" title="Chapter�18.�Buildlink methodology">Chapter�18, <i>Buildlink methodology</i></a>).</p>
 <p>To declare which language's compiler a package needs, set
     the <code class="varname">USE_LANGUAGES</code> variable. Allowed values
     currently are:
     </p>
 <pre class="programlisting">
 	c99, c++, c++03, gnu++03, c++0x, gnu++0x, c++11, gnu++11,
 	c++14, gnu++14, c++17, gnu++17, c++20, gnu++20, fortran,
 	fortran77, java, objc, obj-c++, and ada.
     </pre>
 <p>
     (and any combination).  The default is
     <span class="quote">&#8220;<span class="quote">c</span>&#8221;</span>.  Packages using GNU configure scripts, even if
     written in C++, usually need a C compiler for the configure
     phase.</p>
 <p>To express a general requirement on a specific C or C++
     version, normally only <code class="varname">GCC_REQD</code> needs to be set.
     For example, GCC 7 includes support for C++17, so if the package uses
     C++17 it should specify:
     </p>
 <pre class="programlisting">
 	GCC_REQD+=	7
     </pre>
 <p>Language variants like <code class="literal">c++11</code> for
     <code class="varname">USE_LANGUAGES</code> should only be specified
     if the package does not explicitly set <code class="literal">-std=...</code>
     when compiling (i.e. the package assumes the compiler defaults to
     C++11 or some other standard).  This is usually a bug in the
     upstream build system.</p>
 <p>GCC version 5 includes support for C++14, while GCC 4.7 includes
     more-or-less complete support for C++11.  For more information, consult
     <a class="ulink" href="https://gcc.gnu.org/projects/cxx-status.html" target="_top">GCC's own documentation on programming language support.</a></p>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="java-programming-language"></a>21.4.2.�Java</h3></div></div></div>
 <p>If a program is written in Java, use the Java framework in
     pkgsrc.  The package must include
     <code class="filename">../../mk/java-vm.mk</code>.  This Makefile fragment
     provides the following variables:</p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p><code class="varname">USE_JAVA</code> defines if a build
       dependency on the JDK is added.  If
       <code class="varname">USE_JAVA</code> is set to <span class="quote">&#8220;<span class="quote">run</span>&#8221;</span>, then
       there is only a runtime dependency on the JDK.  The default is
 @@ -8513,77 +8559,89 @@ pre-configure:
       </p></li>
 </ul></div>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="go-programming-language"></a>21.4.3.�Go</h3></div></div></div>
 <p>If a program is written in Go and has any dependencies on
     other Go modules, have the package include
     <code class="filename">../../lang/go/go-module.mk</code>.</p>
 <div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem"><p>Generate a list of those dependencies with
       <span class="command"><strong>make clean &amp;&amp; make patch &amp;&amp; make show-go-modules &gt;
       go-modules.mk</strong></span>.</p></li>
-<li class="listitem">
+<li class="listitem"><p>Prepend
-<p>Prepend </p>
+      <code class="literal">.include "go-modules.mk"</code> to any other
-<pre class="programlisting">.include
+      <code class="literal">.include</code>s.</p></li>
-      "go-modules.mk"</pre>
+<li class="listitem"><p>Incorporate these modules in
-<p> to any other
+      <code class="filename">distinfo</code> with <span class="command"><strong>make
-      </p>
+      makesum</strong></span>.</p></li>
-<pre class="programlisting">.include</pre>
+</ol></div>
-<p>s.</p>
+</div>
-</li>
+<div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="rust-programming-language"></a>21.4.4.�Rust</h3></div></div></div>
 <p>If a program is written in Rust and uses Cargo to build,
     have the package include
     <code class="filename">../../lang/rust/cargo.mk</code>.</p>
 <div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem"><p>Generate a list of those dependencies with
       <span class="command"><strong>make CARGO_ARGS="build --release" build &amp;&amp;
       make print-cargo-depends &gt; cargo-depends.mk</strong></span>.</p></li>
 <li class="listitem"><p>Prepend
       <code class="literal">.include "cargo-depends.mk"</code> to any other
       <code class="literal">.include</code>s.</p></li>
 <li class="listitem"><p>Incorporate these modules in
       <code class="filename">distinfo</code> with <span class="command"><strong>make
       makesum</strong></span>.</p></li>
 </ol></div>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="perl-scripts"></a>21.4.4.�Packages containing Perl scripts</h3></div></div></div>
+<a name="perl-scripts"></a>21.4.5.�Packages containing Perl scripts</h3></div></div></div>
 <p>If your package contains interpreted Perl scripts, add
     <span class="quote">&#8220;<span class="quote">perl</span>&#8221;</span> to the <code class="varname">USE_TOOLS</code> variable
     and set <code class="varname">REPLACE_PERL</code> to ensure that the proper
     interpreter path is set. <code class="varname">REPLACE_PERL</code> should
     contain a list of scripts, relative to <code class="varname">WRKSRC</code>,
     that you want adjusted. Every occurrence of
     <code class="filename">*/bin/perl</code> in a she-bang line will be
     replaced with the full path to the Perl executable.</p>
 <p>If a particular version of Perl is needed, set the
     <code class="varname">PERL5_REQD</code> variable to the version number.  The
     default is <span class="quote">&#8220;<span class="quote">5.0</span>&#8221;</span>.</p>
 <p>See <a class="xref" href="#perl-modules" title="21.6.6.�Packages installing Perl modules">Section�21.6.6, &#8220;Packages installing Perl modules&#8221;</a> for information
     about handling Perl modules.</p>
 <p>There is also the <code class="varname">REPLACE_PERL6</code> variable
     for the language now known as Raku.</p>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="shell-scripts"></a>21.4.5.�Packages containing shell scripts</h3></div></div></div>
+<a name="shell-scripts"></a>21.4.6.�Packages containing shell scripts</h3></div></div></div>
 <p><code class="varname">REPLACE_SH</code>,
     <code class="varname">REPLACE_BASH</code>, <code class="varname">REPLACE_CSH</code>,
     and <code class="varname">REPLACE_KSH</code> can be used to replace shell
     hash bangs in files. Please use the appropriate one, preferring
     <code class="varname">REPLACE_SH</code> in case this shell is sufficient.
     Each should contain a list of scripts, relative to
     <code class="varname">WRKSRC</code>, that you want adjusted. Every
     occurrence of the matching shell in a she-bang line will be
     replaced with the full path to the shell executable.
     When using <code class="varname">REPLACE_BASH</code>, don't forget to add
     <code class="filename">bash</code> to <code class="varname">USE_TOOLS</code>.</p>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="other-programming-languages"></a>21.4.6.�Other programming languages</h3></div></div></div>
+<a name="other-programming-languages"></a>21.4.7.�Other programming languages</h3></div></div></div>
 <p>There are further similar REPLACE variables available, e.g.,
     <code class="varname">REPLACE_AWK</code> for packages containing awk scripts,
     and <code class="varname">REPLACE_R</code> for R. These two, like the others
     noted above, have their actions defined centrally in
     <code class="filename">mk/configure/replace-interpreter.mk</code>. Other
     languages define the actions of these variables within their own
     dedicated part of the tree, e.g., <code class="varname">REPLACE_PHP</code> is
     actioned in <code class="filename">lang/php/phpversion.mk</code>, and
     <code class="varname">REPLACE_PYTHON</code> is actioned in
     <code class="filename">lang/python/application.mk</code>. For other languages,
     consult the mk files found within their specific directories (the
     naming convention varies), or check the list found in
     <a class="xref" href="#help-topics" title="Appendix�E.�Help topics">Appendix�E, <i>Help topics</i></a>.</p>
 @@ -8616,61 +8674,80 @@ pre-configure:
 	system, hardware architecture and compiler has its own macro.
 	For example, if the macros <code class="varname">__GNUC__</code>,
 	<code class="varname">__i386__</code> and <code class="varname">__NetBSD__</code>
 	are all defined, you know that you are using NetBSD on an i386
 	compatible CPU, and your compiler is GCC.</p>
 <p>The list of the following macros for hardware and
 	operating system depends on the compiler that is used. For
 	example, if you want to conditionally compile code on Solaris,
 	don't use <code class="varname">__sun__</code>, as the SunPro compiler
 	does not define it. Use <code class="varname">__sun</code> instead.</p>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fixes.build.cpp.os"></a>21.5.1.1.�C preprocessor macros to identify the operating system</h4></div></div></div>
 <p>To distinguish between specific NetBSD versions,
         you should use the following code.</p>
 <pre class="programlisting">
 #ifdef __NetBSD__
 #include &lt;sys/param.h&gt;
 #if __NetBSD_Prereq__(9,99,17)
 /* use a newer feature */
 #else
 /* older code */
 #endif
 #endif
 #ifndef _WIN32
 /* Unix-like specific code */
 #endif
 </pre>
 <p>To distinguish between 4.4 BSD-derived systems and the
         rest of the world, you should use the following code.</p>
 <pre class="programlisting">
 #include &lt;sys/param.h&gt;
 #if (defined(BSD) &amp;&amp; BSD &gt;= 199306)
 /* BSD-specific code goes here */
 #else
 /* non-BSD-specific code goes here */
 #endif
 </pre>
-<p>If this distinction is not fine enough, you can also test
+<p>You can also test for the following macros:</p>
 	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__
+Linux       __linux
 Mac OS X    __APPLE__
 MirBSD      __MirBSD__ (__OpenBSD__ is also defined)
 Minix3      __minix
 NetBSD      __NetBSD__
 OpenBSD     __OpenBSD__
 Solaris     sun, __sun
 Unix(-like) __unix
 </pre>
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fixes.build.cpp.arch"></a>21.5.1.2.�C preprocessor macros to identify the hardware architecture</h4></div></div></div>
 <pre class="programlisting">
 i386        i386, __i386, __i386__
 x86-64      __amd64__, __x86_64__
 ARM         __arm__
 MIPS        __mips
 SPARC       sparc, __sparc
 PowerPC     __powerpc
 </pre>
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fixes.build.cpp.compiler"></a>21.5.1.3.�C preprocessor macros to identify the compiler</h4></div></div></div>
 <pre class="programlisting">
 GCC         __GNUC__ (major version), __GNUC_MINOR__
 MIPSpro     _COMPILER_VERSION (0x741 for MIPSpro 7.41)
 SunPro      __SUNPRO_C (0x570 for Sun C 5.7)
 SunPro C++  __SUNPRO_CC (0x580 for Sun C++ 5.8)
 </pre>
 </div>
 </div>
 @@ -8787,30 +8864,30 @@ bootstrap program prevents installing pk
 directories. Existing pkgsrc installations are not checked for symlinks
 though.</p>
 <p>The "No such file or directory" error messages are a typical
 symptom of symlinks, and it's quite difficult to find out that this is
 the actual cause.</p>
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fixes.build.header.stale"></a>21.5.3.4.�Stale working directories</h4></div></div></div>
 <p>When building a hierarchy of packages, it may happen that one
 package is built and then pkgsrc is updated. This situation can provoke
 various hard to diagnose build errors. To clean up the situation:</p>
 <pre class="programlisting">
-<code class="prompt">$</code> (cd ../../ &amp;&amp; test -f mk/bsd.pkg.mk &amp;&amp; rm -rf */*/work)
+<code class="prompt">$</code> (cd ../../ &amp;&amp; cat mk/bsd.pkg.mk &gt;/dev/null &amp;&amp; rm -rf */*/work)
 </pre>
-<p>(The test for <code class="filename">bsd.pkg.mk</code> just prevents running
+<p>(The only purpose of the <code class="filename">bsd.pkg.mk</code> is to
-this command in the wrong directory.)</p>
+prevent running this command in the wrong directory.)</p>
 <p>If you have set <code class="varname">WRKOBJDIR</code> in <a class="link" href="#mk.conf"><code class="filename">mk.conf</code></a>, remove
 that directory as well.</p>
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="fixes.build.header.misc"></a>21.5.3.5.�Other possible reasons</h4></div></div></div>
 <p>On platforms other than BSD, third-party packages are installed in
 <code class="filename">/usr/include</code>, together with the base system. This
 means that pkgsrc cannot distinguish between headers provided by the base
 system (which it needs) and headers from third-party packages (which are
 often included in pkgsrc as well). This can lead to subtle version
 mismatches.</p>
 <p>In pkgsrc installations that have been active for several years, it
 @@ -8871,34 +8948,34 @@ far and what any error messages were.
 <tr>
 <td>nanosleep, sem_*, timer_*</td>
 <td>-lrt</td>
 <td>Solaris</td>
 </tr>
 <tr>
 <td>openpty</td>
 <td>-lutil</td>
 <td>Linux</td>
 </tr>
 </tbody>
 </table>
 </div>
-<p>To fix these linker errors, it is often sufficient to say
+<p>To fix these linker errors, it is often sufficient to add
     <code class="literal">LIBS.<em class="replaceable"><code>OperatingSystem</code></em>+=
     -l<em class="replaceable"><code>foo</code></em></code> to the package
-    <code class="filename">Makefile</code> and then say <span class="command"><strong>bmake clean;
+    <code class="filename">Makefile</code> and then run <span class="command"><strong>bmake clean;
     bmake</strong></span>.</p>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="undefined-reference-sunpro"></a>21.5.4.1.�Special issue: The SunPro compiler</h4></div></div></div>
+<a name="undefined-reference-sunpro"></a>21.5.4.1.�The SunPro compiler and inline functions</h4></div></div></div>
 <p>When you are using the SunPro compiler, there is another
 possibility. That compiler cannot handle the following code:</p>
 <pre class="programlisting">
 extern int extern_func(int);
 static inline int
 inline_func(int x)
+{
         return extern_func(x);
+}
 int main(void)
+{
 @@ -8908,67 +8985,71 @@ int main(void)
 <p>It generates the code for <code class="function">inline_func</code> even if
 that function is never used. This code then refers to
 <code class="function">extern_func</code>, which can usually not be resolved. To
 solve this problem you can try to tell the package to disable inlining
 of functions.</p>
 </div>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="out-of-memory"></a>21.5.5.�Running out of memory</h3></div></div></div>
 <p>Sometimes packages fail to build because the compiler runs
     into an operating system specific soft limit.  With the
     <code class="varname">UNLIMIT_RESOURCES</code> variable pkgsrc can be told
-    to unlimit the resources.  Currently, the allowed values are any combination of
+    to unlimit the resources.  The allowed values are any combination of
-    <span class="quote">&#8220;<span class="quote">cputime</span>&#8221;</span>, <span class="quote">&#8220;<span class="quote">datasize</span>&#8221;</span>,
+    <span class="quote">&#8220;<span class="quote">cputime</span>&#8221;</span>,
-    <span class="quote">&#8220;<span class="quote">memorysize</span>&#8221;</span>, and <span class="quote">&#8220;<span class="quote">stacksize</span>&#8221;</span>.
+    <span class="quote">&#8220;<span class="quote">datasize</span>&#8221;</span>,
     <span class="quote">&#8220;<span class="quote">memorysize</span>&#8221;</span>,
     <span class="quote">&#8220;<span class="quote">stacksize</span>&#8221;</span> and
     <span class="quote">&#8220;<span class="quote">virtualsize</span>&#8221;</span>.
     Setting this variable is similar to running the shell builtin
     <span class="command"><strong>ulimit</strong></span> command to raise the maximum data
     segment size or maximum stack size of a process, respectively, to
     their hard limits.</p>
 </div>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="fixes.install"></a>21.6.�The <span class="emphasis"><em>install</em></span> phase</h2></div></div></div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="install-scripts"></a>21.6.1.�Creating needed directories</h3></div></div></div>
 <p>The BSD-compatible <span class="command"><strong>install</strong></span> supplied
     with some operating systems cannot create more than one
     directory at a time. As such, you should call
     <code class="literal">${INSTALL_*_DIR}</code> like this:</p>
 <pre class="programlisting">
 ${INSTALL_DATA_DIR} ${PREFIX}/dir1
 ${INSTALL_DATA_DIR} ${PREFIX}/dir2
 </pre>
-<p>You can also just append <span class="quote">&#8220;<span class="quote"><code class="literal">dir1
+<p>Instead of running the <span class="command"><strong>install</strong></span> commands
-    dir2</code></span>&#8221;</span> to the
+    directly, you can also append <span class="quote">&#8220;<span class="quote"><code class="literal">dir1
-    <code class="varname">INSTALLATION_DIRS</code> variable, which will
+    dir2</code></span>&#8221;</span> to the <code class="varname">INSTALLATION_DIRS</code>
-    automatically do the right thing.</p>
+    variable, which will automatically do the right thing.</p>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="where-to-install-documentation"></a>21.6.2.�Where to install documentation</h3></div></div></div>
 <p>In general, documentation should be installed into
     <code class="filename">${PREFIX}/share/doc/${PKGBASE}</code> or
-    <code class="filename">${PREFIX}/share/doc/${PKGNAME}</code> (the latter
+    <code class="filename">${PREFIX}/share/doc/${PKGNAME_NOREV}</code> (the latter
     includes the version number of the package).</p>
 <p>Many modern packages using GNU autoconf allow to set the
     directory where HTML documentation is installed with the
-    <span class="quote">&#8220;<span class="quote">--with-html-dir</span>&#8221;</span> option. Sometimes using this flag
+    <span class="quote">&#8220;<span class="quote">--with-html-dir</span>&#8221;</span> option. Sometimes using this flag is
-    is needed because otherwise the documentation ends up in
+    needed because otherwise the documentation ends up in
-    <code class="filename">${PREFIX}/share/doc/html</code> or other
+    <code class="filename">${PREFIX}/share/doc/html</code> or other places. In
-    places.</p>
+    pkgsrc, the HTML documentation should go into the package-specific
     directory, just like any other documentation.</p>
 <p>An exception to the above is that library API documentation
     generated with the <a href="https://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/textproc/gtk-doc/index.html" target="_top"><code class="filename">textproc/gtk-doc</code></a> tools, for use by special
     browsers (devhelp) should be left at their default location, which
     is <code class="filename">${PREFIX}/share/gtk-doc</code>.  Such
     documentation can be recognized from files ending in
     <code class="filename">.devhelp</code> or <code class="filename">.devhelp2</code>.
     (It is also acceptable to install such files in
     <code class="filename">${PREFIX}/share/doc/${PKGBASE}</code> or
     <code class="filename">${PREFIX}/share/doc/${PKGNAME}</code>; the
     <code class="filename">.devhelp*</code> file must be directly in that
     directory then, no additional subdirectory level is allowed in
     this case. This is usually achieved by using
     <span class="quote">&#8220;<span class="quote">--with-html-dir=${PREFIX}/share/doc</span>&#8221;</span>.
 @@ -9053,32 +9134,26 @@ SPECIAL_PERMS+=         ${PREFIX}/bin/mo
 <a name="hardcoded-paths"></a>21.6.5.�Packages with hardcoded paths to other interpreters</h3></div></div></div>
 <p>Your package may also contain scripts with hardcoded paths to
       other interpreters besides (or as well as) Perl.  To correct the
       full pathname to the script interpreter, you need to set the
       following definitions in your <code class="filename">Makefile</code> (we
     shall use <span class="command"><strong>tclsh</strong></span> in this example):</p>
 <pre class="programlisting">
 REPLACE_INTERPRETER+=   tcl
 REPLACE.tcl.old=        .*/bin/tclsh
 REPLACE.tcl.new=        ${PREFIX}/bin/tclsh
 REPLACE_FILES.tcl=      # list of tcl scripts which need to be fixed,
 # relative to ${WRKSRC}, just as in REPLACE_PERL
 </pre>
 <div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Note</h3>
 <p>Before March 2006, these variables were called
     <code class="varname">_REPLACE.*</code> and
     <code class="varname">_REPLACE_FILES.*</code>.</p>
 </div>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="perl-modules"></a>21.6.6.�Packages installing Perl modules</h3></div></div></div>
 <p>Makefiles of packages providing perl5 modules should include
     the Makefile fragment
     <code class="filename">../../lang/perl5/module.mk</code>.  It provides a
     <span class="command"><strong>do-configure</strong></span> target for the standard perl
     configuration for such modules as well as various hooks to tune
     this configuration.  See comments in this file for
     details.</p>
 <p>Perl5 modules will install into different places depending
     on the version of perl used during the build process.  To
 @@ -9425,35 +9500,26 @@ a complete GNOME environment
 platforms</em></span>.  We can say with confidence that pkgsrc is one of
 the most advanced build and packaging systems for GNOME due to its
 included technologies buildlink3, the wrappers and tools framework and
 automatic configuration file management.  Lots of efforts are put into
 achieving a completely clean deinstallation of installed software
 components.</p>
 <p>Given that pkgsrc is <a class="ulink" href="https://www.NetBSD.org/" target="_top">NetBSD</a>'s official packaging system,
 the above also means that great efforts are put into making GNOME work
 under this operating system.</p>
 <p>This chapter is aimed at pkgsrc developers and other people
 interested in helping our GNOME porting and packaging efforts.  It
 provides instructions on how to manage the existing packages and some
 important information regarding their internals.</p>
 <div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">We need your help!</h3>
 <p>Should you have some spare cycles to devote to NetBSD, pkgsrc
   and GNOME and are willing to learn new exciting stuff, please jump
   straight to the <a class="ulink" href="https://www.NetBSD.org/contrib/projects.html#gnome" target="_top">pending
   work</a> list!  There is still a long way to go to get a
   fully-functional GNOME desktop under NetBSD and we need your help to
   achieve it!</p>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="meta-packages"></a>22.1.�Meta packages</h2></div></div></div>
 <p>pkgsrc includes three GNOME-related meta packages:</p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p><a href="https://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/meta-pkgs/gnome-base/index.html" target="_top"><code class="filename">meta-pkgs/gnome-base</code></a>: Provides
     the core GNOME desktop environment.  It only includes the necessary
     bits to get it to boot correctly, although it may lack important
     functionality for daily operation.  The idea behind this package is
     to let end users build their own configurations on top of this one,
     first installing this meta package to achieve a functional setup and
     then adding individual applications.</p></li>
 <li class="listitem"><p><a href="https://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/meta-pkgs/gnome/index.html" target="_top"><code class="filename">meta-pkgs/gnome</code></a>: Provides a
 @@ -9481,64 +9547,64 @@ change it to alphabetical sorting!<
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="new-package"></a>22.2.�Packaging a GNOME application</h2></div></div></div>
 <p>Almost all GNOME applications are written in C and use a common
 set of tools as their build system.  Things get different with the new
 bindings to other languages (such as Python), but the following will
 give you a general idea on the minimum required tools:</p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p>Almost all GNOME applications use the GNU Autotools as their
     build system.  As a general rule you will need to tell this to your
     package:</p>
 <pre class="programlisting">
-GNU_CONFIGURE=yes
+GNU_CONFIGURE=  yes
-USE_LIBTOOL=yes
+USE_LIBTOOL=    yes
-USE_TOOLS+=gmake
+USE_TOOLS+=     gmake
 </pre>
 </li>
 <li class="listitem">
 <p>If the package uses pkg-config to detect dependencies, add this
     tool to the list of required utilities:</p>
 <pre class="programlisting">
-USE_TOOLS+=pkg-config
+USE_TOOLS+=     pkg-config
 </pre>
 <p>Also use <a href="https://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/pkgtools/verifypc/index.html" target="_top"><code class="filename">pkgtools/verifypc</code></a> at
     the end of the build process to ensure that you did not miss to
     specify any dependency in your package and that the version
     requirements are all correct.</p>
 </li>
 <li class="listitem"><p>If the package uses intltool, be sure to add
     <code class="literal">intltool</code> to the <code class="varname">USE_TOOLS</code>
     to handle dependencies and to force the package to use the latest
     available version.</p></li>
 <li class="listitem">
 <p>If the package uses gtk-doc (a documentation generation
     utility), do <span class="emphasis"><em>not</em></span> add a dependency on it.  The
     tool is rather big and the distfile should come with pregenerated
     documentation anyway; if it does not, it is a bug that you ought to
     report.  For such packages you should disable gtk-doc (unless it is
     the default):</p>
 <pre class="programlisting">
-CONFIGURE_ARGS+=--disable-gtk-doc
+CONFIGURE_ARGS+=        --disable-gtk-doc
 </pre>
 <p>The default location of installed HTML files
     (<code class="filename">share/gtk-doc/&lt;package-name&gt;</code>) is correct
     and should not be changed unless the package insists on installing
     them somewhere else.  Otherwise programs as
     <span class="command"><strong>devhelp</strong></span> will not be able to open them.  You can
     do that with an entry similar to:</p>
 <pre class="programlisting">
-CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/...
+CONFIGURE_ARGS+=        --with-html-dir=${PREFIX}/share/gtk-doc/...
 </pre>
 </li>
 </ul></div>
 <p>GNOME uses multiple <span class="emphasis"><em>shared</em></span> directories and
 files under the installation prefix to maintain databases.  In this
 context, shared means that those exact same directories and files are
 used among several different packages, leading to conflicts in the
 <code class="filename">PLIST</code>.  pkgsrc currently includes functionality to
 handle the most common cases, so you have to forget about using
 <code class="literal">@unexec ${RMDIR}</code> lines in your file lists and
 omitting shared files from them.  If you find yourself doing those,
 <span class="emphasis"><em>your package is most likely incorrect</em></span>.</p>
 <p>The following table lists the common situations that result in
 @@ -9970,189 +10036,183 @@ place.
 <a name="devfaq.qandaset"></a><dl>
 <dt>24.1. <a href="#devfaq.makeflags">What is the difference between
 	MAKEFLAGS, .MAKEFLAGS and
 	MAKE_FLAGS?</a>
 </dt>
 <dt>24.2. <a href="#devfaq.make">What is the difference between
 	MAKE, GMAKE and
 	MAKE_PROGRAM?</a>
 </dt>
 <dt>24.3. <a href="#devfaq.cc">What is the difference between
 	CC, PKG_CC and
 	PKGSRC_COMPILER?</a>
 </dt>
-<dt>24.4. <a href="#devfaq.bl3flags">What is the difference between
+<dt>24.4. <a href="#devfaq.bl3prefix">Why does make show-var
 	BUILDLINK_LDFLAGS,
 	BUILDLINK_LDADD and
 	BUILDLINK_LIBS?</a>
 </dt>
 <dt>24.5. <a href="#devfaq.bl3prefix">Why does make show-var
 	VARNAME=BUILDLINK_PREFIX.foo
 	say it's empty?</a>
 </dt>
-<dt>24.6. <a href="#devfaq.master_sites">What does
+<dt>24.5. <a href="#devfaq.master_sites">What does
 	${MASTER_SITE_SOURCEFORGE:=package/} mean? I
 	don't understand the := inside
 	it.</a>
 </dt>
-<dt>24.7. <a href="#devfaq.mailinglists">Which mailing lists are there for package
+<dt>24.6. <a href="#devfaq.mailinglists">Which mailing lists are there for package
 	developers?</a>
 </dt>
-<dt>24.8. <a href="#devfaq.documentation">Where is the pkgsrc
+<dt>24.7. <a href="#devfaq.documentation">Where is the pkgsrc
 	documentation?</a>
 </dt>
-<dt>24.9. <a href="#devfaq.too-much-time">I have a little time to kill.
+<dt>24.8. <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="devfaq.makeflags.q"></a><p><b>24.1.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
 	<code class="varname">MAKEFLAGS</code>, <code class="varname">.MAKEFLAGS</code> and
 	<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
+<td align="left" valign="top">
-	to the pkgsrc-internal invocations of <a class="citerefentry" href="https://man.NetBSD.org/NetBSD-9.2/i386/make.1"><span class="citerefentry"><span class="refentrytitle">make</span>(1)</span></a>, while
+<p><code class="varname">MAKEFLAGS</code> are the flags passed
-	<code class="varname">MAKE_FLAGS</code> are the flags that are passed to
+	to the pkgsrc-internal invocations of <a class="citerefentry" href="https://man.NetBSD.org/NetBSD-9.2/i386/make.1"><span class="citerefentry"><span class="refentrytitle">make</span>(1)</span></a>.</p>
-	the <code class="varname">MAKE_PROGRAM</code> when building the
+<p><code class="varname">MAKE_FLAGS</code> are the flags that are
-	package. [FIXME: What is .MAKEFLAGS for?]</p></td>
+	passed to the <code class="varname">MAKE_PROGRAM</code> when building the
 	package.</p>
 <p><code class="varname">.MAKEFLAGS</code> is an internal variable of
 	<span class="command"><strong>bmake</strong></span> and should not be used by
 	packages.</p>
 </td>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
 <a name="devfaq.make"></a><a name="devfaq.make.q"></a><p><b>24.2.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
 	<code class="varname">MAKE</code>, <code class="varname">GMAKE</code> and
 	<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
+<td align="left" valign="top">
 <p><code class="varname">MAKE</code> is the path to the
 	<a class="citerefentry" href="https://man.NetBSD.org/NetBSD-9.2/i386/make.1"><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
+	infrastructure.</p>
-	Make, but you need to say <code class="varname">USE_TOOLS+=gmake</code> to
+<p><code class="varname">GMAKE</code> is the path to GNU Make, but you
-	use that. <code class="varname">MAKE_PROGRAM</code> is the path to the
+	need to say <code class="varname">USE_TOOLS+=gmake</code> to use
-	Make program that is used for building the
+	that.</p>
-	package.</p></td>
+<p><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="devfaq.cc.q"></a><p><b>24.3.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
 	<code class="varname">CC</code>, <code class="varname">PKG_CC</code> and
 	<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="devfaq.bl3flags.q"></a><p><b>24.4.</b></p>
+<p><code class="varname">CC</code> is the path to the real C
 	compiler, which can be configured by the pkgsrc user.</p>
 <p><code class="varname">PKG_CC</code> is the path to the compiler
 	wrapper.</p>
 <p><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>
 <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="devfaq.bl3prefix.q"></a><p><b>24.5.</b></p>
+<a name="devfaq.bl3prefix"></a><a name="devfaq.bl3prefix.q"></a><p><b>24.4.</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="devfaq.master_sites.q"></a><p><b>24.6.</b></p>
+<a name="devfaq.master_sites"></a><a name="devfaq.master_sites.q"></a><p><b>24.5.</b></p>
 </td>
 <td align="left" valign="top"><p>What does
 	<code class="code">${MASTER_SITE_SOURCEFORGE:=package/}</code> mean? I
 	don't understand the <code class="code">:=</code> inside
 	it.</p></td>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
-<td align="left" valign="top"><p>The <code class="code">:=</code> is not really an
+<td align="left" valign="top"><p>The <code class="code">:=</code> is not an
-	assignment operator, although it looks like it.
+	assignment operator, even though it may look like one.
 	Instead, it is a degenerate form of
 	<code class="code">${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="https://man.NetBSD.org/NetBSD-9.2/i386/make.1"><span class="citerefentry"><span class="refentrytitle">make</span>(1)</span></a> man page and which is
 	commonly used in the form <code class="code">${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="code">package/</code>. That's where the
 	<code class="code">:</code> and the <code class="code">=</code> fall
 	together.</p></td>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.mailinglists"></a><a name="devfaq.mailinglists.q"></a><p><b>24.7.</b></p>
+<a name="devfaq.mailinglists"></a><a name="devfaq.mailinglists.q"></a><p><b>24.6.</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="https://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="https://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="https://man.NetBSD.org/NetBSD-9.2/i386/send-pr.1"><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="devfaq.documentation.q"></a><p><b>24.8.</b></p>
+<a name="devfaq.documentation"></a><a name="devfaq.documentation.q"></a><p><b>24.7.</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
 @@ -10180,29 +10240,29 @@ What shall I 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="devfaq.too-much-time.q"></a><p><b>24.9.</b></p>
+<a name="devfaq.too-much-time"></a><a name="devfaq.too-much-time.q"></a><p><b>24.8.</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="https://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/pkgtools/pkg_chk/index.html" target="_top"><code class="filename">pkgtools/pkg_chk</code></a> package).  It
     will tell you about newer versions of installed packages that are
     available, but not yet updated in pkgsrc.</p></li>
 <li class="listitem"><p>Browse <code class="filename">pkgsrc/doc/TODO</code>
 @@ -11723,132 +11783,136 @@ source packages
 <tr>
 <td>ACROREAD_FONTPATH</td>
 <td>ADDITIONAL</td>
 </tr>
 <tr>
 <td>AFAIK</td>
 <td>AIX</td>
 </tr>
 <tr>
 <td>ALLOW_VULNERABLE_PACKAGES</td>
 <td>ALL_ENV</td>
 </tr>
 <tr>
 <td>ALSA_PC</td>
 <td>ALTERNATIVES_SRC</td>
 <td>AMANDA_TMP</td>
 </tr>
 <tr>
 <td>AMANDA_TMP</td>
 <td>AMANDA_USER</td>
 <td>AMANDA_VAR</td>
 </tr>
 <tr>
 <td>AMANDA_VAR</td>
 <td>APACHE_GROUP</td>
 <td>APACHE_MODULE_NAME</td>
 </tr>
 <tr>
 <td>APACHE_MODULE_NAME</td>
 <td>APACHE_MODULE_SRC</td>
 <td>APACHE_MODULE_SRCDIR</td>
 </tr>
 <tr>
 <td>APACHE_MODULE_SRCDIR</td>
 <td>APACHE_PKG_PREFIX</td>
 <td>APACHE_SUEXEC_CONFIGURE_ARGS</td>
 </tr>
 <tr>
 <td>APACHE_SUEXEC_CONFIGURE_ARGS</td>
 <td>APACHE_SUEXEC_DOCROOT</td>
 <td>APACHE_USER</td>
 </tr>
 <tr>
 <td>APACHE_USER</td>
 <td>APPEND_ABI</td>
 <td>APPEND_ELF</td>
 </tr>
 <tr>
 <td>APPEND_ELF</td>
 <td>ARLA_CACHE</td>
 <td>AUDIT_PACKAGES_FLAGS</td>
 </tr>
 <tr>
 <td>AUDIT_PACKAGES_FLAGS</td>
 <td>AUTOCONF_REQD</td>
 <td>AUTOMAKE_OVERRIDE</td>
 </tr>
 <tr>
 <td>AUTOMAKE_OVERRIDE</td>
 <td>AUTOMAKE_REQD</td>
 <td>AUTO_MKDIRS</td>
 </tr>
 <tr>
 <td>AUTO_MKDIRS</td>
 <td>BDB185_DEFAULT</td>
 <td>BDBBASE</td>
 </tr>
 <tr>
 <td>BDBBASE</td>
 <td>BDB_ACCEPTED</td>
 <td>BDB_DEFAULT</td>
 </tr>
 <tr>
 <td>BDB_DEFAULT</td>
 <td>BDB_LIBS</td>
 <td>BDB_TYPE</td>
 </tr>
 <tr>
 <td>BDB_TYPE</td>
 <td>BINCIMAP_GROUP</td>
 <td>BINCIMAP_USER</td>
 </tr>
 <tr>
 <td>BINCIMAP_USER</td>
 <td>BIND_DIR</td>
 <td>BIND_GROUP</td>
 </tr>
 <tr>
 <td>BIND_GROUP</td>
 <td>BIND_USER</td>
 <td>BINOWN</td>
 </tr>
 <tr>
 <td>BINOWN</td>
 <td>BINPKG_SITES</td>
 <td>BIN_INSTALL_FLAGS</td>
 </tr>
 <tr>
 <td>BIN_INSTALL_FLAGS</td>
 <td>BISON_PKGDATADIR</td>
 <td>BLAS</td>
 </tr>
 <tr>
 <td>BLAS</td>
 <td>BLAS_ACCEPTED</td>
 <td>BLAS_C_INTERFACE</td>
 </tr>
 <tr>
 <td>BLAS_C_INTERFACE</td>
 <td>BLAS_INCLUDES</td>
 <td>BLAS_INDEX64</td>
 </tr>
 <tr>
 <td>BLAS_INDEX64</td>
 <td>BLAS_LIBS</td>
 <td>BLAS_TYPE</td>
 </tr>
 <tr>
 <td>BLAS_TYPE</td>
 <td>BOOTSTRAP_DEPENDS</td>
 <td>BROKEN</td>
 </tr>
 <tr>
 <td>BROKEN</td>
 <td>BROKEN_EXCEPT_ON_PLATFORM</td>
 <td>BROKEN_ON_PLATFORM</td>
 </tr>
 <tr>
 <td>BROKEN_ON_PLATFORM</td>
 <td>BSDSRCDIR</td>
 <td>BSDXSRCDIR</td>
 </tr>
 <tr>
 <td>BSDXSRCDIR</td>
 <td>BSD_MAKE_ENV</td>
 <td>BUILDLINK_AUTO_DIRS</td>
 </tr>
 <tr>
 <td>BUILDLINK_AUTO_DIRS</td>
 <td>BUILDLINK_AUTO_VARS</td>
 <td>BUILDLINK_CFLAGS</td>
 </tr>
 <tr>
 <td>BUILDLINK_CFLAGS</td>
 <td>BUILDLINK_CONTENTS_FILTER</td>
 </tr>
 <tr>
 <td>BUILDLINK_CPPFLAGS</td>
 <td>BUILDLINK_DEPMETHOD</td>
 </tr>
 <tr>
 <td>BUILDLINK_FILES</td>
 <td>BUILDLINK_FILES_CMD</td>
 </tr>
 <tr>
 <td>BUILDLINK_FNAME_TRANSFORM</td>
 <td>BUILDLINK_LDFLAGS</td>
 </tr>
 <tr>
 <td>BUILDLINK_LIBS</td>
 <td>BUILDLINK_OPSYS_SUPPORT_PTHREAD</td>
 </tr>
 @@ -11920,115 +11984,127 @@ source packages
 <td>CCACHE_DIR</td>
 <td>CCACHE_LOGFILE</td>
 </tr>
 <tr>
 <td>CC_VERSION</td>
 <td>CC_VERSION_STRING</td>
 </tr>
 <tr>
 <td>CDRECORD_CONF</td>
 <td>CDROM_PKG_URL_DIR</td>
 </tr>
 <tr>
 <td>CDROM_PKG_URL_HOST</td>
-<td>CHECK_COMPILER</td>
+<td>CHECKOUT_DATE</td>
 </tr>
 <tr>
 <td>CHECK_COMPILER</td>
 <td>CHECK_FAKEHOME</td>
 <td>CHECK_FILES</td>
 </tr>
 <tr>
 <td>CHECK_FILES</td>
 <td>CHECK_FILES_SKIP</td>
 <td>CHECK_FILES_STRICT</td>
 </tr>
 <tr>
 <td>CHECK_FILES_STRICT</td>
 <td>CHECK_HEADERS</td>
 <td>CHECK_HEADERS_SKIP</td>
 </tr>
 <tr>
 <td>CHECK_HEADERS_SKIP</td>
 <td>CHECK_INTERPRETER</td>
 <td>CHECK_INTERPRETER_SKIP</td>
 </tr>
 <tr>
 <td>CHECK_INTERPRETER_SKIP</td>
 <td>CHECK_PERMS</td>
 <td>CHECK_PERMS_AUTOFIX</td>
 </tr>
 <tr>
 <td>CHECK_PERMS_AUTOFIX</td>
 <td>CHECK_PERMS_SKIP</td>
 <td>CHECK_PIE</td>
 </tr>
 <tr>
 <td>CHECK_PIE</td>
 <td>CHECK_PIE_SKIP</td>
 <td>CHECK_PIE_SUPPORTED</td>
 </tr>
 <tr>
 <td>CHECK_PIE_SUPPORTED</td>
 <td>CHECK_PORTABILITY</td>
 <td>CHECK_PORTABILITY_EXPERIMENTAL</td>
 </tr>
 <tr>
 <td>CHECK_PORTABILITY_EXPERIMENTAL</td>
 <td>CHECK_PORTABILITY_SKIP</td>
 <td>CHECK_RELRO</td>
 </tr>
 <tr>
 <td>CHECK_RELRO</td>
 <td>CHECK_RELRO_SKIP</td>
 <td>CHECK_RELRO_SUPPORTED</td>
 </tr>
 <tr>
 <td>CHECK_RELRO_SUPPORTED</td>
 <td>CHECK_SHLIBS</td>
 <td>CHECK_SHLIBS_SKIP</td>
 </tr>
 <tr>
 <td>CHECK_SHLIBS_SKIP</td>
 <td>CHECK_SHLIBS_SUPPORTED</td>
 <td>CHECK_SHLIBS_TOXIC</td>
 </tr>
 <tr>
 <td>CHECK_SHLIBS_TOXIC</td>
 <td>CHECK_SSP</td>
 <td>CHECK_SSP_SKIP</td>
 </tr>
 <tr>
 <td>CHECK_SSP_SKIP</td>
 <td>CHECK_SSP_SUPPORTED</td>
 <td>CHECK_STRIPPED</td>
 </tr>
 <tr>
 <td>CHECK_STRIPPED</td>
 <td>CHECK_STRIPPED_SKIP</td>
 <td>CHECK_WRKREF</td>
 </tr>
 <tr>
 <td>CHECK_WRKREF</td>
 <td>CHECK_WRKREF_EXTRA_DIRS</td>
 <td>CHECK_WRKREF_SKIP</td>
 </tr>
 <tr>
 <td>CHECK_WRKREF_SKIP</td>
 <td>CLAMAV_DBDIR</td>
 <td>CLAMAV_GROUP</td>
 </tr>
 <tr>
 <td>CLAMAV_GROUP</td>
 <td>CLAMAV_USER</td>
 <td>CLANGBASE</td>
 </tr>
 <tr>
 <td>CLANGBASE</td>
 <td>CLEANDEPENDS</td>
 <td>CMAKE_DEPENDENCIES_REWRITE</td>
 </tr>
 <tr>
 <td>CMAKE_DEPENDENCIES_REWRITE</td>
 <td>CMAKE_INSTALL_NAME_DIR</td>
 <td>CMAKE_INSTALL_PREFIX</td>
 </tr>
 <tr>
 <td>CMAKE_INSTALL_PREFIX</td>
 <td>CMAKE_MODULE_PATH_OVERRIDE</td>
 <td>CMAKE_PKGSRC_BUILD_FLAGS</td>
 </tr>
 <tr>
 <td>CMAKE_PKGSRC_BUILD_FLAGS</td>
 <td>CMAKE_PREFIX_PATH</td>
 </tr>
 <tr>
 <td>CMAKE_USE_GNU_INSTALL_DIRS</td>
 <td>COMMON_LISP_DOCFILES</td>
 </tr>
 <tr>
 <td>COMMON_LISP_EXAMPLES</td>
 <td>COMMON_LISP_EXTRAFILES</td>
 </tr>
 <tr>
 <td>COMMON_LISP_PACKAGES</td>
 <td>COMMON_LISP_SYSTEM</td>
 </tr>
 <tr>
 <td>COMPILER_RPATH_FLAG</td>
 <td>COMPILER_USE_SYMLINKS</td>
 </tr>
 <tr>
 <td>CONFIGURE_ARGS</td>
 <td>CONFIGURE_DIRS</td>
 </tr>
 <tr>
 <td>CONFIGURE_ENV</td>
 <td>CONFIGURE_ENV_SHELL</td>
 </tr>
 @@ -12071,254 +12147,282 @@ source packages
 <tr>
 <td>CTYPE</td>
 <td>CUPS_GROUP</td>
 </tr>
 <tr>
 <td>CUPS_SYSTEM_GROUPS</td>
 <td>CUPS_USER</td>
 </tr>
 <tr>
 <td>CURSES_DEFAULT</td>
 <td>CURSES_TYPE</td>
 </tr>
 <tr>
 <td>CVS_EXTRACTDIR</td>
 <td>CVS_MODULE</td>
 </tr>
 <tr>
 <td>CVS_PROJECT</td>
 <td>CVS_REPOSITORIES</td>
 </tr>
 <tr>
 <td>CVS_ROOT</td>
 <td>CVS_ROOT_GNU</td>
 </tr>
 <tr>
 <td>CVS_ROOT_NONGNU</td>
 <td>CVS_ROOT_SOURCEFORGE</td>
 </tr>
 <tr>
 <td>CVS_TAG</td>
 <td>CXX</td>
 <td>CYRUS_GROUP</td>
 </tr>
 <tr>
 <td>CYRUS_GROUP</td>
 <td>CYRUS_IDLE</td>
 <td>CYRUS_USER</td>
 </tr>
 <tr>
 <td>CYRUS_USER</td>
 <td>DAEMONTOOLS_GROUP</td>
 <td>DAEMONTOOLS_LOG_USER</td>
 </tr>
 <tr>
 <td>DAEMONTOOLS_LOG_USER</td>
 <td>DARWIN_NO_SYSTEM_LIBS</td>
 <td>DARWIN_REQUIRES_FILTER</td>
 </tr>
 <tr>
 <td>DARWIN_REQUIRES_FILTER</td>
 <td>DBUS_GROUP</td>
 <td>DBUS_USER</td>
 </tr>
 <tr>
 <td>DBUS_USER</td>
 <td>DEFANG_GROUP</td>
 <td>DEFANG_USER</td>
 </tr>
 <tr>
 <td>DEFANG_USER</td>
 <td>DEFAULT_ACCEPTABLE_LICENSES</td>
 <td>DEFAULT_DISTFILES</td>
 </tr>
 <tr>
 <td>DEFAULT_DISTFILES</td>
 <td>DEFAULT_IRC_SERVER</td>
 <td>DEFAULT_SERIAL_DEVICE</td>
 </tr>
 <tr>
 <td>DEFAULT_SERIAL_DEVICE</td>
 <td>DEF_UMASK</td>
 <td>DEINSTALLDEPENDS</td>
 </tr>
 <tr>
 <td>DEINSTALLDEPENDS</td>
 <td>DEINSTALL_SRC</td>
 <td>DEINSTALL_TEMPLATES</td>
 </tr>
 <tr>
 <td>DEINSTALL_TEMPLATES</td>
 <td>DELAYED_ERROR_MSG</td>
 <td>DELAYED_WARNING_MSG</td>
 </tr>
 <tr>
 <td>DELAYED_WARNING_MSG</td>
 <td>DEPENDS</td>
 <td>DEPENDS_TARGET</td>
 </tr>
 <tr>
 <td>DEPENDS_TARGET</td>
 <td>DEPENDS_TYPE</td>
 <td>DESTDIR</td>
 </tr>
 <tr>
 <td>DESTDIR</td>
 <td>DESTDIR_VARNAME</td>
 <td>DIALER_GROUP</td>
 </tr>
 <tr>
 <td>DIALER_GROUP</td>
 <td>DIGEST_REQD</td>
 <td>DISTDIR</td>
 </tr>
 <tr>
 <td>DISTDIR</td>
 <td>DISTFILES</td>
 <td>DISTINFO_FILE</td>
 </tr>
 <tr>
 <td>DISTINFO_FILE</td>
 <td>DISTNAME</td>
 <td>DIST_PATH</td>
 </tr>
 <tr>
 <td>DIST_PATH</td>
 <td>DIST_SUBDIR</td>
 <td>DJBDNS_AXFR_USER</td>
 </tr>
 <tr>
 <td>DJBDNS_AXFR_USER</td>
 <td>DJBDNS_CACHE_USER</td>
 <td>DJBDNS_DJBDNS_GROUP</td>
 </tr>
 <tr>
 <td>DJBDNS_DJBDNS_GROUP</td>
 <td>DJBDNS_LOG_USER</td>
 <td>DJBDNS_RBL_USER</td>
 </tr>
 <tr>
 <td>DJBDNS_RBL_USER</td>
 <td>DJBDNS_TINY_USER</td>
 <td>DLOPEN_REQUIRE_PTHREADS</td>
 </tr>
 <tr>
 <td>DLOPEN_REQUIRE_PTHREADS</td>
 <td>DL_AUTO_VARS</td>
 <td>DL_CFLAGS</td>
 </tr>
 <tr>
 <td>DL_CFLAGS</td>
 <td>DL_LDFLAGS</td>
 <td>DL_LIBS</td>
 </tr>
 <tr>
 <td>DL_LIBS</td>
 <td>DNS</td>
 <td>DOCOWN</td>
 </tr>
 <tr>
 <td>DOCOWN</td>
 <td>DOWNLOADED_DISTFILE</td>
 <td>DQCACHE_GROUP</td>
 </tr>
 <tr>
 <td>DQCACHE_GROUP</td>
 <td>DQCACHE_USER</td>
 <td>DT_LAYOUT</td>
 </tr>
 <tr>
 <td>DT_LAYOUT</td>
 <td>DYNAMIC_SITES_CMD</td>
 <td>DYNAMIC_SITES_SCRIPT</td>
 </tr>
 <tr>
 <td>DYNAMIC_SITES_SCRIPT</td>
 <td>ECHO</td>
 <td>ECHO_N</td>
 </tr>
 <tr>
 <td>ECHO_N</td>
 <td>ELK_GUI</td>
 <td>EMACS_TYPE</td>
 </tr>
 <tr>
 <td>EMACS_TYPE</td>
 <td>EMULDIR</td>
 <td>EMULSUBDIR</td>
 </tr>
 <tr>
 <td>EMULSUBDIR</td>
 <td>EMULSUBDIRSLASH</td>
 <td>EMUL_ARCH</td>
 </tr>
 <tr>
 <td>EMUL_ARCH</td>
 <td>EMUL_DISTRO</td>
 <td>EMUL_EXEC_FMT</td>
 </tr>
 <tr>
 <td>EMUL_EXEC_FMT</td>
 <td>EMUL_IS_NATIVE</td>
 <td>EMUL_MODULES</td>
 </tr>
 <tr>
 <td>EMUL_MODULES</td>
 <td>EMUL_OPSYS</td>
 <td>EMUL_PKG_FMT</td>
 </tr>
 <tr>
 <td>EMUL_PKG_FMT</td>
 <td>EMUL_PLATFORM</td>
 <td>EMUL_PLATFORMS</td>
 </tr>
 <tr>
 <td>EMUL_PLATFORMS</td>
 <td>EMUL_PREFER</td>
 <td>EMUL_REQD</td>
 </tr>
 <tr>
 <td>EMUL_REQD</td>
 <td>EMUL_TYPE</td>
 <td>ERROR_MSG</td>
 </tr>
 <tr>
 <td>ERROR_MSG</td>
 <td>EXIM_GROUP</td>
 <td>EXIM_USER</td>
 </tr>
 <tr>
 <td>EXIM_USER</td>
 <td>EXPORT_SYMBOLS_LDFLAGS</td>
 <td>EXTRACTOR</td>
 </tr>
 <tr>
 <td>EXTRACTOR</td>
 <td>EXTRACT_CMD</td>
 <td>EXTRACT_CMD_DEFAULT</td>
 </tr>
 <tr>
 <td>EXTRACT_CMD_DEFAULT</td>
 <td>EXTRACT_DIR</td>
 <td>EXTRACT_ELEMENTS</td>
 </tr>
 <tr>
 <td>EXTRACT_ELEMENTS</td>
 <td>EXTRACT_ENV</td>
 <td>EXTRACT_ONLY</td>
 </tr>
 <tr>
 <td>EXTRACT_ONLY</td>
 <td>EXTRACT_OPTS</td>
 <td>EXTRACT_SUFX</td>
 </tr>
 <tr>
 <td>EXTRACT_SUFX</td>
 <td>EXTRACT_USING</td>
 <td>FAIL</td>
 </tr>
 <tr>
 <td>FAIL</td>
 <td>FAILOVER_FETCH</td>
 <td>FAIL_MSG</td>
 </tr>
 <tr>
 <td>FAIL_MSG</td>
 <td>FAKE_NCURSES</td>
 <td>FAM</td>
 </tr>
 <tr>
 <td>FAM</td>
 <td>FAM_ACCEPTED</td>
 <td>FAM_DEFAULT</td>
 </tr>
 <tr>
 <td>FAM_DEFAULT</td>
 <td>FAM_SERVER</td>
 <td>FCPATH</td>
 </tr>
 <tr>
 <td>FCPATH</td>
 <td>FEATURE_CPPFLAGS</td>
 <td>FEATURE_LDFLAGS</td>
 </tr>
 <tr>
 <td>FEATURE_LDFLAGS</td>
 <td>FEATURE_LIBS</td>
 <td>FETCH_AFTER_ARGS</td>
 </tr>
 <tr>
 <td>FETCH_AFTER_ARGS</td>
 <td>FETCH_BEFORE_ARGS</td>
 <td>FETCH_CMD</td>
 </tr>
 <tr>
 <td>FETCH_CMD</td>
 <td>FETCH_OUTPUT_ARGS</td>
 <td>FETCH_PROXY</td>
 </tr>
 <tr>
 <td>FETCH_PROXY</td>
 <td>FETCH_RESUME_ARGS</td>
 <td>FETCH_TIMEOUT</td>
 </tr>
 <tr>
 <td>FETCH_TIMEOUT</td>
 <td>FETCH_USE_IPV4_ONLY</td>
 <td>FETCH_USING</td>
 </tr>
 <tr>
 <td>FETCH_USING</td>
 <td>FILES_SUBST</td>
 <td>FILES_SUBST_SED</td>
 </tr>
 <tr>
 <td>FILES_SUBST_SED</td>
 <td>FIX_SYSTEM_HEADERS</td>
 </tr>
 <tr>
 <td>FONTDIR</td>
 <td>FONTS_DIRS</td>
 </tr>
 <tr>
 <td>FONTS_VERBOSE</td>
 <td>FOO_HACKS_MK</td>
 </tr>
 <tr>
 <td>FOSSIL_EXTRACTDIR</td>
 <td>FOSSIL_REPO</td>
 </tr>
 <tr>
 <td>FOSSIL_REPOSITORIES</td>
 <td>FOSSIL_VERSION</td>
 </tr>
 <tr>
 <td>FOX_USE_XUNICODE</td>
 <td>FREEWNN_GROUP</td>
 </tr>
 <tr>
 <td>FREEWNN_USER</td>
 <td>FTP_PKG_URL_DIR</td>
 </tr>
 <tr>
 <td>FTP_PKG_URL_HOST</td>
 <td>GAMEDATAMODE</td>
 </tr>
 <tr>
 <td>GAMEDATA_PERMS</td>
 @@ -12375,26 +12479,46 @@ source packages
 <tr>
 <td>GHOSTSCRIPT_REQD</td>
 <td>GITHUB_PROJECT</td>
 </tr>
 <tr>
 <td>GITHUB_RELEASE</td>
 <td>GITHUB_SUBMODULES</td>
 </tr>
 <tr>
 <td>GITHUB_TAG</td>
 <td>GITHUB_TYPE</td>
 </tr>
 <tr>
 <td>GITLAB_PROJECT</td>
 <td>GITLAB_TAG</td>
 </tr>
 <tr>
 <td>GITLAB_TYPE</td>
 <td>GIT_BRANCH</td>
 </tr>
 <tr>
 <td>GIT_ENV</td>
 <td>GIT_EXTRACTDIR</td>
 </tr>
 <tr>
 <td>GIT_REPO</td>
 <td>GIT_REPOSITORIES</td>
 </tr>
 <tr>
 <td>GIT_REVISION</td>
 <td>GIT_TAG</td>
 </tr>
 <tr>
 <td>GNU</td>
 <td>GNU_CONFIGURE</td>
 </tr>
 <tr>
 <td>GNU_CONFIGURE_INFODIR</td>
 <td>GNU_CONFIGURE_MANDIR</td>
 </tr>
 <tr>
 <td>GNU_CONFIGURE_QUIET</td>
 <td>GNU_CONFIGURE_STRICT</td>
 </tr>
 <tr>
 <td>GODEP_REDIRECTS</td>
 @@ -12412,39 +12536,47 @@ source packages
 <td>GO_SRCPATH</td>
 <td>GO_VERSION_DEFAULT</td>
 </tr>
 <tr>
 <td>GROUP_SPECIFIC_PKGS</td>
 <td>GRUB_NETWORK_CARDS</td>
 </tr>
 <tr>
 <td>GRUB_PRESET_COMMAND</td>
 <td>GRUB_SCAN_ARGS</td>
 </tr>
 <tr>
 <td>GZIP</td>
-<td>HASKELL_ENABLE_DYNAMIC_EXECUTABLE</td>
+<td>HASKELL_COMPILER</td>
 </tr>
 <tr>
 <td>HASKELL_ENABLE_DYNAMIC_EXECUTABLE</td>
 <td>HASKELL_ENABLE_HADDOCK_DOCUMENTATION</td>
 <td>HASKELL_ENABLE_LIBRARY_PROFILING</td>
 </tr>
 <tr>
 <td>HASKELL_ENABLE_LIBRARY_PROFILING</td>
 <td>HASKELL_ENABLE_SHARED_LIBRARY</td>
 <td>HASKELL_OPTIMIZATION_LEVEL</td>
 </tr>
 <tr>
 <td>HASKELL_OPTIMIZATION_LEVEL</td>
 <td>HAS_CONFIGURE</td>
 </tr>
 <tr>
 <td>HEADER_TEMPLATES</td>
 <td>HG_REPO</td>
 </tr>
 <tr>
 <td>HG_REPOSITORIES</td>
 <td>HG_TAG</td>
 </tr>
 <tr>
 <td>HOMEPAGE</td>
 <td>HOST_PKGTOOLS_ARGS</td>
 </tr>
 <tr>
 <td>HOST_SPECIFIC_PKGS</td>
 <td>HOWL_GROUP</td>
 </tr>
 <tr>
 <td>HOWL_USER</td>
 <td>ICCBASE</td>
 </tr>
 @@ -12523,26 +12655,30 @@ source packages
 <tr>
 <td>IRRD_USE_PGP</td>
 <td>JABBERD_GROUP</td>
 </tr>
 <tr>
 <td>JABBERD_LOGDIR</td>
 <td>JABBERD_PIDDIR</td>
 </tr>
 <tr>
 <td>JABBERD_SPOOLDIR</td>
 <td>JABBERD_USER</td>
 </tr>
 <tr>
 <td>JAVA_APP_PATH</td>
 <td>JAVA_APP_TARGETS</td>
 </tr>
 <tr>
 <td>JAVA_BINPREFIX</td>
 <td>JAVA_CLASSPATH</td>
 </tr>
 <tr>
 <td>JAVA_HOME</td>
 <td>JAVA_LD_LIBRARY_PATH</td>
 </tr>
 <tr>
 <td>JAVA_NAME</td>
 <td>JAVA_UNLIMIT</td>
 </tr>
 <tr>
 <td>JAVA_WRAPPERS</td>
 @@ -12595,88 +12731,96 @@ source packages
 <tr>
 <td>LIBTOOLIZE_PLIST</td>
 <td>LIBTOOL_M4_OVERRIDE</td>
 </tr>
 <tr>
 <td>LIBUSB_TYPE</td>
 <td>LICENSE</td>
 </tr>
 <tr>
 <td>LINKER_RPATH_FLAG</td>
 <td>LINK_RPATH_FLAG</td>
 </tr>
 <tr>
 <td>LINUX_BASE_NODEPS</td>
 <td>LINUX_BASE_PREFERRED</td>
 </tr>
 <tr>
 <td>LINUX_BASE_REQUIRED</td>
 <td>LINUX_LOCALES</td>
 <td>LOCALBASE</td>
 </tr>
 <tr>
 <td>LOCALBASE</td>
 <td>LOCALBASE_LOCKTYPE</td>
 <td>LOCALPATCHES</td>
 </tr>
 <tr>
 <td>LOCALPATCHES</td>
 <td>LOVE_DATA</td>
 <td>LOVE_GAME</td>
 </tr>
 <tr>
 <td>LOVE_GAME</td>
 <td>LOVE_VERSION</td>
 <td>LP32PLATFORMS</td>
 </tr>
 <tr>
 <td>LP32PLATFORMS</td>
 <td>LP64PLATFORMS</td>
 <td>LUA_BUSTED_ARGS</td>
 </tr>
 <tr>
 <td>LUA_BUSTED_ARGS</td>
 <td>LUA_CDIR</td>
 <td>LUA_COMPILER</td>
 </tr>
 <tr>
 <td>LUA_COMPILER</td>
 <td>LUA_DOCDIR</td>
 <td>LUA_EXAMPLESDIR</td>
 </tr>
 <tr>
 <td>LUA_EXAMPLESDIR</td>
 <td>LUA_INCDIR</td>
 <td>LUA_INTERPRETER</td>
 </tr>
 <tr>
 <td>LUA_INTERPRETER</td>
 <td>LUA_LDIR</td>
 <td>LUA_LINKER_MAGIC</td>
 </tr>
 <tr>
 <td>LUA_LINKER_MAGIC</td>
 <td>LUA_PKGPREFIX</td>
 <td>LUA_SELF_CONFLICT</td>
 </tr>
 <tr>
 <td>LUA_SELF_CONFLICT</td>
 <td>LUA_USE_BUSTED</td>
 <td>LUA_VERSIONS_ACCEPTED</td>
 </tr>
 <tr>
 <td>LUA_VERSIONS_ACCEPTED</td>
 <td>LUA_VERSIONS_INCOMPATIBLE</td>
 <td>LUA_VERSION_DEFAULT</td>
 </tr>
 <tr>
 <td>LUA_VERSION_DEFAULT</td>
 <td>LUA_VERSION_REQD</td>
 <td>Lua</td>
 </tr>
 <tr>
 <td>Lua</td>
 <td>MACHINE_PLATFORM</td>
 <td>MAILAGENT_DOMAIN</td>
 </tr>
 <tr>
 <td>MAILAGENT_DOMAIN</td>
 <td>MAILAGENT_EMAIL</td>
 <td>MAILAGENT_FQDN</td>
 </tr>
 <tr>
 <td>MAILAGENT_FQDN</td>
 <td>MAILAGENT_ORGANIZATION</td>
 </tr>
 <tr>
 <td>MAJORDOMO_HOMEDIR</td>
 <td>MAJOR_OS_VERSION</td>
 </tr>
 <tr>
 <td>MAKEINFO_ARGS</td>
 <td>MAKE_DIRS</td>
 </tr>
 <tr>
 <td>MAKE_DIRS_PERMS</td>
 <td>MAKE_ENV</td>
 </tr>
 <tr>
 <td>MAKE_FILE</td>
 <td>MAKE_FLAGS</td>
 </tr>
 @@ -12743,175 +12887,183 @@ source packages
 <tr>
 <td>MOTIF_TYPE</td>
 <td>MOTIF_TYPE_DEFAULT</td>
 </tr>
 <tr>
 <td>MPI_TYPE</td>
 <td>MSGFMT_STRIP_MSGCTXT</td>
 </tr>
 <tr>
 <td>MSGFMT_STRIP_MSGID_PLURAL</td>
 <td>MTOOLS_ENABLE_FLOPPYD</td>
 </tr>
 <tr>
 <td>MUST</td>
 <td>MV</td>
 <td>MYSQL_CHARSET</td>
 </tr>
 <tr>
 <td>MYSQL_CHARSET</td>
 <td>MYSQL_DATADIR</td>
 <td>MYSQL_EXTRA_CHARSET</td>
 </tr>
 <tr>
 <td>MYSQL_EXTRA_CHARSET</td>
 <td>MYSQL_GROUP</td>
 <td>MYSQL_USER</td>
 </tr>
 <tr>
 <td>MYSQL_USER</td>
 <td>MYSQL_VERSION</td>
 <td>MYSQL_VERSIONS_ACCEPTED</td>
 </tr>
 <tr>
 <td>MYSQL_VERSIONS_ACCEPTED</td>
 <td>MYSQL_VERSIONS_ALL</td>
 <td>MYSQL_VERSION_DEFAULT</td>
 </tr>
 <tr>
 <td>MYSQL_VERSION_DEFAULT</td>
 <td>NAGIOSCMD_GROUP</td>
 <td>NAGIOSDIR</td>
 </tr>
 <tr>
 <td>NAGIOSDIR</td>
 <td>NAGIOS_GROUP</td>
 <td>NAGIOS_USER</td>
 </tr>
 <tr>
 <td>NAGIOS_USER</td>
 <td>NATIVE_APPEND_ABI</td>
 <td>NATIVE_APPEND_ELF</td>
 </tr>
 <tr>
 <td>NATIVE_APPEND_ELF</td>
 <td>NATIVE_EXEC_FMT</td>
 <td>NATIVE_MACHINE_PLATFORM</td>
 </tr>
 <tr>
 <td>NATIVE_MACHINE_PLATFORM</td>
 <td>NATIVE_OBJECT_FMT</td>
 <td>NBPAX_PROGRAM_PREFIX</td>
 </tr>
 <tr>
 <td>NBPAX_PROGRAM_PREFIX</td>
 <td>NETBSD_LOGIN_NAME</td>
 <td>NMH_EDITOR</td>
 </tr>
 <tr>
 <td>NMH_EDITOR</td>
 <td>NMH_MTA</td>
 <td>NMH_PAGER</td>
 </tr>
 <tr>
 <td>NMH_PAGER</td>
 <td>NODE_VERSIONS_ACCEPTED</td>
 <td>NODE_VERSIONS_INCOMPATIBLE</td>
 </tr>
 <tr>
 <td>NODE_VERSIONS_INCOMPATIBLE</td>
 <td>NODE_VERSION_DEFAULT</td>
 <td>NODE_VERSION_REQD</td>
 </tr>
 <tr>
 <td>NODE_VERSION_REQD</td>
 <td>NOLOGIN</td>
 <td>NOTE</td>
 </tr>
 <tr>
 <td>NOTE</td>
 <td>NOT_FOR_PLATFORM</td>
 <td>NOT_PAX_ASLR_SAFE</td>
 </tr>
 <tr>
 <td>NOT_PAX_ASLR_SAFE</td>
 <td>NOT_PAX_MPROTECT_SAFE</td>
 <td>NO_BUILD</td>
 </tr>
 <tr>
 <td>NO_BUILD</td>
 <td>NO_CHECKSUM</td>
 <td>NO_CONFIGURE</td>
 </tr>
 <tr>
 <td>NO_CONFIGURE</td>
 <td>NO_SKIP</td>
 <td>NS_PREFERRED</td>
 </tr>
 <tr>
 <td>NS_PREFERRED</td>
 <td>NULLMAILER_GROUP</td>
 <td>NULLMAILER_USER</td>
 </tr>
 <tr>
 <td>NULLMAILER_USER</td>
 <td>OASIS</td>
 <td>OASIS_BUILD_ARGS</td>
 </tr>
 <tr>
 <td>OASIS_BUILD_ARGS</td>
 <td>OBJHOSTNAME</td>
 <td>OBJMACHINE</td>
 </tr>
 <tr>
 <td>OBJMACHINE</td>
 <td>OCAML_FINDLIB_DIRS</td>
 <td>OCAML_FINDLIB_REGISTER</td>
 </tr>
 <tr>
 <td>OCAML_FINDLIB_REGISTER</td>
 <td>OCAML_FINDLIB_REGISTER_VERBOSE</td>
 <td>OCAML_SITELIBDIR</td>
 </tr>
 <tr>
 <td>OCAML_SITELIBDIR</td>
 <td>OCAML_TOPKG_DOCDIR</td>
 <td>OCAML_USE_DUNE</td>
 </tr>
 <tr>
 <td>OCAML_USE_DUNE</td>
 <td>OCAML_USE_FINDLIB</td>
 <td>OCAML_USE_OASIS</td>
 </tr>
 <tr>
 <td>OCAML_USE_OASIS</td>
 <td>OCAML_USE_OASIS_DYNRUN</td>
 <td>OCAML_USE_OPAM</td>
 </tr>
 <tr>
 <td>OCAML_USE_OPAM</td>
 <td>OCAML_USE_OPT_COMPILER</td>
 <td>OCAML_USE_TOPKG</td>
 </tr>
 <tr>
 <td>OCAML_USE_TOPKG</td>
 <td>OMF</td>
 <td>ONLY_FOR_COMPILER</td>
 </tr>
 <tr>
 <td>ONLY_FOR_COMPILER</td>
 <td>ONLY_FOR_PLATFORM</td>
 <td>OPENSSH_CHROOT</td>
 </tr>
 <tr>
 <td>OPENSSH_CHROOT</td>
 <td>OPENSSH_GROUP</td>
 <td>OPENSSH_USER</td>
 </tr>
 <tr>
 <td>OPENSSH_USER</td>
 <td>OPSYS</td>
 <td>OPSYS_EMULDIR</td>
 </tr>
 <tr>
 <td>OPSYS_EMULDIR</td>
 <td>OPSYS_VERSION</td>
 <td>OS</td>
 </tr>
 <tr>
 <td>OS</td>
 <td>OSS_TYPE</td>
 <td>OSX</td>
 </tr>
 <tr>
 <td>OSX</td>
 <td>OSX_TOLERATE_SDK_SKEW</td>
 <td>OS_VARIANT</td>
 </tr>
 <tr>
 <td>OS_HAVE_ALSA</td>
 <td>OS_HAVE_RCD</td>
 </tr>
 <tr>
 <td>OS_VARIANT</td>
 <td>OS_VERSION</td>
 <td>OTF_FONTS_DIR</td>
 </tr>
 <tr>
 <td>OTF_FONTS_DIR</td>
 <td>OVERRIDE_DIRDEPTH</td>
 <td>OVERRIDE_GEMSPEC</td>
 </tr>
 <tr>
 <td>OVERRIDE_GEMSPEC</td>
 <td>OVERRIDE_GNU_CONFIG_SCRIPTS</td>
 </tr>
 <tr>
 <td>OVERRIDE_ROCKSPEC</td>
 <td>OWN_DIRS</td>
 </tr>
 <tr>
 <td>OWN_DIRS_PERMS</td>
 <td>P4GROUP</td>
 </tr>
 <tr>
 <td>P4PORT</td>
 <td>P4ROOT</td>
 </tr>
 <tr>
 <td>P4USER</td>
 <td>PACKAGES</td>
 @@ -12939,26 +13091,34 @@ source packages
 <tr>
 <td>PATCH_DIST_CAT</td>
 <td>PATCH_DIST_STRIP</td>
 </tr>
 <tr>
 <td>PATCH_FUZZ_FACTOR</td>
 <td>PATCH_STRIP</td>
 </tr>
 <tr>
 <td>PATH</td>
 <td>PCCBASE</td>
 </tr>
 <tr>
 <td>PEAR</td>
 <td>PEAR_CHANNEL</td>
 </tr>
 <tr>
 <td>PEAR_CHANNEL_ALIAS</td>
 <td>PEAR_CHANNEL_VERSION</td>
 </tr>
 <tr>
 <td>PEAR_CMD</td>
 <td>PEAR_LIB</td>
 </tr>
 <tr>
 <td>PEAR_PACKAGE_XML</td>
 <td>PERL5</td>
 </tr>
 <tr>
 <td>PERL5_CONFIGURE</td>
 <td>PERL5_CONFIGURE_DIRS</td>
 </tr>
 <tr>
 <td>PERL5_LDFLAGS</td>
 @@ -13331,308 +13491,320 @@ source packages
 <tr>
 <td>QORE_VERSION</td>
 <td>QPOPPER_FAC</td>
 </tr>
 <tr>
 <td>QPOPPER_SPOOL_DIR</td>
 <td>QPOPPER_USER</td>
 </tr>
 <tr>
 <td>RAKE_NAME</td>
 <td>RASMOL_DEPTH</td>
 </tr>
 <tr>
 <td>RCD_DIR</td>
 <td>RCD_ORDER</td>
 </tr>
 <tr>
 <td>RCD_SCRIPTS</td>
 <td>RCD_SCRIPTS_DIR</td>
 </tr>
 <tr>
 <td>RCD_SCRIPTS_EXAMPLEDIR</td>
 <td>RCD_SCRIPTS_MODE</td>
 </tr>
 <tr>
 <td>RCD_SCRIPTS_SHELL</td>
 <td>RCD_SCRIPT_SRC</td>
 </tr>
 <tr>
 <td>RCD_SUBR</td>
 <td>RDOC</td>
 <td>READLINE_DEFAULT</td>
 </tr>
 <tr>
 <td>READLINE_DEFAULT</td>
 <td>READLINE_TYPE</td>
 <td>REAL_ROOT_GROUP</td>
 </tr>
 <tr>
 <td>REAL_ROOT_GROUP</td>
 <td>REAL_ROOT_USER</td>
 <td>RECURSIVE_MAKE</td>
 </tr>
 <tr>
 <td>RECURSIVE_MAKE</td>
 <td>RELAY_CTRL_DIR</td>
 <td>RELRO_SUPPORTED</td>
 </tr>
 <tr>
 <td>RELRO_SUPPORTED</td>
 <td>REPLACE_AWK</td>
 <td>REPLACE_BASH</td>
 </tr>
 <tr>
 <td>REPLACE_BASH</td>
 <td>REPLACE_CSH</td>
 <td>REPLACE_KSH</td>
 </tr>
 <tr>
 <td>REPLACE_KSH</td>
 <td>REPLACE_LUA</td>
 <td>REPLACE_NODEJS</td>
 </tr>
 <tr>
 <td>REPLACE_NODEJS</td>
 <td>REPLACE_OCTAVE</td>
 <td>REPLACE_PERL</td>
 </tr>
 <tr>
 <td>REPLACE_PERL</td>
 <td>REPLACE_PERL6</td>
 <td>REPLACE_PHP</td>
 </tr>
 <tr>
 <td>REPLACE_PHP</td>
 <td>REPLACE_PYTHON</td>
 <td>REPLACE_QORE</td>
 </tr>
 <tr>
 <td>REPLACE_QORE</td>
 <td>REPLACE_R</td>
 <td>REPLACE_RUBY</td>
 </tr>
 <tr>
 <td>REPLACE_RUBY</td>
 <td>REPLACE_RUBY_DIRS</td>
 <td>REPLACE_RUBY_PAT</td>
 </tr>
 <tr>
 <td>REPLACE_RUBY_PAT</td>
 <td>REPLACE_SH</td>
 <td>REPLACE_TEXLUA</td>
 </tr>
 <tr>
 <td>REPLACE_TEXLUA</td>
 <td>REPLACE_WISH</td>
 <td>REQD_DIRS</td>
 </tr>
 <tr>
 <td>REQD_DIRS</td>
 <td>REQD_DIRS_PERMS</td>
 <td>REQD_FILES</td>
 </tr>
 <tr>
 <td>REQD_FILES</td>
 <td>REQD_FILES_MODE</td>
 <td>REQD_FILES_PERMS</td>
 </tr>
 <tr>
 <td>REQD_FILES_PERMS</td>
 <td>RESOLV_AUTO_VARS</td>
 <td>RESOLV_LDFLAGS</td>
 </tr>
 <tr>
 <td>RESOLV_LDFLAGS</td>
 <td>RESOLV_LIBS</td>
 </tr>
 <tr>
 <td>RM</td>
 <td>ROCKSPEC_NAME</td>
 </tr>
 <tr>
 <td>ROCKSPEC_SPECFILE</td>
 <td>ROOT_CMD</td>
 <td>ROOT_GROUP</td>
 </tr>
 <tr>
 <td>ROOT_GROUP</td>
 <td>ROOT_USER</td>
 <td>RPCGEN</td>
 </tr>
 <tr>
 <td>RPCGEN</td>
 <td>RPM</td>
 <td>RPM2PKG_PLIST</td>
 </tr>
 <tr>
 <td>RPM2PKG_PLIST</td>
 <td>RPM2PKG_PREFIX</td>
 <td>RPM2PKG_STAGE</td>
 </tr>
 <tr>
 <td>RPM2PKG_STAGE</td>
 <td>RPM2PKG_STRIP</td>
 <td>RPM2PKG_SUBPREFIX</td>
 </tr>
 <tr>
 <td>RPM2PKG_SUBPREFIX</td>
 <td>RPMFILES</td>
 <td>RPMIGNOREPATH</td>
 </tr>
 <tr>
 <td>RPMIGNOREPATH</td>
 <td>RPM_DB_PREFIX</td>
 <td>RSSH_CVS_PATH</td>
 </tr>
 <tr>
 <td>RSSH_CVS_PATH</td>
 <td>RSSH_RDIST_PATH</td>
 <td>RSSH_RSYNC_PATH</td>
 </tr>
 <tr>
 <td>RSSH_RSYNC_PATH</td>
 <td>RSSH_SCP_PATH</td>
 <td>RSSH_SFTP_SERVER_PATH</td>
 </tr>
 <tr>
 <td>RSSH_SFTP_SERVER_PATH</td>
 <td>RUBY</td>
 <td>RUBYGEM</td>
 </tr>
 <tr>
 <td>RUBYGEM</td>
 <td>RUBYGEM_NAME</td>
 <td>RUBYGEM_OPTIONS</td>
 </tr>
 <tr>
 <td>RUBYGEM_OPTIONS</td>
 <td>RUBYGEM_VERBOSE</td>
 <td>RUBY_ABI_VERSION</td>
 </tr>
 <tr>
 <td>RUBY_ABI_VERSION</td>
 <td>RUBY_ARCH</td>
 <td>RUBY_ARCHINC</td>
 </tr>
 <tr>
 <td>RUBY_ARCHINC</td>
 <td>RUBY_ARCHLIB</td>
 <td>RUBY_BASE</td>
 </tr>
 <tr>
 <td>RUBY_BASE</td>
 <td>RUBY_BASERIDIR</td>
 <td>RUBY_BUILD_DOCUMENT</td>
 </tr>
 <tr>
 <td>RUBY_BUILD_DOCUMENT</td>
 <td>RUBY_DLEXT</td>
 <td>RUBY_DOC</td>
 </tr>
 <tr>
 <td>RUBY_DOC</td>
 <td>RUBY_DYNAMIC_DIRS</td>
 <td>RUBY_EG</td>
 </tr>
 <tr>
 <td>RUBY_EG</td>
 <td>RUBY_ENCODING_ARG</td>
 <td>RUBY_EXTCONF</td>
 </tr>
 <tr>
 <td>RUBY_EXTCONF</td>
 <td>RUBY_EXTCONF_CHECK</td>
 <td>RUBY_EXTCONF_DEBUG</td>
 </tr>
 <tr>
 <td>RUBY_EXTCONF_DEBUG</td>
 <td>RUBY_EXTCONF_MAKEFILE</td>
 <td>RUBY_GEM_ARCH</td>
 </tr>
 <tr>
 <td>RUBY_GEM_ARCH</td>
 <td>RUBY_GEM_BASE</td>
 <td>RUBY_INC</td>
 </tr>
 <tr>
 <td>RUBY_INC</td>
 <td>RUBY_LIB</td>
 <td>RUBY_LIB_BASE</td>
 </tr>
 <tr>
 <td>RUBY_LIB_BASE</td>
 <td>RUBY_NAME</td>
 <td>RUBY_NOVERSION</td>
 </tr>
 <tr>
 <td>RUBY_NOVERSION</td>
 <td>RUBY_PKGPREFIX</td>
 <td>RUBY_RAILS</td>
 </tr>
 <tr>
 <td>RUBY_RAILS</td>
 <td>RUBY_RAILS52_VERSION</td>
 <td>RUBY_RAILS60_VERSION</td>
 </tr>
 <tr>
 <td>RUBY_RAILS60_VERSION</td>
 <td>RUBY_RAILS61_VERSION</td>
 <td>RUBY_RAILS70_VERSION</td>
 </tr>
 <tr>
 <td>RUBY_RAILS70_VERSION</td>
 <td>RUBY_RAILS_ACCEPTED</td>
 <td>RUBY_RAILS_DEFAULT</td>
 </tr>
 <tr>
 <td>RUBY_RAILS_DEFAULT</td>
 <td>RUBY_RAILS_REQD</td>
 <td>RUBY_RAILS_STRICT_DEP</td>
 </tr>
 <tr>
 <td>RUBY_RAILS_STRICT_DEP</td>
 <td>RUBY_RIDIR</td>
 <td>RUBY_SETUP</td>
 </tr>
 <tr>
 <td>RUBY_SETUP</td>
 <td>RUBY_SHLIB</td>
 <td>RUBY_SHLIBALIAS</td>
 </tr>
 <tr>
 <td>RUBY_SHLIBALIAS</td>
 <td>RUBY_SHLIBVER</td>
 <td>RUBY_SIMPLE_INSTALL</td>
 </tr>
 <tr>
 <td>RUBY_SIMPLE_INSTALL</td>
 <td>RUBY_SITEARCHLIB</td>
 <td>RUBY_SITELIB</td>
 </tr>
 <tr>
 <td>RUBY_SITELIB</td>
 <td>RUBY_SITELIB_BASE</td>
 <td>RUBY_SITERIDIR</td>
 </tr>
 <tr>
 <td>RUBY_SITERIDIR</td>
 <td>RUBY_SLEXT</td>
 <td>RUBY_SRCDIR</td>
 </tr>
 <tr>
 <td>RUBY_SRCDIR</td>
 <td>RUBY_STATICLIB</td>
 <td>RUBY_SUFFIX</td>
 </tr>
 <tr>
 <td>RUBY_SUFFIX</td>
 <td>RUBY_SYSRIDIR</td>
 <td>RUBY_USE_PTHREAD</td>
 </tr>
 <tr>
 <td>RUBY_USE_PTHREAD</td>
 <td>RUBY_VENDORARCHLIB</td>
 <td>RUBY_VENDORLIB</td>
 </tr>
 <tr>
 <td>RUBY_VENDORLIB</td>
 <td>RUBY_VENDORLIB_BASE</td>
 <td>RUBY_VER</td>
 </tr>
 <tr>
 <td>RUBY_VER</td>
 <td>RUBY_VERSION</td>
 <td>RUBY_VERSIONS_ACCEPTED</td>
 </tr>
 <tr>
 <td>RUBY_VERSIONS_ACCEPTED</td>
 <td>RUBY_VERSIONS_INCOMPATIBLE</td>
 <td>RUBY_VERSION_DEFAULT</td>
 </tr>
 <tr>
 <td>RUBY_VERSION_DEFAULT</td>
 <td>RUBY_VERSION_REQD</td>
 <td>RUBY_VER_DIR</td>
 </tr>
 <tr>
 <td>RUBY_VER_DIR</td>
 <td>RUN</td>
 <td>RUN_LDCONFIG</td>
 </tr>
 <tr>
 <td>RUN_LDCONFIG</td>
 <td>RUST_TYPE</td>
 <td>SCO</td>
 </tr>
 <tr>
 <td>SCO</td>
 <td>SCREWS_GROUP</td>
 <td>SCREWS_USER</td>
 </tr>
 <tr>
 <td>SCREWS_USER</td>
 <td>SCRIPTS_ENV</td>
 <td>SCROLLKEEPER_DATADIR</td>
 </tr>
 <tr>
 <td>SCROLLKEEPER_DATADIR</td>
 <td>SCROLLKEEPER_REBUILDDB</td>
 <td>SCROLLKEEPER_UPDATEDB</td>
 </tr>
 <tr>
 <td>SCROLLKEEPER_UPDATEDB</td>
 <td>SDIST_PAWD</td>
 <td>SDL12_TYPE</td>
 </tr>
 <tr>
 <td>SDL12_TYPE</td>
 <td>SERIAL_DEVICES</td>
 <td>SETGIDGAME</td>
 </tr>
 <tr>
 <td>SETGIDGAME</td>
 <td>SETGID_GAMES_PERMS</td>
 <td>SETUID_ROOT_PERMS</td>
 </tr>
 <tr>
 <td>SETUID_ROOT_PERMS</td>
 <td>SH</td>
 </tr>
 <tr>
 <td>SHLIB</td>
 <td>SHORTNAME</td>
 </tr>
 <tr>
 <td>SIGN_PACKAGES</td>
 <td>SILC_CLIENT_WITH_PERL</td>
 </tr>
 <tr>
 <td>SITE_SPECIFIC_PKGS</td>
 <td>SKIP_DEPENDS</td>
 </tr>
 <tr>
 <td>SMF_INSTANCES</td>
 <td>SMF_MANIFEST</td>
 </tr>
 @@ -13699,26 +13871,34 @@ source packages
 <tr>
 <td>SUBST_SKIP_TEXT_CHECK</td>
 <td>SUBST_STAGE</td>
 </tr>
 <tr>
 <td>SUBST_VARS</td>
 <td>SUNWSPROBASE</td>
 </tr>
 <tr>
 <td>SUSE_PREFER</td>
 <td>SU_CMD</td>
 </tr>
 <tr>
 <td>SVN_EXTRACTDIR</td>
 <td>SVN_REPO</td>
 </tr>
 <tr>
 <td>SVN_REPOSITORIES</td>
 <td>SVN_REVISION</td>
 </tr>
 <tr>
 <td>SYSCONFBASE</td>
 <td>TARGET_ARCH</td>
 </tr>
 <tr>
 <td>TBL</td>
 <td>TERMCAP_TYPE</td>
 </tr>
 <tr>
 <td>TERMINFO_DEFAULT</td>
 <td>TERMINFO_TYPE</td>
 </tr>
 <tr>
 <td>TEST</td>
 @@ -13784,178 +13964,182 @@ source packages
 <td>TOOLS_GNU_MISSING</td>
 <td>TOOLS_LDCONFIG</td>
 </tr>
 <tr>
 <td>TOOLS_NOOP</td>
 <td>TOOLS_PATH</td>
 </tr>
 <tr>
 <td>TOOLS_SCRIPT</td>
 <td>TOOLS_USE_CROSS_COMPILE</td>
 </tr>
 <tr>
 <td>TOOL_DEPENDS</td>
-<td>TTF_FONTS_DIR</td>
+<td>TTF_FONTDIR</td>
 </tr>
 <tr>
 <td>TTF_FONTS_DIR</td>
 <td>TYPE</td>
 <td>UAC_REQD_EXECS</td>
 </tr>
 <tr>
 <td>UAC_REQD_EXECS</td>
 <td>UCSPI_SSL_GROUP</td>
 <td>UCSPI_SSL_USER</td>
 </tr>
 <tr>
 <td>UCSPI_SSL_USER</td>
 <td>UNLIMIT_RESOURCES</td>
 <td>UNPRIVILEGED</td>
 </tr>
 <tr>
 <td>UNPRIVILEGED</td>
 <td>UNPRIVILEGED_GROUP</td>
 <td>UNPRIVILEGED_GROUPS</td>
 </tr>
 <tr>
 <td>UNPRIVILEGED_GROUPS</td>
 <td>UNPRIVILEGED_USER</td>
 <td>UNWRAP_FILES</td>
 </tr>
 <tr>
 <td>UNWRAP_FILES</td>
 <td>UNWRAP_PATTERNS</td>
 <td>UPDATE_GEMSPEC</td>
 </tr>
 <tr>
 <td>UPDATE_GEMSPEC</td>
 <td>UPDATE_TARGET</td>
 <td>URI</td>
 </tr>
 <tr>
 <td>URI</td>
 <td>USERGROUP_PHASE</td>
 <td>USERPPP_GROUP</td>
 </tr>
 <tr>
 <td>USERPPP_GROUP</td>
 <td>USER_SPECIFIC_PKGS</td>
 <td>USE_ABI_DEPENDS</td>
 </tr>
 <tr>
 <td>USE_ABI_DEPENDS</td>
 <td>USE_APR</td>
 <td>USE_BSD_MAKEFILE</td>
 </tr>
 <tr>
 <td>USE_BSD_MAKEFILE</td>
 <td>USE_BUILTIN</td>
 <td>USE_CROSS_COMPILE</td>
 </tr>
 <tr>
 <td>USE_CROSS_COMPILE</td>
 <td>USE_CURSES</td>
 <td>USE_CWRAPPERS</td>
 </tr>
 <tr>
 <td>USE_CWRAPPERS</td>
 <td>USE_DB185</td>
 <td>USE_FEATURES</td>
 </tr>
 <tr>
 <td>USE_FEATURES</td>
 <td>USE_GAMESGROUP</td>
 <td>USE_GCC_RUNTIME</td>
 </tr>
 <tr>
 <td>USE_GCC_RUNTIME</td>
 <td>USE_IMAKE</td>
 <td>USE_JAVA</td>
 </tr>
 <tr>
 <td>USE_JAVA</td>
 <td>USE_JAVA2</td>
 <td>USE_LANGUAGES</td>
 </tr>
 <tr>
 <td>USE_LANGUAGES</td>
 <td>USE_LIBTOOL</td>
 <td>USE_NATIVE_GCC</td>
 </tr>
 <tr>
 <td>USE_NATIVE_GCC</td>
 <td>USE_NETBSD_REPO</td>
 <td>USE_PKGSRC_GCC</td>
 </tr>
 <tr>
 <td>USE_PKGSRC_GCC</td>
 <td>USE_PKGSRC_GCC_RUNTIME</td>
 <td>USE_PKGTASKS</td>
 </tr>
 <tr>
 <td>USE_PKGTASKS</td>
 <td>USE_PKG_ADMIN_DIGEST</td>
 <td>USE_RUBY_EXTCONF</td>
 </tr>
 <tr>
 <td>USE_RUBY_EXTCONF</td>
 <td>USE_RUBY_INSTALL</td>
 <td>USE_RUBY_SETUP</td>
 </tr>
 <tr>
 <td>USE_RUBY_SETUP</td>
 <td>USE_RUBY_SETUP_PKG</td>
 <td>USE_TOOLS</td>
 </tr>
 <tr>
 <td>USE_TOOLS</td>
 <td>UUCP_GROUP</td>
 <td>UUCP_USER</td>
 </tr>
 <tr>
 <td>UUCP_USER</td>
 <td>VARBASE</td>
 <td>VARNAME</td>
 </tr>
 <tr>
 <td>VARNAME</td>
 <td>VIM_EXTRA_OPTS</td>
 <td>WARNING_MSG</td>
 </tr>
 <tr>
 <td>WARNING_MSG</td>
 <td>WCALC_CGIDIR</td>
 <td>WCALC_CGIPATH</td>
 </tr>
 <tr>
 <td>WCALC_CGIPATH</td>
 <td>WCALC_HTMLDIR</td>
 <td>WCALC_HTMLPATH</td>
 </tr>
 <tr>
 <td>WCALC_HTMLPATH</td>
 <td>WDM_MANAGERS</td>
 <td>WRAPPER_CC</td>
 </tr>
 <tr>
 <td>WRAPPER_CC</td>
 <td>WRAPPER_REORDER_CMDS</td>
 <td>WRKDIR</td>
 </tr>
 <tr>
 <td>WRKDIR</td>
 <td>WRKDIR_BASENAME</td>
 <td>WRKDIR_LOCKTYPE</td>
 </tr>
 <tr>
 <td>WRKDIR_LOCKTYPE</td>
 <td>WRKLOG</td>
 <td>WRKOBJDIR</td>
 </tr>
 <tr>
 <td>WRKOBJDIR</td>
 <td>WRKSRC</td>
 <td>X10_PORT</td>
 </tr>
 <tr>
 <td>X10_PORT</td>
 <td>X11</td>
 <td>X11BASE</td>
 </tr>
 <tr>
 <td>X11BASE</td>
 <td>X11_PKGSRCDIR</td>
 <td>X11_TYPE</td>
 </tr>
 <tr>
 <td>X11_TYPE</td>
 <td>X509_CERTIFICATE</td>
 <td>X509_KEY</td>
 </tr>
 <tr>
 <td>X509_KEY</td>
 <td>XAW_TYPE</td>
 <td>XLOCK_DEFAULT_MODE</td>
 </tr>
 <tr>
 <td>XLOCK_DEFAULT_MODE</td>
 <td>XMKMF</td>
 <td>XMKMF_FLAGS</td>
 </tr>
 <tr>
 <td>XMKMF_FLAGS</td>
 <td>XXX</td>
 </tr>
 <tr>
 <td>XXXX</td>
 <td>YES</td>
 </tr>
 <tr>
 <td>ZSH_STATIC</td>
 <td>__stdc__</td>
 </tr>
 <tr>
 <td>_vargroups</td>
 <td>accept</td>
 </tr>
 <tr>
 <td>acquire-localbase-lock</td>
 <td>acquire-lock</td>
 @@ -14076,87 +14260,91 @@ source packages
 <td>configure_args</td>
 <td>connect</td>
 </tr>
 <tr>
 <td>cos</td>
 <td>cputime</td>
 </tr>
 <tr>
 <td>create-usergroup</td>
 <td>csh</td>
 </tr>
 <tr>
 <td>ctf</td>
-<td>debug</td>
+<td>cvs</td>
 </tr>
 <tr>
 <td>debug</td>
 <td>declaration</td>
 <td>declare</td>
 </tr>
 <tr>
 <td>declare</td>
 <td>defined</td>
 <td>depend</td>
 </tr>
 <tr>
 <td>depend</td>
 <td>dependencies</td>
 <td>depends</td>
 </tr>
 <tr>
 <td>depends</td>
 <td>depends-checksum</td>
 <td>depends-fetch</td>
 </tr>
 <tr>
 <td>depends-fetch</td>
 <td>deps</td>
 <td>describe</td>
 </tr>
 <tr>
 <td>describe</td>
 <td>destdir</td>
 <td>disable</td>
 </tr>
 <tr>
 <td>disable</td>
 <td>distclean</td>
 <td>distinfo</td>
 </tr>
 <tr>
 <td>distinfo</td>
 <td>dl</td>
 <td>dlopen</td>
 </tr>
 <tr>
 <td>dlopen</td>
 <td>do-buildlink</td>
 <td>do-clean</td>
 </tr>
 <tr>
 <td>do-clean</td>
 <td>do-configure</td>
 <td>do-configure-post-hook</td>
 </tr>
 <tr>
 <td>do-configure-post-hook</td>
 <td>do-extract</td>
 <td>do-fetch</td>
 </tr>
 <tr>
 <td>do-fetch</td>
 <td>do-install</td>
 <td>emul</td>
 </tr>
 <tr>
 <td>emul</td>
 <td>emul-distinfo</td>
 <td>emul-fetch</td>
 </tr>
 <tr>
 <td>emul-fetch</td>
 <td>emulation</td>
 <td>emulator</td>
 </tr>
 <tr>
 <td>emulator</td>
 <td>enable</td>
 </tr>
 <tr>
 <td>endian</td>
 <td>endif</td>
 </tr>
 <tr>
 <td>enomem</td>
 <td>ensurepip</td>
 </tr>
 <tr>
 <td>err</td>
 <td>errx</td>
 </tr>
 <tr>
 <td>etc</td>
 <td>exp</td>
 </tr>
 @@ -14175,79 +14363,87 @@ source packages
 <tr>
 <td>follows</td>
 <td>forbids</td>
 </tr>
 <tr>
 <td>form</td>
 <td>format</td>
 </tr>
 <tr>
 <td>fortify</td>
 <td>fortify_source</td>
 </tr>
 <tr>
 <td>fossil</td>
 <td>friend</td>
 <td>fts</td>
 </tr>
 <tr>
 <td>fts</td>
 <td>fts_close</td>
 <td>fts_open</td>
 </tr>
 <tr>
 <td>fts_open</td>
 <td>fts_read</td>
 <td>fts_set</td>
 </tr>
 <tr>
 <td>fts_set</td>
 <td>gcc</td>
 <td>gethostbyaddr</td>
 </tr>
 <tr>
 <td>gethostbyaddr</td>
 <td>gethostbyname</td>
 <td>gethostbyname2</td>
 </tr>
 <tr>
 <td>gethostbyname2</td>
 <td>getopt_long</td>
 <td>getprogname</td>
 </tr>
 <tr>
 <td>getprogname</td>
 <td>getservbyname</td>
 <td>getservbyport</td>
 </tr>
 <tr>
 <td>getservbyport</td>
 <td>getservent</td>
 </tr>
 <tr>
 <td>gettext</td>
 <td>git</td>
 </tr>
 <tr>
 <td>github</td>
-<td>glob</td>
+<td>gitlab</td>
 </tr>
 <tr>
 <td>glob</td>
 <td>gnu</td>
 <td>gnu_configure_strict</td>
 </tr>
 <tr>
 <td>gnu_configure_strict</td>
 <td>go</td>
 <td>go-deps</td>
 </tr>
 <tr>
 <td>go-deps</td>
 <td>golang</td>
 <td>guess-license</td>
 </tr>
 <tr>
 <td>guess-license</td>
 <td>hashbang</td>
 <td>heimdal</td>
 </tr>
 <tr>
 <td>heimdal</td>
 <td>help</td>
 </tr>
 <tr>
 <td>hg</td>
 <td>imake</td>
 </tr>
 <tr>
 <td>increment</td>
 <td>indirect</td>
 </tr>
 <tr>
 <td>inet_aton</td>
 <td>interp</td>
 </tr>
 <tr>
 <td>interpreter</td>
 <td>intl</td>
 @@ -14299,267 +14495,275 @@ source packages
 <tr>
 <td>locking</td>
 <td>lua</td>
 </tr>
 <tr>
 <td>lvalue</td>
 <td>make</td>
 </tr>
 <tr>
 <td>makesum</td>
 <td>memory</td>
 </tr>
 <tr>
 <td>mercurial</td>
 <td>meta</td>
 <td>meta-package</td>
 </tr>
 <tr>
 <td>meta-package</td>
 <td>meta_package</td>
 <td>mit-krb5</td>
 </tr>
 <tr>
 <td>mit-krb5</td>
 <td>mk.conf</td>
 <td>mkl</td>
 </tr>
 <tr>
 <td>mkl</td>
 <td>mount</td>
 <td>mprotect</td>
 </tr>
 <tr>
 <td>mprotect</td>
 <td>mremap</td>
 <td>nb</td>
 </tr>
 <tr>
 <td>nb</td>
 <td>nbcompat</td>
 <td>netlib</td>
 </tr>
 <tr>
 <td>netlib</td>
 <td>node</td>
 <td>node.js</td>
 </tr>
 <tr>
 <td>node.js</td>
 <td>nodejs</td>
 <td>obstack</td>
 </tr>
 <tr>
 <td>obstack</td>
 <td>obstack_ptr_grow</td>
 <td>occurs</td>
 </tr>
 <tr>
 <td>occurs</td>
 <td>only</td>
 <td>openblas</td>
 </tr>
 <tr>
 <td>openblas</td>
 <td>options</td>
 <td>options.mk</td>
 </tr>
 <tr>
 <td>options.mk</td>
 <td>order</td>
 <td>override</td>
 </tr>
 <tr>
 <td>override</td>
 <td>override-intltool</td>
 <td>override-message-intltool</td>
 </tr>
 <tr>
 <td>override-message-intltool</td>
 <td>package</td>
 <td>parallel</td>
 </tr>
 <tr>
 <td>parallel</td>
 <td>path</td>
 <td>pax</td>
 </tr>
 <tr>
 <td>pax</td>
 <td>paxctl</td>
 <td>pbulk-index</td>
 </tr>
 <tr>
 <td>pbulk-index</td>
 <td>pc</td>
 <td>perl</td>
 </tr>
 <tr>
 <td>perl</td>
 <td>perl5</td>
 <td>perms</td>
 </tr>
 <tr>
 <td>perms</td>
 <td>php</td>
 <td>pkg-build-options</td>
 </tr>
 <tr>
 <td>pkg-build-options</td>
 <td>pkg-config</td>
 <td>pkg_build_options</td>
 </tr>
 <tr>
 <td>pkg_build_options</td>
 <td>platform</td>
 <td>plist</td>
 </tr>
 <tr>
 <td>plist</td>
 <td>post-extract</td>
 <td>post-fetch</td>
 </tr>
 <tr>
 <td>post-fetch</td>
 <td>post-wrapper</td>
 <td>pre-build-checks-hook</td>
 </tr>
 <tr>
 <td>pre-build-checks-hook</td>
 <td>pre-configure</td>
 <td>pre-configure-checks-hook</td>
 </tr>
 <tr>
 <td>pre-configure-checks-hook</td>
 <td>pre-extract</td>
 <td>pre-fetch</td>
 </tr>
 <tr>
 <td>pre-fetch</td>
 <td>print-go-deps</td>
 <td>print-plist</td>
 </tr>
 <tr>
 <td>print-plist</td>
 <td>print-summary-data</td>
 <td>privileged-install-hook</td>
 </tr>
 <tr>
 <td>privileged-install-hook</td>
 <td>pypi</td>
 <td>python</td>
 </tr>
 <tr>
 <td>python</td>
 <td>r</td>
 <td>readme-all</td>
 </tr>
 <tr>
 <td>readme-all</td>
 <td>recursive</td>
 <td>recv</td>
 </tr>
 <tr>
 <td>recv</td>
 <td>recvfrom</td>
 <td>regcomp</td>
 </tr>
 <tr>
 <td>regcomp</td>
 <td>release-localbase-lock</td>
 <td>release-lock</td>
 </tr>
 <tr>
 <td>release-lock</td>
 <td>relro</td>
 <td>rename</td>
 </tr>
 <tr>
 <td>rename</td>
 <td>reorder</td>
 <td>replace</td>
 </tr>
 <tr>
 <td>replace</td>
 <td>replace_interpreter</td>
 <td>reproducible</td>
 </tr>
 <tr>
 <td>reproducible</td>
 <td>resolv</td>
 <td>root</td>
 </tr>
 <tr>
 <td>root</td>
 <td>ruby</td>
 <td>send</td>
 </tr>
 <tr>
 <td>send</td>
 <td>sendfile</td>
 <td>sendto</td>
 </tr>
 <tr>
 <td>sendto</td>
 <td>setenv</td>
 <td>setgid</td>
 </tr>
 <tr>
 <td>setgid</td>
 <td>setprogname</td>
 <td>setuid</td>
 </tr>
 <tr>
 <td>setuid</td>
 <td>sh</td>
 <td>shebang</td>
 </tr>
 <tr>
 <td>shebang</td>
 <td>show</td>
 <td>show-all</td>
 </tr>
 <tr>
 <td>show-all</td>
 <td>show-build-defs</td>
 <td>show-depends</td>
 </tr>
 <tr>
-<td>show-depends-all</td>
+<td>show-depends</td>
 <td>show-depends-dirs</td>
 </tr>
 <tr>
 <td>show-depends-pkgpaths</td>
-<td>show-deps</td>
+<td>show-depends-recursive</td>
 </tr>
 <tr>
 <td>show-deps</td>
 <td>show-distfiles</td>
 <td>show-downlevel</td>
 </tr>
 <tr>
 <td>show-downlevel</td>
 <td>show-subdir-var</td>
 <td>show-tools</td>
 </tr>
 <tr>
 <td>show-tools</td>
 <td>show-var</td>
 <td>show-vars</td>
 </tr>
 <tr>
 <td>show-vars</td>
 <td>snprintf</td>
 <td>socket</td>
 </tr>
 <tr>
 <td>socket</td>
 <td>ssp</td>
 <td>st_mode</td>
 </tr>
 <tr>
 <td>st_mode</td>
 <td>stage-install</td>
 <td>strcasestr</td>
 </tr>
 <tr>
 <td>strcasestr</td>
 <td>strict</td>
 <td>strip</td>
 </tr>
 <tr>
 <td>strip</td>
 <td>strndup</td>
 <td>strnlen</td>
 </tr>
 <tr>
 <td>strnlen</td>
 <td>strsep</td>
 <td>subst</td>
 </tr>
 <tr>
 <td>subst</td>
 <td>substitutions</td>
 </tr>
 <tr>
 <td>subversion</td>
 <td>sun</td>
 </tr>
 <tr>
 <td>sunpro</td>
 <td>sunwspro</td>
 </tr>
 <tr>
 <td>svn</td>
 <td>symlink</td>
 <td>test</td>
 </tr>
 <tr>
 <td>test</td>
 <td>test-env</td>
 <td>tex</td>
 </tr>
 <tr>
 <td>tex</td>
 <td>texlive</td>
 <td>tmp</td>
 </tr>
 <tr>
 <td>tmp</td>
 <td>tool</td>
 <td>tools</td>
 </tr>
 <tr>
 <td>tools</td>
 <td>tools-libtool-m4-override</td>
 </tr>
 <tr>
 <td>transitive</td>
 <td>type</td>
 </tr>
 <tr>
 <td>ulimit</td>
 <td>undefined</td>
 </tr>
 <tr>
 <td>undo-replace</td>
 <td>unlimit</td>
 </tr>
 <tr>
 <td>unprivileged</td>
 <td>unprivileged-install-hook</td>

 @@ -313,35 +313,37 @@ II. The pkgsrc developer's guide
 .2. The fetch phase
 .2.1. Packages whose distfiles aren't available for plain
                 downloading
 .2.2. How to handle modified distfiles with the 'old' name
 .2.3. Packages hosted on github.com
 .3. The configure phase
 .3.1. Shared libraries - libtool
 .3.2. Using libtool on GNU packages that already support libtool
 .3.3. GNU Autoconf/Automake
 .3.4. Meson / ninja
 .4. Programming languages
 .4.1. C, C++, and Fortran
 .4.2. Java
 .4.3. Go
-.4.4. Packages containing Perl scripts
+.4.4. Rust
-.4.5. Packages containing shell scripts
+.4.5. Packages containing Perl scripts
-.4.6. Other programming languages
+.4.6. Packages containing shell scripts
 .4.7. Other programming languages
 .5. The build phase
 .5.1. Compiling C and C++ code conditionally
 .5.2. How to handle compiler bugs
 .5.3. No such file or directory
 .5.4. Undefined reference to "..."
 .5.5. Running out of memory
 .6. The install phase
 .6.1. Creating needed directories
 .6.2. Where to install documentation
 @@ -2838,35 +2840,37 @@ Table of Contents
             framework)
 .2. The fetch phase
 .2.1. Packages whose distfiles aren't available for plain downloading
 .2.2. How to handle modified distfiles with the 'old' name
 .2.3. Packages hosted on github.com
 .3. The configure phase
 .3.1. Shared libraries - libtool
 .3.2. Using libtool on GNU packages that already support libtool
 .3.3. GNU Autoconf/Automake
 .3.4. Meson / ninja
 .4. Programming languages
 .4.1. C, C++, and Fortran
 .4.2. Java
 .4.3. Go
-.4.4. Packages containing Perl scripts
+.4.4. Rust
-.4.5. Packages containing shell scripts
+.4.5. Packages containing Perl scripts
-.4.6. Other programming languages
+.4.6. Packages containing shell scripts
 .4.7. Other programming languages
 .5. The build phase
 .5.1. Compiling C and C++ code conditionally
 .5.2. How to handle compiler bugs
 .5.3. No such file or directory
 .5.4. Undefined reference to "..."
 .5.5. Running out of memory
 .6. The install phase
 .6.1. Creating needed directories
 .6.2. Where to install documentation
 @@ -3470,32 +3474,31 @@ variables influence this.
 The automatic variable PREFIX indicates where all files of the final program
 shall be installed. It is usually set to LOCALBASE (/usr/pkg), or CROSSBASE for
 pkgs in the cross category. The value of PREFIX needs to be put into the
 various places in the program's source where paths to these files are encoded.
 See Section 12.3, "patches/*" and Section 21.3.1, "Shared libraries - libtool"
 for more details.
 When choosing which of these variables to use, follow the following rules:
   * PREFIX always points to the location where the current pkg will be
     installed. When referring to a pkg's own installation path, use "${PREFIX}"
+    .
-  * LOCALBASE is where all non-X11 pkgs are installed. If you need to construct
+  * LOCALBASE is where all pkgs are installed. If you need to construct a -I or
-    a -I or -L argument to the compiler to find includes and libraries
+    -L argument to the compiler to find includes and libraries installed by
-    installed by another non-X11 pkg, use "${LOCALBASE}". The name LOCALBASE
+    another pkg, use "${LOCALBASE}". The name LOCALBASE stems from FreeBSD,
-    stems from FreeBSD, which installed all packages in /usr/local. As pkgsrc
+    which installed all packages in /usr/local. As pkgsrc leaves /usr/local for
-    leaves /usr/local for the system administrator, this variable is a
+    the system administrator, this variable is a misnomer.
     misnomer.
   * X11BASE is where the actual X11 distribution (from xsrc, etc.) is
     installed. When looking for standard X11 includes (not those installed by a
     package), use "${X11BASE}".
   * X11-based packages using imake must set USE_IMAKE to be installed correctly
     under LOCALBASE.
   * Within ${PREFIX}, packages should install files according to hier(7), with
     the exception that manual pages go into ${PREFIX}/man, not ${PREFIX}/share/
     man.
 .3. Directories used during the build process
 @@ -5914,28 +5917,28 @@ The automatic copying of config files ca
 variable PKG_CONFIG prior to package installation.
 .3. System startup scripts
 System startup scripts are special files because they must be installed in a
 place known by the underlying OS, usually outside the installation prefix.
 Therefore, the same rules described in Section 20.1, "Files and directories
 outside the installation prefix" apply, and the same solutions can be used.
 However, pkginstall provides a special mechanism to handle these files.
 In order to provide system startup scripts, the package has to:
 . Store the script inside ${FILESDIR}, with the .sh suffix appended.
-    Considering the print/cups package as an example, it has a cupsd.sh in its
+    Considering the print/cups-base package as an example, it has a cupsd.sh in
-    files directory.
+    its files directory.
 . Tell pkginstall to handle it, appending the name of the script, without its
     extension, to the RCD_SCRIPTS variable. Continuing the previous example:
     RCD_SCRIPTS+=   cupsd
 Once this is done, pkginstall will do the following steps for each script in an
 automated fashion:
 . Process the file found in the files directory applying all the
     substitutions described in the FILES_SUBST variable.
 . Copy the script from the files directory to the examples hierarchy, $
 @@ -6042,35 +6045,37 @@ Table of Contents
         framework)
 .2. The fetch phase
 .2.1. Packages whose distfiles aren't available for plain downloading
 .2.2. How to handle modified distfiles with the 'old' name
 .2.3. Packages hosted on github.com
 .3. The configure phase
 .3.1. Shared libraries - libtool
 .3.2. Using libtool on GNU packages that already support libtool
 .3.3. GNU Autoconf/Automake
 .3.4. Meson / ninja
 .4. Programming languages
 .4.1. C, C++, and Fortran
 .4.2. Java
 .4.3. Go
-.4.4. Packages containing Perl scripts
+.4.4. Rust
-.4.5. Packages containing shell scripts
+.4.5. Packages containing Perl scripts
-.4.6. Other programming languages
+.4.6. Packages containing shell scripts
 .4.7. Other programming languages
 .5. The build phase
 .5.1. Compiling C and C++ code conditionally
 .5.2. How to handle compiler bugs
 .5.3. No such file or directory
 .5.4. Undefined reference to "..."
 .5.5. Running out of memory
 .6. The install phase
 .6.1. Creating needed directories
 .6.2. Where to install documentation
 @@ -6981,81 +6986,100 @@ in some circumstances. Some of the more
     has been done:
 . The shared object is named correctly, i.e. libfoo.la, not foo.la
 . The -dlopen option is used when linking an executable.
   * The use of libltdl without the correct calls to initialisation routines.
     The function lt_dlinit() should be called and the macro
     LTDL_SET_PRELOADED_SYMBOLS included in executables.
 .3.3. GNU Autoconf/Automake
 If a package needs GNU autoconf or automake to be executed to regenerate the
-configure script and Makefile.in makefile templates, then they should be
+configure script and Makefile.in makefile templates from configure.ac and
-executed in a pre-configure target.
+Makefile.am, then they should be executed in a pre-configure target:
-For packages that need only autoconf:
+USE_TOOLS+=     autoconf automake autoreconf
 GNU_CONFIGURE=  yes
 AUTOCONF_REQD=  2.50            # if default version is not good enough
 USE_TOOLS+=     autoconf        # use "autoconf213" for autoconf-2.13
 ...
 pre-configure:
         cd ${WRKSRC} && autoconf
 ...
 and for packages that need automake and autoconf:
 AUTOMAKE_REQD=  1.7.1           # if default version is not good enough
 USE_TOOLS+=     automake        # use "automake14" for automake-1.4
 ...
 pre-configure:
-        set -e; cd ${WRKSRC}; \
+        set -e; cd ${WRKSRC} && autoreconf -fi
         aclocal; autoheader; automake -a --foreign -i; autoconf
 ...
-Packages which use GNU Automake will almost certainly require GNU Make.
+Packages which use GNU Automake will sometimes require GNU Make (gmake in
 USE_TOOLS), but not always. Note that autoreconf only needs to be executed if
 configure.ac or Makefiles are modified, or configure is not present.
 There are times when the configure process makes additional changes to the
 generated files, which then causes the build process to try to re-execute the
 automake sequence. This is prevented by touching various files in the configure
 stage. If this causes problems with your package you can set AUTOMAKE_OVERRIDE=
 NO in the package Makefile.
 .3.4. Meson / ninja
 Packages using Meson to configure need to include:
 .include "../../devel/meson/build.mk"
 In nearly all cases (any program with dependencies), pkg-config needs to be
 added to USE_TOOLS. If the package installs translation files for non-English
 languages, also add msgfmt and xgettext:
 USE_TOOLS+=     pkg-config msgfmt xgettext
 If any options need to be passed to Meson, use MESON_ARGS instead of
 CONFIGURE_ARGS:
 MESON_ARGS+=    -Dx11=false
 .4. Programming languages
 .4.1. C, C++, and Fortran
-Compilers for the C, C++, and Fortran languages comes with the NetBSD base
+Compilers for the C and C++ languages comes with the NetBSD base system. By
-system. By default, pkgsrc assumes that a package is written in C and will hide
+default, pkgsrc assumes that a package is written in C and will hide all other
-all other compilers (via the wrapper framework, see Chapter 18, Buildlink
+compilers (via the wrapper framework, see Chapter 18, Buildlink methodology).
 methodology).
 To declare which language's compiler a package needs, set the USE_LANGUAGES
 variable. Allowed values currently are:
         c99, c++, c++03, gnu++03, c++0x, gnu++0x, c++11, gnu++11,
         c++14, gnu++14, c++17, gnu++17, c++20, gnu++20, fortran,
         fortran77, java, objc, obj-c++, and ada.
 (and any combination). The default is "c". Packages using GNU configure
 scripts, even if written in C++, usually need a C compiler for the configure
 phase.
 To express a general requirement on a specific C or C++ version, normally only
 GCC_REQD needs to be set. For example, GCC 7 includes support for C++17, so if
 the package uses C++17 it should specify:
         GCC_REQD+=      7
 Language variants like c++11 for USE_LANGUAGES should only be specified if the
 package does not explicitly set -std=... when compiling (i.e. the package
 assumes the compiler defaults to C++11 or some other standard). This is usually
 a bug in the upstream build system.
 GCC version 5 includes support for C++14, while GCC 4.7 includes more-or-less
 complete support for C++11. For more information, consult GCC's own
 documentation on programming language support.
 .4.2. Java
 If a program is written in Java, use the Java framework in pkgsrc. The package
 must include ../../mk/java-vm.mk. This Makefile fragment provides the following
 variables:
   * USE_JAVA defines if a build dependency on the JDK is added. If USE_JAVA is
     set to "run", then there is only a runtime dependency on the JDK. The
     default is "yes", which also adds a build dependency on the JDK.
   * Set USE_JAVA2 to declare that a package needs a Java2 implementation. The
     supported values are "yes", "1.4", and "1.5". "yes" accepts any Java2
     implementation, "1.4" insists on versions 1.4 or above, and "1.5" only
 @@ -7063,66 +7087,69 @@ variables:
   * PKG_JAVA_HOME is automatically set to the runtime location of the used Java
     implementation dependency. It may be used to set JAVA_HOME to a good value
     if the program needs this variable to be defined.
 .4.3. Go
 If a program is written in Go and has any dependencies on other Go modules,
 have the package include ../../lang/go/go-module.mk.
 . Generate a list of those dependencies with make clean && make patch && make
     show-go-modules > go-modules.mk.
-. Prepend
+. Prepend .include "go-modules.mk" to any other .includes.
 . Incorporate these modules in distinfo with make makesum.
-    .include
+.4.4. Rust
           "go-modules.mk"
-    to any other
+If a program is written in Rust and uses Cargo to build, have the package
 include ../../lang/rust/cargo.mk.
-    .include
+. Generate a list of those dependencies with make CARGO_ARGS="build
     --release" build && make print-cargo-depends > cargo-depends.mk.
-    s.
+. Prepend .include "cargo-depends.mk" to any other .includes.
 . Incorporate these modules in distinfo with make makesum.
-.4.4. Packages containing Perl scripts
+.4.5. Packages containing Perl scripts
 If your package contains interpreted Perl scripts, add "perl" to the USE_TOOLS
 variable and set REPLACE_PERL to ensure that the proper interpreter path is
 set. REPLACE_PERL should contain a list of scripts, relative to WRKSRC, that
 you want adjusted. Every occurrence of */bin/perl in a she-bang line will be
 replaced with the full path to the Perl executable.
 If a particular version of Perl is needed, set the PERL5_REQD variable to the
 version number. The default is "5.0".
 See Section 21.6.6, "Packages installing Perl modules" for information about
 handling Perl modules.
 There is also the REPLACE_PERL6 variable for the language now known as Raku.
-.4.5. Packages containing shell scripts
+.4.6. Packages containing shell scripts
 REPLACE_SH, REPLACE_BASH, REPLACE_CSH, and REPLACE_KSH can be used to replace
 shell hash bangs in files. Please use the appropriate one, preferring
 REPLACE_SH in case this shell is sufficient. Each should contain a list of
 scripts, relative to WRKSRC, that you want adjusted. Every occurrence of the
 matching shell in a she-bang line will be replaced with the full path to the
 shell executable. When using REPLACE_BASH, don't forget to add bash to
 USE_TOOLS.
-.4.6. Other programming languages
+.4.7. Other programming languages
 There are further similar REPLACE variables available, e.g., REPLACE_AWK for
 packages containing awk scripts, and REPLACE_R for R. These two, like the
 others noted above, have their actions defined centrally in mk/configure/
 replace-interpreter.mk. Other languages define the actions of these variables
 within their own dedicated part of the tree, e.g., REPLACE_PHP is actioned in
 lang/php/phpversion.mk, and REPLACE_PYTHON is actioned in lang/python/
 application.mk. For other languages, consult the mk files found within their
 specific directories (the naming convention varies), or check the list found in
 Appendix E, Help topics.
 Currently, special handling for other languages varies in pkgsrc. If a compiler
 package provides a buildlink3.mk file, include that, otherwise just add a
 @@ -7145,58 +7172,77 @@ depending on the operating system and ha
 These macros can be queried using for example #if defined(__i386). Almost every
 operating system, hardware architecture and compiler has its own macro. For
 example, if the macros __GNUC__, __i386__ and __NetBSD__ are all defined, you
 know that you are using NetBSD on an i386 compatible CPU, and your compiler is
 GCC.
 The list of the following macros for hardware and operating system depends on
 the compiler that is used. For example, if you want to conditionally compile
 code on Solaris, don't use __sun__, as the SunPro compiler does not define it.
 Use __sun instead.
 .5.1.1. C preprocessor macros to identify the operating system
 To distinguish between specific NetBSD versions, you should use the following
 code.
 #ifdef __NetBSD__
 #include <sys/param.h>
 #if __NetBSD_Prereq__(9,99,17)
 /* use a newer feature */
 #else
 /* older code */
 #endif
 #endif
 #ifndef _WIN32
 /* Unix-like specific code */
 #endif
 To distinguish between 4.4 BSD-derived systems and the rest of the world, you
 should use the following code.
 #include <sys/param.h>
 #if (defined(BSD) && BSD >= 199306)
 /* BSD-specific code goes here */
 #else
 /* non-BSD-specific code goes here */
 #endif
-If this distinction is not fine enough, you can also test for the following
+You can also test for the following macros:
 macros.
 Cygwin      __CYGWIN__
 DragonFly   __DragonFly__
 FreeBSD     __FreeBSD__
 Haiku       __HAIKU__
 Interix     __INTERIX
 IRIX        __sgi (TODO: get a definite source for this)
-Linux       linux, __linux, __linux__
+Linux       __linux
 Mac OS X    __APPLE__
 MirBSD      __MirBSD__ (__OpenBSD__ is also defined)
 Minix3      __minix
 NetBSD      __NetBSD__
 OpenBSD     __OpenBSD__
 Solaris     sun, __sun
 Unix(-like) __unix
 .5.1.2. C preprocessor macros to identify the hardware architecture
 i386        i386, __i386, __i386__
 x86-64      __amd64__, __x86_64__
 ARM         __arm__
 MIPS        __mips
 SPARC       sparc, __sparc
 PowerPC     __powerpc
 .5.1.3. C preprocessor macros to identify the compiler
 GCC         __GNUC__ (major version), __GNUC_MINOR__
 MIPSpro     _COMPILER_VERSION (0x741 for MIPSpro 7.41)
 SunPro      __SUNPRO_C (0x570 for Sun C 5.7)
 SunPro C++  __SUNPRO_CC (0x580 for Sun C++ 5.8)
 .5.2. How to handle compiler bugs
 Some source files trigger bugs in the compiler, based on combinations of
 compiler version and architecture and almost always relation to optimisation
 being enabled. Common symptoms are gcc internal errors or never finishing
 @@ -7292,30 +7338,30 @@ Pkgsrc does not work reliably if any of
 symlink. Since 2019Q2, the pkgsrc bootstrap program prevents installing pkgsrc
 in symlink-based directories. Existing pkgsrc installations are not checked for
 symlinks though.
 The "No such file or directory" error messages are a typical symptom of
 symlinks, and it's quite difficult to find out that this is the actual cause.
 .5.3.4. Stale working directories
 When building a hierarchy of packages, it may happen that one package is built
 and then pkgsrc is updated. This situation can provoke various hard to diagnose
 build errors. To clean up the situation:
-$ (cd ../../ && test -f mk/bsd.pkg.mk && rm -rf */*/work)
+$ (cd ../../ && cat mk/bsd.pkg.mk >/dev/null && rm -rf */*/work)
-(The test for bsd.pkg.mk just prevents running this command in the wrong
+(The only purpose of the bsd.pkg.mk is to prevent running this command in the
-directory.)
+wrong directory.)
 If you have set WRKOBJDIR in mk.conf, remove that directory as well.
 .5.3.5. Other possible reasons
 On platforms other than BSD, third-party packages are installed in /usr/
 include, together with the base system. This means that pkgsrc cannot
 distinguish between headers provided by the base system (which it needs) and
 headers from third-party packages (which are often included in pkgsrc as well).
 This can lead to subtle version mismatches.
 In pkgsrc installations that have been active for several years, it may happen
 that some files are manually deleted. To exclude this unlikely reason, run
 @@ -7341,85 +7387,87 @@ and over.
 |crypt                    |-lcrypt |DragonFly, NetBSD |
 |-------------------------+--------+------------------|
 |dlopen, dlsym            |-ldl    |Linux             |
 |-------------------------+--------+------------------|
 |gethost*                 |-lnsl   |Solaris           |
 |-------------------------+--------+------------------|
 |inet_aton                |-lresolv|Solaris           |
 |-------------------------+--------+------------------|
 |nanosleep, sem_*, timer_*|-lrt    |Solaris           |
 |-------------------------+--------+------------------|
 |openpty                  |-lutil  |Linux             |
 +-----------------------------------------------------+
-To fix these linker errors, it is often sufficient to say LIBS.OperatingSystem+
+To fix these linker errors, it is often sufficient to add LIBS.OperatingSystem+
-= -lfoo to the package Makefile and then say bmake clean; bmake.
+= -lfoo to the package Makefile and then run bmake clean; bmake.
-.5.4.1. Special issue: The SunPro compiler
+.5.4.1. The SunPro compiler and inline functions
 When you are using the SunPro compiler, there is another possibility. That
 compiler cannot handle the following code:
 extern int extern_func(int);
 static inline int
 inline_func(int x)
+{
         return extern_func(x);
+}
 int main(void)
+{
         return 0;
+}
 It generates the code for inline_func even if that function is never used. This
 code then refers to extern_func, which can usually not be resolved. To solve
 this problem you can try to tell the package to disable inlining of functions.
 .5.5. Running out of memory
 Sometimes packages fail to build because the compiler runs into an operating
 system specific soft limit. With the UNLIMIT_RESOURCES variable pkgsrc can be
-told to unlimit the resources. Currently, the allowed values are any
+told to unlimit the resources. The allowed values are any combination of "
-combination of "cputime", "datasize", "memorysize", and "stacksize". Setting
+cputime", "datasize", "memorysize", "stacksize" and "virtualsize". Setting this
-this variable is similar to running the shell builtin ulimit command to raise
+variable is similar to running the shell builtin ulimit command to raise the
-the maximum data segment size or maximum stack size of a process, respectively,
+maximum data segment size or maximum stack size of a process, respectively, to
-to their hard limits.
+their hard limits.
 .6. The install phase
 .6.1. Creating needed directories
 The BSD-compatible install supplied with some operating systems cannot create
 more than one directory at a time. As such, you should call ${INSTALL_*_DIR}
 like this:
 ${INSTALL_DATA_DIR} ${PREFIX}/dir1
 ${INSTALL_DATA_DIR} ${PREFIX}/dir2
-You can also just append "dir1 dir2" to the INSTALLATION_DIRS variable, which
+Instead of running the install commands directly, you can also append "dir1
-will automatically do the right thing.
+dir2" to the INSTALLATION_DIRS variable, which will automatically do the right
 thing.
 .6.2. Where to install documentation
 In general, documentation should be installed into ${PREFIX}/share/doc/$
-{PKGBASE} or ${PREFIX}/share/doc/${PKGNAME} (the latter includes the version
+{PKGBASE} or ${PREFIX}/share/doc/${PKGNAME_NOREV} (the latter includes the
-number of the package).
+version number of the package).
 Many modern packages using GNU autoconf allow to set the directory where HTML
 documentation is installed with the "--with-html-dir" option. Sometimes using
 this flag is needed because otherwise the documentation ends up in ${PREFIX}/
-share/doc/html or other places.
+share/doc/html or other places. In pkgsrc, the HTML documentation should go
 into the package-specific directory, just like any other documentation.
 An exception to the above is that library API documentation generated with the
 textproc/gtk-doc tools, for use by special browsers (devhelp) should be left at
 their default location, which is ${PREFIX}/share/gtk-doc. Such documentation
 can be recognized from files ending in .devhelp or .devhelp2. (It is also
 acceptable to install such files in ${PREFIX}/share/doc/${PKGBASE} or ${PREFIX}
 /share/doc/${PKGNAME}; the .devhelp* file must be directly in that directory
 then, no additional subdirectory level is allowed in this case. This is usually
 achieved by using "--with-html-dir=${PREFIX}/share/doc". ${PREFIX}/share/
 gtk-doc is preferred though.)
 .6.3. Installing highscore files
 @@ -7479,30 +7527,26 @@ as root ("destdir") or the package can i
 .6.5. Packages with hardcoded paths to other interpreters
 Your package may also contain scripts with hardcoded paths to other
 interpreters besides (or as well as) Perl. To correct the full pathname to the
 script interpreter, you need to set the following definitions in your Makefile
 (we shall use tclsh in this example):
 REPLACE_INTERPRETER+=   tcl
 REPLACE.tcl.old=        .*/bin/tclsh
 REPLACE.tcl.new=        ${PREFIX}/bin/tclsh
 REPLACE_FILES.tcl=      # list of tcl scripts which need to be fixed,
 # relative to ${WRKSRC}, just as in REPLACE_PERL
 Note
 Before March 2006, these variables were called _REPLACE.* and _REPLACE_FILES.*.
 .6.6. Packages installing Perl modules
 Makefiles of packages providing perl5 modules should include the Makefile
 fragment ../../lang/perl5/module.mk. It provides a do-configure target for the
 standard perl configuration for such modules as well as various hooks to tune
 this configuration. See comments in this file for details.
 Perl5 modules will install into different places depending on the version of
 perl used during the build process. To address this, pkgsrc will append lines
 to the PLIST corresponding to the files listed in the installed .packlist file
 generated by most perl5 modules. This is invoked by defining PERL5_PACKLIST to
 a space-separated list of packlist files relative to PERL5_PACKLIST_DIR
 (PERL5_INSTALLVENDORARCH by default), e.g.:
 @@ -7761,33 +7805,26 @@ GNOME environment under many different p
 that pkgsrc is one of the most advanced build and packaging systems for GNOME
 due to its included technologies buildlink3, the wrappers and tools framework
 and automatic configuration file management. Lots of efforts are put into
 achieving a completely clean deinstallation of installed software components.
 Given that pkgsrc is NetBSD's official packaging system, the above also means
 that great efforts are put into making GNOME work under this operating system.
 This chapter is aimed at pkgsrc developers and other people interested in
 helping our GNOME porting and packaging efforts. It provides instructions on
 how to manage the existing packages and some important information regarding
 their internals.
 We need your help!
 Should you have some spare cycles to devote to NetBSD, pkgsrc and GNOME and are
 willing to learn new exciting stuff, please jump straight to the pending work
 list! There is still a long way to go to get a fully-functional GNOME desktop
 under NetBSD and we need your help to achieve it!
 .1. Meta packages
 pkgsrc includes three GNOME-related meta packages:
   * meta-pkgs/gnome-base: Provides the core GNOME desktop environment. It only
     includes the necessary bits to get it to boot correctly, although it may
     lack important functionality for daily operation. The idea behind this
     package is to let end users build their own configurations on top of this
     one, first installing this meta package to achieve a functional setup and
     then adding individual applications.
   * meta-pkgs/gnome: Provides a complete installation of the GNOME platform and
     desktop as defined by the GNOME project; this is based on the components
 @@ -7807,57 +7844,57 @@ updates: a package may depend on other p
 listed after it. It is very important to keep this order to ease updates so...
 do not change it to alphabetical sorting!
 .2. Packaging a GNOME application
 Almost all GNOME applications are written in C and use a common set of tools as
 their build system. Things get different with the new bindings to other
 languages (such as Python), but the following will give you a general idea on
 the minimum required tools:
   * Almost all GNOME applications use the GNU Autotools as their build system.
     As a general rule you will need to tell this to your package:
-    GNU_CONFIGURE=yes
+    GNU_CONFIGURE=  yes
-    USE_LIBTOOL=yes
+    USE_LIBTOOL=    yes
-    USE_TOOLS+=gmake
+    USE_TOOLS+=     gmake
   * If the package uses pkg-config to detect dependencies, add this tool to the
     list of required utilities:
-    USE_TOOLS+=pkg-config
+    USE_TOOLS+=     pkg-config
     Also use pkgtools/verifypc at the end of the build process to ensure that
     you did not miss to specify any dependency in your package and that the
     version requirements are all correct.
   * If the package uses intltool, be sure to add intltool to the USE_TOOLS to
     handle dependencies and to force the package to use the latest available
     version.
   * If the package uses gtk-doc (a documentation generation utility), do not
     add a dependency on it. The tool is rather big and the distfile should come
     with pregenerated documentation anyway; if it does not, it is a bug that
     you ought to report. For such packages you should disable gtk-doc (unless
     it is the default):
-    CONFIGURE_ARGS+=--disable-gtk-doc
+    CONFIGURE_ARGS+=        --disable-gtk-doc
     The default location of installed HTML files (share/gtk-doc/<package-name>)
     is correct and should not be changed unless the package insists on
     installing them somewhere else. Otherwise programs as devhelp will not be
     able to open them. You can do that with an entry similar to:
-    CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/...
+    CONFIGURE_ARGS+=        --with-html-dir=${PREFIX}/share/gtk-doc/...
 GNOME uses multiple shared directories and files under the installation prefix
 to maintain databases. In this context, shared means that those exact same
 directories and files are used among several different packages, leading to
 conflicts in the PLIST. pkgsrc currently includes functionality to handle the
 most common cases, so you have to forget about using @unexec ${RMDIR} lines in
 your file lists and omitting shared files from them. If you find yourself doing
 those, your package is most likely incorrect.
 The following table lists the common situations that result in using shared
 directories or files. For each of them, the appropriate solution is given.
 After applying the solution be sure to regenerate the package's file list with
 make print-PLIST and ensure it is correct.
 @@ -8211,94 +8248,100 @@ follow these steps.
     (and any packages from step 5, of course).
 Chapter 24. Frequently Asked Questions
 This section contains the answers to questions that may arise when you are
 writing a package. If you don't find your question answered here, first have a
 look in the other chapters, and if you still don't have the answer, ask on the
 pkgsrc-users mailing list.
 .1. What is the difference between MAKEFLAGS, .MAKEFLAGS and MAKE_FLAGS?
 .2. What is the difference between MAKE, GMAKE and MAKE_PROGRAM?
 .3. What is the difference between CC, PKG_CC and PKGSRC_COMPILER?
-.4. What is the difference between BUILDLINK_LDFLAGS, BUILDLINK_LDADD and
+.4. Why does make show-var VARNAME=BUILDLINK_PREFIX.foo say it's empty?
-    BUILDLINK_LIBS?
+.5. What does ${MASTER_SITE_SOURCEFORGE:=package/} mean? I don't understand
 .5. Why does make show-var VARNAME=BUILDLINK_PREFIX.foo say it's empty?
 .6. What does ${MASTER_SITE_SOURCEFORGE:=package/} mean? I don't understand
     the := inside it.
-.7. Which mailing lists are there for package developers?
+.6. Which mailing lists are there for package developers?
-.8. Where is the pkgsrc documentation?
+.7. Where is the pkgsrc documentation?
-.9. I have a little time to kill. What shall I do?
+.8. I have a little time to kill. What shall I do?
 .1. What is the difference between MAKEFLAGS, .MAKEFLAGS and MAKE_FLAGS?
       MAKEFLAGS are the flags passed to the pkgsrc-internal invocations of make
-      (1), while MAKE_FLAGS are the flags that are passed to the MAKE_PROGRAM
+      (1).
       when building the package. [FIXME: What is .MAKEFLAGS for?]
       MAKE_FLAGS are the flags that are passed to the MAKE_PROGRAM when
       building the package.
       .MAKEFLAGS is an internal variable of bmake and should not be used by
       packages.
 .2. What is the difference between MAKE, GMAKE and MAKE_PROGRAM?
       MAKE is the path to the make(1) program that is used in the pkgsrc
-      infrastructure. GMAKE is the path to GNU Make, but you need to say
+      infrastructure.
       USE_TOOLS+=gmake to use that. MAKE_PROGRAM is the path to the Make
-      program that is used for building the package.
+      GMAKE is the path to GNU Make, but you need to say USE_TOOLS+=gmake to
       use that.
       MAKE_PROGRAM is the path to the Make program that is used for building
       the package.
 .3. What is the difference between CC, PKG_CC and PKGSRC_COMPILER?
       CC is the path to the real C compiler, which can be configured by the
-      pkgsrc user. PKG_CC is the path to the compiler wrapper. PKGSRC_COMPILER
+      pkgsrc user.
       is not a path to a compiler, but the type of compiler that should be
       used. See mk/compiler.mk for more information about the latter variable.
-.4. What is the difference between BUILDLINK_LDFLAGS, BUILDLINK_LDADD and
+      PKG_CC is the path to the compiler wrapper.
       BUILDLINK_LIBS?
-      [FIXME]
+      PKGSRC_COMPILER is not a path to a compiler, but the type of compiler
       that should be used. See mk/compiler.mk for more information about the
       latter variable.
-.5. Why does make show-var VARNAME=BUILDLINK_PREFIX.foo say it's empty?
+.4. Why does make show-var VARNAME=BUILDLINK_PREFIX.foo say it's empty?
       For optimization reasons, some variables are only available in the "
       wrapper" phase and later. To "simulate" the wrapper phase, append
       PKG_PHASE=wrapper to the above command.
-.6. What does ${MASTER_SITE_SOURCEFORGE:=package/} mean? I don't understand
+.5. What does ${MASTER_SITE_SOURCEFORGE:=package/} mean? I don't understand
       the := inside it.
-      The := is not really an assignment operator, although it looks like it.
+      The := is not an assignment operator, even though it may look like one.
       Instead, it is a degenerate form of ${LIST:old_string=new_string}, which
       is documented in the make(1) man page and which is commonly used in the
       form ${SRCS:.c=.o}. In the case of MASTER_SITE_*, old_string is the empty
       string and new_string is package/. That's where the : and the = fall
       together.
-.7. Which mailing lists are there for package developers?
+.6. Which mailing lists are there for package developers?
       tech-pkg
           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.
       pkgsrc-bugs
           All bug reports in category "pkg" sent with send-pr(1) appear here.
           Please do not report your bugs here directly; use one of the other
           mailing lists.
-.8. Where is the pkgsrc documentation?
+.7. Where is the pkgsrc documentation?
       There are many places where you can find documentation about pkgsrc:
         * 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 say.
         * On the mailing list archives (see https://mail-index.NetBSD.org/),
           you can find discussions about certain features, announcements of new
           parts of the pkgsrc infrastructure and sometimes even announcements
           that a certain feature has been marked as obsolete. The benefit here
           is that each message has a date appended to it.
 @@ -8312,27 +8355,27 @@ pkgsrc-users mailing list.
           Some contain a detailed description of what has changed, but they are
           geared towards the other pkgsrc developers, not towards an average
           pkgsrc user. They also only document changes, so if you don't know
           what has been before, these messages may not be worth too much to
           you.
         * Some parts of pkgsrc are only "implicitly documented", that is the
           documentation exists only in the mind of the developer who wrote the
           code. To get this information, use the cvs annotate command to see
           who has written it and ask on the tech-pkg 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.
-.9. I have a little time to kill. What shall I do?
+.8. I have a little time to kill. What shall I do?
       This is not really an FAQ yet, but here's the answer anyway.
         * Run pkg_chk -N (from the pkgtools/pkg_chk package). It will tell you
           about newer versions of installed packages that are available, but
           not yet updated in pkgsrc.
         * Browse pkgsrc/doc/TODO -- it contains a list of suggested new
           packages and a list of cleanups and enhancements for pkgsrc that
           would be nice to have.
         * Review packages for which review was requested on the tech-pkg
           mailing list.
 @@ -9514,750 +9557,786 @@ about categories and packages.
 The stable directory is a symlink to the latest pkgsrc-20xxQy.
 The pkgsrc-20xxQy. directories contain files related to the -20xxQy stable
 branch of the CVS repository. In these directories there is an additional file
 called pkgsrc-20xxQy.tar.{bz,gz,xz}, which contains the state of pkgsrc when it
 was branched.
 Appendix E. Help topics
 The following list contains all help topics that are available when running
 bmake help topic=:index.
-#!                                   -lintl
+#!                                -lintl
-bit                                64bit
+bit                             64bit
-ABI                                  ACCEPTABLE_LICENSES
+ABI                               ACCEPTABLE_LICENSES
-ACROREAD_FONTPATH                    ADDITIONAL
+ACROREAD_FONTPATH                 ADDITIONAL
-AFAIK                                AIX
+AFAIK                             AIX
-ALLOW_VULNERABLE_PACKAGES            ALL_ENV
+ALLOW_VULNERABLE_PACKAGES         ALL_ENV
-ALTERNATIVES_SRC                     AMANDA_TMP
+ALSA_PC                           ALTERNATIVES_SRC
-AMANDA_USER                          AMANDA_VAR
+AMANDA_TMP                        AMANDA_USER
-APACHE_GROUP                         APACHE_MODULE_NAME
+AMANDA_VAR                        APACHE_GROUP
-APACHE_MODULE_SRC                    APACHE_MODULE_SRCDIR
+APACHE_MODULE_NAME                APACHE_MODULE_SRC
-APACHE_PKG_PREFIX                    APACHE_SUEXEC_CONFIGURE_ARGS
+APACHE_MODULE_SRCDIR              APACHE_PKG_PREFIX
-APACHE_SUEXEC_DOCROOT                APACHE_USER
+APACHE_SUEXEC_CONFIGURE_ARGS      APACHE_SUEXEC_DOCROOT
-APPEND_ABI                           APPEND_ELF
+APACHE_USER                       APPEND_ABI
-ARLA_CACHE                           AUDIT_PACKAGES_FLAGS
+APPEND_ELF                        ARLA_CACHE
-AUTOCONF_REQD                        AUTOMAKE_OVERRIDE
+AUDIT_PACKAGES_FLAGS              AUTOCONF_REQD
-AUTOMAKE_REQD                        AUTO_MKDIRS
+AUTOMAKE_OVERRIDE                 AUTOMAKE_REQD
-BDB185_DEFAULT                       BDBBASE
+AUTO_MKDIRS                       BDB185_DEFAULT
-BDB_ACCEPTED                         BDB_DEFAULT
+BDBBASE                           BDB_ACCEPTED
-BDB_LIBS                             BDB_TYPE
+BDB_DEFAULT                       BDB_LIBS
-BINCIMAP_GROUP                       BINCIMAP_USER
+BDB_TYPE                          BINCIMAP_GROUP
-BIND_DIR                             BIND_GROUP
+BINCIMAP_USER                     BIND_DIR
-BIND_USER                            BINOWN
+BIND_GROUP                        BIND_USER
-BINPKG_SITES                         BIN_INSTALL_FLAGS
+BINOWN                            BINPKG_SITES
-BISON_PKGDATADIR                     BLAS
+BIN_INSTALL_FLAGS                 BISON_PKGDATADIR
-BLAS_ACCEPTED                        BLAS_C_INTERFACE
+BLAS                              BLAS_ACCEPTED
-BLAS_INCLUDES                        BLAS_INDEX64
+BLAS_C_INTERFACE                  BLAS_INCLUDES
-BLAS_LIBS                            BLAS_TYPE
+BLAS_INDEX64                      BLAS_LIBS
-BOOTSTRAP_DEPENDS                    BROKEN
+BLAS_TYPE                         BOOTSTRAP_DEPENDS
-BROKEN_EXCEPT_ON_PLATFORM            BROKEN_ON_PLATFORM
+BROKEN                            BROKEN_EXCEPT_ON_PLATFORM
-BSDSRCDIR                            BSDXSRCDIR
+BROKEN_ON_PLATFORM                BSDSRCDIR
-BSD_MAKE_ENV                         BUILDLINK_AUTO_DIRS
+BSDXSRCDIR                        BSD_MAKE_ENV
-BUILDLINK_AUTO_VARS                  BUILDLINK_CFLAGS
+BUILDLINK_AUTO_DIRS               BUILDLINK_AUTO_VARS
-BUILDLINK_CONTENTS_FILTER            BUILDLINK_CPPFLAGS
+BUILDLINK_CFLAGS                  BUILDLINK_CONTENTS_FILTER
-BUILDLINK_FILES                      BUILDLINK_FILES_CMD
+BUILDLINK_CPPFLAGS                BUILDLINK_DEPMETHOD
-BUILDLINK_FNAME_TRANSFORM            BUILDLINK_LDFLAGS
+BUILDLINK_FILES                   BUILDLINK_FILES_CMD
-BUILDLINK_LIBS                       BUILDLINK_OPSYS_SUPPORT_PTHREAD
+BUILDLINK_FNAME_TRANSFORM         BUILDLINK_LDFLAGS
-BUILDLINK_PKGNAME                    BUILDLINK_PREFIX
+BUILDLINK_LIBS                    BUILDLINK_OPSYS_SUPPORT_PTHREAD
-BUILDLINK_RPATHDIRS                  BUILDLINK_TREE
+BUILDLINK_PKGNAME                 BUILDLINK_PREFIX
-BUILD_DEFS                           BUILD_DEFS_EFFECTS
+BUILDLINK_RPATHDIRS               BUILDLINK_TREE
-BUILD_DEPENDS                        BUILD_DIRS
+BUILD_DEFS                        BUILD_DEFS_EFFECTS
-BUILD_ENV_SHELL                      BUILD_MAKE_CMD
+BUILD_DEPENDS                     BUILD_DIRS
-BUILD_MAKE_FLAGS                     BUILD_TARGET
+BUILD_ENV_SHELL                   BUILD_MAKE_CMD
-BUILTIN_FIND_FILES                   BUILTIN_FIND_FILES_VAR
+BUILD_MAKE_FLAGS                  BUILD_TARGET
-BUILTIN_FIND_GREP                    BUILTIN_FIND_HEADERS
+BUILTIN_FIND_FILES                BUILTIN_FIND_FILES_VAR
-BUILTIN_FIND_HEADERS_VAR             BUILTIN_FIND_PKGCONFIG
+BUILTIN_FIND_GREP                 BUILTIN_FIND_HEADERS
-BUILTIN_FIND_PKGCONFIG_VAR           BUILTIN_PKG
+BUILTIN_FIND_HEADERS_VAR          BUILTIN_FIND_PKGCONFIG
-BUILTIN_TEST_CURSES_DEFINES          BUILTIN_TEST_CURSES_FUNCS
+BUILTIN_FIND_PKGCONFIG_VAR        BUILTIN_PKG
-BUILTIN_VERSION_SCRIPT               BUILTIN_X11_TYPE
+BUILTIN_TEST_CURSES_DEFINES       BUILTIN_TEST_CURSES_FUNCS
-BUILTIN_X11_VERSION                  CACTI_GROUP
+BUILTIN_VERSION_SCRIPT            BUILTIN_X11_TYPE
-CACTI_USER                           CANNA_GROUP
+BUILTIN_X11_VERSION               CACTI_GROUP
-CANNA_USER                           CAT
+CACTI_USER                        CANNA_GROUP
-CBLAS_LIBS                           CCACHE_BASE
+CANNA_USER                        CAT
-CCACHE_DIR                           CCACHE_LOGFILE
+CBLAS_LIBS                        CCACHE_BASE
-CC_VERSION                           CC_VERSION_STRING
+CCACHE_DIR                        CCACHE_LOGFILE
-CDRECORD_CONF                        CDROM_PKG_URL_DIR
+CC_VERSION                        CC_VERSION_STRING
-CDROM_PKG_URL_HOST                   CHECK_COMPILER
+CDRECORD_CONF                     CDROM_PKG_URL_DIR
-CHECK_FAKEHOME                       CHECK_FILES
+CDROM_PKG_URL_HOST                CHECKOUT_DATE
-CHECK_FILES_SKIP                     CHECK_FILES_STRICT
+CHECK_COMPILER                    CHECK_FAKEHOME
-CHECK_HEADERS                        CHECK_HEADERS_SKIP
+CHECK_FILES                       CHECK_FILES_SKIP
-CHECK_INTERPRETER                    CHECK_INTERPRETER_SKIP
+CHECK_FILES_STRICT                CHECK_HEADERS
-CHECK_PERMS                          CHECK_PERMS_AUTOFIX
+CHECK_HEADERS_SKIP                CHECK_INTERPRETER
-CHECK_PERMS_SKIP                     CHECK_PIE
+CHECK_INTERPRETER_SKIP            CHECK_PERMS
-CHECK_PIE_SKIP                       CHECK_PIE_SUPPORTED
+CHECK_PERMS_AUTOFIX               CHECK_PERMS_SKIP
-CHECK_PORTABILITY                    CHECK_PORTABILITY_EXPERIMENTAL
+CHECK_PIE                         CHECK_PIE_SKIP
-CHECK_PORTABILITY_SKIP               CHECK_RELRO
+CHECK_PIE_SUPPORTED               CHECK_PORTABILITY
-CHECK_RELRO_SKIP                     CHECK_RELRO_SUPPORTED
+CHECK_PORTABILITY_EXPERIMENTAL    CHECK_PORTABILITY_SKIP
-CHECK_SHLIBS                         CHECK_SHLIBS_SKIP
+CHECK_RELRO                       CHECK_RELRO_SKIP
-CHECK_SHLIBS_SUPPORTED               CHECK_SHLIBS_TOXIC
+CHECK_RELRO_SUPPORTED             CHECK_SHLIBS
-CHECK_SSP                            CHECK_SSP_SKIP
+CHECK_SHLIBS_SKIP                 CHECK_SHLIBS_SUPPORTED
-CHECK_SSP_SUPPORTED                  CHECK_STRIPPED
+CHECK_SHLIBS_TOXIC                CHECK_SSP
-CHECK_STRIPPED_SKIP                  CHECK_WRKREF
+CHECK_SSP_SKIP                    CHECK_SSP_SUPPORTED
-CHECK_WRKREF_EXTRA_DIRS              CHECK_WRKREF_SKIP
+CHECK_STRIPPED                    CHECK_STRIPPED_SKIP
-CLAMAV_DBDIR                         CLAMAV_GROUP
+CHECK_WRKREF                      CHECK_WRKREF_EXTRA_DIRS
-CLAMAV_USER                          CLANGBASE
+CHECK_WRKREF_SKIP                 CLAMAV_DBDIR
-CLEANDEPENDS                         CMAKE_DEPENDENCIES_REWRITE
+CLAMAV_GROUP                      CLAMAV_USER
-CMAKE_INSTALL_NAME_DIR               CMAKE_INSTALL_PREFIX
+CLANGBASE                         CLEANDEPENDS
-CMAKE_MODULE_PATH_OVERRIDE           CMAKE_PKGSRC_BUILD_FLAGS
+CMAKE_DEPENDENCIES_REWRITE        CMAKE_INSTALL_NAME_DIR
-CMAKE_PREFIX_PATH                    CMAKE_USE_GNU_INSTALL_DIRS
+CMAKE_INSTALL_PREFIX              CMAKE_MODULE_PATH_OVERRIDE
-COMPILER_RPATH_FLAG                  COMPILER_USE_SYMLINKS
+CMAKE_PKGSRC_BUILD_FLAGS          CMAKE_PREFIX_PATH
-CONFIGURE_ARGS                       CONFIGURE_DIRS
+CMAKE_USE_GNU_INSTALL_DIRS        COMMON_LISP_DOCFILES
-CONFIGURE_ENV                        CONFIGURE_ENV_SHELL
+COMMON_LISP_EXAMPLES              COMMON_LISP_EXTRAFILES
-CONFIGURE_HAS_INFODIR                CONFIGURE_HAS_MANDIR
+COMMON_LISP_PACKAGES              COMMON_LISP_SYSTEM
-CONFIGURE_SCRIPT                     CONFIG_SHELL
+COMPILER_RPATH_FLAG               COMPILER_USE_SYMLINKS
-CONFIG_SHELL_FLAGS                   CONF_FILES
+CONFIGURE_ARGS                    CONFIGURE_DIRS
-CONF_FILES_MODE                      CONF_FILES_PERMS
+CONFIGURE_ENV                     CONFIGURE_ENV_SHELL
-CONSERVER_DEFAULTHOST                CONSERVER_DEFAULTPORT
+CONFIGURE_HAS_INFODIR             CONFIGURE_HAS_MANDIR
-CP                                   CPP
+CONFIGURE_SCRIPT                  CONFIG_SHELL
-CPP_PRECOMP_FLAGS                    CREATE_WRKDIR_SYMLINK
+CONFIG_SHELL_FLAGS                CONF_FILES
-CROSSBASE                            CTFCONVERT
+CONF_FILES_MODE                   CONF_FILES_PERMS
-CTF_FILES_SKIP                       CTF_SUPPORTED
+CONSERVER_DEFAULTHOST             CONSERVER_DEFAULTPORT
-CTYPE                                CUPS_GROUP
+CP                                CPP
-CUPS_SYSTEM_GROUPS                   CUPS_USER
+CPP_PRECOMP_FLAGS                 CREATE_WRKDIR_SYMLINK
-CURSES_DEFAULT                       CURSES_TYPE
+CROSSBASE                         CTFCONVERT
-CXX                                  CYRUS_GROUP
+CTF_FILES_SKIP                    CTF_SUPPORTED
-CYRUS_IDLE                           CYRUS_USER
+CTYPE                             CUPS_GROUP
-DAEMONTOOLS_GROUP                    DAEMONTOOLS_LOG_USER
+CUPS_SYSTEM_GROUPS                CUPS_USER
-DARWIN_NO_SYSTEM_LIBS                DARWIN_REQUIRES_FILTER
+CURSES_DEFAULT                    CURSES_TYPE
-DBUS_GROUP                           DBUS_USER
+CVS_EXTRACTDIR                    CVS_MODULE
-DEFANG_GROUP                         DEFANG_USER
+CVS_PROJECT                       CVS_REPOSITORIES
-DEFAULT_ACCEPTABLE_LICENSES          DEFAULT_DISTFILES
+CVS_ROOT                          CVS_ROOT_GNU
-DEFAULT_IRC_SERVER                   DEFAULT_SERIAL_DEVICE
+CVS_ROOT_NONGNU                   CVS_ROOT_SOURCEFORGE
-DEF_UMASK                            DEINSTALLDEPENDS
+CVS_TAG                           CXX
-DEINSTALL_SRC                        DEINSTALL_TEMPLATES
+CYRUS_GROUP                       CYRUS_IDLE
-DELAYED_ERROR_MSG                    DELAYED_WARNING_MSG
+CYRUS_USER                        DAEMONTOOLS_GROUP
-DEPENDS                              DEPENDS_TARGET
+DAEMONTOOLS_LOG_USER              DARWIN_NO_SYSTEM_LIBS
-DEPENDS_TYPE                         DESTDIR
+DARWIN_REQUIRES_FILTER            DBUS_GROUP
-DESTDIR_VARNAME                      DIALER_GROUP
+DBUS_USER                         DEFANG_GROUP
-DIGEST_REQD                          DISTDIR
+DEFANG_USER                       DEFAULT_ACCEPTABLE_LICENSES
-DISTFILES                            DISTINFO_FILE
+DEFAULT_DISTFILES                 DEFAULT_IRC_SERVER
-DISTNAME                             DIST_PATH
+DEFAULT_SERIAL_DEVICE             DEF_UMASK
-DIST_SUBDIR                          DJBDNS_AXFR_USER
+DEINSTALLDEPENDS                  DEINSTALL_SRC
-DJBDNS_CACHE_USER                    DJBDNS_DJBDNS_GROUP
+DEINSTALL_TEMPLATES               DELAYED_ERROR_MSG
-DJBDNS_LOG_USER                      DJBDNS_RBL_USER
+DELAYED_WARNING_MSG               DEPENDS
-DJBDNS_TINY_USER                     DLOPEN_REQUIRE_PTHREADS
+DEPENDS_TARGET                    DEPENDS_TYPE
-DL_AUTO_VARS                         DL_CFLAGS
+DESTDIR                           DESTDIR_VARNAME
-DL_LDFLAGS                           DL_LIBS
+DIALER_GROUP                      DIGEST_REQD
-DNS                                  DOCOWN
+DISTDIR                           DISTFILES
-DOWNLOADED_DISTFILE                  DQCACHE_GROUP
+DISTINFO_FILE                     DISTNAME
-DQCACHE_USER                         DT_LAYOUT
+DIST_PATH                         DIST_SUBDIR
-DYNAMIC_SITES_CMD                    DYNAMIC_SITES_SCRIPT
+DJBDNS_AXFR_USER                  DJBDNS_CACHE_USER
-ECHO                                 ECHO_N
+DJBDNS_DJBDNS_GROUP               DJBDNS_LOG_USER
-ELK_GUI                              EMACS_TYPE
+DJBDNS_RBL_USER                   DJBDNS_TINY_USER
-EMULDIR                              EMULSUBDIR
+DLOPEN_REQUIRE_PTHREADS           DL_AUTO_VARS
-EMULSUBDIRSLASH                      EMUL_ARCH
+DL_CFLAGS                         DL_LDFLAGS
-EMUL_DISTRO                          EMUL_EXEC_FMT
+DL_LIBS                           DNS
-EMUL_IS_NATIVE                       EMUL_MODULES
+DOCOWN                            DOWNLOADED_DISTFILE
-EMUL_OPSYS                           EMUL_PKG_FMT
+DQCACHE_GROUP                     DQCACHE_USER
-EMUL_PLATFORM                        EMUL_PLATFORMS
+DT_LAYOUT                         DYNAMIC_SITES_CMD
-EMUL_PREFER                          EMUL_REQD
+DYNAMIC_SITES_SCRIPT              ECHO
-EMUL_TYPE                            ERROR_MSG
+ECHO_N                            ELK_GUI
-EXIM_GROUP                           EXIM_USER
+EMACS_TYPE                        EMULDIR
-EXPORT_SYMBOLS_LDFLAGS               EXTRACTOR
+EMULSUBDIR                        EMULSUBDIRSLASH
-EXTRACT_CMD                          EXTRACT_CMD_DEFAULT
+EMUL_ARCH                         EMUL_DISTRO
-EXTRACT_DIR                          EXTRACT_ELEMENTS
+EMUL_EXEC_FMT                     EMUL_IS_NATIVE
-EXTRACT_ENV                          EXTRACT_ONLY
+EMUL_MODULES                      EMUL_OPSYS
-EXTRACT_OPTS                         EXTRACT_SUFX
+EMUL_PKG_FMT                      EMUL_PLATFORM
-EXTRACT_USING                        FAIL
+EMUL_PLATFORMS                    EMUL_PREFER
-FAILOVER_FETCH                       FAIL_MSG
+EMUL_REQD                         EMUL_TYPE
-FAKE_NCURSES                         FAM
+ERROR_MSG                         EXIM_GROUP
-FAM_ACCEPTED                         FAM_DEFAULT
+EXIM_USER                         EXPORT_SYMBOLS_LDFLAGS
-FAM_SERVER                           FCPATH
+EXTRACTOR                         EXTRACT_CMD
-FEATURE_CPPFLAGS                     FEATURE_LDFLAGS
+EXTRACT_CMD_DEFAULT               EXTRACT_DIR
-FEATURE_LIBS                         FETCH_AFTER_ARGS
+EXTRACT_ELEMENTS                  EXTRACT_ENV
-FETCH_BEFORE_ARGS                    FETCH_CMD
+EXTRACT_ONLY                      EXTRACT_OPTS
-FETCH_OUTPUT_ARGS                    FETCH_PROXY
+EXTRACT_SUFX                      EXTRACT_USING
-FETCH_RESUME_ARGS                    FETCH_TIMEOUT
+FAIL                              FAILOVER_FETCH
-FETCH_USE_IPV4_ONLY                  FETCH_USING
+FAIL_MSG                          FAKE_NCURSES
-FILES_SUBST                          FILES_SUBST_SED
+FAM                               FAM_ACCEPTED
-FIX_SYSTEM_HEADERS                   FONTS_DIRS
+FAM_DEFAULT                       FAM_SERVER
-FONTS_VERBOSE                        FOO_HACKS_MK
+FCPATH                            FEATURE_CPPFLAGS
-FOX_USE_XUNICODE                     FREEWNN_GROUP
+FEATURE_LDFLAGS                   FEATURE_LIBS
-FREEWNN_USER                         FTP_PKG_URL_DIR
+FETCH_AFTER_ARGS                  FETCH_BEFORE_ARGS
-FTP_PKG_URL_HOST                     GAMEDATAMODE
+FETCH_CMD                         FETCH_OUTPUT_ARGS
-GAMEDATA_PERMS                       GAMEDIRMODE
+FETCH_PROXY                       FETCH_RESUME_ARGS
-GAMEDIR_PERMS                        GAMEGRP
+FETCH_TIMEOUT                     FETCH_USE_IPV4_ONLY
-GAMEMODE                             GAMEOWN
+FETCH_USING                       FILES_SUBST
-GAMES_GROUP                          GAMES_USER
+FILES_SUBST_SED                   FIX_SYSTEM_HEADERS
-GCC                                  GCCBASE
+FONTDIR                           FONTS_DIRS
-GCC_REQD                             GCC_VERSION_SUFFIX
+FONTS_VERBOSE                     FOO_HACKS_MK
-GEM_BUILD                            GEM_CLEANBUILD
+FOSSIL_EXTRACTDIR                 FOSSIL_REPO
-GEM_CLEANBUILD_EXTENSIONS            GEM_DOCDIR
+FOSSIL_REPOSITORIES               FOSSIL_VERSION
-GEM_EXTSDIR                          GEM_HOME
+FOX_USE_XUNICODE                  FREEWNN_GROUP
-GEM_KEEPBUILD                        GEM_LIBDIR
+FREEWNN_USER                      FTP_PKG_URL_DIR
-GEM_NAME                             GEM_PATH
+FTP_PKG_URL_HOST                  GAMEDATAMODE
-GEM_PLUGINSDIR                       GEM_SPECFILE
+GAMEDATA_PERMS                    GAMEDIRMODE
-GENERATE_PLIST                       GHC
+GAMEDIR_PERMS                     GAMEGRP
-GHOSTSCRIPT_REQD                     GITHUB_PROJECT
+GAMEMODE                          GAMEOWN
-GITHUB_RELEASE                       GITHUB_SUBMODULES
+GAMES_GROUP                       GAMES_USER
-GITHUB_TAG                           GITHUB_TYPE
+GCC                               GCCBASE
-GNU                                  GNU_CONFIGURE
+GCC_REQD                          GCC_VERSION_SUFFIX
-GNU_CONFIGURE_INFODIR                GNU_CONFIGURE_MANDIR
+GEM_BUILD                         GEM_CLEANBUILD
-GNU_CONFIGURE_QUIET                  GNU_CONFIGURE_STRICT
+GEM_CLEANBUILD_EXTENSIONS         GEM_DOCDIR
-GODEP_REDIRECTS                      GO_BUILD_PATTERN
+GEM_EXTSDIR                       GEM_HOME
-GO_DEPS                              GO_DIST_BASE
+GEM_KEEPBUILD                     GEM_LIBDIR
-GO_EXTRA_MOD_DIRS                    GO_MODULE_FILES
+GEM_NAME                          GEM_PATH
-GO_SRCPATH                           GO_VERSION_DEFAULT
+GEM_PLUGINSDIR                    GEM_SPECFILE
-GROUP_SPECIFIC_PKGS                  GRUB_NETWORK_CARDS
+GENERATE_PLIST                    GHC
-GRUB_PRESET_COMMAND                  GRUB_SCAN_ARGS
+GHOSTSCRIPT_REQD                  GITHUB_PROJECT
-GZIP                                 HASKELL_ENABLE_DYNAMIC_EXECUTABLE
+GITHUB_RELEASE                    GITHUB_SUBMODULES
-HASKELL_ENABLE_HADDOCK_DOCUMENTATION HASKELL_ENABLE_LIBRARY_PROFILING
+GITHUB_TAG                        GITHUB_TYPE
-HASKELL_ENABLE_SHARED_LIBRARY        HASKELL_OPTIMIZATION_LEVEL
+GITLAB_PROJECT                    GITLAB_TAG
-HAS_CONFIGURE                        HEADER_TEMPLATES
+GITLAB_TYPE                       GIT_BRANCH
-HOMEPAGE                             HOST_PKGTOOLS_ARGS
+GIT_ENV                           GIT_EXTRACTDIR
-HOST_SPECIFIC_PKGS                   HOWL_GROUP
+GIT_REPO                          GIT_REPOSITORIES
-HOWL_USER                            ICCBASE
+GIT_REVISION                      GIT_TAG
-ICECAST_CHROOTDIR                    ICON_THEMES
+GNU                               GNU_CONFIGURE
-IDOBASE                              IGNORE_CCACHE
+GNU_CONFIGURE_INFODIR             GNU_CONFIGURE_MANDIR
-IGNORE_INFO_DIRS                     IGNORE_INTERACTIVE_FETCH
+GNU_CONFIGURE_QUIET               GNU_CONFIGURE_STRICT
-IMAKE                                IMAKEOPTS
+GODEP_REDIRECTS                   GO_BUILD_PATTERN
-IMAKE_MAKE                           IMAKE_MANINSTALL
+GO_DEPS                           GO_DIST_BASE
-IMAP_UW_CCLIENT_MBOX_FMT             IMDICTDIR
+GO_EXTRA_MOD_DIRS                 GO_MODULE_FILES
-INCOMPAT_CURSES                      INFO_DIR
+GO_SRCPATH                        GO_VERSION_DEFAULT
-INFO_FILES                           INFO_FILES_VERBOSE
+GROUP_SPECIFIC_PKGS               GRUB_NETWORK_CARDS
-INFO_MSG                             INIT_SYSTEM
+GRUB_PRESET_COMMAND               GRUB_SCAN_ARGS
-INN_DATA_DIR                         INN_GROUP
+GZIP                              HASKELL_COMPILER
-INN_USER                             INSTALLATION_DIRS
+HASKELL_ENABLE_DYNAMIC_EXECUTABLE HASKELL_ENABLE_HADDOCK_DOCUMENTATION
-INSTALLATION_DIRS_FROM_PLIST         INSTALL_ENV
+HASKELL_ENABLE_LIBRARY_PROFILING  HASKELL_ENABLE_SHARED_LIBRARY
-INSTALL_SH_OVERRIDE                  INSTALL_SRC
+HASKELL_OPTIMIZATION_LEVEL        HAS_CONFIGURE
-INSTALL_TEMPLATES                    INSTALL_UNSTRIPPED
+HEADER_TEMPLATES                  HG_REPO
-IRCD_HYBRID_IRC_GROUP                IRCD_HYBRID_IRC_USER
+HG_REPOSITORIES                   HG_TAG
-IRCD_HYBRID_MAXCONN                  IRCD_HYBRID_NICLEN
+HOMEPAGE                          HOST_PKGTOOLS_ARGS
-IRCD_HYBRID_SYSLOG_EVENTS            IRCD_HYBRID_SYSLOG_FACILITY
+HOST_SPECIFIC_PKGS                HOWL_GROUP
-IRCD_HYBRID_TOPICLEN                 IRIX
+HOWL_USER                         ICCBASE
-IRRD_USE_PGP                         JABBERD_GROUP
+ICECAST_CHROOTDIR                 ICON_THEMES
-JABBERD_LOGDIR                       JABBERD_PIDDIR
+IDOBASE                           IGNORE_CCACHE
-JABBERD_SPOOLDIR                     JABBERD_USER
+IGNORE_INFO_DIRS                  IGNORE_INTERACTIVE_FETCH
-JAVA_BINPREFIX                       JAVA_CLASSPATH
+IMAKE                             IMAKEOPTS
-JAVA_HOME                            JAVA_LD_LIBRARY_PATH
+IMAKE_MAKE                        IMAKE_MANINSTALL
-JAVA_NAME                            JAVA_UNLIMIT
+IMAP_UW_CCLIENT_MBOX_FMT          IMDICTDIR
-JAVA_WRAPPERS                        JPEG_ACCEPTED
+INCOMPAT_CURSES                   INFO_DIR
-JPEG_DEFAULT                         KERBEROS
+INFO_FILES                        INFO_FILES_VERBOSE
-KERMIT_SUID_UUCP                     KJS_USE_PCRE
+INFO_MSG                          INIT_SYSTEM
-KNEWS_DOMAIN_FILE                    KNEWS_DOMAIN_NAME
+INN_DATA_DIR                      INN_GROUP
-KRB5_ACCEPTED                        KRB5_DEFAULT
+INN_USER                          INSTALLATION_DIRS
-LANGUAGES                            LAPACKE_LIBS
+INSTALLATION_DIRS_FROM_PLIST      INSTALL_ENV
-LAPACK_LIBS                          LATEX2HTML_ICONPATH
+INSTALL_SH_OVERRIDE               INSTALL_SRC
-LDCONFIG_ADD_CMD                     LDCONFIG_REMOVE_CMD
+INSTALL_TEMPLATES                 INSTALL_UNSTRIPPED
-LDD                                  LEAFNODE_DATA_DIR
+IRCD_HYBRID_IRC_GROUP             IRCD_HYBRID_IRC_USER
-LEAFNODE_GROUP                       LEAFNODE_USER
+IRCD_HYBRID_MAXCONN               IRCD_HYBRID_NICLEN
-LIBDVDCSS_HOMEPAGE                   LIBDVDCSS_MASTER_SITES
+IRCD_HYBRID_SYSLOG_EVENTS         IRCD_HYBRID_SYSLOG_FACILITY
-LIBRSVG_TYPE                         LIBTOOL
+IRCD_HYBRID_TOPICLEN              IRIX
-LIBTOOLIZE_PLIST                     LIBTOOL_M4_OVERRIDE
+IRRD_USE_PGP                      JABBERD_GROUP
-LIBUSB_TYPE                          LICENSE
+JABBERD_LOGDIR                    JABBERD_PIDDIR
-LINKER_RPATH_FLAG                    LINK_RPATH_FLAG
+JABBERD_SPOOLDIR                  JABBERD_USER
-LINUX_LOCALES                        LOCALBASE
+JAVA_APP_PATH                     JAVA_APP_TARGETS
-LOCALBASE_LOCKTYPE                   LOCALPATCHES
+JAVA_BINPREFIX                    JAVA_CLASSPATH
-LOVE_DATA                            LOVE_GAME
+JAVA_HOME                         JAVA_LD_LIBRARY_PATH
-LOVE_VERSION                         LP32PLATFORMS
+JAVA_NAME                         JAVA_UNLIMIT
-LP64PLATFORMS                        LUA_BUSTED_ARGS
+JAVA_WRAPPERS                     JPEG_ACCEPTED
-LUA_CDIR                             LUA_COMPILER
+JPEG_DEFAULT                      KERBEROS
-LUA_DOCDIR                           LUA_EXAMPLESDIR
+KERMIT_SUID_UUCP                  KJS_USE_PCRE
-LUA_INCDIR                           LUA_INTERPRETER
+KNEWS_DOMAIN_FILE                 KNEWS_DOMAIN_NAME
-LUA_LDIR                             LUA_LINKER_MAGIC
+KRB5_ACCEPTED                     KRB5_DEFAULT
-LUA_PKGPREFIX                        LUA_SELF_CONFLICT
+LANGUAGES                         LAPACKE_LIBS
-LUA_USE_BUSTED                       LUA_VERSIONS_ACCEPTED
+LAPACK_LIBS                       LATEX2HTML_ICONPATH
-LUA_VERSIONS_INCOMPATIBLE            LUA_VERSION_DEFAULT
+LDCONFIG_ADD_CMD                  LDCONFIG_REMOVE_CMD
-LUA_VERSION_REQD                     Lua
+LDD                               LEAFNODE_DATA_DIR
-MACHINE_PLATFORM                     MAILAGENT_DOMAIN
+LEAFNODE_GROUP                    LEAFNODE_USER
-MAILAGENT_EMAIL                      MAILAGENT_FQDN
+LIBDVDCSS_HOMEPAGE                LIBDVDCSS_MASTER_SITES
-MAILAGENT_ORGANIZATION               MAJORDOMO_HOMEDIR
+LIBRSVG_TYPE                      LIBTOOL
-MAKEINFO_ARGS                        MAKE_DIRS
+LIBTOOLIZE_PLIST                  LIBTOOL_M4_OVERRIDE
-MAKE_DIRS_PERMS                      MAKE_ENV
+LIBUSB_TYPE                       LICENSE
-MAKE_FILE                            MAKE_FLAGS
+LINKER_RPATH_FLAG                 LINK_RPATH_FLAG
-MAKE_JOBS                            MAKE_JOBS_SAFE
+LINUX_BASE_NODEPS                 LINUX_BASE_PREFERRED
-MAKE_PROGRAM                         MANCOMPRESSED_IF_MANZ
+LINUX_BASE_REQUIRED               LINUX_LOCALES
-MANINSTALL                           MANZ
+LOCALBASE                         LOCALBASE_LOCKTYPE
-MASTER_SITES                         MASTER_SITE_BACKUP
+LOCALPATCHES                      LOVE_DATA
-MASTER_SITE_LOCAL                    MASTER_SITE_MOZILLA
+LOVE_GAME                         LOVE_VERSION
-MASTER_SITE_OVERRIDE                 MASTER_SITE_PERL_CPAN
+LP32PLATFORMS                     LP64PLATFORMS
-MASTER_SORT                          MASTER_SORT_RANDOM
+LUA_BUSTED_ARGS                   LUA_CDIR
-MASTER_SORT_REGEX                    MECAB_CHARSET
+LUA_COMPILER                      LUA_DOCDIR
-MEDIATOMB_GROUP                      MEDIATOMB_USER
+LUA_EXAMPLESDIR                   LUA_INCDIR
-MIPSPROBASE                          MIREDO_GROUP
+LUA_INTERPRETER                   LUA_LDIR
-MIREDO_USER                          MISSING_FEATURES
+LUA_LINKER_MAGIC                  LUA_PKGPREFIX
-MKDIR                                MKPIE_SUPPORTED
+LUA_SELF_CONFLICT                 LUA_USE_BUSTED
-MLDONKEY_GROUP                       MLDONKEY_HOME
+LUA_VERSIONS_ACCEPTED             LUA_VERSIONS_INCOMPATIBLE
-MLDONKEY_USER                        MONOTONE_GROUP
+LUA_VERSION_DEFAULT               LUA_VERSION_REQD
-MONOTONE_USER                        MOTIFBASE
+Lua                               MACHINE_PLATFORM
-MOTIF_TYPE                           MOTIF_TYPE_DEFAULT
+MAILAGENT_DOMAIN                  MAILAGENT_EMAIL
-MPI_TYPE                             MSGFMT_STRIP_MSGCTXT
+MAILAGENT_FQDN                    MAILAGENT_ORGANIZATION
-MSGFMT_STRIP_MSGID_PLURAL            MTOOLS_ENABLE_FLOPPYD
+MAJORDOMO_HOMEDIR                 MAJOR_OS_VERSION
-MV                                   MYSQL_CHARSET
+MAKEINFO_ARGS                     MAKE_DIRS
-MYSQL_DATADIR                        MYSQL_EXTRA_CHARSET
+MAKE_DIRS_PERMS                   MAKE_ENV
-MYSQL_GROUP                          MYSQL_USER
+MAKE_FILE                         MAKE_FLAGS
-MYSQL_VERSION                        MYSQL_VERSIONS_ACCEPTED
+MAKE_JOBS                         MAKE_JOBS_SAFE
-MYSQL_VERSIONS_ALL                   MYSQL_VERSION_DEFAULT
+MAKE_PROGRAM                      MANCOMPRESSED_IF_MANZ
-NAGIOSCMD_GROUP                      NAGIOSDIR
+MANINSTALL                        MANZ
-NAGIOS_GROUP                         NAGIOS_USER
+MASTER_SITES                      MASTER_SITE_BACKUP
-NATIVE_APPEND_ABI                    NATIVE_APPEND_ELF
+MASTER_SITE_LOCAL                 MASTER_SITE_MOZILLA
-NATIVE_EXEC_FMT                      NATIVE_MACHINE_PLATFORM
+MASTER_SITE_OVERRIDE              MASTER_SITE_PERL_CPAN
-NATIVE_OBJECT_FMT                    NBPAX_PROGRAM_PREFIX
+MASTER_SORT                       MASTER_SORT_RANDOM
-NETBSD_LOGIN_NAME                    NMH_EDITOR
+MASTER_SORT_REGEX                 MECAB_CHARSET
-NMH_MTA                              NMH_PAGER
+MEDIATOMB_GROUP                   MEDIATOMB_USER
-NODE_VERSIONS_ACCEPTED               NODE_VERSIONS_INCOMPATIBLE
+MIPSPROBASE                       MIREDO_GROUP
-NODE_VERSION_DEFAULT                 NODE_VERSION_REQD
+MIREDO_USER                       MISSING_FEATURES
-NOLOGIN                              NOTE
+MKDIR                             MKPIE_SUPPORTED
-NOT_FOR_PLATFORM                     NOT_PAX_ASLR_SAFE
+MLDONKEY_GROUP                    MLDONKEY_HOME
-NOT_PAX_MPROTECT_SAFE                NO_BUILD
+MLDONKEY_USER                     MONOTONE_GROUP
-NO_CHECKSUM                          NO_CONFIGURE
+MONOTONE_USER                     MOTIFBASE
-NO_SKIP                              NS_PREFERRED
+MOTIF_TYPE                        MOTIF_TYPE_DEFAULT
-NULLMAILER_GROUP                     NULLMAILER_USER
+MPI_TYPE                          MSGFMT_STRIP_MSGCTXT
-OASIS                                OASIS_BUILD_ARGS
+MSGFMT_STRIP_MSGID_PLURAL         MTOOLS_ENABLE_FLOPPYD
-OBJHOSTNAME                          OBJMACHINE
+MUST                              MV
-OCAML_FINDLIB_DIRS                   OCAML_FINDLIB_REGISTER
+MYSQL_CHARSET                     MYSQL_DATADIR
-OCAML_FINDLIB_REGISTER_VERBOSE       OCAML_SITELIBDIR
+MYSQL_EXTRA_CHARSET               MYSQL_GROUP
-OCAML_TOPKG_DOCDIR                   OCAML_USE_DUNE
+MYSQL_USER                        MYSQL_VERSION
-OCAML_USE_FINDLIB                    OCAML_USE_OASIS
+MYSQL_VERSIONS_ACCEPTED           MYSQL_VERSIONS_ALL
-OCAML_USE_OASIS_DYNRUN               OCAML_USE_OPAM
+MYSQL_VERSION_DEFAULT             NAGIOSCMD_GROUP
-OCAML_USE_OPT_COMPILER               OCAML_USE_TOPKG
+NAGIOSDIR                         NAGIOS_GROUP
-OMF                                  ONLY_FOR_COMPILER
+NAGIOS_USER                       NATIVE_APPEND_ABI
-ONLY_FOR_PLATFORM                    OPENSSH_CHROOT
+NATIVE_APPEND_ELF                 NATIVE_EXEC_FMT
-OPENSSH_GROUP                        OPENSSH_USER
+NATIVE_MACHINE_PLATFORM           NATIVE_OBJECT_FMT
-OPSYS                                OPSYS_EMULDIR
+NBPAX_PROGRAM_PREFIX              NETBSD_LOGIN_NAME
-OPSYS_VERSION                        OS
+NMH_EDITOR                        NMH_MTA
-OSS_TYPE                             OSX
+NMH_PAGER                         NODE_VERSIONS_ACCEPTED
-OSX_TOLERATE_SDK_SKEW                OS_VARIANT
+NODE_VERSIONS_INCOMPATIBLE        NODE_VERSION_DEFAULT
-OS_VERSION                           OTF_FONTS_DIR
+NODE_VERSION_REQD                 NOLOGIN
-OVERRIDE_DIRDEPTH                    OVERRIDE_GEMSPEC
+NOTE                              NOT_FOR_PLATFORM
-OVERRIDE_GNU_CONFIG_SCRIPTS          OWN_DIRS
+NOT_PAX_ASLR_SAFE                 NOT_PAX_MPROTECT_SAFE
-OWN_DIRS_PERMS                       P4GROUP
+NO_BUILD                          NO_CHECKSUM
-P4PORT                               P4ROOT
+NO_CONFIGURE                      NO_SKIP
-P4USER                               PACKAGES
+NS_PREFERRED                      NULLMAILER_GROUP
-PALMOS_DEFAULT_SDK                   PAMBASE
+NULLMAILER_USER                   OASIS
-PAM_DEFAULT                          PAPERSIZE
+OASIS_BUILD_ARGS                  OBJHOSTNAME
-PASSIVE_FETCH                        PATCHDIR
+OBJMACHINE                        OCAML_FINDLIB_DIRS
-PATCHFILES                           PATCH_ARGS
+OCAML_FINDLIB_REGISTER            OCAML_FINDLIB_REGISTER_VERBOSE
-PATCH_DEBUG                          PATCH_DIST_ARGS
+OCAML_SITELIBDIR                  OCAML_TOPKG_DOCDIR
-PATCH_DIST_CAT                       PATCH_DIST_STRIP
+OCAML_USE_DUNE                    OCAML_USE_FINDLIB
-PATCH_FUZZ_FACTOR                    PATCH_STRIP
+OCAML_USE_OASIS                   OCAML_USE_OASIS_DYNRUN
-PATH                                 PCCBASE
+OCAML_USE_OPAM                    OCAML_USE_OPT_COMPILER
-PEAR_CMD                             PEAR_LIB
+OCAML_USE_TOPKG                   OMF
-PEAR_PACKAGE_XML                     PERL5
+ONLY_FOR_COMPILER                 ONLY_FOR_PLATFORM
-PERL5_CONFIGURE                      PERL5_CONFIGURE_DIRS
+OPENSSH_CHROOT                    OPENSSH_GROUP
-PERL5_LDFLAGS                        PERL5_LICENSE
+OPENSSH_USER                      OPSYS
-PERL5_MODULE_TYPE                    PERL5_PACKLIST
+OPSYS_EMULDIR                     OPSYS_VERSION
-PERL5_PACKLIST_DIR                   PERL5_PERLBASE
+OS                                OSS_TYPE
-PERL5_SITEBASE                       PERL5_USE_PACKLIST
+OSX                               OSX_TOLERATE_SDK_SKEW
-PERL5_VENDORBASE                     PFCTL
+OS_HAVE_ALSA                      OS_HAVE_RCD
-PFVAR_H                              PF_VERSION
+OS_VARIANT                        OS_VERSION
-PGGROUP                              PGHOME
+OTF_FONTS_DIR                     OVERRIDE_DIRDEPTH
-PGPKGSRCDIR                          PGSQL_TYPE
+OVERRIDE_GEMSPEC                  OVERRIDE_GNU_CONFIG_SCRIPTS
-PGSQL_VERSION                        PGSQL_VERSIONS_ACCEPTED
+OVERRIDE_ROCKSPEC                 OWN_DIRS
-PGSQL_VERSION_DEFAULT                PGUSER
+OWN_DIRS_PERMS                    P4GROUP
-PG_LIB_EXT                           PHP
+P4PORT                            P4ROOT
-PHPCOMMON_MK                         PHPPKGSRCDIR
+P4USER                            PACKAGES
-PHP_BASE_VERS                        PHP_CHECK_INSTALLED
+PALMOS_DEFAULT_SDK                PAMBASE
-PHP_EXTENSION_DIR                    PHP_INITIAL_TEENY
+PAM_DEFAULT                       PAPERSIZE
-PHP_PKG_PREFIX                       PHP_VERSION
+PASSIVE_FETCH                     PATCHDIR
-PHP_VERSIONS_ACCEPTED                PHP_VERSIONS_INCOMPATIBLE
+PATCHFILES                        PATCH_ARGS
-PHP_VERSION_DEFAULT                  PHP_VERSION_REQD
+PATCH_DEBUG                       PATCH_DIST_ARGS
-PILRC_USE_GTK                        PKGCONFIG_BASE
+PATCH_DIST_CAT                    PATCH_DIST_STRIP
-PKGCONFIG_FILE                       PKGCONFIG_OVERRIDE
+PATCH_FUZZ_FACTOR                 PATCH_STRIP
-PKGCONFIG_OVERRIDE_STAGE             PKGDIR
+PATH                              PCCBASE
-PKGGNUDIR                            PKGINFODIR
+PEAR                              PEAR_CHANNEL
-PKGLOCALEDIR                         PKGMANDIR
+PEAR_CHANNEL_ALIAS                PEAR_CHANNEL_VERSION
-PKGNAME                              PKGNAME_REQD
+PEAR_CMD                          PEAR_LIB
-PKGPATH                              PKGREVISION
+PEAR_PACKAGE_XML                  PERL5
-PKGSRC_BLAS_TYPES                    PKGSRC_CHANGES
+PERL5_CONFIGURE                   PERL5_CONFIGURE_DIRS
-PKGSRC_COMPILER                      PKGSRC_KEEP_BIN_PKGS
+PERL5_LDFLAGS                     PERL5_LICENSE
-PKGSRC_LOCKTYPE                      PKGSRC_MAKE_ENV
+PERL5_MODULE_TYPE                 PERL5_PACKLIST
-PKGSRC_MESSAGE_RECIPIENTS            PKGSRC_MKPIE
+PERL5_PACKLIST_DIR                PERL5_PERLBASE
-PKGSRC_MKREPRO                       PKGSRC_OVERRIDE_MKPIE
+PERL5_SITEBASE                    PERL5_USE_PACKLIST
-PKGSRC_RUN_TEST                      PKGSRC_SETENV
+PERL5_VENDORBASE                  PFCTL
-PKGSRC_SLEEPSECS                     PKGSRC_TODO
+PFVAR_H                           PF_VERSION
-PKGSRC_USE_CTF                       PKGSRC_USE_FORTIFY
+PGGROUP                           PGHOME
-PKGSRC_USE_RELRO                     PKGSRC_USE_SSP
+PGPKGSRCDIR                       PGSQL_TYPE
-PKGSRC_USE_STACK_CHECK               PKGTASKS_DATAFILE
+PGSQL_VERSION                     PGSQL_VERSIONS_ACCEPTED
-PKGTOOLS_ARGS                        PKGTOOLS_ENV
+PGSQL_VERSION_DEFAULT             PGUSER
-PKG_ALTERNATIVES                     PKG_APACHE
+PG_LIB_EXT                        PHP
-PKG_APACHE_ACCEPTED                  PKG_APACHE_DEFAULT
+PHPCOMMON_MK                      PHPPKGSRCDIR
-PKG_BEST_EXISTS                      PKG_BUILD_OPTIONS
+PHP_BASE_VERS                     PHP_CHECK_INSTALLED
-PKG_COMPRESSION                      PKG_CONFIG
+PHP_EXTENSION_DIR                 PHP_INITIAL_TEENY
-PKG_CONFIG_PERMS                     PKG_CREATE_USERGROUP
+PHP_PKG_PREFIX                    PHP_VERSION
-PKG_DB_TMPDIR                        PKG_DEBUG_LEVEL
+PHP_VERSIONS_ACCEPTED             PHP_VERSIONS_INCOMPATIBLE
-PKG_DEFAULT_OPTIONS                  PKG_DESTDIR_SUPPORT
+PHP_VERSION_DEFAULT               PHP_VERSION_REQD
-PKG_DEVELOPER                        PKG_DISABLED_OPTIONS
+PILRC_USE_GTK                     PKGCONFIG_BASE
-PKG_FATAL_ERRORS                     PKG_FC
+PKGCONFIG_FILE                    PKGCONFIG_OVERRIDE
-PKG_FILELIST_CMD                     PKG_GECOS
+PKGCONFIG_OVERRIDE_STAGE          PKGDIR
-PKG_GID                              PKG_GROUPS
+PKGGNUDIR                         PKGINFODIR
-PKG_GROUPS_VARS                      PKG_HOME
+PKGLOCALEDIR                      PKGMANDIR
-PKG_INIT_SCRIPTS                     PKG_JAVA_HOME
+PKGNAME                           PKGNAME_REQD
-PKG_JVM                              PKG_JVMS_ACCEPTED
+PKGPATH                           PKGREVISION
-PKG_JVM_DEFAULT                      PKG_LEGACY_OPTIONS
+PKGSRC_BLAS_TYPES                 PKGSRC_CHANGES
-PKG_LIBTOOL                          PKG_OPTIONS
+PKGSRC_COMPILER                   PKGSRC_KEEP_BIN_PKGS
-PKG_OPTIONS_DEPRECATED_WARNINGS      PKG_OPTIONS_LEGACY_OPTS
+PKGSRC_LOCKTYPE                   PKGSRC_MAKE_ENV
-PKG_OPTIONS_LEGACY_VARS              PKG_OPTIONS_NONEMPTY_SETS
+PKGSRC_MESSAGE_RECIPIENTS         PKGSRC_MKPIE
-PKG_OPTIONS_OPTIONAL_GROUPS          PKG_OPTIONS_REQUIRED_GROUPS
+PKGSRC_MKREPRO                    PKGSRC_OVERRIDE_MKPIE
-PKG_OPTIONS_VAR                      PKG_PHP
+PKGSRC_RUN_TEST                   PKGSRC_SETENV
-PKG_PHP_MAJOR_VERS                   PKG_PHP_VERSION
+PKGSRC_SLEEPSECS                  PKGSRC_TODO
-PKG_RCD_SCRIPTS                      PKG_REFCOUNT_DBDIR
+PKGSRC_USE_CTF                    PKGSRC_USE_FORTIFY
-PKG_REGISTER_SHELLS                  PKG_RESUME_TRANSFERS
+PKGSRC_USE_RELRO                  PKGSRC_USE_SSP
-PKG_SHELL                            PKG_SUGGESTED_OPTIONS
+PKGSRC_USE_STACK_CHECK            PKGTASKS_DATAFILE
-PKG_SUPPORTED_OPTIONS                PKG_SYSCONFBASE
+PKGTOOLS_ARGS                     PKGTOOLS_ENV
-PKG_SYSCONFBASEDIR                   PKG_SYSCONFDIR
+PKG_ALTERNATIVES                  PKG_APACHE
-PKG_SYSCONFDIR_PERMS                 PKG_SYSCONFSUBDIR
+PKG_APACHE_ACCEPTED               PKG_APACHE_DEFAULT
-PKG_SYSCONFVAR                       PKG_TOOLS_BIN
+PKG_BEST_EXISTS                   PKG_BUILD_OPTIONS
-PKG_UID                              PKG_UPDATE_FONTS_DB
+PKG_COMPRESSION                   PKG_CONFIG
-PKG_USERS                            PKG_USERS_VARS
+PKG_CONFIG_PERMS                  PKG_CREATE_USERGROUP
-PKG_VERBOSE                          PLEASE
+PKG_DB_TMPDIR                     PKG_DEBUG_LEVEL
-PLIST                                PLIST_AWK
+PKG_DEFAULT_OPTIONS               PKG_DESTDIR_SUPPORT
-PLIST_AWK_ENV                        PLIST_SRC
+PKG_DEVELOPER                     PKG_DISABLED_OPTIONS
-PLIST_SUBST                          PLIST_TYPE
+PKG_FATAL_ERRORS                  PKG_FC
-PLIST_VARS                           POPTOP_USE_MPPE
+PKG_FILELIST_CMD                  PKG_GECOS
-POSSIBLE_GFORTRAN_VERSION            POST_FETCH_HOOK
+PKG_GID                           PKG_GROUPS
-PREFER                               PREFER_NATIVE
+PKG_GROUPS_VARS                   PKG_HOME
-PREFER_NATIVE_PTHREADS               PREFER_PKGSRC
+PKG_INIT_SCRIPTS                  PKG_JAVA_HOME
-PREFIX                               PREPEND_PATH
+PKG_JVM                           PKG_JVMS_ACCEPTED
-PRE_ROOT_CMD                         PRIVILEGED_STAGES
+PKG_JVM_DEFAULT                   PKG_LEGACY_OPTIONS
-PS                                   PTHREAD_AUTO_VARS
+PKG_LIBTOOL                       PKG_OPTIONS
-PTHREAD_CFLAGS                       PTHREAD_LDFLAGS
+PKG_OPTIONS_DEPRECATED_WARNINGS   PKG_OPTIONS_LEGACY_OPTS
-PTHREAD_LIBS                         PTHREAD_OPTS
+PKG_OPTIONS_LEGACY_VARS           PKG_OPTIONS_NONEMPTY_SETS
-PTHREAD_TYPE                         PVM_SSH
+PKG_OPTIONS_OPTIONAL_GROUPS       PKG_OPTIONS_REQUIRED_GROUPS
-PYPKGPREFIX                          PYTHON_FOR_BUILD_ONLY
+PKG_OPTIONS_VAR                   PKG_PHP
-PYTHON_SELF_CONFLICT                 PYTHON_VERSIONED_DEPENDENCIES
+PKG_PHP_MAJOR_VERS                PKG_PHP_VERSION
-PYTHON_VERSIONS_ACCEPTED             PYTHON_VERSIONS_INCOMPATIBLE
+PKG_RCD_SCRIPTS                   PKG_REFCOUNT_DBDIR
-PYTHON_VERSION_DEFAULT               PYTHON_VERSION_REQD
+PKG_REGISTER_SHELLS               PKG_RESUME_TRANSFERS
-PYVERSSUFFIX                         QMAILDIR
+PKG_SHELL                         PKG_SUGGESTED_OPTIONS
-QMAIL_ALIAS_USER                     QMAIL_DAEMON_USER
+PKG_SUPPORTED_OPTIONS             PKG_SYSCONFBASE
-QMAIL_LOG_USER                       QMAIL_NOFILES_GROUP
+PKG_SYSCONFBASEDIR                PKG_SYSCONFDIR
-QMAIL_PASSWD_USER                    QMAIL_QMAIL_GROUP
+PKG_SYSCONFDIR_PERMS              PKG_SYSCONFSUBDIR
-QMAIL_QUEUE_DIR                      QMAIL_QUEUE_EXTRA
+PKG_SYSCONFVAR                    PKG_TOOLS_BIN
-QMAIL_QUEUE_USER                     QMAIL_REMOTE_USER
+PKG_UID                           PKG_UPDATE_FONTS_DB
-QMAIL_ROOT_USER                      QMAIL_SEND_USER
+PKG_USERS                         PKG_USERS_VARS
-QORE_LATEST_MODULE_API               QORE_MODULE_API
+PKG_VERBOSE                       PLEASE
-QORE_MODULE_DIR                      QORE_USER_MODULE_DIR
+PLIST                             PLIST_AWK
-QORE_VERSION                         QPOPPER_FAC
+PLIST_AWK_ENV                     PLIST_SRC
-QPOPPER_SPOOL_DIR                    QPOPPER_USER
+PLIST_SUBST                       PLIST_TYPE
-RAKE_NAME                            RASMOL_DEPTH
+PLIST_VARS                        POPTOP_USE_MPPE
-RCD_SCRIPTS                          RCD_SCRIPTS_DIR
+POSSIBLE_GFORTRAN_VERSION         POST_FETCH_HOOK
-RCD_SCRIPTS_EXAMPLEDIR               RCD_SCRIPTS_MODE
+PREFER                            PREFER_NATIVE
-RCD_SCRIPTS_SHELL                    RCD_SCRIPT_SRC
+PREFER_NATIVE_PTHREADS            PREFER_PKGSRC
-RDOC                                 READLINE_DEFAULT
+PREFIX                            PREPEND_PATH
-READLINE_TYPE                        REAL_ROOT_GROUP
+PRE_ROOT_CMD                      PRIVILEGED_STAGES
-REAL_ROOT_USER                       RECURSIVE_MAKE
+PS                                PTHREAD_AUTO_VARS
-RELAY_CTRL_DIR                       RELRO_SUPPORTED
+PTHREAD_CFLAGS                    PTHREAD_LDFLAGS
-REPLACE_AWK                          REPLACE_BASH
+PTHREAD_LIBS                      PTHREAD_OPTS
-REPLACE_CSH                          REPLACE_KSH
+PTHREAD_TYPE                      PVM_SSH
-REPLACE_LUA                          REPLACE_NODEJS
+PYPKGPREFIX                       PYTHON_FOR_BUILD_ONLY
-REPLACE_OCTAVE                       REPLACE_PERL
+PYTHON_SELF_CONFLICT              PYTHON_VERSIONED_DEPENDENCIES
-REPLACE_PERL6                        REPLACE_PHP
+PYTHON_VERSIONS_ACCEPTED          PYTHON_VERSIONS_INCOMPATIBLE
-REPLACE_PYTHON                       REPLACE_QORE
+PYTHON_VERSION_DEFAULT            PYTHON_VERSION_REQD
-REPLACE_R                            REPLACE_RUBY
+PYVERSSUFFIX                      QMAILDIR
-REPLACE_RUBY_DIRS                    REPLACE_RUBY_PAT
+QMAIL_ALIAS_USER                  QMAIL_DAEMON_USER
-REPLACE_SH                           REPLACE_TEXLUA
+QMAIL_LOG_USER                    QMAIL_NOFILES_GROUP
-REPLACE_WISH                         REQD_DIRS
+QMAIL_PASSWD_USER                 QMAIL_QMAIL_GROUP
-REQD_DIRS_PERMS                      REQD_FILES
+QMAIL_QUEUE_DIR                   QMAIL_QUEUE_EXTRA
-REQD_FILES_MODE                      REQD_FILES_PERMS
+QMAIL_QUEUE_USER                  QMAIL_REMOTE_USER
-RESOLV_AUTO_VARS                     RESOLV_LDFLAGS
+QMAIL_ROOT_USER                   QMAIL_SEND_USER
-RESOLV_LIBS                          RM
+QORE_LATEST_MODULE_API            QORE_MODULE_API
-ROOT_CMD                             ROOT_GROUP
+QORE_MODULE_DIR                   QORE_USER_MODULE_DIR
-ROOT_USER                            RPCGEN
+QORE_VERSION                      QPOPPER_FAC
-RPM                                  RPM2PKG_PLIST
+QPOPPER_SPOOL_DIR                 QPOPPER_USER
-RPM2PKG_PREFIX                       RPM2PKG_STAGE
+RAKE_NAME                         RASMOL_DEPTH
-RPM2PKG_STRIP                        RPM2PKG_SUBPREFIX
+RCD_DIR                           RCD_ORDER
-RPMFILES                             RPMIGNOREPATH
+RCD_SCRIPTS                       RCD_SCRIPTS_DIR
-RPM_DB_PREFIX                        RSSH_CVS_PATH
+RCD_SCRIPTS_EXAMPLEDIR            RCD_SCRIPTS_MODE
-RSSH_RDIST_PATH                      RSSH_RSYNC_PATH
+RCD_SCRIPTS_SHELL                 RCD_SCRIPT_SRC
-RSSH_SCP_PATH                        RSSH_SFTP_SERVER_PATH
+RCD_SUBR                          RDOC
-RUBY                                 RUBYGEM
+READLINE_DEFAULT                  READLINE_TYPE
-RUBYGEM_NAME                         RUBYGEM_OPTIONS
+REAL_ROOT_GROUP                   REAL_ROOT_USER
-RUBYGEM_VERBOSE                      RUBY_ABI_VERSION
+RECURSIVE_MAKE                    RELAY_CTRL_DIR
-RUBY_ARCH                            RUBY_ARCHINC
+RELRO_SUPPORTED                   REPLACE_AWK
-RUBY_ARCHLIB                         RUBY_BASE
+REPLACE_BASH                      REPLACE_CSH
-RUBY_BASERIDIR                       RUBY_BUILD_DOCUMENT
+REPLACE_KSH                       REPLACE_LUA
-RUBY_DLEXT                           RUBY_DOC
+REPLACE_NODEJS                    REPLACE_OCTAVE
-RUBY_DYNAMIC_DIRS                    RUBY_EG
+REPLACE_PERL                      REPLACE_PERL6
-RUBY_ENCODING_ARG                    RUBY_EXTCONF
+REPLACE_PHP                       REPLACE_PYTHON
-RUBY_EXTCONF_CHECK                   RUBY_EXTCONF_DEBUG
+REPLACE_QORE                      REPLACE_R
-RUBY_EXTCONF_MAKEFILE                RUBY_GEM_ARCH
+REPLACE_RUBY                      REPLACE_RUBY_DIRS
-RUBY_GEM_BASE                        RUBY_INC
+REPLACE_RUBY_PAT                  REPLACE_SH
-RUBY_LIB                             RUBY_LIB_BASE
+REPLACE_TEXLUA                    REPLACE_WISH
-RUBY_NAME                            RUBY_NOVERSION
+REQD_DIRS                         REQD_DIRS_PERMS
-RUBY_PKGPREFIX                       RUBY_RAILS
+REQD_FILES                        REQD_FILES_MODE
-RUBY_RAILS52_VERSION                 RUBY_RAILS60_VERSION
+REQD_FILES_PERMS                  RESOLV_AUTO_VARS
-RUBY_RAILS61_VERSION                 RUBY_RAILS70_VERSION
+RESOLV_LDFLAGS                    RESOLV_LIBS
-RUBY_RAILS_ACCEPTED                  RUBY_RAILS_DEFAULT
+RM                                ROCKSPEC_NAME
-RUBY_RAILS_REQD                      RUBY_RAILS_STRICT_DEP
+ROCKSPEC_SPECFILE                 ROOT_CMD
-RUBY_RIDIR                           RUBY_SETUP
+ROOT_GROUP                        ROOT_USER
-RUBY_SHLIB                           RUBY_SHLIBALIAS
+RPCGEN                            RPM
-RUBY_SHLIBVER                        RUBY_SIMPLE_INSTALL
+RPM2PKG_PLIST                     RPM2PKG_PREFIX
-RUBY_SITEARCHLIB                     RUBY_SITELIB
+RPM2PKG_STAGE                     RPM2PKG_STRIP
-RUBY_SITELIB_BASE                    RUBY_SITERIDIR
+RPM2PKG_SUBPREFIX                 RPMFILES
-RUBY_SLEXT                           RUBY_SRCDIR
+RPMIGNOREPATH                     RPM_DB_PREFIX
-RUBY_STATICLIB                       RUBY_SUFFIX
+RSSH_CVS_PATH                     RSSH_RDIST_PATH
-RUBY_SYSRIDIR                        RUBY_USE_PTHREAD
+RSSH_RSYNC_PATH                   RSSH_SCP_PATH
-RUBY_VENDORARCHLIB                   RUBY_VENDORLIB
+RSSH_SFTP_SERVER_PATH             RUBY
-RUBY_VENDORLIB_BASE                  RUBY_VER
+RUBYGEM                           RUBYGEM_NAME
-RUBY_VERSION                         RUBY_VERSIONS_ACCEPTED
+RUBYGEM_OPTIONS                   RUBYGEM_VERBOSE
-RUBY_VERSIONS_INCOMPATIBLE           RUBY_VERSION_DEFAULT
+RUBY_ABI_VERSION                  RUBY_ARCH
-RUBY_VERSION_REQD                    RUBY_VER_DIR
+RUBY_ARCHINC                      RUBY_ARCHLIB
-RUN                                  RUN_LDCONFIG
+RUBY_BASE                         RUBY_BASERIDIR
-RUST_TYPE                            SCO
+RUBY_BUILD_DOCUMENT               RUBY_DLEXT
-SCREWS_GROUP                         SCREWS_USER
+RUBY_DOC                          RUBY_DYNAMIC_DIRS
-SCRIPTS_ENV                          SCROLLKEEPER_DATADIR
+RUBY_EG                           RUBY_ENCODING_ARG
-SCROLLKEEPER_REBUILDDB               SCROLLKEEPER_UPDATEDB
+RUBY_EXTCONF                      RUBY_EXTCONF_CHECK
-SDIST_PAWD                           SDL12_TYPE
+RUBY_EXTCONF_DEBUG                RUBY_EXTCONF_MAKEFILE
-SERIAL_DEVICES                       SETGIDGAME
+RUBY_GEM_ARCH                     RUBY_GEM_BASE
-SETGID_GAMES_PERMS                   SETUID_ROOT_PERMS
+RUBY_INC                          RUBY_LIB
-SH                                   SHLIB
+RUBY_LIB_BASE                     RUBY_NAME
-SIGN_PACKAGES                        SILC_CLIENT_WITH_PERL
+RUBY_NOVERSION                    RUBY_PKGPREFIX
-SITE_SPECIFIC_PKGS                   SKIP_DEPENDS
+RUBY_RAILS                        RUBY_RAILS52_VERSION
-SMF_INSTANCES                        SMF_MANIFEST
+RUBY_RAILS60_VERSION              RUBY_RAILS61_VERSION
-SMF_METHODS                          SMF_METHOD_SHELL
+RUBY_RAILS70_VERSION              RUBY_RAILS_ACCEPTED
-SMF_METHOD_SRC                       SMF_NAME
+RUBY_RAILS_DEFAULT                RUBY_RAILS_REQD
-SMF_PREFIX                           SMF_SRCDIR
+RUBY_RAILS_STRICT_DEP             RUBY_RIDIR
-SNIPROXY_GROUP                       SNIPROXY_USER
+RUBY_SETUP                        RUBY_SHLIB
-SOURCE_BUFFSIZE                      SPECIAL_PERMS
+RUBY_SHLIBALIAS                   RUBY_SHLIBVER
-SPECIFIC_PKGS                        SSH_SUID
+RUBY_SIMPLE_INSTALL               RUBY_SITEARCHLIB
-SSP_SUPPORTED                        SSYNC_PAWD
+RUBY_SITELIB                      RUBY_SITELIB_BASE
-STEP_MSG                             STRIP
+RUBY_SITERIDIR                    RUBY_SLEXT
-STRIP_DBG                            STRIP_DEBUG
+RUBY_SRCDIR                       RUBY_STATICLIB
-STRIP_DEBUG_SUPPORTED                STRIP_FILES_SKIP
+RUBY_SUFFIX                       RUBY_SYSRIDIR
-SU                                   SUBDIR
+RUBY_USE_PTHREAD                  RUBY_VENDORARCHLIB
-SUBST                                SUBST_CLASSES
+RUBY_VENDORLIB                    RUBY_VENDORLIB_BASE
-SUBST_FILES                          SUBST_FILTER_CMD
+RUBY_VER                          RUBY_VERSION
-SUBST_MESSAGE                        SUBST_NOOP_OK
+RUBY_VERSIONS_ACCEPTED            RUBY_VERSIONS_INCOMPATIBLE
-SUBST_SED                            SUBST_SHOW_DIFF
+RUBY_VERSION_DEFAULT              RUBY_VERSION_REQD
-SUBST_SKIP_TEXT_CHECK                SUBST_STAGE
+RUBY_VER_DIR                      RUN
-SUBST_VARS                           SUNWSPROBASE
+RUN_LDCONFIG                      RUST_TYPE
-SUSE_PREFER                          SU_CMD
+SCO                               SCREWS_GROUP
-SYSCONFBASE                          TARGET_ARCH
+SCREWS_USER                       SCRIPTS_ENV
-TBL                                  TERMCAP_TYPE
+SCROLLKEEPER_DATADIR              SCROLLKEEPER_REBUILDDB
-TERMINFO_DEFAULT                     TERMINFO_TYPE
+SCROLLKEEPER_UPDATEDB             SDIST_PAWD
-TEST                                 TEST_DEPENDS
+SDL12_TYPE                        SERIAL_DEVICES
-TEST_DIRS                            TEST_ENV
+SETGIDGAME                        SETGID_GAMES_PERMS
-TEST_ENV_SHELL                       TEST_MAKE_CMD
+SETUID_ROOT_PERMS                 SH
-TEST_MAKE_FLAGS                      TEST_TARGET
+SHLIB                             SHORTNAME
-TEXLIVE_IGNORE_PATTERNS              TEXLIVE_REV
+SIGN_PACKAGES                     SILC_CLIENT_WITH_PERL
-TEXLIVE_UNVERSIONED                  TEXMFSITE
+SITE_SPECIFIC_PKGS                SKIP_DEPENDS
-TEX_FORMATS                          TEX_HYPHEN_DAT
+SMF_INSTANCES                     SMF_MANIFEST
-TEX_HYPHEN_DEF                       TEX_TEXMF_DIRS
+SMF_METHODS                       SMF_METHOD_SHELL
-THTTPD_LOG_FACILITY                  TINYDYN_USER
+SMF_METHOD_SRC                    SMF_NAME
-TLSWRAPPER_CHROOT                    TO
+SMF_PREFIX                        SMF_SRCDIR
-TOOLS_ALIASES                        TOOLS_ALWAYS_WRAP
+SNIPROXY_GROUP                    SNIPROXY_USER
-TOOLS_ARGS                           TOOLS_BROKEN
+SOURCE_BUFFSIZE                   SPECIAL_PERMS
-TOOLS_CMD                            TOOLS_CMDLINE_SED
+SPECIFIC_PKGS                     SSH_SUID
-TOOLS_CREATE                         TOOLS_CROSS_DESTDIR
+SSP_SUPPORTED                     SSYNC_PAWD
-TOOLS_DIR                            TOOLS_FAIL
+STEP_MSG                          STRIP
-TOOLS_GNU_MISSING                    TOOLS_LDCONFIG
+STRIP_DBG                         STRIP_DEBUG
-TOOLS_NOOP                           TOOLS_PATH
+STRIP_DEBUG_SUPPORTED             STRIP_FILES_SKIP
-TOOLS_SCRIPT                         TOOLS_USE_CROSS_COMPILE
+SU                                SUBDIR
-TOOL_DEPENDS                         TTF_FONTS_DIR
+SUBST                             SUBST_CLASSES
-TYPE                                 UAC_REQD_EXECS
+SUBST_FILES                       SUBST_FILTER_CMD
-UCSPI_SSL_GROUP                      UCSPI_SSL_USER
+SUBST_MESSAGE                     SUBST_NOOP_OK
-UNLIMIT_RESOURCES                    UNPRIVILEGED
+SUBST_SED                         SUBST_SHOW_DIFF
-UNPRIVILEGED_GROUP                   UNPRIVILEGED_GROUPS
+SUBST_SKIP_TEXT_CHECK             SUBST_STAGE
-UNPRIVILEGED_USER                    UNWRAP_FILES
+SUBST_VARS                        SUNWSPROBASE
-UNWRAP_PATTERNS                      UPDATE_GEMSPEC
+SUSE_PREFER                       SU_CMD
-UPDATE_TARGET                        URI
+SVN_EXTRACTDIR                    SVN_REPO
-USERGROUP_PHASE                      USERPPP_GROUP
+SVN_REPOSITORIES                  SVN_REVISION
-USER_SPECIFIC_PKGS                   USE_ABI_DEPENDS
+SYSCONFBASE                       TARGET_ARCH
-USE_APR                              USE_BSD_MAKEFILE
+TBL                               TERMCAP_TYPE
-USE_BUILTIN                          USE_CROSS_COMPILE
+TERMINFO_DEFAULT                  TERMINFO_TYPE
-USE_CURSES                           USE_CWRAPPERS
+TEST                              TEST_DEPENDS
-USE_DB185                            USE_FEATURES
+TEST_DIRS                         TEST_ENV
-USE_GAMESGROUP                       USE_GCC_RUNTIME
+TEST_ENV_SHELL                    TEST_MAKE_CMD
-USE_IMAKE                            USE_JAVA
+TEST_MAKE_FLAGS                   TEST_TARGET
-USE_JAVA2                            USE_LANGUAGES
+TEXLIVE_IGNORE_PATTERNS           TEXLIVE_REV
-USE_LIBTOOL                          USE_NATIVE_GCC
+TEXLIVE_UNVERSIONED               TEXMFSITE
-USE_NETBSD_REPO                      USE_PKGSRC_GCC
+TEX_FORMATS                       TEX_HYPHEN_DAT
-USE_PKGSRC_GCC_RUNTIME               USE_PKGTASKS
+TEX_HYPHEN_DEF                    TEX_TEXMF_DIRS
-USE_PKG_ADMIN_DIGEST                 USE_RUBY_EXTCONF
+THTTPD_LOG_FACILITY               TINYDYN_USER
-USE_RUBY_INSTALL                     USE_RUBY_SETUP
+TLSWRAPPER_CHROOT                 TO
-USE_RUBY_SETUP_PKG                   USE_TOOLS
+TOOLS_ALIASES                     TOOLS_ALWAYS_WRAP
-UUCP_GROUP                           UUCP_USER
+TOOLS_ARGS                        TOOLS_BROKEN
-VARBASE                              VARNAME
+TOOLS_CMD                         TOOLS_CMDLINE_SED
-VIM_EXTRA_OPTS                       WARNING_MSG
+TOOLS_CREATE                      TOOLS_CROSS_DESTDIR
-WCALC_CGIDIR                         WCALC_CGIPATH
+TOOLS_DIR                         TOOLS_FAIL
-WCALC_HTMLDIR                        WCALC_HTMLPATH
+TOOLS_GNU_MISSING                 TOOLS_LDCONFIG
-WDM_MANAGERS                         WRAPPER_CC
+TOOLS_NOOP                        TOOLS_PATH
-WRAPPER_REORDER_CMDS                 WRKDIR
+TOOLS_SCRIPT                      TOOLS_USE_CROSS_COMPILE
-WRKDIR_BASENAME                      WRKDIR_LOCKTYPE
+TOOL_DEPENDS                      TTF_FONTDIR
-WRKLOG                               WRKOBJDIR
+TTF_FONTS_DIR                     TYPE
-WRKSRC                               X10_PORT
+UAC_REQD_EXECS                    UCSPI_SSL_GROUP
-X11                                  X11BASE
+UCSPI_SSL_USER                    UNLIMIT_RESOURCES
-X11_PKGSRCDIR                        X11_TYPE
+UNPRIVILEGED                      UNPRIVILEGED_GROUP
-X509_CERTIFICATE                     X509_KEY
+UNPRIVILEGED_GROUPS               UNPRIVILEGED_USER
-XAW_TYPE                             XLOCK_DEFAULT_MODE
+UNWRAP_FILES                      UNWRAP_PATTERNS
-XMKMF                                XMKMF_FLAGS
+UPDATE_GEMSPEC                    UPDATE_TARGET
-XXX                                  YES
+URI                               USERGROUP_PHASE
-ZSH_STATIC                           __stdc__
+USERPPP_GROUP                     USER_SPECIFIC_PKGS
-_vargroups                           accept
+USE_ABI_DEPENDS                   USE_APR
-acquire-localbase-lock               acquire-lock
+USE_BSD_MAKEFILE                  USE_BUILTIN
-add                                  administrator
+USE_CROSS_COMPILE                 USE_CURSES
-alloca                               alternatives
+USE_CWRAPPERS                     USE_DB185
-aslr                                 asprintf
+USE_FEATURES                      USE_GAMESGROUP
-atlas                                autoconf
+USE_GCC_RUNTIME                   USE_IMAKE
-automake                             autoreconf
+USE_JAVA                          USE_JAVA2
-awk                                  bash
+USE_LANGUAGES                     USE_LIBTOOL
-big-endian                           bin-install
+USE_NATIVE_GCC                    USE_NETBSD_REPO
-bind                                 binpkg-list
+USE_PKGSRC_GCC                    USE_PKGSRC_GCC_RUNTIME
-blas                                 bootstrap-depends
+USE_PKGTASKS                      USE_PKG_ADMIN_DIGEST
-broken                               broken_on_platform
+USE_RUBY_EXTCONF                  USE_RUBY_INSTALL
-bsd                                  bsd.prog.mk
+USE_RUBY_SETUP                    USE_RUBY_SETUP_PKG
-build                                build-env
+USE_TOOLS                         UUCP_GROUP
-buildlink-directories                buildlink-oss-soundcard-h
+UUCP_USER                         VARBASE
-c                                    c++
+VARNAME                           VIM_EXTRA_OPTS
-ccache                               cce
+WARNING_MSG                       WCALC_CGIDIR
-cdefs                                ceil
+WCALC_CGIPATH                     WCALC_HTMLDIR
-changes                              changes-entry
+WCALC_HTMLPATH                    WDM_MANAGERS
-changes-entry-noupdate               check
+WRAPPER_CC                        WRAPPER_REORDER_CMDS
-check-clean                          check-files
+WRKDIR                            WRKDIR_BASENAME
-check-files-clean                    check-vulnerable
+WRKDIR_LOCKTYPE                   WRKLOG
-checksum                             checksum-phase
+WRKOBJDIR                         WRKSRC
-clean                                clean-depends
+X10_PORT                          X11
-cleandir                             commit
+X11BASE                           X11_PKGSRCDIR
-commit-changes-entry                 compact
+X11_TYPE                          X509_CERTIFICATE
-compiler                             conf
+X509_KEY                          XAW_TYPE
-config.guess                         config.sub
+XLOCK_DEFAULT_MODE                XMKMF
-configuration                        configure
+XMKMF_FLAGS                       XXX
-configure-env                        configure-help
+XXXX                              YES
-configure_args                       connect
+ZSH_STATIC                        __stdc__
-cos                                  cputime
+_vargroups                        accept
-create-usergroup                     csh
+acquire-localbase-lock            acquire-lock
-ctf                                  debug
+add                               administrator
-declaration                          declare
+alloca                            alternatives
-defined                              depend
+aslr                              asprintf
-dependencies                         depends
+atlas                             autoconf
-depends-checksum                     depends-fetch
+automake                          autoreconf
-deps                                 describe
+awk                               bash
-destdir                              disable
+big-endian                        bin-install
-distclean                            distinfo
+bind                              binpkg-list
-dl                                   dlopen
+blas                              bootstrap-depends
-do-buildlink                         do-clean
+broken                            broken_on_platform
-do-configure                         do-configure-post-hook
+bsd                               bsd.prog.mk
-do-extract                           do-fetch
+build                             build-env
-do-install                           emul
+buildlink-directories             buildlink-oss-soundcard-h
-emul-distinfo                        emul-fetch
+c                                 c++
-emulation                            emulator
+ccache                            cce
-enable                               endian
+cdefs                             ceil
-enomem                               ensurepip
+changes                           changes-entry
-err                                  errx
+changes-entry-noupdate            check
-etc                                  exp
+check-clean                       check-files
-extract-rpm                          fabs
+check-files-clean                 check-vulnerable
-feature                              features
+checksum                          checksum-phase
-fetch                                fetch-list
+clean                             clean-depends
-follows                              forbids
+cleandir                          commit
-form                                 format
+commit-changes-entry              compact
-fortify                              fortify_source
+compiler                          conf
-friend                               fts
+config.guess                      config.sub
-fts_close                            fts_open
+configuration                     configure
-fts_read                             fts_set
+configure-env                     configure-help
-gcc                                  gethostbyaddr
+configure_args                    connect
-gethostbyname                        gethostbyname2
+cos                               cputime
-getopt_long                          getprogname
+create-usergroup                  csh
-getservbyname                        getservbyport
+ctf                               cvs
-getservent                           gettext
+debug                             declaration
-github                               glob
+declare                           defined
-gnu                                  gnu_configure_strict
+depend                            dependencies
-go                                   go-deps
+depends                           depends-checksum
-golang                               guess-license
+depends-fetch                     deps
-hashbang                             heimdal
+describe                          destdir
-help                                 imake
+disable                           distclean
-increment                            indirect
+distinfo                          dl
-inet_aton                            interp
+dlopen                            do-buildlink
-interpreter                          intl
+do-clean                          do-configure
-ip4                                  ip6
+do-configure-post-hook            do-extract
-ipv4                                 ipv6
+do-fetch                          do-install
-iso                                  kerberos
+emul                              emul-distinfo
-krb                                  krb5
+emul-fetch                        emulation
-ksh                                  lapack
+emulator                          enable
-latex                                libintl_bindtextdomain
+endian                            endif
-libintl_gettext                      libintl_textdomain
+enomem                            ensurepip
-libnbcompat                          libs
+err                               errx
-libtool                              licence
+etc                               exp
-license                              lintl
+extract-rpm                       fabs
-little-endian                        lock
+feature                           features
-locking                              lua
+fetch                             fetch-list
-lvalue                               make
+follows                           forbids
-makesum                              memory
+form                              format
-meta                                 meta-package
+fortify                           fortify_source
-meta_package                         mit-krb5
+fossil                            friend
-mk.conf                              mkl
+fts                               fts_close
-mount                                mprotect
+fts_open                          fts_read
-mremap                               nb
+fts_set                           gcc
-nbcompat                             netlib
+gethostbyaddr                     gethostbyname
-node                                 node.js
+gethostbyname2                    getopt_long
-nodejs                               obstack
+getprogname                       getservbyname
-obstack_ptr_grow                     occurs
+getservbyport                     getservent
-only                                 openblas
+gettext                           git
-options                              options.mk
+github                            gitlab
-order                                override
+glob                              gnu
-override-intltool                    override-message-intltool
+gnu_configure_strict              go
-package                              parallel
+go-deps                           golang
-path                                 pax
+guess-license                     hashbang
-paxctl                               pbulk-index
+heimdal                           help
-pc                                   perl
+hg                                imake
-perl5                                perms
+increment                         indirect
-php                                  pkg-build-options
+inet_aton                         interp
-pkg-config                           pkg_build_options
+interpreter                       intl
-platform                             plist
+ip4                               ip6
-post-extract                         post-fetch
+ipv4                              ipv6
-post-wrapper                         pre-build-checks-hook
+iso                               kerberos
-pre-configure                        pre-configure-checks-hook
+krb                               krb5
-pre-extract                          pre-fetch
+ksh                               lapack
-print-go-deps                        print-plist
+latex                             libintl_bindtextdomain
-print-summary-data                   privileged-install-hook
+libintl_gettext                   libintl_textdomain
-pypi                                 python
+libnbcompat                       libs
-r                                    readme-all
+libtool                           licence
-recursive                            recv
+license                           lintl
-recvfrom                             regcomp
+little-endian                     lock
-release-localbase-lock               release-lock
+locking                           lua
-relro                                rename
+lvalue                            make
-reorder                              replace
+makesum                           memory
-replace_interpreter                  reproducible
+mercurial                         meta
-resolv                               root
+meta-package                      meta_package
-ruby                                 send
+mit-krb5                          mk.conf
-sendfile                             sendto
+mkl                               mount
-setenv                               setgid
+mprotect                          mremap
-setprogname                          setuid
+nb                                nbcompat
-sh                                   shebang
+netlib                            node
-show                                 show-all
+node.js                           nodejs
-show-build-defs                      show-depends
+obstack                           obstack_ptr_grow
-show-depends-all                     show-depends-dirs
+occurs                            only
-show-depends-pkgpaths                show-deps
+openblas                          options
-show-distfiles                       show-downlevel
+options.mk                        order
-show-subdir-var                      show-tools
+override                          override-intltool
-show-var                             show-vars
+override-message-intltool         package
-snprintf                             socket
+parallel                          path
-ssp                                  st_mode
+pax                               paxctl
-stage-install                        strcasestr
+pbulk-index                       pc
-strict                               strip
+perl                              perl5
-strndup                              strnlen
+perms                             php
-strsep                               subst
+pkg-build-options                 pkg-config
-substitutions                        sun
+pkg_build_options                 platform
-sunpro                               sunwspro
+plist                             post-extract
-symlink                              test
+post-fetch                        post-wrapper
-test-env                             tex
+pre-build-checks-hook             pre-configure
-texlive                              tmp
+pre-configure-checks-hook         pre-extract
-tool                                 tools
+pre-fetch                         print-go-deps
-tools-libtool-m4-override            type
+print-plist                       print-summary-data
-ulimit                               undefined
+privileged-install-hook           pypi
-undo-replace                         unlimit
+python                            r
-unprivileged                         unprivileged-install-hook
+readme-all                        recursive
-unstripped                           update
+recv                              recvfrom
-upload                               upload-distfiles
+regcomp                           release-localbase-lock
-use_tools                            user
+release-lock                      relro
-utimes                               vasprintf
+rename                            reorder
-verbose                              vsnprintf
+replace                           replace_interpreter
-warn                                 warning
+reproducible                      resolv
-warnings                             warnx
+root                              ruby
-wattr_off                            wattr_on
+send                              sendfile
-work                                 wrapper
+sendto                            setenv
-wrkdir
+setgid                            setprogname
 setuid                            sh
 shebang                           show
 show-all                          show-build-defs
 show-depends                      show-depends-dirs
 show-depends-pkgpaths             show-depends-recursive
 show-deps                         show-distfiles
 show-downlevel                    show-subdir-var
 show-tools                        show-var
 show-vars                         snprintf
 socket                            ssp
 st_mode                           stage-install
 strcasestr                        strict
 strip                             strndup
 strnlen                           strsep
 subst                             substitutions
 subversion                        sun
 sunpro                            sunwspro
 svn                               symlink
 test                              test-env
 tex                               texlive
 tmp                               tool
 tools                             tools-libtool-m4-override
 transitive                        type
 ulimit                            undefined
 undo-replace                      unlimit
 unprivileged                      unprivileged-install-hook
 unstripped                        update
 upload                            upload-distfiles
 use_tools                         user
 utimes                            vasprintf
 verbose                           vsnprintf
 warn                              warning
 warnings                          warnx
 wattr_off                         wattr_on
 work                              wrapper
 wrkdir
 Appendix F. Editing guidelines for the pkgsrc guide
 Table of Contents
 F.1. Make targets
 F.2. Procedure
 This section contains information on editing the pkgsrc guide itself.
 F.1. Make targets
 The pkgsrc guide's source code is stored in pkgsrc/doc/guide/files, and several