Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id F32ED84D41
	for <pkgsrc-changes@NetBSD.org>; Sat, 20 May 2023 15:43:54 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([IPv6:::1])
	by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025)
	with ESMTP id LEd-9SzTi1Wm for <pkgsrc-changes@netbsd.org>;
	Sat, 20 May 2023 15:43:54 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197])
	by mail.netbsd.org (Postfix) with ESMTP id E513484D05
	for <pkgsrc-changes@NetBSD.org>; Sat, 20 May 2023 15:43:53 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id DE61BFA87; Sat, 20 May 2023 15:43:53 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1684597433198310"
MIME-Version: 1.0
Date: Sat, 20 May 2023 15:43:53 +0000
From: "Roland Illig" <rillig@netbsd.org>
Subject: CVS commit: pkgsrc/doc/guide/files
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: rillig@netbsd.org
X-Mailer: log_accum
Message-Id: <20230520154353.DE61BFA87@cvs.NetBSD.org>

This is a multi-part message in MIME format.

--_----------=_1684597433198310
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	rillig
Date:		Sat May 20 15:43:53 UTC 2023

Modified Files:
	pkgsrc/doc/guide/files: buildlink.xml configuring.xml

Log Message:
doc/guide: move the PREFER section to the user's guide and rewrite it

The variables PREFER_PKGSRC and PREFER_NATIVE are user-settable,
therefore it was confusing to see them documented only in the developer
part.

Rewrite the whole section to sync with reality since neither of these
variables is tested for the word "no".


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/doc/guide/files/buildlink.xml
cvs rdiff -u -r1.59 -r1.60 pkgsrc/doc/guide/files/configuring.xml

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


--_----------=_1684597433198310
Content-Disposition: inline
Content-Length: 9279
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/doc/guide/files/buildlink.xml
diff -u pkgsrc/doc/guide/files/buildlink.xml:1.48 pkgsrc/doc/guide/files/buildlink.xml:1.49
--- pkgsrc/doc/guide/files/buildlink.xml:1.48	Tue Jan 24 14:32:37 2023
+++ pkgsrc/doc/guide/files/buildlink.xml	Sat May 20 15:43:53 2023
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $NetBSD: buildlink.xml,v 1.48 2023/01/24 14:32:37 wiz Exp $ -->
+<!-- $NetBSD: buildlink.xml,v 1.49 2023/05/20 15:43:53 rillig Exp $ -->
 
 <chapter id="buildlink">
   <title>Buildlink methodology</title>
@@ -570,73 +570,5 @@ CHECK_BUILTIN.foo?=     no
       files to symlink into <filename>${BUILDLINK_DIR}</filename> (via
       <varname>BUILDLINK_FILES.<replaceable>pkg</replaceable></varname>).</para>
     </sect2>
-
-    <sect2 id="native-or-pkgsrc-preference">
-      <title>Global preferences for native or pkgsrc software</title>
-
-      <para>When building packages, it's possible to choose whether to set
-	a global preference for using either the built-in (native)
-	version or the pkgsrc version of software to satisfy a
-	dependency.  This is controlled by setting
-	<varname>PREFER_PKGSRC</varname> and
-	<varname>PREFER_NATIVE</varname>.  These variables take values
-	of either <quote>yes</quote>, <quote>no</quote>, or a list of
-	packages.  <varname>PREFER_PKGSRC</varname> tells pkgsrc to
-	use the pkgsrc versions of software, while
-	<varname>PREFER_NATIVE</varname> tells pkgsrc to use the
-	built-in versions.  Preferences are determined by the most
-	specific instance of the package in either
-	<varname>PREFER_PKGSRC</varname> or
-	<varname>PREFER_NATIVE</varname>.  If a package is specified
-	in neither or in both variables, then
-	<varname>PREFER_PKGSRC</varname> has precedence over
-	<varname>PREFER_NATIVE</varname>.  For example, to require
-	using pkgsrc versions of software for all but the most basic
-      bits on a NetBSD system, you can set:</para>
-
-<programlisting>
-PREFER_PKGSRC=  yes
-PREFER_NATIVE=  getopt skey tcp_wrappers
-</programlisting>
-
-      <para>A package <emphasis>must</emphasis> have a
-      <filename>builtin.mk</filename>
-      file to be listed in <varname>PREFER_NATIVE</varname>,
-      otherwise it is simply ignored in that list.</para>
-
-      <para><varname>PREFER_PKGSRC</varname> and
-      <varname>PREFER_NATIVE</varname> should be set during bootstrap
-      to ensure that the bootstrap process does not use inapropriate
-      native tools as dependencies for core packages.
-
-<screen>
-&rprompt; <userinput>./bootstrap --prefer-pkgsrc yes --prefer-native openssl</userinput>
-</screen>
-
-      Switching between settings globally at a later date can introduce
-      complications with dependency resolution. This is caused by packages
-      built with the opposite preference being installed alongside each
-      other.  Hence, any changes to these variables after bootstrap will
-      necessitate rebuilding all packages depending on one whose preference
-      has been changed.  This is not trivial and should be avoided.</para>
-
-      <para>When using pkgsrc on Linux systems, there is high risk of
-      "leakage", where programs installed by pkgsrc may inadvertently use a
-      command or library not installed by pkgsrc, e.g. those installed by
-      yum or apt.  Such foreign dependencies may be installed, removed, or
-      upgraded to a version incompatible with the pkgsrc package at any
-      time, causing pkgsrc packages to subsequently malfunction.  Pkgsrc
-      cannot prevent this, as it has no control over other package managers.
-      Another potential problem is that under Redhat Enterprise and related
-      Linux systems, yum packages are only patched and never upgraded, so
-      eventually they may become too outdated for use by pkgsrc.  Even
-      intentionally using foreign dependencies, not considered leakage, can
-      lead to these problems, so it is generally discouraged.  In order to
-      minimize such problems, PREFER_PKGSRC defaults to "yes" on Linux systems.
-      This ensures that pkgsrc is aware of any changes to dependency packages
-      and can rebuild or upgrade the entire dependency tree as needed.  This
-      default can be overridden by setting --prefer-pkgsrc to "no" or a list of
-      packages, or by setting --prefer-native to "yes".</para>
-    </sect2>
   </sect1>
 </chapter>

