summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz>2009-10-25 21:32:17 +0000
committerwiz <wiz>2009-10-25 21:32:17 +0000
commitb4bec712ca4163a1be34fc9a3e6fa7c79e09d254 (patch)
treea0dbea3b95137af5f9a8b71a7195ecd60224af91
parent2df94bf1190dda82c569551a83a85e4abdd38485 (diff)
downloadpkgsrc-b4bec712ca4163a1be34fc9a3e6fa7c79e09d254.tar.gz
Add 2-clause-bsd to DEFAULT_ACCEPTABLE_LICENSES.
-rw-r--r--mk/license.mk4
-rw-r--r--pkgtools/pkg_install/files/lib/license.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/license.mk b/mk/license.mk
index 94a7ba6e954..10b05e0b31c 100644
--- a/mk/license.mk
+++ b/mk/license.mk
@@ -1,4 +1,4 @@
-# $NetBSD: license.mk,v 1.29 2009/07/26 09:18:29 wiz Exp $
+# $NetBSD: license.mk,v 1.30 2009/10/25 21:32:17 wiz Exp $
#
# This file handles everything about the LICENSE variable. It is
# included automatically by bsd.pkg.mk.
@@ -102,7 +102,7 @@ DEFAULT_ACCEPTABLE_LICENSES= \
gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 \
gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 \
gnu-gpl-v3 gnu-lgpl-v3 \
- original-bsd modified-bsd \
+ original-bsd modified-bsd 2-clause-bsd \
x11 mit miros \
apache-1.1 apache-2.0 \
artistic artistic-2.0 \
diff --git a/pkgtools/pkg_install/files/lib/license.c b/pkgtools/pkg_install/files/lib/license.c
index 164cd87cf81..31ff6056b44 100644
--- a/pkgtools/pkg_install/files/lib/license.c
+++ b/pkgtools/pkg_install/files/lib/license.c
@@ -1,4 +1,4 @@
-/* $NetBSD: license.c,v 1.9 2009/08/02 17:56:45 joerg Exp $ */
+/* $NetBSD: license.c,v 1.10 2009/10/25 21:32:48 wiz Exp $ */
/*-
* Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -50,7 +50,7 @@ const char *default_acceptable_licenses =
"gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 "
"gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 "
"gnu-gpl-v3 gnu-lgpl-v3 "
- "original-bsd modified-bsd "
+ "original-bsd modified-bsd 2-clause-bsd "
"x11 mit miros "
"apache-1.1 apache-2.0 "
"artistic artistic-2.0 "