[pkgsrc/trunk]: pkgsrc/doc regen

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dd31ec6d20a7
branches:  trunk
changeset: 352314:dd31ec6d20a7
user:      maya <maya%pkgsrc.org@localhost>
date:      Mon Sep 12 12:20:47 2016 +0000

description:
regen

diffstat:

 doc/pkgsrc.html |  33 ++++++++++++++++++++++-----------
 doc/pkgsrc.txt  |  17 ++++++++++++++++-
 2 files changed, 38 insertions(+), 12 deletions(-)

diffs (154 lines):

diff -r a2d94b1b9162 -r dd31ec6d20a7 doc/pkgsrc.html
--- a/doc/pkgsrc.html   Mon Sep 12 12:18:43 2016 +0000
+++ b/doc/pkgsrc.html   Mon Sep 12 12:20:47 2016 +0000
@@ -1815,6 +1815,17 @@
          when building packages.  If the system GCC doesn't
          satisfy this requirement, then pkgsrc will build and
          install one of the GCC packages to use instead.</p></dd>
+<dt><span class="term"><code class="varname">PYTHON_DEFAULT_VERSION</code>:</span></dt>
+<dd><p>Specifies which version of python to use when several
+         options are available.</p></dd>
+<dt><span class="term"><code class="varname">PKGSRC_FORTRAN</code>:</span></dt>
+<dd><p>Specifies the fortran compiler to use.
+         The default is <code class="varname">g95</code>, and
+         <code class="varname">gfortran</code> is an alternative.</p></dd>
+<dt><span class="term"><code class="varname">GFORTRAN_VERSION</code>:</span></dt>
+<dd><p>If <code class="varname">PKGSRC_FORTRAN</code><code class="literal">=</code>
+         <code class="varname">gfortran</code> is used, this option specifies which
+         version to use.</p></dd>
 </dl></div>
 </div>
 <div class="sect2">
@@ -7161,7 +7172,7 @@
     (OS-version-platform) that can use glob-style
     wildcards.</p>
 <p>If a package is not appropriate for some platforms (as
-    oopposed to merely broken), a different set of variables should be
+    opposed to merely broken), a different set of variables should be
     used as this affects failure reporting and statistics.
     If the package is appropriate for most platforms, the exceptions
     should be noted with <code class="varname">NOT_FOR_PLATFORM</code>.  If
@@ -8809,7 +8820,7 @@
        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="idm79356336"></a><dl>
+<a name="idm80465328"></a><dl>
 <dt>22.1. <a href="#devfaq.makeflags">What is the difference between
        MAKEFLAGS, .MAKEFLAGS and
        MAKE_FLAGS?</a>
@@ -8854,7 +8865,7 @@
 <tbody>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.makeflags"></a><a name="idm79355952"></a><p><b>22.1.</b></p>
+<a name="devfaq.makeflags"></a><a name="idm80464944"></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
@@ -8870,7 +8881,7 @@
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.make"></a><a name="idm79351856"></a><p><b>22.2.</b></p>
+<a name="devfaq.make"></a><a name="idm80460976"></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
@@ -8888,7 +8899,7 @@
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.cc"></a><a name="idm79347504"></a><p><b>22.3.</b></p>
+<a name="devfaq.cc"></a><a name="idm80456496"></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
@@ -8906,7 +8917,7 @@
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3flags"></a><a name="idm79343280"></a><p><b>22.4.</b></p>
+<a name="devfaq.bl3flags"></a><a name="idm80452400"></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>,
@@ -8919,7 +8930,7 @@
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3prefix"></a><a name="idm79341104"></a><p><b>22.5.</b></p>
+<a name="devfaq.bl3prefix"></a><a name="idm80450096"></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>
@@ -8935,7 +8946,7 @@
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.master_sites"></a><a name="idm79338032"></a><p><b>22.6.</b></p>
+<a name="devfaq.master_sites"></a><a name="idm80447024"></a><p><b>22.6.</b></p>
 </td>
 <td align="left" valign="top"><p>What does
        <code class="code">${MASTER_SITE_SOURCEFORGE:=package/}</code> mean? I
@@ -8959,7 +8970,7 @@
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.mailinglists"></a><a name="idm79331120"></a><p><b>22.7.</b></p>
+<a name="devfaq.mailinglists"></a><a name="idm80440112"></a><p><b>22.7.</b></p>
 </td>
 <td align="left" valign="top"><p>Which mailing lists are there for package
        developers?</p></td>
@@ -8984,7 +8995,7 @@
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.documentation"></a><a name="idm79327280"></a><p><b>22.8.</b></p>
+<a name="devfaq.documentation"></a><a name="idm80436400"></a><p><b>22.8.</b></p>
 </td>
 <td align="left" valign="top"><p>Where is the pkgsrc
        documentation?</p></td>
@@ -9032,7 +9043,7 @@
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.too-much-time"></a><a name="idm79320880"></a><p><b>22.9.</b></p>
+<a name="devfaq.too-much-time"></a><a name="idm80429872"></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 -r a2d94b1b9162 -r dd31ec6d20a7 doc/pkgsrc.txt
--- a/doc/pkgsrc.txt    Mon Sep 12 12:18:43 2016 +0000
+++ b/doc/pkgsrc.txt    Mon Sep 12 12:20:47 2016 +0000
@@ -1521,6 +1521,21 @@
     the system GCC doesn't satisfy this requirement, then pkgsrc will build and
     install one of the GCC packages to use instead.
 
+PYTHON_DEFAULT_VERSION:
+
+    Specifies which version of python to use when several options are
+    available.
+
+PKGSRC_FORTRAN:
+
+    Specifies the fortran compiler to use. The default is g95, and gfortran is
+    an alternative.
+
+GFORTRAN_VERSION:
+
+    If PKGSRC_FORTRAN= gfortran is used, this option specifies which version to
+    use.
+
 5.4.2. Additional flags to the compiler (CFLAGS)
 
 If you wish to set the CFLAGS variable, please make sure to use the += operator
@@ -5961,7 +5976,7 @@
 Both BROKEN_ON_PLATFORM and BROKEN_EXCEPT_ON_PLATFORM are OS triples
 (OS-version-platform) that can use glob-style wildcards.
 
-If a package is not appropriate for some platforms (as oopposed to merely
+If a package is not appropriate for some platforms (as opposed to merely
 broken), a different set of variables should be used as this affects failure
 reporting and statistics. If the package is appropriate for most platforms, the
 exceptions should be noted with NOT_FOR_PLATFORM. If the package is appropriate