- 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@)

11 files changed, 11 insertions, 11 deletions

diff --git a/mail/cclient/Makefile b/mail/cclient/Makefile
index 59543a4a41d7..96fae7e30a74 100644
--- a/mail/cclient/Makefile
+++ b/mail/cclient/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	imap-${PORTVERSION}
 MAINTAINER=	anders@FreeBSD.org
 COMMENT=	Mark Crispin's C-client mail access routines
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 OPTIONS_DEFINE=	SSL SSL_AND_PLAINTEXT IPV6 MBX_DEFAULT
diff --git a/mail/horde-ingo/Makefile b/mail/horde-ingo/Makefile
index 013696ae0bf8..cf79cd5c8492 100644
--- a/mail/horde-ingo/Makefile
+++ b/mail/horde-ingo/Makefile
@@ -8,7 +8,7 @@ PKGNAMEPREFIX=	horde-
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde email filter rules manager
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LATEST_LINK=	horde-${PORTNAME}
diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile
index 80e34f815676..4e29f4abb2c4 100644
--- a/mail/horde-turba/Makefile
+++ b/mail/horde-turba/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	mail www pear
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde web based address book
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LATEST_LINK=	horde-${PORTNAME}
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index d30b01693768..07f5507f8712 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -15,7 +15,7 @@ PKGNAMESUFFIX=	-uw
 MAINTAINER=	anders@FreeBSD.org
 COMMENT=	University of Washington IMAP4rev1/POP2/POP3 mail servers
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	c-client4.9:${PORTSDIR}/mail/cclient
diff --git a/mail/libdkim/Makefile b/mail/libdkim/Makefile
index 9a1ee226a94a..3f478e61d8b9 100644
--- a/mail/libdkim/Makefile
+++ b/mail/libdkim/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DKIM (DomainKeys Identified Mail) library
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 USE_ZIP=	YES
 USE_LDCONFIG=	YES
diff --git a/mail/mime4j/Makefile b/mail/mime4j/Makefile
index 02d826ec9ad6..78b85db554f6 100644
--- a/mail/mime4j/Makefile
+++ b/mail/mime4j/Makefile
@@ -13,7 +13,7 @@ COMMENT=	A Java parser for e-mail message streams
 
 RUN_DEPENDS=	${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_JAVA=	yes
diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index e82a139dd7d1..2519fe179c45 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -13,7 +13,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:apache,cpan
 MAINTAINER?=	beech@FreeBSD.org
 COMMENT?=	A highly efficient mail filter for identifying spam
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 BUILD_DEPENDS=	p5-NetAddr-IP>=4.00.7:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
 		p5-Net-DNS>=0.63:${PORTSDIR}/dns/p5-Net-DNS \
diff --git a/mail/p5-SES/Makefile b/mail/p5-SES/Makefile
index 0d57d00bfd28..b5e70d0a72d1 100644
--- a/mail/p5-SES/Makefile
+++ b/mail/p5-SES/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	ses-tools-2011-11-14
 MAINTAINER=	stephon@gmail.com
 COMMENT=	Perl module of Amazon Simple Email Services
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
diff --git a/mail/postfix-policyd-spf-python/Makefile b/mail/postfix-policyd-spf-python/Makefile
index 3c624850b5d1..6c90ccdc945d 100644
--- a/mail/postfix-policyd-spf-python/Makefile
+++ b/mail/postfix-policyd-spf-python/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	pypolicyd-spf-${PORTVERSION}
 MAINTAINER=	me@mortis.eu
 COMMENT=	Pure Python Postfix policy daemon for SPF checking
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipaddr>0:${PORTSDIR}/devel/py-ipaddr \
 		${PYTHON_PKGNAMEPREFIX}spf>0:${PORTSDIR}/mail/py-spf \
diff --git a/mail/py-authres/Makefile b/mail/py-authres/Makefile
index 6a1643c32b45..b704730e742a 100644
--- a/mail/py-authres/Makefile
+++ b/mail/py-authres/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	yasu@utahime.org
 COMMENT=	Python module for RFC 5451 Authentication-Results headers
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
diff --git a/mail/spamass-ixhash/Makefile b/mail/spamass-ixhash/Makefile
index a08faeed5182..e03b5ca272a1 100644
--- a/mail/spamass-ixhash/Makefile
+++ b/mail/spamass-ixhash/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin \
 		p5-Digest-MD5>=0:${PORTSDIR}/security/p5-Digest-MD5 \
 		p5-Net-DNS>=0.63:${PORTSDIR}/dns/p5-Net-DNS
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 SUB_FILES=	pkg-message
 NO_BUILD=	yes