regen

1 files changed, 33 insertions, 34 deletions

diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index 90ebcc65aa2..a58e94c48cc 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -59,7 +59,6 @@ I. The pkgsrc user's guide
 
         3.1. Binary distribution
         3.2. Bootstrapping pkgsrc
-        3.3. Platform-specific notes
 
     4. Using pkgsrc
 
@@ -545,7 +544,7 @@ Table 1.1. Platforms supported by pkgsrc
 |--------------------------------------+---------------+----------------------|
 |Linux                                 |   Jun 1999    |README.Linux          |
 |--------------------------------------+---------------+----------------------|
-|Darwin (Mac OS X)                     |   Oct 2001    |README.MacOSX         |
+|Darwin / Mac OS X / OS X / macOS      |   Oct 2001    |README.MacOSX         |
 |--------------------------------------+---------------+----------------------|
 |FreeBSD                               |   Nov 2002    |README.FreeBSD        |
 |--------------------------------------+---------------+----------------------|
@@ -694,7 +693,6 @@ Table of Contents
 
     3.1. Binary distribution
     3.2. Bootstrapping pkgsrc
-    3.3. Platform-specific notes
 
 4. Using pkgsrc
 
@@ -800,7 +798,7 @@ Before you download any pkgsrc files, you should decide whether you want the
 current branch or the stable branch. The latter is forked on a quarterly basis
 from the current branch and only gets modified for security updates. The names
 of the stable branches are built from the year and the quarter, for example
-2014Q3.
+2016Q4.
 
 The second step is to decide how you want to download pkgsrc. You can get it as
 a tar file or via CVS. Both ways are described here.
@@ -816,14 +814,14 @@ There are a number of subdirectories for different purposes, which are
 described in detail in Appendix C, Directory layout of the pkgsrc FTP server.
 
 The tar archive for the current branch is in the directory current and is
-called pkgsrc.tar.gz. It is autogenerated daily.
+called pkgsrc.tar.gz. It is autogenerated weekly.
 
 To save download time we provide bzip2- and xz-compressed archives which are
 published at pkgsrc.tar.bz2 and pkgsrc.tar.xz respectively.
 
 You can fetch the same files using FTP.
 
-The tar file for the stable branch 2014Q3 is in the directory pkgsrc-2014Q3 and
+The tar file for the stable branch 2016Q4 is in the directory pkgsrc-2016Q4 and
 is also called pkgsrc.tar.gz.
 
 To download a pkgsrc stable tarball, run:
@@ -831,7 +829,7 @@ To download a pkgsrc stable tarball, run:
 $ ftp ftp://ftp.NetBSD.org/pub/pkgsrc/pkgsrc-20xxQy/pkgsrc.tar.gz
 
 Where pkgsrc-20xxQy is the stable branch to be downloaded, for example, "
-pkgsrc-2014Q3".
+pkgsrc-2016Q4".
 
 If you prefer, you can also fetch it using "wget", "curl", or your web browser.
 
@@ -853,7 +851,7 @@ To fetch a specific pkgsrc stable branch, run:
 $ cd /usr && cvs -q -z2 -d anoncvs@anoncvs.NetBSD.org:/cvsroot checkout -r pkgsrc-20xxQy -P pkgsrc
 
 Where pkgsrc-20xxQy is the stable branch to be checked out, for example, "
-pkgsrc-2014Q3"
+pkgsrc-2016Q4"
 
 This will create the directory pkgsrc/ in your /usr/ directory and all the
 package source will be stored under /usr/pkgsrc/.
@@ -935,7 +933,7 @@ When updating pkgsrc, the CVS program keeps track of the branch you selected.
 But if you, for whatever reason, want to switch from the stable branch to the
 current one, you can do it by adding the option "-A" after the "update"
 keyword. To switch from the current branch back to the stable branch, add the "
--rpkgsrc-2014Q3" option.
+-rpkgsrc-2016Q4" option.
 
 2.2.2.2. What happens to my changes when updating?
 
@@ -951,7 +949,6 @@ Table of Contents
 
 3.1. Binary distribution
 3.2. Bootstrapping pkgsrc
-3.3. Platform-specific notes
 
 3.1. Binary distribution
 
@@ -975,11 +972,10 @@ Installing the bootstrap kit from source should be as simple as:
 To bootstrap in unprivileged mode pass "--unprivileged" flag to bootstrap
 
 By default, in privileged mode pkgsrc uses /usr/pkg for prefix where programs
-will be installed in, and /var/db/pkg for the package database directory where
-pkgsrc will do its internal bookkeeping, /var is used as varbase, where
+will be installed in, and /usr/pkg/pkgdb for the package database directory
+where pkgsrc will do its internal bookkeeping, /var is used as varbase, where
 packages install their persistent data. In unprivileged mode pkgsrc uses ~/pkg
