regen

1 files changed, 27 insertions, 28 deletions

diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html
index e8d919505c2..bd4b2150b79 100644
--- a/doc/pkgsrc.html
+++ b/doc/pkgsrc.html
@@ -7362,7 +7362,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="idm73132112"></a><dl>
+<a name="idm73164880"></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
@@ -7381,7 +7381,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 <tbody>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.new"></a><a name="idm73131728"></a><p><b>18.4.1.</b></p>
+<a name="tools.new"></a><a name="idm73164496"></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>
@@ -7391,7 +7391,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.listall"></a><a name="idm73130704"></a><p><b>18.4.2.</b></p>
+<a name="tools.listall"></a><a name="idm73163472"></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>
@@ -7402,7 +7402,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.used"></a><a name="idm73129680"></a><p><b>18.4.3.</b></p>
+<a name="tools.used"></a><a name="idm73162448"></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
@@ -8161,7 +8161,8 @@ FETCH_MESSAGE+= "manually from "${MASTER_SITES:Q}"."
 <div class="sect2">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="build.fetch.github"></a>19.2.3. Packages hosted on github.com</h3></div></div></div>
-<p>Helper methods exist for packages hosted on github.com. You do not need to specify <code class="varname">MASTER_SITE</code> but should instead use one of the three supported methods from below.</p>
+<p>Helper methods exist for packages hosted on github.com which will often have distfile names that clash with other packages, for example <code class="filename">1.0.tar.gz</code>. Use one of the three recipes from below:
+    </p>
 <div class="sect3">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="build.fetch.github.tag"></a>19.2.3.1. Fetch based on a tagged release</h4></div></div></div>
@@ -8170,10 +8171,9 @@ FETCH_MESSAGE+= "manually from "${MASTER_SITES:Q}"."
       </p>
 <pre class="programlisting">
 DISTNAME=       exampleproject-1.0
-USE_GITHUB=     yes
-GH_ACCOUNT=     username
-#GH_PROJECT=    # can be omitted if same as DISTNAME
-GH_TAGNAME=     v1.0
+MASTER_SITES=   ${MASTER_SITE_GITHUB:=username/}
+#GITHUB_PROJECT=        # can be omitted if same as DISTNAME
+GITHUB_TAG=     v${PKGVERSION_NOREV}
 EXTRACT_SUFX=   .zip
 </pre>
 </div>
@@ -8185,10 +8185,9 @@ EXTRACT_SUFX=   .zip
       </p>
 <pre class="programlisting">
 DISTNAME=       example-1.0
-USE_GITHUB=     yes
-#GH_ACCOUNT=    # can be omitted if same as DISTNAME
-#GH_PROJECT=    # can be omitted if same as DISTNAME
-GH_COMMIT=      988881adc9fc3655077dc2d4d757d480b5ea0e11
+MASTER_SITES=   ${MASTER_SITE_GITHUB:example/}
+#GITHUB_PROJECT=        # can be omitted if same as DISTNAME
+GITHUB_TAG=     988881adc9fc3655077dc2d4d757d480b5ea0e11
       </pre>
 </div>
 <div class="sect3">
@@ -8198,12 +8197,12 @@ GH_COMMIT=      988881adc9fc3655077dc2d4d757d480b5ea0e11
         If your distfile URL looks similar to <code class="literal">http://github.com/username/exampleproject/releases/download/rel-1.6/offensive-1.6.zip</code>, then you are packaging a release.
       </p>
 <pre class="programlisting">
-PKGNAME=	${DISTNAME:S/offensive/proper/}
 DISTNAME=       offensive-1.6
-USE_GITHUB=     yes
-GH_ACCOUNT=     username
-GH_PROJECT=     exampleproject
-GH_RELEASE=     rel-${PKGVERSION_NOREV} # usually just set this to ${DISTNAME}
+PKGNAME=        ${DISTNAME:S/offensive/proper/}
+MASTER_SITES=   ${MASTER_SITE_GITHUB:=username/}
+GITHUB_PROJECT= exampleproject
+GITHUB_RELEASE= rel-${PKGVERSION_NOREV} # usually just set this to ${DISTNAME}
+EXTRACT_SUFX=   .zip
       </pre>
 </div>
 </div>
@@ -9550,7 +9549,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="idm74671184"></a><dl>
+<a name="idm72614864"></a><dl>
 <dt>22.1. <a href="#devfaq.makeflags">What is the difference between
 	MAKEFLAGS, .MAKEFLAGS and
 	MAKE_FLAGS?</a>
@@ -9595,7 +9594,7 @@ do?</a>
 <tbody>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.makeflags"></a><a name="idm74670800"></a><p><b>22.1.</b></p>
+<a name="devfaq.makeflags"></a><a name="idm72614480"></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
@@ -9611,7 +9610,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.make"></a><a name="idm74666704"></a><p><b>22.2.</b></p>
+<a name="devfaq.make"></a><a name="idm72610384"></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
@@ -9629,7 +9628,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.cc"></a><a name="idm74662352"></a><p><b>22.3.</b></p>
+<a name="devfaq.cc"></a><a name="idm72606032"></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
@@ -9647,7 +9646,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3flags"></a><a name="idm74658128"></a><p><b>22.4.</b></p>
+<a name="devfaq.bl3flags"></a><a name="idm72601808"></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>,
@@ -9660,7 +9659,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3prefix"></a><a name="idm74655952"></a><p><b>22.5.</b></p>
+<a name="devfaq.bl3prefix"></a><a name="idm72599632"></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>
@@ -9676,7 +9675,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.master_sites"></a><a name="idm74652880"></a><p><b>22.6.</b></p>
+<a name="devfaq.master_sites"></a><a name="idm72596560"></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
@@ -9700,7 +9699,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.mailinglists"></a><a name="idm74644816"></a><p><b>22.7.</b></p>
+<a name="devfaq.mailinglists"></a><a name="idm74677456"></a><p><b>22.7.</b></p>
 </td>
 <td align="left" valign="top"><p>Which mailing lists are there for package
 	developers?</p></td>
@@ -9725,7 +9724,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.documentation"></a><a name="idm74640976"></a><p><b>22.8.</b></p>
+<a name="devfaq.documentation"></a><a name="idm74673616"></a><p><b>22.8.</b></p>
 </td>
 <td align="left" valign="top"><p>Where is the pkgsrc
 	documentation?</p></td>
@@ -9773,7 +9772,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.too-much-time"></a><a name="idm74634448"></a><p><b>22.9.</b></p>
+<a name="devfaq.too-much-time"></a><a name="idm74667088"></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>