Revert the previous commit.

2 files changed, 340 insertions, 394 deletions

diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html
index edd963142b4..6f2f310e351 100644
--- a/doc/pkgsrc.html
+++ b/doc/pkgsrc.html
@@ -163,8 +163,6 @@ builds)</a></span></dt>
 <dd><dl>
 <dt><span class="sect2"><a href="#creating.perl-module">12.1.1. Perl modules</a></span></dt>
 <dt><span class="sect2"><a href="#creating.python-module">12.1.2. Python modules and programs</a></span></dt>
-<dt><span class="sect2"><a href="#creating.R-package">12.1.3. R packages</a></span></dt>
-<dt><span class="sect2"><a href="#creating.TeX-package">12.1.4. TeX packages</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#creating.examples">12.2. Examples</a></span></dt>
 <dd><dl><dt><span class="sect2"><a href="#creating.nvu">12.2.1. How the www/nvu package came into pkgsrc</a></span></dt></dl></dd>
@@ -2799,8 +2797,6 @@ anymore, you can remove that file and run <span class="command"><strong>cvs -q u
 <dd><dl>
 <dt><span class="sect2"><a href="#creating.perl-module">12.1.1. Perl modules</a></span></dt>
 <dt><span class="sect2"><a href="#creating.python-module">12.1.2. Python modules and programs</a></span></dt>
-<dt><span class="sect2"><a href="#creating.R-package">12.1.3. R packages</a></span></dt>
-<dt><span class="sect2"><a href="#creating.TeX-package">12.1.4. TeX packages</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#creating.examples">12.2. Examples</a></span></dt>
 <dd><dl><dt><span class="sect2"><a href="#creating.nvu">12.2.1. How the www/nvu package came into pkgsrc</a></span></dt></dl></dd>
@@ -3062,8 +3058,6 @@ anymore, you can remove that file and run <span class="command"><strong>cvs -q u
 <dd><dl>
 <dt><span class="sect2"><a href="#creating.perl-module">12.1.1. Perl modules</a></span></dt>
 <dt><span class="sect2"><a href="#creating.python-module">12.1.2. Python modules and programs</a></span></dt>
-<dt><span class="sect2"><a href="#creating.R-package">12.1.3. R packages</a></span></dt>
-<dt><span class="sect2"><a href="#creating.TeX-package">12.1.4. TeX packages</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#creating.examples">12.2. Examples</a></span></dt>
 <dd><dl><dt><span class="sect2"><a href="#creating.nvu">12.2.1. How the www/nvu package came into pkgsrc</a></span></dt></dl></dd>
@@ -3235,18 +3229,6 @@ PYTHON_VERSIONED_DEPENDENCIES=dialog
 Look inside <code class="filename">versioned_dependencies.mk</code> for a list
 of supported packages.</p>
 </div>
-<div class="sect2">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="creating.R-package"></a>12.1.3. R packages</h3></div></div></div>
-<p>Simple R packages from CRAN are handled automatically by
-<span class="command"><strong>R2pkg</strong></span>, including dependencies.</p>
-</div>
-<div class="sect2">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="creating.TeX-package"></a>12.1.4. TeX packages</h3></div></div></div>
-<p>TeX and LaTeX packages from CTAN are handled automatically by
-<span class="command"><strong>url2pkg</strong></span>, including dependencies.</p>
-</div>
 </div>
 <div class="sect1">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
@@ -8960,7 +8942,7 @@ place.</p></li>
 	and if you still don't have the answer, ask on the
 	<code class="literal">pkgsrc-users</code> mailing list.</p>
 <div class="qandaset">
-<a name="idp140534676752072"></a><dl>
+<a name="idm74633904"></a><dl>
 <dt>24.1. <a href="#devfaq.makeflags">What is the difference between
 	MAKEFLAGS, .MAKEFLAGS and
 	MAKE_FLAGS?</a>
@@ -9005,7 +8987,7 @@ do?</a>
 <tbody>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.makeflags"></a><a name="idp140534676752744"></a><p><b>24.1.</b></p>
+<a name="devfaq.makeflags"></a><a name="idm74633520"></a><p><b>24.1.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
 	<code class="varname">MAKEFLAGS</code>, <code class="varname">.MAKEFLAGS</code> and
@@ -9021,7 +9003,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.make"></a><a name="idp140534689356328"></a><p><b>24.2.</b></p>
+<a name="devfaq.make"></a><a name="idm74637744"></a><p><b>24.2.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
 	<code class="varname">MAKE</code>, <code class="varname">GMAKE</code> and
@@ -9039,7 +9021,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.cc"></a><a name="idp140534689361384"></a><p><b>24.3.</b></p>
+<a name="devfaq.cc"></a><a name="idm73302192"></a><p><b>24.3.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
 	<code class="varname">CC</code>, <code class="varname">PKG_CC</code> and
