aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.licenses.db.mk8
-rw-r--r--UPDATING6
-rw-r--r--audio/vo-aacenc/Makefile2
-rw-r--r--audio/vo-amrwbenc/Makefile2
-rw-r--r--biology/lamarc/Makefile2
-rw-r--r--chinese/opencc/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/p5-MongoDB/Makefile2
-rw-r--r--databases/pecl-mongo/Makefile2
-rw-r--r--databases/py-cql/Makefile2
-rw-r--r--databases/py-south/Makefile2
-rw-r--r--deskutils/horde4-mnemo/Makefile2
-rw-r--r--devel/R-cran-foreach/Makefile2
-rw-r--r--devel/R-cran-iterators/Makefile2
-rw-r--r--devel/apache-ant/Makefile2
-rw-r--r--devel/etoile-unitkit/Makefile2
-rw-r--r--devel/fb303/Makefile2
-rw-r--r--devel/jakarta-commons-chain/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/ninja/Makefile2
-rw-r--r--devel/py-gdata/Makefile2
-rw-r--r--devel/py-wsgi_xmlrpc/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/thrift/Makefile2
-rw-r--r--dns/py-namebench/Makefile2
-rw-r--r--editors/pico-alpine/Makefile2
-rw-r--r--graphics/R-cran-RColorBrewer/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--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-lang/Makefile2
-rw-r--r--java/netty/Makefile2
-rw-r--r--lang/gambit-c/Makefile2
-rw-r--r--lang/groovy/Makefile2
-rw-r--r--mail/alpine/Makefile2
-rw-r--r--mail/cclient/Makefile2
-rw-r--r--mail/horde4-ingo/Makefile2
-rw-r--r--mail/horde4-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-SES/Makefile2
-rw-r--r--mail/spamass-ixhash/Makefile2
-rw-r--r--net-p2p/i2p/Makefile2
-rw-r--r--net/activemq/Makefile2
-rw-r--r--net/googlecl/Makefile2
-rw-r--r--net/mDNSResponder/Makefile2
-rw-r--r--net/openvswitch/Makefile2
-rw-r--r--net/py-libcloud/Makefile2
-rw-r--r--print/pdfbox/Makefile2
-rw-r--r--security/apache-xml-security-c/Makefile2
-rw-r--r--security/honggfuzz/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-openssl/Makefile2
-rw-r--r--security/skipfish/Makefile2
-rw-r--r--security/xml-security/Makefile2
-rw-r--r--sysutils/dtpstree/Makefile2
-rw-r--r--sysutils/salt/Makefile2
-rw-r--r--textproc/etoile-lucenekit/Makefile2
-rw-r--r--textproc/fex/Makefile2
-rw-r--r--textproc/lucene/Makefile2
-rw-r--r--textproc/nltk/Makefile2
-rw-r--r--textproc/xalan-j/Makefile2
-rw-r--r--textproc/zorba/Makefile2
-rw-r--r--www/axis2/Makefile2
-rw-r--r--www/axis2/pkg-plist2
-rw-r--r--www/closure-compiler/Makefile2
-rw-r--r--www/closure-linter/Makefile2
-rw-r--r--www/dtse/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/jakarta-jmeter/Makefile2
-rw-r--r--www/mod_auth_mysql2/Makefile2
-rw-r--r--www/mod_authn_sasl/Makefile2
-rw-r--r--www/mod_geoip2/Makefile2
-rw-r--r--www/mod_gnutls/Makefile2
-rw-r--r--www/mod_rivet/Makefile2
-rw-r--r--www/mod_setenvifplus/Makefile2
-rw-r--r--www/mod_wsgi/Makefile2
-rw-r--r--www/mod_wsgi3/Makefile2
-rw-r--r--www/py-dtflickr/Makefile2
-rw-r--r--www/py-selenium/Makefile2
-rw-r--r--www/py-tornado/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--x11-fonts/droid-fonts-ttf/Makefile2
107 files changed, 115 insertions, 109 deletions
diff --git a/Mk/bsd.licenses.db.mk b/Mk/bsd.licenses.db.mk
index 4bfb91d882a1..967a7df6c378 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= ART10 ART20 ASL BSD BSL CDDL EPL GFDL GPLv1 GPLv2 GPLv3 ISCL \
+_LICENSE_LIST= AL2 ART10 ART20 BSD BSL CDDL EPL GFDL GPLv1 GPLv2 GPLv3 ISCL \
LGPL20 LGPL21 LGPL3 LPPL10 LPPL11 LPPL12 LPPL13 LPPL13a \
LPPL13b LPPL13c MIT MPL OWL PHP202 PHP30 PHP301 PSFL ZPL21
@@ -65,15 +65,15 @@ _LICENSE_PERMS_DEFAULT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
# - General permissions from groups are added to each license, if not defined.
#
+_LICENSE_NAME_AL2= Apache License
+_LICENSE_GROUPS_AL2= FSF OSI COPYFREE
+
_LICENSE_NAME_ART10= Artistic License version 1.0
_LICENSE_GROUPS_ART10= OSI
_LICENSE_NAME_ART20= Artistic License version 2.0
_LICENSE_GROUPS_ART20= FSF GPL OSI
-_LICENSE_NAME_ASL= Apache License
-_LICENSE_GROUPS_ASL= FSF OSI COPYFREE
-
_LICENSE_NAME_BSD= BSD license
_LICENSE_GROUPS_BSD= FSF OSI COPYFREE
diff --git a/UPDATING b/UPDATING
index 641a13d6c210..76e9509ea810 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,12 @@ You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20120109:
+ AFFECTS: ports using Apache Software License 2.0
+ AUTHOR: tabthorpe@FreeBSD.org
+
+ The correct acronym for Apache Sofware License 2.0 is really AL2.
+
+20120109:
AFFECTS: users of graphics/inkscape:
AUTHOR: bsam@@FreeBSD.org
diff --git a/audio/vo-aacenc/Makefile b/audio/vo-aacenc/Makefile
index 8f4bbd00f9cc..ad54e672f9d1 100644
--- a/audio/vo-aacenc/Makefile
+++ b/audio/vo-aacenc/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/opencore-amr/${PORTNAME}
MAINTAINER= mm@FreeBSD.org
COMMENT= VisualOn AAC encoder library
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/audio/vo-amrwbenc/Makefile b/audio/vo-amrwbenc/Makefile
index 186b45f4d941..c73a88b93954 100644
--- a/audio/vo-amrwbenc/Makefile
+++ b/audio/vo-amrwbenc/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/opencore-amr/${PORTNAME}
MAINTAINER= mm@FreeBSD.org
COMMENT= VisualOn AMR-WB encoder library
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/biology/lamarc/Makefile b/biology/lamarc/Makefile
index cf35c2fd27cc..941b4ed2c50b 100644
--- a/biology/lamarc/Makefile
+++ b/biology/lamarc/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX= .src.tar.gz
MAINTAINER= cs@FreeBSD.org
COMMENT= A package of programs for computing population parameters
-LICENSE= ASL
+LICENSE= AL2
OPTIONS= WXGTK2 "Install wxWidgets" off
diff --git a/chinese/opencc/Makefile b/chinese/opencc/Makefile
index 6763666670d8..684397e43f0d 100644
--- a/chinese/opencc/Makefile
+++ b/chinese/opencc/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
MAINTAINER= lichray@gmail.com
COMMENT= Open Chinese Convert library and utilities
-LICENSE= ASL
+LICENSE= AL2
MAN1= opencc.1 opencc_dict.1
diff --git a/databases/adminer/Makefile b/databases/adminer/Makefile
index c6528678df16..2fbfa634f3ad 100644
--- a/databases/adminer/Makefile
+++ b/databases/adminer/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= SF/${PORTNAME}/Adminer/Adminer%20${PORTVERSION}
MAINTAINER= wen@FreeBSD.org
COMMENT= A full-featured database management tool written in PHP
-LICENSE= ASL
+LICENSE= AL2
USE_ZIP= yes
NO_BUILD= yes
diff --git a/databases/cassandra/Makefile b/databases/cassandra/Makefile
index 5c379884385d..be390f64374f 100644
--- a/databases/cassandra/Makefile
+++ b/databases/cassandra/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX= -bin.tar.gz
MAINTAINER= gslin@gslin.org
COMMENT= Open source distributed database management system
-LICENSE= ASL
+LICENSE= AL2
JAVA_VERSION= 1.6
JAVA_VENDOR= openjdk
diff --git a/databases/jasperserver/Makefile b/databases/jasperserver/Makefile
index 405bd18e7746..82d0316951d1 100644
--- a/databases/jasperserver/Makefile
+++ b/databases/jasperserver/Makefile
@@ -16,7 +16,7 @@ EXTRACT_ONLY= jasperreports-server-cp-${PORTVERSION}-src.zip
MAINTAINER= jgh@FreeBSD.org
COMMENT= Open Source Java Reporting Library
-LICENSE= GPLv2 MIT ASL
+LICENSE= GPLv2 MIT AL2
LICENSE_COMB= multi
BUILD_DEPENDS= mvn:${PORTSDIR}/devel/maven2
diff --git a/databases/java-mybatis/Makefile b/databases/java-mybatis/Makefile
index afccdb33267c..d28157edb25b 100644
--- a/databases/java-mybatis/Makefile
+++ b/databases/java-mybatis/Makefile
@@ -22,7 +22,7 @@ COMMENT= SQL Mapping Framework
USE_JAVA= yes
USE_ZIP= yes
-LICENSE= ASL
+LICENSE= AL2
NO_BUILD= yes
JAR_FILE= ${PORTNAME}-${PORTVERSION}.jar
diff --git a/databases/kumofs/Makefile b/databases/kumofs/Makefile
index 914d74316cb8..588d820e48fb 100644
--- a/databases/kumofs/Makefile
+++ b/databases/kumofs/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= msgpack:${PORTSDIR}/devel/msgpack \
tokyocabinet:${PORTSDIR}/databases/tokyocabinet
RUN_DEPENDS= rubygem-msgpack>0:${PORTSDIR}/devel/rubygem-msgpack
-LICENSE= ASL
+LICENSE= AL2
USE_AUTOTOOLS= libtool autoheader autoconf automake aclocal
ACLOCAL_ARGS= # empty
AUTOMAKE_ARGS= --add-missing --copy
diff --git a/databases/p5-MongoDB/Makefile b/databases/p5-MongoDB/Makefile
index e7e0c9a0e481..f082778c5e71 100644
--- a/databases/p5-MongoDB/Makefile
+++ b/databases/p5-MongoDB/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Mongo Driver for Perl
-LICENSE= ASL
+LICENSE= AL2
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 aacf664d6303..b80d7c76c7fe 100644
--- a/databases/pecl-mongo/Makefile
+++ b/databases/pecl-mongo/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= miwi@FreeBSD.org
COMMENT= PECL classes for Mongo Database Driver
-LICENSE= ASL
+LICENSE= AL2
IGNORE_WITH_PHP=4
diff --git a/databases/py-cql/Makefile b/databases/py-cql/Makefile
index 414460c61824..4362225bc07b 100644
--- a/databases/py-cql/Makefile
+++ b/databases/py-cql/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= hsn@sendmail.cz
COMMENT= Python DB-API 2.0 client interface for Cassandra
-LICENSE= ASL
+LICENSE= AL2
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/thrift/Thrift.py:${PORTSDIR}/devel/py-thrift
diff --git a/databases/py-south/Makefile b/databases/py-south/Makefile
index f52dea122080..90a2a27737fa 100644
--- a/databases/py-south/Makefile
+++ b/databases/py-south/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= count@211.ru
COMMENT= This is South, intelligent schema migrations for Django apps
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/deskutils/horde4-mnemo/Makefile b/deskutils/horde4-mnemo/Makefile
index 6dbfb72c29ea..247ab2feba07 100644
--- a/deskutils/horde4-mnemo/Makefile
+++ b/deskutils/horde4-mnemo/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX= horde-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde web based notes manager
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE
LATEST_LINK= horde4-${PORTNAME}
diff --git a/devel/R-cran-foreach/Makefile b/devel/R-cran-foreach/Makefile
index 2b20c371aeab..56b14917d623 100644
--- a/devel/R-cran-foreach/Makefile
+++ b/devel/R-cran-foreach/Makefile
@@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= tota@FreeBSD.org
COMMENT= Foreach looping construct for R
-LICENSE= ASL
+LICENSE= AL2
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 c2a4ca69bcf1..ddc7acac82d1 100644
--- a/devel/R-cran-iterators/Makefile
+++ b/devel/R-cran-iterators/Makefile
@@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= tota@FreeBSD.org
COMMENT= Iterator construct for R
-LICENSE= ASL
+LICENSE= AL2
USE_R_MOD= yes
R_MOD_AUTOPLIST= yes
diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index 3d5a6cbc681f..2fa14fd6b640 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -20,7 +20,7 @@ COMMENT= Java- and XML-based build tool, conceptually similar to make
RUN_DEPENDS= classpath:${PORTSDIR}/java/javavmwrapper
-LICENSE= ASL
+LICENSE= AL2
ANT_DISTFILE= ${PORTNAME}-${PORTVERSION}-bin.tar.bz2
MANPAGE_DISTFILE= ${PORTNAME}-manpage-${MANPAGE_VERSION}.tgz
diff --git a/devel/etoile-unitkit/Makefile b/devel/etoile-unitkit/Makefile
index 6f9b4de7edcf..bf4f0c9ad899 100644
--- a/devel/etoile-unitkit/Makefile
+++ b/devel/etoile-unitkit/Makefile
@@ -15,7 +15,7 @@ DISTNAME= etoile-0.4.1
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Etoile Project UnitKit test framework on GNUstep
-LICENSE= ASL
+LICENSE= AL2
USE_BZIP2= yes
USE_GNUSTEP= yes
diff --git a/devel/fb303/Makefile b/devel/fb303/Makefile
index d5b48b803503..4a7f6189f5b6 100644
--- a/devel/fb303/Makefile
+++ b/devel/fb303/Makefile
@@ -16,7 +16,7 @@ DISTNAME= thrift-${PORTVERSION}
MAINTAINER= komarov@valerka.net
COMMENT= The Facebook Bassline
-LICENSE= ASL
+LICENSE= AL2
LIB_DEPENDS= boost_system:${PORTSDIR}/devel/boost-libs \
thrift:${PORTSDIR}/devel/thrift
diff --git a/devel/jakarta-commons-chain/Makefile b/devel/jakarta-commons-chain/Makefile
index e53d94711597..9c0a2b0ef3d7 100644
--- a/devel/jakarta-commons-chain/Makefile
+++ b/devel/jakarta-commons-chain/Makefile
@@ -19,7 +19,7 @@ COMMENT= API implementing Chain of Responsiblity design pattern
BUILD_DEPENDS= ${JAR_DEPENDS}
RUN_DEPENDS= ${JAR_DEPENDS}
-LICENSE= ASL
+LICENSE= AL2
JAR_DEPENDS= ${JAVALIBDIR}/commons-beanutils.jar:${PORTSDIR}/java/jakarta-commons-beanutils \
${JAVALIBDIR}/commons-digester.jar:${PORTSDIR}/textproc/jakarta-commons-digester \
diff --git a/devel/jakarta-commons-io/Makefile b/devel/jakarta-commons-io/Makefile
index def3602816bd..da6581fc7014 100644
--- a/devel/jakarta-commons-io/Makefile
+++ b/devel/jakarta-commons-io/Makefile
@@ -18,7 +18,7 @@ COMMENT= A collection of I/O utilities for Java
BUILD_DEPENDS= ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit
-LICENSE= ASL
+LICENSE= AL2
USE_JAVA= yes
JAVA_VERSION= 1.5+
diff --git a/devel/log4cxx/Makefile b/devel/log4cxx/Makefile
index 41027ff77335..79ad2c53a06f 100644
--- a/devel/log4cxx/Makefile
+++ b/devel/log4cxx/Makefile
@@ -15,7 +15,7 @@ DISTNAME= apache-${PORTNAME}-${PORTVERSION}
MAINTAINER= rene@FreeBSD.org
COMMENT= Log4cxx is a port to C++ of the Log4j project
-LICENSE= ASL
+LICENSE= AL2
LIB_DEPENDS= apr-1:${PORTSDIR}/devel/apr1
diff --git a/devel/maven-ant-tasks/Makefile b/devel/maven-ant-tasks/Makefile
index 1d3d71edddb7..d1ab193904d1 100644
--- a/devel/maven-ant-tasks/Makefile
+++ b/devel/maven-ant-tasks/Makefile
@@ -18,7 +18,7 @@ COMMENT= Allows Maven's artifact handling to be used from within an Ant build
RUN_DEPENDS= ant:${PORTSDIR}/devel/apache-ant
-LICENSE= ASL
+LICENSE= AL2
USE_JAVA= 1.5+
diff --git a/devel/ninja/Makefile b/devel/ninja/Makefile
index b1ee319240d8..5d68bf2846ee 100644
--- a/devel/ninja/Makefile
+++ b/devel/ninja/Makefile
@@ -15,7 +15,7 @@ DISTNAME= Roorabck-${PORTNAME}-${DISTVERSION}-0-g${GITVERSION}
MAINTAINER= magik@roorback.net
COMMENT= Ninja is a small build system closest in spirit to Make
-LICENSE= ASL
+LICENSE= AL2
CONFLICTS= irc/ninja-[0-9]*
USE_PYTHON= yes
diff --git a/devel/py-gdata/Makefile b/devel/py-gdata/Makefile
index 849e76410984..03d2dc8210fb 100644
--- a/devel/py-gdata/Makefile
+++ b/devel/py-gdata/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= duchateau.olivier@gmail.com
COMMENT= GData Python Client Library
-LICENSE= ASL
+LICENSE= AL2
PROJECTHOST= gdata-python-client
USE_PYTHON= -2.7
diff --git a/devel/py-wsgi_xmlrpc/Makefile b/devel/py-wsgi_xmlrpc/Makefile
index 8b0db42f49b3..f3b9bb80e039 100644
--- a/devel/py-wsgi_xmlrpc/Makefile
+++ b/devel/py-wsgi_xmlrpc/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME:S/_/-/}-${PORTVERSION}
MAINTAINER= geka@sippysoft.com
COMMENT= WSGI application for a simple XMLRPC method dispatching
-LICENSE= ASL
+LICENSE= AL2
USE_PYTHON= 2.5+
USE_PYDISTUTILS= easy_install
diff --git a/devel/scalatest/Makefile b/devel/scalatest/Makefile
index fd319783b20c..f2ce8ffa2cb5 100644
--- a/devel/scalatest/Makefile
+++ b/devel/scalatest/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://www.artima.com/downloadScalaTest/ \
MAINTAINER= mitsururike@gmail.com
COMMENT= A regression testing utility for use with the Scala Language
-LICENSE= ASL
+LICENSE= AL2
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 cdc5eb6526ab..3f5a97924fed 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -19,7 +19,7 @@ USE_BZIP2= yes
USE_AUTOTOOLS= libtool
USE_KDE4= # Used below if KWallet support is enabled
-LICENSE= ASL
+LICENSE= AL2
CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.6.[0-9]*
diff --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common
index 13424da94abd..bddfdd653d58 100644
--- a/devel/subversion16/Makefile.common
+++ b/devel/subversion16/Makefile.common
@@ -19,7 +19,7 @@ USE_BZIP2= yes
USE_AUTOTOOLS= libtool
USE_KDE4= # Used below if KWallet support is enabled
-LICENSE= ASL
+LICENSE= AL2
CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.7.[0-9]*
LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}16${PKGNAMESUFFIX}
diff --git a/devel/thrift/Makefile b/devel/thrift/Makefile
index 28570e1ca455..fe1337b6667b 100644
--- a/devel/thrift/Makefile
+++ b/devel/thrift/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= /thrift/${PORTVERSION}
MAINTAINER= komarov@valerka.net
COMMENT= Framework for scalable cross-language services development
-LICENSE= ASL
+LICENSE= AL2
LIB_DEPENDS= boost_iostreams:${PORTSDIR}/devel/boost-libs \
event-1.4:${PORTSDIR}/devel/libevent
diff --git a/dns/py-namebench/Makefile b/dns/py-namebench/Makefile
index bed179f05323..8164d3e88ef8 100644
--- a/dns/py-namebench/Makefile
+++ b/dns/py-namebench/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= jgh@FreeBSD.org
COMMENT= An open-source DNS benchmark utility
-LICENSE= ASL
+LICENSE= AL2
RUN_DEPENDS+= \
${PYTHON_PKGNAMEPREFIX}Jinja2>=2.5.5:${PORTSDIR}/devel/py-Jinja2 \
diff --git a/editors/pico-alpine/Makefile b/editors/pico-alpine/Makefile
index 6e1fbb249162..2d0cc0372be1 100644
--- a/editors/pico-alpine/Makefile
+++ b/editors/pico-alpine/Makefile
@@ -12,7 +12,7 @@ DISTNAME= alpine-${PORTVERSION}
COMMENT= [Al]PIne's message COmposition editor and Pilot file manager
-LICENSE= ASL
+LICENSE= AL2
MASTERDIR= ${.CURDIR}/../../mail/alpine
diff --git a/graphics/R-cran-RColorBrewer/Makefile b/graphics/R-cran-RColorBrewer/Makefile
index 24fcb702a354..89b4defca08b 100644
--- a/graphics/R-cran-RColorBrewer/Makefile
+++ b/graphics/R-cran-RColorBrewer/Makefile
@@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}_${DISTVERSION}
MAINTAINER= tota@FreeBSD.org
COMMENT= ColorBrewer palettes
-LICENSE= ASL
+LICENSE= AL2
USE_R_MOD= yes
R_MOD_AUTOPLIST= yes
diff --git a/graphics/py-actdiag/Makefile b/graphics/py-actdiag/Makefile
index ede4e1742be2..f468fbbaeed9 100644
--- a/graphics/py-actdiag/Makefile
+++ b/graphics/py-actdiag/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= tota@FreeBSD.org
COMMENT= A simple activity-diagram image generator
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PKGNAMEPREFIX}imaging>=1.1.5:${PORTSDIR}/graphics/py-imaging \
diff --git a/graphics/py-blockdiag/Makefile b/graphics/py-blockdiag/Makefile
index 6b2e4f093742..9a6da4a5a0c3 100644
--- a/graphics/py-blockdiag/Makefile
+++ b/graphics/py-blockdiag/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= tota@FreeBSD.org
COMMENT= A simple block-diagram image generator
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PKGNAMEPREFIX}imaging>=1.1.5:${PORTSDIR}/graphics/py-imaging \
diff --git a/graphics/py-nwdiag/Makefile b/graphics/py-nwdiag/Makefile
index b1a451664287..ec64c3c9ee16 100644
--- a/graphics/py-nwdiag/Makefile
+++ b/graphics/py-nwdiag/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= tota@FreeBSD.org
COMMENT= A simple network-diagram image generator
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PKGNAMEPREFIX}imaging>=1.1.5:${PORTSDIR}/graphics/py-imaging \
diff --git a/graphics/py-seqdiag/Makefile b/graphics/py-seqdiag/Makefile
index 6a16a6fcfcb2..0f2addd4ad30 100644
--- a/graphics/py-seqdiag/Makefile
+++ b/graphics/py-seqdiag/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= tota@FreeBSD.org
COMMENT= A simple sequence-diagram image generator
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PKGNAMEPREFIX}imaging>=1.1.5:${PORTSDIR}/graphics/py-imaging \
diff --git a/graphics/tesseract-data/Makefile b/graphics/tesseract-data/Makefile
index 8e61a03ec7d2..c0625e05cbd7 100644
--- a/graphics/tesseract-data/Makefile
+++ b/graphics/tesseract-data/Makefile
@@ -16,7 +16,7 @@ EXTRACT_ONLY= #empty
MAINTAINER= bf@FreeBSD.org
COMMENT= Additional trained language data for the Tesseract OCR engine
-LICENSE= ASL
+LICENSE= AL2
DIST_SUBDIR= tesseract
PROJECTHOST= tesseract-ocr
diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile
index 850fe9f78bf9..9840e46ec7a3 100644
--- a/graphics/tesseract/Makefile
+++ b/graphics/tesseract/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= bf@FreeBSD.org
COMMENT= Commercial quality open source OCR engine
-LICENSE= ASL
+LICENSE= AL2
LIB_DEPENDS= lept.2:${PORTSDIR}/graphics/leptonica
diff --git a/java/castor/Makefile b/java/castor/Makefile
index 28e764d103e8..7c42a2de1844 100644
--- a/java/castor/Makefile
+++ b/java/castor/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= crees@FreeBSD.org
COMMENT= Data binding for XML (JAXB) and SQL database (JDO)
-LICENSE= ASL
+LICENSE= AL2
USE_JAVA= yes
JAVA_VERSION= 1.5+
diff --git a/java/jakarta-commons-cli/Makefile b/java/jakarta-commons-cli/Makefile
index 52a9ac5838fc..bf1eacf3d916 100644
--- a/java/jakarta-commons-cli/Makefile
+++ b/java/jakarta-commons-cli/Makefile
@@ -17,7 +17,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-bin
MAINTAINER= hq@FreeBSD.org
COMMENT= Java library for command line arguments and options
-LICENSE= ASL
+LICENSE= AL2
USE_JAVA= yes
JAVA_VERSION= 1.5+
diff --git a/java/jakarta-commons-codec/Makefile b/java/jakarta-commons-codec/Makefile
index 7d6b06ec8a60..07ec2949ffd0 100644
--- a/java/jakarta-commons-codec/Makefile
+++ b/java/jakarta-commons-codec/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= ale@FreeBSD.org
COMMENT= An implementations of common encoders and decoders
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
USE_JAVA= yes
diff --git a/java/jakarta-commons-lang/Makefile b/java/jakarta-commons-lang/Makefile
index 3f1e72eba41a..c5034c786e8c 100644
--- a/java/jakarta-commons-lang/Makefile
+++ b/java/jakarta-commons-lang/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= hq@FreeBSD.org
COMMENT= Jakarta library with helper utilities for the java.lang API
-LICENSE= ASL
+LICENSE= AL2
USE_JAVA= yes
JAVA_VERSION= 1.5+
diff --git a/java/netty/Makefile b/java/netty/Makefile
index 7d01e926766c..ddfbba378185 100644
--- a/java/netty/Makefile
+++ b/java/netty/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF/jboss/Netty%20Project/Netty%20${PORTVERSION}.Final/
MAINTAINER= m.tsatsenko@gmail.com
COMMENT= Java NIO client server framework
-LICENSE= ASL
+LICENSE= AL2
USE_JAVA= yes
USE_BZIP2= yes
diff --git a/lang/gambit-c/Makefile b/lang/gambit-c/Makefile
index 99dcfd3a4022..46cacea44f42 100644
--- a/lang/gambit-c/Makefile
+++ b/lang/gambit-c/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= pmn@bakarika.net
COMMENT= Gambit programming system where the compiler generates portable C code
-LICENSE= ASL
+LICENSE= AL2
MAN1= gsi.1
diff --git a/lang/groovy/Makefile b/lang/groovy/Makefile
index c270ce68015b..1ef824c90391 100644
--- a/lang/groovy/Makefile
+++ b/lang/groovy/Makefile
@@ -15,7 +15,7 @@ DISTFILES= groovy-binary-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= mjs@Bur.st
COMMENT= Agile dynamic language for the JVM
-LICENSE= ASL
+LICENSE= AL2
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:U}
USE_ZIP=yes
diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile
index 438db48b113c..57f4f26df69d 100644
--- a/mail/alpine/Makefile
+++ b/mail/alpine/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= alpine-${PORTVERSION}
MAINTAINER= dougb@FreeBSD.org
COMMENT?= Mail and news client descended from Pine
-LICENSE= ASL
+LICENSE= AL2
OPTIONS+= THREADS "Compile with thread support" on \
MOUSE "Enable mouse support for xterm" on \
diff --git a/mail/cclient/Makefile b/mail/cclient/Makefile
index b71c5909d9f1..c8e7030f69a9 100644
--- a/mail/cclient/Makefile
+++ b/mail/cclient/Makefile
@@ -19,7 +19,7 @@ DISTNAME= imap-${PORTVERSION}
MAINTAINER= anders@FreeBSD.org
COMMENT= Mark Crispin's C-client mail access routines
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
OPTIONS= SSL "Compile with SSL support" on \
diff --git a/mail/horde4-ingo/Makefile b/mail/horde4-ingo/Makefile
index 244134faaa7c..354a529bb2de 100644
--- a/mail/horde4-ingo/Makefile
+++ b/mail/horde4-ingo/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX= horde-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde email filter rules manager
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE
LATEST_LINK= horde4-${PORTNAME}
diff --git a/mail/horde4-turba/Makefile b/mail/horde4-turba/Makefile
index bcd489c37163..4000ed8f031f 100644
--- a/mail/horde4-turba/Makefile
+++ b/mail/horde4-turba/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= mail www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde web based address book
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE
LATEST_LINK= horde4-${PORTNAME}
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index d4da403ad72d..cdfc6c9cc364 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -19,7 +19,7 @@ PKGNAMESUFFIX= -uw
MAINTAINER= anders@FreeBSD.org
COMMENT= University of Washington IMAP4rev1/POP2/POP3 mail servers
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
LIB_DEPENDS= c-client4.9:${PORTSDIR}/mail/cclient
diff --git a/mail/libdkim/Makefile b/mail/libdkim/Makefile
index c9067d3dba0f..6d1308092d83 100644
--- a/mail/libdkim/Makefile
+++ b/mail/libdkim/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= SF
MAINTAINER= skv@FreeBSD.org
COMMENT= DKIM (DomainKeys Identified Mail) library
-LICENSE= ASL
+LICENSE= AL2
USE_ZIP= YES
USE_LDCONFIG= YES
diff --git a/mail/mime4j/Makefile b/mail/mime4j/Makefile
index 7a503733d9a1..be1206e5740c 100644
--- a/mail/mime4j/Makefile
+++ b/mail/mime4j/Makefile
@@ -17,7 +17,7 @@ COMMENT= A Java parser for e-mail message streams
RUN_DEPENDS= ${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_JAVA= yes
diff --git a/mail/p5-SES/Makefile b/mail/p5-SES/Makefile
index 989f59bbf367..2a110676efb5 100644
--- a/mail/p5-SES/Makefile
+++ b/mail/p5-SES/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ses-tools-2011-10-31
MAINTAINER= stephon@gmail.com
COMMENT= Perl module of Amazon Simple Email Services
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= p5-Digest-SHA>=0:${PORTSDIR}/security/p5-Digest-SHA \
diff --git a/mail/spamass-ixhash/Makefile b/mail/spamass-ixhash/Makefile
index 27225b1b11ef..14eef91d9948 100644
--- a/mail/spamass-ixhash/Makefile
+++ b/mail/spamass-ixhash/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin \
${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
p5-Net-DNS>=0.63:${PORTSDIR}/dns/p5-Net-DNS
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE
SUB_FILES= pkg-message
NO_BUILD= yes
diff --git a/net-p2p/i2p/Makefile b/net-p2p/i2p/Makefile
index fbd5ffcfcd18..69c0ff114b51 100644
--- a/net-p2p/i2p/Makefile
+++ b/net-p2p/i2p/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY= i2psource_${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= lioux@FreeBSD.org
COMMENT= An anonymizing network
-LICENSE= ASL EULA
+LICENSE= AL2 EULA
LICENSE_COMB= multi
BUILD_DEPENDS= ${LOCALBASE}/lib/libgmp.a:${PORTSDIR}/math/gmp \
diff --git a/net/activemq/Makefile b/net/activemq/Makefile
index 8b7c182e5ab2..c7ed05eba13a 100644
--- a/net/activemq/Makefile
+++ b/net/activemq/Makefile
@@ -19,7 +19,7 @@ COMMENT= Messaging and Integration Patterns provider
NO_BUILD= yes
USE_JAVA= yes
-LICENSE= ASL
+LICENSE= AL2
JAVA_VERSION= 1.5+
MQDATA= ${PREFIX}/lib/${PORTNAME}
MQDB= ${PREFIX}/${PORTNAME}
diff --git a/net/googlecl/Makefile b/net/googlecl/Makefile
index 37039273c5db..66feab0a4b2c 100644
--- a/net/googlecl/Makefile
+++ b/net/googlecl/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gdata/__init__.py:${PORTSDIR}/devel/py-gdata
USE_PYTHON= yes
USE_PYDISTUTILS= yes
-LICENSE= ASL
+LICENSE= AL2
.if !defined(NO_INSTALL_MANPAGES)
MAN1= google.1
diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile
index 0dda92e314b4..23cd34379f7d 100644
--- a/net/mDNSResponder/Makefile
+++ b/net/mDNSResponder/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://opensource.apple.com/tarballs/mDNSResponder/
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Apple's mDNSResponder
-LICENSE= ASL BSD
+LICENSE= AL2 BSD
LICENSE_COMB= dual
CONFLICTS= avahi-libdns-[0-9]*
diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile
index 82cacb2e1d5b..3868229e013d 100644
--- a/net/openvswitch/Makefile
+++ b/net/openvswitch/Makefile
@@ -21,7 +21,7 @@ MASTER_SITES= http://openvswitch.org/releases/
MAINTAINER= trasz@FreeBSD.org
COMMENT= A production quality, multilayer virtual switch
-LICENSE= ASL
+LICENSE= AL2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= SSL_LIBS=-lssl SSL_CFLAGS=-I/usr/include/openssl
diff --git a/net/py-libcloud/Makefile b/net/py-libcloud/Makefile
index 071e5e79f0fc..fe2c6e240d90 100644
--- a/net/py-libcloud/Makefile
+++ b/net/py-libcloud/Makefile
@@ -16,7 +16,7 @@ DISTNAME= apache-${PORTNAME}-${PORTVERSION}
MAINTAINER= novel@FreeBSD.org
COMMENT= Standard client library for many popular cloud providers
-LICENSE= ASL
+LICENSE= AL2
USE_PYTHON= yes
USE_PYDISTUTILS=yes
diff --git a/print/pdfbox/Makefile b/print/pdfbox/Makefile
index fbb1fdbedae6..7bc3febcab21 100644
--- a/print/pdfbox/Makefile
+++ b/print/pdfbox/Makefile
@@ -19,7 +19,7 @@ COMMENT= Java PDF Library
RUN_DEPENDS= ${JAVAJARDIR}/bcmail.jar:${PORTSDIR}/java/bouncycastle \
${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging
-LICENSE= ASL
+LICENSE= AL2
USE_JAVA= yes
JAVA_VERSION= 1.5+
diff --git a/security/apache-xml-security-c/Makefile b/security/apache-xml-security-c/Makefile
index 2ba38e53b8a8..1e61caf00473 100644
--- a/security/apache-xml-security-c/Makefile
+++ b/security/apache-xml-security-c/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= apache-
MAINTAINER= janos.mohacsi@bsd.hu
COMMENT= Apache XML security libraries - C++ version
-LICENSE= ASL
+LICENSE= AL2
OPTIONS= XERCES_3 "With Xerces vesion 3.x (shibboleth2 requires)" on
diff --git a/security/honggfuzz/Makefile b/security/honggfuzz/Makefile
index 91f3681b81b8..85ee2b272411 100644
--- a/security/honggfuzz/Makefile
+++ b/security/honggfuzz/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= sbz@FreeBSD.org
COMMENT= A general-purpose fuzzer with simple, command-line interface
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/COPYING
USE_GMAKE= yes
diff --git a/security/p5-Net-SAML/Makefile b/security/p5-Net-SAML/Makefile
index 68663da617cc..c2ae42f61502 100644
--- a/security/p5-Net-SAML/Makefile
+++ b/security/p5-Net-SAML/Makefile
@@ -17,7 +17,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl extension for using SAML SSO
-LICENSE= ASL
+LICENSE= AL2
LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
zxid:${PORTSDIR}/security/zxid
diff --git a/security/pam_google_authenticator/Makefile b/security/pam_google_authenticator/Makefile
index 8107674f81a5..231c75248d4a 100644
--- a/security/pam_google_authenticator/Makefile
+++ b/security/pam_google_authenticator/Makefile
@@ -14,7 +14,7 @@ DISTNAME= google-authenticator-${PORTVERSION}
MAINTAINER= jnlin@csie.nctu.edu.tw
COMMENT= PAM module for two-step authentication from Google
-LICENSE= ASL
+LICENSE= AL2
WRKSRC= ${WRKDIR}/${DISTNAME}/libpam
diff --git a/security/pear-Auth_OpenID/Makefile b/security/pear-Auth_OpenID/Makefile
index 44481f40aac2..aa35b248c757 100644
--- a/security/pear-Auth_OpenID/Makefile
+++ b/security/pear-Auth_OpenID/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${RUN_DEPENDS}
CONFLICTS= php-Auth_OpenID-1.*
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/COPYING
USE_BZIP2= yes
diff --git a/security/py-kerberos/Makefile b/security/py-kerberos/Makefile
index df7800791bbe..708a50e00388 100644
--- a/security/py-kerberos/Makefile
+++ b/security/py-kerberos/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= roland@micite.net
COMMENT= Kerberos bindings for python
-LICENSE= ASL
+LICENSE= AL2
BUILD_DEPENDS= krb5-config:${PORTSDIR}/security/krb5
LIB_DEPENDS= krb5support.0:${PORTSDIR}/security/krb5
diff --git a/security/py-openssl/Makefile b/security/py-openssl/Makefile
index b3130accfc92..087d6fdfbace 100644
--- a/security/py-openssl/Makefile
+++ b/security/py-openssl/Makefile
@@ -16,7 +16,7 @@ DISTNAME= pyOpenSSL-${PORTVERSION}
MAINTAINER= sbz@FreeBSD.org
COMMENT= Python interface to the OpenSSL library
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_PYTHON= yes
diff --git a/security/skipfish/Makefile b/security/skipfish/Makefile
index edc6d678cb89..aa85cd3f11a6 100644
--- a/security/skipfish/Makefile
+++ b/security/skipfish/Makefile
@@ -13,7 +13,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= zi@FreeBSD.org
COMMENT= A fully automated, active web application security reconnaissance tool
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= idn.17:${PORTSDIR}/dns/libidn
diff --git a/security/xml-security/Makefile b/security/xml-security/Makefile
index 707ffd82efda..63dd0405f163 100644
--- a/security/xml-security/Makefile
+++ b/security/xml-security/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-common
RUN_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
${JAVALIBDIR}/xalan.jar:${PORTSDIR}/textproc/xalan-j
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_ZIP= yes
diff --git a/sysutils/dtpstree/Makefile b/sysutils/dtpstree/Makefile
index 55a133b7ac67..88c421d3419f 100644
--- a/sysutils/dtpstree/Makefile
+++ b/sysutils/dtpstree/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://apt.douglasthrift.net/files/${PORTNAME}/ \
MAINTAINER= douglas@douglasthrift.net
COMMENT= Display a tree of processes
-LICENSE= ASL
+LICENSE= AL2
USE_XZ= yes
USE_GMAKE= yes
diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile
index c4d032701460..063dbcc65acc 100644
--- a/sysutils/salt/Makefile
+++ b/sysutils/salt/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= https://github.com/downloads/saltstack/salt/
MAINTAINER= christer.edwards@gmail.com
COMMENT= Distributed, remote execution and configuration management system
-LICENSE= ASL
+LICENSE= AL2
LIB_DEPENDS= zmq.1:${PORTSDIR}/devel/zmq
diff --git a/textproc/etoile-lucenekit/Makefile b/textproc/etoile-lucenekit/Makefile
index d31165c629a4..740e46ba6830 100644
--- a/textproc/etoile-lucenekit/Makefile
+++ b/textproc/etoile-lucenekit/Makefile
@@ -15,7 +15,7 @@ DISTNAME= etoile-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Etoile Project OgreKit framework
-LICENSE= ASL
+LICENSE= AL2
USE_BZIP2= yes
USE_GNUSTEP= yes
diff --git a/textproc/fex/Makefile b/textproc/fex/Makefile
index c1e711323177..0869053122f9 100644
--- a/textproc/fex/Makefile
+++ b/textproc/fex/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://semicomplete.com/files/${PORTNAME}/ \
MAINTAINER= zi@FreeBSD.org
COMMENT= A powerful field extraction tool
-LICENSE= ASL
+LICENSE= AL2
PLIST_FILES= bin/fex
diff --git a/textproc/lucene/Makefile b/textproc/lucene/Makefile
index 72efe4a9aded..423d6bbea735 100644
--- a/textproc/lucene/Makefile
+++ b/textproc/lucene/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= gerrit.beine@gmx.de
COMMENT= A full-text search engine for Java
-LICENSE= ASL
+LICENSE= AL2
NO_BUILD= yes
USE_JAVA= yes
diff --git a/textproc/nltk/Makefile b/textproc/nltk/Makefile
index 1b6f1692d425..54061cd34fae 100644
--- a/textproc/nltk/Makefile
+++ b/textproc/nltk/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkin
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
${PYTHON_SITELIBDIR}/yaml/__init__.py:${PORTSDIR}/devel/py-yaml
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
PYDISTUTILS_EGGINFO= ${PORTNAME}-${DISTVERSION}-py${PYTHON_VER}.egg-info
diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile
index 11616c516f65..ef222a90f9d2 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -17,7 +17,7 @@ COMMENT= Apache XSLT processor for transforming XML documents
RUN_DEPENDS= ${JAVALIBDIR}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
USE_ZIP= yes
diff --git a/textproc/zorba/Makefile b/textproc/zorba/Makefile
index 70f1d2c24bf7..be3b4297df9b 100644
--- a/textproc/zorba/Makefile
+++ b/textproc/zorba/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}/
MAINTAINER= gahr@FreeBSD.org
COMMENT= A general purpose C++ XQuery processor
-LICENSE= ASL
+LICENSE= AL2
LIB_DEPENDS= xerces-c.3:${PORTSDIR}/textproc/xerces-c3 \
tidy:${PORTSDIR}/www/tidy-lib \
diff --git a/www/axis2/Makefile b/www/axis2/Makefile
index eaae91cac8ea..2afe6439450b 100644
--- a/www/axis2/Makefile
+++ b/www/axis2/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-bin
MAINTAINER= jgh@FreeBSD.org
COMMENT= Provides a Web Services,SOAP and WSDL engine from Apache
-LICENSE= ASL
+LICENSE= AL2
USE_ZIP= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/www/axis2/pkg-plist b/www/axis2/pkg-plist
index 61a2a061d1ff..3ebb88220cd7 100644
--- a/www/axis2/pkg-plist
+++ b/www/axis2/pkg-plist
@@ -213,4 +213,4 @@
@dirrmtry %%APPHOME%%/webapps/axis2/WEB-INF/lib/endorsed
@dirrmtry %%APPHOME%%/webapps/axis2/WEB-INF/lib
@dirrmtry %%APPHOME%%/webapps/axis2/WEB-INF
-@dirrmtry %%APPHOME%%/webapps/axis2 \ No newline at end of file
+@dirrmtry %%APPHOME%%/webapps/axis2
diff --git a/www/closure-compiler/Makefile b/www/closure-compiler/Makefile
index d3a80022d3e2..3988b0b26c6f 100644
--- a/www/closure-compiler/Makefile
+++ b/www/closure-compiler/Makefile
@@ -14,7 +14,7 @@ DISTNAME= compiler-${PORTVERSION}
MAINTAINER= jlaffaye@FreeBSD.org
COMMENT= Closure Compiler
-LICENSE= ASL
+LICENSE= AL2
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/www/closure-linter/Makefile b/www/closure-linter/Makefile
index cb78475a2acd..8437a0d464c6 100644
--- a/www/closure-linter/Makefile
+++ b/www/closure-linter/Makefile
@@ -15,7 +15,7 @@ DISTNAME= closure_linter-${PORTVERSION}
MAINTAINER= jlaffaye@FreeBSD.org
COMMENT= JavaScript linter
-LICENSE= ASL
+LICENSE= AL2
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gflags:${PORTSDIR}/devel/py-gflags
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gflags:${PORTSDIR}/devel/py-gflags
diff --git a/www/dtse/Makefile b/www/dtse/Makefile
index 2cd01f9c6a6e..1ef9ddab048e 100644
--- a/www/dtse/Makefile
+++ b/www/dtse/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= douglas@douglasthrift.net
COMMENT= An indexing search engine for use on small websites
-LICENSE= ASL
+LICENSE= AL2
.if defined(WITH_OPENSSL)
USE_OPENSSL= yes
diff --git a/www/htmlcompressor/Makefile b/www/htmlcompressor/Makefile
index 8f27c91a423f..5842a7865cc2 100644
--- a/www/htmlcompressor/Makefile
+++ b/www/htmlcompressor/Makefile
@@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= skv@FreeBSD.org
COMMENT= HTML/XML Compressor
-LICENSE= ASL
+LICENSE= AL2
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_ZIP= yes
diff --git a/www/httest/Makefile b/www/httest/Makefile
index 19ee81d5e8c9..5bda3aa67515 100644
--- a/www/httest/Makefile
+++ b/www/httest/Makefile
@@ -17,7 +17,7 @@ COMMENT= HTTP Test Tool
LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1 \
pcre.0:${PORTSDIR}/devel/pcre
-LICENSE= ASL
+LICENSE= AL2
GNU_CONFIGURE= yes
USE_OPENSSL= yes
diff --git a/www/httpclient/Makefile b/www/httpclient/Makefile
index 2f170fc18a3e..3ea9dcc88cfb 100644
--- a/www/httpclient/Makefile
+++ b/www/httpclient/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= ${JAVAJARDIR}/httpcore.jar:${PORTSDIR}/www/httpcore \
${JAVAJARDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
${JAVAJARDIR}/commons-codec.jar:${PORTSDIR}/java/jakarta-commons-codec
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
USE_JAVA= yes
diff --git a/www/httpcore/Makefile b/www/httpcore/Makefile
index a8a135de1650..69fbc105cbb1 100644
--- a/www/httpcore/Makefile
+++ b/www/httpcore/Makefile
@@ -15,7 +15,7 @@ DISTNAME= httpcomponents-core-${DISTVERSION}-bin
MAINTAINER= ale@FreeBSD.org
COMMENT= Java components implementing the base HTTP protocol
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
USE_JAVA= yes
diff --git a/www/jakarta-jmeter/Makefile b/www/jakarta-jmeter/Makefile
index 850c2fe4a23e..b60fa118dc0d 100644
--- a/www/jakarta-jmeter/Makefile
+++ b/www/jakarta-jmeter/Makefile
@@ -17,7 +17,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= beat@FreeBSD.org
COMMENT= Functional behaviour load and performance test application
-LICENSE= ASL
+LICENSE= AL2
USE_JAVA= yes
JAVA_VERSION= 1.5+
diff --git a/www/mod_auth_mysql2/Makefile b/www/mod_auth_mysql2/Makefile
index 9964e06005d2..6abee59fd5ef 100644
--- a/www/mod_auth_mysql2/Makefile
+++ b/www/mod_auth_mysql2/Makefile
@@ -17,7 +17,7 @@ DIST_SUBDIR= apache22
MAINTAINER= mm@FreeBSD.org
COMMENT= MySQL-based authentication module with VirtualHost support
-LICENSE= ASL
+LICENSE= AL2
LATEST_LINK= mod_auth_mysql2
diff --git a/www/mod_authn_sasl/Makefile b/www/mod_authn_sasl/Makefile
index 6a4e2657d393..6e87e7885289 100644
--- a/www/mod_authn_sasl/Makefile
+++ b/www/mod_authn_sasl/Makefile
@@ -20,7 +20,7 @@ MAKE_JOBS_SAFE= yes
OPTIONS= SASLAUTHD "Register dependency for cyrus-sasl2-saslauthd" off
-LICENSE= ASL
+LICENSE= AL2
USE_BZIP2= yes
USE_APACHE= 22
diff --git a/www/mod_geoip2/Makefile b/www/mod_geoip2/Makefile
index 475aca79a46b..d189859ef6d6 100644
--- a/www/mod_geoip2/Makefile
+++ b/www/mod_geoip2/Makefile
@@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= jau@iki.fi
COMMENT= An Apache module that provides the country code of the client's IP
-LICENSE= ASL
+LICENSE= AL2
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 aac573f50d62..a030972cd198 100644
--- a/www/mod_gnutls/Makefile
+++ b/www/mod_gnutls/Makefile
@@ -16,7 +16,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= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= gnutls.47:${PORTSDIR}/security/gnutls
diff --git a/www/mod_rivet/Makefile b/www/mod_rivet/Makefile
index cd9059e48b57..3a9dffafb7f3 100644
--- a/www/mod_rivet/Makefile
+++ b/www/mod_rivet/Makefile
@@ -18,7 +18,7 @@ COMMENT= Embeds a Tcl interpreter in the Apache server
WRKSRC= ${WRKDIR}/libapache2-mod-rivet-${PORTVERSION}
MAKE_JOBS_SAFE= yes
-LICENSE= ASL
+LICENSE= AL2
USE_APACHE= 22+
USE_AUTOTOOLS= automake autoconf
diff --git a/www/mod_setenvifplus/Makefile b/www/mod_setenvifplus/Makefile
index a77fc1d8a611..6c02886f3ac3 100644
--- a/www/mod_setenvifplus/Makefile
+++ b/www/mod_setenvifplus/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX= -src.tar.gz
MAINTAINER= ports@christianserving.org
COMMENT= Allows setting environment variables based on request attributes
-LICENSE= ASL
+LICENSE= AL2
USE_APACHE= 20+
AP_FAST_BUILD= YES
diff --git a/www/mod_wsgi/Makefile b/www/mod_wsgi/Makefile
index 55301f1edf5d..f31108708830 100644
--- a/www/mod_wsgi/Makefile
+++ b/www/mod_wsgi/Makefile
@@ -17,7 +17,7 @@ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX}
MAINTAINER= douglas@douglasthrift.net
COMMENT= Python WSGI adapter module for Apache
-LICENSE= ASL
+LICENSE= AL2
MAKE_JOBS_SAFE= yes
diff --git a/www/mod_wsgi3/Makefile b/www/mod_wsgi3/Makefile
index f1ca9e2a3058..b1ff357e0ed6 100644
--- a/www/mod_wsgi3/Makefile
+++ b/www/mod_wsgi3/Makefile
@@ -17,7 +17,7 @@ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX}
MAINTAINER= douglas@douglasthrift.net
COMMENT= Python WSGI adapter module for Apache
-LICENSE= ASL
+LICENSE= AL2
MAKE_JOBS_SAFE= yes
diff --git a/www/py-dtflickr/Makefile b/www/py-dtflickr/Makefile
index 28760e2699c8..2158a8407e78 100644
--- a/www/py-dtflickr/Makefile
+++ b/www/py-dtflickr/Makefile
@@ -16,7 +16,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= douglas@douglasthrift.net
COMMENT= Spiffy Flickr API library using JSON
-LICENSE= ASL
+LICENSE= AL2
USE_BZIP2= yes
USE_PYTHON= 2.5+
diff --git a/www/py-selenium/Makefile b/www/py-selenium/Makefile
index 0e1e0f3a69c0..1ca5f686c835 100644
--- a/www/py-selenium/Makefile
+++ b/www/py-selenium/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= douglas@douglasthrift.net
COMMENT= Python bindings for Selenium
-LICENSE= ASL
+LICENSE= AL2
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 af71ea81c665..1aafc6f34b33 100644
--- a/www/py-tornado/Makefile
+++ b/www/py-tornado/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= khsing.cn@gmail.com
COMMENT= Python Web Server from FriendFeed
-LICENSE= ASL
+LICENSE= AL2
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}curl>0:${PORTSDIR}/ftp/py-curl
diff --git a/www/tomcat-native/Makefile b/www/tomcat-native/Makefile
index 46ad9fb20b48..73a343d06709 100644
--- a/www/tomcat-native/Makefile
+++ b/www/tomcat-native/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= ale@FreeBSD.org
COMMENT= Tomcat native library
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKDIR}/${DISTNAME}/LICENSE
LIB_DEPENDS= apr-1:${PORTSDIR}/devel/apr1
diff --git a/www/tomcat6/Makefile b/www/tomcat6/Makefile
index 1681804d111c..7ec4e89c731f 100644
--- a/www/tomcat6/Makefile
+++ b/www/tomcat6/Makefile
@@ -15,7 +15,7 @@ DISTNAME= apache-${PORTNAME}-${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
COMMENT= Open-source Java web server by Apache, 6.x branch
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_JAVA= yes
diff --git a/www/tomcat7/Makefile b/www/tomcat7/Makefile
index cc7f143932a0..c391a23856b7 100644
--- a/www/tomcat7/Makefile
+++ b/www/tomcat7/Makefile
@@ -15,7 +15,7 @@ DISTNAME= apache-${PORTNAME}-${PORTVERSION}
MAINTAINER= ale@FreeBSD.org
COMMENT= Open-source Java web server by Apache, 7.x branch
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_JAVA= yes
diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile
index 5d21b2b2c141..7a1b0132707c 100644
--- a/www/trafficserver/Makefile
+++ b/www/trafficserver/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= APACHE/${PORTNAME}
MAINTAINER= jnlin@csie.nctu.edu.tw
COMMENT= A fast, scalable and extensible HTTP proxy server
-LICENSE= ASL
+LICENSE= AL2
LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \
expat.6:${PORTSDIR}/textproc/expat2 \
diff --git a/x11-fonts/droid-fonts-ttf/Makefile b/x11-fonts/droid-fonts-ttf/Makefile
index 21e381655220..72d2e2b774e8 100644
--- a/x11-fonts/droid-fonts-ttf/Makefile
+++ b/x11-fonts/droid-fonts-ttf/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= LOCAL/sunpoet/
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= The Droid typeface family
-LICENSE= ASL
+LICENSE= AL2
LICENSE_FILE= ${WRKSRC}/NOTICE
BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \