 @@ -7164,31 +7164,26 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="build.package"></a>17.15. The <span class="emphasis"><em>package</em></span> phase</h2></div></div></div>
 <p>Once the install stage has completed, a binary package of
     the installed files can be built.  These binary packages can be
     used for quick installation without previous compilation, e.g. by
     the <span class="command"><strong>make bin-install</strong></span> or by using
     <span class="command"><strong>pkg_add</strong></span>.</p>
 <p>By default, the binary packages are created in
     <code class="filename">${PACKAGES}/All</code> and symlinks are created in
     <code class="filename">${PACKAGES}/<em class="replaceable"><code>category</code></em></code>,
     one for each category in the <code class="varname">CATEGORIES</code>
     variable.  <code class="varname">PACKAGES</code> defaults to
     <code class="filename">pkgsrc/packages</code>.</p>
 <p>If there should be no binary package, set
     <code class="varname">NO_PACKAGE</code> to &#8220;<span class="quote">yes</span>&#8221;.
     This should only be used in rare cases, like when a package
     definitely is only usable on the machine where it is built and even
     then, a binary package can be useful.</p>
 </div>
 <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="build.clean"></a>17.16. Cleaning up</h2></div></div></div>
 <p>Once you're finished with a package, you can clean the work
     directory by running <span class="command"><strong>make clean</strong></span>.  If you want
     to clean the work directories of all dependencies too, use
     <span class="command"><strong>make clean-depends</strong></span>.</p>
 </div>
 <div class="sect1" lang="en">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="build.helpful-targets"></a>17.17. Other helpful targets</h2></div></div></div>
 <div class="variablelist"><dl>
 @@ -7633,48 +7628,48 @@ TOOLS_PLATFORM.true?=           true
 <dt>18.4.2. <a href="#tools.listall">How do I get a list of all available
 	tools?</a>
 </dt>
 <dt>18.4.3. <a href="#tools.used">How can I get a list of all the tools that a
 	package is using while being built? I want to know whether it
 	uses sed or not.</a>
 </dt>
 </dl>
 <table border="0" summary="Q and A Set">
 <col align="left" width="1%">
 <tbody>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.new"></a><a name="id1168230299317"></a><p><b>18.4.1.</b></p>
+<a name="tools.new"></a><a name="id9503882"></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>
 <tr class="answer">
 <td align="left" valign="top"></td>
 <td align="left" valign="top"><p>TODO</p></td>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.listall"></a><a name="id1168230299325"></a><p><b>18.4.2.</b></p>
+<a name="tools.listall"></a><a name="id9503891"></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>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
 <td align="left" valign="top"><p>TODO</p></td>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="tools.used"></a><a name="id1168230299334"></a><p><b>18.4.3.</b></p>
+<a name="tools.used"></a><a name="id9503899"></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
 	uses sed or not.</p></td>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
 <td align="left" valign="top"><p>Currently, you can't. (TODO: But I want to be able
 	to do it.)</p></td>
 </tr>
 </tbody>
 </table>
 </div>
 @@ -7838,41 +7833,51 @@ INTERACTIVE_STAGE=      configure instal
     are labeled with a license tag denoting the license.  Note that a
     package with no license to copy trivially does not meet either the
     Free or Open Source test.</p>
 <p>For packages which are not Free or Open Source, pkgsrc will
     not build the package unless the user has indicated to pkgsrc that
     packages with that particular license may be built.  Note that
     this documentation avoids the term "accepted the license".  The
     pkgsrc system is merely providing a mechanism to avoid
     accidentally building a package with a non-free license;
     judgement and responsibility remain with the user.  (Installation
     of binary packages are not currently subject to this mechanism;
     this is a bug.)</p>
 <p>One might want to only install packages with a BSD license,
-    or the GPL, and not the other.  The pkgsrc license tag mechanism
+    or the GPL, and not the other.  The free licenses are added to the
-    does not provide a way to do this.  It might be possible to put in
+    default <code class="varname">ACCEPTABLE_LICENSES</code> variable.  The
-    tags for free licenses, and have a default
+    user can override the default by setting the
-    <code class="varname">ACCEPTABLE_LICENSES</code> variable value, but this is
+    <code class="varname">ACCEPTABLE_LICENSES</code> variable with "=" instead
-    widely viewed as having a very poor ratio of benefit to
+    of "+=".  The licenses accepted by default are:
-    work.</p>
+    </p>
 <pre class="programlisting">
     public-domain
     gnu-gpl-v2 gnu-lgpl-v2
     gnu-gpl-v3 gnu-lgpl-v3
     original-bsd modified-bsd
     x11
     apache-2.0
     cddl-1.0
     open-font-license
     </pre>
 <p>
     </p>
 <p>The license tag mechanism is intended to address
     copyright-related issues surrounding building, installing and
     using a package, and not to address redistribution issues (see
     <code class="varname">RESTRICTED</code> and
-    <code class="varname">NO_SRC_ON_FTP</code>, etc.).  However, the above
+    <code class="varname">NO_SRC_ON_FTP</code>, etc.).
-    definition of licenses for which tags are not needed implies
+    Packages with redistribution restrictions should set these
-    that packages with redistribution restrictions should have
+    tags.</p>
     tags, because Free or Open Source programs do not have
     redistribution restrictions.</p>
 <p>Denoting that a package may be copied according to a
     particular license is done by placing the license in
     <code class="filename">pkgsrc/licenses</code> and setting the
     <code class="varname">LICENSE</code> variable to a string identifying the
     license, e.g. in <a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/graphics/xv/README.html" target="_top"><code class="filename">graphics/xv</code></a>:</p>
 <pre class="programlisting">
 LICENSE=        xv-license
     </pre>
 <p>When trying to build, the user will get a notice that the
     package is covered by a license which has not been placed in the
     <code class="varname">ACCEPTABLE_LICENSES</code> variable:</p>
 <pre class="programlisting">
 <code class="prompt">%</code> <strong class="userinput"><code>make</code></strong>
 @@ -7963,31 +7968,26 @@ ACCEPTABLE_LICENSES+=xv-license
 <p>Distfiles may not be placed on CD-ROM, together with
 	other distfiles, for which a fee may be charged.  In this
 	case, set this variable to <code class="varname">${RESTRICTED}</code>.
 	</p>
 </li>
 <li>
 <p><code class="varname">NO_SRC_ON_FTP</code></p>
 <p>Distfiles may not made available via FTP at no charge.
 	In this case, set this variable to
 	<code class="varname">${RESTRICTED}</code>.  If this variable is set,
 	the distfile(s) will not be mirrored on ftp.NetBSD.org.</p>
 </li>
 </ul></div>
 <p>Please note that the use of <code class="varname">NO_PACKAGE</code>,
     <code class="varname">IGNORE</code>, <code class="varname">NO_CDROM</code>, or other
     generic make variables to denote restrictions is deprecated,
     because they unconditionally prevent users from generating
     binary packages!</p>
 </div>
 <div class="sect2" lang="en">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="dependencies"></a>19.1.6. Handling dependencies</h3></div></div></div>
 <p>Your package may depend on some other package being present
     - and there are various ways of expressing this dependency.
     pkgsrc supports the <code class="varname">BUILD_DEPENDS</code> and
     <code class="varname">DEPENDS</code> definitions, the
     <code class="varname">USE_TOOLS</code> definition, as well as dependencies
     via <code class="filename">buildlink3.mk</code>, which is the preferred way
     to handle dependencies, and which uses the variables named above.
     See <a class="xref" href="#buildlink" title="Chapter 14. Buildlink methodology">Chapter 14, <i>Buildlink methodology</i></a> for more information.</p>
 <p>The basic difference between the two variables is as
 @@ -9666,157 +9666,157 @@ place.
 </dt>
 <dt>22.8. <a href="#devfaq.documentation">Where is the pkgsrc
 	documentation?</a>
 </dt>
 <dt>22.9. <a href="#devfaq.too-much-time">I have a little time to kill.  What shall I
 do?</a>
 </dt>
 </dl>
 <table border="0" summary="Q and A Set">
 <col align="left" width="1%">
 <tbody>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.makeflags"></a><a name="id1168230286353"></a><p><b>22.1.</b></p>
