Regenerate text and HTML versions after my recent changes.

2 files changed, 88 insertions, 40 deletions

diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html
index 0527b0c9e65..48f404af20c 100644
--- a/doc/pkgsrc.html
+++ b/doc/pkgsrc.html
@@ -85,8 +85,9 @@
 <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>
+<dt><span class="sect2"><a href="#mirbsd">3.3.7. MirBSD</a></span></dt>
+<dt><span class="sect2"><a href="#openbsd">3.3.8. OpenBSD</a></span></dt>
+<dt><span class="sect2"><a href="#solaris">3.3.9. Solaris</a></span></dt>
 </dl></dd>
 </dl></dd>
 <dt><span class="chapter"><a href="#using">4. Using pkgsrc</a></span></dt>
@@ -668,7 +669,7 @@ minutes!</p>
 </tr>
 <tr>
 <td><a class="ulink" href="http://www.mirbsd.org/" target="_top">MirBSD</a></td>
-<td align="center">Aug 2011</td>
+<td align="center">Jan 2011</td>
 </tr>
 <tr>
 <td><a class="ulink" href="http://www.minix3.org/" target="_top">Minix3</a></td>
@@ -820,8 +821,9 @@ minutes!</p>
 <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>
+<dt><span class="sect2"><a href="#mirbsd">3.3.7. MirBSD</a></span></dt>
+<dt><span class="sect2"><a href="#openbsd">3.3.8. OpenBSD</a></span></dt>
+<dt><span class="sect2"><a href="#solaris">3.3.9. Solaris</a></span></dt>
 </dl></dd>
 </dl></dd>
 <dt><span class="chapter"><a href="#using">4. Using pkgsrc</a></span></dt>
@@ -1119,8 +1121,9 @@ release -d
 <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>
+<dt><span class="sect2"><a href="#mirbsd">3.3.7. MirBSD</a></span></dt>
+<dt><span class="sect2"><a href="#openbsd">3.3.8. OpenBSD</a></span></dt>
+<dt><span class="sect2"><a href="#solaris">3.3.9. Solaris</a></span></dt>
 </dl></dd>
 </dl>
 </div>
@@ -1513,7 +1516,30 @@ 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.7. OpenBSD</h3></div></div></div>
+<a name="mirbsd"></a>3.3.7. MirBSD</h3></div></div></div>
+<p>pkgsrc has been tested on MirBSD #10-current (2011 and newer).
+      Older versions might also work. Releases before #10 are not
+      supported.</p>
+<p>The package tools of the (older) native ports tree,
+      <a class="ulink" href="//www.mirbsd.org/ports.htm" target="_top">MirPorts</a>,
+      have the same names as the ones used by pkgsrc. Care should be taken
+      that the right tools are used. When installing packages from source,
+      use the <code class="filename">bmake</code> command for pkgsrc and
+      <code class="filename">mmake</code> for MirPorts.</p>
+<p>pkgsrc and MirPorts use the same location for the package
+      database, <code class="filename">/var/db/pkg</code>. It is strongly recommended
+      to use <code class="filename">/usr/pkg/db</code> instead, so that the pkgsrc
+      tree is self-contained. This is also the default setting used in the
+      binary package builds.</p>
+<p>Binary packages for MirBSD/i386 can be found on the pkgsrc ftp
+      server. The bootstrap kit there already contains the
+      <span class="command"><strong>pkgin</strong></span> package manager. See the
+      <a class="ulink" href="https://www.mirbsd.org/pkgsrc.htm" target="_top">pkgsrc on MirOS</a>
+      page for more details.</p>
+</div>
+<div class="sect2">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="openbsd"></a>3.3.8. 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
@@ -1554,7 +1580,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.8. Solaris</h3></div></div></div>
+<a name="solaris"></a>3.3.9. 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>
@@ -1575,7 +1601,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.8.1. If you are using gcc</h4></div></div></div>
+<a name="solaris-gcc-note"></a>3.3.9.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,
@@ -1586,7 +1612,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.8.2. If you are using Sun WorkShop</h4></div></div></div>
+<a name="solaris-sun-workshop-note"></a>3.3.9.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; ">
@@ -1616,7 +1642,7 @@ CXXCPP= CC -E
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="solaris-sunpro-64"></a>3.3.8.3. Building 64-bit binaries with SunPro</h4></div></div></div>
+<a name="solaris-sunpro-64"></a>3.3.9.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">
@@ -1632,7 +1658,7 @@ ABI=                    64
 </div>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
-<a name="plat.sunos.problems"></a>3.3.8.4. Common problems</h4></div></div></div>
+<a name="plat.sunos.problems"></a>3.3.9.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
@@ -7666,7 +7692,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="idm76234800"></a><dl>
+<a name="idp140459939576832"></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
@@ -7685,7 +7711,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 <tbody>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.new"></a><a name="idm76234416"></a><p><b>18.4.1.</b></p>
+<a name="tools.new"></a><a name="idp140459939577472"></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>
@@ -7695,7 +7721,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.listall"></a><a name="idm76233264"></a><p><b>18.4.2.</b></p>
+<a name="tools.listall"></a><a name="idp140459939578752"></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>
@@ -7706,7 +7732,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.used"></a><a name="idm76232240"></a><p><b>18.4.3.</b></p>
+<a name="tools.used"></a><a name="idp140459939580048"></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
@@ -9769,7 +9795,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="idm77764400"></a><dl>
+<a name="idp140459940175040"></a><dl>
 <dt>22.1. <a href="#devfaq.makeflags">What is the difference between
 	MAKEFLAGS, .MAKEFLAGS and
 	MAKE_FLAGS?</a>