@@ -9057,7 +9039,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3flags"></a><a name="idp140534689366248"></a><p><b>24.4.</b></p>
+<a name="devfaq.bl3flags"></a><a name="idm73298096"></a><p><b>24.4.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
 	<code class="varname">BUILDLINK_LDFLAGS</code>,
@@ -9070,7 +9052,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3prefix"></a><a name="idp140534689368872"></a><p><b>24.5.</b></p>
+<a name="devfaq.bl3prefix"></a><a name="idm73295920"></a><p><b>24.5.</b></p>
 </td>
 <td align="left" valign="top"><p>Why does <span class="command"><strong>make show-var
 	VARNAME=BUILDLINK_PREFIX.<em class="replaceable"><code>foo</code></em></strong></span>
@@ -9086,7 +9068,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.master_sites"></a><a name="idp140534689372744"></a><p><b>24.6.</b></p>
+<a name="devfaq.master_sites"></a><a name="idm74648624"></a><p><b>24.6.</b></p>
 </td>
 <td align="left" valign="top"><p>What does
 	<code class="code">${MASTER_SITE_SOURCEFORGE:=package/}</code> mean? I
@@ -9110,7 +9092,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.mailinglists"></a><a name="idp140534689380456"></a><p><b>24.7.</b></p>
+<a name="devfaq.mailinglists"></a><a name="idm74650032"></a><p><b>24.7.</b></p>
 </td>
 <td align="left" valign="top"><p>Which mailing lists are there for package
 	developers?</p></td>
@@ -9135,7 +9117,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.documentation"></a><a name="idp140534689385368"></a><p><b>24.8.</b></p>
+<a name="devfaq.documentation"></a><a name="idm74654512"></a><p><b>24.8.</b></p>
 </td>
 <td align="left" valign="top"><p>Where is the pkgsrc
 	documentation?</p></td>
@@ -9183,7 +9165,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.too-much-time"></a><a name="idp140534689394200"></a><p><b>24.9.</b></p>
+<a name="devfaq.too-much-time"></a><a name="idm74664496"></a><p><b>24.9.</b></p>
 </td>
 <td align="left" valign="top"><p>I have a little time to kill.  What shall I
 do?</p></td>
@@ -11305,483 +11287,479 @@ source packages</h2></div></div></div>
 </tr>
 <tr>
 <td>LANGUAGES</td>
-<td>LAPACK_LIBS</td>
-</tr>
-<tr>
 <td>LATEX2HTML_ICONPATH</td>
-<td>LDCONFIG_ADD_CMD</td>
 </tr>
 <tr>
+<td>LDCONFIG_ADD_CMD</td>
 <td>LDCONFIG_REMOVE_CMD</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>
-<td>LINK_RPATH_FLAG</td>
 </tr>
 <tr>
+<td>LINK_RPATH_FLAG</td>
 <td>LINUX_BASE_NODEPS</td>
-<td>LINUX_BASE_PREFERRED</td>
 </tr>
 <tr>
+<td>LINUX_BASE_PREFERRED</td>
 <td>LINUX_BASE_REQUIRED</td>
-<td>LINUX_LOCALES</td>
 </tr>
 <tr>
+<td>LINUX_LOCALES</td>
 <td>LOCALBASE</td>
-<td>LOCALBASE_LOCKTYPE</td>
 </tr>
 <tr>
+<td>LOCALBASE_LOCKTYPE</td>
 <td>LOCALPATCHES</td>
-<td>LOVE_DATA</td>
 </tr>
 <tr>
+<td>LOVE_DATA</td>
 <td>LOVE_GAME</td>
-<td>LOVE_VERSION</td>
 </tr>
 <tr>
+<td>LOVE_VERSION</td>
 <td>LP64PLATFORMS</td>
-<td>MACHINE_PLATFORM</td>
 </tr>
 <tr>
+<td>MACHINE_PLATFORM</td>
 <td>MAILAGENT_DOMAIN</td>
-<td>MAILAGENT_EMAIL</td>
 </tr>
 <tr>
+<td>MAILAGENT_EMAIL</td>
 <td>MAILAGENT_FQDN</td>
-<td>MAILAGENT_ORGANIZATION</td>
 </tr>
 <tr>
+<td>MAILAGENT_ORGANIZATION</td>
 <td>MAJORDOMO_HOMEDIR</td>
-<td>MAJOR_OS_VERSION</td>
 </tr>
 <tr>
+<td>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>MANINSTALL</td>
 </tr>
 <tr>
+<td>MANINSTALL</td>
 <td>MANZ</td>
-<td>MASTER_SITES</td>
 </tr>
 <tr>