+<a name="devfaq.makeflags"></a><a name="id9508424"></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
 	<code class="varname">MAKE_FLAGS</code>?</p></td>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
 <td align="left" valign="top"><p><code class="varname">MAKEFLAGS</code> are the flags passed
 	to the pkgsrc-internal invocations of <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?make+1+NetBSD-current"><span class="citerefentry"><span class="refentrytitle">make</span>(1)</span></a>, while
 	<code class="varname">MAKE_FLAGS</code> are the flags that are passed to
 	the <code class="varname">MAKE_PROGRAM</code> when building the
 	package. [FIXME: What is .MAKEFLAGS for?]</p></td>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.make"></a><a name="id1168230286387"></a><p><b>22.2.</b></p>
+<a name="devfaq.make"></a><a name="id9508458"></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
 	<code class="varname">MAKE_PROGRAM</code>?</p></td>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
 <td align="left" valign="top"><p><code class="varname">MAKE</code> is the path to the
 	<a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?make+1+NetBSD-current"><span class="citerefentry"><span class="refentrytitle">make</span>(1)</span></a> program that is used in the pkgsrc
 	infrastructure. <code class="varname">GMAKE</code> is the path to GNU
 	Make, but you need to say <code class="varname">USE_TOOLS+=gmake</code> to
 	use that. <code class="varname">MAKE_PROGRAM</code> is the path to the
 	Make program that is used for building the
 	package.</p></td>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.cc"></a><a name="id1168230286423"></a><p><b>22.3.</b></p>
+<a name="devfaq.cc"></a><a name="id9508494"></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
 	<code class="varname">PKGSRC_COMPILER</code>?</p></td>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
 <td align="left" valign="top"><p><code class="varname">CC</code> is the path to the real C
 	compiler, which can be configured by the pkgsrc user.
 	<code class="varname">PKG_CC</code> is the path to the compiler wrapper.
 	<code class="varname">PKGSRC_COMPILER</code> is <span class="emphasis"><em>not</em></span> a
 	path to a compiler, but the type of compiler that should be
 	used. See <code class="filename">mk/compiler.mk</code> for more
 	information about the latter variable.</p></td>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3flags"></a><a name="id1168230286458"></a><p><b>22.4.</b></p>
+<a name="devfaq.bl3flags"></a><a name="id9508530"></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>,
 	<code class="varname">BUILDLINK_LDADD</code> and
 	<code class="varname">BUILDLINK_LIBS</code>?</p></td>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
 <td align="left" valign="top"><p>[FIXME]</p></td>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.bl3prefix"></a><a name="id1168230286476"></a><p><b>22.5.</b></p>
+<a name="devfaq.bl3prefix"></a><a name="id9508548"></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>
 	say it's empty?</p></td>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
 <td align="left" valign="top"><p>For optimization reasons, some variables are only
 	available in the &#8220;<span class="quote">wrapper</span>&#8221; phase and later. To
 	&#8220;<span class="quote">simulate</span>&#8221; the wrapper phase, append
 	<span class="command"><strong>PKG_PHASE=wrapper</strong></span> to the above
 	command.</p></td>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.master_sites"></a><a name="id1168230286502"></a><p><b>22.6.</b></p>
+<a name="devfaq.master_sites"></a><a name="id9508573"></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
 	don't understand the <code class="literal">:=</code> inside
 	it.</p></td>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
 <td align="left" valign="top"><p>The <code class="literal">:=</code> is not really an
 	assignment operator, like you might expect at first sight.
 	Instead, it is a degenerate form of
 	<code class="literal">${LIST:<em class="replaceable"><code>old_string</code></em>=<em class="replaceable"><code>new_string</code></em>}</code>,
 	which is documented in the <a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?make+1+NetBSD-current"><span class="citerefentry"><span class="refentrytitle">make</span>(1)</span></a> man page and which you
 	may have seen as in <code class="literal">${SRCS:.c=.o}</code>. In the
 	case of <code class="varname">MASTER_SITE_*</code>,
 	<em class="replaceable"><code>old_string</code></em> is the empty string and
 	<em class="replaceable"><code>new_string</code></em> is
 	<code class="literal">package/</code>. That's where the
 	<code class="literal">:</code> and the <code class="literal">=</code> fall
 	together.</p></td>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.mailinglists"></a><a name="id1168230286569"></a><p><b>22.7.</b></p>
