doc/pkgsrc.*: regen

1 files changed, 377 insertions, 405 deletions

diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index fec28ac3ca1..5a1e005e4ce 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -519,7 +519,7 @@ The following principles are basic to pkgsrc:
   * "It should only work if it's right." ? That means, if a package contains
     bugs, it's better to find them and to complain about them rather than to
     just install the package and hope that it works. There are numerous checks
-    in pkgsrc that try to find such bugs: Static analysis tools (pkgtools/
+    in pkgsrc that try to find such bugs: static analysis tools (pkgtools/
     pkglint), build-time checks (portability of shell scripts), and
     post-installation checks (installed files, references to shared libraries,
     script interpreters).
@@ -1710,24 +1710,25 @@ Table of Contents
 
     8.4.1. Example of cdpack
 
-For a number of reasons you may want to build binary packages for a large
-selected set of packages in pkgsrc or even for all pkgsrc packages. For
+For a number of reasons, you may want to build binary packages for a large
+selected set of packages in pkgsrc, or even for all pkgsrc packages. For
 instance, when you have multiple machines that should run the same software, it
 is wasted time if they all build their packages themselves from source. Or you
 may want to build a list of packages you want and check them before deploying
-onto production system. There is a way of getting a set of binary packages: The
-bulk build system, or pbulk ("p" stands for "parallel"). This chapter describes
-how to set it up.
+onto production systems. There is a way of getting a set of binary packages:
+the bulk build system, or pbulk ("p" stands for "parallel"). This chapter
+describes how to set it up.
 
 8.1. Preparations
 
 First of all, you have to decide whether you build all packages or a limited
 set of them. Full bulk builds usually consume a lot more resources, both space
-and time, than builds for some practical sets of packages. There exists a
-number of particularly heavy packages that are not actually interesting to a
-wide audience. For a limited bulk builds you need to make a list of packages
-you want to build. Note that all their dependencies will be built, so you don't
-need to track them manually.
+and time, than builds for some practical sets of packages. A number of
+particularly heavy packages exist that are not actually interesting to a wide
+audience. (The approximate resource consumption for a full bulk build is given
+in section Section 8.3, "Requirements of a full bulk build".) For limited bulk
+builds you need to make a list of packages you want to build. Note that all
+their dependencies will be built, so you don't need to track them manually.
 
 During bulk builds various packages are installed and deinstalled in /usr/pkg
 (or whatever LOCALBASE is), so make sure that you don't need any package during
@@ -1848,7 +1849,7 @@ ISO 9660 images.
 
 If you wish to include a common set of files (COPYRIGHT, README, etc.) on each
 CD in the collection, then you need to create a directory which contains these
-files. e.g.
+files, e.g.:
 
 # mkdir /tmp/common
 # echo "This is a README" > /tmp/common/README
@@ -2695,8 +2696,10 @@ package involves only a few steps.
     between TOOL_DEPENDS and BUILD_DEPENDS occurs when cross-compiling:
     TOOL_DEPENDS are native packages, i.e. packages for the architecture where
     the package is built; BUILD_DEPENDS are target packages, i.e. packages for
-    the architecture for which the package is built. Your package may then look
-    like this:
+    the architecture for which the package is built. There is also
+    TEST_DEPENDS, which is used to specify a dependency used only for testing
+    the resulting package built, using the upstream project's included test
+    suite. Your package may then look like this:
 
     [...]
 
@@ -2767,10 +2770,10 @@ If the packaged software is a Python module, include one of ../../lang/python/
 egg.mk, ../../lang/python/distutils.mk, or ../../lang/python/extension.mk.
 
 Most Python packages use either "distutils" or easy-setup/setuptools ("eggs").
-if the packaged software is using setuptools, you only need to include "../../
+If the packaged software is using setuptools, you only need to include "../../
 lang/python/egg.mk". Otherwise, if the software uses "distutils", include "..
-/../lang/python/distutils.mk". so pkgsrc will use this framework. "distutils"
-uses a script called setup.py, if the "distutils" driver is not called
+/../lang/python/distutils.mk", so pkgsrc will use this framework. "distutils"
+uses a script called setup.py; if the "distutils" driver is not called
 setup.py, set the PYSETUP variable to the name of the script.
 
 Either way, the package directory should be called "py-software" and PKGNAME
@@ -5936,26 +5939,28 @@ his/her responsibility to ensure this.
 
 21.1.5. Handling dependencies
 
-Your package may depend on some other package being present - and there are
-various ways of expressing this dependency. pkgsrc supports the BUILD_DEPENDS
-and DEPENDS and TOOL_DEPENDS definitions, the USE_TOOLS definition, as well as
-dependencies via buildlink3.mk, which is the preferred way to handle
-dependencies, and which uses the variables named above. See Chapter 16, 
-Buildlink methodology for more information.
-
-The basic difference between the two variables is as follows: The DEPENDS
-definition registers that pre-requisite in the binary package so it will be
-pulled in when the binary package is later installed, whilst the BUILD_DEPENDS
-and TOOL_DEPENDS definitions does not, marking a dependency that is only needed
-for building the package.
-
-This means that if you only need a package present whilst you are building, it
-should be noted as a TOOL_DEPENDS or BUILD_DEPENDS. When cross-compiling,
-TOOL_DEPENDS are native packages, i.e. packages for the architecture where the
-package is built; BUILD_DEPENDS are target packages, i.e. packages for the
-architecture for which the package is built.
-
-The format for BUILD_DEPENDS, DEPENDS and TOOL_DEPENDS definition is:
+Your package may depend on some other package being present, and there are
+various ways of expressing this dependency. pkgsrc supports the DEPENDS,
+BUILD_DEPENDS, TOOL_DEPENDS, and TEST_DEPENDS definitions, the USE_TOOLS
+definition, as well as dependencies via buildlink3.mk, which is the preferred
+way to handle dependencies, and which uses the variables named above. See
+Chapter 16, Buildlink methodology for more information.
+
+The basic difference is that the DEPENDS definition registers that
+pre-requisite in the binary package so it will be pulled in when the binary
+package is later installed, whilst the BUILD_DEPENDS, TOOL_DEPENDS, and
+TEST_DEPENDS definitions do not, marking a dependency that is only needed for
+building or testing the resulting package. See also Chapter 12, Creating a new
+pkgsrc package from scratch for more information.
+
+This means that if you only need a package present whilst you are building or
+testing, it should be noted as a TOOL_DEPENDS, BUILD_DEPENDS, or TEST_DEPENDS.
+When cross-compiling, TOOL_DEPENDS are native packages, i.e. packages for the
+architecture where the package is built; BUILD_DEPENDS are target packages,
+i.e., packages for the architecture for which the package is built.
+
+The format for a DEPENDS, BUILD_DEPENDS, TOOL_DEPENDS, and TEST_DEPENDS
+definition is:
 
 <pre-req-package-name>:../../<category>/<pre-req-package>
 
@@ -5995,7 +6000,11 @@ version numbers recognized by pkg_info(1).
 
     DEPENDS+=        tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 
- 7. You can use wildcards in package dependencies. Note that such wildcard
+ 7. If your package includes a test suite that has extra dependencies only
+    required for this purpose (frequently this can be run as a "make test"
+    target), use the TEST_DEPENDS variable.
+
+ 8. You can use wildcards in package dependencies. Note that such wildcard
     dependencies are retained when creating binary packages. The dependency is
     checked when installing the binary package and any package which matches
     the pattern will be used. Wildcard dependencies should be used with care.
@@ -7471,10 +7480,10 @@ possibly untested features.
 
 Renaming packages is not recommended.
 
-When renaming packages, be sure to fix any references to old name in other
+When renaming packages, be sure to fix any references to the old name in other
 Makefiles, options, buildlink files, etc.
 
-Also when renaming a package, please add the package name and version pattern
+Also, when renaming a package, please add the package name and version pattern
 (s) of the previous package to SUPERSEDES. This may be repeated for multiple
 renames. The new package would be an exact replacement. Example:
 
@@ -8711,25 +8720,23 @@ bmake help topic=:index.
 ACCEPTABLE_LICENSES                  ACROREAD_FONTPATH
 ADDITIONAL                           AFAIK
 AIX                                  ALLOW_VULNERABLE_PACKAGES
-ALL_ENV                              ALSA_PC
-ALTERNATIVES_SRC                     AMANDA_TMP
-AMANDA_USER                          AMANDA_VAR
-APACHE_GROUP                         APACHE_MODULE_NAME
-APACHE_MODULE_SRC                    APACHE_MODULE_SRCDIR
-APACHE_PKG_PREFIX                    APACHE_SUEXEC_CONFIGURE_ARGS
-APACHE_SUEXEC_DOCROOT                APACHE_USER
-APPEND_ABI                           APPEND_ELF
-ARLA_CACHE                           AUDIT_PACKAGES_FLAGS
-AUTOCONF_REQD                        AUTOMAKE_OVERRIDE
-AUTOMAKE_REQD                        AUTO_MKDIRS
-BDB185_DEFAULT                       BDBBASE
-BDB_ACCEPTED                         BDB_DEFAULT
-BDB_LIBS                             BDB_TYPE
-BIND_DIR                             BIND_GROUP
-BIND_USER                            BINPKG_SITES
-BIN_INSTALL_FLAGS                    BISON_PKGDATADIR
-BLAS_ACCEPTED                        BLAS_LIBS
-BLAS_TYPE                            BOOTSTRAP_DEPENDS
+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                             BIND_DIR
+BIND_GROUP                           BIND_USER
+BINPKG_SITES                         BIN_INSTALL_FLAGS
+BISON_PKGDATADIR                     BOOTSTRAP_DEPENDS
 BOOTSTRAP_SETUPTOOLS                 BROKEN
 BROKEN_EXCEPT_ON_PLATFORM            BROKEN_ON_PLATFORM
 BSDSRCDIR                            BSDXSRCDIR
@@ -8757,29 +8764,26 @@ CAT                                  CCACHE_BASE
 CCACHE_DIR                           CCACHE_LOGFILE
 CC_VERSION                           CC_VERSION_STRING
 CDRECORD_CONF                        CDROM_PKG_URL_DIR
-CDROM_PKG_URL_HOST                   CHECKOUT_DATE
-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_PORTABILITY
-CHECK_PORTABILITY_SKIP               CHECK_RELRO
-CHECK_RELRO_SKIP                     CHECK_RELRO_SUPPORTED
-CHECK_SHLIBS                         CHECK_SHLIBS_BLACKLIST
-CHECK_SHLIBS_SKIP                    CHECK_SHLIBS_SUPPORTED
-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_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
+CDROM_PKG_URL_HOST                   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_PORTABILITY                    CHECK_PORTABILITY_SKIP
+CHECK_RELRO                          CHECK_RELRO_SKIP
+CHECK_RELRO_SUPPORTED                CHECK_SHLIBS
+CHECK_SHLIBS_BLACKLIST               CHECK_SHLIBS_SKIP
+CHECK_SHLIBS_SUPPORTED               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_PREFIX
+CMAKE_MODULE_PATH_OVERRIDE           CMAKE_PKGSRC_BUILD_FLAGS
+CMAKE_PREFIX_PATH                    CMAKE_USE_GNU_INSTALL_DIRS
 COMPILER_RPATH_FLAG                  COMPILER_USE_SYMLINKS
 CONFIGURE_ARGS                       CONFIGURE_DIRS
 CONFIGURE_ENV                        CONFIGURE_ENV_SHELL
@@ -8795,68 +8799,61 @@ CTF_FILES_SKIP                       CTF_SUPPORTED
 CTYPE                                CUPS_GROUP
 CUPS_SYSTEM_GROUPS                   CUPS_USER
 CURSES_DEFAULT                       CURSES_TYPE
-CVS_EXTRACTDIR                       CVS_MODULE
-CVS_PROJECT                          CVS_REPOSITORIES
-CVS_ROOT                             CVS_ROOT_GNU
-CVS_ROOT_NONGNU                      CVS_ROOT_SOURCEFORGE
-CVS_TAG                              CXX
-CYRUS_GROUP                          CYRUS_IDLE
-CYRUS_USER                           DAEMONTOOLS_GROUP
-DAEMONTOOLS_LOG_USER                 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
-DOWNLOADED_DISTFILE                  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                        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_USING                          FILES_SUBST
-FILES_SUBST_SED                      FIX_SYSTEM_HEADERS
-FLUXBOX_USE_GNOME                    FLUXBOX_USE_KDE
-FLUXBOX_USE_XFT                      FLUXBOX_USE_XINERAMA
-FONTDIR                              FONTS_DIRS
+CXX                                  CYRUS_GROUP
+CYRUS_IDLE                           CYRUS_USER
+DAEMONTOOLS_GROUP                    DAEMONTOOLS_LOG_USER
+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                                  DOWNLOADED_DISTFILE
+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
+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_USING
+FILES_SUBST                          FILES_SUBST_SED
+FIX_SYSTEM_HEADERS                   FLUXBOX_USE_GNOME
+FLUXBOX_USE_KDE                      FLUXBOX_USE_XFT
+FLUXBOX_USE_XINERAMA                 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
@@ -8874,14 +8871,11 @@ GEM_PATH                             GEM_SPECFILE
 GENERATE_PLIST                       GHOSTSCRIPT_REQD
 GITHUB_PROJECT                       GITHUB_RELEASE
 GITHUB_TAG                           GITHUB_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_STRICT
-GODEP_REDIRECTS                      GO_BUILD_PATTERN
-GO_DEPS                              GO_DIST_BASE
+GNU                                  GNU_CONFIGURE
+GNU_CONFIGURE_INFODIR                GNU_CONFIGURE_MANDIR
+GNU_CONFIGURE_STRICT                 GODEP_REDIRECTS
+GO_BUILD_PATTERN                     GO_DEPS
+GO_DIST_BASE                         GO_MODULE_FILES
 GO_SRCPATH                           GO_VERSION_DEFAULT
 GROUP_SPECIFIC_PKGS                  GRUB_NETWORK_CARDS
 GRUB_PRESET_COMMAND                  GRUB_SCAN_ARGS
@@ -8889,42 +8883,39 @@ GZIP                                 HASKELL_COMPILER
 HASKELL_ENABLE_HADDOCK_DOCUMENTATION HASKELL_ENABLE_LIBRARY_PROFILING
 HASKELL_ENABLE_SHARED_LIBRARY        HASKELL_OPTIMIZATION_LEVEL
 HAS_CONFIGURE                        HEADER_TEMPLATES
-HG_REPO                              HG_REPOSITORIES
-HG_TAG                               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
-JAKARTA_HOME                         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
-LAPACK_LIBS                          LATEX2HTML_ICONPATH
+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                         JAKARTA_HOME
+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                            LATEX2HTML_ICONPATH
 LDCONFIG_ADD_CMD                     LDCONFIG_REMOVE_CMD
 LEAFNODE_DATA_DIR                    LEAFNODE_GROUP
 LEAFNODE_USER                        LIBDVDCSS_HOMEPAGE
@@ -8932,16 +8923,14 @@ 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
-LOVE_VERSION                         LP64PLATFORMS
-MACHINE_PLATFORM                     MAILAGENT_DOMAIN
-MAILAGENT_EMAIL                      MAILAGENT_FQDN
-MAILAGENT_ORGANIZATION               MAJORDOMO_HOMEDIR
-MAJOR_OS_VERSION                     MAKEINFO_ARGS
+LINK_RPATH_FLAG                      LINUX_LOCALES
+LOCALBASE                            LOCALBASE_LOCKTYPE
+LOCALPATCHES                         LOVE_DATA
+LOVE_GAME                            LOVE_VERSION
+LP64PLATFORMS                        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
@@ -8998,52 +8987,48 @@ ONLY_FOR_PLATFORM                    OPENSSH_CHROOT
 OPENSSH_GROUP                        OPENSSH_USER
 OPSYS                                OPSYS_EMULDIR
 OSS_TYPE                             OSX
-OSX_TOLERATE_SDK_SKEW                OS_HAVE_ALSA
-OS_HAVE_RCD                          OS_VARIANT
+OSX_TOLERATE_SDK_SKEW                OS_VARIANT
 OS_VERSION                           OTF_FONTS_DIR
 OVERRIDE_DIRDEPTH                    OVERRIDE_GEMSPEC
-OVERRIDE_GNU_CONFIG_SCRIPTS          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_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
+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_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_CHANGES
 PKGSRC_COMPILER                      PKGSRC_KEEP_BIN_PKGS
 PKGSRC_LOCKTYPE                      PKGSRC_MAKE_ENV
 PKGSRC_MESSAGE_RECIPIENTS            PKGSRC_MKPIE
@@ -9111,75 +9096,72 @@ QMAIL_REMOTE_USER                    QMAIL_ROOT_USER
 QMAIL_SEND_USER                      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
-REPLACE_AWK                          REPLACE_BASH
-REPLACE_CSH                          REPLACE_KSH
-REPLACE_PERL                         REPLACE_PERL6
-REPLACE_PHP                          REPLACE_PYTHON
-REPLACE_RUBY                         REPLACE_RUBY_DIRS
-REPLACE_RUBY_PAT                     REPLACE_SH
-REPLACE_TEXLUA                       REQD_DIRS
-REQD_DIRS_PERMS                      REQD_FILES
-REQD_FILES_MODE                      REQD_FILES_PERMS
-RESOLV_AUTO_VARS                     RESOLV_LDFLAGS
-RESOLV_LIBS                          RM
-ROCKSPEC_NAME                        ROCKSPEC_SPECFILE
-ROOT_CMD                             ROOT_GROUP
-ROOT_USER                            RPCGEN
-RPM                                  RPM2PKG_PLIST
-RPM2PKG_PREFIX                       RPM2PKG_STAGE
-RPM2PKG_STRIP                        RPM2PKG_SUBPREFIX
-RPMFILES                             RPMIGNOREPATH
-RPM_DB_PREFIX                        RSSH_CVS_PATH
-RSSH_RDIST_PATH                      RSSH_RSYNC_PATH
-RSSH_SCP_PATH                        RSSH_SFTP_SERVER_PATH
-RUBY                                 RUBYGEM
-RUBYGEM_NAME                         RUBYGEM_OPTIONS
-RUBY_ABI_VERSION                     RUBY_ARCH
-RUBY_ARCHINC                         RUBY_ARCHLIB
-RUBY_BASE                            RUBY_BASERIDIR
-RUBY_BUILD_DOCUMENT                  RUBY_DLEXT
-RUBY_DOC                             RUBY_DYNAMIC_DIRS
-RUBY_EG                              RUBY_ENCODING_ARG
-RUBY_EXTCONF                         RUBY_EXTCONF_CHECK
-RUBY_EXTCONF_DEBUG                   RUBY_EXTCONF_MAKEFILE
-RUBY_GEM_BASE                        RUBY_INC
-RUBY_LIB                             RUBY_LIB_BASE
-RUBY_NAME                            RUBY_NOVERSION
-RUBY_PKGPREFIX                       RUBY_RAILS
-RUBY_RAILS51_VERSION                 RUBY_RAILS52_VERSION
-RUBY_RAILS60_VERSION                 RUBY_RAILS_ACCEPTED
-RUBY_RAILS_DEFAULT                   RUBY_RAILS_REQD
-RUBY_RAILS_STRICT_DEP                RUBY_RIDIR
-RUBY_SETUP                           RUBY_SHLIB
-RUBY_SHLIBALIAS                      RUBY_SHLIBVER
-RUBY_SIMPLE_INSTALL                  RUBY_SITEARCHLIB
-RUBY_SITELIB                         RUBY_SITELIB_BASE
-RUBY_SITERIDIR                       RUBY_SLEXT
-RUBY_SRCDIR                          RUBY_STATICLIB
-RUBY_SUFFIX                          RUBY_SYSRIDIR
-RUBY_USE_PTHREAD                     RUBY_VENDORARCHLIB
-RUBY_VENDORLIB                       RUBY_VENDORLIB_BASE
-RUBY_VER                             RUBY_VERSION
-RUBY_VERSIONS_ACCEPTED               RUBY_VERSIONS_INCOMPATIBLE
-RUBY_VERSION_DEFAULT                 RUBY_VERSION_REQD
-RUBY_VER_DIR                         RUN
-RUN_LDCONFIG                         SAWFISH_THEMES
-SCO                                  SCREWS_GROUP
-SCREWS_USER                          SCRIPTS_ENV
-SCROLLKEEPER_DATADIR                 SCROLLKEEPER_REBUILDDB
-SCROLLKEEPER_UPDATEDB                SDIST_PAWD
-SERIAL_DEVICES                       SETGIDGAME
-SETGID_GAMES_PERMS                   SETUID_ROOT_PERMS
-SH                                   SHLIB
-SHORTNAME                            SIGN_PACKAGES
+RDOC                                 READLINE_DEFAULT
+READLINE_TYPE                        REAL_ROOT_GROUP
+REAL_ROOT_USER                       RECURSIVE_MAKE
+RELAY_CTRL_DIR                       REPLACE_AWK
+REPLACE_BASH                         REPLACE_CSH
+REPLACE_KSH                          REPLACE_PERL
+REPLACE_PERL6                        REPLACE_PHP
+REPLACE_PYTHON                       REPLACE_RUBY
+REPLACE_RUBY_DIRS                    REPLACE_RUBY_PAT
+REPLACE_SH                           REPLACE_TEXLUA
+REQD_DIRS                            REQD_DIRS_PERMS
+REQD_FILES                           REQD_FILES_MODE
+REQD_FILES_PERMS                     RESOLV_AUTO_VARS
+RESOLV_LDFLAGS                       RESOLV_LIBS
+RM                                   ROOT_CMD
+ROOT_GROUP                           ROOT_USER
+RPCGEN                               RPM
+RPM2PKG_PLIST                        RPM2PKG_PREFIX
+RPM2PKG_STAGE                        RPM2PKG_STRIP
+RPM2PKG_SUBPREFIX                    RPMFILES
+RPMIGNOREPATH                        RPM_DB_PREFIX
+RSSH_CVS_PATH                        RSSH_RDIST_PATH
+RSSH_RSYNC_PATH                      RSSH_SCP_PATH
+RSSH_SFTP_SERVER_PATH                RUBY
+RUBYGEM                              RUBYGEM_NAME
+RUBYGEM_OPTIONS                      RUBY_ABI_VERSION
+RUBY_ARCH                            RUBY_ARCHINC
+RUBY_ARCHLIB                         RUBY_BASE
+RUBY_BASERIDIR                       RUBY_BUILD_DOCUMENT
+RUBY_DLEXT                           RUBY_DOC
+RUBY_DYNAMIC_DIRS                    RUBY_EG
+RUBY_ENCODING_ARG                    RUBY_EXTCONF
+RUBY_EXTCONF_CHECK                   RUBY_EXTCONF_DEBUG
+RUBY_EXTCONF_MAKEFILE                RUBY_GEM_BASE
+RUBY_INC                             RUBY_LIB
+RUBY_LIB_BASE                        RUBY_NAME
+RUBY_NOVERSION                       RUBY_PKGPREFIX
+RUBY_RAILS                           RUBY_RAILS51_VERSION
+RUBY_RAILS52_VERSION                 RUBY_RAILS60_VERSION
+RUBY_RAILS_ACCEPTED                  RUBY_RAILS_DEFAULT
+RUBY_RAILS_REQD                      RUBY_RAILS_STRICT_DEP
+RUBY_RIDIR                           RUBY_SETUP
+RUBY_SHLIB                           RUBY_SHLIBALIAS
+RUBY_SHLIBVER                        RUBY_SIMPLE_INSTALL
+RUBY_SITEARCHLIB                     RUBY_SITELIB
+RUBY_SITELIB_BASE                    RUBY_SITERIDIR
+RUBY_SLEXT                           RUBY_SRCDIR
+RUBY_STATICLIB                       RUBY_SUFFIX
+RUBY_SYSRIDIR                        RUBY_USE_PTHREAD
+RUBY_VENDORARCHLIB                   RUBY_VENDORLIB
+RUBY_VENDORLIB_BASE                  RUBY_VER
+RUBY_VERSION                         RUBY_VERSIONS_ACCEPTED
+RUBY_VERSIONS_INCOMPATIBLE           RUBY_VERSION_DEFAULT
+RUBY_VERSION_REQD                    RUBY_VER_DIR
+RUN                                  RUN_LDCONFIG
+SAWFISH_THEMES                       SCO
+SCREWS_GROUP                         SCREWS_USER
+SCRIPTS_ENV                          SCROLLKEEPER_DATADIR
+SCROLLKEEPER_REBUILDDB               SCROLLKEEPER_UPDATEDB
+SDIST_PAWD                           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
@@ -9200,9 +9182,7 @@ 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                         TERMCAP_TYPE
+SU_CMD                               TERMCAP_TYPE
 TERMINFO_DEFAULT                     TERMINFO_TYPE
 TEST                                 TEST_DEPENDS
 TEST_DIRS                            TEST_ENV
@@ -9219,45 +9199,44 @@ TOOLS_CREATE                         TOOLS_DIR
 TOOLS_FAIL                           TOOLS_GNU_MISSING
 TOOLS_LDCONFIG                       TOOLS_NOOP
 TOOLS_PATH                           TOOLS_SCRIPT
-TOOL_DEPENDS                         TTF_FONTDIR
-TTF_FONTS_DIR                        TYPE
-UAC_REQD_EXECS                       UCSPI_SSL_GROUP
-UCSPI_SSL_USER                       UNLIMIT_RESOURCES
-UNPRIVILEGED                         UNPRIVILEGED_GROUP
-UNPRIVILEGED_GROUPS                  UNPRIVILEGED_USER
-UNWRAP_FILES                         UNWRAP_PATTERNS
-UPDATE_GEMSPEC                       UPDATE_TARGET
-URI                                  USA
-USERGROUP_PHASE                      USERPPP_GROUP
-USER_SPECIFIC_PKGS                   USE_ABI_DEPENDS
-USE_APR                              USE_BSD_MAKEFILE
-USE_BUILTIN                          USE_CROSS_COMPILE
-USE_CURSES                           USE_CWRAPPERS
-USE_DB185                            USE_FEATURES
-USE_GAMESGROUP                       USE_GCC_RUNTIME
-USE_IMAKE                            USE_JAVA
-USE_JAVA2                            USE_LANGUAGES
-USE_LIBTOOL                          USE_NATIVE_GCC
-USE_NETBSD_REPO                      USE_PKGSRC_GCC
-USE_PKGSRC_GCC_RUNTIME               USE_PKGTASKS
-USE_PKG_ADMIN_DIGEST                 USE_RUBY_EXTCONF
-USE_RUBY_INSTALL                     USE_RUBY_SETUP
-USE_RUBY_SETUP_PKG                   USE_TOOLS
-UUCP_GROUP                           UUCP_USER
-VARBASE                              VARNAME
-VIM_EXTRA_OPTS                       WARNING_MSG
-WCALC_CGIDIR                         WCALC_CGIPATH
-WCALC_HTMLDIR                        WCALC_HTMLPATH
-WDM_MANAGERS                         WRAPPER_REORDER_CMDS
-WRKDIR                               WRKDIR_BASENAME
-WRKDIR_LOCKTYPE                      WRKLOG
-WRKOBJDIR                            WRKSRC
-X10_PORT                             X11
-X11BASE                              X11_PKGSRCDIR
-X11_TYPE                             X509_CERTIFICATE
-X509_KEY                             XAW_TYPE
-XLOCK_DEFAULT_MODE                   XMKMF_FLAGS
-XXX                                  XXXX
+TOOL_DEPENDS                         TTF_FONTS_DIR
+TYPE                                 UAC_REQD_EXECS
+UCSPI_SSL_GROUP                      UCSPI_SSL_USER
+UNLIMIT_RESOURCES                    UNPRIVILEGED
+UNPRIVILEGED_GROUP                   UNPRIVILEGED_GROUPS
+UNPRIVILEGED_USER                    UNWRAP_FILES
+UNWRAP_PATTERNS                      UPDATE_GEMSPEC
+UPDATE_TARGET                        URI
+USA                                  USERGROUP_PHASE
+USERPPP_GROUP                        USER_SPECIFIC_PKGS
+USE_ABI_DEPENDS                      USE_APR
+USE_BSD_MAKEFILE                     USE_BUILTIN
+USE_CROSS_COMPILE                    USE_CURSES
+USE_CWRAPPERS                        USE_DB185
+USE_FEATURES                         USE_GAMESGROUP
+USE_GCC_RUNTIME                      USE_IMAKE
+USE_JAVA                             USE_JAVA2
+USE_LANGUAGES                        USE_LIBTOOL
+USE_NATIVE_GCC                       USE_NETBSD_REPO
+USE_PKGSRC_GCC                       USE_PKGSRC_GCC_RUNTIME
+USE_PKGTASKS                         USE_PKG_ADMIN_DIGEST
+USE_RUBY_EXTCONF                     USE_RUBY_INSTALL
+USE_RUBY_SETUP                       USE_RUBY_SETUP_PKG
+USE_TOOLS                            UUCP_GROUP
+UUCP_USER                            VARBASE
+VARNAME                              VIM_EXTRA_OPTS
+WARNING_MSG                          WCALC_CGIDIR
+WCALC_CGIPATH                        WCALC_HTMLDIR
+WCALC_HTMLPATH                       WDM_MANAGERS
+WRAPPER_REORDER_CMDS                 WRKDIR
+WRKDIR_BASENAME                      WRKDIR_LOCKTYPE
+WRKLOG                               WRKOBJDIR
+WRKSRC                               X10_PORT
+X11                                  X11BASE
+X11_PKGSRCDIR                        X11_TYPE
+X509_CERTIFICATE                     X509_KEY
+XAW_TYPE                             XLOCK_DEFAULT_MODE
+XMKMF_FLAGS                          XXX
 YES                                  ZERO_FILESIZE_P
 ZSH_STATIC                           __stdc__
 _vargroups                           accept
@@ -9265,12 +9244,11 @@ acquire-localbase-lock               acquire-lock
 add                                  administrator
 alloca                               alternatives
 aslr                                 asprintf
-atlas                                autoconf
-automake                             autoreconf
-awk                                  bash
-big-endian                           bin-install
-bind                                 binpkg-list
-blas                                 bootstrap-depends
+autoconf                             automake
+autoreconf                           awk
+bash                                 big-endian
+bin-install                          bind
+binpkg-list                          bootstrap-depends
 broken                               broken_on_platform
 bsd                                  bsd.prog.mk
 build                                build-env
@@ -9293,33 +9271,31 @@ configure-env                        configure-help
 configure_args                       connect
 cos                                  cputime
 create-usergroup                     csh
-ctf                                  cvs
-debug                                declaration
-declare                              defined
-depend                               dependencies
-depends                              depends-checksum
-depends-fetch                        deps
-describe                             destdir
-disable                              distclean
-distinfo                             dl
-dlopen                               do-build
-do-buildlink                         do-clean
-do-configure                         do-configure-post-hook
-do-extract                           do-fetch
-do-install                           emul
+ctf                                  debug
+declaration                          declare
+defined                              depend
+dependencies                         depends
+depends-checksum                     depends-fetch
+deps                                 describe
+destdir                              disable
+distclean                            distinfo
+dl                                   dlopen
+do-build                             do-buildlink
+do-clean                             do-configure
+do-configure-post-hook               do-extract
+do-fetch                             emul
 emul-distinfo                        emul-fetch
 emulation                            emulator
 enable                               endian
-endif                                enomem
-err                                  errx
-etc                                  exp
-extract-rpm                          fabs
-feature                              features
-fetch                                fetch-list
-follows                              forbids
-form                                 format
-fortify                              fortify_source
-fossil                               friend
+enomem                               err
+errx                                 etc
+exp                                  extract-rpm
+fabs                                 feature
+features                             fetch
+fetch-list                           follows
+forbids                              form
+format                               fortify
+fortify_source                       friend
 fts                                  fts_close
 fts_open                             fts_read
 fts_set                              gcc
@@ -9327,36 +9303,33 @@ gethostbyaddr                        gethostbyname
 gethostbyname2                       getopt_long
 getprogname                          getservbyname
 getservbyport                        getservent
-gettext                              git
-github                               glob
-gnu                                  gnu_configure_strict
-go                                   go-deps
-golang                               guess-license
-hashbang                             heimdal
-help                                 hg
+gettext                              github
+glob                                 gnu
+gnu_configure_strict                 go
+go-deps                              golang
+guess-license                        hashbang
+heimdal                              help
 imake                                increment
 inet_aton                            interp
 interpreter                          intl
 iso                                  kerberos
 krb                                  krb5
-ksh                                  lapack
-latex                                libintl_bindtextdomain
-libintl_gettext                      libintl_textdomain
-libnbcompat                          libs
-libtool                              licence
-license                              lintl
-little-endian                        lock
-locking                              lvalue
-make                                 makesum
-memory                               mercurial
+ksh                                  latex
+libintl_bindtextdomain               libintl_gettext
+libintl_textdomain                   libnbcompat
+libs                                 libtool
+licence                              license
+lintl                                little-endian
+lock                                 locking
+lvalue                               make
+makesum                              memory
 meta                                 meta-package
 meta_package                         mit-krb5
-mk.conf                              mkl
-mount                                mprotect
-mremap                               nb
-nbcompat                             obstack
-obstack_ptr_grow                     occurs
-only                                 openblas
+mk.conf                              mount
+mprotect                             mremap
+nb                                   nbcompat
+obstack                              obstack_ptr_grow
+occurs                               only
 options                              options.mk
 order                                override
 override-intltool                    override-message-intltool
@@ -9398,9 +9371,8 @@ stage-install                        strcasestr
 strict                               strip
 strndup                              strnlen
 strsep                               subst
-substitutions                        subversion
-sun                                  sunpro
-sunwspro                             svn
+substitutions                        sun
+sunpro                               sunwspro
 symlink                              test
 test-env                             tex
 texlive                              tmp