55 files changed, 55 insertions, 55 deletions

diff --git a/www/axis2/Makefile b/www/axis2/Makefile
index d662475595e0..3a1b8c1b3e31 100644
--- a/www/axis2/Makefile
+++ b/www/axis2/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Provides a Web Services,SOAP and WSDL engine from Apache
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 USE_ZIP=	yes
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/www/closure-compiler/Makefile b/www/closure-compiler/Makefile
index 5034f3229e9f..02c1221cdff4 100644
--- a/www/closure-compiler/Makefile
+++ b/www/closure-compiler/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	compiler-${PORTVERSION}
 MAINTAINER=	jlaffaye@FreeBSD.org
 COMMENT=	Closure Compiler
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/www/closure-linter/Makefile b/www/closure-linter/Makefile
index 05f7085d846d..74def910a562 100644
--- a/www/closure-linter/Makefile
+++ b/www/closure-linter/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	closure_linter-${PORTVERSION}
 MAINTAINER=	jlaffaye@FreeBSD.org
 COMMENT=	JavaScript linter
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gflags:${PORTSDIR}/devel/py-gflags
 
diff --git a/www/dtse/Makefile b/www/dtse/Makefile
index de9caccb42e9..7e3005349546 100644
--- a/www/dtse/Makefile
+++ b/www/dtse/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	douglas@douglasthrift.net
 COMMENT=	An indexing search engine for use on small websites
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/ax_check_gnu_make.m4:${PORTSDIR}/devel/autoconf-archive
 
diff --git a/www/flickcurl/Makefile b/www/flickcurl/Makefile
index b3c11350d6a5..956e3519151d 100644
--- a/www/flickcurl/Makefile
+++ b/www/flickcurl/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://download.dajobe.org/flickcurl/
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	C library for the Flickr API
 
-LICENSE=	AL2 GPLv2 LGPL21
+LICENSE=	APACHE20 GPLv2 LGPL21
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
diff --git a/www/get_flash_videos/Makefile b/www/get_flash_videos/Makefile
index ced751fc0976..c4e4985bff0a 100644
--- a/www/get_flash_videos/Makefile
+++ b/www/get_flash_videos/Makefile
@@ -12,7 +12,7 @@ EXTRACT_ONLY=
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Download videos from various Flash-based video hosting sites
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 RUN_DEPENDS=	\
 		p5-Crypt-Blowfish_PP>=0:${PORTSDIR}/security/p5-Crypt-Blowfish_PP \
diff --git a/www/google-appengine/Makefile b/www/google-appengine/Makefile
index acb833821102..2b43ed221c60 100644
--- a/www/google-appengine/Makefile
+++ b/www/google-appengine/Makefile
@@ -11,7 +11,7 @@ DISTFILES=	${PORTNAME:S|-|_|}_${PORTVERSION}.zip
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Development tools for Google App Engine (SDK)
 
-LICENSE=	AL2 BSD GPLv2 LGPL21 MIT MPL PSFL
+LICENSE=	APACHE20 BSD GPLv2 LGPL21 MIT MPL PSFL
 LICENSE_COMB=	multi
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=${PYTHON_VER}:${PORTSDIR}/databases/py-sqlite3 \
diff --git a/www/htdump/Makefile b/www/htdump/Makefile
index b59396cb613c..0d371f09903b 100644
--- a/www/htdump/Makefile
+++ b/www/htdump/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://ivo.palli.nl/prog/linux/htdump/bin/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool to retrieve WWW data
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 OPTIONS_DEFINE=	SSL
 OPTIONS_DEFAULT=SSL
diff --git a/www/htmlcompressor/Makefile b/www/htmlcompressor/Makefile
index eb301c87cb93..29792bd77ea0 100644
--- a/www/htmlcompressor/Makefile
+++ b/www/htmlcompressor/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HTML/XML Compressor
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 NO_WRKSUBDIR=	yes
 USE_JAVA=	yes
