regen

1 files changed, 8 insertions, 49 deletions

diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index b337f2209b9..d5dae3479e3 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -117,8 +117,7 @@ I. The pkgsrc user's guide
         7.2. Requirements of a bulk build
         7.3. Running a pbulk-style bulk build
 
-            7.3.1. Preparation
-            7.3.2. Configuration
+            7.3.1. Configuration
 
         7.4. Creating a multiple CD-ROM packages collection
 
@@ -763,8 +762,7 @@ Table of Contents
     7.2. Requirements of a bulk build
     7.3. Running a pbulk-style bulk build
 
-        7.3.1. Preparation
-        7.3.2. Configuration
+        7.3.1. Configuration
 
     7.4. Creating a multiple CD-ROM packages collection
 
@@ -2181,8 +2179,7 @@ Table of Contents
 7.2. Requirements of a bulk build
 7.3. Running a pbulk-style bulk build
 
-    7.3.1. Preparation
-    7.3.2. Configuration
+    7.3.1. Configuration
 
 7.4. Creating a multiple CD-ROM packages collection
 
@@ -2237,8 +2234,7 @@ others must survive a sudden reboot.
 
   * 1 GB for the pkgsrc tree (read-only, remote, permanent)
 
-  * 5 GB for LOCALBASE (read-write, local, temporary for pbulk, permanent for
-    old-bulk)
+  * 5 GB for LOCALBASE (read-write, local, temporary)
 
   * 10 GB for the log files (read-write, remote, permanent)
 
@@ -2253,47 +2249,7 @@ Running a pbulk-style bulk build works roughly as follows:
   * Then, build each of the packages from a clean installation directory using
     the infrastructure.
 
-7.3.1. Preparation
-
-First, you need to create a pkgsrc installation for the pbulk infrastructure.
-No matter on which platform you are (even on NetBSD), you should bootstrap into
-its own directory. Let's take the directory /usr/pbulk or $HOME/pbulk for it.
-This installation will be bootstrapped and all the tools that are required for
-the bulk build will be installed there.
-
-$ cd /usr/pkgsrc
-$ ./bootstrap/bootstrap --prefix=/usr/pbulk --varbase=/usr/pbulk/var --workdir=/tmp/pbulk-bootstrap
-$ rm -rf /tmp/pbulk-bootstrap
-
-Now the basic environment for the pbulk infrastructure is installed. The
-specific tools are still missing. This is a good time to edit the pkgsrc
-configuration file /usr/pbulk/etc/mk.conf to fit your needs. Typical things you
-might set now are:
-
-  * PKG_DEVELOPER=yes, to enable many consistency checks,
-
-  * WRKOBJDIR=/tmp/pbulk-outer, to keep /usr/pkgsrc free from any
-    modifications,
-
-  * DISTDIR=/distfiles, to have only one directory in which all distfiles (for
-    the infrastructure and for the actual packages) are downloaded,
-
-  * ACCEPTABLE_LICENSES+=..., to select some licenses additional to the usual
-    Free/Open Source licenses that are acceptable to you,
-
-  * SKIP_LICENSE_CHECK=yes, to bypass the license checks.
-
-Now you are ready to build the rest of the pbulk infrastructure.
-
-$ cd pkgtools/pbulk
-$ /usr/pbulk/bin/bmake install
-$ rm -rf /tmp/pbulk-outer
-
-Now the pbulk infrastructure is built and installed. It still needs to be
-configured, and after some more preparation, we will be able to start the real
-bulk build.
-
-7.3.2. Configuration
+7.3.1. Configuration
 
 To simplify configuration we provide helper script mk/pbulk/pbulk.sh.
 
@@ -2331,6 +2287,9 @@ www/firefox
 mail/thunderbird
 misc/libreoffice4
 
+At this point you can also review configuration in /usr/pbulk/etc and make
+final amendments, if wanted.
+
 Start it:
 
 # /usr/pbulk/bin/bulkbuild