pkgsrc-Changes archive

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

CVS commit: pkgsrc/doc



Module Name:    pkgsrc
Committed By:   dholland
Date:           Fri May 12 07:15:54 UTC 2023

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

Log Message:
doc/pkgsrc.*: regen


To generate a diff of this commit:
cvs rdiff -u -r1.352 -r1.353 pkgsrc/doc/pkgsrc.html
cvs rdiff -u -r1.350 -r1.351 pkgsrc/doc/pkgsrc.txt

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

Modified files:

Index: pkgsrc/doc/pkgsrc.html
diff -u pkgsrc/doc/pkgsrc.html:1.352 pkgsrc/doc/pkgsrc.html:1.353
--- pkgsrc/doc/pkgsrc.html:1.352        Wed Apr 26 10:27:38 2023
+++ pkgsrc/doc/pkgsrc.html      Fri May 12 07:15:53 2023
@@ -296,8 +296,9 @@ builds)</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#conf-files-sysconfdir">20.2.1. How <code class="varname">PKG_SYSCONFDIR</code> is set</a></span></dt>
 <dt><span class="sect2"><a href="#conf-files-configure">20.2.2. Telling the software where configuration files are</a></span></dt>
-<dt><span class="sect2"><a href="#conf-files-patching">20.2.3. Patching installations</a></span></dt>
-<dt><span class="sect2"><a href="#conf-files-disable">20.2.4. Disabling handling of configuration files</a></span></dt>
+<dt><span class="sect2"><a href="#conf-files-patching">20.2.3. Patching installation</a></span></dt>
+<dt><span class="sect2"><a href="#conf-files-declare">20.2.4. Declaring configuration files</a></span></dt>
+<dt><span class="sect2"><a href="#conf-files-disable">20.2.5. Disabling handling of configuration files</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#rcd-scripts">20.3. System startup scripts</a></span></dt>
 <dd><dl><dt><span class="sect2"><a href="#rcd-scripts-disable">20.3.1. Disabling handling of system startup scripts</a></span></dt></dl></dd>
@@ -3268,8 +3269,9 @@ anymore, you can remove that file and ru
 <dd><dl>
 <dt><span class="sect2"><a href="#conf-files-sysconfdir">20.2.1. How <code class="varname">PKG_SYSCONFDIR</code> is set</a></span></dt>
 <dt><span class="sect2"><a href="#conf-files-configure">20.2.2. Telling the software where configuration files are</a></span></dt>
-<dt><span class="sect2"><a href="#conf-files-patching">20.2.3. Patching installations</a></span></dt>
-<dt><span class="sect2"><a href="#conf-files-disable">20.2.4. Disabling handling of configuration files</a></span></dt>
+<dt><span class="sect2"><a href="#conf-files-patching">20.2.3. Patching installation</a></span></dt>
+<dt><span class="sect2"><a href="#conf-files-declare">20.2.4. Declaring configuration files</a></span></dt>
+<dt><span class="sect2"><a href="#conf-files-disable">20.2.5. Disabling handling of configuration files</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#rcd-scripts">20.3. System startup scripts</a></span></dt>
 <dd><dl><dt><span class="sect2"><a href="#rcd-scripts-disable">20.3.1. Disabling handling of system startup scripts</a></span></dt></dl></dd>
@@ -6912,8 +6914,9 @@ GENERATE_PLIST+=        ${ECHO} bin/${DI
 <dd><dl>
 <dt><span class="sect2"><a href="#conf-files-sysconfdir">20.2.1. How <code class="varname">PKG_SYSCONFDIR</code> is set</a></span></dt>
 <dt><span class="sect2"><a href="#conf-files-configure">20.2.2. Telling the software where configuration files are</a></span></dt>
-<dt><span class="sect2"><a href="#conf-files-patching">20.2.3. Patching installations</a></span></dt>
-<dt><span class="sect2"><a href="#conf-files-disable">20.2.4. Disabling handling of configuration files</a></span></dt>
+<dt><span class="sect2"><a href="#conf-files-patching">20.2.3. Patching installation</a></span></dt>
+<dt><span class="sect2"><a href="#conf-files-declare">20.2.4. Declaring configuration files</a></span></dt>
+<dt><span class="sect2"><a href="#conf-files-disable">20.2.5. Disabling handling of configuration files</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#rcd-scripts">20.3. System startup scripts</a></span></dt>
 <dd><dl><dt><span class="sect2"><a href="#rcd-scripts-disable">20.3.1. Disabling handling of system startup scripts</a></span></dt></dl></dd>
@@ -7016,54 +7019,79 @@ MAKE_DIRS_PERMS+=       ${VARBASE}/foo/p
 <a name="files-outside-prefix"></a>20.1.2.�File manipulation</h3></div></div></div>
 <p>Creating non-empty files outside the installation prefix is tricky
 because the <code class="filename">PLIST</code> forces all files to be inside it.
-To overcome this problem, the only solution is to extract the file in the
+To overcome this problem, the only solution is to extract the file in a
 known place (i.e., inside the installation prefix) and copy it to the
 appropriate location during installation (done by the installation scripts
-generated by pkginstall).  We will call the former the <span class="emphasis"><em>master
+generated by pkginstall).  We will call the former the <span class="emphasis"><em>reference
 file</em></span> in the following paragraphs, which describe the variables
 that can be used to automatically and consistently handle files outside the
 installation prefix:</p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p><code class="varname">REQD_FILES</code> is a list of pairs of reference
+    and target files.  At installation time, the reference file is copied
+    to the target if and only if the latter does not exist.  Upon
+    deinstallation, the reference file is removed provided that it was
+    not modified by the installation.</p></li>
 <li class="listitem">
-<p><code class="varname">CONF_FILES</code> and
-    <code class="varname">REQD_FILES</code> are pairs of master and target files.
-    During installation time, the master file is copied to the target one
-    if and only if the latter does not exist.  Upon deinstallation, the
-    target file is removed provided that it was not modified by the
-    installation.</p>
-<p>The difference between the two is that the latter prompts the
-    administrator to remove any files that may be left after
-    deinstallation (because they were not empty), while the former does
-    not.</p>
-</li>
-<li class="listitem">
-<p><code class="varname">CONF_FILES_PERMS</code> and
-    <code class="varname">REQD_FILES_PERMS</code> contain tuples describing master
-    files as well as their target locations.  For each of them, it also
-    specifies their owner, their group and their numeric permissions, in
-    this order.  For example:</p>
+<p><code class="varname">REQD_FILES_PERMS</code> contains tuples describing
+    reference files and targets, including owner, group, and numeric
+    permissions that should be set. For example:</p>
 <pre class="programlisting">
 REQD_FILES_PERMS+=      ${PREFIX}/share/somefile ${VARBASE}/somefile \
                         ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
 </pre>
-<p>The difference between the two is exactly the same as their
-    non-<code class="varname">PERMS</code> counterparts.</p>
 </li>
