Received: by mail.netbsd.org (Postfix, from userid 605)
	id 42C4E84D47; Fri, 20 Jan 2023 12:23:32 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id 71C2184D01
	for <pkgsrc-changes@NetBSD.org>; Fri, 20 Jan 2023 12:23:31 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([IPv6:::1])
	by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025)
	with ESMTP id Zz4dI3PoOgZQ for <pkgsrc-changes@netbsd.org>;
	Fri, 20 Jan 2023 12:23:28 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197])
	by mail.netbsd.org (Postfix) with ESMTP id 1263084C13
	for <pkgsrc-changes@NetBSD.org>; Fri, 20 Jan 2023 12:23:28 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id 0F96EFA90; Fri, 20 Jan 2023 12:23:28 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1674217408248180"
MIME-Version: 1.0
Date: Fri, 20 Jan 2023 12:23:28 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/doc
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
X-Mailer: log_accum
Message-Id: <20230120122328.0F96EFA90@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
List-Id: <pkgsrc-changes.NetBSD.org>
Precedence: bulk
List-Unsubscribe: <mailto:majordomo@NetBSD.org?subject=Unsubscribe%20pkgsrc-changes&body=unsubscribe%20pkgsrc-changes>

This is a multi-part message in MIME format.

--_----------=_1674217408248180
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Fri Jan 20 12:23:27 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.347 -r1.348 pkgsrc/doc/pkgsrc.html
cvs rdiff -u -r1.345 -r1.346 pkgsrc/doc/pkgsrc.txt

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


--_----------=_1674217408248180
Content-Disposition: inline
Content-Length: 100149
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=utf-8

Modified files:

Index: pkgsrc/doc/pkgsrc.html
diff -u pkgsrc/doc/pkgsrc.html:1.347 pkgsrc/doc/pkgsrc.html:1.348
--- pkgsrc/doc/pkgsrc.html:1.347	Thu Jan  5 01:45:48 2023
+++ pkgsrc/doc/pkgsrc.html	Fri Jan 20 12:23:27 2023
@@ -4578,13 +4578,18 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
     <code class="varname">SCRIPTS_ENV</code> variable.</p>
 <p>If the program uses <code class="filename">cmake</code>
     for configuration, the appropriate steps can be invoked by
-    setting <code class="varname">USE_CMAKE</code> to <span class="quote">&#8220;<span class="quote">yes</span>&#8221;</span>.
+    including <code class="filename">../../devel/cmake/build.mk</code>.
     You can add variables to cmake's environment by adding them to the
     <code class="varname">CONFIGURE_ENV</code> variable and arguments to cmake
     by adding them to the <code class="varname">CMAKE_ARGS</code> variable.
-    The top directory argument is given by the
-    <code class="varname">CMAKE_ARG_PATH</code> variable, that defaults to
-    <span class="quote">&#8220;<span class="quote">.</span>&#8221;</span> (relative to <code class="varname">CONFIGURE_DIRS</code>)</p>
+    If you want to add arguments only for particular stages, you can use the
+    <code class="varname">CMAKE_CONFIGURE_ARGS</code>,
+    <code class="varname">CMAKE_BUILD_ARGS</code>, and
+    <code class="varname">CMAKE_INSTALL_ARGS</code> variables.
+    You can set the <code class="varname">CONFIGURE_DIRS</code> variable to the
+    directories in which CMake should be run, relative to
+    <code class="varname">WRKSRC</code>. This defaults to to <span class="quote">&#8220;<span class="quote">.</span>&#8221;</span>.
+    </p>
 <p>If there is no configure step at all, set
     <code class="varname">NO_CONFIGURE</code> to <span class="quote">&#8220;<span class="quote">yes</span>&#8221;</span>.</p>
 </div>
@@ -11843,115 +11848,119 @@ source packages</h2></div></div></div>
 <td>ALL_ENV</td>
 </tr>
 <tr>
+<td>ALSA_PC</td>
 <td>ALTERNATIVES_SRC</td>
-<td>AMANDA_TMP</td>
 </tr>
 <tr>
+<td>AMANDA_TMP</td>
 <td>AMANDA_USER</td>
-<td>AMANDA_VAR</td>
 </tr>
 <tr>
+<td>AMANDA_VAR</td>
 <td>APACHE_GROUP</td>
-<td>APACHE_MODULE_NAME</td>
 </tr>
 <tr>
+<td>APACHE_MODULE_NAME</td>
 <td>APACHE_MODULE_SRC</td>
-<td>APACHE_MODULE_SRCDIR</td>
 </tr>
 <tr>
+<td>APACHE_MODULE_SRCDIR</td>
 <td>APACHE_PKG_PREFIX</td>
-<td>APACHE_SUEXEC_CONFIGURE_ARGS</td>
 </tr>
 <tr>
+<td>APACHE_SUEXEC_CONFIGURE_ARGS</td>
 <td>APACHE_SUEXEC_DOCROOT</td>
-<td>APACHE_USER</td>
 </tr>
 <tr>
+<td>APACHE_USER</td>
 <td>APPEND_ABI</td>
-<td>APPEND_ELF</td>
 </tr>
 <tr>
+<td>APPEND_ELF</td>
 <td>ARLA_CACHE</td>
-<td>AUDIT_PACKAGES_FLAGS</td>
 </tr>
 <tr>
+<td>AUDIT_PACKAGES_FLAGS</td>
 <td>AUTOCONF_REQD</td>
-<td>AUTOMAKE_OVERRIDE</td>
 </tr>
 <tr>
+<td>AUTOMAKE_OVERRIDE</td>
 <td>AUTOMAKE_REQD</td>
-<td>AUTO_MKDIRS</td>
 </tr>
 <tr>
+<td>AUTO_MKDIRS</td>
 <td>BDB185_DEFAULT</td>
-<td>BDBBASE</td>
 </tr>
 <tr>
+<td>BDBBASE</td>
 <td>BDB_ACCEPTED</td>
-<td>BDB_DEFAULT</td>
 </tr>
 <tr>
+<td>BDB_DEFAULT</td>
 <td>BDB_LIBS</td>
-<td>BDB_TYPE</td>
 </tr>
 <tr>
+<td>BDB_TYPE</td>
 <td>BINCIMAP_GROUP</td>
-<td>BINCIMAP_USER</td>
 </tr>
 <tr>
+<td>BINCIMAP_USER</td>
 <td>BIND_DIR</td>
-<td>BIND_GROUP</td>
 </tr>
 <tr>
+<td>BIND_GROUP</td>
 <td>BIND_USER</td>
-<td>BINOWN</td>
 </tr>
 <tr>
+<td>BINOWN</td>
 <td>BINPKG_SITES</td>
-<td>BIN_INSTALL_FLAGS</td>
 </tr>
 <tr>
+<td>BIN_INSTALL_FLAGS</td>
 <td>BISON_PKGDATADIR</td>
-<td>BLAS</td>
 </tr>
 <tr>
+<td>BLAS</td>
 <td>BLAS_ACCEPTED</td>
-<td>BLAS_C_INTERFACE</td>
 </tr>
 <tr>
+<td>BLAS_C_INTERFACE</td>
 <td>BLAS_INCLUDES</td>
-<td>BLAS_INDEX64</td>
 </tr>
 <tr>
+<td>BLAS_INDEX64</td>
 <td>BLAS_LIBS</td>
-<td>BLAS_PC</td>
 </tr>
 <tr>
+<td>BLAS_PC</td>
 <td>BLAS_TYPE</td>
-<td>BOOTSTRAP_DEPENDS</td>
 </tr>
 <tr>
+<td>BOOTSTRAP_DEPENDS</td>
 <td>BROKEN</td>
-<td>BROKEN_EXCEPT_ON_PLATFORM</td>
 </tr>
 <tr>
+<td>BROKEN_EXCEPT_ON_PLATFORM</td>
 <td>BROKEN_ON_PLATFORM</td>
-<td>BSDSRCDIR</td>
 </tr>
 <tr>
+<td>BSDSRCDIR</td>
 <td>BSDXSRCDIR</td>
-<td>BSD_MAKE_ENV</td>
 </tr>
 <tr>
+<td>BSD_MAKE_ENV</td>
 <td>BUILDLINK_AUTO_DIRS</td>
-<td>BUILDLINK_AUTO_VARS</td>
 </tr>
 <tr>
+<td>BUILDLINK_AUTO_VARS</td>
 <td>BUILDLINK_CFLAGS</td>
-<td>BUILDLINK_CONTENTS_FILTER</td>
 </tr>
 <tr>
+<td>BUILDLINK_CONTENTS_FILTER</td>
 <td>BUILDLINK_CPPFLAGS</td>
+</tr>
+<tr>
+<td>BUILDLINK_DEPMETHOD</td>
 <td>BUILDLINK_FILES</td>
 </tr>
 <tr>
@@ -12047,95 +12056,107 @@ source packages</h2></div></div></div>
 <td>CHANGES</td>
 </tr>
 <tr>
+<td>CHECKOUT_DATE</td>
 <td>CHECK_COMPILER</td>
-<td>CHECK_FAKEHOME</td>
 </tr>
 <tr>
+<td>CHECK_FAKEHOME</td>
 <td>CHECK_FILES</td>
-<td>CHECK_FILES_SKIP</td>
 </tr>
 <tr>
+<td>CHECK_FILES_SKIP</td>
 <td>CHECK_FILES_STRICT</td>
-<td>CHECK_HEADERS</td>
 </tr>
 <tr>
+<td>CHECK_HEADERS</td>
 <td>CHECK_HEADERS_SKIP</td>
-<td>CHECK_INTERPRETER</td>
 </tr>
 <tr>
+<td>CHECK_INTERPRETER</td>
 <td>CHECK_INTERPRETER_SKIP</td>
-<td>CHECK_PERMS</td>
 </tr>
 <tr>
+<td>CHECK_PERMS</td>
 <td>CHECK_PERMS_AUTOFIX</td>
-<td>CHECK_PERMS_SKIP</td>
 </tr>
 <tr>
+<td>CHECK_PERMS_SKIP</td>
 <td>CHECK_PIE</td>
-<td>CHECK_PIE_SKIP</td>
 </tr>
 <tr>
+<td>CHECK_PIE_SKIP</td>
 <td>CHECK_PIE_SUPPORTED</td>
-<td>CHECK_PORTABILITY</td>
 </tr>
 <tr>
+<td>CHECK_PORTABILITY</td>
 <td>CHECK_PORTABILITY_EXPERIMENTAL</td>
-<td>CHECK_PORTABILITY_SKIP</td>
 </tr>
 <tr>
+<td>CHECK_PORTABILITY_SKIP</td>
 <td>CHECK_RELRO</td>
-<td>CHECK_RELRO_SKIP</td>
 </tr>
 <tr>
+<td>CHECK_RELRO_SKIP</td>
 <td>CHECK_RELRO_SUPPORTED</td>
-<td>CHECK_SHLIBS</td>
 </tr>
 <tr>
+<td>CHECK_SHLIBS</td>
 <td>CHECK_SHLIBS_SKIP</td>
-<td>CHECK_SHLIBS_SUPPORTED</td>
 </tr>
 <tr>
+<td>CHECK_SHLIBS_SUPPORTED</td>
 <td>CHECK_SHLIBS_TOXIC</td>
-<td>CHECK_SSP</td>
 </tr>
 <tr>
+<td>CHECK_SSP</td>
 <td>CHECK_SSP_SKIP</td>
