summaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorOlli Hauer <ohauer@FreeBSD.org>2013-12-30 20:55:18 +0000
committerOlli Hauer <ohauer@FreeBSD.org>2013-12-30 20:55:18 +0000
commit4fb1cfb1cd39cc9eebf2dca04766b8bb32d2851d (patch)
tree3ac0539929df7ded62928608363897c24273f689 /Mk
parent- Enable staging (diff)
- rename AL2 to APACHE20 in Mk/bsd.licenses.db.mk
- svn move Templates/Licenses/AL2 Templates/Licenses/APACHE20 - add APACHE10 and APACHE11 to Mk/bsd.licenses.db.mk - add entry in UPDATING - bulk change all ports AL2 => APACHE20 - math/openfst/pkg-plist: remove share/licenses/openfst-1.3.4 PR: ports/184785 Submitted by: ohauer Reviewed by: tabthorpe Approved by: portmgr (tabthorpe@)
Notes
Notes: svn path=/head/; revision=338168
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.licenses.db.mk12
1 files changed, 9 insertions, 3 deletions
diff --git a/Mk/bsd.licenses.db.mk b/Mk/bsd.licenses.db.mk
index d1dd9a29cf0e..a5323d369262 100644
--- a/Mk/bsd.licenses.db.mk
+++ b/Mk/bsd.licenses.db.mk
@@ -36,7 +36,7 @@ Licenses_db_Include_MAINTAINER= portmgr@FreeBSD.org
# _LICENSE_LIST_GROUPS - List of defined license groups
#
-_LICENSE_LIST= AGPLv3 AL2 ART10 ARTPERL10 ART20 \
+_LICENSE_LIST= AGPLv3 APACHE10 APACHE11 APACHE20 ART10 ARTPERL10 ART20 \
BSD BSD2CLAUSE BSD3CLAUSE BSD4CLAUSE BSL \
CDDL EPL GFDL GPLv1 GPLv2 \
GPLv3 ISCL LGPL20 LGPL21 LGPL3 LPPL10 LPPL11 LPPL12 LPPL13 LPPL13a \
@@ -75,8 +75,14 @@ _LICENSE_PERMS_DEFAULT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
_LICENSE_NAME_AGPLv3= GNU Affero General Public License version 3
_LICENSE_GROUPS_AGPLv3= FSF GPL OSI
-_LICENSE_NAME_AL2= Apache License
-_LICENSE_GROUPS_AL2= FSF OSI
+_LICENSE_NAME_APACHE10= Apache License 1.0
+_LICENSE_GROUPS_APACHE10= FSF OSI
+
+_LICENSE_NAME_APACHE11= Apache License 1.1
+_LICENSE_GROUPS_APACHE11= FSF OSI
+
+_LICENSE_NAME_APACHE20= Apache License 2.0
+_LICENSE_GROUPS_APACHE20= FSF OSI
_LICENSE_NAME_ART10= Artistic License version 1.0
_LICENSE_GROUPS_ART10= OSI