+<li class="listitem"><p><code class="varname">CONF_FILES</code> and
+    <code class="varname">CONF_FILES_PERMS</code> have the same syntax as
+    <code class="varname">REQD_FILES</code> and
+    <code class="varname">REQD_FILES_PERMS</code> respectively.  The difference
+    is that these variables are specifically intended for handling
+    configuration files, for which additional conventions and
+    constraints apply.  See <a class="xref" href="#conf-files" title="20.2.�Configuration files">Section�20.2, &#8220;Configuration files&#8221;</a> for further
+    discussion.  Note in particular that while handling of
+    configuration files can be disabled by the user (see <a class="xref" href="#conf-files-disable" title="20.2.5.�Disabling handling of configuration files">Section�20.2.5, &#8220;Disabling 
handling of configuration files&#8221;</a>), this setting does not affect
+    <code class="varname">REQD_FILES</code> and
+    <code class="varname">REQD_FILES_PERMS</code>.</p></li>
 </ul></div>
+<p>To install an empty file, one can use these macros and
+  <code class="filename">/dev/null</code> as the reference file.</p>
 </div>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="conf-files"></a>20.2.�Configuration files</h2></div></div></div>
-<p>Configuration files are special in the sense that they are installed
-in their own specific directory, <code class="varname">PKG_SYSCONFDIR</code>, and
-need special treatment during installation (most of which is automated by
-pkginstall).  The main concept you must bear in mind is that files marked
-as configuration files are automatically copied to the right place (somewhere
-inside <code class="varname">PKG_SYSCONFDIR</code>) during installation <span class="emphasis"><em>if
-and only if</em></span> they didn't exist before.  Similarly, they will not
-be removed if they have local modifications.  This ensures that
-administrators never lose any custom changes they may have made.</p>
+<p>There are two principles that govern the handling of
+configuration files in pkgsrc: first, the user's configuration must
+not be lost or overwritten by upgrades or reinstallations; and second,
+the default configuration should always be available for reference.
+To that end, pkgsrc has a framework specifically for handling
+configuration files.  In general, configuration files are installed
+into <code class="filename">${PREFIX}/share/examples</code>, and copied from
+there to the pertinent <code class="filename">etc</code> directory as a
+separate step and only as needed.</p>
+<p>To make this work, there are three things that need to happen,
+any of which may require patching.  First, the package must be told to
+read its configuration from the correct place at runtime; this place
+is <code class="filename">${PKG_SYSCONFDIR}</code> (or possibly a subdirectory
+of it) which is often but not always
+<code class="filename">${PREFIX}/etc</code>.  Second, the package must be
+taught to install its default configuration files in
+<code class="filename">${PREFIX}/share/examples/${PKGBASE}</code>; this is the
+point at which patching often becomes required because it is not the
+same place as the runtime location.  Third, the configuration files
+need to be declared in the package makefile; this is the easy part.
+</p>
+<p>With those elements in place, the right things will happen: the
+package install phase and resulting binary package will not touch
+<code class="filename">${PKG_SYSCONFDIR}</code>, and the default configuration
+will be copied into place by the pkgsrc framework only if not already
+present.  Similarly, upon deinstall the configuration will not be
+removed if it has been modified.  (This means that in the case of
+reinstallation and upgrades, unmodified configuration files are
+updated but modifications are never discarded.)</p>
+<p>The following sections describe how to make these things happen
+and document other relevant knobs available in the pkgsrc
+infrastructure.</p>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="conf-files-sysconfdir"></a>20.2.1.�How <code class="varname">PKG_SYSCONFDIR</code> is set</h3></div></div></div>
@@ -7073,7 +7101,7 @@ set based upon the following variables:<
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p><code class="varname">PKG_SYSCONFBASE</code>: The configuration's root
     directory.  Defaults to <code class="filename">${PREFIX}/etc</code> although it may
-    be overridden by the user to point to his preferred location (e.g.,
+    be overridden by the user to point to their preferred location (e.g.,
     <code class="filename">/etc</code>, <code class="filename">/etc/pkg</code>, etc.).
     Packages must not use it directly.</p></li>
 <li class="listitem">
@@ -7100,7 +7128,7 @@ set based upon the following variables:<
 </ul></div>
 <p>Based on the above variables, pkginstall determines the value of
 <code class="varname">PKG_SYSCONFDIR</code>, which is the <span class="emphasis"><em>only</em></span>
-variable that can be used within a package to refer to its configuration
+variable that may be used within a package to refer to its configuration
 directory.  The algorithm used to set its value is basically the
 following:</p>
 <div class="orderedlist"><ol class="orderedlist" type="1">
@@ -7114,32 +7142,34 @@ following:</p>
     <code class="filename">${PKG_SYSCONFBASE}</code>.</p></li>
 </ol></div>
 <p>It is worth mentioning that <code class="filename">${PKG_SYSCONFDIR}</code> is
-automatically added to <code class="filename">OWN_DIRS</code>.  See <a class="xref" href="#dirs-outside-prefix" title="20.1.1.�Directory manipulation">Section�20.1.1, &#8220;Directory 
manipulation&#8221;</a> what this means.  This does not apply to
-subdirectories of <code class="filename">${PKG_SYSCONFDIR}</code>, they still have to
-be created with OWN_DIRS or MAKE_DIRS.</p>
+automatically added to <code class="filename">OWN_DIRS</code>.  This causes it
+to be automatically created if needed.  See <a class="xref" href="#dirs-outside-prefix" title="20.1.1.�Directory manipulation">Section�20.1.1, &#8220;Directory manipulation&#8221;</a> for further 
details.  This does not apply to
+subdirectories of <code class="filename">${PKG_SYSCONFDIR}</code>; they must be manually
+created with <code class="varname">OWN_DIRS</code> or
+<code class="varname">MAKE_DIRS</code>.</p>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="conf-files-configure"></a>20.2.2.�Telling the software where configuration files are</h3></div></div></div>
 <p>Given that pkgsrc (and users!) expect configuration files to be in a
-known place, you need to teach each package where it shall install its
-files.  In some cases you will have to patch the package Makefiles to
-achieve it.  If you are lucky, though, it may be as easy as passing an
-extra flag to the configuration script; this is the case of GNU Autoconf-
-generated files:</p>
+known place, you need to teach each package where to install its files.  In
+some cases you will have to patch the package Makefiles to achieve it.  If
+you are lucky, though, it may be as easy as passing an extra flag to the
+configuration script.  This is the case for packages using GNU
+autoconf:</p>
 <pre class="programlisting">
 CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
 </pre>
 <p>Note that this specifies where the package has to <span class="emphasis"><em>look
-for</em></span> its configuration files, not where they will be originally
-installed (although the difference is never explicit,
-unfortunately).</p>
+for</em></span> its configuration files, not where they will be installed.
+Fortunately, there is a different way to specify the latter, as seen
+in the next seection, although the combination is rather confusing at
+first glance.</p>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="conf-files-patching"></a>20.2.3.�Patching installations</h3></div></div></div>
-<p>As said before, pkginstall automatically handles configuration files.
-This means that <span class="strong"><strong>the packages themselves must not
+<a name="conf-files-patching"></a>20.2.3.�Patching installation</h3></div></div></div>
+<p>As discussed above, <span class="strong"><strong>packages themselves must not
 touch the contents of <code class="filename">${PKG_SYSCONFDIR}</code>
 directly</strong></span>.  Bad news is that many software installation scripts
 will, out of the box, mess with the contents of that directory.  So what is
@@ -7149,24 +7179,48 @@ install any configuration files under th
 <code class="filename">share/examples/${PKGBASE}/</code>.  This way, the
 <code class="filename">PLIST</code> registers them and the administrator always
 has the original copies available.</p>
+<p>It turns out that for packages using GNU autoconf it is possible
+to create the desired effect by setting <code class="varname">sysconfdir</code>
+on the make command line at install time.  Consider this example taken
+from <a href="https://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/mail/mutt/index.html"; target="_top"><code class="filename">mail/mutt</code></a>:</p>
+<pre class="programlisting">
+EGDIR=                  ${PREFIX}/share/examples/mutt
+INSTALL_MAKE_FLAGS=     ${MAKE_FLAGS} sysconfdir=${EGDIR}
+</pre>
+<p>Note that the <code class="varname">EGDIR</code> variable, though commonly
+used for this purpose, is local to that package and has no meaning
+outside it.</p>
+</div>
+<div class="sect2">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="conf-files-declare"></a>20.2.4.�Declaring configuration files</h3></div></div></div>
 <p>Once the required configuration files are in place (i.e., under the
-examples hierarchy), the pkginstall framework can use them as master copies
+examples hierarchy), the pkginstall framework can use them as reference copies
 during the package installation to update what is in
 <code class="filename">${PKG_SYSCONFDIR}</code>.  To achieve this, the variables
 <code class="varname">CONF_FILES</code> and <code class="varname">CONF_FILES_PERMS</code> are
-used.  Check out <a class="xref" href="#files-outside-prefix" title="20.1.2.�File manipulation">Section�20.1.2, &#8220;File manipulation&#8221;</a> for information
-about their syntax and their purpose.  Here is an example, taken from the
-<a href="https://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/mail/mutt/index.html"; target="_top"><code class="filename">mail/mutt</code></a> package:</p>
+used.  Check out <a class="xref" href="#files-outside-prefix" title="20.1.2.�File manipulation">Section�20.1.2, &#8220;File manipulation&#8221;</a> for further
+information about their syntax and their purpose.  Here is an example,
+taken from the <a href="https://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/mail/mutt/index.html"; target="_top"><code class="filename">mail/mutt</code></a> package:</p>
+<pre class="programlisting">
+EGDIR=                  ${PREFIX}/share/examples/mutt
+CONF_FILES=             ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
+</pre>
+<p>Note that (as in the previous section's example) the
+<code class="varname">EGDIR</code> variable is specific to the package and has
+no meaning outside it.</p>
+<p>For reference, the complete example from Mutt is as follows:</p>
 <pre class="programlisting">
-EGDIR=        ${PREFIX}/share/doc/mutt/samples
-CONF_FILES=   ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
+CONFIGURE_ARGS+=        --sysconfdir=${PKG_SYSCONFDIR}
+EGDIR=                  ${PREFIX}/share/examples/mutt
+CONF_FILES=             ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
+INSTALLATION_DIRS+=     ${EGDIR}
+INSTALL_MAKE_FLAGS=     ${MAKE_FLAGS} sysconfdir=${EGDIR}
 </pre>
-<p>Note that the <code class="varname">EGDIR</code> variable is specific to that
-package and has no meaning outside it.</p>
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="conf-files-disable"></a>20.2.4.�Disabling handling of configuration files</h3></div></div></div>
+<a name="conf-files-disable"></a>20.2.5.�Disabling handling of configuration files</h3></div></div></div>
 <p>The automatic copying of config files can be toggled by setting the
 environment variable <code class="varname">PKG_CONFIG</code> prior to package
 installation.</p>
@@ -7204,7 +7258,7 @@ script in an automated fashion:</p>
     variable.</p></li>
 <li class="listitem"><p>Copy the script from the files directory to the examples
     hierarchy, <code class="filename">${PREFIX}/share/examples/rc.d/</code>.  Note
-    that this master file must be explicitly registered in the
+    that this reference file must be explicitly registered in the
     <code class="filename">PLIST</code>.</p></li>
 <li class="listitem"><p>Add code to the installation scripts to copy the startup script
     from the examples hierarchy into the system-wide startup scripts
@@ -11848,119 +11902,115 @@ source packages</h2></div></div></div>
 <td>ALL_ENV</td>
 </tr>
 <tr>
-<td>ALSA_PC</td>
 <td>ALTERNATIVES_SRC</td>
-</tr>
-<tr>
 <td>AMANDA_TMP</td>
-<td>AMANDA_USER</td>
 </tr>
 <tr>
+<td>AMANDA_USER</td>
 <td>AMANDA_VAR</td>
-<td>APACHE_GROUP</td>
 </tr>
 <tr>
+<td>APACHE_GROUP</td>
 <td>APACHE_MODULE_NAME</td>
-<td>APACHE_MODULE_SRC</td>
 </tr>
 <tr>
+<td>APACHE_MODULE_SRC</td>
 <td>APACHE_MODULE_SRCDIR</td>
-<td>APACHE_PKG_PREFIX</td>
 </tr>
 <tr>
+<td>APACHE_PKG_PREFIX</td>
 <td>APACHE_SUEXEC_CONFIGURE_ARGS</td>
-<td>APACHE_SUEXEC_DOCROOT</td>
 </tr>
 <tr>
+<td>APACHE_SUEXEC_DOCROOT</td>
 <td>APACHE_USER</td>
-<td>APPEND_ABI</td>
 </tr>
 <tr>
+<td>APPEND_ABI</td>
 <td>APPEND_ELF</td>
-<td>ARLA_CACHE</td>
 </tr>
 <tr>
+<td>ARLA_CACHE</td>
 <td>AUDIT_PACKAGES_FLAGS</td>
-<td>AUTOCONF_REQD</td>
 </tr>
 <tr>
+<td>AUTOCONF_REQD</td>
 <td>AUTOMAKE_OVERRIDE</td>
-<td>AUTOMAKE_REQD</td>
 </tr>
 <tr>
+<td>AUTOMAKE_REQD</td>
 <td>AUTO_MKDIRS</td>
-<td>BDB185_DEFAULT</td>
 </tr>
 <tr>
+<td>BDB185_DEFAULT</td>
 <td>BDBBASE</td>
-<td>BDB_ACCEPTED</td>
 </tr>
 <tr>
+<td>BDB_ACCEPTED</td>
 <td>BDB_DEFAULT</td>
-<td>BDB_LIBS</td>
 </tr>
 <tr>
+<td>BDB_LIBS</td>
 <td>BDB_TYPE</td>
-<td>BINCIMAP_GROUP</td>
 </tr>
 <tr>
+<td>BINCIMAP_GROUP</td>
 <td>BINCIMAP_USER</td>
-<td>BIND_DIR</td>
 </tr>
 <tr>
+<td>BIND_DIR</td>
 <td>BIND_GROUP</td>
-<td>BIND_USER</td>
 </tr>
 <tr>
+<td>BIND_USER</td>
 <td>BINOWN</td>
-<td>BINPKG_SITES</td>
 </tr>
 <tr>
+<td>BINPKG_SITES</td>
 <td>BIN_INSTALL_FLAGS</td>
-<td>BISON_PKGDATADIR</td>
 </tr>
 <tr>
+<td>BISON_PKGDATADIR</td>
 <td>BLAS</td>
-<td>BLAS_ACCEPTED</td>
 </tr>
 <tr>
+<td>BLAS_ACCEPTED</td>
 <td>BLAS_C_INTERFACE</td>
-<td>BLAS_INCLUDES</td>
 </tr>
 <tr>
+<td>BLAS_INCLUDES</td>
 <td>BLAS_INDEX64</td>
-<td>BLAS_LIBS</td>
 </tr>
 <tr>
+<td>BLAS_LIBS</td>
 <td>BLAS_PC</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>
-<td>BUILDLINK_CPPFLAGS</td>
 </tr>
 <tr>
-<td>BUILDLINK_DEPMETHOD</td>
+<td>BUILDLINK_CPPFLAGS</td>
 <td>BUILDLINK_FILES</td>
 </tr>
 <tr>
@@ -12056,107 +12106,95 @@ source packages</h2></div></div></div>
 <td>CHANGES</td>
 </tr>
 <tr>
-<td>CHECKOUT_DATE</td>
 <td>CHECK_COMPILER</td>
-</tr>
-<tr>
 <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>
-<td>CMAKE_USE_GNU_INSTALL_DIRS</td>
 </tr>
 <tr>
-<td>COMMON_LISP_DOCFILES</td>
-<td>COMMON_LISP_EXAMPLES</td>
-</tr>
-<tr>
-<td>COMMON_LISP_EXTRAFILES</td>
-<td>COMMON_LISP_PACKAGES</td>
-</tr>
-<tr>
-<td>COMMON_LISP_SYSTEM</td>
+<td>CMAKE_USE_GNU_INSTALL_DIRS</td>
 <td>COMPILER_RPATH_FLAG</td>
 </tr>
 <tr>
@@ -12244,247 +12282,227 @@ source packages</h2></div></div></div>
 <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>
-</tr>
-<tr>
 <td>CYRUS_GROUP</td>
-<td>CYRUS_IDLE</td>
 </tr>
 <tr>
+<td>CYRUS_IDLE</td>
 <td>CYRUS_USER</td>
-<td>DAEMONTOOLS_GROUP</td>
 </tr>
 <tr>
+<td>DAEMONTOOLS_GROUP</td>
 <td>DAEMONTOOLS_LOG_USER</td>
-<td>DARWIN_NO_SYSTEM_LIBS</td>
 </tr>
 <tr>
+<td>DARWIN_NO_SYSTEM_LIBS</td>
 <td>DARWIN_REQUIRES_FILTER</td>
-<td>DBUS_GROUP</td>
 </tr>
 <tr>
+<td>DBUS_GROUP</td>
 <td>DBUS_USER</td>
-<td>DEFANG_GROUP</td>
 </tr>
 <tr>
+<td>DEFANG_GROUP</td>
 <td>DEFANG_USER</td>
-<td>DEFAULT_ACCEPTABLE_LICENSES</td>
 </tr>
 <tr>
+<td>DEFAULT_ACCEPTABLE_LICENSES</td>
 <td>DEFAULT_DISTFILES</td>
-<td>DEFAULT_IRC_SERVER</td>
 </tr>
 <tr>
+<td>DEFAULT_IRC_SERVER</td>
 <td>DEFAULT_SERIAL_DEVICE</td>
-<td>DEF_UMASK</td>
 </tr>
 <tr>
+<td>DEF_UMASK</td>
 <td>DEINSTALLDEPENDS</td>
-<td>DEINSTALL_SRC</td>
 </tr>
 <tr>
+<td>DEINSTALL_SRC</td>
 <td>DEINSTALL_TEMPLATES</td>
-<td>DELAYED_ERROR_MSG</td>
 </tr>
 <tr>
+<td>DELAYED_ERROR_MSG</td>
 <td>DELAYED_WARNING_MSG</td>
-<td>DEPENDS</td>
 </tr>
 <tr>
+<td>DEPENDS</td>
 <td>DEPENDS_TARGET</td>
-<td>DEPENDS_TYPE</td>
 </tr>
 <tr>
+<td>DEPENDS_TYPE</td>
 <td>DESTDIR</td>
-<td>DESTDIR_VARNAME</td>
 </tr>
 <tr>
+<td>DESTDIR_VARNAME</td>
 <td>DIALER_GROUP</td>
-<td>DIGEST_REQD</td>
 </tr>
 <tr>
+<td>DIGEST_REQD</td>
 <td>DISTDIR</td>
-<td>DISTFILES</td>
 </tr>
 <tr>
+<td>DISTFILES</td>
 <td>DISTINFO_FILE</td>
-<td>DISTNAME</td>
 </tr>
 <tr>
+<td>DISTNAME</td>
 <td>DIST_PATH</td>
-<td>DIST_SUBDIR</td>
 </tr>
 <tr>
+<td>DIST_SUBDIR</td>
 <td>DJBDNS_AXFR_USER</td>
-<td>DJBDNS_CACHE_USER</td>
 </tr>
 <tr>
+<td>DJBDNS_CACHE_USER</td>
 <td>DJBDNS_DJBDNS_GROUP</td>
-<td>DJBDNS_LOG_USER</td>
 </tr>
 <tr>
+<td>DJBDNS_LOG_USER</td>
 <td>DJBDNS_RBL_USER</td>
-<td>DJBDNS_TINY_USER</td>
 </tr>
 <tr>
+<td>DJBDNS_TINY_USER</td>
 <td>DLOPEN_REQUIRE_PTHREADS</td>
-<td>DL_AUTO_VARS</td>
 </tr>
 <tr>
+<td>DL_AUTO_VARS</td>
 <td>DL_CFLAGS</td>
-<td>DL_LDFLAGS</td>
 </tr>
 <tr>
+<td>DL_LDFLAGS</td>
 <td>DL_LIBS</td>
-<td>DNS</td>
 </tr>
 <tr>
+<td>DNS</td>
 <td>DOCOWN</td>
-<td>DOWNLOADED_DISTFILE</td>
 </tr>
 <tr>
+<td>DOWNLOADED_DISTFILE</td>
 <td>DQCACHE_GROUP</td>
-<td>DQCACHE_USER</td>
 </tr>
 <tr>
+<td>DQCACHE_USER</td>
 <td>DT_LAYOUT</td>
-<td>DYNAMIC_SITES_CMD</td>
 </tr>
 <tr>
+<td>DYNAMIC_SITES_CMD</td>
 <td>DYNAMIC_SITES_SCRIPT</td>
-<td>ECHO</td>
 </tr>
 <tr>
+<td>ECHO</td>
 <td>ECHO_N</td>
-<td>ELK_GUI</td>
 </tr>
 <tr>
+<td>ELK_GUI</td>
 <td>EMACS_TYPE</td>
-<td>EMULDIR</td>
 </tr>
 <tr>
+<td>EMULDIR</td>
 <td>EMULSUBDIR</td>
-<td>EMULSUBDIRSLASH</td>
 </tr>
 <tr>
+<td>EMULSUBDIRSLASH</td>
 <td>EMUL_ARCH</td>
-<td>EMUL_DISTRO</td>
 </tr>
 <tr>
+<td>EMUL_DISTRO</td>
 <td>EMUL_EXEC_FMT</td>
-<td>EMUL_IS_NATIVE</td>
 </tr>
 <tr>
+<td>EMUL_IS_NATIVE</td>
 <td>EMUL_MODULES</td>
-<td>EMUL_OPSYS</td>
 </tr>
 <tr>
+<td>EMUL_OPSYS</td>
 <td>EMUL_PKG_FMT</td>
-<td>EMUL_PLATFORM</td>
 </tr>
 <tr>
+<td>EMUL_PLATFORM</td>
 <td>EMUL_PLATFORMS</td>
-<td>EMUL_PREFER</td>
 </tr>
 <tr>
+<td>EMUL_PREFER</td>
 <td>EMUL_REQD</td>
-<td>EMUL_TYPE</td>
 </tr>
 <tr>
+<td>EMUL_TYPE</td>
 <td>ERROR_MSG</td>
-<td>EXIM_GROUP</td>
 </tr>
 <tr>
+<td>EXIM_GROUP</td>
 <td>EXIM_USER</td>
-<td>EXPORT_SYMBOLS_LDFLAGS</td>
 </tr>
 <tr>
+<td>EXPORT_SYMBOLS_LDFLAGS</td>
 <td>EXTRACTOR</td>
-<td>EXTRACT_CMD</td>
 </tr>
 <tr>
+<td>EXTRACT_CMD</td>
 <td>EXTRACT_CMD_DEFAULT</td>
-<td>EXTRACT_DIR</td>
 </tr>
 <tr>
+<td>EXTRACT_DIR</td>
 <td>EXTRACT_ELEMENTS</td>
-<td>EXTRACT_ENV</td>
 </tr>
 <tr>
+<td>EXTRACT_ENV</td>
 <td>EXTRACT_ONLY</td>
-<td>EXTRACT_OPTS</td>
 </tr>
 <tr>
+<td>EXTRACT_OPTS</td>
 <td>EXTRACT_SUFX</td>
-<td>EXTRACT_USING</td>
 </tr>
 <tr>
+<td>EXTRACT_USING</td>
 <td>FAIL</td>
-<td>FAILOVER_FETCH</td>
 </tr>
 <tr>
+<td>FAILOVER_FETCH</td>
 <td>FAIL_MSG</td>
-<td>FAKE_NCURSES</td>
 </tr>
 <tr>
+<td>FAKE_NCURSES</td>
 <td>FAM</td>
-<td>FAM_ACCEPTED</td>
 </tr>
 <tr>
+<td>FAM_ACCEPTED</td>
 <td>FAM_DEFAULT</td>
-<td>FAM_SERVER</td>
 </tr>
 <tr>
+<td>FAM_SERVER</td>
 <td>FCPATH</td>
-<td>FEATURE_CPPFLAGS</td>
 </tr>
 <tr>
+<td>FEATURE_CPPFLAGS</td>
 <td>FEATURE_LDFLAGS</td>
-<td>FEATURE_LIBS</td>
 </tr>
 <tr>
+<td>FEATURE_LIBS</td>
 <td>FETCH_AFTER_ARGS</td>
-<td>FETCH_BEFORE_ARGS</td>
 </tr>
 <tr>
+<td>FETCH_BEFORE_ARGS</td>
 <td>FETCH_CMD</td>
-<td>FETCH_OUTPUT_ARGS</td>
 </tr>
 <tr>
+<td>FETCH_OUTPUT_ARGS</td>
 <td>FETCH_PROXY</td>
-<td>FETCH_RESUME_ARGS</td>
 </tr>
 <tr>
+<td>FETCH_RESUME_ARGS</td>
 <td>FETCH_TIMEOUT</td>
-<td>FETCH_USE_IPV4_ONLY</td>
 </tr>
 <tr>
+<td>FETCH_USE_IPV4_ONLY</td>
 <td>FETCH_USING</td>
-<td>FILES_SUBST</td>
 </tr>
 <tr>
+<td>FILES_SUBST</td>
 <td>FILES_SUBST_SED</td>
-<td>FIX_SYSTEM_HEADERS</td>
 </tr>
 <tr>
-<td>FONTDIR</td>
+<td>FIX_SYSTEM_HEADERS</td>
 <td>FONTS_DIRS</td>
 </tr>
 <tr>
@@ -12492,14 +12510,6 @@ source packages</h2></div></div></div>
 <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>
@@ -12585,58 +12595,42 @@ source packages</h2></div></div></div>
 </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>
+<td>GNU</td>
 </tr>
 <tr>
-<td>GNU</td>
 <td>GNU_CONFIGURE</td>
+<td>GNU_CONFIGURE_INFODIR</td>
 </tr>
 <tr>
-<td>GNU_CONFIGURE_INFODIR</td>
 <td>GNU_CONFIGURE_MANDIR</td>
+<td>GNU_CONFIGURE_QUIET</td>
 </tr>
 <tr>
-<td>GNU_CONFIGURE_QUIET</td>
 <td>GNU_CONFIGURE_STRICT</td>
+<td>GODEP_REDIRECTS</td>
 </tr>
 <tr>
-<td>GODEP_REDIRECTS</td>
 <td>GO_BUILD_PATTERN</td>
+<td>GO_DEPS</td>
 </tr>
 <tr>
-<td>GO_DEPS</td>
 <td>GO_DIST_BASE</td>
-</tr>
-<tr>
 <td>GO_EXTRA_MOD_DIRS</td>
-<td>GO_MODULE_FILES</td>
 </tr>
 <tr>
+<td>GO_MODULE_FILES</td>
 <td>GO_SRCPATH</td>
-<td>GROUP_SPECIFIC_PKGS</td>
 </tr>
 <tr>
+<td>GROUP_SPECIFIC_PKGS</td>
 <td>GRUB_NETWORK_CARDS</td>
-<td>GRUB_PRESET_COMMAND</td>
 </tr>
 <tr>
+<td>GRUB_PRESET_COMMAND</td>
 <td>GRUB_SCAN_ARGS</td>
-<td>GZIP</td>
 </tr>
 <tr>
-<td>HASKELL_COMPILER</td>
+<td>GZIP</td>
 <td>HASKELL_ENABLE_DYNAMIC_EXECUTABLE</td>
 </tr>
 <tr>
@@ -12656,52 +12650,48 @@ source packages</h2></div></div></div>
 <td>HEADER_TEMPLATES</td>
 </tr>
 <tr>
-<td>HG_REPO</td>
-<td>HG_REPOSITORIES</td>
-</tr>
-<tr>
-<td>HG_TAG</td>
 <td>HOMEPAGE</td>
+<td>HOST_PKGTOOLS_ARGS</td>
 </tr>
 <tr>
-<td>HOST_PKGTOOLS_ARGS</td>
 <td>HOST_SPECIFIC_PKGS</td>
+<td>HOWL_GROUP</td>
 </tr>
 <tr>
-<td>HOWL_GROUP</td>
 <td>HOWL_USER</td>
+<td>ICCBASE</td>
 </tr>
 <tr>
-<td>ICCBASE</td>
 <td>ICECAST_CHROOTDIR</td>
+<td>ICON_THEMES</td>
 </tr>
 <tr>
-<td>ICON_THEMES</td>
 <td>IDOBASE</td>
+<td>IGNORE_CCACHE</td>
 </tr>
 <tr>
-<td>IGNORE_CCACHE</td>
 <td>IGNORE_INFO_DIRS</td>
+<td>IGNORE_INTERACTIVE_FETCH</td>
 </tr>
 <tr>
-<td>IGNORE_INTERACTIVE_FETCH</td>
 <td>IMAKE</td>
+<td>IMAKEOPTS</td>
 </tr>
 <tr>
-<td>IMAKEOPTS</td>
 <td>IMAKE_MAKE</td>
+<td>IMAKE_MANINSTALL</td>
 </tr>
 <tr>
-<td>IMAKE_MANINSTALL</td>
 <td>IMAP_UW_CCLIENT_MBOX_FMT</td>
+<td>IMDICTDIR</td>
 </tr>
 <tr>
-<td>IMDICTDIR</td>
 <td>INCOMPAT_CURSES</td>
+<td>INFO_DIR</td>
 </tr>
 <tr>
-<td>INFO_DIR</td>
 <td>INFO_FILES</td>
+<td>INFO_FILES_VERBOSE</td>
 </tr>
 <tr>
 <td>INFO_MSG</td>
@@ -12756,10 +12746,6 @@ source packages</h2></div></div></div>
 <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>
@@ -12836,76 +12822,68 @@ source packages</h2></div></div></div>
 <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>
-</tr>
-<tr>
 <td>LOCALBASE</td>
-<td>LOCALBASE_LOCKTYPE</td>
 </tr>
 <tr>
+<td>LOCALBASE_LOCKTYPE</td>
 <td>LOCALPATCHES</td>
-<td>LOVE_DATA</td>
 </tr>
 <tr>
+<td>LOVE_DATA</td>
 <td>LOVE_GAME</td>
-<td>LOVE_VERSION</td>
 </tr>
 <tr>
+<td>LOVE_VERSION</td>
 <td>LP32PLATFORMS</td>
-<td>LP64PLATFORMS</td>
 </tr>
 <tr>
+<td>LP64PLATFORMS</td>
 <td>LUA_BUSTED_ARGS</td>
-<td>LUA_CDIR</td>
 </tr>
 <tr>
+<td>LUA_CDIR</td>
 <td>LUA_COMPILER</td>
-<td>LUA_DOCDIR</td>
 </tr>
 <tr>
+<td>LUA_DOCDIR</td>
 <td>LUA_EXAMPLESDIR</td>
-<td>LUA_INCDIR</td>
 </tr>
 <tr>
+<td>LUA_INCDIR</td>
 <td>LUA_INTERPRETER</td>
-<td>LUA_LDIR</td>
 </tr>
 <tr>
+<td>LUA_LDIR</td>
 <td>LUA_LINKER_MAGIC</td>
-<td>LUA_PKGPREFIX</td>
 </tr>
 <tr>
+<td>LUA_PKGPREFIX</td>
 <td>LUA_SELF_CONFLICT</td>
-<td>LUA_USE_BUSTED</td>
 </tr>
 <tr>
+<td>LUA_USE_BUSTED</td>
 <td>LUA_VERSIONS_ACCEPTED</td>
-<td>LUA_VERSIONS_INCOMPATIBLE</td>
 </tr>
 <tr>
+<td>LUA_VERSIONS_INCOMPATIBLE</td>
 <td>LUA_VERSION_DEFAULT</td>
-<td>LUA_VERSION_REQD</td>
 </tr>
 <tr>
+<td>LUA_VERSION_REQD</td>
 <td>Lua</td>
-<td>MACHINE_PLATFORM</td>
 </tr>
 <tr>
+<td>MACHINE_PLATFORM</td>
 <td>MAILAGENT_DOMAIN</td>
-<td>MAILAGENT_EMAIL</td>
 </tr>
 <tr>
+<td>MAILAGENT_EMAIL</td>
 <td>MAILAGENT_FQDN</td>
-<td>MAILAGENT_ORGANIZATION</td>
 </tr>
 <tr>
+<td>MAILAGENT_ORGANIZATION</td>
 <td>MAJORDOMO_HOMEDIR</td>
-<td>MAJOR_OS_VERSION</td>
 </tr>
 <tr>
 <td>MAKEINFO_ARGS</td>
@@ -12992,143 +12970,135 @@ source packages</h2></div></div></div>
 <td>MTOOLS_ENABLE_FLOPPYD</td>
 </tr>
 <tr>
-<td>MUST</td>
 <td>MV</td>
-</tr>
-<tr>
 <td>MYSQL_CHARSET</td>
-<td>MYSQL_DATADIR</td>
 </tr>
 <tr>
+<td>MYSQL_DATADIR</td>
 <td>MYSQL_EXTRA_CHARSET</td>
-<td>MYSQL_GROUP</td>
 </tr>
 <tr>
+<td>MYSQL_GROUP</td>
 <td>MYSQL_USER</td>
-<td>MYSQL_VERSION</td>
 </tr>
 <tr>
+<td>MYSQL_VERSION</td>
 <td>MYSQL_VERSIONS_ACCEPTED</td>
-<td>MYSQL_VERSIONS_ALL</td>
 </tr>
 <tr>
+<td>MYSQL_VERSIONS_ALL</td>
 <td>MYSQL_VERSION_DEFAULT</td>
-<td>NAGIOSCMD_GROUP</td>
 </tr>
 <tr>
+<td>NAGIOSCMD_GROUP</td>
 <td>NAGIOSDIR</td>
-<td>NAGIOS_GROUP</td>
 </tr>
 <tr>
+<td>NAGIOS_GROUP</td>
 <td>NAGIOS_USER</td>
-<td>NATIVE_APPEND_ABI</td>
 </tr>
 <tr>
+<td>NATIVE_APPEND_ABI</td>
 <td>NATIVE_APPEND_ELF</td>
-<td>NATIVE_EXEC_FMT</td>
 </tr>
 <tr>
+<td>NATIVE_EXEC_FMT</td>
 <td>NATIVE_MACHINE_PLATFORM</td>
-<td>NATIVE_OBJECT_FMT</td>
 </tr>
 <tr>
+<td>NATIVE_OBJECT_FMT</td>
 <td>NBPAX_PROGRAM_PREFIX</td>
-<td>NETBSD_LOGIN_NAME</td>
 </tr>
 <tr>
+<td>NETBSD_LOGIN_NAME</td>
 <td>NMH_EDITOR</td>
-<td>NMH_MTA</td>
 </tr>
 <tr>
+<td>NMH_MTA</td>
 <td>NMH_PAGER</td>
-<td>NODE_VERSIONS_ACCEPTED</td>
 </tr>
 <tr>
+<td>NODE_VERSIONS_ACCEPTED</td>
 <td>NODE_VERSIONS_INCOMPATIBLE</td>
-<td>NODE_VERSION_DEFAULT</td>
 </tr>
 <tr>
+<td>NODE_VERSION_DEFAULT</td>
 <td>NODE_VERSION_REQD</td>
-<td>NOLOGIN</td>
 </tr>
 <tr>
+<td>NOLOGIN</td>
 <td>NOTE</td>
-<td>NOT_FOR_PLATFORM</td>
 </tr>
 <tr>
+<td>NOT_FOR_PLATFORM</td>
 <td>NOT_PAX_ASLR_SAFE</td>
-<td>NOT_PAX_MPROTECT_SAFE</td>
 </tr>
 <tr>
+<td>NOT_PAX_MPROTECT_SAFE</td>
 <td>NO_BUILD</td>
-<td>NO_CHECKSUM</td>
 </tr>
 <tr>
+<td>NO_CHECKSUM</td>
 <td>NO_CONFIGURE</td>
-<td>NO_SKIP</td>
 </tr>
 <tr>
+<td>NO_SKIP</td>
 <td>NS_PREFERRED</td>
-<td>NULLMAILER_GROUP</td>
 </tr>
 <tr>
+<td>NULLMAILER_GROUP</td>
 <td>NULLMAILER_USER</td>
-<td>OBJHOSTNAME</td>
 </tr>
 <tr>
+<td>OBJHOSTNAME</td>
 <td>OBJMACHINE</td>
-<td>OCAML_FINDLIB_DIRS</td>
 </tr>
 <tr>
+<td>OCAML_FINDLIB_DIRS</td>
 <td>OCAML_FINDLIB_REGISTER</td>
-<td>OCAML_FINDLIB_REGISTER_VERBOSE</td>
 </tr>
 <tr>
+<td>OCAML_FINDLIB_REGISTER_VERBOSE</td>
 <td>OCAML_SITELIBDIR</td>
-<td>OMF</td>
 </tr>
 <tr>
+<td>OMF</td>
 <td>ONLY_FOR_COMPILER</td>
-<td>ONLY_FOR_PLATFORM</td>
 </tr>
 <tr>
+<td>ONLY_FOR_PLATFORM</td>
 <td>OPENSSH_CHROOT</td>
-<td>OPENSSH_GROUP</td>
 </tr>
 <tr>
+<td>OPENSSH_GROUP</td>
 <td>OPENSSH_USER</td>
-<td>OPSYS</td>
 </tr>
 <tr>
+<td>OPSYS</td>
 <td>OPSYS_EMULDIR</td>
-<td>OPSYS_VERSION</td>
 </tr>
 <tr>
+<td>OPSYS_VERSION</td>
 <td>OS</td>
-<td>OSS_TYPE</td>
 </tr>
 <tr>
+<td>OSS_TYPE</td>
 <td>OSX</td>
-<td>OSX_TOLERATE_SDK_SKEW</td>
-</tr>
-<tr>
-<td>OS_HAVE_ALSA</td>
-<td>OS_HAVE_RCD</td>
 </tr>
 <tr>
+<td>OSX_TOLERATE_SDK_SKEW</td>
 <td>OS_VARIANT</td>
-<td>OS_VERSION</td>
 </tr>
 <tr>
+<td>OS_VERSION</td>
 <td>OTF_FONTS_DIR</td>
-<td>OVERRIDE_DIRDEPTH</td>
 </tr>
 <tr>
+<td>OVERRIDE_DIRDEPTH</td>
 <td>OVERRIDE_GEMSPEC</td>
-<td>OVERRIDE_GNU_CONFIG_SCRIPTS</td>
 </tr>
 <tr>
-<td>OVERRIDE_ROCKSPEC</td>
+<td>OVERRIDE_GNU_CONFIG_SCRIPTS</td>
 <td>OWN_DIRS</td>
 </tr>
 <tr>
@@ -13176,14 +13146,6 @@ source packages</h2></div></div></div>
 <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>
@@ -13581,10 +13543,6 @@ source packages</h2></div></div></div>
 </tr>
 <tr>
 <td>RASMOL_DEPTH</td>
-<td>RCD_DIR</td>
-</tr>
-<tr>
-<td>RCD_ORDER</td>
 <td>RCD_SCRIPTS</td>
 </tr>
 <tr>
@@ -13597,10 +13555,10 @@ source packages</h2></div></div></div>
 </tr>
 <tr>
 <td>RCD_SCRIPT_SRC</td>
-<td>RCD_SUBR</td>
+<td>RDOC</td>
 </tr>
 <tr>
-<td>RDOC</td>
+<td>READLINE_ACCEPTED</td>
 <td>READLINE_DEFAULT</td>
 </tr>
 <tr>
@@ -13672,10 +13630,6 @@ source packages</h2></div></div></div>
 <td>RM</td>
 </tr>
 <tr>
-<td>ROCKSPEC_NAME</td>
-<td>ROCKSPEC_SPECFILE</td>
-</tr>
-<tr>
 <td>ROOT_CMD</td>
 <td>ROOT_GROUP</td>
 </tr>
@@ -13880,187 +13834,175 @@ source packages</h2></div></div></div>
 <td>SHLIB</td>
 </tr>
 <tr>
-<td>SHORTNAME</td>
 <td>SIGN_PACKAGES</td>
-</tr>
-<tr>
 <td>SILC_CLIENT_WITH_PERL</td>
-<td>SITE_SPECIFIC_PKGS</td>
 </tr>
 <tr>
+<td>SITE_SPECIFIC_PKGS</td>
 <td>SKIP_DEPENDS</td>
-<td>SMF_INSTANCES</td>
 </tr>
 <tr>
+<td>SMF_INSTANCES</td>
 <td>SMF_MANIFEST</td>
-<td>SMF_METHODS</td>
 </tr>
 <tr>
+<td>SMF_METHODS</td>
 <td>SMF_METHOD_SHELL</td>
-<td>SMF_METHOD_SRC</td>
 </tr>
 <tr>
+<td>SMF_METHOD_SRC</td>
 <td>SMF_NAME</td>
-<td>SMF_PREFIX</td>
 </tr>
 <tr>
+<td>SMF_PREFIX</td>
 <td>SMF_SRCDIR</td>
-<td>SNIPROXY_GROUP</td>
 </tr>
 <tr>
+<td>SNIPROXY_GROUP</td>
 <td>SNIPROXY_USER</td>
-<td>SOURCE_BUFFSIZE</td>
 </tr>
 <tr>
+<td>SOURCE_BUFFSIZE</td>
 <td>SPECIAL_PERMS</td>
-<td>SPECIFIC_PKGS</td>
 </tr>
 <tr>
+<td>SPECIFIC_PKGS</td>
 <td>SSH_SUID</td>
-<td>SSP_SUPPORTED</td>
 </tr>
 <tr>
+<td>SSP_SUPPORTED</td>
 <td>SSYNC_PAWD</td>
-<td>STEP_MSG</td>
 </tr>
 <tr>
+<td>STEP_MSG</td>
 <td>STRIP</td>
-<td>STRIP_DBG</td>
 </tr>
 <tr>
+<td>STRIP_DBG</td>
 <td>STRIP_DEBUG</td>
-<td>STRIP_DEBUG_SUPPORTED</td>
 </tr>
 <tr>
+<td>STRIP_DEBUG_SUPPORTED</td>
 <td>STRIP_FILES_SKIP</td>
-<td>SU</td>
 </tr>
 <tr>
+<td>SU</td>
 <td>SUBDIR</td>
-<td>SUBST</td>
 </tr>
 <tr>
+<td>SUBST</td>
 <td>SUBST_CLASSES</td>
-<td>SUBST_FILES</td>
 </tr>
 <tr>
+<td>SUBST_FILES</td>
 <td>SUBST_FILTER_CMD</td>
-<td>SUBST_MESSAGE</td>
 </tr>
 <tr>
+<td>SUBST_MESSAGE</td>
 <td>SUBST_NOOP_OK</td>
-<td>SUBST_SED</td>
 </tr>
 <tr>
+<td>SUBST_SED</td>
 <td>SUBST_SHOW_DIFF</td>
-<td>SUBST_SKIP_TEXT_CHECK</td>
 </tr>
 <tr>
+<td>SUBST_SKIP_TEXT_CHECK</td>
 <td>SUBST_STAGE</td>
-<td>SUBST_VARS</td>
 </tr>
 <tr>
+<td>SUBST_VARS</td>
 <td>SUNWSPROBASE</td>
-<td>SUSE_PREFER</td>
 </tr>
 <tr>
+<td>SUSE_PREFER</td>
 <td>SU_CMD</td>
-<td>SVN_EXTRACTDIR</td>
 </tr>
 <tr>
-<td>SVN_REPO</td>
-<td>SVN_REPOSITORIES</td>
-</tr>
-<tr>
-<td>SVN_REVISION</td>
 <td>SYSCONFBASE</td>
-</tr>
-<tr>
 <td>TARGET_ARCH</td>
-<td>TBL</td>
 </tr>
 <tr>
+<td>TBL</td>
 <td>TERMCAP_TYPE</td>
-<td>TERMINFO_DEFAULT</td>
 </tr>
 <tr>
+<td>TERMINFO_DEFAULT</td>
 <td>TERMINFO_TYPE</td>
-<td>TEST</td>
 </tr>
 <tr>
+<td>TEST</td>
 <td>TEST_DEPENDS</td>
-<td>TEST_DIRS</td>
 </tr>
 <tr>
+<td>TEST_DIRS</td>
 <td>TEST_ENV</td>
-<td>TEST_ENV_SHELL</td>
 </tr>
 <tr>
+<td>TEST_ENV_SHELL</td>
 <td>TEST_MAKE_CMD</td>
-<td>TEST_MAKE_FLAGS</td>
 </tr>
 <tr>
+<td>TEST_MAKE_FLAGS</td>
 <td>TEST_TARGET</td>
-<td>TEXLIVE_IGNORE_PATTERNS</td>
 </tr>
 <tr>
+<td>TEXLIVE_IGNORE_PATTERNS</td>
 <td>TEXLIVE_REV</td>
-<td>TEXLIVE_UNVERSIONED</td>
 </tr>
 <tr>
+<td>TEXLIVE_UNVERSIONED</td>
 <td>TEXMFSITE</td>
-<td>TEX_FORMATS</td>
 </tr>
 <tr>
+<td>TEX_FORMATS</td>
 <td>TEX_HYPHEN_DAT</td>
-<td>TEX_HYPHEN_DEF</td>
 </tr>
 <tr>
+<td>TEX_HYPHEN_DEF</td>
 <td>TEX_TEXMF_DIRS</td>
-<td>THTTPD_LOG_FACILITY</td>
 </tr>
 <tr>
+<td>THTTPD_LOG_FACILITY</td>
 <td>TINYDYN_USER</td>
-<td>TLSWRAPPER_CHROOT</td>
 </tr>
 <tr>
+<td>TLSWRAPPER_CHROOT</td>
 <td>TO</td>
-<td>TOOLS_ALIASES</td>
 </tr>
 <tr>
+<td>TOOLS_ALIASES</td>
 <td>TOOLS_ALWAYS_WRAP</td>
-<td>TOOLS_ARGS</td>
 </tr>
 <tr>
+<td>TOOLS_ARGS</td>
 <td>TOOLS_BROKEN</td>
-<td>TOOLS_CMD</td>
 </tr>
 <tr>
+<td>TOOLS_CMD</td>
 <td>TOOLS_CMDLINE_SED</td>
-<td>TOOLS_CREATE</td>
 </tr>
 <tr>
+<td>TOOLS_CREATE</td>
 <td>TOOLS_CROSS_DESTDIR</td>
-<td>TOOLS_DIR</td>
 </tr>
 <tr>
+<td>TOOLS_DIR</td>
 <td>TOOLS_FAIL</td>
-<td>TOOLS_GNU_MISSING</td>
 </tr>
 <tr>
+<td>TOOLS_GNU_MISSING</td>
 <td>TOOLS_LDCONFIG</td>
-<td>TOOLS_NOOP</td>
 </tr>
 <tr>
+<td>TOOLS_NOOP</td>
 <td>TOOLS_PATH</td>
-<td>TOOLS_SCRIPT</td>
 </tr>
 <tr>
+<td>TOOLS_SCRIPT</td>
 <td>TOOLS_USE_CROSS_COMPILE</td>
-<td>TOOL_DEPENDS</td>
 </tr>
 <tr>
-<td>TTF_FONTDIR</td>
+<td>TOOL_DEPENDS</td>
 <td>TTF_FONTS_DIR</td>
 </tr>
 <tr>
@@ -14213,154 +14155,150 @@ source packages</h2></div></div></div>
 </tr>
 <tr>
 <td>XXX</td>
-<td>XXXX</td>
-</tr>
-<tr>
 <td>YES</td>
-<td>ZSH_STATIC</td>
 </tr>
 <tr>
+<td>ZSH_STATIC</td>
 <td>__stdc__</td>
-<td>_vargroups</td>
 </tr>
 <tr>
+<td>_vargroups</td>
 <td>accept</td>
-<td>acquire-localbase-lock</td>
 </tr>
 <tr>
+<td>acquire-localbase-lock</td>
 <td>acquire-lock</td>
-<td>add</td>
 </tr>
 <tr>
+<td>add</td>
 <td>added</td>
-<td>administrator</td>
 </tr>
 <tr>
+<td>administrator</td>
 <td>alloca</td>
-<td>alternatives</td>
 </tr>
 <tr>
+<td>alternatives</td>
 <td>aslr</td>
-<td>asprintf</td>
 </tr>
 <tr>
+<td>asprintf</td>
 <td>atlas</td>
-<td>autoconf</td>
 </tr>
 <tr>
+<td>autoconf</td>
 <td>automake</td>
-<td>autoreconf</td>
 </tr>
 <tr>
+<td>autoreconf</td>
 <td>awk</td>
-<td>bash</td>
 </tr>
 <tr>
+<td>bash</td>
 <td>big-endian</td>
-<td>bin-install</td>
 </tr>
 <tr>
+<td>bin-install</td>
 <td>bind</td>
-<td>binpkg-list</td>
 </tr>
 <tr>
+<td>binpkg-list</td>
 <td>blas</td>
-<td>bootstrap-depends</td>
 </tr>
 <tr>
+<td>bootstrap-depends</td>
 <td>broken</td>
-<td>broken_on_platform</td>
 </tr>
 <tr>
+<td>broken_on_platform</td>
 <td>bsd</td>
-<td>bsd.prog.mk</td>
 </tr>
 <tr>
+<td>bsd.prog.mk</td>
 <td>build</td>
-<td>build-env</td>
 </tr>
 <tr>
+<td>build-env</td>
 <td>buildlink-directories</td>
-<td>buildlink-oss-soundcard-h</td>
 </tr>
 <tr>
+<td>buildlink-oss-soundcard-h</td>
 <td>c</td>
-<td>c++</td>
 </tr>
 <tr>
+<td>c++</td>
 <td>ccache</td>
-<td>cce</td>
 </tr>
 <tr>
+<td>cce</td>
 <td>cdefs</td>
-<td>ceil</td>
 </tr>
 <tr>
+<td>ceil</td>
 <td>changes</td>
-<td>changes-entry</td>
 </tr>
 <tr>
+<td>changes-entry</td>
 <td>changes-entry-noupdate</td>
-<td>check</td>
 </tr>
 <tr>
+<td>check</td>
 <td>check-clean</td>
-<td>check-files</td>
 </tr>
 <tr>
+<td>check-files</td>
 <td>check-files-clean</td>
-<td>check-vulnerable</td>
 </tr>
 <tr>
+<td>check-vulnerable</td>
 <td>checksum</td>
-<td>checksum-phase</td>
 </tr>
 <tr>
+<td>checksum-phase</td>
 <td>clean</td>
-<td>clean-depends</td>
 </tr>
 <tr>
+<td>clean-depends</td>
 <td>cleandir</td>
-<td>commit</td>
 </tr>
 <tr>
+<td>commit</td>
 <td>commit-changes-entry</td>
-<td>compact</td>
 </tr>
 <tr>
+<td>compact</td>
 <td>compiler</td>
-<td>conf</td>
 </tr>
 <tr>
+<td>conf</td>
 <td>config.guess</td>
-<td>config.sub</td>
 </tr>
 <tr>
+<td>config.sub</td>
 <td>configuration</td>
-<td>configure</td>
 </tr>
 <tr>
+<td>configure</td>
 <td>configure-env</td>
-<td>configure-help</td>
 </tr>
 <tr>
+<td>configure-help</td>
 <td>configure_args</td>
-<td>connect</td>
 </tr>
 <tr>
+<td>connect</td>
 <td>cos</td>
-<td>cpe</td>
 </tr>
 <tr>
+<td>cpe</td>
 <td>cputime</td>
-<td>create-usergroup</td>
 </tr>
 <tr>
+<td>create-usergroup</td>
 <td>csh</td>
-<td>ctf</td>
 </tr>
 <tr>
-<td>cvs</td>
+<td>ctf</td>
 <td>debug</td>
 </tr>
 <tr>
@@ -14424,44 +14362,40 @@ source packages</h2></div></div></div>
 <td>endian</td>
 </tr>
 <tr>
-<td>endif</td>
 <td>enomem</td>
-</tr>
-<tr>
 <td>ensurepip</td>
-<td>err</td>
 </tr>
 <tr>
+<td>err</td>
 <td>errx</td>
-<td>etc</td>
 </tr>
 <tr>
+<td>etc</td>
 <td>exp</td>
-<td>extract-rpm</td>
 </tr>
 <tr>
+<td>extract-rpm</td>
 <td>fabs</td>
-<td>feature</td>
 </tr>
 <tr>
+<td>feature</td>
 <td>features</td>
-<td>fetch</td>
 </tr>
 <tr>
+<td>fetch</td>
 <td>fetch-list</td>
-<td>follows</td>
 </tr>
 <tr>
+<td>follows</td>
 <td>forbids</td>
-<td>form</td>
 </tr>
 <tr>
+<td>form</td>
 <td>format</td>
-<td>fortify</td>
 </tr>
 <tr>
+<td>fortify</td>
 <td>fortify_source</td>
-<td>fossil</td>
 </tr>
 <tr>
 <td>friend</td>
@@ -14496,32 +14430,28 @@ source packages</h2></div></div></div>
 <td>gettext</td>
 </tr>
 <tr>
-<td>git</td>
 <td>github</td>
-</tr>
-<tr>
 <td>gitlab</td>
-<td>glob</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>
-<td>hg</td>
 </tr>
 <tr>
 <td>imake</td>
@@ -14593,235 +14523,231 @@ source packages</h2></div></div></div>
 </tr>
 <tr>
 <td>memory</td>
-<td>mercurial</td>
-</tr>
-<tr>
 <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>move</td>
 </tr>
 <tr>
+<td>move</td>
 <td>moved</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-checks-hook</td>
-<td>pre-extract</td>
 </tr>
 <tr>
+<td>pre-extract</td>
 <td>pre-fetch</td>
-<td>print-go-deps</td>
 </tr>
 <tr>
+<td>print-go-deps</td>
 <td>print-plist</td>
-<td>print-summary-data</td>
 </tr>
 <tr>
+<td>print-summary-data</td>
 <td>privileged-install-hook</td>
-<td>pypi</td>
 </tr>
 <tr>
+<td>pypi</td>
 <td>python</td>
-<td>r</td>
 </tr>
 <tr>
+<td>r</td>
 <td>readme-all</td>
-<td>recursive</td>
 </tr>
 <tr>
+<td>recursive</td>
 <td>recv</td>
-<td>recvfrom</td>
 </tr>
 <tr>
+<td>recvfrom</td>
 <td>regcomp</td>
-<td>release-localbase-lock</td>
 </tr>
 <tr>
+<td>release-localbase-lock</td>
 <td>release-lock</td>
-<td>relro</td>
 </tr>
 <tr>
+<td>relro</td>
 <td>remove</td>
-<td>removed</td>
 </tr>
 <tr>
+<td>removed</td>
 <td>rename</td>
-<td>renamed</td>
 </tr>
 <tr>
+<td>renamed</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</td>
 <td>show-depends-dirs</td>
-<td>show-depends-pkgpaths</td>
 </tr>
 <tr>
+<td>show-depends-pkgpaths</td>
 <td>show-depends-recursive</td>
-<td>show-deps</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>
-<td>subversion</td>
 </tr>
 <tr>
 <td>sun</td>
@@ -14829,83 +14755,83 @@ source packages</h2></div></div></div>
 </tr>
 <tr>
 <td>sunwspro</td>
-<td>svn</td>
+<td>symlink</td>
 </tr>
 <tr>
-<td>symlink</td>
 <td>test</td>
+<td>test-env</td>
 </tr>
 <tr>
-<td>test-env</td>
 <td>tex</td>
+<td>texlive</td>
 </tr>
 <tr>
-<td>texlive</td>
 <td>tmp</td>
+<td>todo</td>
 </tr>
 <tr>
-<td>todo</td>
 <td>tool</td>
+<td>tools</td>
 </tr>
 <tr>
-<td>tools</td>
 <td>tools-libtool-m4-override</td>
+<td>transitive</td>
 </tr>
 <tr>
-<td>transitive</td>
 <td>type</td>
+<td>ulimit</td>
 </tr>
 <tr>
-<td>ulimit</td>
 <td>undefined</td>
+<td>undo-replace</td>
 </tr>
 <tr>
-<td>undo-replace</td>
 <td>unlimit</td>
+<td>unprivileged</td>
 </tr>
 <tr>
-<td>unprivileged</td>
 <td>unprivileged-install-hook</td>
+<td>unstripped</td>
 </tr>
 <tr>
-<td>unstripped</td>
 <td>update</td>
+<td>updated</td>
 </tr>
 <tr>
-<td>updated</td>
 <td>upload</td>
+<td>upload-distfiles</td>
 </tr>
 <tr>
-<td>upload-distfiles</td>
 <td>use_tools</td>
+<td>user</td>
 </tr>
 <tr>
-<td>user</td>
 <td>utimes</td>
+<td>vasprintf</td>
 </tr>
 <tr>
-<td>vasprintf</td>
 <td>verbose</td>
+<td>vsnprintf</td>
 </tr>
 <tr>
-<td>vsnprintf</td>
 <td>warn</td>
+<td>warning</td>
 </tr>
 <tr>
-<td>warning</td>
 <td>warnings</td>
+<td>warnx</td>
 </tr>
 <tr>
-<td>warnx</td>
 <td>wattr_off</td>
+<td>wattr_on</td>
 </tr>
 <tr>
-<td>wattr_on</td>
 <td>work</td>
+<td>wrapper</td>
 </tr>
 <tr>
-<td>wrapper</td>
 <td>wrkdir</td>
+<td>�</td>
 </tr>
 </table>
 </div>

Index: pkgsrc/doc/pkgsrc.txt
diff -u pkgsrc/doc/pkgsrc.txt:1.350 pkgsrc/doc/pkgsrc.txt:1.351
--- pkgsrc/doc/pkgsrc.txt:1.350 Wed Apr 26 10:27:38 2023
+++ pkgsrc/doc/pkgsrc.txt       Fri May 12 07:15:53 2023
@@ -206,8 +206,9 @@ II. The pkgsrc developer's guide
         20.2. Configuration files
             20.2.1. How PKG_SYSCONFDIR is set
             20.2.2. Telling the software where configuration files are
-            20.2.3. Patching installations
-            20.2.4. Disabling handling of configuration files
+            20.2.3. Patching installation
+            20.2.4. Declaring configuration files
+            20.2.5. Disabling handling of configuration files
         20.3. System startup scripts
             20.3.1. Disabling handling of system startup scripts
         20.4. System users and groups
@@ -2601,8 +2602,9 @@ Table of Contents
     20.2. Configuration files
         20.2.1. How PKG_SYSCONFDIR is set
         20.2.2. Telling the software where configuration files are
-        20.2.3. Patching installations
-        20.2.4. Disabling handling of configuration files
+        20.2.3. Patching installation
+        20.2.4. Declaring configuration files
+        20.2.5. Disabling handling of configuration files
     20.3. System startup scripts
         20.3.1. Disabling handling of system startup scripts
     20.4. System users and groups
@@ -5468,8 +5470,9 @@ Table of Contents
 20.2. Configuration files
     20.2.1. How PKG_SYSCONFDIR is set
     20.2.2. Telling the software where configuration files are
-    20.2.3. Patching installations
-    20.2.4. Disabling handling of configuration files
+    20.2.3. Patching installation
+    20.2.4. Declaring configuration files
+    20.2.5. Disabling handling of configuration files
 20.3. System startup scripts
     20.3.1. Disabling handling of system startup scripts
 20.4. System users and groups
@@ -5563,43 +5566,67 @@ anywhere in the file system:
 
 Creating non-empty files outside the installation prefix is tricky because the
 PLIST forces all files to be inside it. To overcome this problem, the only
-solution is to extract the file in the known place (i.e., inside the
-installation prefix) and copy it to the appropriate location during
-installation (done by the installation scripts generated by pkginstall). We
-will call the former the master file in the following paragraphs, which
-describe the variables that can be used to automatically and consistently
-handle files outside the installation prefix:
-
-  * CONF_FILES and REQD_FILES are pairs of master and target files. During
-    installation time, the master file is copied to the target one if and only
-    if the latter does not exist. Upon deinstallation, the target file is
+solution is to extract the file in a known place (i.e., inside the installation
+prefix) and copy it to the appropriate location during installation (done by
+the installation scripts generated by pkginstall). We will call the former the 
+reference file in the following paragraphs, which describe the variables that
+can be used to automatically and consistently handle files outside the
+installation prefix:
+
+  * REQD_FILES is a list of pairs of reference and target files. At
+    installation time, the reference file is copied to the target if and only
+    if the latter does not exist. Upon deinstallation, the reference file is
     removed provided that it was not modified by the installation.
 
-    The difference between the two is that the latter prompts the administrator
-    to remove any files that may be left after deinstallation (because they
-    were not empty), while the former does not.
-
-  * CONF_FILES_PERMS and REQD_FILES_PERMS contain tuples describing master
-    files as well as their target locations. For each of them, it also
-    specifies their owner, their group and their numeric permissions, in this
-    order. For example:
+  * REQD_FILES_PERMS contains tuples describing reference files and targets,
+    including owner, group, and numeric permissions that should be set. For
+    example:
 
     REQD_FILES_PERMS+=      ${PREFIX}/share/somefile ${VARBASE}/somefile \
                             ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
 
-    The difference between the two is exactly the same as their non-PERMS
-    counterparts.
+  * CONF_FILES and CONF_FILES_PERMS have the same syntax as REQD_FILES and
+    REQD_FILES_PERMS respectively. The difference is that these variables are
+    specifically intended for handling configuration files, for which
+    additional conventions and constraints apply. See Section 20.2,
+    "Configuration files" for further discussion. Note in particular that while
+    handling of configuration files can be disabled by the user (see
+    Section 20.2.5, "Disabling handling of configuration files"), this setting
+    does not affect REQD_FILES and REQD_FILES_PERMS.
+
+To install an empty file, one can use these macros and /dev/null as the
+reference file.
 
 20.2. Configuration files
 
-Configuration files are special in the sense that they are installed in their
-own specific directory, PKG_SYSCONFDIR, and need special treatment during
-installation (most of which is automated by pkginstall). The main concept you
-must bear in mind is that files marked as configuration files are automatically
-copied to the right place (somewhere inside PKG_SYSCONFDIR) during installation
-if and only if they didn't exist before. Similarly, they will not be removed if
-they have local modifications. This ensures that administrators never lose any
-custom changes they may have made.
+There are two principles that govern the handling of configuration files in
+pkgsrc: first, the user's configuration must not be lost or overwritten by
+upgrades or reinstallations; and second, the default configuration should
+always be available for reference. To that end, pkgsrc has a framework
+specifically for handling configuration files. In general, configuration files
+are installed into ${PREFIX}/share/examples, and copied from there to the
+pertinent etc directory as a separate step and only as needed.
+
+To make this work, there are three things that need to happen, any of which may
+require patching. First, the package must be told to read its configuration
+from the correct place at runtime; this place is ${PKG_SYSCONFDIR} (or possibly
+a subdirectory of it) which is often but not always ${PREFIX}/etc. Second, the
+package must be taught to install its default configuration files in ${PREFIX}/
+share/examples/${PKGBASE}; this is the point at which patching often becomes
+required because it is not the same place as the runtime location. Third, the
+configuration files need to be declared in the package makefile; this is the
+easy part.
+
+With those elements in place, the right things will happen: the package install
+phase and resulting binary package will not touch ${PKG_SYSCONFDIR}, and the
+default configuration will be copied into place by the pkgsrc framework only if
+not already present. Similarly, upon deinstall the configuration will not be
+removed if it has been modified. (This means that in the case of reinstallation
+and upgrades, unmodified configuration files are updated but modifications are
+never discarded.)
+
+The following sections describe how to make these things happen and document
+other relevant knobs available in the pkgsrc infrastructure.
 
 20.2.1. How PKG_SYSCONFDIR is set
 
@@ -5607,7 +5634,7 @@ As said before, the PKG_SYSCONFDIR varia
 shall be installed. Its contents are set based upon the following variables:
 
   * PKG_SYSCONFBASE: The configuration's root directory. Defaults to ${PREFIX}/
-    etc although it may be overridden by the user to point to his preferred
+    etc although it may be overridden by the user to point to their preferred
     location (e.g., /etc, /etc/pkg, etc.). Packages must not use it directly.
 
   * PKG_SYSCONFSUBDIR: A subdirectory of PKG_SYSCONFBASE under which the
@@ -5628,7 +5655,7 @@ shall be installed. Its contents are set
     placed.
 
 Based on the above variables, pkginstall determines the value of
-PKG_SYSCONFDIR, which is the only variable that can be used within a package to
+PKG_SYSCONFDIR, which is the only variable that may be used within a package to
 refer to its configuration directory. The algorithm used to set its value is
 basically the following:
 
@@ -5641,28 +5668,29 @@ basically the following:
  3. Otherwise, it is set to ${PKG_SYSCONFBASE}.
 
 It is worth mentioning that ${PKG_SYSCONFDIR} is automatically added to
-OWN_DIRS. See Section 20.1.1, "Directory manipulation" what this means. This
-does not apply to subdirectories of ${PKG_SYSCONFDIR}, they still have to be
-created with OWN_DIRS or MAKE_DIRS.
+OWN_DIRS. This causes it to be automatically created if needed. See
+Section 20.1.1, "Directory manipulation" for further details. This does not
+apply to subdirectories of ${PKG_SYSCONFDIR}; they must be manually created
+with OWN_DIRS or MAKE_DIRS.
 
 20.2.2. Telling the software where configuration files are
 
 Given that pkgsrc (and users!) expect configuration files to be in a known
-place, you need to teach each package where it shall install its files. In some
-cases you will have to patch the package Makefiles to achieve it. If you are
-lucky, though, it may be as easy as passing an extra flag to the configuration
-script; this is the case of GNU Autoconf- generated files:
+place, you need to teach each package where to install its files. In some cases
+you will have to patch the package Makefiles to achieve it. If you are lucky,
+though, it may be as easy as passing an extra flag to the configuration script.
+This is the case for packages using GNU autoconf:
 
 CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
 
 Note that this specifies where the package has to look for its configuration
-files, not where they will be originally installed (although the difference is
-never explicit, unfortunately).
+files, not where they will be installed. Fortunately, there is a different way
+to specify the latter, as seen in the next seection, although the combination
+is rather confusing at first glance.
 
-20.2.3. Patching installations
+20.2.3. Patching installation
 
-As said before, pkginstall automatically handles configuration files. This
-means that the packages themselves must not touch the contents of $
+As discussed above, packages themselves must not touch the contents of $
 {PKG_SYSCONFDIR} directly. Bad news is that many software installation scripts
 will, out of the box, mess with the contents of that directory. So what is the
 correct procedure to fix this issue?
@@ -5672,20 +5700,40 @@ configuration files under the examples h
 This way, the PLIST registers them and the administrator always has the
 original copies available.
 
-Once the required configuration files are in place (i.e., under the examples
-hierarchy), the pkginstall framework can use them as master copies during the
-package installation to update what is in ${PKG_SYSCONFDIR}. To achieve this,
-the variables CONF_FILES and CONF_FILES_PERMS are used. Check out
-Section 20.1.2, "File manipulation" for information about their syntax and
-their purpose. Here is an example, taken from the mail/mutt package:
+It turns out that for packages using GNU autoconf it is possible to create the
+desired effect by setting sysconfdir on the make command line at install time.
+Consider this example taken from mail/mutt:
+
+EGDIR=                  ${PREFIX}/share/examples/mutt
+INSTALL_MAKE_FLAGS=     ${MAKE_FLAGS} sysconfdir=${EGDIR}
 
-EGDIR=        ${PREFIX}/share/doc/mutt/samples
-CONF_FILES=   ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
+Note that the EGDIR variable, though commonly used for this purpose, is local
+to that package and has no meaning outside it.
 
-Note that the EGDIR variable is specific to that package and has no meaning
-outside it.
+20.2.4. Declaring configuration files
+
+Once the required configuration files are in place (i.e., under the examples
+hierarchy), the pkginstall framework can use them as reference copies during
+the package installation to update what is in ${PKG_SYSCONFDIR}. To achieve
+this, the variables CONF_FILES and CONF_FILES_PERMS are used. Check out
+Section 20.1.2, "File manipulation" for further information about their syntax
+and their purpose. Here is an example, taken from the mail/mutt package:
+
+EGDIR=                  ${PREFIX}/share/examples/mutt
+CONF_FILES=             ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
+
+Note that (as in the previous section's example) the EGDIR variable is specific
+to the package and has no meaning outside it.
+
+For reference, the complete example from Mutt is as follows:
+
+CONFIGURE_ARGS+=        --sysconfdir=${PKG_SYSCONFDIR}
+EGDIR=                  ${PREFIX}/share/examples/mutt
+CONF_FILES=             ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
+INSTALLATION_DIRS+=     ${EGDIR}
+INSTALL_MAKE_FLAGS=     ${MAKE_FLAGS} sysconfdir=${EGDIR}
 
-20.2.4. Disabling handling of configuration files
+20.2.5. Disabling handling of configuration files
 
 The automatic copying of config files can be toggled by setting the environment
 variable PKG_CONFIG prior to package installation.
@@ -5716,7 +5764,7 @@ automated fashion:
     substitutions described in the FILES_SUBST variable.
 
  2. Copy the script from the files directory to the examples hierarchy, $
-    {PREFIX}/share/examples/rc.d/. Note that this master file must be
+    {PREFIX}/share/examples/rc.d/. Note that this reference file must be
     explicitly registered in the PLIST.
 
  3. Add code to the installation scripts to copy the startup script from the
@@ -9313,35 +9361,34 @@ ABI                                  ACC
 ACROREAD_FONTPATH                    ADDITIONAL
 AFAIK                                AIX
 ALLOW_VULNERABLE_PACKAGES            ALL_ENV
-ALSA_PC                              ALTERNATIVES_SRC
-AMANDA_TMP                           AMANDA_USER
-AMANDA_VAR                           APACHE_GROUP
-APACHE_MODULE_NAME                   APACHE_MODULE_SRC
-APACHE_MODULE_SRCDIR                 APACHE_PKG_PREFIX
-APACHE_SUEXEC_CONFIGURE_ARGS         APACHE_SUEXEC_DOCROOT
-APACHE_USER                          APPEND_ABI
-APPEND_ELF                           ARLA_CACHE
-AUDIT_PACKAGES_FLAGS                 AUTOCONF_REQD
-AUTOMAKE_OVERRIDE                    AUTOMAKE_REQD
-AUTO_MKDIRS                          BDB185_DEFAULT
-BDBBASE                              BDB_ACCEPTED
-BDB_DEFAULT                          BDB_LIBS
-BDB_TYPE                             BINCIMAP_GROUP
-BINCIMAP_USER                        BIND_DIR
-BIND_GROUP                           BIND_USER
-BINOWN                               BINPKG_SITES
-BIN_INSTALL_FLAGS                    BISON_PKGDATADIR
-BLAS                                 BLAS_ACCEPTED
-BLAS_C_INTERFACE                     BLAS_INCLUDES
-BLAS_INDEX64                         BLAS_LIBS
-BLAS_PC                              BLAS_TYPE
-BOOTSTRAP_DEPENDS                    BROKEN
-BROKEN_EXCEPT_ON_PLATFORM            BROKEN_ON_PLATFORM
-BSDSRCDIR                            BSDXSRCDIR
-BSD_MAKE_ENV                         BUILDLINK_AUTO_DIRS
-BUILDLINK_AUTO_VARS                  BUILDLINK_CFLAGS
-BUILDLINK_CONTENTS_FILTER            BUILDLINK_CPPFLAGS
-BUILDLINK_DEPMETHOD                  BUILDLINK_FILES
+ALTERNATIVES_SRC                     AMANDA_TMP
+AMANDA_USER                          AMANDA_VAR
+APACHE_GROUP                         APACHE_MODULE_NAME
+APACHE_MODULE_SRC                    APACHE_MODULE_SRCDIR
+APACHE_PKG_PREFIX                    APACHE_SUEXEC_CONFIGURE_ARGS
+APACHE_SUEXEC_DOCROOT                APACHE_USER
+APPEND_ABI                           APPEND_ELF
+ARLA_CACHE                           AUDIT_PACKAGES_FLAGS
+AUTOCONF_REQD                        AUTOMAKE_OVERRIDE
+AUTOMAKE_REQD                        AUTO_MKDIRS
+BDB185_DEFAULT                       BDBBASE
+BDB_ACCEPTED                         BDB_DEFAULT
+BDB_LIBS                             BDB_TYPE
+BINCIMAP_GROUP                       BINCIMAP_USER
+BIND_DIR                             BIND_GROUP
+BIND_USER                            BINOWN
+BINPKG_SITES                         BIN_INSTALL_FLAGS
+BISON_PKGDATADIR                     BLAS
+BLAS_ACCEPTED                        BLAS_C_INTERFACE
+BLAS_INCLUDES                        BLAS_INDEX64
+BLAS_LIBS                            BLAS_PC
+BLAS_TYPE                            BOOTSTRAP_DEPENDS
+BROKEN                               BROKEN_EXCEPT_ON_PLATFORM
+BROKEN_ON_PLATFORM                   BSDSRCDIR
+BSDXSRCDIR                           BSD_MAKE_ENV
+BUILDLINK_AUTO_DIRS                  BUILDLINK_AUTO_VARS
+BUILDLINK_CFLAGS                     BUILDLINK_CONTENTS_FILTER
+BUILDLINK_CPPFLAGS                   BUILDLINK_FILES
 BUILDLINK_FILES_CMD                  BUILDLINK_FNAME_TRANSFORM
 BUILDLINK_LDFLAGS                    BUILDLINK_LIBS
 BUILDLINK_OPSYS_SUPPORT_PTHREAD      BUILDLINK_PKGNAME
@@ -9365,32 +9412,29 @@ CCACHE_DIR                           CCA
 CC_VERSION                           CC_VERSION_STRING
 CDRECORD_CONF                        CDROM_PKG_URL_DIR
 CDROM_PKG_URL_HOST                   CHANGES
-CHECKOUT_DATE                        CHECK_COMPILER
-CHECK_FAKEHOME                       CHECK_FILES
-CHECK_FILES_SKIP                     CHECK_FILES_STRICT
-CHECK_HEADERS                        CHECK_HEADERS_SKIP
-CHECK_INTERPRETER                    CHECK_INTERPRETER_SKIP
-CHECK_PERMS                          CHECK_PERMS_AUTOFIX
-CHECK_PERMS_SKIP                     CHECK_PIE
-CHECK_PIE_SKIP                       CHECK_PIE_SUPPORTED
-CHECK_PORTABILITY                    CHECK_PORTABILITY_EXPERIMENTAL
-CHECK_PORTABILITY_SKIP               CHECK_RELRO
-CHECK_RELRO_SKIP                     CHECK_RELRO_SUPPORTED
-CHECK_SHLIBS                         CHECK_SHLIBS_SKIP
-CHECK_SHLIBS_SUPPORTED               CHECK_SHLIBS_TOXIC
-CHECK_SSP                            CHECK_SSP_SKIP
-CHECK_SSP_SUPPORTED                  CHECK_STRIPPED
-CHECK_STRIPPED_SKIP                  CHECK_WRKREF
-CHECK_WRKREF_EXTRA_DIRS              CHECK_WRKREF_SKIP
-CLAMAV_DBDIR                         CLAMAV_GROUP
-CLAMAV_USER                          CLANGBASE
-CLEANDEPENDS                         CMAKE_DEPENDENCIES_REWRITE
-CMAKE_INSTALL_NAME_DIR               CMAKE_INSTALL_PREFIX
-CMAKE_MODULE_PATH_OVERRIDE           CMAKE_PKGSRC_BUILD_FLAGS
-CMAKE_PREFIX_PATH                    CMAKE_USE_GNU_INSTALL_DIRS
-COMMON_LISP_DOCFILES                 COMMON_LISP_EXAMPLES
-COMMON_LISP_EXTRAFILES               COMMON_LISP_PACKAGES
-COMMON_LISP_SYSTEM                   COMPILER_RPATH_FLAG
+CHECK_COMPILER                       CHECK_FAKEHOME
+CHECK_FILES                          CHECK_FILES_SKIP
+CHECK_FILES_STRICT                   CHECK_HEADERS
+CHECK_HEADERS_SKIP                   CHECK_INTERPRETER
+CHECK_INTERPRETER_SKIP               CHECK_PERMS
+CHECK_PERMS_AUTOFIX                  CHECK_PERMS_SKIP
+CHECK_PIE                            CHECK_PIE_SKIP
+CHECK_PIE_SUPPORTED                  CHECK_PORTABILITY
+CHECK_PORTABILITY_EXPERIMENTAL       CHECK_PORTABILITY_SKIP
+CHECK_RELRO                          CHECK_RELRO_SKIP
+CHECK_RELRO_SUPPORTED                CHECK_SHLIBS
+CHECK_SHLIBS_SKIP                    CHECK_SHLIBS_SUPPORTED
+CHECK_SHLIBS_TOXIC                   CHECK_SSP
+CHECK_SSP_SKIP                       CHECK_SSP_SUPPORTED
+CHECK_STRIPPED                       CHECK_STRIPPED_SKIP
+CHECK_WRKREF                         CHECK_WRKREF_EXTRA_DIRS
+CHECK_WRKREF_SKIP                    CLAMAV_DBDIR
+CLAMAV_GROUP                         CLAMAV_USER
+CLANGBASE                            CLEANDEPENDS
+CMAKE_DEPENDENCIES_REWRITE           CMAKE_INSTALL_NAME_DIR
+CMAKE_INSTALL_PREFIX                 CMAKE_MODULE_PATH_OVERRIDE
+CMAKE_PKGSRC_BUILD_FLAGS             CMAKE_PREFIX_PATH
+CMAKE_USE_GNU_INSTALL_DIRS           COMPILER_RPATH_FLAG
 COMPILER_USE_SYMLINKS                CONFIGURE_ARGS
 CONFIGURE_DIRS                       CONFIGURE_ENV
 CONFIGURE_ENV_SHELL                  CONFIGURE_HAS_INFODIR
@@ -9412,70 +9456,63 @@ CTF_FILES_SKIP                       CTF
 CTYPE                                CUPS_GROUP
 CUPS_SYSTEM_GROUPS                   CUPS_USER
 CURSES_DEFAULT                       CURSES_TYPE
-CVS_EXTRACTDIR                       CVS_MODULE
-CVS_PROJECT                          CVS_REPOSITORIES
-CVS_ROOT                             CVS_ROOT_GNU
-CVS_ROOT_NONGNU                      CVS_ROOT_SOURCEFORGE
-CVS_TAG                              CXX
-CYRUS_GROUP                          CYRUS_IDLE
-CYRUS_USER                           DAEMONTOOLS_GROUP
-DAEMONTOOLS_LOG_USER                 DARWIN_NO_SYSTEM_LIBS
-DARWIN_REQUIRES_FILTER               DBUS_GROUP
-DBUS_USER                            DEFANG_GROUP
-DEFANG_USER                          DEFAULT_ACCEPTABLE_LICENSES
-DEFAULT_DISTFILES                    DEFAULT_IRC_SERVER
-DEFAULT_SERIAL_DEVICE                DEF_UMASK
-DEINSTALLDEPENDS                     DEINSTALL_SRC
-DEINSTALL_TEMPLATES                  DELAYED_ERROR_MSG
-DELAYED_WARNING_MSG                  DEPENDS
-DEPENDS_TARGET                       DEPENDS_TYPE
-DESTDIR                              DESTDIR_VARNAME
-DIALER_GROUP                         DIGEST_REQD
-DISTDIR                              DISTFILES
-DISTINFO_FILE                        DISTNAME
-DIST_PATH                            DIST_SUBDIR
-DJBDNS_AXFR_USER                     DJBDNS_CACHE_USER
-DJBDNS_DJBDNS_GROUP                  DJBDNS_LOG_USER
-DJBDNS_RBL_USER                      DJBDNS_TINY_USER
-DLOPEN_REQUIRE_PTHREADS              DL_AUTO_VARS
-DL_CFLAGS                            DL_LDFLAGS
-DL_LIBS                              DNS
-DOCOWN                               DOWNLOADED_DISTFILE
-DQCACHE_GROUP                        DQCACHE_USER
-DT_LAYOUT                            DYNAMIC_SITES_CMD
-DYNAMIC_SITES_SCRIPT                 ECHO
-ECHO_N                               ELK_GUI
-EMACS_TYPE                           EMULDIR
-EMULSUBDIR                           EMULSUBDIRSLASH
-EMUL_ARCH                            EMUL_DISTRO
-EMUL_EXEC_FMT                        EMUL_IS_NATIVE
-EMUL_MODULES                         EMUL_OPSYS
-EMUL_PKG_FMT                         EMUL_PLATFORM
-EMUL_PLATFORMS                       EMUL_PREFER
-EMUL_REQD                            EMUL_TYPE
-ERROR_MSG                            EXIM_GROUP
-EXIM_USER                            EXPORT_SYMBOLS_LDFLAGS
-EXTRACTOR                            EXTRACT_CMD
-EXTRACT_CMD_DEFAULT                  EXTRACT_DIR
-EXTRACT_ELEMENTS                     EXTRACT_ENV
-EXTRACT_ONLY                         EXTRACT_OPTS
-EXTRACT_SUFX                         EXTRACT_USING
-FAIL                                 FAILOVER_FETCH
-FAIL_MSG                             FAKE_NCURSES
-FAM                                  FAM_ACCEPTED
-FAM_DEFAULT                          FAM_SERVER
-FCPATH                               FEATURE_CPPFLAGS
-FEATURE_LDFLAGS                      FEATURE_LIBS
-FETCH_AFTER_ARGS                     FETCH_BEFORE_ARGS
-FETCH_CMD                            FETCH_OUTPUT_ARGS
-FETCH_PROXY                          FETCH_RESUME_ARGS
-FETCH_TIMEOUT                        FETCH_USE_IPV4_ONLY
-FETCH_USING                          FILES_SUBST
-FILES_SUBST_SED                      FIX_SYSTEM_HEADERS
-FONTDIR                              FONTS_DIRS
+CXX                                  CYRUS_GROUP
+CYRUS_IDLE                           CYRUS_USER
+DAEMONTOOLS_GROUP                    DAEMONTOOLS_LOG_USER
+DARWIN_NO_SYSTEM_LIBS                DARWIN_REQUIRES_FILTER
+DBUS_GROUP                           DBUS_USER
+DEFANG_GROUP                         DEFANG_USER
+DEFAULT_ACCEPTABLE_LICENSES          DEFAULT_DISTFILES
+DEFAULT_IRC_SERVER                   DEFAULT_SERIAL_DEVICE
+DEF_UMASK                            DEINSTALLDEPENDS
+DEINSTALL_SRC                        DEINSTALL_TEMPLATES
+DELAYED_ERROR_MSG                    DELAYED_WARNING_MSG
+DEPENDS                              DEPENDS_TARGET
+DEPENDS_TYPE                         DESTDIR
+DESTDIR_VARNAME                      DIALER_GROUP
+DIGEST_REQD                          DISTDIR
+DISTFILES                            DISTINFO_FILE
+DISTNAME                             DIST_PATH
+DIST_SUBDIR                          DJBDNS_AXFR_USER
+DJBDNS_CACHE_USER                    DJBDNS_DJBDNS_GROUP
+DJBDNS_LOG_USER                      DJBDNS_RBL_USER
+DJBDNS_TINY_USER                     DLOPEN_REQUIRE_PTHREADS
+DL_AUTO_VARS                         DL_CFLAGS
+DL_LDFLAGS                           DL_LIBS
+DNS                                  DOCOWN
+DOWNLOADED_DISTFILE                  DQCACHE_GROUP
+DQCACHE_USER                         DT_LAYOUT
+DYNAMIC_SITES_CMD                    DYNAMIC_SITES_SCRIPT
+ECHO                                 ECHO_N
+ELK_GUI                              EMACS_TYPE
+EMULDIR                              EMULSUBDIR
+EMULSUBDIRSLASH                      EMUL_ARCH
+EMUL_DISTRO                          EMUL_EXEC_FMT
+EMUL_IS_NATIVE                       EMUL_MODULES
+EMUL_OPSYS                           EMUL_PKG_FMT
+EMUL_PLATFORM                        EMUL_PLATFORMS
+EMUL_PREFER                          EMUL_REQD
+EMUL_TYPE                            ERROR_MSG
+EXIM_GROUP                           EXIM_USER
+EXPORT_SYMBOLS_LDFLAGS               EXTRACTOR
+EXTRACT_CMD                          EXTRACT_CMD_DEFAULT
+EXTRACT_DIR                          EXTRACT_ELEMENTS
+EXTRACT_ENV                          EXTRACT_ONLY
+EXTRACT_OPTS                         EXTRACT_SUFX
+EXTRACT_USING                        FAIL
+FAILOVER_FETCH                       FAIL_MSG
+FAKE_NCURSES                         FAM
+FAM_ACCEPTED                         FAM_DEFAULT
+FAM_SERVER                           FCPATH
+FEATURE_CPPFLAGS                     FEATURE_LDFLAGS
+FEATURE_LIBS                         FETCH_AFTER_ARGS
+FETCH_BEFORE_ARGS                    FETCH_CMD
+FETCH_OUTPUT_ARGS                    FETCH_PROXY
+FETCH_RESUME_ARGS                    FETCH_TIMEOUT
+FETCH_USE_IPV4_ONLY                  FETCH_USING
+FILES_SUBST                          FILES_SUBST_SED
+FIX_SYSTEM_HEADERS                   FONTS_DIRS
 FONTS_VERBOSE                        FOO_HACKS_MK
-FOSSIL_EXTRACTDIR                    FOSSIL_REPO
-FOSSIL_REPOSITORIES                  FOSSIL_VERSION
 FOX_USE_XUNICODE                     FREEWNN_GROUP
 FREEWNN_USER                         FTP_PKG_URL_DIR
 FTP_PKG_URL_HOST                     GAMEDATAMODE
@@ -9497,36 +9534,31 @@ GITHUB_RELEASE                       GIT
 GITHUB_TAG                           GITHUB_TYPE
 GITLAB_PROJECT                       GITLAB_RELEASE
 GITLAB_SUBMODULES                    GITLAB_TAG
-GITLAB_TYPE                          GIT_BRANCH
-GIT_ENV                              GIT_EXTRACTDIR
-GIT_REPO                             GIT_REPOSITORIES
-GIT_REVISION                         GIT_TAG
-GNU                                  GNU_CONFIGURE
-GNU_CONFIGURE_INFODIR                GNU_CONFIGURE_MANDIR
-GNU_CONFIGURE_QUIET                  GNU_CONFIGURE_STRICT
-GODEP_REDIRECTS                      GO_BUILD_PATTERN
-GO_DEPS                              GO_DIST_BASE
-GO_EXTRA_MOD_DIRS                    GO_MODULE_FILES
-GO_SRCPATH                           GROUP_SPECIFIC_PKGS
-GRUB_NETWORK_CARDS                   GRUB_PRESET_COMMAND
-GRUB_SCAN_ARGS                       GZIP
-HASKELL_COMPILER                     HASKELL_ENABLE_DYNAMIC_EXECUTABLE
+GITLAB_TYPE                          GNU
+GNU_CONFIGURE                        GNU_CONFIGURE_INFODIR
+GNU_CONFIGURE_MANDIR                 GNU_CONFIGURE_QUIET
+GNU_CONFIGURE_STRICT                 GODEP_REDIRECTS
+GO_BUILD_PATTERN                     GO_DEPS
+GO_DIST_BASE                         GO_EXTRA_MOD_DIRS
+GO_MODULE_FILES                      GO_SRCPATH
+GROUP_SPECIFIC_PKGS                  GRUB_NETWORK_CARDS
+GRUB_PRESET_COMMAND                  GRUB_SCAN_ARGS
+GZIP                                 HASKELL_ENABLE_DYNAMIC_EXECUTABLE
 HASKELL_ENABLE_HADDOCK_DOCUMENTATION HASKELL_ENABLE_LIBRARY_PROFILING
 HASKELL_ENABLE_SHARED_LIBRARY        HASKELL_ENABLE_TESTS
 HASKELL_OPTIMIZATION_LEVEL           HASKELL_PKG_NAME
 HASKELL_UNRESTRICT_DEPENDENCIES      HEADER_TEMPLATES
-HG_REPO                              HG_REPOSITORIES
-HG_TAG                               HOMEPAGE
-HOST_PKGTOOLS_ARGS                   HOST_SPECIFIC_PKGS
-HOWL_GROUP                           HOWL_USER
-ICCBASE                              ICECAST_CHROOTDIR
-ICON_THEMES                          IDOBASE
-IGNORE_CCACHE                        IGNORE_INFO_DIRS
-IGNORE_INTERACTIVE_FETCH             IMAKE
-IMAKEOPTS                            IMAKE_MAKE
-IMAKE_MANINSTALL                     IMAP_UW_CCLIENT_MBOX_FMT
-IMDICTDIR                            INCOMPAT_CURSES
-INFO_DIR                             INFO_FILES
+HOMEPAGE                             HOST_PKGTOOLS_ARGS
+HOST_SPECIFIC_PKGS                   HOWL_GROUP
+HOWL_USER                            ICCBASE
+ICECAST_CHROOTDIR                    ICON_THEMES
+IDOBASE                              IGNORE_CCACHE
+IGNORE_INFO_DIRS                     IGNORE_INTERACTIVE_FETCH
+IMAKE                                IMAKEOPTS
+IMAKE_MAKE                           IMAKE_MANINSTALL
+IMAP_UW_CCLIENT_MBOX_FMT             IMDICTDIR
+INCOMPAT_CURSES                      INFO_DIR
+INFO_FILES                           INFO_FILES_VERBOSE
 INFO_MSG                             INIT_SYSTEM
 INN_DATA_DIR                         INN_GROUP
 INN_USER                             INSTALLATION_DIRS
@@ -9540,7 +9572,6 @@ IRCD_HYBRID_TOPICLEN                 IRI
 IRRD_USE_PGP                         JABBERD_GROUP
 JABBERD_LOGDIR                       JABBERD_PIDDIR
 JABBERD_SPOOLDIR                     JABBERD_USER
-JAVA_APP_PATH                        JAVA_APP_TARGETS
 JAVA_BINPREFIX                       JAVA_CLASSPATH
 JAVA_HOME                            JAVA_LD_LIBRARY_PATH
 JAVA_NAME                            JAVA_UNLIMIT
@@ -9560,24 +9591,22 @@ LIBRSVG_TYPE                         LIB
 LIBTOOLIZE_PLIST                     LIBTOOL_M4_OVERRIDE
 LIBUSB_TYPE                          LICENSE
 LINKER_RPATH_FLAG                    LINK_RPATH_FLAG
-LINUX_BASE_NODEPS                    LINUX_BASE_PREFERRED
-LINUX_BASE_REQUIRED                  LINUX_LOCALES
-LOCALBASE                            LOCALBASE_LOCKTYPE
-LOCALPATCHES                         LOVE_DATA
-LOVE_GAME                            LOVE_VERSION
-LP32PLATFORMS                        LP64PLATFORMS
-LUA_BUSTED_ARGS                      LUA_CDIR
-LUA_COMPILER                         LUA_DOCDIR
-LUA_EXAMPLESDIR                      LUA_INCDIR
-LUA_INTERPRETER                      LUA_LDIR
-LUA_LINKER_MAGIC                     LUA_PKGPREFIX
-LUA_SELF_CONFLICT                    LUA_USE_BUSTED
-LUA_VERSIONS_ACCEPTED                LUA_VERSIONS_INCOMPATIBLE
-LUA_VERSION_DEFAULT                  LUA_VERSION_REQD
-Lua                                  MACHINE_PLATFORM
-MAILAGENT_DOMAIN                     MAILAGENT_EMAIL
-MAILAGENT_FQDN                       MAILAGENT_ORGANIZATION
-MAJORDOMO_HOMEDIR                    MAJOR_OS_VERSION
+LINUX_LOCALES                        LOCALBASE
+LOCALBASE_LOCKTYPE                   LOCALPATCHES
+LOVE_DATA                            LOVE_GAME
+LOVE_VERSION                         LP32PLATFORMS
+LP64PLATFORMS                        LUA_BUSTED_ARGS
+LUA_CDIR                             LUA_COMPILER
+LUA_DOCDIR                           LUA_EXAMPLESDIR
+LUA_INCDIR                           LUA_INTERPRETER
+LUA_LDIR                             LUA_LINKER_MAGIC
+LUA_PKGPREFIX                        LUA_SELF_CONFLICT
+LUA_USE_BUSTED                       LUA_VERSIONS_ACCEPTED
+LUA_VERSIONS_INCOMPATIBLE            LUA_VERSION_DEFAULT
+LUA_VERSION_REQD                     Lua
+MACHINE_PLATFORM                     MAILAGENT_DOMAIN
+MAILAGENT_EMAIL                      MAILAGENT_FQDN
+MAILAGENT_ORGANIZATION               MAJORDOMO_HOMEDIR
 MAKEINFO_ARGS                        MAKE_DIRS
 MAKE_DIRS_PERMS                      MAKE_ENV
 MAKE_FILE                            MAKE_FLAGS
@@ -9599,41 +9628,39 @@ MONOTONE_USER                        MOT
 MOTIF_TYPE                           MOTIF_TYPE_DEFAULT
 MPI_TYPE                             MSGFMT_STRIP_MSGCTXT
 MSGFMT_STRIP_MSGID_PLURAL            MTOOLS_ENABLE_FLOPPYD
-MUST                                 MV
-MYSQL_CHARSET                        MYSQL_DATADIR
-MYSQL_EXTRA_CHARSET                  MYSQL_GROUP
-MYSQL_USER                           MYSQL_VERSION
-MYSQL_VERSIONS_ACCEPTED              MYSQL_VERSIONS_ALL
-MYSQL_VERSION_DEFAULT                NAGIOSCMD_GROUP
-NAGIOSDIR                            NAGIOS_GROUP
-NAGIOS_USER                          NATIVE_APPEND_ABI
-NATIVE_APPEND_ELF                    NATIVE_EXEC_FMT
-NATIVE_MACHINE_PLATFORM              NATIVE_OBJECT_FMT
-NBPAX_PROGRAM_PREFIX                 NETBSD_LOGIN_NAME
-NMH_EDITOR                           NMH_MTA
-NMH_PAGER                            NODE_VERSIONS_ACCEPTED
-NODE_VERSIONS_INCOMPATIBLE           NODE_VERSION_DEFAULT
-NODE_VERSION_REQD                    NOLOGIN
-NOTE                                 NOT_FOR_PLATFORM
-NOT_PAX_ASLR_SAFE                    NOT_PAX_MPROTECT_SAFE
-NO_BUILD                             NO_CHECKSUM
-NO_CONFIGURE                         NO_SKIP
-NS_PREFERRED                         NULLMAILER_GROUP
-NULLMAILER_USER                      OBJHOSTNAME
-OBJMACHINE                           OCAML_FINDLIB_DIRS
-OCAML_FINDLIB_REGISTER               OCAML_FINDLIB_REGISTER_VERBOSE
-OCAML_SITELIBDIR                     OMF
-ONLY_FOR_COMPILER                    ONLY_FOR_PLATFORM
-OPENSSH_CHROOT                       OPENSSH_GROUP
-OPENSSH_USER                         OPSYS
-OPSYS_EMULDIR                        OPSYS_VERSION
-OS                                   OSS_TYPE
-OSX                                  OSX_TOLERATE_SDK_SKEW
-OS_HAVE_ALSA                         OS_HAVE_RCD
-OS_VARIANT                           OS_VERSION
-OTF_FONTS_DIR                        OVERRIDE_DIRDEPTH
-OVERRIDE_GEMSPEC                     OVERRIDE_GNU_CONFIG_SCRIPTS
-OVERRIDE_ROCKSPEC                    OWN_DIRS
+MV                                   MYSQL_CHARSET
+MYSQL_DATADIR                        MYSQL_EXTRA_CHARSET
+MYSQL_GROUP                          MYSQL_USER
+MYSQL_VERSION                        MYSQL_VERSIONS_ACCEPTED
+MYSQL_VERSIONS_ALL                   MYSQL_VERSION_DEFAULT
+NAGIOSCMD_GROUP                      NAGIOSDIR
+NAGIOS_GROUP                         NAGIOS_USER
+NATIVE_APPEND_ABI                    NATIVE_APPEND_ELF
+NATIVE_EXEC_FMT                      NATIVE_MACHINE_PLATFORM
+NATIVE_OBJECT_FMT                    NBPAX_PROGRAM_PREFIX
+NETBSD_LOGIN_NAME                    NMH_EDITOR
+NMH_MTA                              NMH_PAGER
+NODE_VERSIONS_ACCEPTED               NODE_VERSIONS_INCOMPATIBLE
+NODE_VERSION_DEFAULT                 NODE_VERSION_REQD
+NOLOGIN                              NOTE
+NOT_FOR_PLATFORM                     NOT_PAX_ASLR_SAFE
+NOT_PAX_MPROTECT_SAFE                NO_BUILD
+NO_CHECKSUM                          NO_CONFIGURE
+NO_SKIP                              NS_PREFERRED
+NULLMAILER_GROUP                     NULLMAILER_USER
+OBJHOSTNAME                          OBJMACHINE
+OCAML_FINDLIB_DIRS                   OCAML_FINDLIB_REGISTER
+OCAML_FINDLIB_REGISTER_VERBOSE       OCAML_SITELIBDIR
+OMF                                  ONLY_FOR_COMPILER
+ONLY_FOR_PLATFORM                    OPENSSH_CHROOT
+OPENSSH_GROUP                        OPENSSH_USER
+OPSYS                                OPSYS_EMULDIR
+OPSYS_VERSION                        OS
+OSS_TYPE                             OSX
+OSX_TOLERATE_SDK_SKEW                OS_VARIANT
+OS_VERSION                           OTF_FONTS_DIR
+OVERRIDE_DIRDEPTH                    OVERRIDE_GEMSPEC
+OVERRIDE_GNU_CONFIG_SCRIPTS          OWN_DIRS
 OWN_DIRS_PERMS                       P4GROUP
 P4PORT                               P4ROOT
 P4USER                               PACKAGES
@@ -9645,8 +9672,6 @@ PATCH_DEBUG                          PAT
 PATCH_DIST_CAT                       PATCH_DIST_STRIP
 PATCH_FUZZ_FACTOR                    PATCH_STRIP
 PATH                                 PCCBASE
-PEAR                                 PEAR_CHANNEL
-PEAR_CHANNEL_ALIAS                   PEAR_CHANNEL_VERSION
 PEAR_CMD                             PEAR_LIB
 PEAR_PACKAGE_XML                     PERL5
 PERL5_CONFIGURE                      PERL5_CONFIGURE_DIRS
@@ -9746,12 +9771,11 @@ QORE_MODULE_API                      QOR
 QORE_USER_MODULE_DIR                 QORE_VERSION
 QPOPPER_FAC                          QPOPPER_SPOOL_DIR
 QPOPPER_USER                         RAKE_NAME
-RASMOL_DEPTH                         RCD_DIR
-RCD_ORDER                            RCD_SCRIPTS
+RASMOL_DEPTH                         RCD_SCRIPTS
 RCD_SCRIPTS_DIR                      RCD_SCRIPTS_EXAMPLEDIR
 RCD_SCRIPTS_MODE                     RCD_SCRIPTS_SHELL
-RCD_SCRIPT_SRC                       RCD_SUBR
-RDOC                                 READLINE_DEFAULT
+RCD_SCRIPT_SRC                       RDOC
+READLINE_ACCEPTED                    READLINE_DEFAULT
 READLINE_TYPE                        REAL_ROOT_GROUP
 REAL_ROOT_USER                       RECURSIVE_MAKE
 RELAY_CTRL_DIR                       RELRO_SUPPORTED
@@ -9769,7 +9793,6 @@ REQD_DIRS_PERMS                      REQ
 REQD_FILES_MODE                      REQD_FILES_PERMS
 RESOLV_AUTO_VARS                     RESOLV_LDFLAGS
 RESOLV_LIBS                          RM
-ROCKSPEC_NAME                        ROCKSPEC_SPECFILE
 ROOT_CMD                             ROOT_GROUP
 ROOT_USER                            RPCGEN
 RPM                                  RPM2PKG_PLIST
@@ -9821,52 +9844,49 @@ SDIST_PAWD                           SDL
 SERIAL_DEVICES                       SETGIDGAME
 SETGID_GAMES_PERMS                   SETUID_ROOT_PERMS
 SH                                   SHLIB
-SHORTNAME                            SIGN_PACKAGES
-SILC_CLIENT_WITH_PERL                SITE_SPECIFIC_PKGS
-SKIP_DEPENDS                         SMF_INSTANCES
-SMF_MANIFEST                         SMF_METHODS
-SMF_METHOD_SHELL                     SMF_METHOD_SRC
-SMF_NAME                             SMF_PREFIX
-SMF_SRCDIR                           SNIPROXY_GROUP
-SNIPROXY_USER                        SOURCE_BUFFSIZE
-SPECIAL_PERMS                        SPECIFIC_PKGS
-SSH_SUID                             SSP_SUPPORTED
-SSYNC_PAWD                           STEP_MSG
-STRIP                                STRIP_DBG
-STRIP_DEBUG                          STRIP_DEBUG_SUPPORTED
-STRIP_FILES_SKIP                     SU
-SUBDIR                               SUBST
-SUBST_CLASSES                        SUBST_FILES
-SUBST_FILTER_CMD                     SUBST_MESSAGE
-SUBST_NOOP_OK                        SUBST_SED
-SUBST_SHOW_DIFF                      SUBST_SKIP_TEXT_CHECK
-SUBST_STAGE                          SUBST_VARS
-SUNWSPROBASE                         SUSE_PREFER
-SU_CMD                               SVN_EXTRACTDIR
-SVN_REPO                             SVN_REPOSITORIES
-SVN_REVISION                         SYSCONFBASE
-TARGET_ARCH                          TBL
-TERMCAP_TYPE                         TERMINFO_DEFAULT
-TERMINFO_TYPE                        TEST
-TEST_DEPENDS                         TEST_DIRS
-TEST_ENV                             TEST_ENV_SHELL
-TEST_MAKE_CMD                        TEST_MAKE_FLAGS
-TEST_TARGET                          TEXLIVE_IGNORE_PATTERNS
-TEXLIVE_REV                          TEXLIVE_UNVERSIONED
-TEXMFSITE                            TEX_FORMATS
-TEX_HYPHEN_DAT                       TEX_HYPHEN_DEF
-TEX_TEXMF_DIRS                       THTTPD_LOG_FACILITY
-TINYDYN_USER                         TLSWRAPPER_CHROOT
-TO                                   TOOLS_ALIASES
-TOOLS_ALWAYS_WRAP                    TOOLS_ARGS
-TOOLS_BROKEN                         TOOLS_CMD
-TOOLS_CMDLINE_SED                    TOOLS_CREATE
-TOOLS_CROSS_DESTDIR                  TOOLS_DIR
-TOOLS_FAIL                           TOOLS_GNU_MISSING
-TOOLS_LDCONFIG                       TOOLS_NOOP
-TOOLS_PATH                           TOOLS_SCRIPT
-TOOLS_USE_CROSS_COMPILE              TOOL_DEPENDS
-TTF_FONTDIR                          TTF_FONTS_DIR
+SIGN_PACKAGES                        SILC_CLIENT_WITH_PERL
+SITE_SPECIFIC_PKGS                   SKIP_DEPENDS
+SMF_INSTANCES                        SMF_MANIFEST
+SMF_METHODS                          SMF_METHOD_SHELL
+SMF_METHOD_SRC                       SMF_NAME
+SMF_PREFIX                           SMF_SRCDIR
+SNIPROXY_GROUP                       SNIPROXY_USER
+SOURCE_BUFFSIZE                      SPECIAL_PERMS
+SPECIFIC_PKGS                        SSH_SUID
+SSP_SUPPORTED                        SSYNC_PAWD
+STEP_MSG                             STRIP
+STRIP_DBG                            STRIP_DEBUG
+STRIP_DEBUG_SUPPORTED                STRIP_FILES_SKIP
+SU                                   SUBDIR
+SUBST                                SUBST_CLASSES
+SUBST_FILES                          SUBST_FILTER_CMD
+SUBST_MESSAGE                        SUBST_NOOP_OK
+SUBST_SED                            SUBST_SHOW_DIFF
+SUBST_SKIP_TEXT_CHECK                SUBST_STAGE
+SUBST_VARS                           SUNWSPROBASE
+SUSE_PREFER                          SU_CMD
+SYSCONFBASE                          TARGET_ARCH
+TBL                                  TERMCAP_TYPE
+TERMINFO_DEFAULT                     TERMINFO_TYPE
+TEST                                 TEST_DEPENDS
+TEST_DIRS                            TEST_ENV
+TEST_ENV_SHELL                       TEST_MAKE_CMD
+TEST_MAKE_FLAGS                      TEST_TARGET
+TEXLIVE_IGNORE_PATTERNS              TEXLIVE_REV
+TEXLIVE_UNVERSIONED                  TEXMFSITE
+TEX_FORMATS                          TEX_HYPHEN_DAT
+TEX_HYPHEN_DEF                       TEX_TEXMF_DIRS
+THTTPD_LOG_FACILITY                  TINYDYN_USER
+TLSWRAPPER_CHROOT                    TO
+TOOLS_ALIASES                        TOOLS_ALWAYS_WRAP
+TOOLS_ARGS                           TOOLS_BROKEN
+TOOLS_CMD                            TOOLS_CMDLINE_SED
+TOOLS_CREATE                         TOOLS_CROSS_DESTDIR
+TOOLS_DIR                            TOOLS_FAIL
+TOOLS_GNU_MISSING                    TOOLS_LDCONFIG
+TOOLS_NOOP                           TOOLS_PATH
+TOOLS_SCRIPT                         TOOLS_USE_CROSS_COMPILE
+TOOL_DEPENDS                         TTF_FONTS_DIR
 TYPE                                 UAC_REQD_EXECS
 UCSPI_SSL_GROUP                      UCSPI_SSL_USER
 UNLIMIT_RESOURCES                    UNPRIVILEGED
@@ -9904,44 +9924,43 @@ X11_PKGSRCDIR                        X11
 X509_CERTIFICATE                     X509_KEY
 XAW_TYPE                             XLOCK_DEFAULT_MODE
 XMKMF                                XMKMF_FLAGS
-XXX                                  XXXX
-YES                                  ZSH_STATIC
-__stdc__                             _vargroups
-accept                               acquire-localbase-lock
-acquire-lock                         add
-added                                administrator
-alloca                               alternatives
-aslr                                 asprintf
-atlas                                autoconf
-automake                             autoreconf
-awk                                  bash
-big-endian                           bin-install
-bind                                 binpkg-list
-blas                                 bootstrap-depends
-broken                               broken_on_platform
-bsd                                  bsd.prog.mk
-build                                build-env
-buildlink-directories                buildlink-oss-soundcard-h
-c                                    c++
-ccache                               cce
-cdefs                                ceil
-changes                              changes-entry
-changes-entry-noupdate               check
-check-clean                          check-files
-check-files-clean                    check-vulnerable
-checksum                             checksum-phase
-clean                                clean-depends
-cleandir                             commit
-commit-changes-entry                 compact
-compiler                             conf
-config.guess                         config.sub
-configuration                        configure
-configure-env                        configure-help
-configure_args                       connect
-cos                                  cpe
-cputime                              create-usergroup
-csh                                  ctf
-cvs                                  debug
+XXX                                  YES
+ZSH_STATIC                           __stdc__
+_vargroups                           accept
+acquire-localbase-lock               acquire-lock
+add                                  added
+administrator                        alloca
+alternatives                         aslr
+asprintf                             atlas
+autoconf                             automake
+autoreconf                           awk
+bash                                 big-endian
+bin-install                          bind
+binpkg-list                          blas
+bootstrap-depends                    broken
+broken_on_platform                   bsd
+bsd.prog.mk                          build
+build-env                            buildlink-directories
+buildlink-oss-soundcard-h            c
+c++                                  ccache
+cce                                  cdefs
+ceil                                 changes
+changes-entry                        changes-entry-noupdate
+check                                check-clean
+check-files                          check-files-clean
+check-vulnerable                     checksum
+checksum-phase                       clean
+clean-depends                        cleandir
+commit                               commit-changes-entry
+compact                              compiler
+conf                                 config.guess
+config.sub                           configuration
+configure                            configure-env
+configure-help                       configure_args
+connect                              cos
+cpe                                  cputime
+create-usergroup                     csh
+ctf                                  debug
 declaration                          declare
 defined                              depend
 dependencies                         depends
@@ -9957,16 +9976,15 @@ do-install                           emu
 emul-distinfo                        emul-fetch
 emulation                            emulator
 enable                               endian
-endif                                enomem
-ensurepip                            err
-errx                                 etc
-exp                                  extract-rpm
-fabs                                 feature
-features                             fetch
-fetch-list                           follows
-forbids                              form
-format                               fortify
-fortify_source                       fossil
+enomem                               ensurepip
+err                                  errx
+etc                                  exp
+extract-rpm                          fabs
+feature                              features
+fetch                                fetch-list
+follows                              forbids
+form                                 format
+fortify                              fortify_source
 friend                               fts
 fts_close                            fts_open
 fts_read                             fts_set
@@ -9975,13 +9993,12 @@ gethostbyname                        get
 getopt_long                          getprogname
 getservbyname                        getservbyport
 getservent                           gettext
-git                                  github
-gitlab                               glob
-gnu                                  gnu_configure_strict
-go                                   go-deps
-golang                               guess-license
-hashbang                             heimdal
-help                                 hg
+github                               gitlab
+glob                                 gnu
+gnu_configure_strict                 go
+go-deps                              golang
+guess-license                        hashbang
+heimdal                              help
 imake                                increment
 indirect                             inet_aton
 interp                               interpreter
@@ -9999,85 +10016,84 @@ lintl                                lit
 lock                                 locking
 lua                                  lvalue
 make                                 makesum
-memory                               mercurial
-meta                                 meta-package
-meta_package                         mit-krb5
-mk.conf                              mkl
-mount                                move
-moved                                mprotect
-mremap                               nb
-nbcompat                             netlib
-node                                 node.js
-nodejs                               obstack
-obstack_ptr_grow                     occurs
-only                                 openblas
-options                              options.mk
-order                                override
-override-intltool                    override-message-intltool
-package                              parallel
-path                                 pax
-paxctl                               pbulk-index
-pc                                   perl
-perl5                                perms
-php                                  pkg-build-options
-pkg-config                           pkg_build_options
-platform                             plist
-post-extract                         post-fetch
-post-wrapper                         pre-build-checks-hook
-pre-configure-checks-hook            pre-extract
-pre-fetch                            print-go-deps
-print-plist                          print-summary-data
-privileged-install-hook              pypi
-python                               r
-readme-all                           recursive
-recv                                 recvfrom
-regcomp                              release-localbase-lock
-release-lock                         relro
-remove                               removed
-rename                               renamed
-reorder                              replace
-replace_interpreter                  reproducible
-resolv                               root
-ruby                                 send
-sendfile                             sendto
-setenv                               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
+memory                               meta
+meta-package                         meta_package
+mit-krb5                             mk.conf
+mkl                                  mount
+move                                 moved
+mprotect                             mremap
+nb                                   nbcompat
+netlib                               node
+node.js                              nodejs
+obstack                              obstack_ptr_grow
+occurs                               only
+openblas                             options
+options.mk                           order
+override                             override-intltool
+override-message-intltool            package
+parallel                             path
+pax                                  paxctl
+pbulk-index                          pc
+perl                                 perl5
+perms                                php
+pkg-build-options                    pkg-config
+pkg_build_options                    platform
+plist                                post-extract
+post-fetch                           post-wrapper
+pre-build-checks-hook                pre-configure-checks-hook
+pre-extract                          pre-fetch
+print-go-deps                        print-plist
+print-summary-data                   privileged-install-hook
+pypi                                 python
+r                                    readme-all
+recursive                            recv
+recvfrom                             regcomp
+release-localbase-lock               release-lock
+relro                                remove
+removed                              rename
+renamed                              reorder
+replace                              replace_interpreter
+reproducible                         resolv
+root                                 ruby
+send                                 sendfile
+sendto                               setenv
+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
 sun                                  sunpro
-sunwspro                             svn
-symlink                              test
-test-env                             tex
-texlive                              tmp
-todo                                 tool
-tools                                tools-libtool-m4-override
-transitive                           type
-ulimit                               undefined
-undo-replace                         unlimit
-unprivileged                         unprivileged-install-hook
-unstripped                           update
-updated                              upload
-upload-distfiles                     use_tools
-user                                 utimes
-vasprintf                            verbose
-vsnprintf                            warn
-warning                              warnings
-warnx                                wattr_off
-wattr_on                             work
-wrapper                              wrkdir
+sunwspro                             symlink
+test                                 test-env
+tex                                  texlive
+tmp                                  todo
+tool                                 tools
+tools-libtool-m4-override            transitive
+type                                 ulimit
+undefined                            undo-replace
+unlimit                              unprivileged
+unprivileged-install-hook            unstripped
+update                               updated
+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
 



Home | Main Index | Thread Index | Old Index