regen

1 files changed, 38 insertions, 31 deletions

diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html
index eca614f0601..d746c8d0ac6 100644
--- a/doc/pkgsrc.html
+++ b/doc/pkgsrc.html
@@ -1406,25 +1406,32 @@ PKGSRC_COMPILER=        mipspro
 <p>To bootstrap using icc, assuming the default icc installation
       directory:</p>
 <pre class="programlisting">
-env ICCBASE=/opt/intel/cc/10.1.008 ./bootstrap --compiler=icc
+env CC=/opt/intel_cc_80/bin/icc LDFLAGS=-static-libcxa \
+ac_cv___attribute__=yes ./bootstrap
       </pre>
 <div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Note</h3>
-<p>For icc 8.0 you must add `LDFLAGS=-static-libcxa' to this.</p>
-<p>For icc 8.1 you must add `LDFLAGS=-i-static' instead.</p>
-<p>For icc 10.1 neither of these appears to be necessary.</p>
-</div>
-<p>Use a value for ICCBASE that corresponds to the directory
-      where icc is installed. After bootstrapping, set
-      <code class="varname">ICCBASE</code> in <a class="link" href="#mk.conf"><code class="filename">mk.conf</code></a>:</p>
+<p>icc 8.1 needs the `-i-static' argument instead of -static-libcxa.</p>
+</div>
+<p>icc supports __attribute__, but the GNU configure test uses a nested
+      function, which icc does not support. #undef'ing __attribute__ has the
+      unfortunate side-effect of breaking many of the Linux header files, which
+      cannot be compiled properly without __attribute__. The test must be
+      overridden so that __attribute__ is assumed supported by the
+      compiler.</p>
+<p>After bootstrapping, you should set <code class="varname">PKGSRC_COMPILER</code>
+      in <a class="link" href="#mk.conf"><code class="filename">mk.conf</code></a>:</p>
+<pre class="programlisting">
+PKGSRC_COMPILER=        icc
+      </pre>
+<p>The default installation directory for icc is
+      <code class="filename">/opt/intel_cc_80</code>, which
+      is also the pkgsrc default. If you have installed it into a different
+      directory, set <code class="varname">ICCBASE</code> in
+      <a class="link" href="#mk.conf"><code class="filename">mk.conf</code></a>:</p>
 <pre class="programlisting">
-ICCBASE=                /opt/intel/cc/10.1.008
+ICCBASE=                /opt/icc
       </pre>
-<p>The pkgsrc default for <code class="varname">ICCBASE</code> is
-      <code class="filename">/opt/intel_cc_80</code>. This is the default
-      install directory for icc 8.0. If you are using a more recent
-      version, be sure to set the correct path explicitly.
-      </p>
 <p>pkgsrc uses the static linking method of the runtime libraries
       provided by icc, so binaries can be run on other systems which do not
       have the shared libraries installed.</p>
@@ -5918,7 +5925,7 @@ installation prefix:</p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">
 <p><code class="varname">CONF_FILES</code> and
-    <code class="varname">SUPPORT_FILES</code> are pairs of master and target files.
+    <code class="varname">REQD_FILES</code> are pairs of master and target files.
     During installation time, the master file is copied to the target one
     if and only if the latter does not exist.  Upon deinstallation, the
     target file is removed provided that it was not modified by the
@@ -5930,12 +5937,12 @@ installation prefix:</p>
 </li>
 <li class="listitem">
 <p><code class="varname">CONF_FILES_PERMS</code> and
-    <code class="varname">SUPPORT_FILES_PERMS</code> contain tuples describing master
+    <code class="varname">REQD_FILES_PERMS</code> contain tuples describing master
     files as well as their target locations.  For each of them, it also
     specifies their owner, their group and their numeric permissions, in
     this order.  For example:</p>
 <pre class="programlisting">
-SUPPORT_FILES_PERMS+= ${PREFIX}/share/somefile ${VARBASE}/somefile ${ROOT_USER} ${ROOT_GROUP} 0700
+REQD_FILES_PERMS+= ${PREFIX}/share/somefile ${VARBASE}/somefile ${ROOT_USER} ${ROOT_GROUP} 0700
 </pre>
 <p>The difference between the two is exactly the same as their
     non-<code class="varname">PERMS</code> counterparts.</p>
@@ -7545,7 +7552,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" title="Frequently Asked Questions">
-<a name="id1168229338859"></a><dl>
+<a name="id1168229295927"></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
@@ -7562,7 +7569,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 <tbody>
 <tr class="question" title="18.4.1.">
 <td align="left" valign="top">
-<a name="tools.new"></a><a name="id1168229338864"></a><p><b>18.4.1.</b></p>
+<a name="tools.new"></a><a name="id1168229295930"></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>
@@ -7572,7 +7579,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 </tr>
 <tr class="question" title="18.4.2.">
 <td align="left" valign="top">
-<a name="tools.listall"></a><a name="id1168229338872"></a><p><b>18.4.2.</b></p>
+<a name="tools.listall"></a><a name="id1168229295939"></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>
@@ -7583,7 +7590,7 @@ TOOLS_PLATFORM.true?=           true                    # shell builtin
 </tr>
 <tr class="question" title="18.4.3.">
 <td align="left" valign="top">
-<a name="tools.used"></a><a name="id1168229338881"></a><p><b>18.4.3.</b></p>
+<a name="tools.used"></a><a name="id1168229295947"></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
@@ -9558,7 +9565,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" title="Frequently Asked Questions">
-<a name="id1168229325797"></a><dl>
+<a name="id1168229300237"></a><dl>
 <dt>22.1. <a href="#devfaq.makeflags">What is the difference between
 	MAKEFLAGS, .MAKEFLAGS and
 	MAKE_FLAGS?</a>
@@ -9601,7 +9608,7 @@ do?</a>
 <tbody>
 <tr class="question" title="22.1.">
 <td align="left" valign="top">
-<a name="devfaq.makeflags"></a><a name="id1168229325800"></a><p><b>22.1.</b></p>
+<a name="devfaq.makeflags"></a><a name="id1168229300241"></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
@@ -9617,7 +9624,7 @@ do?</a>
 </tr>
 <tr class="question" title="22.2.">
 <td align="left" valign="top">
-<a name="devfaq.make"></a><a name="id1168229325833"></a><p><b>22.2.</b></p>
+<a name="devfaq.make"></a><a name="id1168229300274"></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
@@ -9635,7 +9642,7 @@ do?</a>
 </tr>
 <tr class="question" title="22.3.">
 <td align="left" valign="top">
-<a name="devfaq.cc"></a><a name="id1168229325905"></a><p><b>22.3.</b></p>
+<a name="devfaq.cc"></a><a name="id1168229300345"></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
@@ -9653,7 +9660,7 @@ do?</a>
 </tr>
 <tr class="question" title="22.4.">
 <td align="left" valign="top">
-<a name="devfaq.bl3flags"></a><a name="id1168229325939"></a><p><b>22.4.</b></p>
+<a name="devfaq.bl3flags"></a><a name="id1168229300379"></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>,
@@ -9666,7 +9673,7 @@ do?</a>
 </tr>
 <tr class="question" title="22.5.">
 <td align="left" valign="top">
-<a name="devfaq.bl3prefix"></a><a name="id1168229325957"></a><p><b>22.5.</b></p>
+<a name="devfaq.bl3prefix"></a><a name="id1168229300398"></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>
@@ -9682,7 +9689,7 @@ do?</a>
 </tr>
 <tr class="question" title="22.6.">
 <td align="left" valign="top">
-<a name="devfaq.master_sites"></a><a name="id1168229325984"></a><p><b>22.6.</b></p>
+<a name="devfaq.master_sites"></a><a name="id1168229300424"></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
@@ -9706,7 +9713,7 @@ do?</a>
 </tr>
 <tr class="question" title="22.7.">
 <td align="left" valign="top">
-<a name="devfaq.mailinglists"></a><a name="id1168229326119"></a><p><b>22.7.</b></p>
+<a name="devfaq.mailinglists"></a><a name="id1168229300560"></a><p><b>22.7.</b></p>
 </td>
 <td align="left" valign="top"><p>Which mailing lists are there for package
 	developers?</p></td>
@@ -9731,7 +9738,7 @@ do?</a>
 </tr>
 <tr class="question" title="22.8.">
 <td align="left" valign="top">
-<a name="devfaq.documentation"></a><a name="id1168229326150"></a><p><b>22.8.</b></p>
+<a name="devfaq.documentation"></a><a name="id1168229300590"></a><p><b>22.8.</b></p>
 </td>
 <td align="left" valign="top"><p>Where is the pkgsrc
 	documentation?</p></td>
@@ -9779,7 +9786,7 @@ do?</a>
 </tr>
 <tr class="question" title="22.9.">
 <td align="left" valign="top">
-<a name="devfaq.too-much-time"></a><a name="id1168229326204"></a><p><b>22.9.</b></p>
+<a name="devfaq.too-much-time"></a><a name="id1168229300713"></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>