diff --git a/www/httest/Makefile b/www/httest/Makefile
index 7ca35bb18731..44ee49365328 100644
--- a/www/httest/Makefile
+++ b/www/httest/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/htt/htt${PORTVERSION:R}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	HTTP Test Tool
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 LIB_DEPENDS=	libapr-1.so:${PORTSDIR}/devel/apr1 \
 		libpcre.so:${PORTSDIR}/devel/pcre
diff --git a/www/httpclient/Makefile b/www/httpclient/Makefile
index aa41df7e7e06..d32fa92c736c 100644
--- a/www/httpclient/Makefile
+++ b/www/httpclient/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	httpcomponents-client-${DISTVERSION}-bin
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Java components implementing an advanced HTTP client
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${JAVAJARDIR}/httpcore.jar:${PORTSDIR}/www/httpcore \
diff --git a/www/httpcore/Makefile b/www/httpcore/Makefile
index 2929a86b0bd1..908b7c005c60 100644
--- a/www/httpcore/Makefile
+++ b/www/httpcore/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	httpcomponents-core-${DISTVERSION}-bin
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Java components implementing the base HTTP protocol
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USE_JAVA=	yes
diff --git a/www/jmeter/Makefile b/www/jmeter/Makefile
index 37b8d9e20239..8e2b1d812065 100644
--- a/www/jmeter/Makefile
+++ b/www/jmeter/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Functional behaviour load and performance test application
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 # These are JAR-files installed by other ports. The list should keep
 # growing until all Java applications install just their own JARs -- not
diff --git a/www/jspwiki/Makefile b/www/jspwiki/Makefile
index 537238e72caa..5f47e922c5f8 100644
--- a/www/jspwiki/Makefile
+++ b/www/jspwiki/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	JSPWiki-${PORTVERSION}-bin
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Feature-rich and extensible Wiki engine built around J2EE
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 USE_ZIP=	yes
 USE_JAVA=	1.6+
diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile
index 24e45f426809..e8f7088bf9be 100644
--- a/www/libapreq2/Makefile
+++ b/www/libapreq2/Makefile
@@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR=libapreq
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Generic Apache2 Request Library
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 USE_APACHE=	22+
 USE_GMAKE=	yes
diff --git a/www/mod_auth_cas/Makefile b/www/mod_auth_cas/Makefile
index 77cffcea3632..1b38da07750a 100644
--- a/www/mod_auth_cas/Makefile
+++ b/www/mod_auth_cas/Makefile
@@ -14,7 +14,7 @@ EXTRACT_ONLY=
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache 2.x module that supports the CASv1 and CASv2 protocols
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
diff --git a/www/mod_auth_external2/Makefile b/www/mod_auth_external2/Makefile
index 63f53f469c1a..b05717961c36 100644
--- a/www/mod_auth_external2/Makefile
+++ b/www/mod_auth_external2/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	apache2
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows users authentication based on external mechanisms
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 USE_APACHE=	22
 AP_FAST_BUILD=	yes
diff --git a/www/mod_auth_mysql2/Makefile b/www/mod_auth_mysql2/Makefile
index 7806419611f7..bdfccdf851c6 100644
--- a/www/mod_auth_mysql2/Makefile
+++ b/www/mod_auth_mysql2/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR=	apache2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MySQL-based authentication module with VirtualHost support
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_MYSQL=	yes
diff --git a/www/mod_authn_sasl/Makefile b/www/mod_authn_sasl/Makefile
index 29332c05eca4..c7ee3cd7d8f5 100644
--- a/www/mod_authn_sasl/Makefile
+++ b/www/mod_authn_sasl/Makefile
@@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR=mod-authn-sasl/mod-authn-sasl/${PORTVERSION}
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Allows user authentication based on libsasl2 mechanisms on apache 2.2
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 
diff --git a/www/mod_authnz_crowd/Makefile b/www/mod_authnz_crowd/Makefile
index 77f25c95a4f0..b748f12aaf9b 100644
--- a/www/mod_authnz_crowd/Makefile
+++ b/www/mod_authnz_crowd/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	apache2
 MAINTAINER=	vivek@khera.org
 COMMENT=	Apache 2.2.x module to use Atlassian Crowd for authentication
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion \
 		libcurl.so:${PORTSDIR}/ftp/curl