-<td>CHECK_SSP_SUPPORTED</td>
 </tr>
 <tr>
+<td>CHECK_SSP_SUPPORTED</td>
 <td>CHECK_STRIPPED</td>
-<td>CHECK_STRIPPED_SKIP</td>
 </tr>
 <tr>
+<td>CHECK_STRIPPED_SKIP</td>
 <td>CHECK_WRKREF</td>
-<td>CHECK_WRKREF_EXTRA_DIRS</td>
 </tr>
 <tr>
+<td>CHECK_WRKREF_EXTRA_DIRS</td>
 <td>CHECK_WRKREF_SKIP</td>
-<td>CLAMAV_DBDIR</td>
 </tr>
 <tr>
+<td>CLAMAV_DBDIR</td>
 <td>CLAMAV_GROUP</td>
-<td>CLAMAV_USER</td>
 </tr>
 <tr>
+<td>CLAMAV_USER</td>
 <td>CLANGBASE</td>
-<td>CLEANDEPENDS</td>
 </tr>
 <tr>
+<td>CLEANDEPENDS</td>
 <td>CMAKE_DEPENDENCIES_REWRITE</td>
-<td>CMAKE_INSTALL_NAME_DIR</td>
 </tr>
 <tr>
+<td>CMAKE_INSTALL_NAME_DIR</td>
 <td>CMAKE_INSTALL_PREFIX</td>
-<td>CMAKE_MODULE_PATH_OVERRIDE</td>
 </tr>
 <tr>
+<td>CMAKE_MODULE_PATH_OVERRIDE</td>
 <td>CMAKE_PKGSRC_BUILD_FLAGS</td>
-<td>CMAKE_PREFIX_PATH</td>
 </tr>
 <tr>
+<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>COMPILER_RPATH_FLAG</td>
 </tr>
 <tr>
@@ -12223,227 +12244,247 @@ 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>
-<td>CYRUS_GROUP</td>
 </tr>
 <tr>
+<td>CYRUS_GROUP</td>
 <td>CYRUS_IDLE</td>
-<td>CYRUS_USER</td>
 </tr>
 <tr>
+<td>CYRUS_USER</td>
 <td>DAEMONTOOLS_GROUP</td>
-<td>DAEMONTOOLS_LOG_USER</td>
 </tr>
 <tr>
+<td>DAEMONTOOLS_LOG_USER</td>
 <td>DARWIN_NO_SYSTEM_LIBS</td>
-<td>DARWIN_REQUIRES_FILTER</td>
 </tr>
 <tr>
+<td>DARWIN_REQUIRES_FILTER</td>
 <td>DBUS_GROUP</td>
-<td>DBUS_USER</td>
 </tr>
 <tr>
+<td>DBUS_USER</td>
 <td>DEFANG_GROUP</td>
-<td>DEFANG_USER</td>
 </tr>
 <tr>
+<td>DEFANG_USER</td>
 <td>DEFAULT_ACCEPTABLE_LICENSES</td>
-<td>DEFAULT_DISTFILES</td>
 </tr>
 <tr>
+<td>DEFAULT_DISTFILES</td>
 <td>DEFAULT_IRC_SERVER</td>
-<td>DEFAULT_SERIAL_DEVICE</td>
 </tr>
 <tr>
+<td>DEFAULT_SERIAL_DEVICE</td>
 <td>DEF_UMASK</td>
-<td>DEINSTALLDEPENDS</td>
 </tr>
 <tr>
+<td>DEINSTALLDEPENDS</td>
 <td>DEINSTALL_SRC</td>
-<td>DEINSTALL_TEMPLATES</td>
 </tr>
 <tr>
+<td>DEINSTALL_TEMPLATES</td>
 <td>DELAYED_ERROR_MSG</td>
-<td>DELAYED_WARNING_MSG</td>
 </tr>
 <tr>
+<td>DELAYED_WARNING_MSG</td>
 <td>DEPENDS</td>
-<td>DEPENDS_TARGET</td>
 </tr>
 <tr>
+<td>DEPENDS_TARGET</td>
 <td>DEPENDS_TYPE</td>
-<td>DESTDIR</td>
 </tr>
 <tr>
+<td>DESTDIR</td>
 <td>DESTDIR_VARNAME</td>
-<td>DIALER_GROUP</td>
 </tr>
 <tr>
+<td>DIALER_GROUP</td>
 <td>DIGEST_REQD</td>
-<td>DISTDIR</td>
 </tr>
 <tr>
+<td>DISTDIR</td>
 <td>DISTFILES</td>
-<td>DISTINFO_FILE</td>
 </tr>
 <tr>
+<td>DISTINFO_FILE</td>
 <td>DISTNAME</td>
-<td>DIST_PATH</td>
 </tr>
 <tr>
+<td>DIST_PATH</td>
 <td>DIST_SUBDIR</td>
-<td>DJBDNS_AXFR_USER</td>
 </tr>
 <tr>
+<td>DJBDNS_AXFR_USER</td>
 <td>DJBDNS_CACHE_USER</td>
-<td>DJBDNS_DJBDNS_GROUP</td>
 </tr>
 <tr>
+<td>DJBDNS_DJBDNS_GROUP</td>
 <td>DJBDNS_LOG_USER</td>
-<td>DJBDNS_RBL_USER</td>
 </tr>
 <tr>
+<td>DJBDNS_RBL_USER</td>
 <td>DJBDNS_TINY_USER</td>
-<td>DLOPEN_REQUIRE_PTHREADS</td>
 </tr>
 <tr>
+<td>DLOPEN_REQUIRE_PTHREADS</td>
 <td>DL_AUTO_VARS</td>
-<td>DL_CFLAGS</td>
 </tr>
 <tr>
+<td>DL_CFLAGS</td>
 <td>DL_LDFLAGS</td>
-<td>DL_LIBS</td>
 </tr>
 <tr>
+<td>DL_LIBS</td>
 <td>DNS</td>
-<td>DOCOWN</td>
 </tr>
 <tr>
+<td>DOCOWN</td>
 <td>DOWNLOADED_DISTFILE</td>
-<td>DQCACHE_GROUP</td>
 </tr>
 <tr>
+<td>DQCACHE_GROUP</td>
 <td>DQCACHE_USER</td>
-<td>DT_LAYOUT</td>
 </tr>
 <tr>
+<td>DT_LAYOUT</td>
 <td>DYNAMIC_SITES_CMD</td>
-<td>DYNAMIC_SITES_SCRIPT</td>
 </tr>
 <tr>
+<td>DYNAMIC_SITES_SCRIPT</td>
 <td>ECHO</td>
-<td>ECHO_N</td>
 </tr>
 <tr>
+<td>ECHO_N</td>
 <td>ELK_GUI</td>
-<td>EMACS_TYPE</td>
 </tr>
 <tr>
+<td>EMACS_TYPE</td>
 <td>EMULDIR</td>
-<td>EMULSUBDIR</td>
 </tr>
 <tr>
+<td>EMULSUBDIR</td>
 <td>EMULSUBDIRSLASH</td>
-<td>EMUL_ARCH</td>
 </tr>
 <tr>
+<td>EMUL_ARCH</td>
 <td>EMUL_DISTRO</td>
-<td>EMUL_EXEC_FMT</td>
 </tr>
 <tr>
+<td>EMUL_EXEC_FMT</td>
 <td>EMUL_IS_NATIVE</td>
-<td>EMUL_MODULES</td>
 </tr>
 <tr>
+<td>EMUL_MODULES</td>
 <td>EMUL_OPSYS</td>
-<td>EMUL_PKG_FMT</td>
 </tr>
 <tr>
+<td>EMUL_PKG_FMT</td>
 <td>EMUL_PLATFORM</td>
-<td>EMUL_PLATFORMS</td>
 </tr>
 <tr>
+<td>EMUL_PLATFORMS</td>
 <td>EMUL_PREFER</td>
-<td>EMUL_REQD</td>
 </tr>
 <tr>
+<td>EMUL_REQD</td>
 <td>EMUL_TYPE</td>
-<td>ERROR_MSG</td>
 </tr>
 <tr>
+<td>ERROR_MSG</td>
 <td>EXIM_GROUP</td>
-<td>EXIM_USER</td>
 </tr>
 <tr>
+<td>EXIM_USER</td>
 <td>EXPORT_SYMBOLS_LDFLAGS</td>
-<td>EXTRACTOR</td>
 </tr>
 <tr>
+<td>EXTRACTOR</td>
 <td>EXTRACT_CMD</td>
-<td>EXTRACT_CMD_DEFAULT</td>
 </tr>
 <tr>
+<td>EXTRACT_CMD_DEFAULT</td>
 <td>EXTRACT_DIR</td>
-<td>EXTRACT_ELEMENTS</td>
 </tr>
 <tr>
+<td>EXTRACT_ELEMENTS</td>
 <td>EXTRACT_ENV</td>
-<td>EXTRACT_ONLY</td>
 </tr>
 <tr>
+<td>EXTRACT_ONLY</td>
 <td>EXTRACT_OPTS</td>
-<td>EXTRACT_SUFX</td>
 </tr>
 <tr>
+<td>EXTRACT_SUFX</td>
 <td>EXTRACT_USING</td>
-<td>FAIL</td>
 </tr>
 <tr>
+<td>FAIL</td>
 <td>FAILOVER_FETCH</td>
-<td>FAIL_MSG</td>
 </tr>
 <tr>
+<td>FAIL_MSG</td>
 <td>FAKE_NCURSES</td>
-<td>FAM</td>
 </tr>
 <tr>
+<td>FAM</td>
 <td>FAM_ACCEPTED</td>
-<td>FAM_DEFAULT</td>
 </tr>
 <tr>
+<td>FAM_DEFAULT</td>
 <td>FAM_SERVER</td>
-<td>FCPATH</td>
 </tr>
 <tr>
+<td>FCPATH</td>
 <td>FEATURE_CPPFLAGS</td>
-<td>FEATURE_LDFLAGS</td>
 </tr>
 <tr>
+<td>FEATURE_LDFLAGS</td>
 <td>FEATURE_LIBS</td>
-<td>FETCH_AFTER_ARGS</td>
 </tr>
 <tr>
+<td>FETCH_AFTER_ARGS</td>
 <td>FETCH_BEFORE_ARGS</td>
-<td>FETCH_CMD</td>
 </tr>
 <tr>
+<td>FETCH_CMD</td>
 <td>FETCH_OUTPUT_ARGS</td>
-<td>FETCH_PROXY</td>
 </tr>
 <tr>
+<td>FETCH_PROXY</td>
 <td>FETCH_RESUME_ARGS</td>
-<td>FETCH_TIMEOUT</td>
 </tr>
 <tr>
+<td>FETCH_TIMEOUT</td>
 <td>FETCH_USE_IPV4_ONLY</td>
-<td>FETCH_USING</td>
 </tr>
 <tr>
+<td>FETCH_USING</td>
 <td>FILES_SUBST</td>
-<td>FILES_SUBST_SED</td>
 </tr>
 <tr>
+<td>FILES_SUBST_SED</td>
 <td>FIX_SYSTEM_HEADERS</td>
+</tr>
+<tr>
+<td>FONTDIR</td>
 <td>FONTS_DIRS</td>
 </tr>
 <tr>
@@ -12451,6 +12492,14 @@ 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>
@@ -12536,43 +12585,59 @@ source packages</h2></div></div></div>
 </tr>
 <tr>
 <td>GITLAB_TYPE</td>
