regen

2 files changed, 168 insertions, 105 deletions

diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html
index 0211f8a20a5..3ff9b6a002f 100644
--- a/doc/pkgsrc.html
+++ b/doc/pkgsrc.html
@@ -79,13 +79,14 @@
 <dt><span class="sect1"><a href="#bootstrapping-pkgsrc">3.2. Bootstrapping pkgsrc</a></span></dt>
 <dt><span class="sect1"><a href="#platform-specific-notes">3.3. Platform-specific notes</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#darwin">3.3.1. Darwin (Mac OS X)</a></span></dt>
-<dt><span class="sect2"><a href="#freebsd">3.3.2. FreeBSD</a></span></dt>
-<dt><span class="sect2"><a href="#interix">3.3.3. Interix</a></span></dt>
-<dt><span class="sect2"><a href="#irix">3.3.4. IRIX</a></span></dt>
-<dt><span class="sect2"><a href="#linux">3.3.5. Linux</a></span></dt>
-<dt><span class="sect2"><a href="#openbsd">3.3.6. OpenBSD</a></span></dt>
-<dt><span class="sect2"><a href="#solaris">3.3.7. Solaris</a></span></dt>
+<dt><span class="sect2"><a href="#cygwin">3.3.1. Cygwin</a></span></dt>
+<dt><span class="sect2"><a href="#darwin">3.3.2. Darwin (Mac OS X)</a></span></dt>
+<dt><span class="sect2"><a href="#freebsd">3.3.3. FreeBSD</a></span></dt>
+<dt><span class="sect2"><a href="#interix">3.3.4. Interix</a></span></dt>
+<dt><span class="sect2"><a href="#irix">3.3.5. IRIX</a></span></dt>
+<dt><span class="sect2"><a href="#linux">3.3.6. Linux</a></span></dt>
+<dt><span class="sect2"><a href="#openbsd">3.3.7. OpenBSD</a></span></dt>
+<dt><span class="sect2"><a href="#solaris">3.3.8. Solaris</a></span></dt>
 </dl></dd>
 </dl></dd>
 <dt><span class="chapter"><a href="#using">4. Using pkgsrc</a></span></dt>
@@ -665,6 +666,18 @@ minutes!</p>
 <td><a class="ulink" href="http://www.haiku-os.org/" target="_top">Haiku</a></td>
 <td align="center">Sep 2010</td>
 </tr>
+<tr>
+<td><a class="ulink" href="http://www.mirbsd.org/" target="_top">MirBSD</a></td>
+<td align="center">Aug 2011</td>
+</tr>
+<tr>
+<td><a class="ulink" href="http://www.minix3.org/" target="_top">Minix3</a></td>
+<td align="center">Nov 2011</td>
+</tr>
+<tr>
+<td><a class="ulink" href="http://cygwin.com/" target="_top">Cygwin</a></td>
+<td align="center">Mar 2013</td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -801,13 +814,14 @@ minutes!</p>
 <dt><span class="sect1"><a href="#bootstrapping-pkgsrc">3.2. Bootstrapping pkgsrc</a></span></dt>
 <dt><span class="sect1"><a href="#platform-specific-notes">3.3. Platform-specific notes</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#darwin">3.3.1. Darwin (Mac OS X)</a></span></dt>
-<dt><span class="sect2"><a href="#freebsd">3.3.2. FreeBSD</a></span></dt>
-<dt><span class="sect2"><a href="#interix">3.3.3. Interix</a></span></dt>
-<dt><span class="sect2"><a href="#irix">3.3.4. IRIX</a></span></dt>
-<dt><span class="sect2"><a href="#linux">3.3.5. Linux</a></span></dt>
-<dt><span class="sect2"><a href="#openbsd">3.3.6. OpenBSD</a></span></dt>
-<dt><span class="sect2"><a href="#solaris">3.3.7. Solaris</a></span></dt>
+<dt><span class="sect2"><a href="#cygwin">3.3.1. Cygwin</a></span></dt>
+<dt><span class="sect2"><a href="#darwin">3.3.2. Darwin (Mac OS X)</a></span></dt>
+<dt><span class="sect2"><a href="#freebsd">3.3.3. FreeBSD</a></span></dt>
+<dt><span class="sect2"><a href="#interix">3.3.4. Interix</a></span></dt>
+<dt><span class="sect2"><a href="#irix">3.3.5. IRIX</a></span></dt>
+<dt><span class="sect2"><a href="#linux">3.3.6. Linux</a></span></dt>
+<dt><span class="sect2"><a href="#openbsd">3.3.7. OpenBSD</a></span></dt>
+<dt><span class="sect2"><a href="#solaris">3.3.8. Solaris</a></span></dt>
 </dl></dd>
 </dl></dd>
 <dt><span class="chapter"><a href="#using">4. Using pkgsrc</a></span></dt>
@@ -1083,13 +1097,14 @@ release -d
 <dt><span class="sect1"><a href="#bootstrapping-pkgsrc">3.2. Bootstrapping pkgsrc</a></span></dt>
 <dt><span class="sect1"><a href="#platform-specific-notes">3.3. Platform-specific notes</a></span></dt>
 <dd><dl>
-<dt><span class="sect2"><a href="#darwin">3.3.1. Darwin (Mac OS X)</a></span></dt>
-<dt><span class="sect2"><a href="#freebsd">3.3.2. FreeBSD</a></span></dt>
-<dt><span class="sect2"><a href="#interix">3.3.3. Interix</a></span></dt>
-<dt><span class="sect2"><a href="#irix">3.3.4. IRIX</a></span></dt>
-<dt><span class="sect2"><a href="#linux">3.3.5. Linux</a></span></dt>
-<dt><span class="sect2"><a href="#openbsd">3.3.6. OpenBSD</a></span></dt>
-<dt><span class="sect2"><a href="#solaris">3.3.7. Solaris</a></span></dt>
+<dt><span class="sect2"><a href="#cygwin">3.3.1. Cygwin</a></span></dt>
+<dt><span class="sect2"><a href="#darwin">3.3.2. Darwin (Mac OS X)</a></span></dt>
+<dt><span class="sect2"><a href="#freebsd">3.3.3. FreeBSD</a></span></dt>
+<dt><span class="sect2"><a href="#interix">3.3.4. Interix</a></span></dt>
+<dt><span class="sect2"><a href="#irix">3.3.5. IRIX</a></span></dt>
+<dt><span class="sect2"><a href="#linux">3.3.6. Linux</a></span></dt>
+<dt><span class="sect2"><a href="#openbsd">3.3.7. OpenBSD</a></span></dt>
+<dt><span class="sect2"><a href="#solaris">3.3.8. Solaris</a></span></dt>
 </dl></dd>
 </dl>
 </div>
@@ -1151,7 +1166,26 @@ release -d
 <p>Here are some platform-specific notes you should be aware of.</p>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="darwin"></a>3.3.1. Darwin (Mac OS X)</h3></div></div></div>
+<a name="cygwin"></a>3.3.1. Cygwin</h3></div></div></div>
+<p>Cygwin 1.7.x and later are supported.</p>
+<p>You need to install minimal base packages in `Base' category
+      plus any of compiler, gcc, gcc4, and/or clang.
+      For gcc and gcc4, C and C++ compiler will be installed by default,
+      but you can install Fortran compiler additionally
+      because it will be required to use libtool.
+      If it is not installed (or too old), Fortran compiler will be
+      installed with pkgsrc automatically.</p>
+<p>As noted in
+      <a class="ulink" href="http://cygwin.com/faq-nochunks.html#faq.using.su" target="_top">Cygwin FAQ: `Why doesn't su work?'</a>,
+      su(1) command has been in Cygwin distribution, but it has never worked.
+      Unless you bootstrap pkgsrc with the --unprivileged option, workaround is:
+      </p>
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Right click "Cygwin Terminal" in your Start Menu,
+          then pick "Run as administrator".</p></li></ul></div>
+</div>
+<div class="sect2">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="darwin"></a>3.3.2. Darwin (Mac OS X)</h3></div></div></div>
 <p>Darwin 5.x and up are supported.</p>
 <p>Before you start, you need to download and install
       the Mac OS X Developer Tools from Apple's Developer Connection.
@@ -1165,7 +1199,7 @@ release -d
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="freebsd"></a>3.3.2. FreeBSD</h3></div></div></div>
+<a name="freebsd"></a>3.3.3. FreeBSD</h3></div></div></div>
 <p>FreeBSD 8.3 and 9.0 have been tested and are supported,
       other versions may work.</p>
 <p>Care should be taken so that the tools that this kit installs do not conflict
@@ -1194,7 +1228,7 @@ release -d
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="interix"></a>3.3.3. Interix</h3></div></div></div>
+<a name="interix"></a>3.3.4. Interix</h3></div></div></div>
 <p>Interix is a POSIX-compatible subsystem for the Windows NT kernel,
       providing a Unix-like environment with a tighter kernel integration than
       available with Cygwin.  It is part of the Windows Services for Unix
@@ -1212,7 +1246,7 @@ release -d
       with pkgsrc.</p>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="platform.interix-sfu-install"></a>3.3.3.1. When installing Interix/SFU</h4></div></div></div>
+<a name="platform.interix-sfu-install"></a>3.3.4.1. When installing Interix/SFU</h4></div></div></div>
 <p>At an absolute minimum, the following packages must be installed from
 	the Windows Services for Unix 3.5 distribution in order to use pkgsrc:</p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
@@ -1253,7 +1287,7 @@ release -d
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="platform.interix-sfu-postinstall"></a>3.3.3.2. What to do if Interix/SFU is already installed</h4></div></div></div>
+<a name="platform.interix-sfu-postinstall"></a>3.3.4.2. What to do if Interix/SFU is already installed</h4></div></div></div>
 <p>If SFU is already installed and you wish to alter these settings to work
 	with pkgsrc, note the following things.</p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
@@ -1276,7 +1310,7 @@ release -d
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="platform.interix-notes"></a>3.3.3.3. Important notes for using pkgsrc</h4></div></div></div>
+<a name="platform.interix-notes"></a>3.3.4.3. Important notes for using pkgsrc</h4></div></div></div>
 <p>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 also be used to run the bootstrap.  This is