Index: pkgsrc/doc/guide/files/configuring.xml
diff -u pkgsrc/doc/guide/files/configuring.xml:1.59 pkgsrc/doc/guide/files/configuring.xml:1.60
--- pkgsrc/doc/guide/files/configuring.xml:1.59	Thu Jan  5 01:42:15 2023
+++ pkgsrc/doc/guide/files/configuring.xml	Sat May 20 15:43:53 2023
@@ -1,4 +1,4 @@
-<!-- $NetBSD: configuring.xml,v 1.59 2023/01/05 01:42:15 gutteridge Exp $ -->
+<!-- $NetBSD: configuring.xml,v 1.60 2023/05/20 15:43:53 rillig Exp $ -->
 
 <chapter id="configuring">
   <title>Configuring pkgsrc</title>
@@ -119,6 +119,85 @@ spelling mistakes) takes place.</para>
       </itemizedlist></para>
   </sect1>
 
+  <sect1 id="native-or-pkgsrc-preference">
+    <title>Preferences for native or pkgsrc software</title>
+
+    <para>Whenever a package depends on a package that has a
+    <filename>builtin.mk</filename> file, the dependent package can
+    either use the built-in (native) version from the base system or the
+    pkgsrc-provided version.  This only affects dependencies, so it is
+    still possible to build the pkgsrc package <filename
+    role="pkg">devel/pcre++</filename> even when other packages depend
+    on the native pcre++ version instead.</para>
+
+    <para>To force using the pkgsrc-provided version for a particular
+    package, define <quote><varname>PREFER_PKGSRC</varname> =
+    <replaceable>package-ID</replaceable></quote> in &mk.conf;. To force
+    using the native package, define
+    <quote><varname>PREFER_NATIVE</varname> =
+    <replaceable>package-ID</replaceable></quote>. In both cases, the
+    <replaceable>package-ID</replaceable> is the one from the
+    <filename>buildlink3.mk</filename> of the package. In most cases,
+    this ID is the same as the directory name of the package, but for
+    example, <filename role="pkgpath">devel/pcre++</filename> has the
+    package ID <quote>pcrexx</quote>.</para>
+
+    <para>For the packages that are not listed by their package ID,
+    pkgsrc uses the pkgsrc-provided version if
+    <varname>PREFER_PKGSRC</varname> contains the word
+    <quote>yes</quote>. Otherwise, if <varname>PREFER_NATIVE</varname>
+    contains the word <quote>yes</quote>, pkgsrc uses the native
+    version. For example, to require using the pkgsrc-provided versions
+    for all but the most basic bits on a NetBSD system, you can
+    set:</para>
+
+<programlisting>
+PREFER_PKGSRC=  yes
+PREFER_NATIVE=  getopt skey tcp_wrappers
+</programlisting>
+
+    <para>A package <emphasis>must</emphasis> have a
+    <filename>builtin.mk</filename> file to be listed in
+    <varname>PREFER_NATIVE</varname>, otherwise it is simply ignored in
+    that list.</para>
+
+    <para><varname>PREFER_PKGSRC</varname> and
+    <varname>PREFER_NATIVE</varname> should be set during bootstrap to
+    ensure that the bootstrap process does not use inapropriate native
+    tools as dependencies for core packages.</para>
+
+<screen>
+&rprompt; <userinput>./bootstrap --prefer-pkgsrc yes --prefer-native openssl</userinput>
+</screen>
+
+    <para>Switching between settings globally at a later date can
+    introduce complications with dependency resolution.  This is caused
+    by packages built with the opposite preference being installed
+    alongside each other.  Hence, when changing any of these variables
+    after bootstrap, you need to rebuild all packages depending on those
+    whose preference has been changed.  This is not trivial and should
+    be avoided.</para>
+
+    <para>When using pkgsrc on Linux systems, there is high risk of
+    <quote>leakage</quote>, where programs installed by pkgsrc may
+    inadvertently use a command or library not installed by pkgsrc, e.g.
+    those installed by yum or apt.  Such foreign dependencies may be
+    installed, removed, or upgraded to a version incompatible with the
+    pkgsrc package at any time, causing pkgsrc packages to subsequently
+    malfunction.  Pkgsrc cannot prevent this, as it has no control over
+    other package managers. Another potential problem is that under
+    Redhat Enterprise and related Linux systems, yum packages are only
+    patched and never upgraded, so eventually they may become too
+    outdated for use by pkgsrc.  Even intentionally using foreign
+    dependencies, not considered leakage, can lead to these problems, so
+    it is generally discouraged.  In order to minimize such problems,
+    PREFER_PKGSRC defaults to <quote>yes</quote> on Linux systems. This ensures that
+    pkgsrc is aware of any changes to dependency packages and can
+    rebuild or upgrade the entire dependency tree as needed.  This
+    default can be overridden by setting --prefer-pkgsrc to a
+    list of packages and --prefer-native to <quote>yes</quote>.</para>
+  </sect1>
+
   <sect1 id="variables-affecting-installation">
     <title>Variables affecting the installation process</title>
 


--_----------=_1684597433198310--