diff --git a/www/mod_authz_unixgroup/Makefile b/www/mod_authz_unixgroup/Makefile
index 718e22d4f41e..d903e06c61a9 100644
--- a/www/mod_authz_unixgroup/Makefile
+++ b/www/mod_authz_unixgroup/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	apache2
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	UNIX group access control module for Apache 2.2
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 PORTSCOUT=	limit:^1\.0\.
 
diff --git a/www/mod_bw/Makefile b/www/mod_bw/Makefile
index e157ef2ec944..35a5cecb208f 100644
--- a/www/mod_bw/Makefile
+++ b/www/mod_bw/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	apache2
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Bandwidth and Connection control per Virtual Host or Directory
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 WRKSRC=		${WRKDIR}/mod_bw
 USE_APACHE=	22
diff --git a/www/mod_geoip2/Makefile b/www/mod_geoip2/Makefile
index f7dde6bed307..5f05bbc24303 100644
--- a/www/mod_geoip2/Makefile
+++ b/www/mod_geoip2/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	jau@iki.fi
 COMMENT=	Apache module that provides the country code of the client IP
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 BUILD_DEPENDS=	GeoIP>=1.4.4:${PORTSDIR}/net/GeoIP
 RUN_DEPENDS=	GeoIP>=1.4.4:${PORTSDIR}/net/GeoIP
diff --git a/www/mod_gnutls/Makefile b/www/mod_gnutls/Makefile
index 2661f50551a8..bf25495b4f67 100644
--- a/www/mod_gnutls/Makefile
+++ b/www/mod_gnutls/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 MAINTAINER=	fumifumi@abacustech.jp
 COMMENT=	mod_gnutls uses the GnuTLS library to provide SSL, and TLS encryption for Apache HTTPD
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	gnutls.26:${PORTSDIR}/security/gnutls
diff --git a/www/mod_hosts_access/Makefile b/www/mod_hosts_access/Makefile
index d5e73d89bd93..0b5afd380a61 100644
--- a/www/mod_hosts_access/Makefile
+++ b/www/mod_hosts_access/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	LOCAL/pgollucci
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache module that makes Apache respect hosts.allow and hosts.deny
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 USE_APACHE=	22
 AP_FAST_BUILD=	yes
diff --git a/www/mod_jail/Makefile b/www/mod_jail/Makefile
index d416bff0a38d..8d6605a0e39f 100644
--- a/www/mod_jail/Makefile
+++ b/www/mod_jail/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://mod-jail.googlecode.com/files/
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache module to enable an easy alternative to mod_chroot
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 USE_APACHE=	22+
 AP_FAST_BUILD=	yes
diff --git a/www/mod_limitipconn2/Makefile b/www/mod_limitipconn2/Makefile
index f9e50881f6a6..235fe623a1d5 100644
--- a/www/mod_limitipconn2/Makefile
+++ b/www/mod_limitipconn2/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	apache2
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	Allows you to limit the number of simultaneous connexions
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 USE_APACHE=	22
 USE_BZIP2=	yes
diff --git a/www/mod_myvhost/Makefile b/www/mod_myvhost/Makefile
index 140f5fc1e794..d12e8c332740 100644
--- a/www/mod_myvhost/Makefile
+++ b/www/mod_myvhost/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Apache module for dynamically configured mass virtual hosting with php
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 MANUAL_PACKAGE_BUILD=	needs apr and apache with DBD options enabled
 