+<td>MASTER_SITES</td>
 <td>MASTER_SITE_BACKUP</td>
-<td>MASTER_SITE_CYGWIN</td>
 </tr>
 <tr>
+<td>MASTER_SITE_CYGWIN</td>
 <td>MASTER_SITE_GNOME</td>
-<td>MASTER_SITE_GNU</td>
 </tr>
 <tr>
+<td>MASTER_SITE_GNU</td>
 <td>MASTER_SITE_LOCAL</td>
-<td>MASTER_SITE_MOZILLA</td>
 </tr>
 <tr>
+<td>MASTER_SITE_MOZILLA</td>
 <td>MASTER_SITE_OPENOFFICE</td>
-<td>MASTER_SITE_OVERRIDE</td>
 </tr>
 <tr>
+<td>MASTER_SITE_OVERRIDE</td>
 <td>MASTER_SITE_PERL_CPAN</td>
-<td>MASTER_SITE_SUNSITE</td>
 </tr>
 <tr>
+<td>MASTER_SITE_SUNSITE</td>
 <td>MASTER_SITE_SUSE</td>
-<td>MASTER_SITE_TEX_CTAN</td>
 </tr>
 <tr>
+<td>MASTER_SITE_TEX_CTAN</td>
 <td>MASTER_SITE_XCONTRIB</td>
-<td>MASTER_SITE_XEMACS</td>
 </tr>
 <tr>
+<td>MASTER_SITE_XEMACS</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>MLDONKEY_GROUP</td>
 </tr>
 <tr>
+<td>MLDONKEY_GROUP</td>
 <td>MLDONKEY_HOME</td>
-<td>MLDONKEY_USER</td>
 </tr>
 <tr>
+<td>MLDONKEY_USER</td>
 <td>MONOTONE_GROUP</td>
-<td>MONOTONE_USER</td>
 </tr>
 <tr>
+<td>MONOTONE_USER</td>
 <td>MOTIFBASE</td>
-<td>MOTIF_TYPE</td>
 </tr>
 <tr>
+<td>MOTIF_TYPE</td>
 <td>MOTIF_TYPE_DEFAULT</td>
-<td>MPI_TYPE</td>
 </tr>
 <tr>
+<td>MPI_TYPE</td>
 <td>MSGFMT_STRIP_MSGCTXT</td>
-<td>MSGFMT_STRIP_MSGID_PLURAL</td>
 </tr>
 <tr>
+<td>MSGFMT_STRIP_MSGID_PLURAL</td>
 <td>MTOOLS_ENABLE_FLOPPYD</td>
-<td>MUST</td>
 </tr>
 <tr>
+<td>MUST</td>
 <td>MV</td>
-<td>MYSQL_CHARSET</td>
 </tr>
 <tr>
+<td>MYSQL_CHARSET</td>
 <td>MYSQL_DATADIR</td>
-<td>MYSQL_EXTRA_CHARSET</td>
 </tr>
 <tr>
+<td>MYSQL_EXTRA_CHARSET</td>
 <td>MYSQL_GROUP</td>
-<td>MYSQL_PKGSRCDIR</td>
 </tr>
 <tr>
+<td>MYSQL_PKGSRCDIR</td>
 <td>MYSQL_USER</td>
-<td>MYSQL_VERSIONS_ACCEPTED</td>
 </tr>
 <tr>
+<td>MYSQL_VERSIONS_ACCEPTED</td>
 <td>MYSQL_VERSION_DEFAULT</td>
-<td>NAGIOSCMD_GROUP</td>
 </tr>
 <tr>
+<td>NAGIOSCMD_GROUP</td>
 <td>NAGIOSDIR</td>
-<td>NAGIOS_GROUP</td>
 </tr>
 <tr>
+<td>NAGIOS_GROUP</td>
 <td>NAGIOS_USER</td>
-<td>NATIVE_APPEND_ABI</td>
 </tr>
 <tr>
+<td>NATIVE_APPEND_ABI</td>
 <td>NATIVE_APPEND_ELF</td>
-<td>NATIVE_EXEC_FMT</td>
 </tr>
 <tr>
+<td>NATIVE_EXEC_FMT</td>
 <td>NATIVE_MACHINE_PLATFORM</td>
-<td>NATIVE_OBJECT_FMT</td>
 </tr>
 <tr>
+<td>NATIVE_OBJECT_FMT</td>
 <td>NBPAX_PROGRAM_PREFIX</td>
-<td>NETBSD_LOGIN_NAME</td>
 </tr>
 <tr>
+<td>NETBSD_LOGIN_NAME</td>
 <td>NMH_EDITOR</td>
-<td>NMH_MTA</td>
 </tr>
 <tr>
+<td>NMH_MTA</td>
 <td>NMH_PAGER</td>