+<a name="devfaq.mailinglists"></a><a name="id9508641"></a><p><b>22.7.</b></p>
 </td>
 <td align="left" valign="top"><p>Which mailing lists are there for package
 	developers?</p></td>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
 <td align="left" valign="top"><div class="variablelist"><dl>
 <dt><span class="term"><a class="ulink" href="http://www.NetBSD.org/mailinglists/index.html#tech-pkg" target="_top">tech-pkg</a></span></dt>
 <dd><p>This is a list for technical discussions related
 	to pkgsrc development, e.g. soliciting feedback for changes to
 	pkgsrc infrastructure, proposed new features, questions related
 	to porting pkgsrc to a new platform, advice for maintaining a
 	package, patches that affect many packages, help requests moved
 	from pkgsrc-users when an infrastructure bug is found,
 	etc.</p></dd>
 <dt><span class="term"><a class="ulink" href="http://www.NetBSD.org/mailinglists/index.html#pkgsrc-bugs" target="_top">pkgsrc-bugs</a></span></dt>
 <dd><p>All bug reports in category "pkg" sent with
 	<a class="citerefentry" href="http://netbsd.gw.com/cgi-bin/man-cgi?send-pr+1+NetBSD-current"><span class="citerefentry"><span class="refentrytitle">send-pr</span>(1)</span></a> appear here. Please do not report your bugs here
 	directly; use one of the other mailing
 	lists.</p></dd>
 </dl></div></td>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.documentation"></a><a name="id1168230286669"></a><p><b>22.8.</b></p>
+<a name="devfaq.documentation"></a><a name="id9508741"></a><p><b>22.8.</b></p>
 </td>
 <td align="left" valign="top"><p>Where is the pkgsrc
 	documentation?</p></td>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
 <td align="left" valign="top">
 <p>There are many places where you can find
 	documentation about pkgsrc:</p>
 <div class="itemizedlist"><ul type="disc">
 <li><p>The pkgsrc guide (this document) is a collection
 	of chapters that explain large parts of pkgsrc, but some
 	chapters tend to be outdated. Which ones they are is hard to
 @@ -9844,27 +9844,27 @@ do?
 	documented</span>&#8221;, that is the documentation exists only in the
 	mind of the developer who wrote the code. To get this
 	information, use the <span class="command"><strong>cvs annotate</strong></span> command
 	to see who has written it and ask on the
 	<code class="literal">tech-pkg</code> mailing list, so that others can
 	find your questions later (see above). To be sure that the
 	developer in charge reads the mail, you may CC him or
 	her.</p></li>
 </ul></div>
 </td>
 </tr>
 <tr class="question">
 <td align="left" valign="top">
-<a name="devfaq.too-much-time"></a><a name="id1168230286724"></a><p><b>22.9.</b></p>
+<a name="devfaq.too-much-time"></a><a name="id9508794"></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>
 </tr>
 <tr class="answer">
 <td align="left" valign="top"></td>
 <td align="left" valign="top">
 <p>This is not really an FAQ yet, but here's the answer
 anyway.</p>
 <div class="itemizedlist"><ul type="disc">
 <li><p>Run <span class="command"><strong>pkg_chk -N</strong></span> (from the
     <a href="ftp://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/pkgtools/pkg_chk/README.html" target="_top"><code class="filename">pkgtools/pkg_chk</code></a> package).  It
     will tell you about newer versions of installed packages that are

 @@ -6093,30 +6093,26 @@ INSTALLATION_DIRS
 In the rare cases that a package shouldn't install anything, set NO_INSTALL to
 "yes". This is mostly relevant for packages in the regress category.
 .15. The package phase
 Once the install stage has completed, a binary package of the installed files
 can be built. These binary packages can be used for quick installation without
 previous compilation, e.g. by the make bin-install or by using pkg_add.
 By default, the binary packages are created in ${PACKAGES}/All and symlinks are
 created in ${PACKAGES}/category, one for each category in the CATEGORIES
 variable. PACKAGES defaults to pkgsrc/packages.
 If there should be no binary package, set NO_PACKAGE to "yes". This should only
 be used in rare cases, like when a package definitely is only usable on the
 machine where it is built and even then, a binary package can be useful.
 .16. Cleaning up
 Once you're finished with a package, you can clean the work directory by
 running make clean. If you want to clean the work directories of all
 dependencies too, use make clean-depends.
 .17. Other helpful targets
 pre/post-*
     For any of the main targets described in the previous section, two
     auxiliary targets exist with "pre-" and "post-" used as a prefix for the
     main target's name. These targets are invoked before and after the main
 @@ -6626,37 +6622,44 @@ are Free or Open Source. However, packag
 those tests are labeled with a license tag denoting the license. Note that a
 package with no license to copy trivially does not meet either the Free or Open
 Source test.
 For packages which are not Free or Open Source, pkgsrc will not build the
 package unless the user has indicated to pkgsrc that packages with that
 particular license may be built. Note that this documentation avoids the term
 "accepted the license". The pkgsrc system is merely providing a mechanism to
 avoid accidentally building a package with a non-free license; judgement and
 responsibility remain with the user. (Installation of binary packages are not
 currently subject to this mechanism; this is a bug.)
 One might want to only install packages with a BSD license, or the GPL, and not
