regen

2 files changed, 59 insertions, 118 deletions

diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html
index f7c73a798de..9ec43634222 100644
--- a/doc/pkgsrc.html
+++ b/doc/pkgsrc.html
@@ -901,7 +901,7 @@ and dashes.</p>
 	quarterly basis from the current branch and only gets modified
 	for security updates. The names of the stable branches are built
 	from the year and the quarter, for example
-	<code class="literal">2006Q3</code>.</p>
+	<code class="literal">2006Q4</code>.</p>
 <p>The second step is to decide <span class="emphasis"><em>how</em></span> you
 	want to download pkgsrc. You can get it as a tar file, via SUP,
 	or via CVS. All three ways are described here.</p>
@@ -915,8 +915,8 @@ and dashes.</p>
 <p>The tar file for the current branch is in the directory
 	<code class="filename">current</code> and is called <a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc.tar.gz" target="_top"><code class="filename">pkgsrc.tar.gz</code></a>.
 	It is autogenerated daily.</p>
-<p>The tar file for the stable branch 2006Q3 is in the
-	directory <code class="filename">pkgsrc-2006Q3</code> and is also called <a href="ftp://ftp.NetBSD.org/pub/pkgsrc/pkgsrc-2006Q3/pkgsrc-2006Q3.tar.gz" target="_top"><code class="filename">pkgsrc-2006Q3.tar.gz</code></a>.</p>
+<p>The tar file for the stable branch 2006Q4 is in the
+	directory <code class="filename">pkgsrc-2006Q4</code> and is also called <a href="ftp://ftp.NetBSD.org/pub/pkgsrc/pkgsrc-2006Q4/pkgsrc-2006Q4.tar.gz" target="_top"><code class="filename">pkgsrc-2006Q4.tar.gz</code></a>.</p>
 <p>After downloading the tar file, change to the directory
 	where you want to have pkgsrc. This is usually
 	<code class="filename">/usr</code>. Then, run <span><strong class="command">gzcat
@@ -963,7 +963,7 @@ and dashes.</p>
 	<code class="filename">/usr</code>. In that directory you run the
 	checkout command, which is <span><strong class="command">cvs -q checkout -P
 	pkgsrc</strong></span> for the current branch and <span><strong class="command">cvs -q
-	checkout -rpkgsrc-2006Q3 -P pkgsrc</strong></span> for the stable
+	checkout -rpkgsrc-2006Q4 -P pkgsrc</strong></span> for the stable
 	branch. This command will create a directory called
 	<code class="filename">pkgsrc</code> with all the pkgsrc files in
 	it.</p>
@@ -1016,7 +1016,7 @@ and dashes.</p>
 	by adding the option &#8220;<span class="quote">-A</span>&#8221; after the
 	&#8220;<span class="quote">update</span>&#8221; keyword. To switch from the current branch
 	back to the stable branch, add the
-	&#8220;<span class="quote">-rpkgsrc-2006Q3</span>&#8221; option.</p>
+	&#8220;<span class="quote">-rpkgsrc-2006Q4</span>&#8221; option.</p>
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
@@ -1749,67 +1749,37 @@ file and inspect the contents before extracting it.
 <li><p>SPROlang
 	  - Sun WorkShop Compilers common components</p></li>
 </ul></div>
-<p>You should set <code class="varname">CC</code>, <code class="varname">CXX</code> and
-	optionally, <code class="varname">CPP</code> in <code class="filename">/etc/mk.conf</code>,
-	e.g.:</p>
+<p>You should set the following variables in your
+	<code class="filename">mk.conf</code> file:</p>
 <pre class="programlisting">
-	  CC=     cc
-	  CXX=    CC
-	  CPP=    /usr/ccs/lib/cpp
-	</pre>
+    CC=     cc
+    CXX=    CC
+    CPP=    cc -E
+    CXXCPP= CC -E
+</pre>
+<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Note</h3>
+<p>The <code class="varname">CPP</code> setting might break some
+	packages that use the C preprocessor for processing things other
+	than C source code.</p>
+</div>
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="solaris-sunpro-64"></a>3.3.7.3. Building 64-bit binaries with SunPro</h4></div></div></div>
-<p>Building 64-bit binaries is a little trickier. First, you
-	need to bootstrap pkgsrc in 64-bit mode. One problem here is
-	that while building one of the programs in the bootstrap kit
-	(<code class="filename">bmake</code>), the <code class="varname">CFLAGS</code>
-	variable is not honored, even if it is set in the environment.
-	To work around this bug, you can create a simple shell script
-	called <code class="filename">cc64</code> and put it somewhere in the
-	<code class="varname">PATH</code>:</p>
-<pre class="programlisting">
-	  #! /bin/sh
-	  exec /opt/SUNWspro/bin/cc -xtarget=ultra -xarch=v9 ${1+"$@"}
-	</pre>
-<p>Then, pass the definition for <code class="varname">CC</code> in the
-	environment of the <span><strong class="command">bootstrap</strong></span> command:</p>
-<pre class="programlisting">
-	  <code class="prompt">$</code> <strong class="userinput"><code>cd bootstrap</code></strong>
-	  <code class="prompt">$</code> <strong class="userinput"><code>CC=cc64 ./bootstrap</code></strong>
-	</pre>
-<p>After bootstrapping, there are two alternative ways,
-	depending on whether you want to find bugs in packages or get
-	your system ready quickly. If you just want a running system,
-	add the following lines to your <code class="filename">mk.conf</code>
+<p>To build 64-bit packages, you just need to have the
+	following lines in your <code class="filename">mk.conf</code>
 	file:</p>
 <pre class="programlisting">