-<td>GNU</td>
+<td>GIT_BRANCH</td>
 </tr>
 <tr>
+<td>GIT_ENV</td>
+<td>GIT_EXTRACTDIR</td>
+</tr>
+<tr>
+<td>GIT_REPO</td>
+<td>GIT_REPOSITORIES</td>
+</tr>
+<tr>
+<td>GIT_REVISION</td>
+<td>GIT_TAG</td>
+</tr>
+<tr>
+<td>GNU</td>
 <td>GNU_CONFIGURE</td>
-<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>
-<td>GO_EXTRA_MOD_DIRS</td>
 </tr>
 <tr>
+<td>GO_EXTRA_MOD_DIRS</td>
 <td>GO_MODULE_FILES</td>
-<td>GO_SRCPATH</td>
 </tr>
 <tr>
+<td>GO_SRCPATH</td>
 <td>GROUP_SPECIFIC_PKGS</td>
-<td>GRUB_NETWORK_CARDS</td>
 </tr>
 <tr>
+<td>GRUB_NETWORK_CARDS</td>
 <td>GRUB_PRESET_COMMAND</td>
-<td>GRUB_SCAN_ARGS</td>
 </tr>
 <tr>
+<td>GRUB_SCAN_ARGS</td>
 <td>GZIP</td>
-<td>HASKELL_ENABLE_DYNAMIC_EXECUTABLE</td>
+</tr>
+<tr>
+<td>HASKELL_COMPILER</td>
+<td>HASKELL_ENABLE_DYNAMIC_EXECUTABLE</td>
 </tr>
 <tr>
 <td>HASKELL_ENABLE_HADDOCK_DOCUMENTATION</td>
@@ -12591,176 +12656,192 @@ 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_FILES_VERBOSE</td>
 <td>INFO_MSG</td>
-<td>INIT_SYSTEM</td>
 </tr>
 <tr>
+<td>INIT_SYSTEM</td>
 <td>INN_DATA_DIR</td>
-<td>INN_GROUP</td>
 </tr>
 <tr>
+<td>INN_GROUP</td>
 <td>INN_USER</td>
-<td>INSTALLATION_DIRS</td>
 </tr>
 <tr>
+<td>INSTALLATION_DIRS</td>
 <td>INSTALLATION_DIRS_FROM_PLIST</td>
-<td>INSTALL_ENV</td>
 </tr>
 <tr>
+<td>INSTALL_ENV</td>
 <td>INSTALL_SH_OVERRIDE</td>
-<td>INSTALL_SRC</td>
 </tr>
 <tr>
+<td>INSTALL_SRC</td>
 <td>INSTALL_TEMPLATES</td>
-<td>INSTALL_UNSTRIPPED</td>
 </tr>
 <tr>
+<td>INSTALL_UNSTRIPPED</td>
 <td>IRCD_HYBRID_IRC_GROUP</td>
-<td>IRCD_HYBRID_IRC_USER</td>
 </tr>
 <tr>
+<td>IRCD_HYBRID_IRC_USER</td>
 <td>IRCD_HYBRID_MAXCONN</td>
-<td>IRCD_HYBRID_NICLEN</td>
 </tr>
 <tr>
+<td>IRCD_HYBRID_NICLEN</td>
 <td>IRCD_HYBRID_SYSLOG_EVENTS</td>
-<td>IRCD_HYBRID_SYSLOG_FACILITY</td>
 </tr>
 <tr>
+<td>IRCD_HYBRID_SYSLOG_FACILITY</td>
 <td>IRCD_HYBRID_TOPICLEN</td>
-<td>IRIX</td>
 </tr>
 <tr>
+<td>IRIX</td>
 <td>IRRD_USE_PGP</td>
-<td>JABBERD_GROUP</td>
 </tr>
 <tr>
+<td>JABBERD_GROUP</td>
 <td>JABBERD_LOGDIR</td>
-<td>JABBERD_PIDDIR</td>
 </tr>
 <tr>
+<td>JABBERD_PIDDIR</td>
 <td>JABBERD_SPOOLDIR</td>
+</tr>
+<tr>
 <td>JABBERD_USER</td>
+<td>JAVA_APP_PATH</td>
 </tr>
 <tr>
+<td>JAVA_APP_TARGETS</td>
 <td>JAVA_BINPREFIX</td>
-<td>JAVA_CLASSPATH</td>
 </tr>
 <tr>
+<td>JAVA_CLASSPATH</td>
 <td>JAVA_HOME</td>
-<td>JAVA_LD_LIBRARY_PATH</td>
 </tr>
 <tr>
+<td>JAVA_LD_LIBRARY_PATH</td>
 <td>JAVA_NAME</td>
-<td>JAVA_UNLIMIT</td>
 </tr>
 <tr>
+<td>JAVA_UNLIMIT</td>
 <td>JAVA_WRAPPERS</td>
-<td>JPEG_ACCEPTED</td>
 </tr>
 <tr>
+<td>JPEG_ACCEPTED</td>
 <td>JPEG_DEFAULT</td>
-<td>KERBEROS</td>
 </tr>
 <tr>
+<td>KERBEROS</td>
 <td>KERMIT_SUID_UUCP</td>
-<td>KJS_USE_PCRE</td>
 </tr>
 <tr>
+<td>KJS_USE_PCRE</td>
 <td>KNEWS_DOMAIN_FILE</td>
-<td>KNEWS_DOMAIN_NAME</td>
 </tr>
 <tr>
+<td>KNEWS_DOMAIN_NAME</td>
 <td>KRB5_ACCEPTED</td>
-<td>KRB5_DEFAULT</td>
 </tr>
 <tr>
+<td>KRB5_DEFAULT</td>
 <td>LANGUAGES</td>
-<td>LAPACKE_LIBS</td>
 </tr>
 <tr>
+<td>LAPACKE_LIBS</td>
 <td>LAPACKE_PC</td>
-<td>LAPACK_LIBS</td>
 </tr>
 <tr>
+<td>LAPACK_LIBS</td>
 <td>LAPACK_PC</td>
-<td>LATEX2HTML_ICONPATH</td>
 </tr>
 <tr>
+<td>LATEX2HTML_ICONPATH</td>
 <td>LDCONFIG_ADD_CMD</td>
-<td>LDCONFIG_REMOVE_CMD</td>
 </tr>
 <tr>
+<td>LDCONFIG_REMOVE_CMD</td>
 <td>LDD</td>
-<td>LEAFNODE_DATA_DIR</td>
 </tr>
 <tr>
+<td>LEAFNODE_DATA_DIR</td>
 <td>LEAFNODE_GROUP</td>
-<td>LEAFNODE_USER</td>
 </tr>
 <tr>
+<td>LEAFNODE_USER</td>
 <td>LIBDVDCSS_HOMEPAGE</td>
-<td>LIBDVDCSS_MASTER_SITES</td>
 </tr>
 <tr>
+<td>LIBDVDCSS_MASTER_SITES</td>
 <td>LIBRSVG_TYPE</td>
-<td>LIBTOOL</td>
 </tr>
 <tr>
+<td>LIBTOOL</td>
 <td>LIBTOOLIZE_PLIST</td>
-<td>LIBTOOL_M4_OVERRIDE</td>
 </tr>
 <tr>
+<td>LIBTOOL_M4_OVERRIDE</td>
 <td>LIBUSB_TYPE</td>
-<td>LICENSE</td>
 </tr>
 <tr>
+<td>LICENSE</td>
 <td>LINKER_RPATH_FLAG</td>
+</tr>
+<tr>
 <td>LINK_RPATH_FLAG</td>
+<td>LINUX_BASE_NODEPS</td>
+</tr>
+<tr>
+<td>LINUX_BASE_PREFERRED</td>
+<td>LINUX_BASE_REQUIRED</td>
 </tr>
 <tr>
 <td>LINUX_LOCALES</td>
@@ -12827,88 +12908,92 @@ source packages</h2></div></div></div>
 <td>MAJORDOMO_HOMEDIR</td>
 </tr>
 <tr>
+<td>MAJOR_OS_VERSION</td>
 <td>MAKEINFO_ARGS</td>
-<td>MAKE_DIRS</td>
 </tr>
 <tr>
+<td>MAKE_DIRS</td>
 <td>MAKE_DIRS_PERMS</td>
-<td>MAKE_ENV</td>
 </tr>
 <tr>
+<td>MAKE_ENV</td>
 <td>MAKE_FILE</td>
-<td>MAKE_FLAGS</td>
 </tr>
 <tr>
+<td>MAKE_FLAGS</td>
 <td>MAKE_JOBS</td>
-<td>MAKE_JOBS_SAFE</td>
 </tr>
 <tr>
+<td>MAKE_JOBS_SAFE</td>
 <td>MAKE_PROGRAM</td>
-<td>MANCOMPRESSED_IF_MANZ</td>
 </tr>
 <tr>
+<td>MANCOMPRESSED_IF_MANZ</td>
 <td>MANINSTALL</td>
-<td>MANZ</td>
 </tr>
 <tr>
+<td>MANZ</td>
 <td>MASTER_SITES</td>
-<td>MASTER_SITE_BACKUP</td>
 </tr>
 <tr>
+<td>MASTER_SITE_BACKUP</td>
 <td>MASTER_SITE_LOCAL</td>
-<td>MASTER_SITE_MOZILLA</td>
 </tr>
 <tr>
+<td>MASTER_SITE_MOZILLA</td>
 <td>MASTER_SITE_OVERRIDE</td>
-<td>MASTER_SITE_PERL_CPAN</td>
 </tr>
 <tr>
+<td>MASTER_SITE_PERL_CPAN</td>
 <td>MASTER_SORT</td>
-<td>MASTER_SORT_RANDOM</td>
 </tr>
 <tr>
+<td>MASTER_SORT_RANDOM</td>
 <td>MASTER_SORT_REGEX</td>
-<td>MECAB_CHARSET</td>
 </tr>
 <tr>
+<td>MECAB_CHARSET</td>
 <td>MEDIATOMB_GROUP</td>
-<td>MEDIATOMB_USER</td>
 </tr>
 <tr>
+<td>MEDIATOMB_USER</td>
 <td>MIPSPROBASE</td>
-<td>MIREDO_GROUP</td>
 </tr>
 <tr>
+<td>MIREDO_GROUP</td>
 <td>MIREDO_USER</td>
-<td>MISSING_FEATURES</td>
 </tr>
 <tr>
+<td>MISSING_FEATURES</td>
 <td>MKDIR</td>
-<td>MKPIE_SUPPORTED</td>
 </tr>
 <tr>
+<td>MKPIE_SUPPORTED</td>
 <td>MLDONKEY_GROUP</td>
-<td>MLDONKEY_HOME</td>
 </tr>
 <tr>
+<td>MLDONKEY_HOME</td>
 <td>MLDONKEY_USER</td>
-<td>MONOTONE_GROUP</td>
 </tr>
 <tr>
+<td>MONOTONE_GROUP</td>
 <td>MONOTONE_USER</td>
-<td>MOTIFBASE</td>
 </tr>
 <tr>
+<td>MOTIFBASE</td>
 <td>MOTIF_TYPE</td>
-<td>MOTIF_TYPE_DEFAULT</td>
 </tr>
 <tr>
+<td>MOTIF_TYPE_DEFAULT</td>
 <td>MPI_TYPE</td>
-<td>MSGFMT_STRIP_MSGCTXT</td>
 </tr>
 <tr>
