aboutsummaryrefslogtreecommitdiff
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
parent15ed6235586fa434f1987dc7a0f0a26164d59b33 (diff)
downloadports-4fb1cfb1cd39cc9eebf2dca04766b8bb32d2851d.tar.gz
ports-4fb1cfb1cd39cc9eebf2dca04766b8bb32d2851d.zip
Notes
-rw-r--r--Mk/bsd.licenses.db.mk12
-rw-r--r--Templates/Licenses/APACHE20 (renamed from Templates/Licenses/AL2)0
-rw-r--r--UPDATING6
-rw-r--r--archivers/snappy-java/Makefile2
-rw-r--r--audio/opencore-amr/Makefile2
-rw-r--r--audio/py-pylast/Makefile2
-rw-r--r--audio/vo-aacenc/Makefile2
-rw-r--r--audio/vo-amrwbenc/Makefile2
-rw-r--r--benchmarks/polygraph/Makefile2
-rw-r--r--benchmarks/wrk/Makefile2
-rw-r--r--biology/lamarc/Makefile2
-rw-r--r--chinese/opencc/Makefile2
-rw-r--r--databases/R-cran-RSQLite.extfuns/Makefile2
-rw-r--r--databases/adminer/Makefile2
-rw-r--r--databases/cassandra/Makefile2
-rw-r--r--databases/jasperserver/Makefile2
-rw-r--r--databases/java-mybatis/Makefile2
-rw-r--r--databases/kumofs/Makefile2
-rw-r--r--databases/libmongo-client/Makefile2
-rw-r--r--databases/liquibase/Makefile2
-rw-r--r--databases/mongodb/Makefile4
-rw-r--r--databases/p5-MongoDB/Makefile2
-rw-r--r--databases/pecl-mongo/Makefile2
-rw-r--r--databases/php5-pdo_cassandra/Makefile2
-rw-r--r--databases/py-carbon/Makefile2
-rw-r--r--databases/py-cql/Makefile2
-rw-r--r--databases/py-riak/Makefile2
-rw-r--r--databases/py-south/Makefile2
-rw-r--r--databases/py-swift/Makefile2
-rw-r--r--databases/py-swiftclient/Makefile2
-rw-r--r--databases/pymongo/Makefile2
-rw-r--r--deskutils/horde-mnemo/Makefile2
-rw-r--r--devel/R-cran-foreach/Makefile2
-rw-r--r--devel/R-cran-iterators/Makefile2
-rw-r--r--devel/android-tools-adb/Makefile2
-rw-r--r--devel/apache-ant/Makefile2
-rw-r--r--devel/awscli/Makefile2
-rw-r--r--devel/fb303/Makefile2
-rw-r--r--devel/git-review/Makefile2
-rw-r--r--devel/gjstest/Makefile2
-rw-r--r--devel/hadoop/Makefile2
-rw-r--r--devel/jakarta-commons-daemon/Makefile2
-rw-r--r--devel/jakarta-commons-io/Makefile2
-rw-r--r--devel/log4cxx/Makefile2
-rw-r--r--devel/maven-ant-tasks/Makefile2
-rw-r--r--devel/maven3/Makefile2
-rw-r--r--devel/meck/Makefile2
-rw-r--r--devel/mongo-cxx-driver/Makefile2
-rw-r--r--devel/ninja/Makefile2
-rw-r--r--devel/opengrok/Makefile2
-rw-r--r--devel/p5-Capture-Tiny/Makefile2
-rw-r--r--devel/p5-Class-Tiny/Makefile2
-rw-r--r--devel/p5-IO-Prompt-Tiny/Makefile2
-rw-r--r--devel/p5-Path-Tiny/Makefile2
-rw-r--r--devel/p5-Test-FailWarnings/Makefile2
-rw-r--r--devel/p5-Test-Number-Delta/Makefile2
-rw-r--r--devel/p5-Types-Path-Tiny/Makefile2
-rw-r--r--devel/pecl-xhprof/Makefile2
-rw-r--r--devel/py-binplist/Makefile2
-rw-r--r--devel/py-gdata/Makefile2
-rw-r--r--devel/py-jsonrpclib/Makefile2
-rw-r--r--devel/py-kazoo/Makefile2
-rw-r--r--devel/py-msgpack/Makefile2
-rw-r--r--devel/py-pbr/Makefile2
-rw-r--r--devel/py-robotframework-ride/Makefile2
-rw-r--r--devel/py-robotframework-selenium2library/Makefile2
-rw-r--r--devel/py-robotframework/Makefile2
-rw-r--r--devel/py-stevedore/Makefile2
-rw-r--r--devel/py-watchdog/Makefile2
-rw-r--r--devel/py-wsgi_xmlrpc/Makefile2
-rw-r--r--devel/pysvn/Makefile2
-rw-r--r--devel/rebar/Makefile2
-rw-r--r--devel/rubygem-atomic/Makefile2
-rw-r--r--devel/rubygem-thread_safe/Makefile2
-rw-r--r--devel/sbt/Makefile2
-rw-r--r--devel/scalatest/Makefile2
-rw-r--r--devel/subversion/Makefile.common2
-rw-r--r--devel/subversion16/Makefile.common2
-rw-r--r--devel/subversion17/Makefile.common2
-rw-r--r--devel/thrift/Makefile2
-rw-r--r--devel/zookeeper/Makefile2
-rw-r--r--dns/py-namebench/Makefile2
-rw-r--r--editors/openoffice-3/Makefile4
-rw-r--r--editors/openoffice-4/Makefile4
-rw-r--r--editors/openoffice-devel/Makefile4
-rw-r--r--graphics/ImageMagick/Makefile2
-rw-r--r--graphics/R-cran-RColorBrewer/Makefile2
-rw-r--r--graphics/batik/Makefile2
-rw-r--r--graphics/py-actdiag/Makefile2
-rw-r--r--graphics/py-blockdiag/Makefile2
-rw-r--r--graphics/py-nwdiag/Makefile2
-rw-r--r--graphics/py-seqdiag/Makefile2
-rw-r--r--graphics/tesseract-data/Makefile2
-rw-r--r--graphics/tesseract/Makefile2
-rw-r--r--graphics/xmlgraphics-commons/Makefile2
-rw-r--r--japanese/p5-Mail-SpamAssassin/Makefile2
-rw-r--r--java/castor/Makefile2
-rw-r--r--java/jakarta-commons-cli/Makefile2
-rw-r--r--java/jakarta-commons-codec/Makefile2
-rw-r--r--java/jakarta-commons-httpclient/Makefile2
-rw-r--r--java/jakarta-commons-lang/Makefile2
-rw-r--r--java/netty/Makefile2
-rw-r--r--lang/fsharp/Makefile2
-rw-r--r--lang/gambit-c/Makefile2
-rw-r--r--lang/groovy/Makefile2
-rw-r--r--lang/ironpython/Makefile2
-rw-r--r--lang/pharo/Makefile2
-rw-r--r--lang/squeak/Makefile2
-rw-r--r--mail/cclient/Makefile2
-rw-r--r--mail/horde-ingo/Makefile2
-rw-r--r--mail/horde-turba/Makefile2
-rw-r--r--mail/imap-uw/Makefile2
-rw-r--r--mail/libdkim/Makefile2
-rw-r--r--mail/mime4j/Makefile2
-rw-r--r--mail/p5-Mail-SpamAssassin/Makefile2
-rw-r--r--mail/p5-SES/Makefile2
-rw-r--r--mail/postfix-policyd-spf-python/Makefile2
-rw-r--r--mail/py-authres/Makefile2
-rw-r--r--mail/spamass-ixhash/Makefile2
-rw-r--r--math/metis/Makefile2
-rw-r--r--math/openfst/Makefile2
-rw-r--r--math/openfst/pkg-plist3
-rw-r--r--multimedia/livestreamer/Makefile2
-rw-r--r--net-im/openfire/Makefile2
-rw-r--r--net-mgmt/aircrack-ng/Makefile2
-rw-r--r--net-p2p/i2p/Makefile2
-rw-r--r--net/activemq/Makefile2
-rw-r--r--net/freerdp/Makefile2
-rw-r--r--net/googlecl/Makefile2
-rw-r--r--net/mDNSResponder/Makefile2
-rw-r--r--net/openvswitch/Makefile2
-rw-r--r--net/owamp/Makefile2
-rw-r--r--net/py-beanstalkc/Makefile2
-rw-r--r--net/py-gspreadsheet/Makefile2
-rw-r--r--net/py-libcloud/Makefile2
-rw-r--r--net/py-twitter/Makefile2
-rw-r--r--net/sip_scenario/Makefile2
-rw-r--r--print/pdfbox/Makefile2
-rw-r--r--security/apache-xml-security-c/Makefile2
-rw-r--r--security/ftimes/Makefile2
-rw-r--r--security/honggfuzz/Makefile2
-rw-r--r--security/ophcrack/Makefile2
-rw-r--r--security/orthrus/Makefile2
-rw-r--r--security/p5-Net-SAML/Makefile2
-rw-r--r--security/pam_google_authenticator/Makefile2
-rw-r--r--security/pear-Auth_OpenID/Makefile2
-rw-r--r--security/py-kerberos/Makefile2
-rw-r--r--security/py-keyczar/Makefile2
-rw-r--r--security/py-openssl/Makefile2
-rw-r--r--security/py-plaso/Makefile2
-rw-r--r--security/py-python-registry/Makefile2
-rw-r--r--security/py-rsa/Makefile2
-rw-r--r--security/py-slowaes/Makefile2
-rw-r--r--security/skipfish/Makefile2
-rw-r--r--security/xml-security/Makefile2
-rw-r--r--sysutils/dtpstree/Makefile2
-rw-r--r--sysutils/p5-Sys-Filesystem/Makefile2
-rw-r--r--sysutils/puppet/Makefile2
-rw-r--r--sysutils/py-halite/Makefile2
-rw-r--r--sysutils/py-pytsk/Makefile2
-rw-r--r--sysutils/py-salt-api/Makefile2
-rw-r--r--sysutils/py-salt-cloud/Makefile2
-rw-r--r--sysutils/py-salt/Makefile2
-rw-r--r--textproc/apache-poi/Makefile2
-rw-r--r--textproc/apache-solr/Makefile2
-rw-r--r--textproc/apache-solr3/Makefile2
-rw-r--r--textproc/clucene/Makefile2
-rw-r--r--textproc/elasticsearch/Makefile2
-rw-r--r--textproc/fex/Makefile2
-rw-r--r--textproc/kibana/Makefile2
-rw-r--r--textproc/lucene/Makefile2
-rw-r--r--textproc/lucene4/Makefile2
-rw-r--r--textproc/nltk/Makefile2
-rw-r--r--textproc/p5-Pod-WikiDoc/Makefile2
-rw-r--r--textproc/raptor2/Makefile2
-rw-r--r--textproc/rasqal/Makefile2
-rw-r--r--textproc/redland-bindings/Makefile2
-rw-r--r--textproc/xalan-j/Makefile2
-rw-r--r--textproc/xqilla/Makefile2
-rw-r--r--textproc/zorba/Makefile2
-rw-r--r--www/axis2/Makefile2
-rw-r--r--www/closure-compiler/Makefile2
-rw-r--r--www/closure-linter/Makefile2
-rw-r--r--www/dtse/Makefile2
-rw-r--r--www/flickcurl/Makefile2
-rw-r--r--www/get_flash_videos/Makefile2
-rw-r--r--www/google-appengine/Makefile2
-rw-r--r--www/htdump/Makefile2
-rw-r--r--www/htmlcompressor/Makefile2
-rw-r--r--www/httest/Makefile2
-rw-r--r--www/httpclient/Makefile2
-rw-r--r--www/httpcore/Makefile2
-rw-r--r--www/jmeter/Makefile2
-rw-r--r--www/jspwiki/Makefile2
-rw-r--r--www/libapreq2/Makefile2
-rw-r--r--www/mod_auth_cas/Makefile2
-rw-r--r--www/mod_auth_external2/Makefile2
-rw-r--r--www/mod_auth_mysql2/Makefile2
-rw-r--r--www/mod_authn_sasl/Makefile2
-rw-r--r--www/mod_authnz_crowd/Makefile2
-rw-r--r--www/mod_authz_unixgroup/Makefile2
-rw-r--r--www/mod_bw/Makefile2
-rw-r--r--www/mod_geoip2/Makefile2
-rw-r--r--www/mod_gnutls/Makefile2
-rw-r--r--www/mod_hosts_access/Makefile2
-rw-r--r--www/mod_jail/Makefile2
-rw-r--r--www/mod_limitipconn2/Makefile2
-rw-r--r--www/mod_myvhost/Makefile2
-rw-r--r--www/mod_reproxy/Makefile2
-rw-r--r--www/mod_rivet/Makefile2
-rw-r--r--www/mod_security/Makefile2
-rw-r--r--www/mod_setenvifplus/Makefile2
-rw-r--r--www/mod_spdy/Makefile2
-rw-r--r--www/mod_tidy/Makefile2
-rw-r--r--www/mod_umask/Makefile2
-rw-r--r--www/mod_wsgi2/Makefile2
-rw-r--r--www/mod_wsgi3/Makefile2
-rw-r--r--www/mod_xsendfile/Makefile2
-rw-r--r--www/p5-HTTP-CookieJar/Makefile2
-rw-r--r--www/py-dtflickr/Makefile2
-rw-r--r--www/py-falcon/Makefile2
-rw-r--r--www/py-google-api-python-client/Makefile2
-rw-r--r--www/py-rackspace-monitoring/Makefile2
-rw-r--r--www/py-selenium/Makefile2
-rw-r--r--www/py-tornado/Makefile2
-rw-r--r--www/rubygem-bootstrap-sass/Makefile2
-rw-r--r--www/rubygem-selenium-webdriver/Makefile2
-rw-r--r--www/sahi/Makefile2
-rw-r--r--www/serf/Makefile2
-rw-r--r--www/tomcat-native/Makefile2
-rw-r--r--www/tomcat6/Makefile2
-rw-r--r--www/tomcat7/Makefile2
-rw-r--r--www/trafficserver/Makefile2
-rw-r--r--www/vertx/Makefile2
-rw-r--r--www/webmachine/Makefile2
-rw-r--r--x11-fonts/droid-fonts-ttf/Makefile2
-rw-r--r--x11-fonts/roboto-fonts-ttf/Makefile2
237 files changed, 252 insertions, 243 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
diff --git a/Templates/Licenses/AL2 b/Templates/Licenses/APACHE20
index d9a10c0d8e86..d9a10c0d8e86 100644
--- a/Templates/Licenses/AL2
+++ b/Templates/Licenses/APACHE20
diff --git a/UPDATING b/UPDATING
index 1af6a4394ae8..e9fee1db3a91 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,12 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20121230:
+ AFFECTS: ports using Apache Software License 2.0
+ AUTHOR: ohauer@FreeBSD.org
+
+ The acronym for Apache Software License 2.0 was renamed to APACHE20
+
20121226:
AFFECTS: users of security/cyrus-sasl2
AUTHOR: ume@FreeBSD.org
diff --git a/archivers/snappy-java/Makefile b/archivers/snappy-java/Makefile
index 0e86be1e68eb..af92c7f47b6e 100644
--- a/archivers/snappy-java/Makefile
+++ b/archivers/snappy-java/Makefile
@@ -21,7 +21,7 @@ EXTRACT_ONLY= snappy-${PORTVERSION}.tar.gz \
MAINTAINER= hsn@sendmail.cz
COMMENT= Fast compressor/decompressor library
-LICENSE= AL2
+LICENSE= APACHE20
BUILD_DEPENDS= ${LOCALBASE}/share/java/maven3/bin/mvn:${PORTSDIR}/devel/maven3
diff --git a/audio/opencore-amr/Makefile b/audio/opencore-amr/Makefile
index ec8eb77d1886..2f5c1ae227ad 100644
--- a/audio/opencore-amr/Makefile
+++ b/audio/opencore-amr/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
MAINTAINER= gslin@gslin.org
COMMENT= OpenCORE implementation of AMR Narrowband & Wideband speech codec
-LICENSE= AL2
+LICENSE= APACHE20
GNU_CONFIGURE= yes
USES= gmake pathfix
diff --git a/audio/py-pylast/Makefile b/audio/py-pylast/Makefile
index d72e7536c4aa..9186c5c60f75 100644
--- a/audio/py-pylast/Makefile
+++ b/audio/py-pylast/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= CHEESESHOP
MAINTAINER= feld@FreeBSD.org
COMMENT= A Python interface to Last.fm
-LICENSE= AL2
+LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/COPYING
USE_PYTHON= yes
diff --git a/audio/vo-aacenc/Makefile b/audio/vo-aacenc/Makefile
index 19b7f9a6d610..b747f106d31a 100644
--- a/audio/vo-aacenc/Makefile
+++ b/audio/vo-aacenc/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/opencore-amr/${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= VisualOn AAC encoder library
-LICENSE= AL2
+LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/audio/vo-amrwbenc/Makefile b/audio/vo-amrwbenc/Makefile
index 36eecd05e139..940425606866 100644
--- a/audio/vo-amrwbenc/Makefile
+++ b/audio/vo-amrwbenc/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/opencore-amr/${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= VisualOn AMR-WB encoder library
-LICENSE= AL2
+LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/benchmarks/polygraph/Makefile b/benchmarks/polygraph/Makefile
index 83cb619096c1..38c901dc5459 100644
--- a/benchmarks/polygraph/Makefile
+++ b/benchmarks/polygraph/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= as@bsdgroup.de
COMMENT= A benchmarking tool for Web proxies
-LICENSE= AL2
+LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_GCC= 4.2+
diff --git a/benchmarks/wrk/Makefile b/benchmarks/wrk/Makefile
index b63b2774157c..23f0c4e157c6 100644
--- a/benchmarks/wrk/Makefile
+++ b/benchmarks/wrk/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= osa@FreeBSD.org
COMMENT= The modern HTTP benchmarking tool
-LICENSE= AL2
+LICENSE= APACHE20
FETCH_ARGS= -pRr
LIB_DEPENDS+= libluajit-5.1.so:${PORTSDIR}/lang/luajit
diff --git a/biology/lamarc/Makefile b/biology/lamarc/Makefile
index 6f619f2a73fb..ba94de6c18d6 100644
--- a/biology/lamarc/Makefile
+++ b/biology/lamarc/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://evolution.genetics.washington.edu/lamarc/download/
MAINTAINER= ports@FreeBSD.org
COMMENT= Package of programs for computing population parameters
-LICENSE= AL2
+LICENSE= APACHE20
OPTIONS_DEFINE= WXGTK DOCS
diff --git a/chinese/opencc/Makefile b/chinese/opencc/Makefile
index 8966dc4f5ecf..25ccbd679453 100644
--- a/chinese/opencc/Makefile
+++ b/chinese/opencc/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
MAINTAINER= lichray@gmail.com
COMMENT= Open Chinese Convert library and utilities
-LICENSE= AL2
+LICENSE= APACHE20
MAN1= opencc.1 opencc_dict.1
diff --git a/databases/R-cran-RSQLite.extfuns/Makefile b/databases/R-cran-RSQLite.extfuns/Makefile
index bc1377bcf0df..dcab50cc6215 100644
--- a/databases/R-cran-RSQLite.extfuns/Makefile
+++ b/databases/R-cran-RSQLite.extfuns/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= skreuzer@FreeBSD.org
COMMENT= SQLite extension functions for RSQLite
-LICENSE= AL2
+LICENSE= APACHE20
BUILD_DEPENDS= R-cran-RSQLite>=0.11.1:${PORTSDIR}/databases/R-cran-RSQLite
RUN_DEPENDS:= ${BUILD_DEPENDS}
diff --git a/databases/adminer/Makefile b/databases/adminer/Makefile
index 49f1c9ddf77e..4cd301ceb9f1 100644
--- a/databases/adminer/Makefile
+++ b/databases/adminer/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/Adminer/Adminer%20${PORTVERSION}
MAINTAINER= wen@FreeBSD.org
COMMENT= Full-featured database management tool written in PHP
-LICENSE= AL2
+LICENSE= APACHE20
USE_ZIP= yes
NO_BUILD= yes
diff --git a/databases/cassandra/Makefile b/databases/cassandra/Makefile
index af866c7860e1..242256ab0f42 100644
--- a/databases/cassandra/Makefile
+++ b/databases/cassandra/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX= -bin.tar.gz
MAINTAINER= hsn@sendmail.cz
COMMENT= Open source distributed database management system
-LICENSE= AL2
+LICENSE= APACHE20
JAVA_VERSION= 1.7
JAVA_VENDOR= openjdk
diff --git a/databases/jasperserver/Makefile b/databases/jasperserver/Makefile
index bf7e88990090..3add0612a4e2 100644
--- a/databases/jasperserver/Makefile
+++ b/databases/jasperserver/Makefile
@@ -18,7 +18,7 @@ EXTRACT_ONLY= jasperreports-server-cp-${PORTVERSION}-src.zip \
MAINTAINER= jgh@FreeBSD.org
COMMENT= Open Source Java Reporting Library
-LICENSE= GPLv3 MIT AL2
+LICENSE= GPLv3 MIT APACHE20
LICENSE_COMB= multi
BUILD_DEPENDS= mvn:${PORTSDIR}/devel/maven2
diff --git a/databases/java-mybatis/Makefile b/databases/java-mybatis/Makefile
index ae026f9ba9fb..0e29cc872bd9 100644
--- a/databases/java-mybatis/Makefile
+++ b/databases/java-mybatis/Makefile
@@ -18,7 +18,7 @@ COMMENT= SQL Mapping Framework
USE_JAVA= yes
USE_ZIP= yes
-LICENSE= AL2
+LICENSE= APACHE20
NO_BUILD= yes
JAR_FILE= ${PORTNAME}-${PORTVERSION}.jar
diff --git a/databases/kumofs/Makefile b/databases/kumofs/Makefile
index 9422c01481d7..3138587d43c1 100644
--- a/databases/kumofs/Makefile
+++ b/databases/kumofs/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS= libmsgpack.so:${PORTSDIR}/devel/msgpack \
libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
RUN_DEPENDS= rubygem-msgpack>0:${PORTSDIR}/devel/rubygem-msgpack
-LICENSE= AL2
+LICENSE= APACHE20
USE_AUTOTOOLS= libtool autoheader autoconf automake aclocal
ACLOCAL_ARGS= # empty
AUTOMAKE_ARGS= --add-missing --copy
diff --git a/databases/libmongo-client/Makefile b/databases/libmongo-client/Makefile
index 8d88a8aea2b4..45b4b76a5bf2 100644
--- a/databases/libmongo-client/Makefile
+++ b/databases/libmongo-client/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= databases
MAINTAINER= gd.workbox@gmail.com
COMMENT= Alternative C driver for MongoDB
-LICENSE= AL2
+LICENSE= APACHE20
USE_GITHUB= yes
GH_ACCOUNT= algernon
diff --git a/databases/liquibase/Makefile b/databases/liquibase/Makefile
index 87a655f9c875..f0981e515fe0 100644
--- a/databases/liquibase/Makefile
+++ b/databases/liquibase/Makefile
@@ -10,7 +10,7 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}-bin${EXTRACT_SUFX}
MAINTAINER= gslin@gslin.org
COMMENT= Database Change Management
-LICENSE= AL2
+LICENSE= APACHE20
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/databases/mongodb/Makefile b/databases/mongodb/Makefile
index ebea56f9b41e..5b450e5ca875 100644
--- a/databases/mongodb/Makefile
+++ b/databases/mongodb/Makefile
@@ -10,8 +10,8 @@ DISTNAME= ${PORTNAME}-src-r${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
COMMENT= NOSQL distributed document-oriented database
-# mongodb is AGPLv3, C++ driver is AL2
-LICENSE= AGPLv3 AL2
+# mongodb is AGPLv3, C++ driver is APACHE20
+LICENSE= AGPLv3 APACHE20
LICENSE_COMB= multi
LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
diff --git a/databases/p5-MongoDB/Makefile b/databases/p5-MongoDB/Makefile
index be8dbca939bb..4a4ba07d2aec 100644
--- a/databases/p5-MongoDB/Makefile
+++ b/databases/p5-MongoDB/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Mongo Driver for Perl
-LICENSE= AL2
+LICENSE= APACHE20
BUILD_DEPENDS= p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
p5-Class-Method-Modifiers>=0:${PORTSDIR}/devel/p5-Class-Method-Modifiers \
diff --git a/databases/pecl-mongo/Makefile b/databases/pecl-mongo/Makefile
index 4293072ee1c5..14ad91189501 100644
--- a/databases/pecl-mongo/Makefile
+++ b/databases/pecl-mongo/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR= PECL
MAINTAINER= miwi@FreeBSD.org
COMMENT= PECL classes for Mongo Database Driver
-LICENSE= AL2
+LICENSE= APACHE20
USE_PHP= spl
USE_PHP_BUILD= yes
diff --git a/databases/php5-pdo_cassandra/Makefile b/databases/php5-pdo_cassandra/Makefile
index 198e8c68e7c7..595ebd047def 100644
--- a/databases/php5-pdo_cassandra/Makefile
+++ b/databases/php5-pdo_cassandra/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${GITHUB_USER}-php-${PORTNAME}-${GITTAG}-14-g${GITREVISION}
MAINTAINER= gasol.wu@gmail.com
COMMENT= PDO driver for Apache Cassandra
-LICENSE= AL2
+LICENSE= APACHE20
LIB_DEPENDS= libboost_iostreams.so:${PORTSDIR}/devel/boost-libs
diff --git a/databases/py-carbon/Makefile b/databases/py-carbon/Makefile
index 5763c4d7d340..e9d7a45bff68 100644
--- a/databases/py-carbon/Makefile
+++ b/databases/py-carbon/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= bsdports@wayfair.com
COMMENT= Backend storage application for graphite
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}txamqp>=0.3:${PORTSDIR}/net/py-txamqp \
${PYTHON_PKGNAMEPREFIX}whisper>=0.9.10:${PORTSDIR}/databases/py-whisper
diff --git a/databases/py-cql/Makefile b/databases/py-cql/Makefile
index 85eb04e7756a..7019d71311eb 100644
--- a/databases/py-cql/Makefile
+++ b/databases/py-cql/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= hsn@sendmail.cz
COMMENT= Python DB-API 2.0 client interface for Cassandra
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/thrift/Thrift.py:${PORTSDIR}/devel/py-thrift
diff --git a/databases/py-riak/Makefile b/databases/py-riak/Makefile
index 357f0d33b44d..3b2a7fc5ae8e 100644
--- a/databases/py-riak/Makefile
+++ b/databases/py-riak/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= tj@harperdog.com
COMMENT= Python API for Riak, a Dynamo-inspired key/value store
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}protobuf>=2.4.0:${PORTSDIR}/devel/py-protobuf
diff --git a/databases/py-south/Makefile b/databases/py-south/Makefile
index 100a050ef347..bddf2a4a5858 100644
--- a/databases/py-south/Makefile
+++ b/databases/py-south/Makefile
@@ -11,7 +11,7 @@ DISTNAME= South-${PORTVERSION}
MAINTAINER= wg@FreeBSD.org
COMMENT= Intelligent schema migrations for Django apps
-LICENSE= AL2
+LICENSE= APACHE20
USE_PYTHON= yes
USE_PYDISTUTILS=yes
diff --git a/databases/py-swift/Makefile b/databases/py-swift/Makefile
index 80293c48732b..23dd633ed13a 100644
--- a/databases/py-swift/Makefile
+++ b/databases/py-swift/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= gslin@gslin.org
COMMENT= Highly available, distributed, eventually consistent object/blob store
-LICENSE= AL2
+LICENSE= APACHE20
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.5.21:${PORTSDIR}/devel/py-pbr
diff --git a/databases/py-swiftclient/Makefile b/databases/py-swiftclient/Makefile
index 67434748138a..05bbb84cb6e3 100644
--- a/databases/py-swiftclient/Makefile
+++ b/databases/py-swiftclient/Makefile
@@ -11,7 +11,7 @@ DISTNAME= python-${PORTNAME}-${PORTVERSION}
MAINTAINER= trociny@FreeBSD.org
COMMENT= Python client library for OpenStack Object Storage (Swift)
-LICENSE= AL2
+LICENSE= APACHE20
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.5.21:${PORTSDIR}/devel/py-pbr
diff --git a/databases/pymongo/Makefile b/databases/pymongo/Makefile
index c1c1a3512b09..522625ec4443 100644
--- a/databases/pymongo/Makefile
+++ b/databases/pymongo/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= CHEESESHOP
MAINTAINER= wg@FreeBSD.org
COMMENT= Python driver for MongoDB
-LICENSE= AL2
+LICENSE= APACHE20
USE_PYTHON= yes
USE_PYDISTUTILS= yes
diff --git a/deskutils/horde-mnemo/Makefile b/deskutils/horde-mnemo/Makefile
index 0b52d24d96d1..347feb18d2e6 100644
--- a/deskutils/horde-mnemo/Makefile
+++ b/deskutils/horde-mnemo/Makefile
@@ -8,7 +8,7 @@ PKGNAMEPREFIX= horde-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde web based notes manager
-LICENSE= AL2
+LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
LATEST_LINK= horde-${PORTNAME}
diff --git a/devel/R-cran-foreach/Makefile b/devel/R-cran-foreach/Makefile
index ff0dc335373e..17f8fc39b7dc 100644
--- a/devel/R-cran-foreach/Makefile
+++ b/devel/R-cran-foreach/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= tota@FreeBSD.org
COMMENT= Foreach looping construct for R
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= R-cran-iterators>=1.0.0:${PORTSDIR}/devel/R-cran-iterators
diff --git a/devel/R-cran-iterators/Makefile b/devel/R-cran-iterators/Makefile
index 6d1db9b1d357..0198e51279d7 100644
--- a/devel/R-cran-iterators/Makefile
+++ b/devel/R-cran-iterators/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= tota@FreeBSD.org
COMMENT= Iterator construct for R
-LICENSE= AL2
+LICENSE= APACHE20
USES= cran:auto-plist
diff --git a/devel/android-tools-adb/Makefile b/devel/android-tools-adb/Makefile
index 261fe0d8d0b2..f2db526a69af 100644
--- a/devel/android-tools-adb/Makefile
+++ b/devel/android-tools-adb/Makefile
@@ -9,7 +9,7 @@ DISTNAME= android-platform_system_core-${GH_COMMIT}
MAINTAINER= kevlo@FreeBSD.org
COMMENT= Android debug bridge command line tool
-LICENSE= AL2
+LICENSE= APACHE20
USE_GITHUB= yes
GH_ACCOUNT= android
diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index b49c5e3fe70b..06ad9ced2a8d 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY= ${ANT_DISTFILE}
MAINTAINER= java@FreeBSD.org
COMMENT= Java- and XML-based build tool, conceptually similar to make
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= classpath:${PORTSDIR}/java/javavmwrapper
diff --git a/devel/awscli/Makefile b/devel/awscli/Makefile
index 5999f6694ad6..957fc55cbda6 100644
--- a/devel/awscli/Makefile
+++ b/devel/awscli/Makefile
@@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR=source/a/awscli
MAINTAINER= alexey@renatasystems.org
COMMENT= Universal Command Line Interface for Amazon Web Services
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcdoc>=0.12.0:${PORTSDIR}/devel/py-bcdoc \
${PYTHON_PKGNAMEPREFIX}botocore>=0.28:${PORTSDIR}/devel/py-botocore \
diff --git a/devel/fb303/Makefile b/devel/fb303/Makefile
index 6895d94d2207..a24978bddc03 100644
--- a/devel/fb303/Makefile
+++ b/devel/fb303/Makefile
@@ -12,7 +12,7 @@ DISTNAME= thrift-${PORTVERSION}
MAINTAINER= komarov@valerka.net
COMMENT= Facebook Bassline
-LICENSE= AL2
+LICENSE= APACHE20
LIB_DEPENDS= libthrift.so:${PORTSDIR}/devel/thrift-cpp
BUILD_DEPENDS= thrift:${PORTSDIR}/devel/thrift
diff --git a/devel/git-review/Makefile b/devel/git-review/Makefile
index c941036db4f6..b38ea8e76f19 100644
--- a/devel/git-review/Makefile
+++ b/devel/git-review/Makefile
@@ -9,7 +9,7 @@ MASTER_SITE_SUBDIR= source/g/${PORTNAME}
MAINTAINER= dereckson@gmail.com
COMMENT= Allow to push review and interact with a Gerrit server
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}argparse>0:${PORTSDIR}/devel/py-argparse \
git:${PORTSDIR}/devel/git
diff --git a/devel/gjstest/Makefile b/devel/gjstest/Makefile
index 223d12cb7ae4..9e8e054a9f90 100644
--- a/devel/gjstest/Makefile
+++ b/devel/gjstest/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}.${SNAPSHOT}
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Lightweight JS unit testing using the V8 engine
-LICENSE= AL2
+LICENSE= APACHE20
BUILD_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
LIB_DEPENDS= libgflags.so:${PORTSDIR}/devel/gflags \
diff --git a/devel/hadoop/Makefile b/devel/hadoop/Makefile
index f34ba45cbbec..c75e23b11418 100644
--- a/devel/hadoop/Makefile
+++ b/devel/hadoop/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR= hadoop
MAINTAINER= pfg@apache.org
COMMENT= Apache Map/Reduce framework
-LICENSE= AL2
+LICENSE= APACHE20
BUILD_DEPENDS= gmake:${PORTSDIR}/devel/gmake \
gsed:${PORTSDIR}/textproc/gsed
diff --git a/devel/jakarta-commons-daemon/Makefile b/devel/jakarta-commons-daemon/Makefile
index 28fcb40a8a69..dfc8e5877dd5 100644
--- a/devel/jakarta-commons-daemon/Makefile
+++ b/devel/jakarta-commons-daemon/Makefile
@@ -14,7 +14,7 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}-native-src${EXTRACT_SUFX}:src \
MAINTAINER= ale@FreeBSD.org
COMMENT= Wrapper code to start/stop a Java application as a daemon
-LICENSE= AL2
+LICENSE= APACHE20
USE_JAVA= yes
JAVA_VERSION= 1.6+
diff --git a/devel/jakarta-commons-io/Makefile b/devel/jakarta-commons-io/Makefile
index eab627938e57..e02cf151b78d 100644
--- a/devel/jakarta-commons-io/Makefile
+++ b/devel/jakarta-commons-io/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= ports@FreeBSD.org
COMMENT= A collection of I/O utilities for Java
-LICENSE= AL2
+LICENSE= APACHE20
BUILD_DEPENDS= ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit
diff --git a/devel/log4cxx/Makefile b/devel/log4cxx/Makefile
index 7640d000066b..f6a1298a6bee 100644
--- a/devel/log4cxx/Makefile
+++ b/devel/log4cxx/Makefile
@@ -12,7 +12,7 @@ DISTNAME= apache-${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ port of the Log4j project
-LICENSE= AL2
+LICENSE= APACHE20
LIB_DEPENDS= apr-1:${PORTSDIR}/devel/apr1
diff --git a/devel/maven-ant-tasks/Makefile b/devel/maven-ant-tasks/Makefile
index 986408a155b2..32a3d3e6a868 100644
--- a/devel/maven-ant-tasks/Makefile
+++ b/devel/maven-ant-tasks/Makefile
@@ -11,7 +11,7 @@ EXTRACT_ONLY=
MAINTAINER= crees@FreeBSD.org
COMMENT= Allows Maven artifact handling to be used from within an Ant build
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= ant:${PORTSDIR}/devel/apache-ant
diff --git a/devel/maven3/Makefile b/devel/maven3/Makefile
index e8294a59db9d..55df2eba8d6b 100644
--- a/devel/maven3/Makefile
+++ b/devel/maven3/Makefile
@@ -11,7 +11,7 @@ DISTNAME= apache-maven-${DISTVERSION}-bin
MAINTAINER= hq@FreeBSD.org
COMMENT= Java project management tool, 3.x branch
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= mvn:${PORTSDIR}/devel/maven-wrapper
diff --git a/devel/meck/Makefile b/devel/meck/Makefile
index 08299d314304..0fbc1796048f 100644
--- a/devel/meck/Makefile
+++ b/devel/meck/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES= GH
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Erlang library for building mock modules
-LICENSE= AL2
+LICENSE= APACHE20
BUILD_DEPENDS= erlc:${PORTSDIR}/lang/erlang \
rebar:${PORTSDIR}/devel/rebar
diff --git a/devel/mongo-cxx-driver/Makefile b/devel/mongo-cxx-driver/Makefile
index 3fbc6dad3e3b..ff96bb4921f9 100644
--- a/devel/mongo-cxx-driver/Makefile
+++ b/devel/mongo-cxx-driver/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= GH
MAINTAINER= waitman@waitman.net
COMMENT= C++ 2.4 Driver for MongoDB
-LICENSE= AL2
+LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \
diff --git a/devel/ninja/Makefile b/devel/ninja/Makefile
index 18c641e07ce8..3de46e573441 100644
--- a/devel/ninja/Makefile
+++ b/devel/ninja/Makefile
@@ -9,7 +9,7 @@ CATEGORIES= devel
MAINTAINER= gblach@FreeBSD.org
COMMENT= Ninja is a small build system closest in spirit to Make
-LICENSE= AL2
+LICENSE= APACHE20
USE_GITHUB= yes
GH_ACCOUNT= martine
diff --git a/devel/opengrok/Makefile b/devel/opengrok/Makefile
index 82846cd4d2a5..7b1c064e1eec 100644
--- a/devel/opengrok/Makefile
+++ b/devel/opengrok/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://hub.opensolaris.org/bin/download/Project+opengrok/files/
MAINTAINER= tj@FreeBSD.org
COMMENT= Fast and powerful code search and cross-reference engine
-LICENSE= CDDL AL2
+LICENSE= CDDL APACHE20
LICENSE_COMB= multi
RUN_DEPENDS= exctags:${PORTSDIR}/devel/ctags
diff --git a/devel/p5-Capture-Tiny/Makefile b/devel/p5-Capture-Tiny/Makefile
index 2c86afaa09dd..d372837edccd 100644
--- a/devel/p5-Capture-Tiny/Makefile
+++ b/devel/p5-Capture-Tiny/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= bill.brinzer@gmail.com
COMMENT= Capture STDOUT and STDERR from Perl, XS, or external programs
-LICENSE= AL2
+LICENSE= APACHE20
TEST_DEPENDS= p5-Inline>=0:${PORTSDIR}/devel/p5-Inline
diff --git a/devel/p5-Class-Tiny/Makefile b/devel/p5-Class-Tiny/Makefile
index 6ee0a9c7e458..f728edcc4e29 100644
--- a/devel/p5-Class-Tiny/Makefile
+++ b/devel/p5-Class-Tiny/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Perl extension for minimalist class construction
-LICENSE= AL2
+LICENSE= APACHE20
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-IO-Prompt-Tiny/Makefile b/devel/p5-IO-Prompt-Tiny/Makefile
index b3b41a252d9e..0b3a7ea439be 100644
--- a/devel/p5-IO-Prompt-Tiny/Makefile
+++ b/devel/p5-IO-Prompt-Tiny/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Prompt for user input with a default option
-LICENSE= AL2
+LICENSE= APACHE20
BUILD_DEPENDS= p5-Capture-Tiny>=0.12:${PORTSDIR}/devel/p5-Capture-Tiny
RUN_DEPENDS:= ${BUILD_DEPENDS}
diff --git a/devel/p5-Path-Tiny/Makefile b/devel/p5-Path-Tiny/Makefile
index b094b032ecba..cfe979f6fd40 100644
--- a/devel/p5-Path-Tiny/Makefile
+++ b/devel/p5-Path-Tiny/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
COMMENT= File path utility
-LICENSE= AL2
+LICENSE= APACHE20
TEST_DEPENDS= p5-Test-FailWarnings>=0:${PORTSDIR}/devel/p5-Test-FailWarnings
diff --git a/devel/p5-Test-FailWarnings/Makefile b/devel/p5-Test-FailWarnings/Makefile
index 872c52d7f95d..755aa600a5f4 100644
--- a/devel/p5-Test-FailWarnings/Makefile
+++ b/devel/p5-Test-FailWarnings/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Add test failures if warnings are caught
-LICENSE= AL2
+LICENSE= APACHE20
BUILD_DEPENDS= p5-Capture-Tiny>=0.21:${PORTSDIR}/devel/p5-Capture-Tiny
RUN_DEPENDS:= ${BUILD_DEPENDS}
diff --git a/devel/p5-Test-Number-Delta/Makefile b/devel/p5-Test-Number-Delta/Makefile
index 76fb3370b17d..2b16333bc5a3 100644
--- a/devel/p5-Test-Number-Delta/Makefile
+++ b/devel/p5-Test-Number-Delta/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= tjs@cdpa.nsysu.edu.tw
COMMENT= Compare the difference between two numbers within a specified amount
-LICENSE= AL2
+LICENSE= APACHE20
USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Types-Path-Tiny/Makefile b/devel/p5-Types-Path-Tiny/Makefile
index 62f39032269d..084f39fb33f9 100644
--- a/devel/p5-Types-Path-Tiny/Makefile
+++ b/devel/p5-Types-Path-Tiny/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Path::Tiny types and coercions for Moose and Moo
-LICENSE= AL2
+LICENSE= APACHE20
BUILD_DEPENDS= p5-Path-Tiny>=0:${PORTSDIR}/devel/p5-Path-Tiny \
p5-Type-Tiny>=0.008:${PORTSDIR}/devel/p5-Type-Tiny
diff --git a/devel/pecl-xhprof/Makefile b/devel/pecl-xhprof/Makefile
index 24c6149a2b12..0856823a3e12 100644
--- a/devel/pecl-xhprof/Makefile
+++ b/devel/pecl-xhprof/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@mcdermottroe.com
COMMENT= Hierarchical Profiler for PHP
-LICENSE= AL2
+LICENSE= APACHE20
WRKSRC= ${WRKDIR}/${DISTNAME}/extension
diff --git a/devel/py-binplist/Makefile b/devel/py-binplist/Makefile
index 4c7c82acab28..06d8ac981a4b 100644
--- a/devel/py-binplist/Makefile
+++ b/devel/py-binplist/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= antoine@FreeBSD.org
COMMENT= Binary plist parser
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz
diff --git a/devel/py-gdata/Makefile b/devel/py-gdata/Makefile
index 4e27db098198..dbbc23d194da 100644
--- a/devel/py-gdata/Makefile
+++ b/devel/py-gdata/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= olivierd@FreeBSD.org
COMMENT= GData Python Client Library
-LICENSE= AL2
+LICENSE= APACHE20
PROJECTHOST= gdata-python-client
USE_PYTHON= -2.7
diff --git a/devel/py-jsonrpclib/Makefile b/devel/py-jsonrpclib/Makefile
index 3b96882edf4a..baded8b3a1bb 100644
--- a/devel/py-jsonrpclib/Makefile
+++ b/devel/py-jsonrpclib/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= bra@fsn.hu
COMMENT= Implements the JSON-RPC 2.0 proposed specification in pure Python
-LICENSE= AL2
+LICENSE= APACHE20
USE_PYTHON= -2.7
USE_PYDISTUTILS=yes
diff --git a/devel/py-kazoo/Makefile b/devel/py-kazoo/Makefile
index 223ed21de637..985fd020663d 100644
--- a/devel/py-kazoo/Makefile
+++ b/devel/py-kazoo/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= skreuzer@FreeBSD.org
COMMENT= Higher Level API to Zookeeper for Python
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:${PORTSDIR}/devel/py-zope.interface \
${PYTHON_PKGNAMEPREFIX}gevent>=0.13.8:${PORTSDIR}/devel/py-gevent
diff --git a/devel/py-msgpack/Makefile b/devel/py-msgpack/Makefile
index 881570b7e171..8203dfa25b1f 100644
--- a/devel/py-msgpack/Makefile
+++ b/devel/py-msgpack/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-python-${PORTVERSION}
MAINTAINER= zont@FreeBSD.org
COMMENT= MessagePack (de)serializer for Python
-LICENSE= AL2
+LICENSE= APACHE20
USE_PYTHON= yes
USE_PYDISTUTILS= easy_install
diff --git a/devel/py-pbr/Makefile b/devel/py-pbr/Makefile
index 1a78b17fb502..05810754a92f 100644
--- a/devel/py-pbr/Makefile
+++ b/devel/py-pbr/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= koobs@FreeBSD.org
COMMENT= Python Build Reasonableness
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>=1.0:${PORTSDIR}/devel/py-pip
diff --git a/devel/py-robotframework-ride/Makefile b/devel/py-robotframework-ride/Makefile
index 38d8914cdf32..b1d13a9e0e47 100644
--- a/devel/py-robotframework-ride/Makefile
+++ b/devel/py-robotframework-ride/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= Vladimir.Chukharev@gmail.com
COMMENT= Test data editor for Robot Framework
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:${PORTSDIR}/devel/py-robotframework \
${PYTHON_PKGNAMEPREFIX}robotframework-selenium2library>=1.1.0:${PORTSDIR}/devel/py-robotframework-selenium2library
diff --git a/devel/py-robotframework-selenium2library/Makefile b/devel/py-robotframework-selenium2library/Makefile
index 5b29173409d0..d3be970e83de 100644
--- a/devel/py-robotframework-selenium2library/Makefile
+++ b/devel/py-robotframework-selenium2library/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= Vladimir.Chukharev@gmail.com
COMMENT= Web testing library for Robot Framework
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:${PORTSDIR}/devel/py-robotframework \
${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:${PORTSDIR}/devel/py-decorator
diff --git a/devel/py-robotframework/Makefile b/devel/py-robotframework/Makefile
index 1895a3f720f7..0ce711dceb90 100644
--- a/devel/py-robotframework/Makefile
+++ b/devel/py-robotframework/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= Vladimir.Chukharev@gmail.com
COMMENT= Generic test automation framework
-LICENSE= AL2
+LICENSE= APACHE20
USE_PYTHON= -2.7
USE_PYDISTUTILS=yes
diff --git a/devel/py-stevedore/Makefile b/devel/py-stevedore/Makefile
index 7c1c87861827..0c694ffd8f64 100644
--- a/devel/py-stevedore/Makefile
+++ b/devel/py-stevedore/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Manage dynamic plugins for Python applications
-LICENSE= AL2
+LICENSE= APACHE20
BUILD_DEPENDS= ${PKGNAMEPREFIX}argparse>=1.1:${PORTSDIR}/devel/py-argparse
TEST_DEPENDS= ${PKGNAMEPREFIX}coverage>=3.5.3:${PORTSDIR}/devel/py-coverage \
diff --git a/devel/py-watchdog/Makefile b/devel/py-watchdog/Makefile
index 1289ad882d13..fd3ed06d0cc6 100644
--- a/devel/py-watchdog/Makefile
+++ b/devel/py-watchdog/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Python API library to monitor file system events
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= ${PKGNAMEPREFIX}argh>=0.15.1:${PORTSDIR}/devel/py-argh \
${PKGNAMEPREFIX}yaml>=3.10:${PORTSDIR}/devel/py-yaml \
diff --git a/devel/py-wsgi_xmlrpc/Makefile b/devel/py-wsgi_xmlrpc/Makefile
index 5ce498e8b4fd..70fc9a0ac22b 100644
--- a/devel/py-wsgi_xmlrpc/Makefile
+++ b/devel/py-wsgi_xmlrpc/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME:S/_/-/}-${PORTVERSION}
MAINTAINER= geka@sippysoft.com
COMMENT= WSGI application for a simple XMLRPC method dispatching
-LICENSE= AL2
+LICENSE= APACHE20
USE_PYTHON= 2.5+
USE_PYDISTUTILS= easy_install
diff --git a/devel/pysvn/Makefile b/devel/pysvn/Makefile
index e0d7c5eb6440..3711e9d82a87 100644
--- a/devel/pysvn/Makefile
+++ b/devel/pysvn/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://pysvn.barrys-emacs.org/source_kits/
MAINTAINER= bra@fsn.hu
COMMENT= Python binding for Subversion
-LICENSE= AL2
+LICENSE= APACHE20
LIB_DEPENDS= svn_client-1:${PORTSDIR}/devel/subversion \
neon:${PORTSDIR}/www/neon29
diff --git a/devel/rebar/Makefile b/devel/rebar/Makefile
index 4f614a4f80b5..7f56f0b76c55 100644
--- a/devel/rebar/Makefile
+++ b/devel/rebar/Makefile
@@ -10,7 +10,7 @@ DISTNAME= basho-${PORTNAME}-${GITVERSION}
MAINTAINER= koobs@FreeBSD.org
COMMENT= A build-tool for Erlang that follows OTP principles
-LICENSE= AL2
+LICENSE= APACHE20
BUILD_DEPENDS= ${LOCALBASE}/bin/escript:${PORTSDIR}/lang/erlang
RUN_DEPENDS:= ${BUILD_DEPENDS}
diff --git a/devel/rubygem-atomic/Makefile b/devel/rubygem-atomic/Makefile
index d77fdf461d44..cdaabd1ff2f3 100644
--- a/devel/rubygem-atomic/Makefile
+++ b/devel/rubygem-atomic/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= RG
MAINTAINER= ruby@FreeBSD.org
COMMENT= Atomic reference implementation
-LICENSE= AL2
+LICENSE= APACHE20
USE_RUBY= yes
USE_RUBYGEMS= yes
diff --git a/devel/rubygem-thread_safe/Makefile b/devel/rubygem-thread_safe/Makefile
index 846d0fbce092..90efab83de84 100644
--- a/devel/rubygem-thread_safe/Makefile
+++ b/devel/rubygem-thread_safe/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= RG
MAINTAINER= ruby@FreeBSD.org
COMMENT= Thread-safe collections and utilities for Ruby
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= rubygem-atomic>=0:${PORTSDIR}/devel/rubygem-atomic
diff --git a/devel/sbt/Makefile b/devel/sbt/Makefile
index 92f529f67606..6ea73ce92c94 100644
--- a/devel/sbt/Makefile
+++ b/devel/sbt/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR= ${PORTNAME}/${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
COMMENT= A build tool for Scala projects
-LICENSE= AL2
+LICENSE= APACHE20
OPTIONS_DEFINE= ADVANCED
ADVANCED_DESC= Install advanced bash shell-script
diff --git a/devel/scalatest/Makefile b/devel/scalatest/Makefile
index fb96e8b713a3..05c329d671d8 100644
--- a/devel/scalatest/Makefile
+++ b/devel/scalatest/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.artima.com/downloadScalaTest/ \
MAINTAINER= mitsururike@gmail.com
COMMENT= A regression testing utility for use with the Scala Language
-LICENSE= AL2
+LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= scala>=2.9.0:${PORTSDIR}/lang/scala
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 802a012789ec..55630d97ceb9 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -14,7 +14,7 @@ USE_AUTOTOOLS= libtool
USE_KDE4= # Used below if KWallet support is enabled
USES+= pkgconfig
-LICENSE= AL2
+LICENSE= APACHE20
CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^8].[0-9]*
diff --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common
index 0bc17883efaa..63c997b17745 100644
--- a/devel/subversion16/Makefile.common
+++ b/devel/subversion16/Makefile.common
@@ -15,7 +15,7 @@ USE_AUTOTOOLS= libtool
USE_KDE4= # Used below if KWallet support is enabled
USES+= pkgconfig
-LICENSE= AL2
+LICENSE= APACHE20
CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^6].[0-9]*
diff --git a/devel/subversion17/Makefile.common b/devel/subversion17/Makefile.common
index fdfbca7ea27f..04a62d3bbd4e 100644
--- a/devel/subversion17/Makefile.common
+++ b/devel/subversion17/Makefile.common
@@ -18,7 +18,7 @@ USE_AUTOTOOLS= libtool
USE_KDE4= # Used below if KWallet support is enabled
USES+= pkgconfig
-LICENSE= AL2
+LICENSE= APACHE20
CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^7].[0-9]*
LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}17${PKGNAMESUFFIX}
diff --git a/devel/thrift/Makefile b/devel/thrift/Makefile
index 2dd257bd84e7..5d692e303614 100644
--- a/devel/thrift/Makefile
+++ b/devel/thrift/Makefile
@@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR= /thrift/${PORTVERSION}
MAINTAINER= komarov@valerka.net
COMMENT= Framework for scalable cross-language services development
-LICENSE= AL2
+LICENSE= APACHE20
USE_AUTOTOOLS= autoconf autoheader:env aclocal automake libtool
ACLOCAL_ARGS= -I${WRKSRC}/aclocal
diff --git a/devel/zookeeper/Makefile b/devel/zookeeper/Makefile
index 26142be22c8d..a2a9ad60d786 100644
--- a/devel/zookeeper/Makefile
+++ b/devel/zookeeper/Makefile
@@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR= zookeeper/zookeeper-${PORTVERSION}
MAINTAINER= gnn@FreeBSD.org
COMMENT= A Coordination Service for Distributed Applications
-LICENSE= AL2
+LICENSE= APACHE20
LIB_DEPENDS= cppunit:${PORTSDIR}/devel/cppunit
RUN_DEPENDS:= ${BUILD_DEPENDS}
diff --git a/dns/py-namebench/Makefile b/dns/py-namebench/Makefile
index b8737f081875..bc440600d48b 100644
--- a/dns/py-namebench/Makefile
+++ b/dns/py-namebench/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= jgh@FreeBSD.org
COMMENT= An open-source DNS benchmark utility
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS+= \
${PYTHON_PKGNAMEPREFIX}Jinja2>=2.5.5:${PORTSDIR}/devel/py-Jinja2 \
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 98a98c2c372a..5ce6be791a30 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -15,7 +15,7 @@ EXTRACT_ONLY= ${OOOSRC} ${EXTSRC}
MAINTAINER= office@FreeBSD.org
COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
-LICENSE= AL2
+LICENSE= APACHE20
PKGNAMESUFFIX= 3
@@ -288,7 +288,7 @@ post-install:
@${ECHO_CMD} "" > ${TMPPLIST}
@${ECHO_CMD} "share/licenses/${PKGNAME}/catalog.mk" >> ${TMPPLIST}
@${ECHO_CMD} "share/licenses/${PKGNAME}/LICENSE" >> ${TMPPLIST}
- @${ECHO_CMD} "share/licenses/${PKGNAME}/AL2" >> ${TMPPLIST}
+ @${ECHO_CMD} "share/licenses/${PKGNAME}/APACHE20" >> ${TMPPLIST}
@${ECHO_CMD} "@dirrm share/licenses/${PKGNAME}" >> ${TMPPLIST}
@${ECHO_CMD} "@dirrm share/licenses" >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST}
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile
index add5eff6d194..90787d04bc56 100644
--- a/editors/openoffice-4/Makefile
+++ b/editors/openoffice-4/Makefile
@@ -16,7 +16,7 @@ EXTRACT_ONLY= ${OOOSRC} ${EXTSRC}
MAINTAINER= office@FreeBSD.org
COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
-LICENSE= AL2
+LICENSE= APACHE20
NO_LATEST_LINK= yes
@@ -303,7 +303,7 @@ post-install:
@${ECHO_CMD} "" > ${TMPPLIST}
@${ECHO_CMD} "share/licenses/${PKGNAME}/catalog.mk" >> ${TMPPLIST}
@${ECHO_CMD} "share/licenses/${PKGNAME}/LICENSE" >> ${TMPPLIST}
- @${ECHO_CMD} "share/licenses/${PKGNAME}/AL2" >> ${TMPPLIST}
+ @${ECHO_CMD} "share/licenses/${PKGNAME}/APACHE20" >> ${TMPPLIST}
@${ECHO_CMD} "@dirrm share/licenses/${PKGNAME}" >> ${TMPPLIST}
@${ECHO_CMD} "@dirrm share/licenses" >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST}
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 92f38be0c5ba..261f3bdf7147 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -16,7 +16,7 @@ EXTRACT_ONLY= ${OOOSRC} ${EXTSRC}
MAINTAINER= office@FreeBSD.org
COMMENT= Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser(developer version)
-LICENSE= AL2
+LICENSE= APACHE20
PKGNAMESUFFIX= -devel
@@ -303,7 +303,7 @@ post-install:
@${ECHO_CMD} "" > ${TMPPLIST}
@${ECHO_CMD} "share/licenses/${PKGNAME}/catalog.mk" >> ${TMPPLIST}
@${ECHO_CMD} "share/licenses/${PKGNAME}/LICENSE" >> ${TMPPLIST}
- @${ECHO_CMD} "share/licenses/${PKGNAME}/AL2" >> ${TMPPLIST}
+ @${ECHO_CMD} "share/licenses/${PKGNAME}/APACHE20" >> ${TMPPLIST}
@${ECHO_CMD} "@dirrm share/licenses/${PKGNAME}" >> ${TMPPLIST}
@${ECHO_CMD} "@dirrm share/licenses" >> ${TMPPLIST}
@cd ${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST}
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index d4c599db5c00..15914a59c600 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -30,7 +30,7 @@ MASTER_SITES= http://www.imagemagick.org/download/ \
MAINTAINER= c.petrik.sosa@gmail.com
COMMENT= Image processing tools
-LICENSE= AL2
+LICENSE= APACHE20
USES= pkgconfig:both pathfix perl5
USE_XZ= yes
diff --git a/graphics/R-cran-RColorBrewer/Makefile b/graphics/R-cran-RColorBrewer/Makefile
index 0b4cca1ec8be..2885110e330c 100644
--- a/graphics/R-cran-RColorBrewer/Makefile
+++ b/graphics/R-cran-RColorBrewer/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}_${DISTVERSION}
MAINTAINER= tota@FreeBSD.org
COMMENT= ColorBrewer palettes
-LICENSE= AL2
+LICENSE= APACHE20
USES= cran:auto-plist
diff --git a/graphics/batik/Makefile b/graphics/batik/Makefile
index 65add2483345..338125e2914c 100644
--- a/graphics/batik/Makefile
+++ b/graphics/batik/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= nemysis@FreeBSD.org
COMMENT= Java based SVG toolkit
-LICENSE= AL2
+LICENSE= APACHE20
USE_ZIP= yes
USE_JAVA= 1.5+
diff --git a/graphics/py-actdiag/Makefile b/graphics/py-actdiag/Makefile
index da352238ca38..b98f28ea1487 100644
--- a/graphics/py-actdiag/Makefile
+++ b/graphics/py-actdiag/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= tota@FreeBSD.org
COMMENT= Simple activity-diagram image generator
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= ${PKGNAMEPREFIX}imaging>=1.1.5:${PORTSDIR}/graphics/py-imaging \
${PKGNAMEPREFIX}blockdiag>=1.2.4:${PORTSDIR}/graphics/py-blockdiag \
diff --git a/graphics/py-blockdiag/Makefile b/graphics/py-blockdiag/Makefile
index badddf8a303e..2be907728177 100644
--- a/graphics/py-blockdiag/Makefile
+++ b/graphics/py-blockdiag/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= tota@FreeBSD.org
COMMENT= A simple block-diagram image generator
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= ${PKGNAMEPREFIX}imaging>=1.1.5:${PORTSDIR}/graphics/py-imaging \
${PKGNAMEPREFIX}funcparserlib>=0.3.4:${PORTSDIR}/devel/py-funcparserlib \
diff --git a/graphics/py-nwdiag/Makefile b/graphics/py-nwdiag/Makefile
index 9df9207b5a69..fd9f626bd784 100644
--- a/graphics/py-nwdiag/Makefile
+++ b/graphics/py-nwdiag/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= tota@FreeBSD.org
COMMENT= A simple network-diagram image generator
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= ${PKGNAMEPREFIX}imaging>=1.1.5:${PORTSDIR}/graphics/py-imaging \
${PKGNAMEPREFIX}funcparserlib>=0.3.4:${PORTSDIR}/devel/py-funcparserlib \
diff --git a/graphics/py-seqdiag/Makefile b/graphics/py-seqdiag/Makefile
index fac92ee055af..3973cf4c8492 100644
--- a/graphics/py-seqdiag/Makefile
+++ b/graphics/py-seqdiag/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= tota@FreeBSD.org
COMMENT= Simple sequence-diagram image generator
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= ${PKGNAMEPREFIX}imaging>=1.1.5:${PORTSDIR}/graphics/py-imaging \
${PKGNAMEPREFIX}funcparserlib>=0.3.4:${PORTSDIR}/devel/py-funcparserlib \
diff --git a/graphics/tesseract-data/Makefile b/graphics/tesseract-data/Makefile
index bf8a14569b2e..e903c5d19c65 100644
--- a/graphics/tesseract-data/Makefile
+++ b/graphics/tesseract-data/Makefile
@@ -14,7 +14,7 @@ EXTRACT_ONLY= #empty
MAINTAINER= bf@FreeBSD.org
COMMENT= Trained language data for the Tesseract OCR engine
-LICENSE= AL2
+LICENSE= APACHE20
DIST_SUBDIR= tesseract
PROJECTHOST= tesseract-ocr
diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile
index 7a021716d246..355150c69f0f 100644
--- a/graphics/tesseract/Makefile
+++ b/graphics/tesseract/Makefile
@@ -11,7 +11,7 @@ DISTFILES= tesseract-ocr-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= bf@FreeBSD.org
COMMENT= Commercial quality open source OCR engine
-LICENSE= AL2
+LICENSE= APACHE20
LIB_DEPENDS= lept:${PORTSDIR}/graphics/leptonica
diff --git a/graphics/xmlgraphics-commons/Makefile b/graphics/xmlgraphics-commons/Makefile
index f31b719a58b7..307fb44b05dd 100644
--- a/graphics/xmlgraphics-commons/Makefile
+++ b/graphics/xmlgraphics-commons/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= APACHE/xmlgraphics/commons/source
MAINTAINER= ports@FreeBSD.org
COMMENT= Several reusable components used by Apache Batik and FOP
-LICENSE= AL2
+LICENSE= APACHE20
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/japanese/p5-Mail-SpamAssassin/Makefile b/japanese/p5-Mail-SpamAssassin/Makefile
index 9b932ba9aa89..37753935409b 100644
--- a/japanese/p5-Mail-SpamAssassin/Makefile
+++ b/japanese/p5-Mail-SpamAssassin/Makefile
@@ -8,7 +8,7 @@ PKGNAMEPREFIX= ja-p5-
MAINTAINER= masaki@club.kyutech.ac.jp
COMMENT= SpamAssassin with patches to handle multibyte character
-LICENSE= AL2
+LICENSE= APACHE20
MASTERDIR= ${.CURDIR}/../../mail/p5-Mail-SpamAssassin
diff --git a/java/castor/Makefile b/java/castor/Makefile
index 14e300ef3dfd..ab04089decd7 100644
--- a/java/castor/Makefile
+++ b/java/castor/Makefile
@@ -10,7 +10,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= crees@FreeBSD.org
COMMENT= Data binding for XML (JAXB) and SQL database (JDO)
-LICENSE= AL2
+LICENSE= APACHE20
USE_JAVA= yes
JAVA_VERSION= 1.6+
diff --git a/java/jakarta-commons-cli/Makefile b/java/jakarta-commons-cli/Makefile
index a2048562f89a..c4c80cc5e72c 100644
--- a/java/jakarta-commons-cli/Makefile
+++ b/java/jakarta-commons-cli/Makefile
@@ -13,7 +13,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-bin
MAINTAINER= hq@FreeBSD.org
COMMENT= Java library for command line arguments and options
-LICENSE= AL2
+LICENSE= APACHE20
USE_JAVA= yes
JAVA_VERSION= 1.6+
diff --git a/java/jakarta-commons-codec/Makefile b/java/jakarta-commons-codec/Makefile
index 4d0f39624f09..2e8c3ed53b5a 100644
--- a/java/jakarta-commons-codec/Makefile
+++ b/java/jakarta-commons-codec/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= ale@FreeBSD.org
COMMENT= An implementations of common encoders and decoders
-LICENSE= AL2
+LICENSE= APACHE20
OPTIONS_DEFINE= DOCS
diff --git a/java/jakarta-commons-httpclient/Makefile b/java/jakarta-commons-httpclient/Makefile
index ddd436b7818a..5379b4de6b0d 100644
--- a/java/jakarta-commons-httpclient/Makefile
+++ b/java/jakarta-commons-httpclient/Makefile
@@ -13,7 +13,7 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}-src
MAINTAINER= ale@FreeBSD.org
COMMENT= A package implementing the client side of the HTTP standard
-LICENSE= AL2
+LICENSE= APACHE20
BUILD_DEPENDS= ${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging
BUILD_DEPENDS+= ${JAVAJARDIR}/commons-codec.jar:${PORTSDIR}/java/jakarta-commons-codec
diff --git a/java/jakarta-commons-lang/Makefile b/java/jakarta-commons-lang/Makefile
index a5cc9887063b..25eb210e40dd 100644
--- a/java/jakarta-commons-lang/Makefile
+++ b/java/jakarta-commons-lang/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= hq@FreeBSD.org
COMMENT= Jakarta library with helper utilities for the java.lang API
-LICENSE= AL2
+LICENSE= APACHE20
USE_JAVA= yes
JAVA_VERSION= 1.6+
diff --git a/java/netty/Makefile b/java/netty/Makefile
index 52238227dcd7..091887f44c8a 100644
--- a/java/netty/Makefile
+++ b/java/netty/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= https://github.com/downloads/netty/netty/
MAINTAINER= m.tsatsenko@gmail.com
COMMENT= Java NIO client server framework
-LICENSE= AL2
+LICENSE= APACHE20
FETCH_ARGS= -Fpr
diff --git a/lang/fsharp/Makefile b/lang/fsharp/Makefile
index 7f10e3bf2d3d..cce921739456 100644
--- a/lang/fsharp/Makefile
+++ b/lang/fsharp/Makefile
@@ -11,7 +11,7 @@ DISTFILES= ${PORTVERSION}
MAINTAINER= mono@FreeBSD.org
COMMENT= Functional and object-oriented language for the .NET platform
-LICENSE= AL2
+LICENSE= APACHE20
BUILD_DEPENDS= mono>=3.0:${PORTSDIR}/lang/mono
RUN_DEPENDS= mono>=3.0:${PORTSDIR}/lang/mono
diff --git a/lang/gambit-c/Makefile b/lang/gambit-c/Makefile
index 162cc91c8eaf..567713c397a5 100644
--- a/lang/gambit-c/Makefile
+++ b/lang/gambit-c/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= pmn@bakarika.net
COMMENT= Gambit programming system where the compiler generates portable C code
-LICENSE= AL2
+LICENSE= APACHE20
MAN1= gsi.1
diff --git a/lang/groovy/Makefile b/lang/groovy/Makefile
index bdc7a5669e14..fc5c6c86d375 100644
--- a/lang/groovy/Makefile
+++ b/lang/groovy/Makefile
@@ -11,7 +11,7 @@ DISTFILES= groovy-binary-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= mjs@Bur.st
COMMENT= Agile dynamic language for the JVM
-LICENSE= AL2
+LICENSE= APACHE20
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:U}
diff --git a/lang/ironpython/Makefile b/lang/ironpython/Makefile
index ac9f21cc21f9..a030361fabaa 100644
--- a/lang/ironpython/Makefile
+++ b/lang/ironpython/Makefile
@@ -8,7 +8,7 @@ DISTNAME= ipy-${PORTVERSION}
MAINTAINER= mva@FreeBSD.org
COMMENT= Python implementation based on .NET
-LICENSE= AL2
+LICENSE= APACHE20
BUILD_DEPENDS= mono:${PORTSDIR}/lang/mono
RUN_DEPENDS= mono:${PORTSDIR}/lang/mono
diff --git a/lang/pharo/Makefile b/lang/pharo/Makefile
index 9c9f65a2c836..94f93904800b 100644
--- a/lang/pharo/Makefile
+++ b/lang/pharo/Makefile
@@ -11,7 +11,7 @@ EXTRACT_ONLY= Pharo-${DISTVERSION}-${SVNVERSION}.zip
MAINTAINER= mutoh@openedu.org
COMMENT= Pharo is Smalltalk-inspired environment
-LICENSE= AL2 MIT
+LICENSE= APACHE20 MIT
LICENSE_COMB= multi
RUN_DEPENDS= squeak:${PORTSDIR}/lang/squeak
diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index 1d11db6b84c0..a4b7a1844790 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -18,7 +18,7 @@ EXTRACT_ONLY= Squeak-${VM_VERSION}-src${EXTRACT_SUFX}
MAINTAINER= mutoh@openedu.org
COMMENT= Full Smalltalk 80 with portability to UNIX, Mac, and Windows
-LICENSE= AL2 MIT
+LICENSE= APACHE20 MIT
LICENSE_COMB= multi
# Don't set USE_ZIP as this breaks EXTRACT_CMD.
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
diff --git a/math/metis/Makefile b/math/metis/Makefile
index 96859c033229..2c5fe703053c 100644
--- a/math/metis/Makefile
+++ b/math/metis/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/
MAINTAINER= bf@FreeBSD.org
COMMENT= A package for unstructured graph partitioning
-LICENSE= AL2
+LICENSE= APACHE20
CONFLICTS= metis4-4* metis-edf-[0-9]*
diff --git a/math/openfst/Makefile b/math/openfst/Makefile
index cfe0aa117537..8f342ab91226 100644
--- a/math/openfst/Makefile
+++ b/math/openfst/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://www.openfst.org/twiki/pub/FST/FstDownload/
MAINTAINER= demon@FreeBSD.org
COMMENT= Library for working with weighted finite-state transducers (FSTs)
-LICENSE= AL2
+LICENSE= APACHE20
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/math/openfst/pkg-plist b/math/openfst/pkg-plist
index 38079ba0553d..cbf46baa6958 100644
--- a/math/openfst/pkg-plist
+++ b/math/openfst/pkg-plist
@@ -305,9 +305,6 @@ lib/libfst.so.1
lib/libfstscript.la
lib/libfstscript.so
lib/libfstscript.so.1
-share/licenses/openfst-1.3.4/AL2
-share/licenses/openfst-1.3.4/LICENSE
-share/licenses/openfst-1.3.4/catalog.mk
@dirrm include/fst/script
@dirrm include/fst/extensions/pdt
@dirrm include/fst/extensions/far
diff --git a/multimedia/livestreamer/Makefile b/multimedia/livestreamer/Makefile
index 430225030c80..57e65cafa077 100644
--- a/multimedia/livestreamer/Makefile
+++ b/multimedia/livestreamer/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Extract web streams and pipe them into video player of choice
-LICENSE= BSD MIT AL2
+LICENSE= BSD MIT APACHE20
LICENSE_COMB= multi
RUN_DEPENDS= rtmpdump:${PORTSDIR}/multimedia/rtmpdump \
diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile
index 1d5da873381e..668fff5a8ed5 100644
--- a/net-im/openfire/Makefile
+++ b/net-im/openfire/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}_src_${PORTVERSION:S/./_/g}
MAINTAINER= gahr@FreeBSD.org
COMMENT= Enterprise instant messaging server
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= classpath:${PORTSDIR}/java/javavmwrapper \
${JAVAJARDIR}/slf4j-api.jar:${PORTSDIR}/devel/slf4j
diff --git a/net-mgmt/aircrack-ng/Makefile b/net-mgmt/aircrack-ng/Makefile
index 5dbcbcd35504..f0bb4055b29e 100644
--- a/net-mgmt/aircrack-ng/Makefile
+++ b/net-mgmt/aircrack-ng/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}-${DISTVERSION:C/b/-beta/}
MAINTAINER= lme@FreeBSD.org
COMMENT= An 802.11 WEP and WPA-PSK keys cracking program
-LICENSE= GPLv2 BSD3CLAUSE AL2
+LICENSE= GPLv2 BSD3CLAUSE APACHE20
LICENSE_COMB= dual
USES= gmake dos2unix
diff --git a/net-p2p/i2p/Makefile b/net-p2p/i2p/Makefile
index 41ddf5c0b456..f13a5b087b38 100644
--- a/net-p2p/i2p/Makefile
+++ b/net-p2p/i2p/Makefile
@@ -15,7 +15,7 @@ EXTRACT_ONLY= i2psource_${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= lioux@FreeBSD.org
COMMENT= An anonymizing network
-LICENSE= AL2 EULA
+LICENSE= APACHE20 EULA
LICENSE_COMB= multi
BUILD_DEPENDS= ${LOCALBASE}/lib/libgmp.a:${PORTSDIR}/math/gmp \
diff --git a/net/activemq/Makefile b/net/activemq/Makefile
index 3bfd56710970..4db34c217680 100644
--- a/net/activemq/Makefile
+++ b/net/activemq/Makefile
@@ -12,7 +12,7 @@ DISTNAME= apache-${PORTNAME}-${PORTVERSION}-bin
MAINTAINER= tj@FreeBSD.org
COMMENT= Messaging and Integration Patterns provider
-LICENSE= AL2
+LICENSE= APACHE20
NO_BUILD= yes
USE_JAVA= yes
diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile
index 0e9ac4ad5c0c..3558f96757bf 100644
--- a/net/freerdp/Makefile
+++ b/net/freerdp/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= net comms ipv6
MAINTAINER= fluffy@FreeBSD.org
COMMENT= A free implementation of Remote Desktop Protocol
-LICENSE= AL2
+LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_OPENSSL= yes
diff --git a/net/googlecl/Makefile b/net/googlecl/Makefile
index 3442b8b1ab84..79b410daf8ee 100644
--- a/net/googlecl/Makefile
+++ b/net/googlecl/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
MAINTAINER= sbz@FreeBSD.org
COMMENT= Command line tools for the Google Data APIs
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gdata/__init__.py:${PORTSDIR}/devel/py-gdata
diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile
index 65cac3e260a3..3f7ea84c0aca 100644
--- a/net/mDNSResponder/Makefile
+++ b/net/mDNSResponder/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://opensource.apple.com/tarballs/${PORTNAME}/
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Bonjour (zero-configuration networking) by Apple
-LICENSE= AL2 BSD3CLAUSE
+LICENSE= APACHE20 BSD3CLAUSE
LICENSE_COMB= dual
CONFLICTS= avahi-libdns-[0-9]*
diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile
index ef44baabe3a6..5bcb830cc46a 100644
--- a/net/openvswitch/Makefile
+++ b/net/openvswitch/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://openvswitch.org/releases/
MAINTAINER= emaste@FreeBSD.org
COMMENT= A production quality, multilayer virtual switch
-LICENSE= AL2
+LICENSE= APACHE20
GNU_CONFIGURE= yes
CONFIGURE_ARGS= SSL_LIBS=-lssl SSL_CFLAGS=-I/usr/include/openssl
diff --git a/net/owamp/Makefile b/net/owamp/Makefile
index 82a65c809cab..be4ef423240d 100644
--- a/net/owamp/Makefile
+++ b/net/owamp/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES= http://software.internet2.edu/sources/owamp/
MAINTAINER= fbsd-ports@opsec.eu
COMMENT= Implementation of the One-Way Active Measurement Protocol
-LICENSE= AL2
+LICENSE= APACHE20
GNU_CONFIGURE= yes
diff --git a/net/py-beanstalkc/Makefile b/net/py-beanstalkc/Makefile
index 8268a46115d7..f8dd630ee89e 100644
--- a/net/py-beanstalkc/Makefile
+++ b/net/py-beanstalkc/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= koobs@FreeBSD.org
COMMENT= A simple beanstalkd client library for Python
-LICENSE= AL2
+LICENSE= APACHE20
USE_PYTHON= yes
USE_PYDISTUTILS= easy_install
diff --git a/net/py-gspreadsheet/Makefile b/net/py-gspreadsheet/Makefile
index 2e9c79a8a315..5babfc68f7d2 100644
--- a/net/py-gspreadsheet/Makefile
+++ b/net/py-gspreadsheet/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= xmj@chaot.net
COMMENT= Wrapper around Google Spreadsheets to look like csv.DictReader
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdata>0:${PORTSDIR}/devel/py-gdata
diff --git a/net/py-libcloud/Makefile b/net/py-libcloud/Makefile
index b465911de545..a822bbff82a8 100644
--- a/net/py-libcloud/Makefile
+++ b/net/py-libcloud/Makefile
@@ -12,7 +12,7 @@ DISTNAME= apache-${PORTNAME}-${PORTVERSION}
MAINTAINER= novel@FreeBSD.org
COMMENT= Standard client library for many popular cloud providers
-LICENSE= AL2
+LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_BZIP2= yes
diff --git a/net/py-twitter/Makefile b/net/py-twitter/Makefile
index 2072400ce4d1..bc6b4776c87e 100644
--- a/net/py-twitter/Makefile
+++ b/net/py-twitter/Makefile
@@ -11,7 +11,7 @@ DISTNAME= python-${PORTNAME}-${PORTVERSION}
MAINTAINER= python@FreeBSD.org
COMMENT= Python wrapper around the Twitter API
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>=0:${PORTSDIR}/www/py-httplib2 \
${PYTHON_PKGNAMEPREFIX}oauth2>=0:${PORTSDIR}/net/py-oauth2 \
diff --git a/net/sip_scenario/Makefile b/net/sip_scenario/Makefile
index 982a399f3782..4442f3323aa6 100644
--- a/net/sip_scenario/Makefile
+++ b/net/sip_scenario/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}.v${PORTVERSION}
MAINTAINER= fbsd-ports@opsec.eu
COMMENT= SIP call flow creator (HTML format)
-LICENSE= AL2
+LICENSE= APACHE20
USE_ZIP= yes
USES= perl5
diff --git a/print/pdfbox/Makefile b/print/pdfbox/Makefile
index c3edd74eaa54..4f7f71176cdf 100644
--- a/print/pdfbox/Makefile
+++ b/print/pdfbox/Makefile
@@ -12,7 +12,7 @@ DISTFILES= ${PORTNAME}-app-${PORTVERSION}.jar \
MAINTAINER= ports@FreeBSD.org
COMMENT= Java PDF Library
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= ${JAVAJARDIR}/bcmail.jar:${PORTSDIR}/java/bouncycastle \
${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging
diff --git a/security/apache-xml-security-c/Makefile b/security/apache-xml-security-c/Makefile
index c458e0c31c39..1ec00d70fdd0 100644
--- a/security/apache-xml-security-c/Makefile
+++ b/security/apache-xml-security-c/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= apache-
MAINTAINER= girgen@FreeBSD.org
COMMENT= Apache XML security libraries - C++ version
-LICENSE= AL2
+LICENSE= APACHE20
OPTIONS_DEFINE= XERCES_3
OPTIONS_DEFAULT= XERCES_3
diff --git a/security/ftimes/Makefile b/security/ftimes/Makefile
index b7b04e02e222..68439ac3f2cf 100644
--- a/security/ftimes/Makefile
+++ b/security/ftimes/Makefile
@@ -10,7 +10,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= klm@uidzero.org
COMMENT= System baselining and evidence collection tool
-LICENSE= BSD AL2 MIT
+LICENSE= BSD APACHE20 MIT
LICENSE_COMB= multi
GNU_CONFIGURE= yes
diff --git a/security/honggfuzz/Makefile b/security/honggfuzz/Makefile
index daab44a8cafc..f9d1c9e09503 100644
--- a/security/honggfuzz/Makefile
+++ b/security/honggfuzz/Makefile
@@ -10,7 +10,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= sbz@FreeBSD.org
COMMENT= General-purpose fuzzer with simple, command-line interface
-LICENSE= AL2
+LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/COPYING
USE_GMAKE= yes
diff --git a/security/ophcrack/Makefile b/security/ophcrack/Makefile
index a57528b03aad..405c777b74fd 100644
--- a/security/ophcrack/Makefile
+++ b/security/ophcrack/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF
MAINTAINER= danfe@FreeBSD.org
COMMENT= Windows password cracker based on rainbow tables
-LICENSE= AL2 GPLv2
+LICENSE= APACHE20 GPLv2
LICENSE_COMB= multi
LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2
diff --git a/security/orthrus/Makefile b/security/orthrus/Makefile
index c6806bf40b23..e9b402888c68 100644
--- a/security/orthrus/Makefile
+++ b/security/orthrus/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= GOOGLE_CODE \
MAINTAINER= gavin@16degrees.com.au
COMMENT= One-Time Password System (OTP) alternative to OPIE or S/Key
-LICENSE= AL2
+LICENSE= APACHE20
LIB_DEPENDS= apr-1:${PORTSDIR}/devel/apr1
diff --git a/security/p5-Net-SAML/Makefile b/security/p5-Net-SAML/Makefile
index ecf073c85be0..166dad7ca25c 100644
--- a/security/p5-Net-SAML/Makefile
+++ b/security/p5-Net-SAML/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl extension for using SAML SSO
-LICENSE= AL2
+LICENSE= APACHE20
LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \
libzxid.so:${PORTSDIR}/security/zxid
diff --git a/security/pam_google_authenticator/Makefile b/security/pam_google_authenticator/Makefile
index 1a8feb49cfa4..6b3c3fab542d 100644
--- a/security/pam_google_authenticator/Makefile
+++ b/security/pam_google_authenticator/Makefile
@@ -10,7 +10,7 @@ DISTNAME= google-authenticator-${PORTVERSION}
MAINTAINER= jnlin@csie.nctu.edu.tw
COMMENT= PAM module for two-step authentication from Google
-LICENSE= AL2
+LICENSE= APACHE20
USE_GMAKE= yes
diff --git a/security/pear-Auth_OpenID/Makefile b/security/pear-Auth_OpenID/Makefile
index 51ba5c5b6456..b2fef3014dca 100644
--- a/security/pear-Auth_OpenID/Makefile
+++ b/security/pear-Auth_OpenID/Makefile
@@ -15,7 +15,7 @@ BUILD_DEPENDS:= ${RUN_DEPENDS}
CONFLICTS= php-Auth_OpenID-1.*
-LICENSE= AL2
+LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/COPYING
USE_BZIP2= yes
diff --git a/security/py-kerberos/Makefile b/security/py-kerberos/Makefile
index e44da0baa5a3..12fbd66bd137 100644
--- a/security/py-kerberos/Makefile
+++ b/security/py-kerberos/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= roland@micite.net
COMMENT= Kerberos bindings for python
-LICENSE= AL2
+LICENSE= APACHE20
BUILD_DEPENDS= krb5-config:${PORTSDIR}/security/krb5
LIB_DEPENDS= krb5support.0:${PORTSDIR}/security/krb5
diff --git a/security/py-keyczar/Makefile b/security/py-keyczar/Makefile
index f89d681c3698..3bf7101fc7f9 100644
--- a/security/py-keyczar/Makefile
+++ b/security/py-keyczar/Makefile
@@ -11,7 +11,7 @@ DISTNAME= python-${PORTNAME}-${PORTVERSION}
MAINTAINER= douglas@douglasthrift.net
COMMENT= Toolkit for safe and simple cryptography
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.0:${PORTSDIR}/security/py-pycrypto
diff --git a/security/py-openssl/Makefile b/security/py-openssl/Makefile
index dab8ffe7e827..f89bad0357e7 100644
--- a/security/py-openssl/Makefile
+++ b/security/py-openssl/Makefile
@@ -11,7 +11,7 @@ DISTNAME= pyOpenSSL-${PORTVERSION}
MAINTAINER= sbz@FreeBSD.org
COMMENT= Python interface to the OpenSSL library
-LICENSE= AL2
+LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_PYTHON= yes
diff --git a/security/py-plaso/Makefile b/security/py-plaso/Makefile
index 8514fa5eba89..a06baa03983f 100644
--- a/security/py-plaso/Makefile
+++ b/security/py-plaso/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}_source_${PORTVERSION}
MAINTAINER= antoine@FreeBSD.org
COMMENT= Automatic creation of a super timeline
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= hachoir-core>=0:${PORTSDIR}/devel/hachoir-core \
hachoir-metadata>=0:${PORTSDIR}/sysutils/hachoir-metadata \
diff --git a/security/py-python-registry/Makefile b/security/py-python-registry/Makefile
index 3dc631855993..6486a7a049a8 100644
--- a/security/py-python-registry/Makefile
+++ b/security/py-python-registry/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= antoine@FreeBSD.org
COMMENT= Read access to Windows Registry files
-LICENSE= AL2
+LICENSE= APACHE20
USE_GITHUB= yes
GH_ACCOUNT= williballenthin
diff --git a/security/py-rsa/Makefile b/security/py-rsa/Makefile
index c3db3c5c0104..575279304d63 100644
--- a/security/py-rsa/Makefile
+++ b/security/py-rsa/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= koobs@FreeBSD.org
COMMENT= Pure-Python RSA implementation
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asn1>=0.1.3:${PORTSDIR}/devel/py-asn1
TEST_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}unittest2>0:${PORTSDIR}/devel/py-unittest2 \
diff --git a/security/py-slowaes/Makefile b/security/py-slowaes/Makefile
index 9988d9a221d2..71d9516bad28 100644
--- a/security/py-slowaes/Makefile
+++ b/security/py-slowaes/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= kyuupichan@gmail.com
COMMENT= Implementation of AES in pure Python
-LICENSE= AL2
+LICENSE= APACHE20
USE_PYTHON= -2.7
USE_PYDISTUTILS=easy_install
diff --git a/security/skipfish/Makefile b/security/skipfish/Makefile
index befb47baffd8..5ee17e081986 100644
--- a/security/skipfish/Makefile
+++ b/security/skipfish/Makefile
@@ -10,7 +10,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= zi@FreeBSD.org
COMMENT= A fully automated, active web application security reconnaissance tool
-LICENSE= AL2
+LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= idn:${PORTSDIR}/dns/libidn \
diff --git a/security/xml-security/Makefile b/security/xml-security/Makefile
index e469a99979c1..323cef707aa6 100644
--- a/security/xml-security/Makefile
+++ b/security/xml-security/Makefile
@@ -15,7 +15,7 @@ BUILD_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-common
${JAVALIBDIR}/xalan.jar:${PORTSDIR}/textproc/xalan-j
RUN_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging
-LICENSE= AL2
+LICENSE= APACHE20
OPTIONS_DEFINE= DOCS EXAMPLES
USE_ZIP= yes
diff --git a/sysutils/dtpstree/Makefile b/sysutils/dtpstree/Makefile
index 307d8c8a4edf..dd1c435c5321 100644
--- a/sysutils/dtpstree/Makefile
+++ b/sysutils/dtpstree/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://apt.douglasthrift.net/files/${PORTNAME}/ \
MAINTAINER= douglas@douglasthrift.net
COMMENT= Display a tree of processes
-LICENSE= AL2
+LICENSE= APACHE20
USE_XZ= yes
GNU_CONFIGURE= yes
diff --git a/sysutils/p5-Sys-Filesystem/Makefile b/sysutils/p5-Sys-Filesystem/Makefile
index 1240f89ffd47..567c3ded6a28 100644
--- a/sysutils/p5-Sys-Filesystem/Makefile
+++ b/sysutils/p5-Sys-Filesystem/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= pirzyk@FreeBSD.org
COMMENT= Perl module to Retrieve list of filesystems and their properties
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= p5-Params-Util>=1.0:${PORTSDIR}/devel/p5-Params-Util \
p5-IPC-Cmd>=0.80:${PORTSDIR}/devel/p5-IPC-Cmd \
diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile
index f58d64b5e04c..1aca8c430752 100644
--- a/sysutils/puppet/Makefile
+++ b/sysutils/puppet/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://downloads.puppetlabs.com/puppet/
MAINTAINER= swills@FreeBSD.org
COMMENT= A configuration management framework written in Ruby
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \
rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-augeas \
diff --git a/sysutils/py-halite/Makefile b/sysutils/py-halite/Makefile
index 41dae8ebca42..df5a4f2e6b48 100644
--- a/sysutils/py-halite/Makefile
+++ b/sysutils/py-halite/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= christer.edwards@gmail.com
COMMENT= SaltStack Web UI
-LICENSE= AL2
+LICENSE= APACHE20
FETCH_ARGS= -pRr
USE_PYTHON= 2.6-2.7
diff --git a/sysutils/py-pytsk/Makefile b/sysutils/py-pytsk/Makefile
index df6d537c9216..98c79a0160ad 100644
--- a/sysutils/py-pytsk/Makefile
+++ b/sysutils/py-pytsk/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= antoine@FreeBSD.org
COMMENT= Python bindings for the Sleuthkit
-LICENSE= AL2
+LICENSE= APACHE20
LIB_DEPENDS= libtsk.so:${PORTSDIR}/sysutils/sleuthkit
diff --git a/sysutils/py-salt-api/Makefile b/sysutils/py-salt-api/Makefile
index 2a36f7524ec0..6bc6912f2b62 100644
--- a/sysutils/py-salt-api/Makefile
+++ b/sysutils/py-salt-api/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= christer.edwards@gmail.com
COMMENT= Exposes the fundamental aspects of Salt control to external sources
-LICENSE= AL2
+LICENSE= APACHE20
FETCH_ARGS= -pRr
USE_PYTHON= 2.6-2.7
diff --git a/sysutils/py-salt-cloud/Makefile b/sysutils/py-salt-cloud/Makefile
index 508d593ff9ea..f3b19dc191d5 100644
--- a/sysutils/py-salt-cloud/Makefile
+++ b/sysutils/py-salt-cloud/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= christer.edwards@gmail.com
COMMENT= Provisioning salted minions to various cloud providers
-LICENSE= AL2
+LICENSE= APACHE20
FETCH_ARGS= -pRr
USE_PYTHON= 2.6-2.7
diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile
index 72df3b0a62e4..e3eab0f1c3f8 100644
--- a/sysutils/py-salt/Makefile
+++ b/sysutils/py-salt/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= christer.edwards@gmail.com
COMMENT= Distributed remote execution and configuration management system
-LICENSE= AL2
+LICENSE= APACHE20
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml \
${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.9:${PORTSDIR}/devel/py-pyzmq \
diff --git a/textproc/apache-poi/Makefile b/textproc/apache-poi/Makefile
index 7101c24beb0e..f85b11c777d6 100644
--- a/textproc/apache-poi/Makefile
+++ b/textproc/apache-poi/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}-src-${PORTVERSION}-20121203
MAINTAINER= ports@FreeBSD.org
COMMENT= Java API To Access Microsoft Format Files
-LICENSE= AL2
+LICENSE= APACHE20
BUILD_DEPENDS= ${JAVALIBDIR}/xalan.jar:${PORTSDIR}/textproc/xalan-j
diff --git a/textproc/apache-solr/Makefile b/textproc/apache-solr/Makefile
index eb3c28d26554..fdc7a560d5fe 100644
--- a/textproc/apache-solr/Makefile
+++ b/textproc/apache-solr/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= gaod@hychen.org
COMMENT= High performance search server built using Lucene Java
-LICENSE= AL2
+LICENSE= APACHE20
CONFLICT= apache-solr-3.6.*
diff --git a/textproc/apache-solr3/Makefile b/textproc/apache-solr3/Makefile
index 46c3736fb6d3..5be9e132612b 100644
--- a/textproc/apache-solr3/Makefile
+++ b/textproc/apache-solr3/Makefile
@@ -12,7 +12,7 @@ PKGNAMESUFFIX= 3
MAINTAINER= gaod@hychen.org
COMMENT= High performance search server built using Lucene Java
-LICENSE= AL2
+LICENSE= APACHE20
CONFLICT= apache-solr-4.1.*
diff --git a/textproc/clucene/Makefile b/textproc/clucene/Makefile
index 78f2694d5ea8..17805c1ce7bc 100644
--- a/textproc/clucene/Makefile
+++ b/textproc/clucene/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-core-${PORTVERSION}
MAINTAINER= office@FreeBSD.org
COMMENT= CLucene is a C++ port of Lucene
-LICENSE= AL2 LGPL21
+LICENSE= APACHE20 LGPL21
LICENSE_COMB= dual
BUILD_DEPENDS= ${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs
diff --git a/textproc/elasticsearch/Makefile b/textproc/elasticsearch/Makefile
index 4a97a4fe4404..2cf2a592ceaa 100644
--- a/textproc/elasticsearch/Makefile
+++ b/textproc/elasticsearch/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \
MAINTAINER= tj@FreeBSD.org
COMMENT= A full-text search engine for Java
-LICENSE= AL2
+LICENSE= APACHE20
USE_JAVA= yes
NO_BUILD= yes
diff --git a/textproc/fex/Makefile b/textproc/fex/Makefile
index 13583db11702..d440e5930c88 100644
--- a/textproc/fex/Makefile
+++ b/textproc/fex/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://semicomplete.googlecode.com/files/ \
MAINTAINER= zi@FreeBSD.org
COMMENT= A powerful field extraction tool
-LICENSE= AL2
+LICENSE= APACHE20
MAKE_ENV+= INSTALLMAN=${PREFIX}/man
diff --git a/textproc/kibana/Makefile b/textproc/kibana/Makefile
index 35cd903918dd..557e929e32fd 100644
--- a/textproc/kibana/Makefile
+++ b/textproc/kibana/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://download.elasticsearch.org/kibana/kibana/
MAINTAINER= antoine@FreeBSD.org
COMMENT= Browser based analytics and search interface to ElasticSearch
-LICENSE= AL2
+LICENSE= APACHE20
NO_BUILD= yes
SUB_FILES= pkg-message
diff --git a/textproc/lucene/Makefile b/textproc/lucene/Makefile
index 34e721667e3c..17142bcaa8ca 100644
--- a/textproc/lucene/Makefile
+++ b/textproc/lucene/Makefile
@@ -13,7 +13,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= danilo@FreeBSD.org
COMMENT= Full-text search engine for Java
-LICENSE= AL2
+LICENSE= APACHE20
CONFLICTS= lucene4-[0-9].*
diff --git a/textproc/lucene4/Makefile b/textproc/lucene4/Makefile
index 5e86eb126c49..90de23287dc3 100644
--- a/textproc/lucene4/Makefile
+++ b/textproc/lucene4/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= mva@FreeBSD.org
COMMENT= Full-text search engine for Java, 4.x branch
-LICENSE= AL2
+LICENSE= APACHE20
CONFLICTS= lucene-[0-9].*
diff --git a/textproc/nltk/Makefile b/textproc/nltk/Makefile
index 518ca8350feb..59bcf3b3df61 100644
--- a/textproc/nltk/Makefile
+++ b/textproc/nltk/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= CHEESESHOP
MAINTAINER= clsung@FreeBSD.org
COMMENT= Natural language toolkit written in python
-LICENSE= AL2
+LICENSE= APACHE20
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:${PORTSDIR}/x11-toolkits/py-tkinter \
${PYTHON_PKGNAMEPREFIX}yaml>=3.09:${PORTSDIR}/devel/py-yaml
diff --git a/textproc/p5-Pod-WikiDoc/Makefile b/textproc/p5-Pod-WikiDoc/Makefile
index 5deb5aebbcd8..d49a964b0394 100644
--- a/textproc/p5-Pod-WikiDoc/Makefile
+++ b/textproc/p5-Pod-WikiDoc/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= mat@FreeBSD.org
COMMENT= Generate Pod from inline wiki style text
-LICENSE= AL2
+LICENSE= APACHE20
BUILD_DEPENDS:= ${RUN_DEPENDS}
RUN_DEPENDS= p5-File-pushd>=0:${PORTSDIR}/devel/p5-File-pushd \
diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
index 401646984af7..e6a5aafde4a9 100644
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@@ -12,7 +12,7 @@ COMMENT= RDF Parser Toolkit for Redland
# Even though GPLv3 is not explicitly mentioned in the port's LICENSE.html, one
# of its licenses is "GPLv2 or newer", which includes GPLv3.
-LICENSE= AL2 GPLv2 GPLv3 LGPL21
+LICENSE= APACHE20 GPLv2 GPLv3 LGPL21
LICENSE_COMB= dual
LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \
diff --git a/textproc/rasqal/Makefile b/textproc/rasqal/Makefile
index 90236f36686a..9cece2fcb30e 100644
--- a/textproc/rasqal/Makefile
+++ b/textproc/rasqal/Makefile
@@ -12,7 +12,7 @@ COMMENT= High-level interface for RDF
# Even though GPLv3 is not explicitly mentioned in the port's LICENSE.html, one
# of its licenses is "GPLv2 or newer", which includes GPLv3.
-LICENSE= AL2 GPLv2 GPLv3 LGPL21
+LICENSE= APACHE20 GPLv2 GPLv3 LGPL21
LICENSE_COMB= dual
LIB_DEPENDS= libraptor2.so:${PORTSDIR}/textproc/raptor2 \
diff --git a/textproc/redland-bindings/Makefile b/textproc/redland-bindings/Makefile
index d3374ef5ee41..699c94527878 100644
--- a/textproc/redland-bindings/Makefile
+++ b/textproc/redland-bindings/Makefile
@@ -11,7 +11,7 @@ COMMENT?= Language bindings for the Redland package
# Even though GPLv3 is not explicitly mentioned in the port's LICENSE.html, one
# of its licenses is "GPLv2 or newer", which includes GPLv3.
-LICENSE= AL2 GPLv2 GPLv3 LGPL21
+LICENSE= APACHE20 GPLv2 GPLv3 LGPL21
LICENSE_COMB= dual
LIB_DEPENDS= librdf.so:${PORTSDIR}/textproc/redland
diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile
index db6b40cdd104..4976893bc187 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -13,7 +13,7 @@ COMMENT= Apache XSLT processor for transforming XML documents
RUN_DEPENDS= ${JAVALIBDIR}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j
-LICENSE= AL2
+LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
USE_ZIP= yes
diff --git a/textproc/xqilla/Makefile b/textproc/xqilla/Makefile
index 47681463aa83..572b29b68012 100644
--- a/textproc/xqilla/Makefile
+++ b/textproc/xqilla/Makefile
@@ -14,7 +14,7 @@ COMMENT= XQuery and XPath2 library
OPTIONS_DEFINE= DOCS
-LICENSE= AL2
+LICENSE= APACHE20
LIB_DEPENDS= libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3
diff --git a/textproc/zorba/Makefile b/textproc/zorba/Makefile
index c8ceeaa15234..7e6777fd915f 100644
--- a/textproc/zorba/Makefile
+++ b/textproc/zorba/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= gahr@FreeBSD.org
COMMENT= A general purpose C++ XQuery processor
-LICENSE= AL2
+LICENSE= APACHE20
LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \
xerces-c.3:${PORTSDIR}/textproc/xerces-c3 \
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
diff --git a/x11-fonts/droid-fonts-ttf/Makefile b/x11-fonts/droid-fonts-ttf/Makefile
index 6f1a8b3461b1..de60f9cb257a 100644
--- a/x11-fonts/droid-fonts-ttf/Makefile
+++ b/x11-fonts/droid-fonts-ttf/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= LOCAL/sunpoet/
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= The Droid typeface family
-LICENSE= AL2
+LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/NOTICE
BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
diff --git a/x11-fonts/roboto-fonts-ttf/Makefile b/x11-fonts/roboto-fonts-ttf/Makefile
index 4b7a9282359f..3b03f4a16f8f 100644
--- a/x11-fonts/roboto-fonts-ttf/Makefile
+++ b/x11-fonts/roboto-fonts-ttf/Makefile
@@ -10,7 +10,7 @@ DISTNAME= Roboto_Hinted_${PORTVERSION}
MAINTAINER= winstonw@lavabit.com
COMMENT= The Roboto typeface family
-LICENSE= AL2
+LICENSE= APACHE20
BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale