CVS commit: pkgsrc/doc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri May 10 12:31:21 UTC 2024

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

Log Message:
doc/pkgsrc.*: regen


To generate a diff of this commit:
cvs rdiff -u -r1.371 -r1.372 pkgsrc/doc/pkgsrc.html
cvs rdiff -u -r1.369 -r1.370 pkgsrc/doc/pkgsrc.txt

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

Modified files:

Index: pkgsrc/doc/pkgsrc.html
diff -u pkgsrc/doc/pkgsrc.html:1.371 pkgsrc/doc/pkgsrc.html:1.372
--- pkgsrc/doc/pkgsrc.html:1.371        Wed May  8 10:44:37 2024
+++ pkgsrc/doc/pkgsrc.html      Fri May 10 12:31:21 2024
@@ -5353,12 +5353,14 @@ PYTHON_VERSIONS_INCOMPATIBLE=       27
 </pre>
 <p>
 If the packaged software is a Python module, include
-<code class="filename">../../lang/python/wheel.mk</code>.
-Note per PEP-518, the minimum and default requirements to create .whl files
-are py-setuptools plus py-wheel; however, there are various other possible
-tools that projects can use. Thus inclusion of <code class="filename">wheel.mk</code>
-does not imply these defaults are defined as TOOL_DEPENDS. Whatever the project
-specifically requires as packaging tools must be defined in the package Makefile.
+<code class="filename">../../lang/python/wheel.mk</code>.  Note per PEP-518,
+the minimum and default requirements to create .whl files are
+<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
+possible tools that projects can use. Thus inclusion of
+<code class="filename">wheel.mk</code> does not imply these defaults are
+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
@@ -5382,21 +5384,6 @@ For example:
 <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">

Index: pkgsrc/doc/pkgsrc.txt
diff -u pkgsrc/doc/pkgsrc.txt:1.369 pkgsrc/doc/pkgsrc.txt:1.370
--- pkgsrc/doc/pkgsrc.txt:1.369 Wed May  8 10:44:37 2024
+++ pkgsrc/doc/pkgsrc.txt       Fri May 10 12:31:21 2024
@@ -4225,10 +4225,11 @@ 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
-possible tools that projects can use. Thus inclusion of wheel.mk does not imply
-these defaults are defined as TOOL_DEPENDS. Whatever the project specifically
-requires as packaging tools must be defined in the package Makefile.
+files are devel/py-setuptools plus devel/py-wheel; however, there are various
+other possible tools that projects can use. Thus inclusion of wheel.mk does not
+imply these defaults are defined as TOOL_DEPENDS. Whatever the project
+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.
@@ -4246,16 +4247,6 @@ 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.
-
 14.1.2. R packages
 
 Simple R packages from CRAN are handled automatically by R2pkg, which is