+<td>MSGFMT_STRIP_MSGCTXT</td>
 <td>MSGFMT_STRIP_MSGID_PLURAL</td>
+</tr>
+<tr>
 <td>MTOOLS_ENABLE_FLOPPYD</td>
+<td>MUST</td>
 </tr>
 <tr>
 <td>MV</td>
@@ -13047,6 +13132,10 @@ source packages</h2></div></div></div>
 <td>OSX_TOLERATE_SDK_SKEW</td>
 </tr>
 <tr>
+<td>OS_HAVE_ALSA</td>
+<td>OS_HAVE_RCD</td>
+</tr>
+<tr>
 <td>OS_VARIANT</td>
 <td>OS_VERSION</td>
 </tr>
@@ -13059,459 +13148,475 @@ source packages</h2></div></div></div>
 <td>OVERRIDE_GNU_CONFIG_SCRIPTS</td>
 </tr>
 <tr>
+<td>OVERRIDE_ROCKSPEC</td>
 <td>OWN_DIRS</td>
-<td>OWN_DIRS_PERMS</td>
 </tr>
 <tr>
+<td>OWN_DIRS_PERMS</td>
 <td>P4GROUP</td>
-<td>P4PORT</td>
 </tr>
 <tr>
+<td>P4PORT</td>
 <td>P4ROOT</td>
-<td>P4USER</td>
 </tr>
 <tr>
+<td>P4USER</td>
 <td>PACKAGES</td>
-<td>PALMOS_DEFAULT_SDK</td>
 </tr>
 <tr>
+<td>PALMOS_DEFAULT_SDK</td>
 <td>PAMBASE</td>
-<td>PAM_DEFAULT</td>
 </tr>
 <tr>
+<td>PAM_DEFAULT</td>
 <td>PAPERSIZE</td>
-<td>PASSIVE_FETCH</td>
 </tr>
 <tr>
+<td>PASSIVE_FETCH</td>
 <td>PATCHDIR</td>
-<td>PATCHFILES</td>
 </tr>
 <tr>
+<td>PATCHFILES</td>
 <td>PATCH_ARGS</td>
-<td>PATCH_DEBUG</td>
 </tr>
 <tr>
+<td>PATCH_DEBUG</td>
 <td>PATCH_DIST_ARGS</td>
-<td>PATCH_DIST_CAT</td>
 </tr>
 <tr>
+<td>PATCH_DIST_CAT</td>
 <td>PATCH_DIST_STRIP</td>
-<td>PATCH_FUZZ_FACTOR</td>
 </tr>
 <tr>
+<td>PATCH_FUZZ_FACTOR</td>
 <td>PATCH_STRIP</td>
-<td>PATH</td>
 </tr>
 <tr>
+<td>PATH</td>
 <td>PCCBASE</td>
-<td>PEAR_CMD</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>
-<td>PEAR_PACKAGE_XML</td>
 </tr>
 <tr>
+<td>PEAR_PACKAGE_XML</td>
 <td>PERL5</td>
-<td>PERL5_CONFIGURE</td>
 </tr>
 <tr>
+<td>PERL5_CONFIGURE</td>
 <td>PERL5_CONFIGURE_DIRS</td>
-<td>PERL5_LDFLAGS</td>
 </tr>
 <tr>
+<td>PERL5_LDFLAGS</td>
 <td>PERL5_LICENSE</td>
-<td>PERL5_MODULE_TYPE</td>
 </tr>
 <tr>
+<td>PERL5_MODULE_TYPE</td>
 <td>PERL5_PACKLIST</td>
-<td>PERL5_PACKLIST_DIR</td>
 </tr>
 <tr>
+<td>PERL5_PACKLIST_DIR</td>
 <td>PERL5_PERLBASE</td>
-<td>PERL5_SITEBASE</td>
 </tr>
 <tr>
+<td>PERL5_SITEBASE</td>
 <td>PERL5_USE_PACKLIST</td>
-<td>PERL5_VENDORBASE</td>
 </tr>
 <tr>
+<td>PERL5_VENDORBASE</td>
 <td>PFCTL</td>
-<td>PFVAR_H</td>
 </tr>
 <tr>
+<td>PFVAR_H</td>
 <td>PF_VERSION</td>
-<td>PGGROUP</td>
 </tr>
 <tr>
+<td>PGGROUP</td>
 <td>PGHOME</td>
-<td>PGPKGSRCDIR</td>
 </tr>
 <tr>
+<td>PGPKGSRCDIR</td>
 <td>PGSQL_TYPE</td>
-<td>PGSQL_VERSION</td>
 </tr>
 <tr>
+<td>PGSQL_VERSION</td>
 <td>PGSQL_VERSIONS_ACCEPTED</td>
-<td>PGSQL_VERSION_DEFAULT</td>
 </tr>
 <tr>
+<td>PGSQL_VERSION_DEFAULT</td>
 <td>PGUSER</td>
-<td>PG_LIB_EXT</td>
 </tr>
 <tr>
+<td>PG_LIB_EXT</td>
 <td>PHP</td>
-<td>PHPCOMMON_MK</td>
 </tr>
 <tr>
+<td>PHPCOMMON_MK</td>
 <td>PHPPKGSRCDIR</td>
-<td>PHP_BASE_VERS</td>
 </tr>
 <tr>
+<td>PHP_BASE_VERS</td>
 <td>PHP_CHECK_INSTALLED</td>
-<td>PHP_EXTENSION_DIR</td>
 </tr>
 <tr>
+<td>PHP_EXTENSION_DIR</td>
 <td>PHP_INITIAL_TEENY</td>
-<td>PHP_PKG_PREFIX</td>
 </tr>
 <tr>
+<td>PHP_PKG_PREFIX</td>
 <td>PHP_VERSION</td>
-<td>PHP_VERSIONS_ACCEPTED</td>
 </tr>
 <tr>
+<td>PHP_VERSIONS_ACCEPTED</td>
 <td>PHP_VERSIONS_INCOMPATIBLE</td>
-<td>PHP_VERSION_DEFAULT</td>
 </tr>
 <tr>
+<td>PHP_VERSION_DEFAULT</td>
 <td>PHP_VERSION_REQD</td>
-<td>PILRC_USE_GTK</td>
 </tr>
 <tr>
+<td>PILRC_USE_GTK</td>
 <td>PKGCONFIG_BASE</td>
-<td>PKGCONFIG_FILE</td>
 </tr>
 <tr>
+<td>PKGCONFIG_FILE</td>
 <td>PKGCONFIG_OVERRIDE</td>
-<td>PKGCONFIG_OVERRIDE_STAGE</td>
 </tr>
 <tr>
+<td>PKGCONFIG_OVERRIDE_STAGE</td>
 <td>PKGDIR</td>
-<td>PKGGNUDIR</td>
 </tr>
 <tr>
+<td>PKGGNUDIR</td>
 <td>PKGINFODIR</td>
-<td>PKGLOCALEDIR</td>
 </tr>
 <tr>
+<td>PKGLOCALEDIR</td>
 <td>PKGMANDIR</td>
-<td>PKGNAME</td>
 </tr>
 <tr>
+<td>PKGNAME</td>
 <td>PKGNAME_REQD</td>
-<td>PKGPATH</td>
 </tr>
 <tr>
+<td>PKGPATH</td>
 <td>PKGREVISION</td>
-<td>PKGSRC_BLAS_TYPES</td>
 </tr>
 <tr>
+<td>PKGSRC_BLAS_TYPES</td>
 <td>PKGSRC_CHANGES</td>
-<td>PKGSRC_COMPILER</td>
 </tr>
 <tr>
+<td>PKGSRC_COMPILER</td>
 <td>PKGSRC_KEEP_BIN_PKGS</td>
-<td>PKGSRC_LOCKTYPE</td>
 </tr>
 <tr>
+<td>PKGSRC_LOCKTYPE</td>
 <td>PKGSRC_MAKE_ENV</td>
-<td>PKGSRC_MESSAGE_RECIPIENTS</td>
 </tr>
 <tr>
+<td>PKGSRC_MESSAGE_RECIPIENTS</td>
 <td>PKGSRC_MKPIE</td>
-<td>PKGSRC_MKREPRO</td>
 </tr>
 <tr>
+<td>PKGSRC_MKREPRO</td>
 <td>PKGSRC_OVERRIDE_MKPIE</td>
-<td>PKGSRC_RUN_TEST</td>
 </tr>
 <tr>
+<td>PKGSRC_RUN_TEST</td>
 <td>PKGSRC_SETENV</td>
-<td>PKGSRC_SLEEPSECS</td>
 </tr>
 <tr>
+<td>PKGSRC_SLEEPSECS</td>
 <td>PKGSRC_TODO</td>
-<td>PKGSRC_USE_CTF</td>
 </tr>
 <tr>
+<td>PKGSRC_USE_CTF</td>
 <td>PKGSRC_USE_FORTIFY</td>
-<td>PKGSRC_USE_MKTOOLS</td>
 </tr>
 <tr>
+<td>PKGSRC_USE_MKTOOLS</td>
 <td>PKGSRC_USE_RELRO</td>
-<td>PKGSRC_USE_SSP</td>
 </tr>
 <tr>
+<td>PKGSRC_USE_SSP</td>
 <td>PKGSRC_USE_STACK_CHECK</td>
-<td>PKGTASKS_DATAFILE</td>
 </tr>
 <tr>
+<td>PKGTASKS_DATAFILE</td>
 <td>PKGTOOLS_ARGS</td>
-<td>PKGTOOLS_ENV</td>
 </tr>
 <tr>
+<td>PKGTOOLS_ENV</td>
 <td>PKG_ALTERNATIVES</td>
-<td>PKG_APACHE</td>
 </tr>
 <tr>
+<td>PKG_APACHE</td>
 <td>PKG_APACHE_ACCEPTED</td>
-<td>PKG_APACHE_DEFAULT</td>
 </tr>
 <tr>
+<td>PKG_APACHE_DEFAULT</td>
 <td>PKG_BEST_EXISTS</td>
-<td>PKG_BUILD_OPTIONS</td>
 </tr>
 <tr>
+<td>PKG_BUILD_OPTIONS</td>
 <td>PKG_COMPRESSION</td>
-<td>PKG_CONFIG</td>
 </tr>
 <tr>
+<td>PKG_CONFIG</td>
 <td>PKG_CONFIG_PERMS</td>
-<td>PKG_CREATE_USERGROUP</td>
 </tr>
 <tr>
+<td>PKG_CREATE_USERGROUP</td>
 <td>PKG_DB_TMPDIR</td>
-<td>PKG_DEBUG_LEVEL</td>
 </tr>
 <tr>
+<td>PKG_DEBUG_LEVEL</td>
 <td>PKG_DEFAULT_OPTIONS</td>
-<td>PKG_DESTDIR_SUPPORT</td>
 </tr>
 <tr>
+<td>PKG_DESTDIR_SUPPORT</td>
 <td>PKG_DEVELOPER</td>
-<td>PKG_DISABLED_OPTIONS</td>
 </tr>
 <tr>
+<td>PKG_DISABLED_OPTIONS</td>
 <td>PKG_FATAL_ERRORS</td>
-<td>PKG_FC</td>
 </tr>
 <tr>
+<td>PKG_FC</td>
 <td>PKG_FILELIST_CMD</td>
-<td>PKG_GECOS</td>
 </tr>
 <tr>
+<td>PKG_GECOS</td>
 <td>PKG_GID</td>
-<td>PKG_GROUPS</td>
 </tr>
 <tr>