-<td>NOLOGIN</td>
 </tr>
 <tr>
+<td>NOLOGIN</td>
 <td>NONZERO_FILESIZE_P</td>
-<td>NOTE</td>
 </tr>
 <tr>
+<td>NOTE</td>
 <td>NOT_FOR_PLATFORM</td>
-<td>NOT_PAX_ASLR_SAFE</td>
 </tr>
 <tr>
+<td>NOT_PAX_ASLR_SAFE</td>
 <td>NOT_PAX_MPROTECT_SAFE</td>
-<td>NO_BUILD</td>
 </tr>
 <tr>
+<td>NO_BUILD</td>
 <td>NO_CHECKSUM</td>
-<td>NO_CONFIGURE</td>
 </tr>
 <tr>
+<td>NO_CONFIGURE</td>
 <td>NO_SKIP</td>
-<td>NS_PREFERRED</td>
 </tr>
 <tr>
+<td>NS_PREFERRED</td>
 <td>NULLMAILER_GROUP</td>
-<td>NULLMAILER_USER</td>
 </tr>
 <tr>
+<td>NULLMAILER_USER</td>
 <td>OASIS</td>
-<td>OASIS_BUILD_ARGS</td>
 </tr>
 <tr>
+<td>OASIS_BUILD_ARGS</td>
 <td>OBJHOSTNAME</td>
-<td>OBJMACHINE</td>
 </tr>
 <tr>
+<td>OBJMACHINE</td>
 <td>OCAML_FINDLIB_DIRS</td>
-<td>OCAML_FINDLIB_REGISTER</td>
 </tr>
 <tr>
+<td>OCAML_FINDLIB_REGISTER</td>
 <td>OCAML_FINDLIB_REGISTER_VERBOSE</td>
-<td>OCAML_SITELIBDIR</td>
 </tr>
 <tr>
+<td>OCAML_SITELIBDIR</td>
 <td>OCAML_TOPKG_DOCDIR</td>
-<td>OCAML_USE_DUNE</td>
 </tr>
 <tr>
+<td>OCAML_USE_DUNE</td>
 <td>OCAML_USE_FINDLIB</td>
-<td>OCAML_USE_JBUILDER</td>
 </tr>
 <tr>
+<td>OCAML_USE_JBUILDER</td>
 <td>OCAML_USE_OASIS</td>
-<td>OCAML_USE_OASIS_DYNRUN</td>
 </tr>
 <tr>
+<td>OCAML_USE_OASIS_DYNRUN</td>
 <td>OCAML_USE_OPAM</td>
-<td>OCAML_USE_OPT_COMPILER</td>
 </tr>
 <tr>
+<td>OCAML_USE_OPT_COMPILER</td>
 <td>OCAML_USE_TOPKG</td>
-<td>OMF</td>
 </tr>
 <tr>
+<td>OMF</td>
 <td>ONLY_FOR_COMPILER</td>
-<td>ONLY_FOR_PLATFORM</td>
 </tr>
 <tr>
+<td>ONLY_FOR_PLATFORM</td>
 <td>OPENSSH_CHROOT</td>
-<td>OPENSSH_GROUP</td>
 </tr>
 <tr>
+<td>OPENSSH_GROUP</td>
 <td>OPENSSH_USER</td>
-<td>OPSYS</td>
 </tr>
 <tr>
+<td>OPSYS</td>
 <td>OPSYS_EMULDIR</td>
-<td>OSS_TYPE</td>
 </tr>
 <tr>
+<td>OSS_TYPE</td>
 <td>OSX</td>
-<td>OSX_TOLERATE_SDK_SKEW</td>
 </tr>
 <tr>
+<td>OSX_TOLERATE_SDK_SKEW</td>
 <td>OS_HAVE_ALSA</td>
-<td>OS_HAVE_RCD</td>
 </tr>
 <tr>
+<td>OS_HAVE_RCD</td>
 <td>OS_VARIANT</td>
-<td>OS_VERSION</td>
 </tr>
 <tr>
+<td>OS_VERSION</td>
 <td>OTF_FONTS_DIR</td>
-<td>OVERRIDE_DIRDEPTH</td>
 </tr>
 <tr>
+<td>OVERRIDE_DIRDEPTH</td>
 <td>OVERRIDE_GEMSPEC</td>
-<td>OVERRIDE_GNU_CONFIG_SCRIPTS</td>
 </tr>
 <tr>
+<td>OVERRIDE_GNU_CONFIG_SCRIPTS</td>
 <td>OVERRIDE_ROCKSPEC</td>
-<td>OWN_DIRS</td>
 </tr>
 <tr>
+<td>OWN_DIRS</td>
 <td>OWN_DIRS_PERMS</td>
-<td>P4GROUP</td>
 </tr>
 <tr>
+<td>P4GROUP</td>
 <td>P4PORT</td>
-<td>P4ROOT</td>
 </tr>
 <tr>
+<td>P4ROOT</td>
 <td>P4USER</td>
-<td>PACKAGES</td>
 </tr>
 <tr>
+<td>PACKAGES</td>
 <td>PALMOS_DEFAULT_SDK</td>
-<td>PAMBASE</td>
 </tr>
 <tr>
+<td>PAMBASE</td>
 <td>PAM_DEFAULT</td>
-<td>PAPERSIZE</td>
 </tr>
 <tr>
+<td>PAPERSIZE</td>
 <td>PASSIVE_FETCH</td>
-<td>PATCHDIR</td>
 </tr>
 <tr>
+<td>PATCHDIR</td>
 <td>PATCHFILES</td>
-<td>PATCH_ARGS</td>
 </tr>
 <tr>
+<td>PATCH_ARGS</td>
 <td>PATCH_DEBUG</td>
-<td>PATCH_DIST_ARGS</td>
 </tr>
 <tr>
+<td>PATCH_DIST_ARGS</td>
 <td>PATCH_DIST_CAT</td>
-<td>PATCH_DIST_STRIP</td>
 </tr>
 <tr>
+<td>PATCH_DIST_STRIP</td>
 <td>PATCH_FUZZ_FACTOR</td>
-<td>PATCH_STRIP</td>
 </tr>
 <tr>
+<td>PATCH_STRIP</td>
 <td>PATH</td>
-<td>PCCBASE</td>
 </tr>
 <tr>
+<td>PCCBASE</td>
 <td>PEAR</td>
-<td>PEAR_CHANNEL</td>
 </tr>
 <tr>
+<td>PEAR_CHANNEL</td>
 <td>PEAR_CHANNEL_ALIAS</td>
-<td>PEAR_CHANNEL_VERSION</td>
 </tr>
 <tr>
+<td>PEAR_CHANNEL_VERSION</td>
 <td>PEAR_CMD</td>
-<td>PEAR_LIB</td>
 </tr>
 <tr>
+<td>PEAR_LIB</td>
 <td>PEAR_PACKAGE_XML</td>
-<td>PERL5</td>
 </tr>
 <tr>
+<td>PERL5</td>
 <td>PERL5_CONFIGURE</td>
-<td>PERL5_CONFIGURE_DIRS</td>
 </tr>
 <tr>
+<td>PERL5_CONFIGURE_DIRS</td>
 <td>PERL5_LDFLAGS</td>
-<td>PERL5_LICENSE</td>
 </tr>
 <tr>
+<td>PERL5_LICENSE</td>
 <td>PERL5_MODULE_TYPE</td>
-<td>PERL5_PACKLIST</td>
 </tr>
 <tr>
+<td>PERL5_PACKLIST</td>
 <td>PERL5_PACKLIST_DIR</td>
-<td>PERL5_PERLBASE</td>
 </tr>
 <tr>
+<td>PERL5_PERLBASE</td>
 <td>PERL5_SITEBASE</td>
-<td>PERL5_USE_PACKLIST</td>
 </tr>
 <tr>
+<td>PERL5_USE_PACKLIST</td>
 <td>PERL5_VENDORBASE</td>
-<td>PFCTL</td>
 </tr>
 <tr>
+<td>PFCTL</td>
 <td>PFVAR_H</td>
-<td>PF_VERSION</td>
 </tr>
 <tr>
+<td>PF_VERSION</td>
 <td>PGGROUP</td>
-<td>PGHOME</td>
 </tr>
 <tr>
+<td>PGHOME</td>
 <td>PGPKGSRCDIR</td>
-<td>PGSQL_TYPE</td>
 </tr>
 <tr>
+<td>PGSQL_TYPE</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_CHANGES</td>
@@ -12652,24 +12630,20 @@ source packages</h2></div></div></div>
 <td>asprintf</td>
 </tr>
 <tr>
-<td>atlas</td>
 <td>autoconf</td>
-</tr>
-<tr>
 <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>binpkg-list</td>
-<td>blas</td>
 </tr>
 <tr>
 <td>bootstrap-depends</td>
@@ -12908,48 +12882,44 @@ source packages</h2></div></div></div>
 <td>ksh</td>
 </tr>
 <tr>
-<td>lapack</td>
 <td>latex</td>
-</tr>
-<tr>
 <td>libnbcompat</td>
-<td>libs</td>
 </tr>
 <tr>
+<td>libs</td>
 <td>libtool</td>
-<td>licence</td>
 </tr>
 <tr>
+<td>licence</td>
 <td>license</td>
-<td>lintl</td>
 </tr>
 <tr>
+<td>lintl</td>
 <td>little-endian</td>
