From fdc7d9ab8ff6900e83027aac04748926a91079a3 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Sat, 26 May 2012 22:13:25 +0000
Subject: Add: +    <para>Please note that packages will to be removed from
 pkgsrc +    when the distfiles are not distributable and cannot be obtained +
    for a period of one full quarter branch. Packages with manual / +   
 interactive fetch must have a maintainer and it is his/her +   
 responsibility to ensure this.</para>

Decided by pmc.

While here, sync list of default acceptable licenses with reality.
---
 doc/guide/files/fixes.xml | 44 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/doc/guide/files/fixes.xml b/doc/guide/files/fixes.xml
index 127a9e6a6db..ca487d70df3 100644
--- a/doc/guide/files/fixes.xml
+++ b/doc/guide/files/fixes.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: fixes.xml,v 1.107 2012/05/23 20:15:48 wiz Exp $ -->
+<!-- $NetBSD: fixes.xml,v 1.108 2012/05/26 22:13:25 wiz Exp $ -->
 
 <chapter id="fixes"> <?dbhtml filename="fixes.html"?>
 <title>Making your package work</title>
@@ -128,14 +128,34 @@ INTERACTIVE_STAGE=      configure install
     <varname>ACCEPTABLE_LICENSES</varname> variable with "=" instead
     of "+=".  The licenses accepted by default are:
     <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
+        public-domain unlicense
+        gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3
+        gnu-gpl-v1
+        gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1
+        gnu-gpl-v3 gnu-lgpl-v3
+        original-bsd modified-bsd 2-clause-bsd
+        x11 mit miros
+        apache-1.1 apache-2.0
+        artistic artistic-2.0
+        cddl-1.0
+        cpl-1.0
+        open-font-license
+        mpl-1.0 mpl-1.1 mpl-2.0
+        php png-license
+        postgresql-license
+        zlib
+        zpl
+        python-software-foundation
+        ipafont
+        ibm-public-license-1.0
+        isc
+        boost-license
+        mplusfont
+        cc-by-sa-v3.0
+        lppl-1.3c
+        lucent
+        epl-v1.0
+	info-zip
     </programlisting>
     </para>
 
@@ -278,6 +298,12 @@ ACCEPTABLE_LICENSES+=xv-license
 	the distfile(s) will not be mirrored on ftp.NetBSD.org.</para>
       </listitem>
     </itemizedlist>
+
+    <para>Please note that packages will to be removed from pkgsrc
+    when the distfiles are not distributable and cannot be obtained
+    for a period of one full quarter branch. Packages with manual /
+    interactive fetch must have a maintainer and it is his/her
+    responsibility to ensure this.</para>
   </sect2>
 
 
-- 
cgit v1.2.3