regen

1 files changed, 34 insertions, 20 deletions

diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html
index 0aeb7ab19a8..9d8dc5738b3 100644
--- a/doc/pkgsrc.html
+++ b/doc/pkgsrc.html
@@ -349,7 +349,8 @@ builds)</a></span></dt>
 <dt><span class="sect2"><a href="#basic-programming-languages">19.4.1. C, C++, and Fortran</a></span></dt>
 <dt><span class="sect2"><a href="#java-programming-language">19.4.2. Java</a></span></dt>
 <dt><span class="sect2"><a href="#perl-scripts">19.4.3. Packages containing perl scripts</a></span></dt>
-<dt><span class="sect2"><a href="#other-programming-languages">19.4.4. Other programming languages</a></span></dt>
+<dt><span class="sect2"><a href="#shell-scripts">19.4.4. Packages containing shell scripts</a></span></dt>
+<dt><span class="sect2"><a href="#other-programming-languages">19.4.5. Other programming languages</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#fixes.build">19.5. Fixing problems in the <span class="emphasis"><em>build</em></span> phase</a></span></dt>
 <dd><dl>
@@ -3758,7 +3759,8 @@ anymore, you can remove that file and run <span class="command"><strong>cvs -q u
 <dt><span class="sect2"><a href="#basic-programming-languages">19.4.1. C, C++, and Fortran</a></span></dt>
 <dt><span class="sect2"><a href="#java-programming-language">19.4.2. Java</a></span></dt>
 <dt><span class="sect2"><a href="#perl-scripts">19.4.3. Packages containing perl scripts</a></span></dt>
-<dt><span class="sect2"><a href="#other-programming-languages">19.4.4. Other programming languages</a></span></dt>
+<dt><span class="sect2"><a href="#shell-scripts">19.4.4. Packages containing shell scripts</a></span></dt>
+<dt><span class="sect2"><a href="#other-programming-languages">19.4.5. Other programming languages</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#fixes.build">19.5. Fixing problems in the <span class="emphasis"><em>build</em></span> phase</a></span></dt>
 <dd><dl>
@@ -4628,7 +4630,7 @@ monitor_file(...)
       the fixes straight from the packaged code.</p>
 <p>This generally involves cleaning up the patches
       (because sometimes the patches that are
-      added to pkgsrc are quick hacks), filling bug reports in the
+      added to pkgsrc are quick hacks), filing bug reports in the
       appropriate trackers for the projects and working with the
       mainstream authors to accept your changes.  It is
       <span class="emphasis"><em>extremely important</em></span> that you do it so that
@@ -7554,7 +7556,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" title="Frequently Asked Questions">
-<a name="idm19312832"></a><dl>
+<a name="idm20025536"></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
@@ -7571,7 +7573,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 <tbody>
 <tr class="question" title="18.4.1.">
 <td align="left" valign="top">
-<a name="tools.new"></a><a name="idm19312448"></a><p><b>18.4.1.</b></p>
+<a name="tools.new"></a><a name="idm20025152"></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>
@@ -7581,7 +7583,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 </tr>
 <tr class="question" title="18.4.2.">
 <td align="left" valign="top">
-<a name="tools.listall"></a><a name="idm19311424"></a><p><b>18.4.2.</b></p>
+<a name="tools.listall"></a><a name="idm20024128"></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>
@@ -7592,7 +7594,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 </tr>
 <tr class="question" title="18.4.3.">
 <td align="left" valign="top">
-<a name="tools.used"></a><a name="idm19310400"></a><p><b>18.4.3.</b></p>
+<a name="tools.used"></a><a name="idm20023104"></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
@@ -7645,7 +7647,8 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 <dt><span class="sect2"><a href="#basic-programming-languages">19.4.1. C, C++, and Fortran</a></span></dt>
 <dt><span class="sect2"><a href="#java-programming-language">19.4.2. Java</a></span></dt>
 <dt><span class="sect2"><a href="#perl-scripts">19.4.3. Packages containing perl scripts</a></span></dt>
-<dt><span class="sect2"><a href="#other-programming-languages">19.4.4. Other programming languages</a></span></dt>
+<dt><span class="sect2"><a href="#shell-scripts">19.4.4. Packages containing shell scripts</a></span></dt>
+<dt><span class="sect2"><a href="#other-programming-languages">19.4.5. Other programming languages</a></span></dt>
 </dl></dd>
 <dt><span class="sect1"><a href="#fixes.build">19.5. Fixing problems in the <span class="emphasis"><em>build</em></span> phase</a></span></dt>
 <dd><dl>
@@ -8566,9 +8569,20 @@ pre-configure:
 <p>See <a class="xref" href="#perl-modules" title="19.6.6. Packages installing perl modules">Section 19.6.6, &#8220;Packages installing perl modules&#8221;</a> for information
     about handling perl modules.</p>
 </div>
-<div class="sect2" title="19.4.4. Other programming languages">
+<div class="sect2" title="19.4.4. Packages containing shell scripts">
 <div class="titlepage"><div><div><h3 class="title">
-<a name="other-programming-languages"></a>19.4.4. Other programming languages</h3></div></div></div>
+<a name="shell-scripts"></a>19.4.4. Packages containing shell scripts</h3></div></div></div>
+<p><code class="varname">REPLACE_SH</code>,
+    <code class="varname">REPLACE_BASH</code>, <code class="varname">REPLACE_CSH</code>,
+    and <code class="varname">REPLACE_KSH</code> can be used to replace shell
+    hash bangs in files. Please use the appropriate one, prefering
+    <code class="varname">REPLACE_SH</code> in case this shell is sufficient.
+    When using <code class="varname">REPLACE_BASH</code>, don't forget to add
+    <code class="filename">bash</code> to <code class="varname">USE_TOOLS</code>.</p>
+</div>
+<div class="sect2" title="19.4.5. Other programming languages">
+<div class="titlepage"><div><div><h3 class="title">
+<a name="other-programming-languages"></a>19.4.5. Other programming languages</h3></div></div></div>
 <p>Currently, there is no special handling for other languages
     in pkgsrc.  If a compiler package provides a
     <code class="filename">buildlink3.mk</code> file, include that, otherwise
@@ -9597,7 +9611,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" title="Frequently Asked Questions">
-<a name="idm20875968"></a><dl>
+<a name="idm19487552"></a><dl>
 <dt>22.1. <a href="#devfaq.makeflags">What is the difference between
 	MAKEFLAGS, .MAKEFLAGS and
 	MAKE_FLAGS?</a>
@@ -9640,7 +9654,7 @@ do?</a>
 <tbody>
 <tr class="question" title="22.1.">
 <td align="left" valign="top">
-<a name="devfaq.makeflags"></a><a name="idm20875584"></a><p><b>22.1.</b></p>
+<a name="devfaq.makeflags"></a><a name="idm19487168"></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
@@ -9656,7 +9670,7 @@ do?</a>
 </tr>
 <tr class="question" title="22.2.">
 <td align="left" valign="top">
-<a name="devfaq.make"></a><a name="idm20871488"></a><p><b>22.2.</b></p>
+<a name="devfaq.make"></a><a name="idm19483200"></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
@@ -9674,7 +9688,7 @@ do?</a>
 </tr>
 <tr class="question" title="22.3.">
 <td align="left" valign="top">
-<a name="devfaq.cc"></a><a name="idm20867136"></a><p><b>22.3.</b></p>
+<a name="devfaq.cc"></a><a name="idm19478720"></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
@@ -9692,7 +9706,7 @@ do?</a>
 </tr>
 <tr class="question" title="22.4.">
 <td align="left" valign="top">
-<a name="devfaq.bl3flags"></a><a name="idm20862912"></a><p><b>22.4.</b></p>
+<a name="devfaq.bl3flags"></a><a name="idm19474624"></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>,
@@ -9705,7 +9719,7 @@ do?</a>
 </tr>
 <tr class="question" title="22.5.">
 <td align="left" valign="top">
-<a name="devfaq.bl3prefix"></a><a name="idm20860736"></a><p><b>22.5.</b></p>
+<a name="devfaq.bl3prefix"></a><a name="idm19472320"></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>
@@ -9721,7 +9735,7 @@ do?</a>
 </tr>
 <tr class="question" title="22.6.">
 <td align="left" valign="top">
-<a name="devfaq.master_sites"></a><a name="idm20857664"></a><p><b>22.6.</b></p>
+<a name="devfaq.master_sites"></a><a name="idm19469248"></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
@@ -9745,7 +9759,7 @@ do?</a>
 </tr>
 <tr class="question" title="22.7.">
 <td align="left" valign="top">
-<a name="devfaq.mailinglists"></a><a name="idm20849600"></a><p><b>22.7.</b></p>
+<a name="devfaq.mailinglists"></a><a name="idm19452992"></a><p><b>22.7.</b></p>
 </td>
 <td align="left" valign="top"><p>Which mailing lists are there for package
 	developers?</p></td>
@@ -9770,7 +9784,7 @@ do?</a>
 </tr>
 <tr class="question" title="22.8.">
 <td align="left" valign="top">
-<a name="devfaq.documentation"></a><a name="idm20837568"></a><p><b>22.8.</b></p>
+<a name="devfaq.documentation"></a><a name="idm19449280"></a><p><b>22.8.</b></p>
 </td>
 <td align="left" valign="top"><p>Where is the pkgsrc
 	documentation?</p></td>
@@ -9818,7 +9832,7 @@ do?</a>
 </tr>
 <tr class="question" title="22.9.">
 <td align="left" valign="top">
-<a name="devfaq.too-much-time"></a><a name="idm20822848"></a><p><b>22.9.</b></p>
+<a name="devfaq.too-much-time"></a><a name="idm19442752"></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>