[pkgsrc/trunk]: pkgsrc/doc doc/pkgsrc.*: regen

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/doc doc/pkgsrc.*: regen
From: gutteridge <gutteridge%pkgsrc.org@localhost>
Date: Tue, 19 Jul 2022 03:02:02 +0000

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8bd21a461785
branches:  trunk
changeset: 382054:8bd21a461785
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Tue Jul 19 02:01:14 2022 +0000

description:
doc/pkgsrc.*: regen

diffstat:

 doc/pkgsrc.html |  2142 +++++++++++++++++++++++++++---------------------------
 doc/pkgsrc.txt  |  1479 +++++++++++++++++++------------------
 2 files changed, 1826 insertions(+), 1795 deletions(-)

diffs (truncated from 4765 to 300 lines):

diff -r 83fa2e522202 -r 8bd21a461785 doc/pkgsrc.html
--- a/doc/pkgsrc.html   Tue Jul 19 01:58:04 2022 +0000
+++ b/doc/pkgsrc.html   Tue Jul 19 02:01:14 2022 +0000
@@ -1288,11 +1288,10 @@
     to get them. The first place where you should look is on the main
     pkgsrc CDN in the directory <a class="ulink" href="https://cdn.NetBSD.org/pub/pkgsrc/packages/"; target="_top"><code class="filename">/pub/pkgsrc/packages</code></a>.</p>
 <p>This directory contains binary packages for multiple
-    platforms. First, select your operating system. (Ignore the
-    directories with version numbers attached to it, they just exist for
-    legacy reasons.) Then, select your hardware architecture, and in the
-    third step, the OS version and the <span class="quote">&#8220;<span class="quote">version</span>&#8221;</span> of pkgsrc.</p>
-<p>In this directory, you often find a file called
+    platforms. First, select your operating system. Then, select your
+    hardware architecture, and in the third step, the OS version and
+    the <span class="quote">&#8220;<span class="quote">version</span>&#8221;</span> of pkgsrc.</p>
+<p>In this directory, you may find a file called
     <code class="filename">bootstrap.tar.gz</code> which contains the package
     management tools. If the file is missing, it is likely that your
     operating system already provides those tools. Download the file and
@@ -5242,6 +5241,10 @@
 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
@@ -7712,10 +7715,11 @@
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="conflicts"></a>21.1.6. Handling conflicts with other packages</h3></div></div></div>
-<p>Your package may conflict with other packages a user might
-    already have installed on his system, e.g. if your package
+<p>Your package may conflict with other packages users might
+    already have installed on their system, e.g., if your package
     installs the same set of files as another package in the pkgsrc
-    tree or has the same <code class="varname">PKGNAME</code>.</p>
+    tree or has the same <code class="varname">PKGNAME</code> (though, the latter
+    would arguably be a bug in itself).</p>
 <p>For example, <a href="https://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/x11/libXaw3d/index.html"; target="_top"><code class="filename">x11/libXaw3d</code></a>
     and <a href="https://cdn.NetBSD.org/pub/pkgsrc/current/pkgsrc/x11/Xaw-Xpm/index.html"; target="_top"><code class="filename">x11/Xaw-Xpm</code></a>
     install the same shared library, thus you set in
@@ -11993,1171 +11997,1175 @@
 </tr>
 <tr>
 <td>CDROM_PKG_URL_HOST</td>
+<td>CHANGES</td>
+</tr>
+<tr>
 <td>CHECK_COMPILER</td>
-</tr>
-<tr>
 <td>CHECK_FAKEHOME</td>
+</tr>
+<tr>
 <td>CHECK_FILES</td>
-</tr>
-<tr>
 <td>CHECK_FILES_SKIP</td>
+</tr>
+<tr>
 <td>CHECK_FILES_STRICT</td>
-</tr>
-<tr>
 <td>CHECK_HEADERS</td>
+</tr>
+<tr>
 <td>CHECK_HEADERS_SKIP</td>
-</tr>
-<tr>
 <td>CHECK_INTERPRETER</td>
+</tr>
+<tr>
 <td>CHECK_INTERPRETER_SKIP</td>
-</tr>
-<tr>
 <td>CHECK_PERMS</td>
+</tr>
+<tr>
 <td>CHECK_PERMS_AUTOFIX</td>
-</tr>
-<tr>
 <td>CHECK_PERMS_SKIP</td>
+</tr>
+<tr>
 <td>CHECK_PIE</td>
-</tr>
-<tr>
 <td>CHECK_PIE_SKIP</td>
+</tr>
+<tr>
 <td>CHECK_PIE_SUPPORTED</td>
-</tr>
-<tr>
 <td>CHECK_PORTABILITY</td>
+</tr>
+<tr>
 <td>CHECK_PORTABILITY_EXPERIMENTAL</td>
-</tr>
-<tr>
 <td>CHECK_PORTABILITY_SKIP</td>
+</tr>
+<tr>
 <td>CHECK_RELRO</td>
-</tr>
-<tr>
 <td>CHECK_RELRO_SKIP</td>
+</tr>
+<tr>
 <td>CHECK_RELRO_SUPPORTED</td>
-</tr>
-<tr>
 <td>CHECK_SHLIBS</td>
+</tr>
+<tr>
 <td>CHECK_SHLIBS_SKIP</td>
-</tr>
-<tr>
 <td>CHECK_SHLIBS_SUPPORTED</td>
+</tr>
+<tr>
 <td>CHECK_SHLIBS_TOXIC</td>
-</tr>
-<tr>
 <td>CHECK_SSP</td>
+</tr>
+<tr>
 <td>CHECK_SSP_SKIP</td>
-</tr>
-<tr>
 <td>CHECK_SSP_SUPPORTED</td>
+</tr>
+<tr>
 <td>CHECK_STRIPPED</td>
-</tr>
-<tr>
 <td>CHECK_STRIPPED_SKIP</td>
+</tr>
+<tr>
 <td>CHECK_WRKREF</td>
-</tr>
-<tr>
 <td>CHECK_WRKREF_EXTRA_DIRS</td>
+</tr>
+<tr>
 <td>CHECK_WRKREF_SKIP</td>
-</tr>
-<tr>
 <td>CLAMAV_DBDIR</td>
+</tr>
+<tr>
 <td>CLAMAV_GROUP</td>
-</tr>
-<tr>
 <td>CLAMAV_USER</td>
+</tr>
+<tr>
 <td>CLANGBASE</td>
-</tr>
-<tr>
 <td>CLEANDEPENDS</td>
+</tr>
+<tr>
 <td>CMAKE_DEPENDENCIES_REWRITE</td>
-</tr>
-<tr>
 <td>CMAKE_INSTALL_NAME_DIR</td>
+</tr>
+<tr>
 <td>CMAKE_INSTALL_PREFIX</td>
-</tr>
-<tr>
 <td>CMAKE_MODULE_PATH_OVERRIDE</td>
+</tr>
+<tr>
 <td>CMAKE_PKGSRC_BUILD_FLAGS</td>
-</tr>
-<tr>
 <td>CMAKE_PREFIX_PATH</td>
+</tr>
+<tr>
 <td>CMAKE_USE_GNU_INSTALL_DIRS</td>
-</tr>
-<tr>
 <td>COMPILER_RPATH_FLAG</td>
+</tr>
+<tr>
 <td>COMPILER_USE_SYMLINKS</td>
-</tr>
-<tr>
 <td>CONFIGURE_ARGS</td>
+</tr>
+<tr>
 <td>CONFIGURE_DIRS</td>
-</tr>
-<tr>
 <td>CONFIGURE_ENV</td>
+</tr>
+<tr>
 <td>CONFIGURE_ENV_SHELL</td>
-</tr>
-<tr>
 <td>CONFIGURE_HAS_INFODIR</td>
+</tr>
+<tr>
 <td>CONFIGURE_HAS_MANDIR</td>
-</tr>
-<tr>
 <td>CONFIGURE_SCRIPT</td>
+</tr>
+<tr>
 <td>CONFIG_SHELL</td>
-</tr>
-<tr>
 <td>CONFIG_SHELL_FLAGS</td>
+</tr>
+<tr>
 <td>CONF_FILES</td>
-</tr>
-<tr>
 <td>CONF_FILES_MODE</td>
+</tr>
+<tr>
 <td>CONF_FILES_PERMS</td>
-</tr>
-<tr>
 <td>CONSERVER_DEFAULTHOST</td>
+</tr>
+<tr>
 <td>CONSERVER_DEFAULTPORT</td>
-</tr>
-<tr>
 <td>CP</td>
+</tr>
+<tr>
 <td>CPP</td>
-</tr>
-<tr>
 <td>CPP_PRECOMP_FLAGS</td>
+</tr>
+<tr>
 <td>CREATE_WRKDIR_SYMLINK</td>
-</tr>
-<tr>
 <td>CROSSBASE</td>
+</tr>
+<tr>
 <td>CTFCONVERT</td>
-</tr>
-<tr>
 <td>CTF_FILES_SKIP</td>
+</tr>
+<tr>
 <td>CTF_SUPPORTED</td>
-</tr>
-<tr>
 <td>CTYPE</td>
+</tr>
+<tr>
 <td>CUPS_GROUP</td>
-</tr>
-<tr>
 <td>CUPS_SYSTEM_GROUPS</td>
+</tr>
+<tr>
 <td>CUPS_USER</td>
-</tr>
-<tr>
 <td>CURSES_DEFAULT</td>
+</tr>
+<tr>
 <td>CURSES_TYPE</td>
-</tr>
-<tr>
 <td>CXX</td>
+</tr>
+<tr>
 <td>CYRUS_GROUP</td>
-</tr>
-<tr>
 <td>CYRUS_IDLE</td>
+</tr>
+<tr>
 <td>CYRUS_USER</td>
-</tr>
-<tr>
 <td>DAEMONTOOLS_GROUP</td>
+</tr>
+<tr>
 <td>DAEMONTOOLS_LOG_USER</td>
-</tr>
-<tr>
 <td>DARWIN_NO_SYSTEM_LIBS</td>
+</tr>
+<tr>
 <td>DARWIN_REQUIRES_FILTER</td>
-</tr>

Prev by Date: [pkgsrc/trunk]: pkgsrc/doc/guide/files fixes.xml: add a comment about conflic...
Next by Date: [pkgsrc/trunk]: pkgsrc/www/firefox firefox: note webrtc support is now x86-only
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc/guide/files fixes.xml: add a comment about conflic...
Next by Thread: [pkgsrc/trunk]: pkgsrc/www/firefox firefox: note webrtc support is now x86-only
Indexes:

Home | Main Index | Thread Index | Old Index