diff --git a/www/mod_reproxy/Makefile b/www/mod_reproxy/Makefile
index 56318d7403b6..fdeee2d668eb 100644
--- a/www/mod_reproxy/Makefile
+++ b/www/mod_reproxy/Makefile
@@ -9,7 +9,7 @@ MASTER_SITE_SUBDIR=	kuriyama
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Apache module to support x-reproxy-url header
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 WRKSRC=		${WRKDIR}/lestrrat-mod_reproxy-0f945ff
 
diff --git a/www/mod_rivet/Makefile b/www/mod_rivet/Makefile
index 3f6f13884acb..629fdc276027 100644
--- a/www/mod_rivet/Makefile
+++ b/www/mod_rivet/Makefile
@@ -11,7 +11,7 @@ DISTNAME=		rivet-${PORTVERSION}
 MAINTAINER=	cowbert@gmail.com
 COMMENT=	Embeds a Tcl interpreter in the Apache server
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 LIB_DEPENDS=	libitcl.so:${PORTSDIR}/lang/itcl
 
diff --git a/www/mod_security/Makefile b/www/mod_security/Makefile
index ea30a4e5afb7..93e34b1c2cda 100644
--- a/www/mod_security/Makefile
+++ b/www/mod_security/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME:S/_//:S/2//}-apache_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An intrusion detection and prevention engine
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre \
 		apr-1:${PORTSDIR}/devel/apr1
diff --git a/www/mod_setenvifplus/Makefile b/www/mod_setenvifplus/Makefile
index c96617a45dd9..d33e951065a4 100644
--- a/www/mod_setenvifplus/Makefile
+++ b/www/mod_setenvifplus/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	apache2
 MAINTAINER=	ports@christianserving.org
 COMMENT=	Allows setting environment variables based on request attributes
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 USE_APACHE=	22+
 AP_FAST_BUILD=	yes
diff --git a/www/mod_spdy/Makefile b/www/mod_spdy/Makefile
index a9675ee63c22..220e0f9390de 100644
--- a/www/mod_spdy/Makefile
+++ b/www/mod_spdy/Makefile
@@ -14,7 +14,7 @@ EXTRACT_ONLY=	mod_spdy_source_${PORTVERSION}.tar.xz
 MAINTAINER=	masaki@club.kyutech.ac.jp
 COMMENT=	SPDY module for the Apache HTTP server v2.2
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python \
 		greadlink:${PORTSDIR}/sysutils/coreutils \
diff --git a/www/mod_tidy/Makefile b/www/mod_tidy/Makefile
index ca8675f9ed7a..172bee88cc66 100644
--- a/www/mod_tidy/Makefile
+++ b/www/mod_tidy/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	apache2
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Validates the HTML output of your apache2 webserver
 
-LICENSE=	AL2 MIT
+LICENSE=	APACHE20 MIT
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libtidy.so:${PORTSDIR}/www/tidy-lib
diff --git a/www/mod_umask/Makefile b/www/mod_umask/Makefile
index ce1276a41671..ac50d3fa5718 100644
--- a/www/mod_umask/Makefile
+++ b/www/mod_umask/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	apache2
 MAINTAINER=	gebhart@secnetix.de
 COMMENT=	Apache 2.x module to set umask of created files
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/mod_wsgi2/Makefile b/www/mod_wsgi2/Makefile
index 2365dd0c21ec..13051130ec52 100644
--- a/www/mod_wsgi2/Makefile
+++ b/www/mod_wsgi2/Makefile
@@ -12,7 +12,7 @@ PKGNAMESUFFIX=	2
 MAINTAINER=	douglas@douglasthrift.net
 COMMENT=	Python WSGI adapter module for Apache
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 CONFLICTS=	${PKGNAMEPREFIX}mod_wsgi-3.* ${PKGNAMEPREFIX}mod_wsgi3.* mod_wsgi-3.*
 
diff --git a/www/mod_wsgi3/Makefile b/www/mod_wsgi3/Makefile
index 3361a2bf0f5b..ecdfe7ccb014 100644
--- a/www/mod_wsgi3/Makefile
+++ b/www/mod_wsgi3/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX=	3
 MAINTAINER=	douglas@douglasthrift.net
 COMMENT=	Python WSGI adapter module for Apache
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 CONFLICTS=	${PKGNAMEPREFIX}mod_wsgi2.* mod_wsgi2.* \
 		${PKGNAMEPREFIX}mod_wsgi-2.* mod_wsgi-2.*
