pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Point to the copy of DEFAULT_ACCEPTABLE_LICENSES in...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8847ce09825d
branches:  trunk
changeset: 558195:8847ce09825d
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Thu Apr 30 12:27:16 2009 +0000

description:
Point to the copy of DEFAULT_ACCEPTABLE_LICENSES in pkg_install
sources, and add a comment opining that there should be only a single
place to configure the default and per-machine lists for both source
and binary package building/installation.

diffstat:

 mk/license.mk |  22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 37716fd25cad -r 8847ce09825d mk/license.mk
--- a/mk/license.mk     Thu Apr 30 11:52:33 2009 +0000
+++ b/mk/license.mk     Thu Apr 30 12:27:16 2009 +0000
@@ -1,20 +1,24 @@
-# $NetBSD: license.mk,v 1.16 2009/04/29 23:50:07 gdt Exp $
+# $NetBSD: license.mk,v 1.17 2009/04/30 12:27:16 gdt Exp $
 #
 # This file handles everything about the LICENSE variable. It is
 # included automatically by bsd.pkg.mk.
 #
+# XXX There should be one place to set the default list and for users
+# to set the ACCEPTABLE_LICENSES list, used by both source builds and
+# binary installs#
+#
 # XXX: Some of this content arguably belongs in the pkgsrc guide
 # instead.
 #
 # === User-settable variables ===
 #
 # ACCEPTABLE_LICENSES
+#
 #      If a package declares a license and that license is not a
-#      member of the list defined by this variable, pkgsrc will
-#      refuse to build the package.
-#
-#      XXX: pkg_install should also check LICENSE and decline to
-#      install if it is not in ACCEPTABLE_LICENSES.
+#      member of the list defined by this variable, pkgsrc will not
+#      build the package and instead print an error message.
+#      (pkg_install has code to behave the same way, but it is not
+#      yet turned on.)
 #
 #      XXX: Perhaps there should be some mechanism to prevent running
 #      programs that are part of packages that declare LICENSEs that
@@ -29,6 +33,7 @@
 # === Package-settable variables ===
 #
 # LICENSE
+#
 #      The license of the package.
 #
 #      Sometimes licensing is other than a single text file.  See
@@ -66,6 +71,11 @@
 #      the effort were made.  Such license names will have a comment
 #      near them in the assignment to DEFAULT_ACCEPTABLE_LICENSES.
 #
+#      The pkg_install sources also have a
+#      DEFAULT_ACCEPTABLE_LICENSES list, and that should be updated
+#      to match the list here.  See
+#      pkgsrc/pkgtools/pkg_install/files/lib/license.c
+#
 # === See also ===
 #
 #      ../doc/TODO, section "Licenses of packages"



Home | Main Index | Thread Index | Old Index