regen

1 files changed, 55 insertions, 28 deletions

diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index b61a0c71af6..65b467c10e2 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -828,7 +828,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
-2007Q1.
+2007Q4.
 
 The second step is to decide how you want to download pkgsrc. You can get it as
 a tar file, via SUP, or via CVS. All three ways are described here.
@@ -842,12 +842,26 @@ described in detail in Appendix C, Directory layout of the pkgsrc FTP server.
 The tar file for the current branch is in the directory current and is called
 pkgsrc.tar.gz. It is autogenerated daily.
 
-The tar file for the stable branch 2007Q1 is in the directory pkgsrc-2007Q1 and
-is also called pkgsrc-2007Q1.tar.gz.
+The tar file for the stable branch 2007Q4 is in the directory pkgsrc-2007Q4 and
+is also called pkgsrc-2007Q4.tar.gz.
 
-After downloading the tar file, change to the directory where you want to have
-pkgsrc. This is usually /usr. Then, run gzcat pkgsrc.tar.gz | tar xf - to
-extract the files.
+To download a pkgsrc stable tarball, run:
+
+$ ftp ftp://ftp.NetBSD.org/pub/pkgsrc/pkgsrc-200xQy/pkgsrc-200xQy.tar.gz
+
+Where pkgsrc-200xQy is the stable branch to be downloaded, for example,
+"pkgsrc-2007Q4".
+
+Then, extract it with:
+
+$ tar -xzf pkgsrc-200xQy.tar.gz -C /usr
+
+This will create the directory pkgsrc/ in /usr/ and all the package source will
+be stored under /usr/pkgsrc/.
+
+To download pkgsrc-current, run:
+
+$ ftp ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc.tar.gz
 
 2.1.2. Via SUP
 
@@ -861,25 +875,22 @@ pkgsrc directory exists. Then, simply run sup -v /path/to/your/supfile.
 
 2.1.3. Via anonymous CVS
 
-To get pkgsrc via CVS, make sure you have cvs(1) installed. To do an initial
-(full) checkout of pkgsrc, you first have to set some environment variables.
-For the C-Shell, type:
+To do an initial (full) checkout of pkgsrc, you first have to set some
+environment variables. For the C-Shell, type:
 
     % setenv CVSROOT anoncvs@anoncvs.NetBSD.org:/cvsroot
     % setenv CVS_RSH ssh
 
 Or, the same for the bourne shell:
 
-    $ CVSROOT="anoncvs@anoncvs.NetBSD.org:/cvsroot"
-    $ CVS_RSH="ssh"
-    $ export CVSROOT CVS_RSH
+    $ export CVSROOT="anoncvs@anoncvs.NetBSD.org:/cvsroot"
+    $ export CVS_RSH="ssh"
 
-By default, cvs doesn't do things like most people would expect it to do, and
-this is unlikely to change. But there is a way to convince cvs, by creating a
-file called .cvsrc in your home directory and saving the following lines to it.
-This file will save you lots of headache and some bug reports, so we strongly
-recommend it. You can find an explanation of this file in the CVS
-documentation.
+By default, cvs doesn't do things like most people would expect it to do. But
+there is a way to convince cvs, by creating a file called .cvsrc in your home
+directory and saving the following lines to it. This file will save you lots of
+headache and some bug reports, so we strongly recommend it. You can find an
+explanation of this file in the CVS documentation.
 
 # recommended CVS configuration file from the pkgsrc guide
 checkout -P
@@ -889,11 +900,21 @@ diff -upN
 cvs -q -z3
 rdiff -u
 
-Then, you change to the directory where you want to have your copy of pkgsrc.
-In most cases this is /usr. In that directory you run the checkout command,
-which is cvs -q checkout -P pkgsrc for the current branch and cvs -q checkout
--rpkgsrc-2007Q1 -P pkgsrc for the stable branch. This command will create a
-directory called pkgsrc with all the pkgsrc files in it.
+To fetch a specific pkgsrc stable branch from scratch, run:
+
+$ cd /usr
+        $ cvs checkout -r pkgsrc-200xQy -P pkgsrc
+
+Where pkgsrc-200xQy is the stable branch to be checked out, for example,
+"pkgsrc-2007Q4"
+
+This will create the directory pkgsrc/ in your /usr/ directory and all the
+package source will be stored under /usr/pkgsrc/.
+
+To fetch the pkgsrc current branch, run:
+
+$ cd /usr
+$ cvs checkout -r -P pkgsrc
 
 2.2. Keeping pkgsrc up-to-date
 
@@ -925,7 +946,9 @@ directory. Remove the pkgsrc directory and extract the new tar file. Done.
 2.2.2. Via CVS
 
 To update pkgsrc via CVS, make sure the environment variable CVS_RSH is set as
-above. Then, change to the pkgsrc directory and run cvs -q update -dP.
+above. Then, change to the pkgsrc directory and run:
+
+$ cvs update -dP
 
 2.2.2.1. Switching between different pkgsrc branches
 
@@ -1623,8 +1646,8 @@ this are located in the MESSAGE file for security/audit-packages.
 
 4.1.6. Finding if newer versions of your installed packages are in pkgsrc
 
-Install pkgtools/pkglint and run lintpkgsrc with the "-i" argument to check if
-your packages are up-to-date, e.g.
+Install pkgtools/lintpkgsrc and run lintpkgsrc with the "-i" argument to check
+if your packages are up-to-date, e.g.
 
 % lintpkgsrc -i
 ...
@@ -2837,8 +2860,10 @@ Utilities for keeping track of installed packages, being up to date, etc:
   * pkgtools/pkgdepgraph: Makes graphs from the output of pkgtools/pkgdep (uses
     graphviz).
 
-  * pkgtools/pkglint: The pkglint(1) program checks a pkgsrc entry for errors,
-    lintpkgsrc(1) does various checks on the complete pkgsrc system.
+  * pkgtools/pkglint: The pkglint(1) program checks a pkgsrc entry for errors.
+
+  * pkgtools/lintpkgsrc: The lintpkgsrc(1) program does various checks on the
+    complete pkgsrc system.
 
   * pkgtools/pkgsurvey: Report what packages you have installed.
 
@@ -6805,6 +6830,8 @@ Examples of changes that do merit an increase to PKGREVISION include:
 
   * Changes to the PLIST
 
+  * A dependency is changed or renamed.
+
 PKGREVISION must also be incremented when dependencies have ABI changes.
 
 19.1.12. Substituting variable text in the package files (the SUBST framework)