diff --git a/www/mod_xsendfile/Makefile b/www/mod_xsendfile/Makefile
index 2f71ebbb59ad..6e1257208f94 100644
--- a/www/mod_xsendfile/Makefile
+++ b/www/mod_xsendfile/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	https://tn123.org/mod_xsendfile/ \
 MAINTAINER=	potatosaladx@gmail.com
 COMMENT=	Apache2 module that processes X-SENDFILE headers
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 USE_APACHE=	22+
 AP_FAST_BUILD=	yes
diff --git a/www/p5-HTTP-CookieJar/Makefile b/www/p5-HTTP-CookieJar/Makefile
index 931bdcf8fa05..dbca9bcd7a08 100644
--- a/www/p5-HTTP-CookieJar/Makefile
+++ b/www/p5-HTTP-CookieJar/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Minimalist HTTP user agent cookie jar
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 BUILD_DEPENDS=	p5-HTTP-Date>=0:${PORTSDIR}/www/p5-HTTP-Date
 RUN_DEPENDS:=	${BUILD_DEPENDS}
diff --git a/www/py-dtflickr/Makefile b/www/py-dtflickr/Makefile
index a90d7a81be69..c29953e882f9 100644
--- a/www/py-dtflickr/Makefile
+++ b/www/py-dtflickr/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	douglas@douglasthrift.net
 COMMENT=	Spiffy Flickr API library using JSON
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 USE_BZIP2=	yes
 USE_PYTHON=	yes
diff --git a/www/py-falcon/Makefile b/www/py-falcon/Makefile
index 888f74d7d538..12cdb53e0077 100644
--- a/www/py-falcon/Makefile
+++ b/www/py-falcon/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	lichray@gmail.com
 COMMENT=	High-performance Python framework for building cloud APIs
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 BUILD_DEPENDS=	cython>=0.11.2:${PORTSDIR}/lang/cython
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}testtools>=0:${PORTSDIR}/devel/py-testtools \
diff --git a/www/py-google-api-python-client/Makefile b/www/py-google-api-python-client/Makefile
index 5c446eb5f415..e297852a6a65 100644
--- a/www/py-google-api-python-client/Makefile
+++ b/www/py-google-api-python-client/Makefile
@@ -11,7 +11,7 @@ DISTFILES=	${PORTNAME}-${DISTVERSION}.tar.gz
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Google API Client Library for Python
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PKGNAMEPREFIX}gflags>=1.4:${PORTSDIR}/devel/py-gflags \
 		${PKGNAMEPREFIX}httplib2>=0.6.0:${PORTSDIR}/www/py-httplib2 \
diff --git a/www/py-rackspace-monitoring/Makefile b/www/py-rackspace-monitoring/Makefile
index e2b9651d18a1..e7e4720b986f 100644
--- a/www/py-rackspace-monitoring/Makefile
+++ b/www/py-rackspace-monitoring/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Python client library for Rackspace Cloud Monitoring
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libcloud>=0.12.4:${PORTSDIR}/net/py-libcloud
 
diff --git a/www/py-selenium/Makefile b/www/py-selenium/Makefile
index 5197804b77b7..98ead472c023 100644
--- a/www/py-selenium/Makefile
+++ b/www/py-selenium/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	douglas@douglasthrift.net
 COMMENT=	Python bindings for Selenium
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}rdflib>=3.1.0:${PORTSDIR}/textproc/py-rdflib
 
