regen

1 files changed, 33 insertions, 8 deletions

diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index 67a4d9b1856..3d770b8e752 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -6539,14 +6539,34 @@ the other. The free licenses are added to the default ACCEPTABLE_LICENSES
 variable. The user can override the default by setting the ACCEPTABLE_LICENSES
 variable with "=" instead of "+=". The licenses accepted by default are:
 
-    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
 
 
 The license tag mechanism is intended to address copyright-related issues
@@ -6649,6 +6669,11 @@ variables that can be set to note these restrictions:
     this variable to ${RESTRICTED}. If this variable is set, the distfile(s)
     will not be mirrored on ftp.NetBSD.org.
 
+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.
+
 19.1.6. Handling dependencies
 
 Your package may depend on some other package being present - and there are