+<td>PKG_GROUPS</td>
 <td>PKG_GROUPS_VARS</td>
-<td>PKG_HOME</td>
 </tr>
 <tr>
+<td>PKG_HOME</td>
 <td>PKG_INIT_SCRIPTS</td>
-<td>PKG_JAVA_HOME</td>
 </tr>
 <tr>
+<td>PKG_JAVA_HOME</td>
 <td>PKG_JVM</td>
-<td>PKG_JVMS_ACCEPTED</td>
 </tr>
 <tr>
+<td>PKG_JVMS_ACCEPTED</td>
 <td>PKG_JVM_DEFAULT</td>
-<td>PKG_LEGACY_OPTIONS</td>
 </tr>
 <tr>
+<td>PKG_LEGACY_OPTIONS</td>
 <td>PKG_LIBTOOL</td>
-<td>PKG_MKSYMLINKS</td>
 </tr>
 <tr>
+<td>PKG_MKSYMLINKS</td>
 <td>PKG_OPTIONS</td>
-<td>PKG_OPTIONS_DEPRECATED_WARNINGS</td>
 </tr>
 <tr>
+<td>PKG_OPTIONS_DEPRECATED_WARNINGS</td>
 <td>PKG_OPTIONS_LEGACY_OPTS</td>
-<td>PKG_OPTIONS_LEGACY_VARS</td>
 </tr>
 <tr>
+<td>PKG_OPTIONS_LEGACY_VARS</td>
 <td>PKG_OPTIONS_NONEMPTY_SETS</td>
-<td>PKG_OPTIONS_OPTIONAL_GROUPS</td>
 </tr>
 <tr>
+<td>PKG_OPTIONS_OPTIONAL_GROUPS</td>
 <td>PKG_OPTIONS_REQUIRED_GROUPS</td>
-<td>PKG_OPTIONS_VAR</td>
 </tr>
 <tr>
+<td>PKG_OPTIONS_VAR</td>
 <td>PKG_PHP</td>
-<td>PKG_PHP_MAJOR_VERS</td>
 </tr>
 <tr>
+<td>PKG_PHP_MAJOR_VERS</td>
 <td>PKG_PHP_VERSION</td>
-<td>PKG_RCD_SCRIPTS</td>
 </tr>
 <tr>
+<td>PKG_RCD_SCRIPTS</td>
 <td>PKG_REFCOUNT_DBDIR</td>
-<td>PKG_REGISTER_SHELLS</td>
 </tr>
 <tr>
+<td>PKG_REGISTER_SHELLS</td>
 <td>PKG_RESUME_TRANSFERS</td>
-<td>PKG_SHELL</td>
 </tr>
 <tr>
+<td>PKG_SHELL</td>
 <td>PKG_SUGGESTED_OPTIONS</td>
-<td>PKG_SUPPORTED_OPTIONS</td>
 </tr>
 <tr>
+<td>PKG_SUPPORTED_OPTIONS</td>
 <td>PKG_SYSCONFBASE</td>
-<td>PKG_SYSCONFBASEDIR</td>
 </tr>
 <tr>
+<td>PKG_SYSCONFBASEDIR</td>
 <td>PKG_SYSCONFDIR</td>
-<td>PKG_SYSCONFDIR_PERMS</td>
 </tr>
 <tr>
+<td>PKG_SYSCONFDIR_PERMS</td>
 <td>PKG_SYSCONFSUBDIR</td>
-<td>PKG_SYSCONFVAR</td>
 </tr>
 <tr>
+<td>PKG_SYSCONFVAR</td>
 <td>PKG_TOOLS_BIN</td>
-<td>PKG_UID</td>
 </tr>
 <tr>
+<td>PKG_UID</td>
 <td>PKG_UPDATE_FONTS_DB</td>
-<td>PKG_USERS</td>
 </tr>
 <tr>
+<td>PKG_USERS</td>
 <td>PKG_USERS_VARS</td>
-<td>PKG_VERBOSE</td>
 </tr>
 <tr>
+<td>PKG_VERBOSE</td>
 <td>PLEASE</td>
-<td>PLIST</td>
 </tr>
 <tr>
+<td>PLIST</td>
 <td>PLIST_AWK</td>
-<td>PLIST_AWK_ENV</td>
 </tr>
 <tr>
+<td>PLIST_AWK_ENV</td>
 <td>PLIST_SRC</td>
-<td>PLIST_SUBST</td>
 </tr>
 <tr>
+<td>PLIST_SUBST</td>
 <td>PLIST_TYPE</td>
-<td>PLIST_VARS</td>
 </tr>
 <tr>
+<td>PLIST_VARS</td>
 <td>POPTOP_USE_MPPE</td>
-<td>POSSIBLE_GFORTRAN_VERSION</td>
 </tr>
 <tr>
+<td>POSSIBLE_GFORTRAN_VERSION</td>
 <td>POST_FETCH_HOOK</td>
-<td>PREFER</td>
 </tr>
 <tr>
+<td>PREFER</td>
 <td>PREFER_NATIVE</td>
-<td>PREFER_NATIVE_PTHREADS</td>
 </tr>
 <tr>
+<td>PREFER_NATIVE_PTHREADS</td>
 <td>PREFER_PKGSRC</td>
-<td>PREFIX</td>
 </tr>
 <tr>
+<td>PREFIX</td>
 <td>PREPEND_PATH</td>
-<td>PRE_ROOT_CMD</td>
 </tr>
 <tr>
+<td>PRE_ROOT_CMD</td>
 <td>PRIVILEGED_STAGES</td>
-<td>PS</td>
 </tr>
 <tr>
+<td>PS</td>
 <td>PTHREAD_AUTO_VARS</td>
-<td>PTHREAD_CFLAGS</td>
 </tr>
 <tr>
+<td>PTHREAD_CFLAGS</td>
 <td>PTHREAD_LDFLAGS</td>
-<td>PTHREAD_LIBS</td>
 </tr>
 <tr>
+<td>PTHREAD_LIBS</td>
 <td>PTHREAD_OPTS</td>
-<td>PTHREAD_TYPE</td>
 </tr>
 <tr>
+<td>PTHREAD_TYPE</td>
 <td>PVM_SSH</td>
-<td>PYPKGPREFIX</td>
 </tr>
 <tr>
+<td>PYPKGPREFIX</td>
 <td>PYTHON_FOR_BUILD_ONLY</td>
-<td>PYTHON_SELF_CONFLICT</td>
 </tr>
 <tr>
+<td>PYTHON_SELF_CONFLICT</td>
 <td>PYTHON_VERSIONED_DEPENDENCIES</td>
-<td>PYTHON_VERSIONS_ACCEPTED</td>
 </tr>
 <tr>
+<td>PYTHON_VERSIONS_ACCEPTED</td>
 <td>PYTHON_VERSIONS_INCOMPATIBLE</td>
-<td>PYTHON_VERSION_DEFAULT</td>
 </tr>
 <tr>
+<td>PYTHON_VERSION_DEFAULT</td>
 <td>PYTHON_VERSION_REQD</td>
-<td>PYVERSSUFFIX</td>
 </tr>
 <tr>
+<td>PYVERSSUFFIX</td>
 <td>QMAILDIR</td>
-<td>QMAIL_ALIAS_USER</td>
 </tr>
 <tr>
+<td>QMAIL_ALIAS_USER</td>
 <td>QMAIL_DAEMON_USER</td>
-<td>QMAIL_LOG_USER</td>
 </tr>
 <tr>
+<td>QMAIL_LOG_USER</td>
 <td>QMAIL_NOFILES_GROUP</td>
-<td>QMAIL_PASSWD_USER</td>
 </tr>
 <tr>
+<td>QMAIL_PASSWD_USER</td>
 <td>QMAIL_QMAIL_GROUP</td>
-<td>QMAIL_QUEUE_DIR</td>
 </tr>
 <tr>
+<td>QMAIL_QUEUE_DIR</td>
 <td>QMAIL_QUEUE_EXTRA</td>
-<td>QMAIL_QUEUE_USER</td>
 </tr>
 <tr>
+<td>QMAIL_QUEUE_USER</td>
 <td>QMAIL_REMOTE_USER</td>
-<td>QMAIL_ROOT_USER</td>
 </tr>
 <tr>
+<td>QMAIL_ROOT_USER</td>
 <td>QMAIL_SEND_USER</td>
-<td>QORE_LATEST_MODULE_API</td>
 </tr>
 <tr>
+<td>QORE_LATEST_MODULE_API</td>
 <td>QORE_MODULE_API</td>
-<td>QORE_MODULE_DIR</td>
 </tr>
 <tr>
+<td>QORE_MODULE_DIR</td>
 <td>QORE_USER_MODULE_DIR</td>
-<td>QORE_VERSION</td>
 </tr>
 <tr>
+<td>QORE_VERSION</td>
 <td>QPOPPER_FAC</td>
-<td>QPOPPER_SPOOL_DIR</td>
 </tr>
 <tr>
+<td>QPOPPER_SPOOL_DIR</td>
 <td>QPOPPER_USER</td>
-<td>RAKE_NAME</td>
 </tr>
 <tr>
+<td>RAKE_NAME</td>
 <td>RASMOL_DEPTH</td>
-<td>RCD_SCRIPTS</td>
 </tr>
 <tr>
+<td>RCD_DIR</td>
+<td>RCD_ORDER</td>
+</tr>
+<tr>
+<td>RCD_SCRIPTS</td>
 <td>RCD_SCRIPTS_DIR</td>
-<td>RCD_SCRIPTS_EXAMPLEDIR</td>
 </tr>
 <tr>
+<td>RCD_SCRIPTS_EXAMPLEDIR</td>
 <td>RCD_SCRIPTS_MODE</td>
-<td>RCD_SCRIPTS_SHELL</td>
 </tr>
 <tr>
+<td>RCD_SCRIPTS_SHELL</td>
 <td>RCD_SCRIPT_SRC</td>
+</tr>
+<tr>
+<td>RCD_SUBR</td>
 <td>RDOC</td>
 </tr>
 <tr>
@@ -13584,6 +13689,10 @@ source packages</h2></div></div></div>
 </tr>
 <tr>
 <td>RM</td>
+<td>ROCKSPEC_NAME</td>
+</tr>
+<tr>
+<td>ROCKSPEC_SPECFILE</td>
 <td>ROOT_CMD</td>
 </tr>
 <tr>
@@ -13788,175 +13897,187 @@ source packages</h2></div></div></div>
 </tr>
 <tr>
 <td>SHLIB</td>
-<td>SIGN_PACKAGES</td>
+<td>SHORTNAME</td>
 </tr>
 <tr>
+<td>SIGN_PACKAGES</td>
 <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>SYSCONFBASE</td>
 </tr>
 <tr>
+<td>SVN_EXTRACTDIR</td>
+<td>SVN_REPO</td>
+</tr>
+<tr>
+<td>SVN_REPOSITORIES</td>
+<td>SVN_REVISION</td>
+</tr>
+<tr>
+<td>SYSCONFBASE</td>
 <td>TARGET_ARCH</td>
-<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>
+</tr>
+<tr>
 <td>TOOL_DEPENDS</td>
+<td>TTF_FONTDIR</td>
 </tr>
 <tr>
 <td>TTF_FONTS_DIR</td>
@@ -14111,148 +14232,152 @@ source packages</h2></div></div></div>
 <td>XXX</td>
 </tr>
 <tr>
+<td>XXXX</td>
 <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>