-the other. The pkgsrc license tag mechanism does not provide a way to do this.
+the other. The free licenses are added to the default ACCEPTABLE_LICENSES
-It might be possible to put in tags for free licenses, and have a default
+variable. The user can override the default by setting the ACCEPTABLE_LICENSES
-ACCEPTABLE_LICENSES variable value, but this is widely viewed as having a very
+variable with "=" instead of "+=". The licenses accepted by default are:
 poor ratio of benefit to work.
     public-domain
     gnu-gpl-v2 gnu-lgpl-v2
     gnu-gpl-v3 gnu-lgpl-v3
     original-bsd modified-bsd
     x11
     apache-2.0
     cddl-1.0
     open-font-license
 The license tag mechanism is intended to address copyright-related issues
 surrounding building, installing and using a package, and not to address
-redistribution issues (see RESTRICTED and NO_SRC_ON_FTP, etc.). However, the
+redistribution issues (see RESTRICTED and NO_SRC_ON_FTP, etc.). Packages with
-above definition of licenses for which tags are not needed implies that
+redistribution restrictions should set these tags.
 packages with redistribution restrictions should have tags, because Free or
 Open Source programs do not have redistribution restrictions.
 Denoting that a package may be copied according to a particular license is done
 by placing the license in pkgsrc/licenses and setting the LICENSE variable to a
 string identifying the license, e.g. in graphics/xv:
 LICENSE=        xv-license
 When trying to build, the user will get a notice that the package is covered by
 a license which has not been placed in the ACCEPTABLE_LICENSES variable:
 % make
 ===> xv-3.10anb9 has an unacceptable license: xv-license.
 @@ -6733,30 +6736,26 @@ variables that can be set to note these
   * NO_SRC_ON_CDROM
     Distfiles may not be placed on CD-ROM, together with other distfiles, for
     which a fee may be charged. In this case, set this variable to $
     {RESTRICTED}.
   * NO_SRC_ON_FTP
     Distfiles may not made available via FTP at no charge. In this case, set
     this variable to ${RESTRICTED}. If this variable is set, the distfile(s)
     will not be mirrored on ftp.NetBSD.org.
 Please note that the use of NO_PACKAGE, IGNORE, NO_CDROM, or other generic make
 variables to denote restrictions is deprecated, because they unconditionally
 prevent users from generating binary packages!
 .1.6. Handling dependencies
 Your package may depend on some other package being present - and there are
 various ways of expressing this dependency. pkgsrc supports the BUILD_DEPENDS
 and DEPENDS definitions, the USE_TOOLS definition, as well as dependencies via
 buildlink3.mk, which is the preferred way to handle dependencies, and which
 uses the variables named above. See Chapter 14, Buildlink methodology for more
 information.
 The basic difference between the two variables is as follows: The DEPENDS
 definition registers that pre-requisite in the binary package so it will be
 pulled in when the binary package is later installed, whilst the BUILD_DEPENDS
 definition does not, marking a dependency that is only needed for building the