regen

1 files changed, 20 insertions, 76 deletions

diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index 4de0ce7488a..d59212245ae 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -1416,7 +1416,12 @@ to enable for a package: PKG_DEFAULT_OPTIONS, which can be used to select or
 disable options for all packages that support them, and PKG_OPTIONS.pkgbase,
 which can be used to select or disable options specifically for package pkgbase
 . Options listed in these variables are selected, options preceded by "-" are
-disabled.
+disabled. A few examples:
+
+$ grep "PKG.*OPTION" /etc/mk.conf
+PKG_DEFAULT_OPTIONS=    -arts -dvdread -esound
+PKG_OPTIONS.kdebase=    debug -sasl
+PKG_OPTIONS.apache=     suexec
 
 The following settings are consulted in the order given, and the last setting
 that selects or disables an option is used:
@@ -1544,14 +1549,6 @@ briefly described here.
   * Another important variable is BULK_PREREQ, which is a list of packages that
     should be always available while building other packages.
 
-Some other options are scattered in the pkgsrc infrastructure:
-
-  * CHECK_FILES can be set to "yes" to check that the installed set of files
-    matches the PLIST.
-
-  * CHECK_INTERPRETER can be set to "yes" to check that the installed "#!
-    "-scripts will find their interpreter.
-
 6.3.1.3. pre-build.local
 
 It is possible to configure the bulk build to perform certain site-specific
@@ -2231,7 +2228,7 @@ Table of Contents
     11.2. Writing buildlink3.mk files
 
         11.2.1. Anatomy of a buildlink3.mk file
-        11.2.2. Updating BUILDLINK_DEPENDS. pkg in buildlink3.mk files
+        11.2.2. Updating BUILDLINK_DEPENDS.pkg in buildlink3.mk files
 
     11.3. Writing builtin.mk files
 
@@ -3240,8 +3237,8 @@ dependency on pkg is added. Several important variables are set in the section:
     is selected by setting BUILDLINK_DEPMETHOD.pkg to "build". By default, the
     full dependency is used.
 
-  * BUILDLINK_INCDIRS.pkg and BUILDLINK_LIBDIRS. pkg (not shown above) are
-    lists of subdirectories of ${BUILDLINK_PREFIX.pkg} to add to the header and
+  * BUILDLINK_INCDIRS.pkg and BUILDLINK_LIBDIRS.pkg (not shown above) are lists
+    of subdirectories of ${BUILDLINK_PREFIX.pkg} to add to the header and
     library search paths. These default to "include" and "lib" respectively.
 
   * BUILDLINK_CPPFLAGS.pkg (not shown above) is the list of preprocessor flags
@@ -3280,7 +3277,7 @@ dependencies. Including these buildlink3.mk files means that the headers and
 libraries for these dependencies are also symlinked into ${BUILDLINK_DIR}
 whenever the pkg buildlink3.mk file is included.
 
-11.2.2. Updating BUILDLINK_DEPENDS. pkg in buildlink3.mk files
+11.2.2. Updating BUILDLINK_DEPENDS.pkg in buildlink3.mk files
 
 There are two situations that require increasing the dependency listed in
 BUILDLINK_DEPENDS.pkg after a package update:
@@ -3299,9 +3296,9 @@ settle for an older one which will not contain the necessary shared libraries.
 
 Please take careful consideration before adjusting BUILDLINK_DEPENDS.pkg as we
 don't want to cause unneeded package deletions and rebuilds. In many cases, new
-versions of packages work just fine with older dependencies. See Section
-15.1.4, "Handling dependencies" for more information about dependencies on
-other packages, including the BUILDLINK_RECOMMENDED and RECOMMENDED
+versions of packages work just fine with older dependencies. See
+Section 15.1.4, "Handling dependencies" for more information about dependencies
+on other packages, including the BUILDLINK_RECOMMENDED and RECOMMENDED
 definitions.
 
 11.3. Writing builtin.mk files
@@ -3838,14 +3835,14 @@ supported by the package, and any default options settings if needed.
  6. PKG_SUGGESTED_OPTIONS is a list of build options which are enabled by
     default.
 
- 7. PKG_OPTIONS_LEGACY_VARS is a list of "USE_VARIABLE: option" pairs that map
+ 7. PKG_OPTIONS_LEGACY_VARS is a list of "USE_VARIABLE:option" pairs that map
     legacy /etc/mk.conf variables to their option counterparts. Pairs should be
     added with "+=" to keep the listing of global legacy variables. A warning
     will be issued if the user uses a legacy variable.
 
- 8. PKG_OPTIONS_LEGACY_OPTS is a list of "old-option: new-option" pairs that
-    map options that have been renamed to their new counterparts. Pairs should
-    be added with "+=" to keep the listing of global legacy options. A warning
+ 8. PKG_OPTIONS_LEGACY_OPTS is a list of "old-option:new-option" pairs that map
+    options that have been renamed to their new counterparts. Pairs should be
+    added with "+=" to keep the listing of global legacy options. A warning
     will be issued if the user uses a legacy option.
 
  9. PKG_LEGACY_OPTIONS is a list of options implied by deprecated variables
@@ -4174,62 +4171,9 @@ defaults to "all".
 
 Once the build stage has completed, the final step is to install the software
 in public directories, so users can access the programs and files. As in the
-build-target, MAKE_PROGRAM is invoked on MAKEFILE here, but with the
-INSTALL_TARGET instead, the latter defaulting to "install" (plus "install.man",
-if USE_IMAKE is set).
-
-In the install phase, the following variables are useful. They are all
-variations of the install(1) command that have the owner, group and permissions
-preset. INSTALL is the plain install command. The specialized variants,
-together with their intended use, are:
-
-INSTALL_PROGRAM_DIR
-
-    directories that contain binaries
-
-INSTALL_SCRIPT_DIR
-
-    directories that contain scripts
-
-INSTALL_LIB_DIR
-
-    directories that contain shared and static libraries
-
-INSTALL_DATA_DIR
-
-    directories that contain data files
-
-INSTALL_MAN_DIR
-
-    directories that contain man pages
-
-INSTALL_PROGRAM
-
-    binaries that can be stripped from debugging symbols
-
-INSTALL_SCRIPT
-
-    binaries that cannot be unstripped
-
-INSTALL_GAME
-
-    game binaries
-
-INSTALL_LIB
-
-    shared and static libraries
-
-INSTALL_DATA
-
-    data files
-
-INSTALL_GAME_DATA
-
-    data files for games
-
-INSTALL_MAN
-
-    man pages
+build-target, $MAKE_PROGRAM is invoked on $MAKEFILE here, but with the
+$INSTALL_TARGET instead, the latter defaulting to "install" (plus
+"install.man", if USE_IMAKE is set).
 
 14.15. The package phase