CVS commit: pkgsrc/mk

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Dec 10 15:50:11 UTC 2018

Modified Files:
        pkgsrc/mk: license.mk

Log Message:
mk/license.mk: rewrite comments around license categories

Reorganize non-approved licenses based on inclusion rationale.  Align
comments to inclusion policy.

(This is a comment-only change.)


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 pkgsrc/mk/license.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/license.mk
diff -u pkgsrc/mk/license.mk:1.94 pkgsrc/mk/license.mk:1.95
--- pkgsrc/mk/license.mk:1.94   Mon Dec 10 15:39:10 2018
+++ pkgsrc/mk/license.mk        Mon Dec 10 15:50:10 2018
@@ -1,4 +1,4 @@
-# $NetBSD: license.mk,v 1.94 2018/12/10 15:39:10 gdt Exp $
+# $NetBSD: license.mk,v 1.95 2018/12/10 15:50:10 gdt Exp $
 #
 # This file handles everything about the LICENSE variable. It is
 # included automatically by bsd.pkg.mk.
@@ -105,12 +105,14 @@
 # Keywords: licence license
 #
 
-# This list is not complete.  Free and Open Source licenses should be
-# added to the list as they are added to pkgsrc.
-#
-# The convention is that Free or Open Source licenses do not have a
-# -license suffix, and nonfree licenses end in -license.
-#
+# The convention is that Free and Open Source licenses do not have a
+# -license suffix, and non-Free licenses end in -license.  Thus,
+# license in DEFAULT_ACCEPTABLE_LICENSES should not end in -license.
+#
+# First, we set DEFAULT_ACCEPTABLE_LICENSES to the set of licenses
+# formally approved as Free Software by FSF or Open Source by OSI,
+# except that we exclude the AGPL (clearly a Free license), following
+# the decision of the board of TNF.
 DEFAULT_ACCEPTABLE_LICENSES= \
        apache-1.1 apache-2.0 \
        arphic-public \
@@ -163,19 +165,26 @@ DEFAULT_ACCEPTABLE_LICENSES= \
        zpl-2.1 \
        zsh
 
-# not approved by OSI, derived from BSD
-DEFAULT_ACCEPTABLE_LICENSES+=  info-zip
+# The following licenses meet the DFSG (but are not formally approved
+# by FSF/OSI) as evidenced by inclusion in Debian main.
+#
+# \todo reference to package
+DEFAULT_ACCEPTABLE_LICENSES+=  happy
+# used in https://sources.debian.org/copyright/license/lsof/
+DEFAULT_ACCEPTABLE_LICENSES+=  purdue
 
-# not approved by OSI, in line with Free Software principles but with rename
-# restrictions and typefaces can not be sold by itself.
-DEFAULT_ACCEPTABLE_LICENSES+=  vera-ttf-license
+# The following licenses are included based on it being obvious they
+# would be approved.
+#
+# derived from BSD
+DEFAULT_ACCEPTABLE_LICENSES+=  info-zip
 
-# DFSG, not evaluated by OSI/FSF
-DEFAULT_ACCEPTABLE_LICENSES+=  happy
+# The following licenses do not currently meet our standards for
+# inclusion.
 
-# DFSG, not evaluated by OSI/FSF
-# Mainly used in https://sources.debian.org/copyright/license/lsof/
-DEFAULT_ACCEPTABLE_LICENSES+=  purdue
+# mostly inline with Free Software principles and typefaces can not be
+# sold by itself.
+DEFAULT_ACCEPTABLE_LICENSES+=  vera-ttf-license
 
 ##### Variant spellings