regen

1 files changed, 19 insertions, 23 deletions

diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index f99b3cd6722..c12be5b9be3 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -881,7 +881,8 @@ To fetch the pkgsrc current branch, run:
 
 $ cd /usr && cvs -q -z3 -d anoncvs@anoncvs.NetBSD.org:/cvsroot checkout -P pkgsrc
 
-Refer to list of available CVS mirrors to choose faster one.
+Refer to the list of available mirrors to choose a faster CVS mirror, if
+needed.
 
 If you get error messages from rsh, you need to set CVS_RSH variable. E.g.:
 
@@ -1017,7 +1018,7 @@ packages that use the X11 Window System.
 
 3.3.2. FreeBSD
 
-FreeBSD 4.7 and 5.0 have been tested and are supported, other versions may
+FreeBSD 8.3 and 9.0 have been tested and are supported, other versions may
 work.
 
 Care should be taken so that the tools that this kit installs do not conflict
@@ -1265,31 +1266,26 @@ Compiler). gcc is the default. icc 8.0 and 8.1 on i386 have been tested.
 
 To bootstrap using icc, assuming the default icc installation directory:
 
-env CC=/opt/intel_cc_80/bin/icc LDFLAGS=-static-libcxa \
-ac_cv___attribute__=yes ./bootstrap
+env ICCBASE=/opt/intel/cc/10.1.008 ./bootstrap --compiler=icc
 
 
 Note
 
-icc 8.1 needs the `-i-static' argument instead of -static-libcxa.
+For icc 8.0 you must add `LDFLAGS=-static-libcxa' to this.
 
-icc supports __attribute__, but the GNU configure test uses a nested function,
-which icc does not support. #undef'ing __attribute__ has the unfortunate
-side-effect of breaking many of the Linux header files, which cannot be
-compiled properly without __attribute__. The test must be overridden so that
-__attribute__ is assumed supported by the compiler.
+For icc 8.1 you must add `LDFLAGS=-i-static' instead.
 
-After bootstrapping, you should set PKGSRC_COMPILER in mk.conf:
+For icc 10.1 neither of these appears to be necessary.
 
-PKGSRC_COMPILER=        icc
+Use a value for ICCBASE that corresponds to the directory where icc is
+installed. After bootstrapping, set ICCBASE in mk.conf:
 
+ICCBASE=                /opt/intel/cc/10.1.008
 
-The default installation directory for icc is /opt/intel_cc_80, which is also
-the pkgsrc default. If you have installed it into a different directory, set
-ICCBASE in mk.conf:
-
-ICCBASE=                /opt/icc
 
+The pkgsrc default for ICCBASE is /opt/intel_cc_80. This is the default install
+directory for icc 8.0. If you are using a more recent version, be sure to set
+the correct path explicitly.
 
 pkgsrc uses the static linking method of the runtime libraries provided by icc,
 so binaries can be run on other systems which do not have the shared libraries
@@ -1303,7 +1299,7 @@ libraries until this is fixed in libtool.
 
 3.3.6. OpenBSD
 
-OpenBSD 3.0 and 3.2 are tested and supported.
+OpenBSD 5.1 has been tested and supported, other versions may work.
 
 Care should be taken so that the tools that this kit installs do not conflict
 with the OpenBSD userland tools. There are several steps:
@@ -7644,13 +7640,13 @@ into ${PREFIX}/share/texmf-dist, not ${PREFIX}/share/texmf.
     trees that need database update.
 
     If your package also installs font map files that need to be registered
-    using updmap, include ../../print/texlive-tetex/map.mk and set
-    TEX_MAP_FILES and/or TEX_MIXEDMAP_FILES to the list of all such font map
-    files. Then updmap will be run automatically at installation/deinstallation
-    to enable/disable font map files for TeX output drivers.
+    using updmap, include ../../print/tex-tetex/map.mk and set TEX_MAP_FILES
+    and/or TEX_MIXEDMAP_FILES to the list of all such font map files. Then 
+    updmap will be run automatically at installation/deinstallation to enable/
+    disable font map files for TeX output drivers.
 
  3. Make sure that none of ls-R databases are included in PLIST, as they will
-    be removed only by the teTeX-bin package.
+    be removed only by the kpathsea package.
 
 19.6.18. Packages supporting running binaries in emulation