@@ -1299,7 +1333,7 @@ interix:kP=\E[S:kN=\E[T:kH=\E[U:dc@:DC@:tc=pcansi:
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="platform.interix-limits"></a>3.3.3.4. Limitations of the Interix platform</h4></div></div></div>
+<a name="platform.interix-limits"></a>3.3.4.4. Limitations of the Interix platform</h4></div></div></div>
 <p>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 desiring to make the most of Interix.</p>
@@ -1356,7 +1390,7 @@ interix:kP=\E[S:kN=\E[T:kH=\E[U:dc@:DC@:tc=pcansi:
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="platform.interix-knownissues"></a>3.3.3.5. Known issues for pkgsrc on Interix</h4></div></div></div>
+<a name="platform.interix-knownissues"></a>3.3.4.5. Known issues for pkgsrc on Interix</h4></div></div></div>
 <p>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 packages currently assume that the user
@@ -1375,7 +1409,7 @@ interix:kP=\E[S:kN=\E[T:kH=\E[U:dc@:DC@:tc=pcansi:
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="irix"></a>3.3.4. IRIX</h3></div></div></div>
+<a name="irix"></a>3.3.5. IRIX</h3></div></div></div>
 <p>You will need a working C compiler, either gcc or SGI's MIPS and MIPSpro
       compiler (cc/c89).  Please set the <code class="varname">CC</code> environment variable
       according to your preference.  If you do not have a license for the MIPSpro
@@ -1420,7 +1454,7 @@ PKGSRC_COMPILER=        mipspro
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="linux"></a>3.3.5. Linux</h3></div></div></div>
+<a name="linux"></a>3.3.6. Linux</h3></div></div></div>
 <p>Some versions of Linux (for example Debian GNU/Linux) need
       either libtermcap or libcurses (libncurses).  Installing the
       distributions libncurses-dev package (or equivalent) should fix
@@ -1463,7 +1497,7 @@ ICCBASE=                /opt/intel/cc/10.1.008
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="openbsd"></a>3.3.6. OpenBSD</h3></div></div></div>
+<a name="openbsd"></a>3.3.7. OpenBSD</h3></div></div></div>
 <p>OpenBSD 5.1 has been tested and supported,
       other versions may work.</p>
 <p>Care should be taken so that the tools that this kit installs do not conflict
@@ -1504,7 +1538,7 @@ ICCBASE=                /opt/intel/cc/10.1.008
 </div>
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="solaris"></a>3.3.7. Solaris</h3></div></div></div>
+<a name="solaris"></a>3.3.8. Solaris</h3></div></div></div>
 <p>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.</p>
@@ -1525,7 +1559,7 @@ ICCBASE=                /opt/intel/cc/10.1.008
       and e.g. <code class="filename">/usr/pkg/{bin,sbin}</code>.</p>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="solaris-gcc-note"></a>3.3.7.1. If you are using gcc</h4></div></div></div>
+<a name="solaris-gcc-note"></a>3.3.8.1. If you are using gcc</h4></div></div></div>
 <p>It makes life much simpler if you only use the same gcc consistently
 	for building all packages.</p>
 <p>It is recommended that an external gcc be used only for bootstrapping,
@@ -1536,7 +1570,7 @@ ICCBASE=                /opt/intel/cc/10.1.008
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="solaris-sun-workshop-note"></a>3.3.7.2. If you are using Sun WorkShop</h4></div></div></div>
+<a name="solaris-sun-workshop-note"></a>3.3.8.2. If you are using Sun WorkShop</h4></div></div></div>
 <p>You will need at least the following packages installed (from WorkShop
 	5.0)</p>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
@@ -1566,7 +1600,7 @@ CXXCPP= CC -E
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="solaris-sunpro-64"></a>3.3.7.3. Building 64-bit binaries with SunPro</h4></div></div></div>
+<a name="solaris-sunpro-64"></a>3.3.8.3. Building 64-bit binaries with SunPro</h4></div></div></div>
 <p>To build 64-bit packages, you just need to have the
 	following lines in your <a class="link" href="#mk.conf"><code class="filename">mk.conf</code></a> file:</p>
 <pre class="programlisting">
@@ -1582,7 +1616,7 @@ ABI=                    64
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="plat.sunos.problems"></a>3.3.7.4. Common problems</h4></div></div></div>
+<a name="plat.sunos.problems"></a>3.3.8.4. Common problems</h4></div></div></div>
 <p>Sometimes, when using <span class="command"><strong>libtool</strong></span>,
       <code class="filename">/bin/ksh</code> crashes with a segmentation fault.
       The workaround is to use another shell for the configure
@@ -5471,9 +5505,10 @@ BUILDLINK_API_DEPENDS.foo+=   foo&gt;=1.1.0
 	require a Kerberos 5 implementation.</p></li>
 <li class="listitem"><p><code class="filename">motif.buildlink3.mk</code> checks for a
 	system-provided Motif installation or adds a dependency on
-	<a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/x11/lesstif/README.html" target="_top"><code class="filename">x11/lesstif</code></a> or <a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/x11/openmotif/README.html" target="_top"><code class="filename">x11/openmotif</code></a>.  The user can set
+	<a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/x11/lesstif/README.html" target="_top"><code class="filename">x11/lesstif</code></a>, <a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/x11/motif/README.html" target="_top"><code class="filename">x11/motif</code></a> or <a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/x11/openmotif/README.html" target="_top"><code class="filename">x11/openmotif</code></a>.  The user can set
 	<code class="varname">MOTIF_TYPE</code> to <span class="quote">&#8220;<span class="quote">dt</span>&#8221;</span>,
-	<span class="quote">&#8220;<span class="quote">lesstif</span>&#8221;</span>, or <span class="quote">&#8220;<span class="quote">openmotif</span>&#8221;</span> to choose
+	<span class="quote">&#8220;<span class="quote">lesstif</span>&#8221;</span>, <span class="quote">&#8220;<span class="quote">motif</span>&#8221;</span> or
+	<span class="quote">&#8220;<span class="quote">openmotif</span>&#8221;</span> to choose
 	which Motif version will be used.</p></li>
 <li class="listitem"><p><code class="filename">oss.buildlink3.mk</code> defines several
 	variables that may be used by packages that use the
@@ -7580,7 +7615,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="tools.questions"></a>18.4. Questions regarding the tools</h2></div></div></div>
 <div class="qandaset">
-<a name="idm28374468"></a><dl>
+<a name="idm30252096"></a><dl>
 <dt>18.4.1. <a href="#tools.new">How do I add a new tool?</a>
 </dt>
 <dt>18.4.2. <a href="#tools.listall">How do I get a list of all available
@@ -7599,7 +7634,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 <tbody>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.new"></a><a name="idm28374276"></a><p><b>18.4.1.</b></p>
+<a name="tools.new"></a><a name="idm30251904"></a><p><b>18.4.1.</b></p>
 </td>
 <td align="left" valign="top"><p>How do I add a new tool?</p></td>
 </tr>
@@ -7609,7 +7644,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.listall"></a><a name="idm28373764"></a><p><b>18.4.2.</b></p>
+<a name="tools.listall"></a><a name="idm30251392"></a><p><b>18.4.2.</b></p>
 </td>
 <td align="left" valign="top"><p>How do I get a list of all available
 	tools?</p></td>
@@ -7620,7 +7655,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.used"></a><a name="idm28373252"></a><p><b>18.4.3.</b></p>
+<a name="tools.used"></a><a name="idm30250880"></a><p><b>18.4.3.</b></p>
 </td>
 <td align="left" valign="top"><p>How can I get a list of all the tools that a
 	package is using while being built? I want to know whether it
@@ -8661,11 +8696,15 @@ pre-configure:
 <p>If this distinction is not fine enough, you can also test
 	for the following macros.</p>
 <pre class="programlisting">
-FreeBSD     __FreeBSD__
+Cygwin      __CYGWIN__
 DragonFly   __DragonFly__
+FreeBSD     __FreeBSD__
+Haiku       __HAIKU__
 Interix     __INTERIX
 IRIX        __sgi (TODO: get a definite source for this)
 Linux       linux, __linux, __linux__
+MirBSD      __MirBSD__ (__OpenBSD__ is also defined)
+Minix3      __minix
 NetBSD      __NetBSD__
 OpenBSD     __OpenBSD__
 Solaris     sun, __sun
@@ -9637,7 +9676,7 @@ place.</p></li>
 	and if you still don't have the answer, ask on the
 	<code class="literal">pkgsrc-users</code> mailing list.</p>
 <div class="qandaset">
-<a name="idm30154116"></a><dl>
+<a name="idm29946880"></a><dl>
 <dt>22.1. <a href="#devfaq.makeflags">What is the difference between
 	MAKEFLAGS, .MAKEFLAGS and
 	MAKE_FLAGS?</a>
@@ -9682,7 +9721,7 @@ do?</a>
 <tbody>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.makeflags"></a><a name="idm30153860"></a><p><b>22.1.</b></p>
+<a name="devfaq.makeflags"></a><a name="idm29946688"></a><p><b>22.1.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
 	<code class="varname">MAKEFLAGS</code>, <code class="varname">.MAKEFLAGS</code> and
@@ -9698,7 +9737,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.make"></a><a name="idm30151748"></a><p><b>22.2.</b></p>
+<a name="devfaq.make"></a><a name="idm29944512"></a><p><b>22.2.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
 	<code class="varname">MAKE</code>, <code class="varname">GMAKE</code> and
@@ -9716,7 +9755,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.cc"></a><a name="idm30145348"></a><p><b>22.3.</b></p>
+<a name="devfaq.cc"></a><a name="idm29942272"></a><p><b>22.3.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
 	<code class="varname">CC</code>, <code class="varname">PKG_CC</code> and
@@ -9734,7 +9773,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3flags"></a><a name="idm30143236"></a><p><b>22.4.</b></p>
+<a name="devfaq.bl3flags"></a><a name="idm29940096"></a><p><b>22.4.</b></p>
 </td>
 <td align="left" valign="top"><p>What is the difference between
 	<code class="varname">BUILDLINK_LDFLAGS</code>,
@@ -9747,7 +9786,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3prefix"></a><a name="idm30142148"></a><p><b>22.5.</b></p>
+<a name="devfaq.bl3prefix"></a><a name="idm29939008"></a><p><b>22.5.</b></p>
 </td>
 <td align="left" valign="top"><p>Why does <span class="command"><strong>make show-var
 	VARNAME=BUILDLINK_PREFIX.<em class="replaceable"><code>foo</code></em></strong></span>
@@ -9763,7 +9802,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.master_sites"></a><a name="idm30140548"></a><p><b>22.6.</b></p>
+<a name="devfaq.master_sites"></a><a name="idm29937472"></a><p><b>22.6.</b></p>
 </td>
 <td align="left" valign="top"><p>What does
 	<code class="literal">${MASTER_SITE_SOURCEFORGE:=package/}</code> mean? I
@@ -9787,7 +9826,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.mailinglists"></a><a name="idm30136580"></a><p><b>22.7.</b></p>
+<a name="devfaq.mailinglists"></a><a name="idm29929408"></a><p><b>22.7.</b></p>
 </td>
 <td align="left" valign="top"><p>Which mailing lists are there for package
 	developers?</p></td>
@@ -9812,7 +9851,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.documentation"></a><a name="idm30134532"></a><p><b>22.8.</b></p>
+<a name="devfaq.documentation"></a><a name="idm29927296"></a><p><b>22.8.</b></p>
 </td>
 <td align="left" valign="top"><p>Where is the pkgsrc
 	documentation?</p></td>
@@ -9860,7 +9899,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.too-much-time"></a><a name="idm30131268"></a><p><b>22.9.</b></p>
+<a name="devfaq.too-much-time"></a><a name="idm29924032"></a><p><b>22.9.</b></p>
 </td>
 <td align="left" valign="top"><p>I have a little time to kill.  What shall I
 do?</p></td>
@@ -11123,11 +11162,8 @@ source packages</h2></div></div></div>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p>Make sure you have the packages needed to
 	regenerate the pkgsrc guide (and other XML-based NetBSD
-	documentation) installed. These are <a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/meta-pkgs/netbsd-doc/README.html" target="_top"><code class="filename">meta-pkgs/netbsd-doc</code></a> for creating the
-	ASCII and HTML versions, and <a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/meta-pkgs/netbsd-doc-print/README.html" target="_top"><code class="filename">meta-pkgs/netbsd-doc-print</code></a> for the
-	PostScript and PDF versions. You will need both packages
-	installed, to make sure documentation is consistent across all
-	formats.</p></li>
+	documentation) installed. These are automatically installed when
+	you install the <a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/meta-pkgs/pkgsrc-guide-tools/README.html" target="_top"><code class="filename">meta-pkgs/pkgsrc-guide-tools</code></a> package.</p></li>
 <li class="step"><p>Run <span class="command"><strong>cd doc/guide</strong></span> to get to the
 	right directory. All further steps will take place
 	here.</p></li>
diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index a1bfe25e89f..6eff6ee1046 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -61,13 +61,14 @@ I. The pkgsrc user's guide
         3.2. Bootstrapping pkgsrc
         3.3. Platform-specific notes
 
-            3.3.1. Darwin (Mac OS X)
-            3.3.2. FreeBSD
-            3.3.3. Interix
-            3.3.4. IRIX
-            3.3.5. Linux
-            3.3.6. OpenBSD
-            3.3.7. Solaris
+            3.3.1. Cygwin
+            3.3.2. Darwin (Mac OS X)
+            3.3.3. FreeBSD
+            3.3.4. Interix
+            3.3.5. IRIX
+            3.3.6. Linux
+            3.3.7. OpenBSD
+            3.3.8. Solaris
 
     4. Using pkgsrc
 
@@ -588,6 +589,12 @@ Table 1.1. Platforms supported by pkgsrc
 |HP-UX                                        |     Apr 2007     |
 |---------------------------------------------+------------------|
 |Haiku                                        |     Sep 2010     |
+|---------------------------------------------+------------------|
+|MirBSD                                       |     Aug 2011     |
+|---------------------------------------------+------------------|
+|Minix3                                       |     Nov 2011     |
+|---------------------------------------------+------------------|
+|Cygwin                                       |     Mar 2013     |
 +----------------------------------------------------------------+
 
 
@@ -706,13 +713,14 @@ Table of Contents
     3.2. Bootstrapping pkgsrc
     3.3. Platform-specific notes
 
-        3.3.1. Darwin (Mac OS X)
-        3.3.2. FreeBSD
-        3.3.3. Interix
-        3.3.4. IRIX
-        3.3.5. Linux
-        3.3.6. OpenBSD
-        3.3.7. Solaris
+        3.3.1. Cygwin
+        3.3.2. Darwin (Mac OS X)
+        3.3.3. FreeBSD
+        3.3.4. Interix
+        3.3.5. IRIX
+        3.3.6. Linux
+        3.3.7. OpenBSD
+        3.3.8. Solaris
 
 4. Using pkgsrc
 
@@ -973,13 +981,14 @@ Table of Contents
 3.2. Bootstrapping pkgsrc
 3.3. Platform-specific notes
 
-    3.3.1. Darwin (Mac OS X)
-    3.3.2. FreeBSD
-    3.3.3. Interix
-    3.3.4. IRIX
-    3.3.5. Linux
-    3.3.6. OpenBSD
-    3.3.7. Solaris
+    3.3.1. Cygwin
+    3.3.2. Darwin (Mac OS X)
+    3.3.3. FreeBSD
+    3.3.4. Interix
+    3.3.5. IRIX
+    3.3.6. Linux
+    3.3.7. OpenBSD
+    3.3.8. Solaris
 
 3.1. Binary distribution
 
@@ -1027,7 +1036,24 @@ build and install packages.
 
 Here are some platform-specific notes you should be aware of.
 
-3.3.1. Darwin (Mac OS X)
+3.3.1. Cygwin
+
+Cygwin 1.7.x and later are supported.
+
+You need to install minimal base packages in `Base' category plus any of
+compiler, gcc, gcc4, and/or clang. For gcc and gcc4, C and C++ compiler will be
+installed by default, but you can install Fortran compiler additionally because
+it will be required to use libtool. If it is not installed (or too old),
+Fortran compiler will be installed with pkgsrc automatically.
+
+As noted in Cygwin FAQ: `Why doesn't su work?', su(1) command has been in
+Cygwin distribution, but it has never worked. Unless you bootstrap pkgsrc with
+the --unprivileged option, workaround is:
+
+  * Right click "Cygwin Terminal" in your Start Menu, then pick "Run as
+    administrator".
+
+3.3.2. Darwin (Mac OS X)
 
 Darwin 5.x and up are supported.
 
@@ -1038,7 +1064,7 @@ optional package included with the Developer Tools) if you intend to build
 packages that use the X11 Window System. (If you don't want or need the full
 Xcode GUI, download and install Command Line Tools for Xcode.)
 
-3.3.2. FreeBSD
+3.3.3. FreeBSD
 
 FreeBSD 8.3 and 9.0 have been tested and are supported, other versions may
 work.
@@ -1063,7 +1089,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.3. 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
@@ -1081,7 +1107,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.3.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:
@@ -1125,7 +1151,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.3.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.
@@ -1148,7 +1174,7 @@ pkgsrc, note the following things.
 
     Set the DWORD value "EnableSetuidBinaries" to 1; then reboot.
 
-3.3.3.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
@@ -1173,7 +1199,7 @@ adequate emulation in most cases:
 interix:kP=\E[S:kN=\E[T:kH=\E[U:dc@:DC@:tc=pcansi:
 
 
-3.3.3.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
@@ -1217,7 +1243,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.3.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
@@ -1233,7 +1259,7 @@ around the issue:
 # chmod -R g+w $PKG_DBDIR
 
 
-3.3.4. 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
@@ -1277,7 +1303,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.5. 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
@@ -1319,7 +1345,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.6. OpenBSD
+3.3.7. OpenBSD
 
 OpenBSD 5.1 has been tested and supported, other versions may work.
 
@@ -1352,7 +1378,7 @@ with the OpenBSD userland tools. There are several steps:
     .endif
 
 
-3.3.7. Solaris
+3.3.8. 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.
@@ -1377,7 +1403,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.7.1. If you are using gcc
+3.3.8.1. If you are using gcc
 
 It makes life much simpler if you only use the same gcc consistently for
 building all packages.
@@ -1388,7 +1414,7 @@ gcc used during bootstrapping.
 
 Binary packages of gcc can be found through http://www.sunfreeware.com/.
 
-3.3.7.2. If you are using Sun WorkShop
+3.3.8.2. If you are using Sun WorkShop
 
 You will need at least the following packages installed (from WorkShop 5.0)
 
@@ -1412,7 +1438,7 @@ Note
 The CPP setting might break some packages that use the C preprocessor for
 processing things other than C source code.
 
-3.3.7.3. Building 64-bit binaries with SunPro
+3.3.8.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:
@@ -1425,7 +1451,7 @@ Note
 This setting has been tested for the SPARC architecture. Intel and AMD machines
 need some more work.
 
-3.3.7.4. Common problems
+3.3.8.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
@@ -4680,9 +4706,9 @@ issues:
     implementation.
 
   * motif.buildlink3.mk checks for a system-provided Motif installation or adds
-    a dependency on x11/lesstif or x11/openmotif. The user can set MOTIF_TYPE
-    to "dt", "lesstif", or "openmotif" to choose which Motif version will be
-    used.
+    a dependency on x11/lesstif, x11/motif or x11/openmotif. The user can set
+    MOTIF_TYPE to "dt", "lesstif", "motif" or "openmotif" to choose which Motif
+    version will be used.
 
   * oss.buildlink3.mk defines several variables that may be used by packages
     that use the Open Sound System (OSS) API.
@@ -7275,11 +7301,15 @@ should use the following code.
 If this distinction is not fine enough, you can also test for the following
 macros.
 
-FreeBSD     __FreeBSD__
+Cygwin      __CYGWIN__
 DragonFly   __DragonFly__
+FreeBSD     __FreeBSD__
+Haiku       __HAIKU__
 Interix     __INTERIX
 IRIX        __sgi (TODO: get a definite source for this)
 Linux       linux, __linux, __linux__
+MirBSD      __MirBSD__ (__OpenBSD__ is also defined)
+Minix3      __minix
 NetBSD      __NetBSD__
 OpenBSD     __OpenBSD__
 Solaris     sun, __sun
@@ -9223,11 +9253,8 @@ D.2. Procedure
 The procedure to edit the pkgsrc guide is:
 
  1. Make sure you have the packages needed to regenerate the pkgsrc guide (and
-    other XML-based NetBSD documentation) installed. These are meta-pkgs/
-    netbsd-doc for creating the ASCII and HTML versions, and meta-pkgs/
-    netbsd-doc-print for the PostScript and PDF versions. You will need both
-    packages installed, to make sure documentation is consistent across all
-    formats.
+    other XML-based NetBSD documentation) installed. These are automatically
+    installed when you install the meta-pkgs/pkgsrc-guide-tools package.
 
  2. Run cd doc/guide to get to the right directory. All further steps will take
     place here.