-for prefix, ~/pkg/var/db/pkg for the package database, and ~/pkg/var for 
-varbase.
+for prefix, ~/pkg/pkgdb for the package database, and ~/pkg/var for varbase.
 
 You can change default layout using command-line arguments. Run "./bootstrap
 --help" to get details.
@@ -995,11 +991,6 @@ It is possible to bootstrap multiple instances of pkgsrc using non-intersecting
 directories. Use bmake corresponding to the installation you're working with to
 build and install packages.
 
-3.3. Platform-specific notes
-
-For platform-specific notes consult the README files found in the notes column
-of Table 1.1, "Platforms supported by pkgsrc"
-
 Chapter 4. Using pkgsrc
 
 Table of Contents
@@ -1059,8 +1050,7 @@ In this directory, you often find a file called bootstrap.tar.gz 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 extract it
 in the / directory. It will create the directories /usr/pkg (containing the
-tools for managing binary packages) and /var/db/pkg (the database of installed
-packages).
+tools for managing binary packages and the database of installed packages).
 
 4.1.2. Installing binary packages
 
@@ -1083,9 +1073,9 @@ in PKG_PATH.
 
 After these preparations, installing a package is very easy:
 
-# pkg_add openoffice2
+# pkg_add libreoffice
 # pkg_add kde-3.5.7
-# pkg_add ap2-php5-*
+# pkg_add ap24-php71-*
 
 Note that any prerequisite packages needed to run the package in question will
 be installed, too, assuming they are present where you install from.
@@ -1145,16 +1135,26 @@ remains current. This may be done by adding an appropriate entry to the root
 users crontab(5) entry. For example the entry
 
 # download vulnerabilities file
-0 3 * * * /usr/sbin/pkg_admin fetch-pkg-vulnerabilities >/dev/null 2>&1
+0 3 * * * /usr/pkg/sbin/pkg_admin fetch-pkg-vulnerabilities >/dev/null 2>&1
+# audit the installed packages and email results to root
+9 3 * * * /usr/pkg/sbin/pkg_admin auit |mail -s "Installed package audit result" root >/dev/null 2>&1
+
+
+will update the vulnerability list every day at 3AM, followed by an audit at
+3:09AM. The result of the audit are then emailed to root. On NetBSD this may be
+accomplished instead by adding the following line to /etc/daily.conf:
+
+fetch_pkg_vulnerabilities=YES
+
 
+to fetch the vulnerability list from the daily security script. The system is
+set to audit the packages by default but can be set explicitly, if desired (not
+required), by adding the follwing line to /etc/security.conf:
 
-will update the vulnerability list every day at 3AM. You may wish to do this
-more often than once a day. In addition, you may wish to run the package audit
-from the daily security script. This may be accomplished by adding the
-following line to /etc/security.local:
+check_pkg_vulnerabilities=YES
 
-/usr/sbin/pkg_admin audit
 
+see daily.conf(5) and security.conf(5) for more details.
 
 4.1.6. Finding if newer versions of your installed packages are in pkgsrc
 
@@ -1388,15 +1388,14 @@ mk.conf, together with some comments that describe each variable's intent.
     {PKGSRCDIR}/distfiles.
 
   * PKG_DBDIR: Where the database about installed packages is stored. The
-    default is /var/db/pkg.
+    default is /usr/pkg/pkgdb.
 
   * MASTER_SITE_OVERRIDE: If set, override the packages' MASTER_SITES with this
     value.
 
   * MASTER_SITE_BACKUP: Backup location(s) for distribution files and patch
     files if not found locally or in ${MASTER_SITES} or ${PATCH_SITES}
-    respectively. The defaults are ftp://ftp.NetBSD.org/pub/pkgsrc/distfiles/$
-    {DIST_SUBDIR}/ and ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/$
+    respectively. The defaults is ftp://ftp.NetBSD.org/pub/pkgsrc/distfiles/$
     {DIST_SUBDIR}/.
 
   * BINPKG_SITES: List of sites carrying binary pkgs. rel and arch are replaced
@@ -1508,7 +1507,7 @@ PKGSRC_COMPILER:
 
       + sunpro: Sun Microsystems, Inc. WorkShip/Forte/Sun ONE Studio
 
-      + xlc: IBM's XL C/C++ compiler suite (Darwin/MacOSX)
+      + xlc: IBM's XL C/C++ compiler suite
 
     The default is "gcc". You can use ccache and/or distcc with an appropriate
     PKGSRC_COMPILER setting, e.g. "ccache gcc". This variable should always be
@@ -1740,7 +1739,7 @@ Or any other way that fits (e.g., curl, wget).
 
 Deploy and configure pbulk tools, e.g.:
 
-# sh pbulk.sh -n # native (NetBSD)
+# sh pbulk.sh -n # use native make, no bootstrap kit needed (for use on NetBSD)
 # sh pbulk.sh -n -c mk.conf.frag # native, apply settings from given mk.conf fragment
 # sh pbulk.sh -nlc mk.conf.frag # native, apply settings, configure for limited build