-	  CC=                     cc64
-	  CXX=                    CC64
-	  PKGSRC_COMPILER=        sunpro
-	</pre>
-<p>This way, all calls to the compiler will be intercepted by
-	the above wrapper and therefore get the necessary ABI options
-	automatically. (Don't forget to create the shell script
-	<code class="filename">CC64</code>, too.)</p>
-<p>To find packages that ignore the user-specified
-	<code class="varname">CFLAGS</code> and <code class="varname">CXXFLAGS</code>, add
-	the following lines to your <code class="filename">mk.conf</code>
-	file:</p>
-<pre class="programlisting">
-	  CC=                     cc
-	  CXX=                    CC
-	  PKGSRC_COMPILER=        sunpro
-	  CFLAGS=                 -xtarget=ultra -xarch=v9
-	  CXXFLAGS=               -xtarget=ultra -xarch=v9
-	  LDFLAGS=                -xtarget=ultra -xarch=v9
-	</pre>
-<p>Packages that don't use the flags provided in the
-	configuration file will try to build 32-bit binaries and fail
-	during linking. Detecting this is useful to prevent bugs on
-	other platforms where the error would not show up but pass
-	silently.</p>
+    PKGSRC_COMPILER=        sunpro
+    ABI=                    64
+</pre>
+<div class="note" style="margin-left: 0.5in; margin-right: 0.5in;">
+<h3 class="title">Note</h3>
+<p>This setting has been tested for the SPARC
+	architecture. Intel and AMD machines need some more
+	work.</p>
+</div>
 </div>
 <div class="sect3" lang="en">
 <div class="titlepage"><div><div><h4 class="title">
@@ -9336,7 +9306,7 @@ do?</a>
 <tbody>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.makeflags"></a><a name="id2686092"></a><b>21.1.</b>
+<a name="devfaq.makeflags"></a><a name="id2685982"></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
@@ -9352,7 +9322,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.make"></a><a name="id2686131"></a><b>21.2.</b>
+<a name="devfaq.make"></a><a name="id2686021"></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
@@ -9370,7 +9340,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.cc"></a><a name="id2686171"></a><b>21.3.</b>
+<a name="devfaq.cc"></a><a name="id2686061"></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
@@ -9388,7 +9358,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3flags"></a><a name="id2686211"></a><b>21.4.</b>
+<a name="devfaq.bl3flags"></a><a name="id2686101"></a><b>21.4.</b>
 </td>
 <td align="left" valign="top"><p>What is the difference between
 	<code class="varname">BUILDLINK_LDFLAGS</code>,
@@ -9401,7 +9371,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3prefix"></a><a name="id2686299"></a><b>21.5.</b>
+<a name="devfaq.bl3prefix"></a><a name="id2686121"></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>
@@ -9417,7 +9387,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.master_sites"></a><a name="id2686329"></a><b>21.6.</b>
+<a name="devfaq.master_sites"></a><a name="id2686151"></a><b>21.6.</b>
 </td>
 <td align="left" valign="top"><p>What does
 	<code class="literal">${MASTER_SITE_SOURCEFORGE:=package/}</code> mean? I
@@ -9441,7 +9411,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.mailinglists"></a><a name="id2686406"></a><b>21.7.</b>
+<a name="devfaq.mailinglists"></a><a name="id2686296"></a><b>21.7.</b>
 </td>
 <td align="left" valign="top"><p>Which mailing lists are there for package
 	developers?</p></td>
@@ -9466,7 +9436,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.documentation"></a><a name="id2686513"></a><b>21.8.</b>
+<a name="devfaq.documentation"></a><a name="id2686334"></a><b>21.8.</b>
 </td>
 <td align="left" valign="top"><p>Where is the pkgsrc
 	documentation?</p></td>
@@ -9514,7 +9484,7 @@ do?</a>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.too-much-time"></a><a name="id2686574"></a><b>21.9.</b>
+<a name="devfaq.too-much-time"></a><a name="id2686396"></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 ea0625db5e5..c364f6521c7 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -804,7 +804,7 @@ Before you download any pkgsrc files, you should decide whether you want the
 current branch or the stable branch. The latter is forked on a quarterly basis
 from the current branch and only gets modified for security updates. The names
 of the stable branches are built from the year and the quarter, for example
