summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordmcmahill <dmcmahill@pkgsrc.org>2007-01-17 02:43:16 +0000
committerdmcmahill <dmcmahill@pkgsrc.org>2007-01-17 02:43:16 +0000
commit5eae87e41cc01023bed4a005172731a7dbb75625 (patch)
tree23dce71ce4e37e991a1321ad7b5f54de4f6c5261
parentfd0f980dbeda723c406b08bd26419b2225654fd5 (diff)
downloadpkgsrc-5eae87e41cc01023bed4a005172731a7dbb75625.tar.gz
clarify that PKGSRC_COMPILER= sunpro gcc is not how this variable is
meant to be used. Partially addresses PR/35433.
-rw-r--r--doc/guide/files/configuring.xml8
-rw-r--r--doc/pkgsrc.html28
-rw-r--r--doc/pkgsrc.txt7
3 files changed, 24 insertions, 19 deletions
diff --git a/doc/guide/files/configuring.xml b/doc/guide/files/configuring.xml
index bf393e16e77..0bec162ee68 100644
--- a/doc/guide/files/configuring.xml
+++ b/doc/guide/files/configuring.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: configuring.xml,v 1.23 2006/12/02 06:12:40 kano Exp $ -->
+<!-- $NetBSD: configuring.xml,v 1.24 2007/01/17 02:43:17 dmcmahill Exp $ -->
<chapter id="configuring">
<title>Configuring pkgsrc</title>
@@ -176,8 +176,10 @@ works.</para>
<varname>distcc</varname> with an appropriate
<varname>PKGSRC_COMPILER</varname> setting,
e.g. <quote><varname>ccache gcc</varname></quote>. This
- variable should always be
- terminated with a value for a real compiler.</para>
+ variable should always be terminated with a value for
+ a real compiler. Note that only one real compiler
+ should be listed (e.g. <quote><varname>sunpro gcc</varname></quote>
+ is not allowed).</para>
</listitem>
</varlistentry>
diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html
index bf6df613aae..2a5ac774e2a 100644
--- a/doc/pkgsrc.html
+++ b/doc/pkgsrc.html
@@ -2445,8 +2445,10 @@ works.</p>
<code class="varname">distcc</code> with an appropriate
<code class="varname">PKGSRC_COMPILER</code> setting,
e.g. &#8220;<span class="quote"><code class="varname">ccache gcc</code></span>&#8221;. This
- variable should always be
- terminated with a value for a real compiler.</p>
+ variable should always be terminated with a value for
+ a real compiler. Note that only one real compiler
+ should be listed (e.g. &#8220;<span class="quote"><code class="varname">sunpro gcc</code></span>&#8221;
+ is not allowed).</p>
</dd>
<dt><span class="term"><code class="varname">GCC_REQD</code>:</span></dt>
<dd><p>This specifies the minimum version of GCC to use
@@ -4444,7 +4446,7 @@ sections.</p>
<span><strong class="command">diff -bu</strong></span> format, and apply without a fuzz to avoid
problems. (To force patches to apply with fuzz you can set
<code class="varname">PATCH_FUZZ_FACTOR=-F2</code>). Furthermore, each patch
- should contain only changed for a single file, and no file should be
+ should contain only changes for a single file, and no file should be
patched by more than one patch file. This helps to keep future
modifications simple.</p>
<p>Each patch file is structured as follows: In the first line,
@@ -6107,7 +6109,7 @@ user's description or comment.
user's home directory, and defaults to
<code class="filename">/nonexistent</code> if not specified.
<code class="varname">PKG_SHELL.<em class="replaceable"><code>user</code></em></code> is the
-user's shell, and defaults to <code class="filename">/sbinno/login</code> if
+user's shell, and defaults to <code class="filename">/sbin/nologin</code> if
not specified.</p>
<p>Similarly, groups can be created by adding entries to the
<code class="varname">PKG_GROUPS</code> variable, whose syntax is:</p>
@@ -9334,7 +9336,7 @@ do?</a>
<tbody>
<tr class="question">
<td align="left" valign="top">
-<a name="devfaq.makeflags"></a><a name="id2686068"></a><b>21.1.</b>
+<a name="devfaq.makeflags"></a><a name="id40664963"></a><b>21.1.</b>
</td>
<td align="left" valign="top"><p>What is the difference between
<code class="varname">MAKEFLAGS</code>, <code class="varname">.MAKEFLAGS</code> and
@@ -9350,7 +9352,7 @@ do?</a>
</tr>
<tr class="question">
<td align="left" valign="top">
-<a name="devfaq.make"></a><a name="id2686106"></a><b>21.2.</b>
+<a name="devfaq.make"></a><a name="id40664997"></a><b>21.2.</b>
</td>
<td align="left" valign="top"><p>What is the difference between
<code class="varname">MAKE</code>, <code class="varname">GMAKE</code> and
@@ -9368,7 +9370,7 @@ do?</a>
</tr>
<tr class="question">
<td align="left" valign="top">
-<a name="devfaq.cc"></a><a name="id2686147"></a><b>21.3.</b>
+<a name="devfaq.cc"></a><a name="id40665035"></a><b>21.3.</b>
</td>
<td align="left" valign="top"><p>What is the difference between
<code class="varname">CC</code>, <code class="varname">PKG_CC</code> and
@@ -9386,7 +9388,7 @@ do?</a>
</tr>
<tr class="question">
<td align="left" valign="top">
-<a name="devfaq.bl3flags"></a><a name="id2686186"></a><b>21.4.</b>
+<a name="devfaq.bl3flags"></a><a name="id40665074"></a><b>21.4.</b>
</td>
<td align="left" valign="top"><p>What is the difference between
<code class="varname">BUILDLINK_LDFLAGS</code>,
@@ -9399,7 +9401,7 @@ do?</a>
</tr>
<tr class="question">
<td align="left" valign="top">
-<a name="devfaq.bl3prefix"></a><a name="id2686206"></a><b>21.5.</b>
+<a name="devfaq.bl3prefix"></a><a name="id40665093"></a><b>21.5.</b>
</td>
<td align="left" valign="top"><p>Why does <span><strong class="command">make show-var
VARNAME=BUILDLINK_PREFIX.<em class="replaceable"><code>foo</code></em></strong></span>
@@ -9415,7 +9417,7 @@ do?</a>
</tr>
<tr class="question">
<td align="left" valign="top">
-<a name="devfaq.master_sites"></a><a name="id2686305"></a><b>21.6.</b>
+<a name="devfaq.master_sites"></a><a name="id40665123"></a><b>21.6.</b>
</td>
<td align="left" valign="top"><p>What does
<code class="literal">${MASTER_SITE_SOURCEFORGE:=package/}</code> mean? I
@@ -9439,7 +9441,7 @@ do?</a>
</tr>
<tr class="question">
<td align="left" valign="top">
-<a name="devfaq.mailinglists"></a><a name="id2686381"></a><b>21.7.</b>
+<a name="devfaq.mailinglists"></a><a name="id40665267"></a><b>21.7.</b>
</td>
<td align="left" valign="top"><p>Which mailing lists are there for package
developers?</p></td>
@@ -9464,7 +9466,7 @@ do?</a>
</tr>
<tr class="question">
<td align="left" valign="top">
-<a name="devfaq.documentation"></a><a name="id2686420"></a><b>21.8.</b>
+<a name="devfaq.documentation"></a><a name="id40665302"></a><b>21.8.</b>
</td>
<td align="left" valign="top"><p>Where is the pkgsrc
documentation?</p></td>
@@ -9512,7 +9514,7 @@ do?</a>
</tr>
<tr class="question">
<td align="left" valign="top">
-<a name="devfaq.too-much-time"></a><a name="id2686482"></a><b>21.9.</b>
+<a name="devfaq.too-much-time"></a><a name="id40665364"></a><b>21.9.</b>
</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 018bb1ea1c5..979f2789df7 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -2010,7 +2010,8 @@ PKGSRC_COMPILER:
The default is "gcc". You can use ccache and/or distcc with an appropriate
PKGSRC_COMPILER setting, e.g. "ccache gcc". This variable should always be
- terminated with a value for a real compiler.
+ terminated with a value for a real compiler. Note that only one real
+ compiler should be listed (e.g. "sunpro gcc" is not allowed).
GCC_REQD:
@@ -3766,7 +3767,7 @@ patch-ab, etc.
The patch-* files should be in diff -bu format, and apply without a fuzz to
avoid problems. (To force patches to apply with fuzz you can set
-PATCH_FUZZ_FACTOR=-F2). Furthermore, each patch should contain only changed for
+PATCH_FUZZ_FACTOR=-F2). Furthermore, each patch should contain only changes for
a single file, and no file should be patched by more than one patch file. This
helps to keep future modifications simple.
@@ -5099,7 +5100,7 @@ Further specification of user details may be done by setting per-user
variables. PKG_UID.user is the numeric UID for the user. PKG_GECOS.user is the
user's description or comment. PKG_HOME.user is the user's home directory, and
defaults to /nonexistent if not specified. PKG_SHELL.user is the user's shell,
-and defaults to /sbinno/login if not specified.
+and defaults to /sbin/nologin if not specified.
Similarly, groups can be created by adding entries to the PKG_GROUPS variable,
whose syntax is: