 @@ -5343,70 +5343,57 @@ left to do.
 <a name="creating.python-module"></a>14.1.1. Python modules and programs</h3></div></div></div>
 <p>Python modules and programs packages are easily created using a
 set of predefined variables.</p>
 <p>
 If some Python versions are not supported by the software, set the
 <code class="varname">PYTHON_VERSIONS_INCOMPATIBLE</code> variable to the Python versions
 that are not supported, e.g.
 </p>
 <pre class="programlisting">
 PYTHON_VERSIONS_INCOMPATIBLE=       27
 </pre>
 <p>
 If the packaged software is a Python module, include
-<code class="filename">../../lang/python/wheel.mk</code>.
+<code class="filename">../../lang/python/wheel.mk</code>.  Note per PEP-518,
-Note per PEP-518, the minimum and default requirements to create .whl files
+the minimum and default requirements to create .whl files are
-are py-setuptools plus py-wheel; however, there are various other possible
+<a href="https://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/devel/py-setuptools/index.html" target="_top"><code class="filename">devel/py-setuptools</code></a> plus <a href="https://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/devel/py-wheel/index.html" target="_top"><code class="filename">devel/py-wheel</code></a>; however, there are various other
-tools that projects can use. Thus inclusion of <code class="filename">wheel.mk</code>
+possible tools that projects can use. Thus inclusion of
-does not imply these defaults are defined as TOOL_DEPENDS. Whatever the project
+<code class="filename">wheel.mk</code> does not imply these defaults are
-specifically requires as packaging tools must be defined in the package Makefile.
+defined as <code class="varname">TOOL_DEPENDS</code>. Whatever the project
 specifically requires as packaging tools must be defined in the
 package Makefile.
 </p>
 <p>The package directory should be called
 <span class="quote">&#8220;<span class="quote">py-software</span>&#8221;</span> and <code class="varname">PKGNAME</code> should be set to
 <span class="quote">&#8220;<span class="quote">${PYPKGPREFIX}-${DISTNAME}</span>&#8221;</span>, e.g.
 </p>
 <pre class="programlisting">
 DISTNAME=   foopymodule-1.2.10
 PKGNAME=    ${PYPKGPREFIX}-${DISTNAME}
 </pre>
 <p>
 For software in PyPi, the name should match what PyPi specifies for
 "pip install software".
 </p>
 <p>If it is an application, include
 <span class="quote">&#8220;<span class="quote"><code class="filename">../../lang/python/application.mk</code></span>&#8221;</span>.
 In order to correctly set the path to the Python interpreter, use the
 <code class="varname">REPLACE_PYTHON</code> variable and set it to the list of files
 (paths relative to <code class="varname">WRKSRC</code>) that must be corrected.
 For example:
 </p>
 <pre class="programlisting">
 REPLACE_PYTHON=   *.py
 </pre>
 <p>Some Python modules have separate distributions for Python-2.x
 and Python-3.x support. In pkgsrc this is handled by the
 <code class="filename">versioned_dependencies.mk</code> file. Set
 <code class="varname">PYTHON_VERSIONED_DEPENDENCIES</code> to the list of
 packages that should be depended upon and include
 <span class="quote">&#8220;<span class="quote"><code class="filename">../../lang/python/versioned_dependencies.mk</code></span>&#8221;</span>,
 then the pkgsrc infrastructure will depend on the appropriate package
 version. For example:
 </p>
 <pre class="programlisting">
 PYTHON_VERSIONED_DEPENDENCIES=dialog
 </pre>
 <p>
 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>14.1.2. R packages</h3></div></div></div>
 <p>Simple R packages from <a class="ulink" href="https://cran.r-project.org/web/packages/available_packages_by_name.html" target="_top">CRAN</a>
 are handled automatically by <span class="command"><strong>R2pkg</strong></span>, which is
 available in <a href="https://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/pkgtools/R2pkg/index.html" target="_top"><code class="filename">pkgtools/R2pkg</code></a>.
 Individual packages (and optionally their dependencies) may be created
 and updated.  R packages generally follow the same form, and most of
 the relevant information needed is contained in a
 <code class="filename">DESCRIPTION</code> file as part of each R package on
 <a class="ulink" href="https://cran.r-project.org/web/packages/available_packages_by_name.html" target="_top">CRAN</a>.
 Consequently, <span class="command"><strong>R2pkg</strong></span> downloads that information and

 @@ -4215,57 +4215,48 @@ package involves only a few steps.
 .1.1. Python modules and programs
 Python modules and programs packages are easily created using a set of
 predefined variables.
 If some Python versions are not supported by the software, set the
 PYTHON_VERSIONS_INCOMPATIBLE variable to the Python versions that are not
 supported, e.g.
 PYTHON_VERSIONS_INCOMPATIBLE=       27
 If the packaged software is a Python module, include ../../lang/python/
 wheel.mk. Note per PEP-518, the minimum and default requirements to create .whl
-files are py-setuptools plus py-wheel; however, there are various other
+files are devel/py-setuptools plus devel/py-wheel; however, there are various
-possible tools that projects can use. Thus inclusion of wheel.mk does not imply
+other possible tools that projects can use. Thus inclusion of wheel.mk does not
-these defaults are defined as TOOL_DEPENDS. Whatever the project specifically
+imply these defaults are defined as TOOL_DEPENDS. Whatever the project
-requires as packaging tools must be defined in the package Makefile.
+specifically requires as packaging tools must be defined in the package
 Makefile.
 The package directory should be called "py-software" and PKGNAME should be set
 to "${PYPKGPREFIX}-${DISTNAME}", e.g.
 DISTNAME=   foopymodule-1.2.10
 PKGNAME=    ${PYPKGPREFIX}-${DISTNAME}
 For software in PyPi, the name should match what PyPi specifies for "pip
 install software".
 If it is an application, include "../../lang/python/application.mk". In order
 to correctly set the path to the Python interpreter, use the REPLACE_PYTHON
 variable and set it to the list of files (paths relative to WRKSRC) that must
 be corrected. For example:
 REPLACE_PYTHON=   *.py
 Some Python modules have separate distributions for Python-2.x and Python-3.x
 support. In pkgsrc this is handled by the versioned_dependencies.mk file. Set
 PYTHON_VERSIONED_DEPENDENCIES to the list of packages that should be depended
 upon and include "../../lang/python/versioned_dependencies.mk", then the pkgsrc
 infrastructure will depend on the appropriate package version. For example:
 PYTHON_VERSIONED_DEPENDENCIES=dialog
 Look inside versioned_dependencies.mk for a list of supported packages.
 .1.2. R packages
 Simple R packages from CRAN are handled automatically by R2pkg, which is
 available in pkgtools/R2pkg. Individual packages (and optionally their
 dependencies) may be created and updated. R packages generally follow the same
 form, and most of the relevant information needed is contained in a DESCRIPTION
 file as part of each R package on CRAN. Consequently, R2pkg downloads that
 information and creates or updates a package in the canonical form. The
 resulting package should be reviewed for correctness.
 .1.3. TeXlive packages
 TeXlive packages from CTAN are handled automatically by texlive2pkg, which is