+</tr>
+<tr>
 <td>ctf</td>
+<td>cvs</td>
 </tr>
 <tr>
 <td>debug</td>
@@ -14316,42 +14441,46 @@ source packages</h2></div></div></div>
 </tr>
 <tr>
 <td>endian</td>
-<td>enomem</td>
+<td>endif</td>
 </tr>
 <tr>
+<td>enomem</td>
 <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>
+</tr>
+<tr>
+<td>fossil</td>
 <td>friend</td>
 </tr>
 <tr>
@@ -14384,30 +14513,34 @@ source packages</h2></div></div></div>
 </tr>
 <tr>
 <td>gettext</td>
-<td>github</td>
+<td>git</td>
 </tr>
 <tr>
+<td>github</td>
 <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>
+</tr>
+<tr>
+<td>hg</td>
 <td>imake</td>
 </tr>
 <tr>
@@ -14479,232 +14612,236 @@ source packages</h2></div></div></div>
 <td>memory</td>
 </tr>
 <tr>
+<td>mercurial</td>
 <td>meta</td>
-<td>meta-package</td>
 </tr>
 <tr>
+<td>meta-package</td>
 <td>meta_package</td>
-<td>mit-krb5</td>
 </tr>
 <tr>
+<td>mit-krb5</td>
 <td>mk.conf</td>
-<td>mkl</td>
 </tr>
 <tr>
+<td>mkl</td>
 <td>mount</td>
-<td>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</td>
-<td>pre-configure-checks-hook</td>
 </tr>
 <tr>
+<td>pre-configure-checks-hook</td>
 <td>pre-extract</td>
-<td>pre-fetch</td>
 </tr>
 <tr>
+<td>pre-fetch</td>
 <td>print-go-deps</td>
-<td>print-plist</td>
 </tr>
 <tr>
+<td>print-plist</td>
 <td>print-summary-data</td>
-<td>privileged-install-hook</td>
 </tr>
 <tr>
+<td>privileged-install-hook</td>
 <td>pypi</td>
-<td>python</td>
 </tr>
 <tr>
+<td>python</td>
 <td>r</td>
-<td>readme-all</td>
 </tr>
 <tr>
+<td>readme-all</td>
 <td>recursive</td>
-<td>recv</td>
 </tr>
 <tr>
+<td>recv</td>
 <td>recvfrom</td>
-<td>regcomp</td>
 </tr>
 <tr>
+<td>regcomp</td>
 <td>release-localbase-lock</td>
-<td>release-lock</td>
 </tr>
 <tr>
+<td>release-lock</td>
 <td>relro</td>
-<td>remove</td>
 </tr>
 <tr>
+<td>remove</td>
 <td>removed</td>
-<td>rename</td>
 </tr>
 <tr>
+<td>rename</td>
 <td>renamed</td>
-<td>reorder</td>
 </tr>
 <tr>
+<td>reorder</td>
 <td>replace</td>
-<td>replace_interpreter</td>
 </tr>
 <tr>
+<td>replace_interpreter</td>
 <td>reproducible</td>
-<td>resolv</td>
 </tr>
 <tr>
+<td>resolv</td>
 <td>root</td>
-<td>ruby</td>
 </tr>
 <tr>
+<td>ruby</td>
 <td>send</td>
-<td>sendfile</td>
 </tr>
 <tr>
+<td>sendfile</td>
 <td>sendto</td>
-<td>setenv</td>
 </tr>
 <tr>
+<td>setenv</td>
 <td>setgid</td>
-<td>setprogname</td>
 </tr>
 <tr>
+<td>setprogname</td>
 <td>setuid</td>
-<td>sh</td>
 </tr>
 <tr>
+<td>sh</td>
 <td>shebang</td>
-<td>show</td>
 </tr>
 <tr>
+<td>show</td>
 <td>show-all</td>
-<td>show-build-defs</td>
 </tr>
 <tr>
+<td>show-build-defs</td>
 <td>show-depends</td>
-<td>show-depends-dirs</td>
 </tr>
 <tr>
+<td>show-depends-dirs</td>
 <td>show-depends-pkgpaths</td>
-<td>show-depends-recursive</td>
 </tr>
 <tr>
+<td>show-depends-recursive</td>
 <td>show-deps</td>
-<td>show-distfiles</td>
 </tr>
 <tr>
+<td>show-distfiles</td>
 <td>show-downlevel</td>
-<td>show-subdir-var</td>
 </tr>
 <tr>
+<td>show-subdir-var</td>
 <td>show-tools</td>
-<td>show-var</td>
 </tr>
 <tr>
+<td>show-var</td>
 <td>show-vars</td>
-<td>snprintf</td>
 </tr>
 <tr>
+<td>snprintf</td>
 <td>socket</td>
-<td>ssp</td>
 </tr>
 <tr>
+<td>ssp</td>
 <td>st_mode</td>
-<td>stage-install</td>
 </tr>
 <tr>
+<td>stage-install</td>
 <td>strcasestr</td>
-<td>strict</td>
 </tr>
 <tr>
+<td>strict</td>
 <td>strip</td>
-<td>strndup</td>
 </tr>
 <tr>
+<td>strndup</td>
 <td>strnlen</td>
-<td>strsep</td>
 </tr>
 <tr>
+<td>strsep</td>
 <td>subst</td>
+</tr>
+<tr>
 <td>substitutions</td>
+<td>subversion</td>
 </tr>
 <tr>
 <td>sun</td>
@@ -14712,83 +14849,83 @@ source packages</h2></div></div></div>
 </tr>
 <tr>
 <td>sunwspro</td>
-<td>symlink</td>
+<td>svn</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.345 pkgsrc/doc/pkgsrc.txt:1.346
--- pkgsrc/doc/pkgsrc.txt:1.345	Thu Jan  5 01:45:48 2023
+++ pkgsrc/doc/pkgsrc.txt	Fri Jan 20 12:23:27 2023
@@ -3564,11 +3564,13 @@ USE_TOOLS. You can add variables to xmkm
 SCRIPTS_ENV variable.
 
 If the program uses cmake for configuration, the appropriate steps can be
-invoked by setting USE_CMAKE to "yes". You can add variables to cmake's
-environment by adding them to the CONFIGURE_ENV variable and arguments to cmake
-by adding them to the CMAKE_ARGS variable. The top directory argument is given
-by the CMAKE_ARG_PATH variable, that defaults to "." (relative to
-CONFIGURE_DIRS)
+invoked by including ../../devel/cmake/build.mk. You can add variables to
+cmake's environment by adding them to the CONFIGURE_ENV variable and arguments
+to cmake by adding them to the CMAKE_ARGS variable. If you want to add
+arguments only for particular stages, you can use the CMAKE_CONFIGURE_ARGS,
+CMAKE_BUILD_ARGS, and CMAKE_INSTALL_ARGS variables. You can set the
+CONFIGURE_DIRS variable to the directories in which CMake should be run,
+relative to WRKSRC. This defaults to to ".".
 
 If there is no configure step at all, set NO_CONFIGURE to "yes".
 
@@ -9317,34 +9319,35 @@ ABI                                  ACC
 ACROREAD_FONTPATH                    ADDITIONAL
 AFAIK                                AIX
 ALLOW_VULNERABLE_PACKAGES            ALL_ENV
-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
+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
 BUILDLINK_FILES_CMD                  BUILDLINK_FNAME_TRANSFORM
 BUILDLINK_LDFLAGS                    BUILDLINK_LIBS
 BUILDLINK_OPSYS_SUPPORT_PTHREAD      BUILDLINK_PKGNAME
@@ -9368,29 +9371,32 @@ CCACHE_DIR                           CCA
 CC_VERSION                           CC_VERSION_STRING
 CDRECORD_CONF                        CDROM_PKG_URL_DIR
 CDROM_PKG_URL_HOST                   CHANGES
-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
+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
 COMPILER_USE_SYMLINKS                CONFIGURE_ARGS
 CONFIGURE_DIRS                       CONFIGURE_ENV
 CONFIGURE_ENV_SHELL                  CONFIGURE_HAS_INFODIR
@@ -9412,63 +9418,70 @@ CTF_FILES_SKIP                       CTF
 CTYPE                                CUPS_GROUP
 CUPS_SYSTEM_GROUPS                   CUPS_USER
 CURSES_DEFAULT                       CURSES_TYPE
-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
+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
 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
@@ -9490,63 +9503,71 @@ GITHUB_RELEASE                       GIT
 GITHUB_TAG                           GITHUB_TYPE
 GITLAB_PROJECT                       GITLAB_RELEASE
 GITLAB_SUBMODULES                    GITLAB_TAG
-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
+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
 HASKELL_ENABLE_HADDOCK_DOCUMENTATION HASKELL_ENABLE_LIBRARY_PROFILING
 HASKELL_ENABLE_SHARED_LIBRARY        HASKELL_OPTIMIZATION_LEVEL
 HASKELL_PKG_NAME                     HASKELL_UNRESTRICT_DEPENDENCIES
 HAS_CONFIGURE                        HEADER_TEMPLATES
