Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK))
	by mollari.NetBSD.org (Postfix) with ESMTPS id 1E41A7A26D
	for <mhonarc+pkgsrc-changes@mail-index.netbsd.org>; Mon, 12 Sep 2016 12:20:49 +0000 (UTC)
Received: by mail.netbsd.org (Postfix, from userid 605)
	id C00F085ED6; Mon, 12 Sep 2016 12:20:48 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id 4F89685ED3
	for <pkgsrc-changes@NetBSD.org>; Mon, 12 Sep 2016 12:20:48 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([IPv6:::1])
	by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025)
	with ESMTP id YfjEg9QlMEQQ for <pkgsrc-changes@netbsd.org>;
	Mon, 12 Sep 2016 12:20:47 +0000 (UTC)
Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984])
	by mail.netbsd.org (Postfix) with ESMTP id 98CB885EC0
	for <pkgsrc-changes@NetBSD.org>; Mon, 12 Sep 2016 12:20:47 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id 93884FBD1; Mon, 12 Sep 2016 12:20:47 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1473682847259870"
MIME-Version: 1.0
Date: Mon, 12 Sep 2016 12:20:47 +0000
From: "Maya Rashish" <maya@netbsd.org>
Subject: CVS commit: pkgsrc/doc
To: pkgsrc-changes@NetBSD.org
Reply-To: maya@netbsd.org
X-Mailer: log_accum
Message-Id: <20160912122047.93884FBD1@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
List-Id: pkgsrc-changes.NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1473682847259870
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	maya
Date:		Mon Sep 12 12:20:47 UTC 2016

Modified Files:
	pkgsrc/doc: pkgsrc.html pkgsrc.txt

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.224 -r1.225 pkgsrc/doc/pkgsrc.html pkgsrc/doc/pkgsrc.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1473682847259870
Content-Disposition: inline
Content-Length: 6954
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/doc/pkgsrc.html
diff -u pkgsrc/doc/pkgsrc.html:1.224 pkgsrc/doc/pkgsrc.html:1.225
--- pkgsrc/doc/pkgsrc.html:1.224	Thu Jul 14 14:40:45 2016
+++ pkgsrc/doc/pkgsrc.html	Mon Sep 12 12:20:47 2016
@@ -1815,6 +1815,17 @@ uid=1000(myusername) gid=100(users) grou
 	  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 @@ CONFLICTS=      bar-[0-9]*
     (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 @@ 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="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 @@ do?</a>
 <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 @@ do?</a>
 </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 @@ do?</a>
 </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 @@ do?</a>
 </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 @@ do?</a>
 </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 @@ do?</a>
 </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 @@ do?</a>
 </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 @@ do?</a>
 </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 @@ do?</a>
 </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>
Index: pkgsrc/doc/pkgsrc.txt
diff -u pkgsrc/doc/pkgsrc.txt:1.224 pkgsrc/doc/pkgsrc.txt:1.225
--- pkgsrc/doc/pkgsrc.txt:1.224	Thu Jul 14 14:40:45 2016
+++ pkgsrc/doc/pkgsrc.txt	Mon Sep 12 12:20:47 2016
@@ -1521,6 +1521,21 @@ GCC_REQD:
     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 @@ runs on a small handful of platforms, se
 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


--_----------=_1473682847259870--