 @@ -1,14 +1,14 @@
-<!-- $NetBSD: fixes.xml,v 1.117 2013/04/15 13:05:14 wiz Exp $ -->
+<!-- $NetBSD: fixes.xml,v 1.118 2013/04/21 11:33:55 rodent Exp $ -->
 <chapter id="fixes"> <?dbhtml filename="fixes.html"?>
 <title>Making your package work</title>
 <sect1 id="general-operation">
   <title>General operation</title>
   <sect2 id="portability-of-packages">
     <title>Portability of packages</title>
     <para>One appealing feature of pkgsrc is that it runs on many
     different platforms. As a result, it is important to ensure,
     where possible, that packages in pkgsrc are portable. This
 @@ -118,54 +118,60 @@ INTERACTIVE_STAGE=      configure instal
     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.)</para>
     <para>One might want to only install packages with a BSD license,
     or the GPL, and not the other.  The free licenses are added to the
     default <varname>ACCEPTABLE_LICENSES</varname> variable.  The
     user can override the default by setting the
     <varname>ACCEPTABLE_LICENSES</varname> variable with "=" instead
     of "+=".  The licenses accepted by default are:
     <programlisting>
-        public-domain unlicense
+	apache-1.1 apache-2.0
-        gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3
+	arphic-public
-        gnu-gpl-v1
+	artistic artistic-2.0
-        gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1
+	boost-license
-        gnu-gpl-v3 gnu-lgpl-v3
+	cc-by-sa-v3.0
-        original-bsd modified-bsd 2-clause-bsd
+	cddl-1.0
-        x11 mit miros
+	cpl-1.0
-        apache-1.1 apache-2.0
+	epl-v1.0
-        artistic artistic-2.0
+	gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3
-        cddl-1.0
+	gnu-gpl-v1
-        cpl-1.0
+	gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1
-        open-font-license
+	gnu-gpl-v3 gnu-lgpl-v3
-        mpl-1.0 mpl-1.1 mpl-2.0
+	ibm-public-license-1.0
-        php png-license
+	ipafont
-        postgresql-license
+	isc
-        zlib
+	lppl-1.3c
-        zpl
+	lucent
-        python-software-foundation
+	miros
-        ipafont
+	mit
-        ibm-public-license-1.0
+	mpl-1.0 mpl-1.1 mpl-2.0
-        isc
+	mplusfont
-        boost-license
+	ofl-v1.0 ofl-v1.1
-        mplusfont
+	original-bsd modified-bsd 2-clause-bsd
-        cc-by-sa-v3.0
+	php
-        lppl-1.3c
+	png-license
-        lucent
+	postgresql-license
-        epl-v1.0
+	public-domain
-	info-zip
+	python-software-foundation
 	qpl-v1.0
 	sleepycat-public
 	unlicense
 	x11
 	zlib
 	zpl
     </programlisting>
     </para>
     <para>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
     <varname>RESTRICTED</varname> and
     <varname>NO_SRC_ON_FTP</varname>, etc.).
     Packages with redistribution restrictions should set these
     tags.</para>
     <para>Denoting that a package may be copied according to a
     particular license is done by placing the license in
 @@ -191,31 +197,37 @@ LICENSE=        xv-license
 *** Error code 1
     </programlisting>
     <para>The license can be viewed with <command>make
     show-license</command>, and if the user so chooses, the line
     printed above can be added to &mk.conf; to
     convey to pkgsrc that it should not in the future fail because of
     that license:</para>
     <programlisting>
 ACCEPTABLE_LICENSES+=xv-license
     </programlisting>
-    <para>When adding a package with a new license, the license text
+    <para>When adding a package with a new license, the following steps
-    should be added to <filename>pkgsrc/licenses</filename> for
+    are required:</para>
-    displaying.  A list of known licenses can be seen in this
+    <orderedlist>
-    directory.</para>
+    <listitem><para>Check if the file can avoid the -license filename tag as described above by referencing <ulink url="http://www.gnu.org/licenses/license-list.html">Various Licenses and Comments about Them</ulink> and <ulink url="http://opensource.org/licenses/alphabetical">Licenses by Name | Open Source Initiative</ulink>.  If this is the case, additionally add the license filename to:</para>
     <itemizedlist>
     <listitem><para>DEFAULT_ACCEPTABLE_LICENSES in <filename>pkgsrc/mk/license.mk</filename></para></listitem>
     <listitem><para>default_acceptable_licenses in <filename>pkgsrc/pkgtools/pkg_install/files/lib/license.c</filename></para></listitem>
     </itemizedlist>
     <para>with the proper syntax as demonstrated in those files, respectively.</para></listitem>
     <listitem><para>The license text should be added to <filename>pkgsrc/licenses</filename> for displaying.  A list of known licenses can be seen in this directory.</para></listitem>
     </orderedlist>
     <para>When the license changes (in a way other than formatting),
     please make sure that the new license has a different name (e.g.,
     append the version number if it exists, or the date).  Just
     because a user told pkgsrc to build programs under a previous
     version of a license does not mean that pkgsrc should build
     programs under the new licenses.  The higher-level point is that
     pkgsrc does not evaluate licenses for reasonableness; the only
     test is a mechanistic test of whether a particular text has been
     approved by either of two bodies.</para>
     <para>The use of <varname>LICENSE=shareware</varname>,
     <varname>LICENSE=no-commercial-use</varname>, and similar language
     is deprecated because it does not crisply refer to a particular