regen

1 files changed, 18 insertions, 12 deletions

diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index 138d0e368a5..e6d128a10c5 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -1937,6 +1937,8 @@ XXX
   * DEPENDS_TARGET: By default, dependencies are only installed, and no binary
     package is created for them. You can set this variable to package-install
     to automatically create binary packages after installing dependencies.
+    Please note that the PKGSRC_KEEP_BIN_PKGScan be set to yes to preserve
+    binary packages when using the install as well.
 
 5.3. Variables affecting the installation process
 
@@ -3507,7 +3509,10 @@ any.
     .Z.
 
   * PATCH_SITES: Primary location(s) for distribution patch files (see
-    PATCHFILES below) if not found locally.
+    PATCHFILES above) if not found locally.
+
+  * PATCH_DIST_STRIP: an argument to patch(1) that sets the pathname strip
+    count to help find the correct files to patch. It defaults to -p0.
 
 The third section contains the following variables.
 
@@ -6594,25 +6599,26 @@ being present in source form during the build.)
 
 Your package may conflict with other packages a user might already have
 installed on his system, e.g. if your package installs the same set of files as
-another package in the pkgsrc tree.
+another package in the pkgsrc tree or has the same PKGNAME.
 
-In this case you can set CONFLICTS to a space-separated list of packages
-(including version string) your package conflicts with.
+These cases are handled automatically by the packaging tools at package
+installation time and do not need to be handled manually.
 
-For example, x11/Xaw3d and x11/Xaw-Xpm install the same shared library, thus
-you set in pkgsrc/x11/Xaw3d/Makefile:
+In case the conflicts can not be recognized automatically (e.g., packages using
+the same config file location but no other shared files), you can set CONFLICTS
+to a space-separated list of packages (including version string) your package
+conflicts with.
 
-CONFLICTS=      Xaw-Xpm-[0-9]*
+For example, if both foo/bar and foo/baz use the same config file, you would
+set in foo/bar/Makefile:
 
+CONFLICTS=      baz-[0-9]*
 
-and in pkgsrc/x11/Xaw-Xpm/Makefile:
 
-CONFLICTS=      Xaw3d-[0-9]*
+and in pkgsrc/foo/baz/Makefile:
 
+CONFLICTS=      bar-[0-9]*
 
-Packages will automatically conflict with other packages with the name prefix
-and a different version string. "Xaw3d-1.5" e.g. will automatically conflict
-with the older version "Xaw3d-1.3".
 
 19.1.8. Packages that cannot or should not be built