-<td>lock</td>
 </tr>
 <tr>
+<td>lock</td>
 <td>locking</td>
-<td>lvalue</td>
 </tr>
 <tr>
+<td>lvalue</td>
 <td>make</td>
-<td>makesum</td>
 </tr>
 <tr>
+<td>makesum</td>
 <td>memory</td>
-<td>mercurial</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>mount</td>
@@ -12972,143 +12942,139 @@ source packages</h2></div></div></div>
 <td>only</td>
 </tr>
 <tr>
-<td>openblas</td>
 <td>options</td>
-</tr>
-<tr>
 <td>options.mk</td>
-<td>order</td>
 </tr>
 <tr>
+<td>order</td>
 <td>override</td>
-<td>override-intltool</td>
 </tr>
 <tr>
+<td>override-intltool</td>
 <td>override-message-intltool</td>
-<td>package</td>
 </tr>
 <tr>
+<td>package</td>
 <td>parallel</td>
-<td>partial</td>
 </tr>
 <tr>
+<td>partial</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-configure</td>
 </tr>
 <tr>
+<td>pre-configure</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>readme-all</td>
-<td>regcomp</td>
 </tr>
 <tr>
+<td>regcomp</td>
 <td>relro</td>
-<td>rename</td>
 </tr>
 <tr>
+<td>rename</td>
 <td>reorder</td>
-<td>replace</td>
 </tr>
 <tr>
+<td>replace</td>
 <td>replace_interpreter</td>
-<td>reproducible</td>
 </tr>
 <tr>
+<td>reproducible</td>
 <td>resolv</td>
-<td>root</td>
 </tr>
 <tr>
+<td>root</td>
 <td>ruby</td>
-<td>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>show</td>
-<td>show-all</td>
 </tr>
 <tr>
+<td>show-all</td>
 <td>show-build-defs</td>
-<td>show-depends</td>
 </tr>
 <tr>
+<td>show-depends</td>
 <td>show-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>ssp</td>
-<td>st_mode</td>
 </tr>
 <tr>
+<td>st_mode</td>
 <td>stage-install</td>
-<td>strip</td>
 </tr>
 <tr>
-<td>strnlen</td>
+<td>strip</td>
 <td>strong</td>
 </tr>
 <tr>
diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index b5396c06258..ad803486588 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -147,8 +147,6 @@ II. The pkgsrc developer's guide
 
             12.1.1. Perl modules
             12.1.2. Python modules and programs
-            12.1.3. R packages
-            12.1.4. TeX packages
 
         12.2. Examples
 
@@ -2374,8 +2372,6 @@ Table of Contents
 
         12.1.1. Perl modules
         12.1.2. Python modules and programs
-        12.1.3. R packages
-        12.1.4. TeX packages
 
     12.2. Examples
 
@@ -2624,8 +2620,6 @@ Table of Contents
 
     12.1.1. Perl modules
     12.1.2. Python modules and programs
-    12.1.3. R packages
-    12.1.4. TeX packages
 
 12.2. Examples
 
@@ -2766,16 +2760,6 @@ PYTHON_VERSIONED_DEPENDENCIES=dialog
 
 Look inside versioned_dependencies.mk for a list of supported packages.
 
-12.1.3. R packages
-
-Simple R packages from CRAN are handled automatically by R2pkg, including
-dependencies.
-
-12.1.4. TeX packages
-
-TeX and LaTeX packages from CTAN are handled automatically by url2pkg,
-including dependencies.
-
 12.2. Examples
 
 12.2.1. How the www/nvu package came into pkgsrc
@@ -8718,126 +8702,125 @@ JPEG_DEFAULT                         KERBEROS
 KERMIT_SUID_UUCP                     KJS_USE_PCRE
 KNEWS_DOMAIN_FILE                    KNEWS_DOMAIN_NAME
 KRB5_ACCEPTED                        KRB5_DEFAULT