diff --git a/www/py-tornado/Makefile b/www/py-tornado/Makefile
index 6cebe70105f0..9fbb200ed12f 100644
--- a/www/py-tornado/Makefile
+++ b/www/py-tornado/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	khsing.cn@gmail.com
 COMMENT=	Python Web Server from FriendFeed
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	easy_install
diff --git a/www/rubygem-bootstrap-sass/Makefile b/www/rubygem-bootstrap-sass/Makefile
index 2b3aca2564a7..beddf8db7717 100644
--- a/www/rubygem-bootstrap-sass/Makefile
+++ b/www/rubygem-bootstrap-sass/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	RG
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Twitter's Bootstrap
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 RUN_DEPENDS=	rubygem-sass>=3.2:${PORTSDIR}/textproc/rubygem-sass
 
diff --git a/www/rubygem-selenium-webdriver/Makefile b/www/rubygem-selenium-webdriver/Makefile
index 76c74b8cef93..b4b36e338e5d 100644
--- a/www/rubygem-selenium-webdriver/Makefile
+++ b/www/rubygem-selenium-webdriver/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	RG
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Tool for writing automated tests of websites
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 RUN_DEPENDS=	rubygem-childprocess>=0.2.5${PORTVERSION}:${PORTSDIR}/devel/rubygem-childprocess \
 		rubygem-multi_json>=1:${PORTSDIR}/devel/rubygem-multi_json \
diff --git a/www/sahi/Makefile b/www/sahi/Makefile
index 709458c1fe18..214c208dfcc7 100644
--- a/www/sahi/Makefile
+++ b/www/sahi/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}_${SAHI_BUILD:S,.,,g}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Web automation and testing tool
 
-LICENSE=	AL2 MPL
+LICENSE=	APACHE20 MPL
 LICENSE_COMB=	multi
 
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
diff --git a/www/serf/Makefile b/www/serf/Makefile
index 6d5cbf551d24..b20765107bec 100644
--- a/www/serf/Makefile
+++ b/www/serf/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	apache@FreeBSD.org
 COMMENT=	Serf HTTP client library
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr1
 
diff --git a/www/tomcat-native/Makefile b/www/tomcat-native/Makefile
index 2b994c24240e..998dea7d5fd4 100644
--- a/www/tomcat-native/Makefile
+++ b/www/tomcat-native/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Tomcat native library
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 LIB_DEPENDS=	libapr-1.so.4:${PORTSDIR}/devel/apr1
 
diff --git a/www/tomcat6/Makefile b/www/tomcat6/Makefile
index d4d2d22d708e..622cee85b75a 100644
--- a/www/tomcat6/Makefile
+++ b/www/tomcat6/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Open-source Java web server by Apache, 6.x branch
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_JAVA=	yes
diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile
index a8d13a65cc31..7d9662cf9c58 100644
--- a/www/tomcat7/Makefile
+++ b/www/tomcat7/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Open-source Java web server by Apache, 7.x branch
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 RUN_DEPENDS=	jsvc:${PORTSDIR}/devel/jakarta-commons-daemon
 
diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile
index 9464d400c9c4..025fb7c4b357 100644
--- a/www/trafficserver/Makefile
+++ b/www/trafficserver/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	APACHE/${PORTNAME}
 MAINTAINER=	jnlin@csie.nctu.edu.tw
 COMMENT=	A fast, scalable and extensible HTTP proxy server
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
 		libexpat.so:${PORTSDIR}/textproc/expat2 \
diff --git a/www/vertx/Makefile b/www/vertx/Makefile
index b0610e0bc6ff..d43a7d75a223 100644
--- a/www/vertx/Makefile
+++ b/www/vertx/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	vert.x-${PORTVERSION}.final
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Effortless asynchronous application development for the modern web
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
diff --git a/www/webmachine/Makefile b/www/webmachine/Makefile
index 60426fba2edc..c4645b723dc8 100644
--- a/www/webmachine/Makefile
+++ b/www/webmachine/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	www devel
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	HTTP semantic awareness on top mochiweb
 
-LICENSE=	AL2
+LICENSE=	APACHE20
 
 BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang \
 		mochiweb-basho>=0:${PORTSDIR}/www/mochiweb-basho