@@ -9814,7 +9840,7 @@ do?</a>
 <tbody>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.makeflags"></a><a name="idm77764016"></a><p><b>22.1.</b></p>
+<a name="devfaq.makeflags"></a><a name="idp140459940175696"></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
@@ -9830,7 +9856,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.make"></a><a name="idm77759920"></a><p><b>22.2.</b></p>
+<a name="devfaq.make"></a><a name="idp140459940180160"></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
@@ -9848,7 +9874,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.cc"></a><a name="idm77755568"></a><p><b>22.3.</b></p>
+<a name="devfaq.cc"></a><a name="idp140459940185184"></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
@@ -9866,7 +9892,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3flags"></a><a name="idm77751344"></a><p><b>22.4.</b></p>
+<a name="devfaq.bl3flags"></a><a name="idp140459940190064"></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>,
@@ -9879,7 +9905,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3prefix"></a><a name="idm77749168"></a><p><b>22.5.</b></p>
+<a name="devfaq.bl3prefix"></a><a name="idp140459940192688"></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>
@@ -9895,7 +9921,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.master_sites"></a><a name="idm77746096"></a><p><b>22.6.</b></p>
+<a name="devfaq.master_sites"></a><a name="idp140459940196560"></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
@@ -9919,7 +9945,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.mailinglists"></a><a name="idm77738032"></a><p><b>22.7.</b></p>
+<a name="devfaq.mailinglists"></a><a name="idp140459940206176"></a><p><b>22.7.</b></p>
 </td>
 <td align="left" valign="top"><p>Which mailing lists are there for package
 	developers?</p></td>
@@ -9944,7 +9970,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.documentation"></a><a name="idm77734192"></a><p><b>22.8.</b></p>
+<a name="devfaq.documentation"></a><a name="idp140459940211088"></a><p><b>22.8.</b></p>
 </td>
 <td align="left" valign="top"><p>Where is the pkgsrc
 	documentation?</p></td>
@@ -9992,7 +10018,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.too-much-time"></a><a name="idm77727664"></a><p><b>22.9.</b></p>
+<a name="devfaq.too-much-time"></a><a name="idp140459940219968"></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>
diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index 3c67ceb247a..a9719199d3d 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -67,8 +67,9 @@ I. The pkgsrc user's guide
             3.3.4. Interix
             3.3.5. IRIX
             3.3.6. Linux
-            3.3.7. OpenBSD
-            3.3.8. Solaris
+            3.3.7. MirBSD
+            3.3.8. OpenBSD
+            3.3.9. Solaris
 
     4. Using pkgsrc
 
@@ -590,7 +591,7 @@ Table 1.1. Platforms supported by pkgsrc
 |---------------------------------------------+------------------|
 |Haiku                                        |     Sep 2010     |
 |---------------------------------------------+------------------|
-|MirBSD                                       |     Aug 2011     |
+|MirBSD                                       |     Jan 2011     |
 |---------------------------------------------+------------------|
 |Minix3                                       |     Nov 2011     |
 |---------------------------------------------+------------------|
@@ -719,8 +720,9 @@ Table of Contents
         3.3.4. Interix
         3.3.5. IRIX
         3.3.6. Linux
-        3.3.7. OpenBSD
-        3.3.8. Solaris
+        3.3.7. MirBSD
+        3.3.8. OpenBSD
+        3.3.9. Solaris
 
 4. Using pkgsrc
 
@@ -1001,8 +1003,9 @@ Table of Contents
     3.3.4. Interix
     3.3.5. IRIX
     3.3.6. Linux
-    3.3.7. OpenBSD
-    3.3.8. Solaris
+    3.3.7. MirBSD
+    3.3.8. OpenBSD
+    3.3.9. Solaris
 
 3.1. Binary distribution
 
@@ -1359,7 +1362,26 @@ 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.7. OpenBSD
+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.
+
+The package tools of the (older) native ports tree, MirPorts, have the same
+names as the ones used by pkgsrc. Care should be taken that the right tools are
+used. When installing packages from source, use the bmake command for pkgsrc
+and mmake for MirPorts.
+
+pkgsrc and MirPorts use the same location for the package database, /var/db/
+pkg. It is strongly recommended to use /usr/pkg/db instead, so that the pkgsrc
+tree is self-contained. This is also the default setting used in the binary
+package builds.
+
+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.8. OpenBSD
 
 OpenBSD 5.1 has been tested and supported, other versions may work.
 
@@ -1392,7 +1414,7 @@ with the OpenBSD userland tools. There are several steps:
     .endif
 
 
-3.3.8. 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.
@@ -1417,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.8.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.
@@ -1428,7 +1450,7 @@ gcc used during bootstrapping.
 
 Binary packages of gcc can be found through http://www.sunfreeware.com/.
 
-3.3.8.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)
 
@@ -1452,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.8.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:
@@ -1465,7 +1487,7 @@ Note
 This setting has been tested for the SPARC architecture. Intel and AMD machines
 need some more work.
 
-3.3.8.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