-LANGUAGES                            LAPACK_LIBS
-LATEX2HTML_ICONPATH                  LDCONFIG_ADD_CMD
-LDCONFIG_REMOVE_CMD                  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                            LOVE_VERSION
-LP64PLATFORMS                        MACHINE_PLATFORM
-MAILAGENT_DOMAIN                     MAILAGENT_EMAIL
-MAILAGENT_FQDN                       MAILAGENT_ORGANIZATION
-MAJORDOMO_HOMEDIR                    MAJOR_OS_VERSION
-MAKEINFO_ARGS                        MAKE_DIRS
-MAKE_DIRS_PERMS                      MAKE_ENV
-MAKE_FILE                            MAKE_FLAGS
-MAKE_JOBS                            MAKE_JOBS_SAFE
-MAKE_PROGRAM                         MANINSTALL
-MANZ                                 MASTER_SITES
-MASTER_SITE_BACKUP                   MASTER_SITE_CYGWIN
-MASTER_SITE_GNOME                    MASTER_SITE_GNU
-MASTER_SITE_LOCAL                    MASTER_SITE_MOZILLA
-MASTER_SITE_OPENOFFICE               MASTER_SITE_OVERRIDE
-MASTER_SITE_PERL_CPAN                MASTER_SITE_SUNSITE
-MASTER_SITE_SUSE                     MASTER_SITE_TEX_CTAN
-MASTER_SITE_XCONTRIB                 MASTER_SITE_XEMACS
-MASTER_SORT                          MASTER_SORT_RANDOM
-MASTER_SORT_REGEX                    MECAB_CHARSET
-MEDIATOMB_GROUP                      MEDIATOMB_USER
-MIPSPROBASE                          MIREDO_GROUP
-MIREDO_USER                          MISSING_FEATURES
-MKDIR                                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_PKGSRCDIR
-MYSQL_USER                           MYSQL_VERSIONS_ACCEPTED
-MYSQL_VERSION_DEFAULT                NAGIOSCMD_GROUP
-NAGIOSDIR                            NAGIOS_GROUP
-NAGIOS_USER                          NATIVE_APPEND_ABI
-NATIVE_APPEND_ELF                    NATIVE_EXEC_FMT
-NATIVE_MACHINE_PLATFORM              NATIVE_OBJECT_FMT
-NBPAX_PROGRAM_PREFIX                 NETBSD_LOGIN_NAME
-NMH_EDITOR                           NMH_MTA
-NMH_PAGER                            NOLOGIN
-NONZERO_FILESIZE_P                   NOTE
-NOT_FOR_PLATFORM                     NOT_PAX_ASLR_SAFE
-NOT_PAX_MPROTECT_SAFE                NO_BUILD
-NO_CHECKSUM                          NO_CONFIGURE
-NO_SKIP                              NS_PREFERRED
-NULLMAILER_GROUP                     NULLMAILER_USER
-OASIS                                OASIS_BUILD_ARGS
-OBJHOSTNAME                          OBJMACHINE
-OCAML_FINDLIB_DIRS                   OCAML_FINDLIB_REGISTER
-OCAML_FINDLIB_REGISTER_VERBOSE       OCAML_SITELIBDIR
-OCAML_TOPKG_DOCDIR                   OCAML_USE_DUNE
-OCAML_USE_FINDLIB                    OCAML_USE_JBUILDER
-OCAML_USE_OASIS                      OCAML_USE_OASIS_DYNRUN
-OCAML_USE_OPAM                       OCAML_USE_OPT_COMPILER
-OCAML_USE_TOPKG                      OMF
-ONLY_FOR_COMPILER                    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                           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
+LANGUAGES                            LATEX2HTML_ICONPATH
+LDCONFIG_ADD_CMD                     LDCONFIG_REMOVE_CMD
+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
+LOVE_VERSION                         LP64PLATFORMS
+MACHINE_PLATFORM                     MAILAGENT_DOMAIN
+MAILAGENT_EMAIL                      MAILAGENT_FQDN
+MAILAGENT_ORGANIZATION               MAJORDOMO_HOMEDIR
+MAJOR_OS_VERSION                     MAKEINFO_ARGS
+MAKE_DIRS                            MAKE_DIRS_PERMS
+MAKE_ENV                             MAKE_FILE
+MAKE_FLAGS                           MAKE_JOBS
+MAKE_JOBS_SAFE                       MAKE_PROGRAM
+MANINSTALL                           MANZ
+MASTER_SITES                         MASTER_SITE_BACKUP
+MASTER_SITE_CYGWIN                   MASTER_SITE_GNOME
+MASTER_SITE_GNU                      MASTER_SITE_LOCAL
+MASTER_SITE_MOZILLA                  MASTER_SITE_OPENOFFICE
+MASTER_SITE_OVERRIDE                 MASTER_SITE_PERL_CPAN
+MASTER_SITE_SUNSITE                  MASTER_SITE_SUSE
+MASTER_SITE_TEX_CTAN                 MASTER_SITE_XCONTRIB
+MASTER_SITE_XEMACS                   MASTER_SORT
+MASTER_SORT_RANDOM                   MASTER_SORT_REGEX
+MECAB_CHARSET                        MEDIATOMB_GROUP
+MEDIATOMB_USER                       MIPSPROBASE
+MIREDO_GROUP                         MIREDO_USER
+MISSING_FEATURES                     MKDIR
+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_PKGSRCDIR                      MYSQL_USER
+MYSQL_VERSIONS_ACCEPTED              MYSQL_VERSION_DEFAULT
+NAGIOSCMD_GROUP                      NAGIOSDIR
+NAGIOS_GROUP                         NAGIOS_USER
+NATIVE_APPEND_ABI                    NATIVE_APPEND_ELF
+NATIVE_EXEC_FMT                      NATIVE_MACHINE_PLATFORM
+NATIVE_OBJECT_FMT                    NBPAX_PROGRAM_PREFIX
+NETBSD_LOGIN_NAME                    NMH_EDITOR
+NMH_MTA                              NMH_PAGER
+NOLOGIN                              NONZERO_FILESIZE_P
+NOTE                                 NOT_FOR_PLATFORM
+NOT_PAX_ASLR_SAFE                    NOT_PAX_MPROTECT_SAFE
+NO_BUILD                             NO_CHECKSUM
+NO_CONFIGURE                         NO_SKIP
+NS_PREFERRED                         NULLMAILER_GROUP
+NULLMAILER_USER                      OASIS
+OASIS_BUILD_ARGS                     OBJHOSTNAME
+OBJMACHINE                           OCAML_FINDLIB_DIRS
+OCAML_FINDLIB_REGISTER               OCAML_FINDLIB_REGISTER_VERBOSE
+OCAML_SITELIBDIR                     OCAML_TOPKG_DOCDIR
+OCAML_USE_DUNE                       OCAML_USE_FINDLIB
+OCAML_USE_JBUILDER                   OCAML_USE_OASIS
+OCAML_USE_OASIS_DYNRUN               OCAML_USE_OPAM
+OCAML_USE_OPT_COMPILER               OCAML_USE_TOPKG
+OMF                                  ONLY_FOR_COMPILER
+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
+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_CHANGES                       PKGSRC_COMPILER
 PKGSRC_KEEP_BIN_PKGS                 PKGSRC_LOCKTYPE
 PKGSRC_MAKE_ENV                      PKGSRC_MESSAGE_RECIPIENTS
@@ -9055,11 +9038,10 @@ ZSH_STATIC                           __stdc__
 _vargroups                           add
 all                                  alternatives
 aslr                                 asprintf
-atlas                                autoconf
-automake                             autoreconf
-awk                                  bash
-big-endian                           bin-install
-binpkg-list                          blas
+autoconf                             automake
+autoreconf                           awk
+bash                                 big-endian
+bin-install                          binpkg-list
 bootstrap-depends                    broken
 broken_on_platform                   build
 build-env                            buildlink-directories
@@ -9119,57 +9101,55 @@ interp                               interpreter
 intl                                 iso
 kerberos                             krb
 krb5                                 ksh
-lapack                               latex
-libnbcompat                          libs
-libtool                              licence
-license                              lintl
-little-endian                        lock
-locking                              lvalue
-make                                 makesum
-memory                               mercurial
-meta                                 meta-package
-meta_package                         mit-krb5
-mk.conf                              mkl
+latex                                libnbcompat
+libs                                 libtool
+licence                              license
+lintl                                little-endian
+lock                                 locking
+lvalue                               make
+makesum                              memory
+mercurial                            meta
+meta-package                         meta_package
+mit-krb5                             mk.conf
 mount                                mprotect
 mremap                               nb
 nbcompat                             no
 obstack                              obstack_ptr_grow
 occurs                               only
-openblas                             options
-options.mk                           order
-override                             override-intltool
-override-message-intltool            package
-parallel                             partial
-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-configure
-pre-extract                          pre-fetch
-print-go-deps                        print-plist
-print-summary-data                   privileged-install-hook
-pypi                                 python
-readme-all                           regcomp
-relro                                rename
-reorder                              replace
-replace_interpreter                  reproducible
-resolv                               root
-ruby                                 setenv
-setgid                               setprogname
-setuid                               sh
-show                                 show-all
-show-build-defs                      show-depends
-show-deps                            show-distfiles
-show-downlevel                       show-subdir-var
-show-tools                           show-var
-show-vars                            snprintf
-ssp                                  st_mode
-stage-install                        strip
-strnlen                              strong
+options                              options.mk
+order                                override
+override-intltool                    override-message-intltool
+package                              parallel
+partial                              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-configure                        pre-extract
+pre-fetch                            print-go-deps
+print-plist                          print-summary-data
+privileged-install-hook              pypi
+python                               readme-all
+regcomp                              relro
+rename                               reorder
+replace                              replace_interpreter
+reproducible                         resolv
+root                                 ruby
+setenv                               setgid
+setprogname                          setuid
+sh                                   show
+show-all                             show-build-defs
+show-depends                         show-deps
+show-distfiles                       show-downlevel
+show-subdir-var                      show-tools
+show-var                             show-vars
+snprintf                             ssp
+st_mode                              stage-install
+strip                                strong
 subst                                subversion
 sun                                  sunpro
 sunwspro                             svn