Regenerate the guide after fixing PR/26464.

1 files changed, 43 insertions, 45 deletions

diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index 2897dfad827..c78299b5c6f 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -64,13 +64,12 @@ I. The pkgsrc user's guide
             3.3.1. Cygwin
             3.3.2. Darwin (Mac OS X)
             3.3.3. FreeBSD
-            3.3.4. GNU/kFreeBSD
-            3.3.5. Interix
-            3.3.6. IRIX
-            3.3.7. Linux
-            3.3.8. MirBSD
-            3.3.9. OpenBSD
-            3.3.10. Solaris
+            3.3.4. Interix
+            3.3.5. IRIX
+            3.3.6. Linux
+            3.3.7. MirBSD
+            3.3.8. OpenBSD
+            3.3.9. Solaris
 
     4. Using pkgsrc
 
@@ -597,8 +596,6 @@ Table 1.1. Platforms supported by pkgsrc
 |Minix3                                       |     Nov 2011     |
 |---------------------------------------------+------------------|
 |Cygwin                                       |     Mar 2013     |
-|---------------------------------------------+------------------|
-|GNU/kFreeBSD                                 |     Jul 2013     |
 +----------------------------------------------------------------+
 
 
@@ -720,13 +717,12 @@ Table of Contents
         3.3.1. Cygwin
         3.3.2. Darwin (Mac OS X)
         3.3.3. FreeBSD
-        3.3.4. GNU/kFreeBSD
-        3.3.5. Interix
-        3.3.6. IRIX
-        3.3.7. Linux
-        3.3.8. MirBSD
-        3.3.9. OpenBSD
-        3.3.10. Solaris
+        3.3.4. Interix
+        3.3.5. IRIX
+        3.3.6. Linux
+        3.3.7. MirBSD
+        3.3.8. OpenBSD
+        3.3.9. Solaris
 
 4. Using pkgsrc
 
@@ -1004,13 +1000,12 @@ Table of Contents
     3.3.1. Cygwin
     3.3.2. Darwin (Mac OS X)
     3.3.3. FreeBSD
-    3.3.4. GNU/kFreeBSD
-    3.3.5. Interix
-    3.3.6. IRIX
-    3.3.7. Linux
-    3.3.8. MirBSD
-    3.3.9. OpenBSD
-    3.3.10. Solaris
+    3.3.4. Interix
+    3.3.5. IRIX
+    3.3.6. Linux
+    3.3.7. MirBSD
+    3.3.8. OpenBSD
+    3.3.9. Solaris
 
 3.1. Binary distribution
 
@@ -1111,14 +1106,7 @@ with the FreeBSD userland tools. There are several steps:
  3. An example mk.conf file will be placed in /etc/mk.conf.example file when
     you use the bootstrap script.
 
-3.3.4. GNU/kFreeBSD
-
-Debian GNU/kFreeBSD is the only GNU/kFreeBSD distribution now. Debian GNU/
-kFreeBSD 7.0 or later is tested and supported.
-
-You should install ncurses (libncurses and libncurses-dev) packages.
-
-3.3.5. Interix
+3.3.4. Interix
 
 Interix is a POSIX-compatible subsystem for the Windows NT kernel, providing a
 Unix-like environment with a tighter kernel integration than available with
@@ -1136,7 +1124,7 @@ and Windows Server 2008 R2 (6.1). As of this writing, the SUA's Interix 6.0
 (32bit) and 6.1 (64bit) subsystems have been tested. Other versions may work as
 well. The Interix 5.x subsystem has not yet been tested with pkgsrc.
 
-3.3.5.1. When installing Interix/SFU
+3.3.4.1. When installing Interix/SFU
 
 At an absolute minimum, the following packages must be installed from the
 Windows Services for Unix 3.5 distribution in order to use pkgsrc:
@@ -1180,7 +1168,7 @@ hotfixes note above, the following option can be added to the appropriate
 will disable DEP completely, which may be a security risk if applications are
 often run as a user in the Administrators group!)
 
-3.3.5.2. What to do if Interix/SFU is already installed
+3.3.4.2. What to do if Interix/SFU is already installed
 
 If SFU is already installed and you wish to alter these settings to work with
 pkgsrc, note the following things.
@@ -1203,7 +1191,7 @@ pkgsrc, note the following things.
 
     Set the DWORD value "EnableSetuidBinaries" to 1; then reboot.
 
-3.3.5.3. Important notes for using pkgsrc
+3.3.4.3. Important notes for using pkgsrc
 
 The package manager (either the pkgsrc "su" user, or the user running
 "pkg_add") must be a member of the local Administrators group. Such a user must
@@ -1228,7 +1216,7 @@ adequate emulation in most cases:
 interix:kP=\E[S:kN=\E[T:kH=\E[U:dc@:DC@:tc=pcansi:
 
 
-3.3.5.4. Limitations of the Interix platform
+3.3.4.4. Limitations of the Interix platform
 
 Though Interix suffices as a familiar and flexible substitute for a full
 Unix-like platform, it has some drawbacks that should be noted for those
@@ -1272,7 +1260,7 @@ desiring to make the most of Interix.
     make tape drive access possible by using Cygwin as a bridge (similarly to
     audio bridged via Cygwin's esound server).
 
-3.3.5.5. Known issues for pkgsrc on Interix
+3.3.4.5. Known issues for pkgsrc on Interix
 
 It is not necessary, in general, to have a "root" user on the Windows system;
 any member of the local Administrators group will suffice. However, some
@@ -1288,7 +1276,7 @@ around the issue:
 # chmod -R g+w $PKG_DBDIR
 
 
-3.3.6. IRIX
+3.3.5. IRIX
 
 You will need a working C compiler, either gcc or SGI's MIPS and MIPSpro
 compiler (cc/c89). Please set the CC environment variable according to your
@@ -1332,7 +1320,7 @@ to make sure that MIPSPro is used, please set your PATH to not include the
 location of gcc (often /usr/freeware/bin), and (important) pass the
 '--preserve-path' flag.
 
-3.3.7. Linux
+3.3.6. Linux
 
 Some versions of Linux (for example Debian GNU/Linux) need either libtermcap or
 libcurses (libncurses). Installing the distributions libncurses-dev package (or
@@ -1374,7 +1362,7 @@ linking a C++ shared library and records it, throwing away the -Bstatic and
 libtool-linked C++ shared libraries will have a runtime dependency on the icc
 libraries until this is fixed in libtool.
 
-3.3.8. MirBSD
+3.3.7. MirBSD
 
 pkgsrc has been tested on MirBSD #10-current (2011 and newer). Older versions
 might also work. Releases before #10 are not supported.
@@ -1393,7 +1381,7 @@ Binary packages for MirBSD/i386 can be found on the pkgsrc ftp server. The
 bootstrap kit there already contains the pkgin package manager. See the pkgsrc
 on MirOS page for more details.
 
-3.3.9. OpenBSD
+3.3.8. OpenBSD
 
 OpenBSD 5.1 has been tested and supported, other versions may work.
 
@@ -1426,7 +1414,7 @@ with the OpenBSD userland tools. There are several steps:
     .endif
 
 
-3.3.10. Solaris
+3.3.9. Solaris
 
 Solaris 2.6 through 10 are supported on both x86 and sparc. You will need a
 working C compiler. Both gcc 4.5.3 and Sun WorkShop 5 have been tested.
@@ -1451,7 +1439,7 @@ Whichever compiler you use, please ensure the compiler tools and your $prefix
 are in your PATH. This includes /usr/ccs/{bin,lib} and e.g. /usr/pkg/
 {bin,sbin}.
 
-3.3.10.1. If you are using gcc
+3.3.9.1. If you are using gcc
 
 It makes life much simpler if you only use the same gcc consistently for
 building all packages.
@@ -1462,7 +1450,7 @@ gcc used during bootstrapping.
 
 Binary packages of gcc can be found through http://www.sunfreeware.com/.
 
-3.3.10.2. If you are using Sun WorkShop
+3.3.9.2. If you are using Sun WorkShop
 
 You will need at least the following packages installed (from WorkShop 5.0)
 
@@ -1486,7 +1474,7 @@ Note
 The CPP setting might break some packages that use the C preprocessor for
 processing things other than C source code.
 
-3.3.10.3. Building 64-bit binaries with SunPro
+3.3.9.3. Building 64-bit binaries with SunPro
 
 To build 64-bit packages, you just need to have the following lines in your
 mk.conf file:
@@ -1499,7 +1487,7 @@ Note
 This setting has been tested for the SPARC architecture. Intel and AMD machines
 need some more work.
 
-3.3.10.4. Common problems
+3.3.9.4. Common problems
 
 Sometimes, when using libtool, /bin/ksh crashes with a segmentation fault. The
 workaround is to use another shell for the configure scripts, for example by
@@ -6911,6 +6899,16 @@ version numbers recognized by pkg_info(1).
     Section 19.1.10, "Handling packages with security problems" for more
     information.
 
+ 7. If the package depends on either one of two (or more) packages, specify the
+    "pre-req-package-name" as a comma-separated list between curly braces.
+
+    As an example, take a package that depends on the Perl "version" module,
+    which has been part of Perl itself since version 5.10.0. This either/or
+    dependency is expressed as:
+
+    DEPENDS+=       {perl>=5.10.0,p5-version-[0-9]*}:../../devel/p5-version
+
+
 If your package needs files from another package to build, add the relevant
 distribution files to DISTFILES, so they will be extracted automatically. See
 the print/ghostscript package for an example. (It relies on the jpeg sources