-2006Q3.
+2006Q4.
 
 The second step is to decide how you want to download pkgsrc. You can get it as
 a tar file, via SUP, or via CVS. All three ways are described here.
@@ -818,8 +818,8 @@ described in detail in Appendix C, Directory layout of the pkgsrc FTP server.
 The tar file for the current branch is in the directory current and is called
 pkgsrc.tar.gz. It is autogenerated daily.
 
-The tar file for the stable branch 2006Q3 is in the directory pkgsrc-2006Q3 and
-is also called pkgsrc-2006Q3.tar.gz.
+The tar file for the stable branch 2006Q4 is in the directory pkgsrc-2006Q4 and
+is also called pkgsrc-2006Q4.tar.gz.
 
 After downloading the tar file, change to the directory where you want to have
 pkgsrc. This is usually /usr. Then, run gzcat pkgsrc.tar.gz | tar xf - to
@@ -853,7 +853,7 @@ Or, the same for the bourne shell:
 Then, you change to the directory where you want to have your copy of pkgsrc.
 In most cases this is /usr. In that directory you run the checkout command,
 which is cvs -q checkout -P pkgsrc for the current branch and cvs -q checkout
--rpkgsrc-2006Q3 -P pkgsrc for the stable branch. This command will create a
+-rpkgsrc-2006Q4 -P pkgsrc for the stable branch. This command will create a
 directory called pkgsrc with all the pkgsrc files in it.
 
 2.2. Keeping pkgsrc up-to-date
@@ -894,7 +894,7 @@ When updating pkgsrc, the CVS program keeps track of the branch you selected.
 But if you, for whatever reason, want to switch from the stable branch to the
 current one, you can do it by adding the option "-A" after the "update"
 keyword. To switch from the current branch back to the stable branch, add the
-"-rpkgsrc-2006Q3" option.
+"-rpkgsrc-2006Q4" option.
 
 2.2.2.2. What happens to my changes when updating?
 
@@ -1474,59 +1474,30 @@ You will need at least the following packages installed (from WorkShop 5.0)
 
   * SPROlang - Sun WorkShop Compilers common components
 
-You should set CC, CXX and optionally, CPP in /etc/mk.conf, e.g.:
+You should set the following variables in your mk.conf file:
 
-          CC=     cc
-          CXX=    CC
-          CPP=    /usr/ccs/lib/cpp
+    CC=     cc
+    CXX=    CC
+    CPP=    cc -E
+    CXXCPP= CC -E
 
+Note
 
-3.3.7.3. Building 64-bit binaries with SunPro
-
-Building 64-bit binaries is a little trickier. First, you need to bootstrap
-pkgsrc in 64-bit mode. One problem here is that while building one of the
-programs in the bootstrap kit (bmake), the CFLAGS variable is not honored, even
-if it is set in the environment. To work around this bug, you can create a
-simple shell script called cc64 and put it somewhere in the PATH:
-
-          #! /bin/sh
-          exec /opt/SUNWspro/bin/cc -xtarget=ultra -xarch=v9 ${1+"$@"}
-
-
-Then, pass the definition for CC in the environment of the bootstrap command:
-
-          $ cd bootstrap
-          $ CC=cc64 ./bootstrap
-
-
-After bootstrapping, there are two alternative ways, depending on whether you
-want to find bugs in packages or get your system ready quickly. If you just
-want a running system, add the following lines to your mk.conf file:
-
-          CC=                     cc64
-          CXX=                    CC64
-          PKGSRC_COMPILER=        sunpro
-
+The CPP setting might break some packages that use the C preprocessor for
+processing things other than C source code.
 
-This way, all calls to the compiler will be intercepted by the above wrapper
-and therefore get the necessary ABI options automatically. (Don't forget to
-create the shell script CC64, too.)
+3.3.7.3. Building 64-bit binaries with SunPro
 
-To find packages that ignore the user-specified CFLAGS and CXXFLAGS, add the
-following lines to your mk.conf file:
+To build 64-bit packages, you just need to have the following lines in your
+mk.conf file:
 
-          CC=                     cc
-          CXX=                    CC
-          PKGSRC_COMPILER=        sunpro
-          CFLAGS=                 -xtarget=ultra -xarch=v9
-          CXXFLAGS=               -xtarget=ultra -xarch=v9
-          LDFLAGS=                -xtarget=ultra -xarch=v9
+    PKGSRC_COMPILER=        sunpro
+    ABI=                    64
 
+Note
 
-Packages that don't use the flags provided in the configuration file will try
-to build 32-bit binaries and fail during linking. Detecting this is useful to
-prevent bugs on other platforms where the error would not show up but pass
-silently.
+This setting has been tested for the SPARC architecture. Intel and AMD machines
+need some more work.
 
 3.3.7.4. Common problems