-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
-INSTALLATION_DIRS_FROM_PLIST         INSTALL_ENV
-INSTALL_SH_OVERRIDE                  INSTALL_SRC
-INSTALL_TEMPLATES                    INSTALL_UNSTRIPPED
-IRCD_HYBRID_IRC_GROUP                IRCD_HYBRID_IRC_USER
-IRCD_HYBRID_MAXCONN                  IRCD_HYBRID_NICLEN
-IRCD_HYBRID_SYSLOG_EVENTS            IRCD_HYBRID_SYSLOG_FACILITY
-IRCD_HYBRID_TOPICLEN                 IRIX
-IRRD_USE_PGP                         JABBERD_GROUP
-JABBERD_LOGDIR                       JABBERD_PIDDIR
-JABBERD_SPOOLDIR                     JABBERD_USER
-JAVA_BINPREFIX                       JAVA_CLASSPATH
-JAVA_HOME                            JAVA_LD_LIBRARY_PATH
-JAVA_NAME                            JAVA_UNLIMIT
-JAVA_WRAPPERS                        JPEG_ACCEPTED
-JPEG_DEFAULT                         KERBEROS
-KERMIT_SUID_UUCP                     KJS_USE_PCRE
-KNEWS_DOMAIN_FILE                    KNEWS_DOMAIN_NAME
-KRB5_ACCEPTED                        KRB5_DEFAULT
-LANGUAGES                            LAPACKE_LIBS
-LAPACKE_PC                           LAPACK_LIBS
-LAPACK_PC                            LATEX2HTML_ICONPATH
-LDCONFIG_ADD_CMD                     LDCONFIG_REMOVE_CMD
-LDD                                  LEAFNODE_DATA_DIR
-LEAFNODE_GROUP                       LEAFNODE_USER
-LIBDVDCSS_HOMEPAGE                   LIBDVDCSS_MASTER_SITES
-LIBRSVG_TYPE                         LIBTOOL
-LIBTOOLIZE_PLIST                     LIBTOOL_M4_OVERRIDE
-LIBUSB_TYPE                          LICENSE
-LINKER_RPATH_FLAG                    LINK_RPATH_FLAG
+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
+INFO_FILES_VERBOSE                   INFO_MSG
+INIT_SYSTEM                          INN_DATA_DIR
+INN_GROUP                            INN_USER
+INSTALLATION_DIRS                    INSTALLATION_DIRS_FROM_PLIST
+INSTALL_ENV                          INSTALL_SH_OVERRIDE
+INSTALL_SRC                          INSTALL_TEMPLATES
+INSTALL_UNSTRIPPED                   IRCD_HYBRID_IRC_GROUP
+IRCD_HYBRID_IRC_USER                 IRCD_HYBRID_MAXCONN
+IRCD_HYBRID_NICLEN                   IRCD_HYBRID_SYSLOG_EVENTS
+IRCD_HYBRID_SYSLOG_FACILITY          IRCD_HYBRID_TOPICLEN
+IRIX                                 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                         JAVA_WRAPPERS
+JPEG_ACCEPTED                        JPEG_DEFAULT
+KERBEROS                             KERMIT_SUID_UUCP
+KJS_USE_PCRE                         KNEWS_DOMAIN_FILE
+KNEWS_DOMAIN_NAME                    KRB5_ACCEPTED
+KRB5_DEFAULT                         LANGUAGES
+LAPACKE_LIBS                         LAPACKE_PC
+LAPACK_LIBS                          LAPACK_PC
+LATEX2HTML_ICONPATH                  LDCONFIG_ADD_CMD
+LDCONFIG_REMOVE_CMD                  LDD
+LEAFNODE_DATA_DIR                    LEAFNODE_GROUP
+LEAFNODE_USER                        LIBDVDCSS_HOMEPAGE
+LIBDVDCSS_MASTER_SITES               LIBRSVG_TYPE
+LIBTOOL                              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
@@ -9563,27 +9584,28 @@ 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
-MAKE_JOBS                            MAKE_JOBS_SAFE
-MAKE_PROGRAM                         MANCOMPRESSED_IF_MANZ
-MANINSTALL                           MANZ
-MASTER_SITES                         MASTER_SITE_BACKUP
-MASTER_SITE_LOCAL                    MASTER_SITE_MOZILLA
-MASTER_SITE_OVERRIDE                 MASTER_SITE_PERL_CPAN
-MASTER_SORT                          MASTER_SORT_RANDOM
-MASTER_SORT_REGEX                    MECAB_CHARSET
-MEDIATOMB_GROUP                      MEDIATOMB_USER
-MIPSPROBASE                          MIREDO_GROUP
-MIREDO_USER                          MISSING_FEATURES
-MKDIR                                MKPIE_SUPPORTED
-MLDONKEY_GROUP                       MLDONKEY_HOME
-MLDONKEY_USER                        MONOTONE_GROUP
-MONOTONE_USER                        MOTIFBASE
-MOTIF_TYPE                           MOTIF_TYPE_DEFAULT
-MPI_TYPE                             MSGFMT_STRIP_MSGCTXT
-MSGFMT_STRIP_MSGID_PLURAL            MTOOLS_ENABLE_FLOPPYD
+MAJOR_OS_VERSION                     MAKEINFO_ARGS
+MAKE_DIRS                            MAKE_DIRS_PERMS
+MAKE_ENV                             MAKE_FILE
+MAKE_FLAGS                           MAKE_JOBS
+MAKE_JOBS_SAFE                       MAKE_PROGRAM
+MANCOMPRESSED_IF_MANZ                MANINSTALL
+MANZ                                 MASTER_SITES
+MASTER_SITE_BACKUP                   MASTER_SITE_LOCAL
+MASTER_SITE_MOZILLA                  MASTER_SITE_OVERRIDE
+MASTER_SITE_PERL_CPAN                MASTER_SORT
+MASTER_SORT_RANDOM                   MASTER_SORT_REGEX
+MECAB_CHARSET                        MEDIATOMB_GROUP
+MEDIATOMB_USER                       MIPSPROBASE
+MIREDO_GROUP                         MIREDO_USER
+MISSING_FEATURES                     MKDIR
+MKPIE_SUPPORTED                      MLDONKEY_GROUP
+MLDONKEY_HOME                        MLDONKEY_USER
+MONOTONE_GROUP                       MONOTONE_USER
+MOTIFBASE                            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
@@ -9618,123 +9640,128 @@ OPENSSH_USER                         OPS
 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
