diff options
| author | rillig <rillig@pkgsrc.org> | 2007-10-17 10:37:43 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2007-10-17 10:37:43 +0000 |
| commit | 21cf8606990e58c5eb8d9b524982277c8d2335eb (patch) | |
| tree | e1df682a8d7039b2faa4f4ec1351ed6c43557982 | |
| parent | 7f19bc04540548642a8cd3387d54ce917500705d (diff) | |
| download | pkgsrc-21cf8606990e58c5eb8d9b524982277c8d2335eb.tar.gz | |
Accept all licenses in DEFAULT_ACCEPTABLE_LICENSES if the user is only
using the += operator, not the simple = operator, in mk.conf. That way
we can mark packages as having open source licenses without disturbing
the users.
| -rw-r--r-- | mk/bsd.prefs.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 234e3ba9ac2..97be2d825c7 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.272 2007/10/16 11:51:21 tnn Exp $ +# $NetBSD: bsd.prefs.mk,v 1.273 2007/10/17 10:37:43 rillig Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -275,8 +275,7 @@ MAKE_ENV+= USETOOLS=no OBJECT_FMT?= Mach-O .endif -# 2007Q3: uncomment this -#ACCEPTABLE_LICENSES?= ${DEFAULT_ACCEPTABLE_LICENSES} +ACCEPTABLE_LICENSES?= ${DEFAULT_ACCEPTABLE_LICENSES} # Provide PKGPATH early on so that mk.conf can use it. PKGPATH?= ${.CURDIR:C|.*/([^/]*/[^/]*)$|\1|} |