regen

1 files changed, 42 insertions, 23 deletions

diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt
index d7a28c9fdee..fdeb439c29d 100644
--- a/doc/pkgsrc.txt
+++ b/doc/pkgsrc.txt
@@ -6611,34 +6611,40 @@ 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 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
+        arphic-public
         artistic artistic-2.0
+        boost-license
+        cc-by-sa-v3.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
+        epl-v1.0
+        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
         ibm-public-license-1.0
+        ipafont
         isc
-        boost-license
-        mplusfont
-        cc-by-sa-v3.0
         lppl-1.3c
         lucent
-        epl-v1.0
-        info-zip
+        miros
+        mit
+        mpl-1.0 mpl-1.1 mpl-2.0
+        mplusfont
+        ofl-v1.0 ofl-v1.1
+        original-bsd modified-bsd 2-clause-bsd
+        php
+        png-license
+        postgresql-license
+        public-domain
+        python-software-foundation
+        qpl-v1.0
+        sleepycat-public
+        unlicense
+        x11
+        zlib
+        zpl
 
 
 The license tag mechanism is intended to address copyright-related issues
@@ -6671,9 +6677,22 @@ should not in the future fail because of that license:
 ACCEPTABLE_LICENSES+=xv-license
 
 
-When adding a package with a new license, the license text should be added to
-pkgsrc/licenses for displaying. A list of known licenses can be seen in this
-directory.
+When adding a package with a new license, the following steps are required:
+
+ 1. Check if the file can avoid the -license filename tag as described above by
+    referencing Various Licenses and Comments about Them and Licenses by Name |
+    Open Source Initiative. If this is the case, additionally add the license
+    filename to:
+
+      + DEFAULT_ACCEPTABLE_LICENSES in pkgsrc/mk/license.mk
+
+      + default_acceptable_licenses in pkgsrc/pkgtools/pkg_install/files/lib/
+        license.c
+
+    with the proper syntax as demonstrated in those files, respectively.
+
+ 2. The license text should be added to pkgsrc/licenses for displaying. A list
+    of known licenses can be seen in this directory.
 
 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