-OWN_DIRS                             OWN_DIRS_PERMS
-P4GROUP                              P4PORT
-P4ROOT                               P4USER
-PACKAGES                             PALMOS_DEFAULT_SDK
-PAMBASE                              PAM_DEFAULT
-PAPERSIZE                            PASSIVE_FETCH
-PATCHDIR                             PATCHFILES
-PATCH_ARGS                           PATCH_DEBUG
-PATCH_DIST_ARGS                      PATCH_DIST_CAT
-PATCH_DIST_STRIP                     PATCH_FUZZ_FACTOR
-PATCH_STRIP                          PATH
-PCCBASE                              PEAR_CMD
-PEAR_LIB                             PEAR_PACKAGE_XML
-PERL5                                PERL5_CONFIGURE
-PERL5_CONFIGURE_DIRS                 PERL5_LDFLAGS
-PERL5_LICENSE                        PERL5_MODULE_TYPE
-PERL5_PACKLIST                       PERL5_PACKLIST_DIR
-PERL5_PERLBASE                       PERL5_SITEBASE
-PERL5_USE_PACKLIST                   PERL5_VENDORBASE
-PFCTL                                PFVAR_H
-PF_VERSION                           PGGROUP
-PGHOME                               PGPKGSRCDIR
-PGSQL_TYPE                           PGSQL_VERSION
-PGSQL_VERSIONS_ACCEPTED              PGSQL_VERSION_DEFAULT
-PGUSER                               PG_LIB_EXT
-PHP                                  PHPCOMMON_MK
-PHPPKGSRCDIR                         PHP_BASE_VERS
-PHP_CHECK_INSTALLED                  PHP_EXTENSION_DIR
-PHP_INITIAL_TEENY                    PHP_PKG_PREFIX
-PHP_VERSION                          PHP_VERSIONS_ACCEPTED
-PHP_VERSIONS_INCOMPATIBLE            PHP_VERSION_DEFAULT
-PHP_VERSION_REQD                     PILRC_USE_GTK
-PKGCONFIG_BASE                       PKGCONFIG_FILE
-PKGCONFIG_OVERRIDE                   PKGCONFIG_OVERRIDE_STAGE
-PKGDIR                               PKGGNUDIR
-PKGINFODIR                           PKGLOCALEDIR
-PKGMANDIR                            PKGNAME
-PKGNAME_REQD                         PKGPATH
-PKGREVISION                          PKGSRC_BLAS_TYPES
-PKGSRC_CHANGES                       PKGSRC_COMPILER
-PKGSRC_KEEP_BIN_PKGS                 PKGSRC_LOCKTYPE
-PKGSRC_MAKE_ENV                      PKGSRC_MESSAGE_RECIPIENTS
-PKGSRC_MKPIE                         PKGSRC_MKREPRO
-PKGSRC_OVERRIDE_MKPIE                PKGSRC_RUN_TEST
-PKGSRC_SETENV                        PKGSRC_SLEEPSECS
-PKGSRC_TODO                          PKGSRC_USE_CTF
-PKGSRC_USE_FORTIFY                   PKGSRC_USE_MKTOOLS
-PKGSRC_USE_RELRO                     PKGSRC_USE_SSP
-PKGSRC_USE_STACK_CHECK               PKGTASKS_DATAFILE
-PKGTOOLS_ARGS                        PKGTOOLS_ENV
-PKG_ALTERNATIVES                     PKG_APACHE
-PKG_APACHE_ACCEPTED                  PKG_APACHE_DEFAULT
-PKG_BEST_EXISTS                      PKG_BUILD_OPTIONS
-PKG_COMPRESSION                      PKG_CONFIG
-PKG_CONFIG_PERMS                     PKG_CREATE_USERGROUP
-PKG_DB_TMPDIR                        PKG_DEBUG_LEVEL
-PKG_DEFAULT_OPTIONS                  PKG_DESTDIR_SUPPORT
-PKG_DEVELOPER                        PKG_DISABLED_OPTIONS
-PKG_FATAL_ERRORS                     PKG_FC
-PKG_FILELIST_CMD                     PKG_GECOS
-PKG_GID                              PKG_GROUPS
-PKG_GROUPS_VARS                      PKG_HOME
-PKG_INIT_SCRIPTS                     PKG_JAVA_HOME
-PKG_JVM                              PKG_JVMS_ACCEPTED
-PKG_JVM_DEFAULT                      PKG_LEGACY_OPTIONS
-PKG_LIBTOOL                          PKG_MKSYMLINKS
-PKG_OPTIONS                          PKG_OPTIONS_DEPRECATED_WARNINGS
-PKG_OPTIONS_LEGACY_OPTS              PKG_OPTIONS_LEGACY_VARS
-PKG_OPTIONS_NONEMPTY_SETS            PKG_OPTIONS_OPTIONAL_GROUPS
-PKG_OPTIONS_REQUIRED_GROUPS          PKG_OPTIONS_VAR
-PKG_PHP                              PKG_PHP_MAJOR_VERS
-PKG_PHP_VERSION                      PKG_RCD_SCRIPTS
-PKG_REFCOUNT_DBDIR                   PKG_REGISTER_SHELLS
-PKG_RESUME_TRANSFERS                 PKG_SHELL
-PKG_SUGGESTED_OPTIONS                PKG_SUPPORTED_OPTIONS
-PKG_SYSCONFBASE                      PKG_SYSCONFBASEDIR
-PKG_SYSCONFDIR                       PKG_SYSCONFDIR_PERMS
-PKG_SYSCONFSUBDIR                    PKG_SYSCONFVAR
-PKG_TOOLS_BIN                        PKG_UID
-PKG_UPDATE_FONTS_DB                  PKG_USERS
-PKG_USERS_VARS                       PKG_VERBOSE
-PLEASE                               PLIST
-PLIST_AWK                            PLIST_AWK_ENV
-PLIST_SRC                            PLIST_SUBST
-PLIST_TYPE                           PLIST_VARS
-POPTOP_USE_MPPE                      POSSIBLE_GFORTRAN_VERSION
-POST_FETCH_HOOK                      PREFER
-PREFER_NATIVE                        PREFER_NATIVE_PTHREADS
-PREFER_PKGSRC                        PREFIX
-PREPEND_PATH                         PRE_ROOT_CMD
-PRIVILEGED_STAGES                    PS
-PTHREAD_AUTO_VARS                    PTHREAD_CFLAGS
-PTHREAD_LDFLAGS                      PTHREAD_LIBS
-PTHREAD_OPTS                         PTHREAD_TYPE
-PVM_SSH                              PYPKGPREFIX
-PYTHON_FOR_BUILD_ONLY                PYTHON_SELF_CONFLICT
-PYTHON_VERSIONED_DEPENDENCIES        PYTHON_VERSIONS_ACCEPTED
-PYTHON_VERSIONS_INCOMPATIBLE         PYTHON_VERSION_DEFAULT
-PYTHON_VERSION_REQD                  PYVERSSUFFIX
-QMAILDIR                             QMAIL_ALIAS_USER
-QMAIL_DAEMON_USER                    QMAIL_LOG_USER
-QMAIL_NOFILES_GROUP                  QMAIL_PASSWD_USER
-QMAIL_QMAIL_GROUP                    QMAIL_QUEUE_DIR
-QMAIL_QUEUE_EXTRA                    QMAIL_QUEUE_USER
-QMAIL_REMOTE_USER                    QMAIL_ROOT_USER
-QMAIL_SEND_USER                      QORE_LATEST_MODULE_API
-QORE_MODULE_API                      QORE_MODULE_DIR
-QORE_USER_MODULE_DIR                 QORE_VERSION
-QPOPPER_FAC                          QPOPPER_SPOOL_DIR
-QPOPPER_USER                         RAKE_NAME
-RASMOL_DEPTH                         RCD_SCRIPTS
-RCD_SCRIPTS_DIR                      RCD_SCRIPTS_EXAMPLEDIR
-RCD_SCRIPTS_MODE                     RCD_SCRIPTS_SHELL
-RCD_SCRIPT_SRC                       RDOC
+OVERRIDE_ROCKSPEC                    OWN_DIRS
+OWN_DIRS_PERMS                       P4GROUP
+P4PORT                               P4ROOT
+P4USER                               PACKAGES
+PALMOS_DEFAULT_SDK                   PAMBASE
+PAM_DEFAULT                          PAPERSIZE
+PASSIVE_FETCH                        PATCHDIR
+PATCHFILES                           PATCH_ARGS
+PATCH_DEBUG                          PATCH_DIST_ARGS
+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
+PERL5_LDFLAGS                        PERL5_LICENSE
+PERL5_MODULE_TYPE                    PERL5_PACKLIST
+PERL5_PACKLIST_DIR                   PERL5_PERLBASE
+PERL5_SITEBASE                       PERL5_USE_PACKLIST
+PERL5_VENDORBASE                     PFCTL
+PFVAR_H                              PF_VERSION
+PGGROUP                              PGHOME
+PGPKGSRCDIR                          PGSQL_TYPE
+PGSQL_VERSION                        PGSQL_VERSIONS_ACCEPTED
+PGSQL_VERSION_DEFAULT                PGUSER
+PG_LIB_EXT                           PHP
+PHPCOMMON_MK                         PHPPKGSRCDIR
+PHP_BASE_VERS                        PHP_CHECK_INSTALLED
+PHP_EXTENSION_DIR                    PHP_INITIAL_TEENY
+PHP_PKG_PREFIX                       PHP_VERSION
+PHP_VERSIONS_ACCEPTED                PHP_VERSIONS_INCOMPATIBLE
+PHP_VERSION_DEFAULT                  PHP_VERSION_REQD
+PILRC_USE_GTK                        PKGCONFIG_BASE
+PKGCONFIG_FILE                       PKGCONFIG_OVERRIDE
+PKGCONFIG_OVERRIDE_STAGE             PKGDIR
+PKGGNUDIR                            PKGINFODIR
+PKGLOCALEDIR                         PKGMANDIR
+PKGNAME                              PKGNAME_REQD
+PKGPATH                              PKGREVISION
+PKGSRC_BLAS_TYPES                    PKGSRC_CHANGES
+PKGSRC_COMPILER                      PKGSRC_KEEP_BIN_PKGS
+PKGSRC_LOCKTYPE                      PKGSRC_MAKE_ENV
+PKGSRC_MESSAGE_RECIPIENTS            PKGSRC_MKPIE
+PKGSRC_MKREPRO                       PKGSRC_OVERRIDE_MKPIE
+PKGSRC_RUN_TEST                      PKGSRC_SETENV
+PKGSRC_SLEEPSECS                     PKGSRC_TODO
+PKGSRC_USE_CTF                       PKGSRC_USE_FORTIFY
+PKGSRC_USE_MKTOOLS                   PKGSRC_USE_RELRO
+PKGSRC_USE_SSP                       PKGSRC_USE_STACK_CHECK
+PKGTASKS_DATAFILE                    PKGTOOLS_ARGS
+PKGTOOLS_ENV                         PKG_ALTERNATIVES
+PKG_APACHE                           PKG_APACHE_ACCEPTED
+PKG_APACHE_DEFAULT                   PKG_BEST_EXISTS
+PKG_BUILD_OPTIONS                    PKG_COMPRESSION
+PKG_CONFIG                           PKG_CONFIG_PERMS
+PKG_CREATE_USERGROUP                 PKG_DB_TMPDIR
+PKG_DEBUG_LEVEL                      PKG_DEFAULT_OPTIONS
+PKG_DESTDIR_SUPPORT                  PKG_DEVELOPER
+PKG_DISABLED_OPTIONS                 PKG_FATAL_ERRORS
+PKG_FC                               PKG_FILELIST_CMD
+PKG_GECOS                            PKG_GID
+PKG_GROUPS                           PKG_GROUPS_VARS
+PKG_HOME                             PKG_INIT_SCRIPTS
+PKG_JAVA_HOME                        PKG_JVM
+PKG_JVMS_ACCEPTED                    PKG_JVM_DEFAULT
+PKG_LEGACY_OPTIONS                   PKG_LIBTOOL
+PKG_MKSYMLINKS                       PKG_OPTIONS
+PKG_OPTIONS_DEPRECATED_WARNINGS      PKG_OPTIONS_LEGACY_OPTS
+PKG_OPTIONS_LEGACY_VARS              PKG_OPTIONS_NONEMPTY_SETS
+PKG_OPTIONS_OPTIONAL_GROUPS          PKG_OPTIONS_REQUIRED_GROUPS
+PKG_OPTIONS_VAR                      PKG_PHP
+PKG_PHP_MAJOR_VERS                   PKG_PHP_VERSION
+PKG_RCD_SCRIPTS                      PKG_REFCOUNT_DBDIR
+PKG_REGISTER_SHELLS                  PKG_RESUME_TRANSFERS
+PKG_SHELL                            PKG_SUGGESTED_OPTIONS
+PKG_SUPPORTED_OPTIONS                PKG_SYSCONFBASE
+PKG_SYSCONFBASEDIR                   PKG_SYSCONFDIR
+PKG_SYSCONFDIR_PERMS                 PKG_SYSCONFSUBDIR
+PKG_SYSCONFVAR                       PKG_TOOLS_BIN
+PKG_UID                              PKG_UPDATE_FONTS_DB
+PKG_USERS                            PKG_USERS_VARS
+PKG_VERBOSE                          PLEASE
+PLIST                                PLIST_AWK
+PLIST_AWK_ENV                        PLIST_SRC
+PLIST_SUBST                          PLIST_TYPE
+PLIST_VARS                           POPTOP_USE_MPPE
+POSSIBLE_GFORTRAN_VERSION            POST_FETCH_HOOK
+PREFER                               PREFER_NATIVE
+PREFER_NATIVE_PTHREADS               PREFER_PKGSRC
+PREFIX                               PREPEND_PATH
+PRE_ROOT_CMD                         PRIVILEGED_STAGES
+PS                                   PTHREAD_AUTO_VARS
+PTHREAD_CFLAGS                       PTHREAD_LDFLAGS
+PTHREAD_LIBS                         PTHREAD_OPTS
+PTHREAD_TYPE                         PVM_SSH
+PYPKGPREFIX                          PYTHON_FOR_BUILD_ONLY
+PYTHON_SELF_CONFLICT                 PYTHON_VERSIONED_DEPENDENCIES
+PYTHON_VERSIONS_ACCEPTED             PYTHON_VERSIONS_INCOMPATIBLE
+PYTHON_VERSION_DEFAULT               PYTHON_VERSION_REQD
+PYVERSSUFFIX                         QMAILDIR
+QMAIL_ALIAS_USER                     QMAIL_DAEMON_USER
+QMAIL_LOG_USER                       QMAIL_NOFILES_GROUP
+QMAIL_PASSWD_USER                    QMAIL_QMAIL_GROUP
+QMAIL_QUEUE_DIR                      QMAIL_QUEUE_EXTRA
+QMAIL_QUEUE_USER                     QMAIL_REMOTE_USER
+QMAIL_ROOT_USER                      QMAIL_SEND_USER
+QORE_LATEST_MODULE_API               QORE_MODULE_API
+QORE_MODULE_DIR                      QORE_USER_MODULE_DIR
+QORE_VERSION                         QPOPPER_FAC
+QPOPPER_SPOOL_DIR                    QPOPPER_USER
+RAKE_NAME                            RASMOL_DEPTH
+RCD_DIR                              RCD_ORDER
+RCD_SCRIPTS                          RCD_SCRIPTS_DIR
+RCD_SCRIPTS_EXAMPLEDIR               RCD_SCRIPTS_MODE
+RCD_SCRIPTS_SHELL                    RCD_SCRIPT_SRC
+RCD_SUBR                             RDOC
 READLINE_DEFAULT                     READLINE_TYPE
 REAL_ROOT_GROUP                      REAL_ROOT_USER
 RECURSIVE_MAKE                       RELAY_CTRL_DIR
@@ -9752,7 +9779,8 @@ REQD_DIRS                            REQ
 REQD_FILES                           REQD_FILES_MODE
 REQD_FILES_PERMS                     RESOLV_AUTO_VARS
 RESOLV_LDFLAGS                       RESOLV_LIBS
-RM                                   ROOT_CMD
+RM                                   ROCKSPEC_NAME
+ROCKSPEC_SPECFILE                    ROOT_CMD
 ROOT_GROUP                           ROOT_USER
 RPCGEN                               RPM
 RPM2PKG_PLIST                        RPM2PKG_PREFIX
@@ -9803,49 +9831,52 @@ SCROLLKEEPER_UPDATEDB                SDI
 SDL12_TYPE                           SERIAL_DEVICES
 SETGIDGAME                           SETGID_GAMES_PERMS
 SETUID_ROOT_PERMS                    SH
-SHLIB                                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
+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                        TYPE
 UAC_REQD_EXECS                       UCSPI_SSL_GROUP
 UCSPI_SSL_USER                       UNLIMIT_RESOURCES
@@ -9884,42 +9915,43 @@ X11_TYPE                             X50
 X509_KEY                             XAW_TYPE
 XLOCK_DEFAULT_MODE                   XMKMF
 XMKMF_FLAGS                          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
+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                                declaration
 declare                              defined
 depend                               dependencies
@@ -9935,16 +9967,17 @@ do-fetch                             do-
 emul                                 emul-distinfo
 emul-fetch                           emulation
 emulator                             enable
-endian                               enomem
-ensurepip                            err
-errx                                 etc
-exp                                  extract-rpm
-fabs                                 feature
-features                             fetch
-fetch-list                           follows
-forbids                              form
-format                               fortify
-fortify_source                       friend
+endian                               endif
+enomem                               ensurepip
+err                                  errx
+etc                                  exp
+extract-rpm                          fabs
+feature                              features
+fetch                                fetch-list
+follows                              forbids
+form                                 format
+fortify                              fortify_source
+fossil                               friend
 fts                                  fts_close
 fts_open                             fts_read
 fts_set                              gcc
@@ -9952,13 +9985,14 @@ gethostbyaddr                        get
 gethostbyname2                       getopt_long
 getprogname                          getservbyname
 getservbyport                        getservent
-gettext                              github
-gitlab                               glob
-gnu                                  gnu_configure_strict
-go                                   go-deps
-golang                               guess-license
-hashbang                             heimdal
-help                                 imake
+gettext                              git
+github                               gitlab
+glob                                 gnu
+gnu_configure_strict                 go
+go-deps                              golang
+guess-license                        hashbang
+heimdal                              help
+hg                                   imake
 increment                            indirect
 inet_aton                            interp
 interpreter                          intl
@@ -9976,84 +10010,85 @@ little-endian                        loc
 locking                              lua
 lvalue                               make
 makesum                              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                        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
+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
+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
 sun                                  sunpro
-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                                
+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
 
 Appendix F. Editing guidelines for the pkgsrc guide
 


--_----------=_1674217408248180--