Update license of ports using MPL (without version)

All ports now should use MPL[10|11|20] license.

Approved by:	portmgr (blanket)

61 files changed, 62 insertions, 61 deletions

diff --git a/astro/readosm/Makefile b/astro/readosm/Makefile
index a0db47734cd9..26866cf7e5e9 100644
--- a/astro/readosm/Makefile
+++ b/astro/readosm/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}e
 MAINTAINER=	lbartoletti@tuxfamily.org
 COMMENT=	Extract valid data from within an Open Street Map input file
 
-LICENSE=	MPL LGPL21 GPLv2
+LICENSE=	MPL11 LGPL21 GPLv2
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2
diff --git a/databases/spatialite/Makefile b/databases/spatialite/Makefile
index d51ba056f561..e3f258100480 100644
--- a/databases/spatialite/Makefile
+++ b/databases/spatialite/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	lib${PORTNAME}-${PORTVERSION}
 MAINTAINER=	lbartoletti@tuxfamily.org
 COMMENT=	Spatial Extensions for SQLite
 
-LICENSE=	MPL LGPL20 GPLv2
+LICENSE=	MPL11 LGPL20 GPLv2
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libgeos_c.so:graphics/geos \
diff --git a/devel/ptlib/Makefile b/devel/ptlib/Makefile
index 9aa45704f496..3f72f3c0b391 100644
--- a/devel/ptlib/Makefile
+++ b/devel/ptlib/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Cross platform C++ library, used by OPAL
 
-LICENSE=	MPL
+LICENSE=	MPL10
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 
diff --git a/devel/soapui/Makefile b/devel/soapui/Makefile
index efd2ef67b99e..eb003576c7c9 100644
--- a/devel/soapui/Makefile
+++ b/devel/soapui/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	SoapUI-${PORTVERSION}-linux-bin
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Web service, SOA, and SOAP testing tool
 
-LICENSE=	EUPL LGPL21 LGPL3 APACHE11 APACHE20 BSD3CLAUSE MPL MIT CPL
+LICENSE=	EUPL LGPL21 LGPL3 APACHE11 APACHE20 BSD3CLAUSE MPL11 MIT CPL
 LICENSE_COMB=	multi
 LICENSE_NAME_EUPL=European Union Public Licence V. 1.1
 LICENSE_FILE_EUPL=${WRKSRC}/LICENSE.txt
diff --git a/devel/zziplib/Makefile b/devel/zziplib/Makefile
index 4987abab8569..58e147794108 100644
--- a/devel/zziplib/Makefile
+++ b/devel/zziplib/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}13/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library to provide transparent read access to zipped files
 
-LICENSE=	LGPL21 MPL
+LICENSE=	LGPL21 MPL11
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	zip:archivers/zip
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index c700523ed960..b3962315456e 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -27,7 +27,7 @@ COMMENT=	Command line tools from BIND: delv, dig, host, nslookup...
 COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
 .endif
 
-LICENSE=	MPL
+LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
diff --git a/dns/bind911/Makefile b/dns/bind911/Makefile
index e6c55a9d3e04..af55b022570c 100644
--- a/dns/bind911/Makefile
+++ b/dns/bind911/Makefile
@@ -26,7 +26,7 @@ COMMENT=	Command line tools from BIND: delv, dig, host, nslookup...
 COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
 .endif
 
-LICENSE=	MPL
+LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
diff --git a/dns/bind912/Makefile b/dns/bind912/Makefile
index 146008f8b7bf..9d5934b2f242 100644
--- a/dns/bind912/Makefile
+++ b/dns/bind912/Makefile
@@ -26,7 +26,7 @@ COMMENT=	Command line tools from BIND: delv, dig, host, nslookup...
 COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
 .endif
 
-LICENSE=	MPL
+LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
diff --git a/emulators/wine-gecko-devel/Makefile b/emulators/wine-gecko-devel/Makefile
index f3d00efa3b1a..c0614c2ae3a9 100644
--- a/emulators/wine-gecko-devel/Makefile
+++ b/emulators/wine-gecko-devel/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY=
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	Gecko Layout Engine for Wine development branch (HTML support)
 
-LICENSE=	MPL GPLv2 GPLv3 LGPL21 LGPL3
+LICENSE=	MPL20 GPLv2 GPLv3 LGPL21 LGPL3
 LICENSE_COMB=	multi
 
 NO_BUILD=	yes
diff --git a/emulators/wine-gecko/Makefile b/emulators/wine-gecko/Makefile
index fc2e1e9bb9d1..c92de03c6341 100644
--- a/emulators/wine-gecko/Makefile
+++ b/emulators/wine-gecko/Makefile
@@ -12,7 +12,7 @@ EXTRACT_ONLY=
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	Gecko Layout Engine for Wine (HTML support)
 
-LICENSE=	MPL GPLv2 GPLv3 LGPL21 LGPL3
+LICENSE=	MPL20 GPLv2 GPLv3 LGPL21 LGPL3
 LICENSE_COMB=	multi
 
 PORTSCOUT=	ignore:1	# for newer versions see emulators/wine-gecko-devel
diff --git a/graphics/libgltf/Makefile b/graphics/libgltf/Makefile
index e3317efd92db..0650780c1302 100644
--- a/graphics/libgltf/Makefile
+++ b/graphics/libgltf/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	LODEV
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	C++ Library for rendering OpenGL models stored in glTF format
 
-LICENSE=	LGPL21 MPL
+LICENSE=	LGPL21 MPL20
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/ptr_container/ptr_map.hpp:devel/boost-libs \
diff --git a/graphics/librasterlite/Makefile b/graphics/librasterlite/Makefile
index 592e755b61bc..06cd46a47a48 100644
--- a/graphics/librasterlite/Makefile
+++ b/graphics/librasterlite/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/librasterlite-sources/
 MAINTAINER=	lbartoletti@tuxfamily.org
 COMMENT=	Library that stores and retrieves raster coverages using a SpatiaLite
 
-LICENSE=	MPL GPLv2 LGPL21
+LICENSE=	MPL11 GPLv2 LGPL21
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libspatialite.so:databases/spatialite \
diff --git a/graphics/librasterlite2/Makefile b/graphics/librasterlite2/Makefile
index 4bb941408349..5cee728e18ee 100644
--- a/graphics/librasterlite2/Makefile
+++ b/graphics/librasterlite2/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/
 MAINTAINER=	lbartoletti@tuxfamily.org
 COMMENT=	Library that stores and retrieves raster coverages using a SpatiaLite
 
-LICENSE=	MPL GPLv2 LGPL21
+LICENSE=	MPL11 GPLv2 LGPL21
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libspatialite.so:databases/spatialite \
diff --git a/lang/rexx-regutil/Makefile b/lang/rexx-regutil/Makefile
index 7e2acd8e5cea..bcdb46469547 100644
--- a/lang/rexx-regutil/Makefile
+++ b/lang/rexx-regutil/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
 MAINTAINER=	bob@eager.cx
 COMMENT=	Implementation of IBM's RexxUtil function library for Regina
 
-LICENSE=	MPL
+LICENSE=	MPL10
 
 BUILD_DEPENDS=	${LOCALBASE}/include/rexxsaa.h:lang/rexx-regina
 
diff --git a/lang/rubinius/Makefile b/lang/rubinius/Makefile
index 32154544e375..8c23e37df9e0 100644
--- a/lang/rubinius/Makefile
+++ b/lang/rubinius/Makefile
@@ -11,7 +11,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	LLVM based ruby language implementation
 
-LICENSE=	MPL
+LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/bundle:sysutils/rubygem-bundler \
diff --git a/lang/sisc/Makefile b/lang/sisc/Makefile
index 2f9903b44fb1..a86aaafb46c2 100644
--- a/lang/sisc/Makefile
+++ b/lang/sisc/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/SISC/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Extensible Java-based Scheme interpreter
 
-LICENSE=	MPL GPLv2+
+LICENSE=	MPL11 GPLv2+
 LICENSE_COMB=	dual
 
 USE_JAVA=	yes
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 5bc6b04579a4..94e8d9300af0 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Integrated mail, calendar and address book distributed suite
 
-LICENSE=	GFDL GPLv2+ LGPL21+ MPL OPENLDAP
+LICENSE=	GFDL GPLv2+ LGPL21+ MPL11 OPENLDAP
 LICENSE_COMB=	multi
 LICENSE_NAME_OPENLDAP=	OpenLDAP Public License
 LICENSE_FILE_OPENLDAP=	${WRKSRC}/COPYING.OPENLDAP
diff --git a/math/eigen3/Makefile b/math/eigen3/Makefile
index 44b63b2a617d..4decf14cecf8 100644
--- a/math/eigen3/Makefile
+++ b/math/eigen3/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Lightweight library for vector and matrix math
 
-LICENSE=	LGPL21 MPL
+LICENSE=	LGPL21 MPL20
 LICENSE_COMB=	multi
 
 CMAKE_ARGS=	-DPKGCONFIG_INSTALL_DIR:PATH="${PREFIX}/libdata/pkgconfig"
diff --git a/math/jtransforms/Makefile b/math/jtransforms/Makefile
index 3798a638d4d1..234ee89739a2 100644
--- a/math/jtransforms/Makefile
+++ b/math/jtransforms/Makefile
@@ -9,7 +9,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Multithreaded FFT library written in pure Java
 
-LICENSE=	GPLv2 LGPL20 MPL
+LICENSE=	GPLv2 LGPL20 MPL11
 LICENSE_COMB=	multi
 
 USES=		tar:bzip2
diff --git a/math/rpy/Makefile b/math/rpy/Makefile
index aa2ed74ef1e8..a4ff8df01d94 100644
--- a/math/rpy/Makefile
+++ b/math/rpy/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python interface to the R Programming Language
 
-LICENSE=	GPLv2 LGPL21 MPL
+LICENSE=	GPLv2 LGPL21 MPL11
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${PYNUMPY}
diff --git a/misc/bdelta/Makefile b/misc/bdelta/Makefile
index 4d58a7731445..70f9ecf8e3df 100644
--- a/misc/bdelta/Makefile
+++ b/misc/bdelta/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	misc devel
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Advanced delta creator, patcher, and library
 
-LICENSE=	MPL
+LICENSE=	MPL20
 
 WRKSRC_SUBDIR=	src
 
diff --git a/multimedia/gstreamer-plugins-fluendo-mpegdemux/Makefile b/multimedia/gstreamer-plugins-fluendo-mpegdemux/Makefile
index 2c86582f59df..eb0a9a0d6214 100644
--- a/multimedia/gstreamer-plugins-fluendo-mpegdemux/Makefile
+++ b/multimedia/gstreamer-plugins-fluendo-mpegdemux/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	gst-fluendo-mpegdemux-${PORTVERSION}
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	MPEG2 demuxing gstreamer plugin from fluendo
 
-LICENSE=	MPL
+LICENSE=	MPL11
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/multimedia/mp4v2/Makefile b/multimedia/mp4v2/Makefile
index 9da47ca430dd..b58fe90a9db0 100644
--- a/multimedia/mp4v2/Makefile
+++ b/multimedia/mp4v2/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	LOCAL/riggs/mp4v2
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Library and tools to read, create, and modify mp4 files
 
-LICENSE=	MPL
+LICENSE=	MPL11
 
 CONFLICTS=	mpeg4ip-libmp4v2-[0-9.]*
 USES=		compiler gmake libtool tar:bzip2
diff --git a/multimedia/tstools/Makefile b/multimedia/tstools/Makefile
index 2755f1eba341..bb18ffefa2e4 100644
--- a/multimedia/tstools/Makefile
+++ b/multimedia/tstools/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	BERLIOS
 MAINTAINER=	fbsd@opal.com
 COMMENT=	MPEG transport, program, and elementary stream tools
 
-LICENSE=	MPL
+LICENSE=	MPL11
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index 0db0d5ef86b3..0a2f981325fd 100644
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -12,7 +12,7 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	corsmith@gmail.com
 COMMENT=	Multi-protocol soft switch for telephony applications
 
-LICENSE=	MPL
+LICENSE=	MPL11
 
 ONLY_FOR_ARCHS=	amd64
 
diff --git a/net/h323plus/Makefile b/net/h323plus/Makefile
index a497f45a6b96..7c256f3db277 100644
--- a/net/h323plus/Makefile
+++ b/net/h323plus/Makefile
@@ -10,7 +10,8 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION:S/./_/g}
 MAINTAINER=	koue@chaosophia.net
 COMMENT=	H323 Video Conferencing library
 
-LICENSE=	MPL
+LICENSE=	MPL10 MPL11
+LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libpt.so:devel/ptlib
 
diff --git a/net/kea/Makefile b/net/kea/Makefile
index 40260e3e320c..a4cd2f7da32f 100644
--- a/net/kea/Makefile
+++ b/net/kea/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	ISC/kea/${PORTVERSION}
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Alternative DHCP implementation by ISC
 
-LICENSE=	MPL
+LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	liblog4cplus.so:devel/log4cplus \
diff --git a/net/libcmis/Makefile b/net/libcmis/Makefile
index 4d23bee5243e..e37fd4432e56 100644
--- a/net/libcmis/Makefile
+++ b/net/libcmis/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://dev-www.libreoffice.org/src/
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Client library for the CMIS interface
 
-LICENSE=	LGPL20 MPL GPLv2
+LICENSE=	LGPL20 MPL11 GPLv2
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libcurl.so:ftp/curl
diff --git a/net/ohphone/Makefile b/net/ohphone/Makefile
index 2d456916c55c..a5bba515c861 100644
--- a/net/ohphone/Makefile
+++ b/net/ohphone/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/distfiles/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	H323 Video Conferencing Program, compatible with NetMeeting
 
-LICENSE=	MPL
+LICENSE=	MPL10
 
 LIB_DEPENDS=	libh323_r.so:net/openh323
 
diff --git a/net/opal/Makefile b/net/opal/Makefile
index e405e47ca597..5a1824ca6c6e 100644
--- a/net/opal/Makefile
+++ b/net/opal/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	VoIP abstraction library
 
-LICENSE=	MPL
+LICENSE=	MPL10
 
 LIB_DEPENDS=	libpt.so:devel/ptlib
 
diff --git a/net/rabbitmq-c/Makefile b/net/rabbitmq-c/Makefile
index 8d5f1c8b73a8..4f1a0b9aa9c8 100644
--- a/net/rabbitmq-c/Makefile
+++ b/net/rabbitmq-c/Makefile
@@ -15,7 +15,7 @@ DIST_SUBDIR=	rabbitmq
 MAINTAINER=	rabbitmq@geoffgarside.co.uk
 COMMENT=	RabbitMQ C AMQP client library
 
-LICENSE=	GPLv2 MPL
+LICENSE=	GPLv2 MPL11
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	python:lang/python \
diff --git a/portuguese/hunspell/Makefile b/portuguese/hunspell/Makefile
index 882bf4fabffc..6e5e243204ea 100644
--- a/portuguese/hunspell/Makefile
+++ b/portuguese/hunspell/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Portuguese hunspell dictionaries
 # We pick the common one among:
 # - pt_PT is licensed under GPLv2, LGPL21 and MPL11.
 # - pt_BR is licensed under LGPL3 and MPL.
-LICENSE=	MPL
+LICENSE=	MPL11
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/print/libmspub01/Makefile b/print/libmspub01/Makefile
index 7c08ceeb4a6d..bb0eb8d0ba8a 100644
--- a/print/libmspub01/Makefile
+++ b/print/libmspub01/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	01
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Library and tools for parsing Microsoft Publisher file format
 
-LICENSE=	LGPL21 MPL GPLv2
+LICENSE=	GPLv2+ LGPL21+ MPL20
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/ptr_container/ptr_map.hpp:devel/boost-libs
diff --git a/print/libpagemaker/Makefile b/print/libpagemaker/Makefile
index e7d96a0287ad..14329c2613e1 100644
--- a/print/libpagemaker/Makefile
+++ b/print/libpagemaker/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	LIBREOFFICE_DEV
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Library and tools for parsing Aldus/Adobe PageMaker documents
 
-LICENSE=	MPL
+LICENSE=	MPL20
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/format.hpp:devel/boost-libs
 LIB_DEPENDS=	librevenge-0.0.so:textproc/librevenge
diff --git a/security/elixir-jose/Makefile b/security/elixir-jose/Makefile
index f7567c3ae129..13f76537c99e 100644
--- a/security/elixir-jose/Makefile
+++ b/security/elixir-jose/Makefile
@@ -8,7 +8,7 @@ PKGNAMEPREFIX=	elixir-
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	JSON Object Signing and Encryption (JOSE) for Elixir
 
-LICENSE=	MPL
+LICENSE=	MPL20
 
 USES=		elixir
 USE_GITHUB=	yes
diff --git a/security/erlang-jose/Makefile b/security/erlang-jose/Makefile
index c39f822c3500..54b63e4e5528 100644
--- a/security/erlang-jose/Makefile
+++ b/security/erlang-jose/Makefile
@@ -8,7 +8,7 @@ PKGNAMEPREFIX=	erlang-
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	JSON Object Signing and Encryption (JOSE) for Erlang
 
-LICENSE=	MPL
+LICENSE=	MPL20
 
 USES=		erlang:rebar
 USE_GITHUB=	yes
diff --git a/security/linux-c6-nss/Makefile b/security/linux-c6-nss/Makefile
index 748a498023e1..50e321102f93 100644
--- a/security/linux-c6-nss/Makefile
+++ b/security/linux-c6-nss/Makefile
@@ -15,7 +15,7 @@ SRC_DISTFILES=	${DISTNAME}${SRC_SUFX}:SOURCE \
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Network Security Services (Linux CentOS ${LINUX_DIST_VER})
 
-LICENSE=	MPL
+LICENSE=	MPL20
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 RPMVERSION=	4.el6_9
diff --git a/sysutils/consul/Makefile b/sysutils/consul/Makefile
index 539bb616a094..0e2bec9178bc 100644
--- a/sysutils/consul/Makefile
+++ b/sysutils/consul/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	sysutils
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Service discovery and configuration made easy
 
-LICENSE=	MPL
+LICENSE=	MPL20
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
diff --git a/sysutils/envconsul/Makefile b/sysutils/envconsul/Makefile
index b4c13c0af931..7afe38074f44 100644
--- a/sysutils/envconsul/Makefile
+++ b/sysutils/envconsul/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	sysutils
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Populate values from Consul into a process environment
 
-LICENSE=	MPL
+LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
diff --git a/sysutils/serf/Makefile b/sysutils/serf/Makefile
index 3e88aba2c6ad..ed6d4e2ea523 100644
--- a/sysutils/serf/Makefile
+++ b/sysutils/serf/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX=	hashicorp-
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Service discovery and configuration made easy
 
-LICENSE=	MPL
+LICENSE=	MPL20
 
 BUILD_DEPENDS=	go:lang/go
 
diff --git a/sysutils/ua/Makefile b/sysutils/ua/Makefile
index 90d6811ab720..7652007a33f0 100644
--- a/sysutils/ua/Makefile
+++ b/sysutils/ua/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	sysutils
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Finds sets of identical files
 
-LICENSE=	MPL
+LICENSE=	MPL11
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	euedge
diff --git a/textproc/consul-template/Makefile b/textproc/consul-template/Makefile
index 125316ed8099..376351ebf59a 100644
--- a/textproc/consul-template/Makefile
+++ b/textproc/consul-template/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	textproc
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Generic template rendering and notifications with Consul
 
-LICENSE=	MPL
+LICENSE=	MPL20
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
diff --git a/textproc/es-hyphen/Makefile b/textproc/es-hyphen/Makefile
index eff32bf7986d..495f55bb0017 100644
--- a/textproc/es-hyphen/Makefile
+++ b/textproc/es-hyphen/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Spanish hyphenation rules
 
-LICENSE=	GPLv3 LGPL3 MPL
+LICENSE=	GPLv3 LGPL3 MPL11
 LICENSE_COMB=	dual
 
 NO_ARCH=	yes
diff --git a/textproc/libabw/Makefile b/textproc/libabw/Makefile
index 9a2af62cfd9a..9d4d9f1b20fe 100644
--- a/textproc/libabw/Makefile
+++ b/textproc/libabw/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	LODEV/${PORTNAME}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Library providing ability to interpret Abiword documents
 
-LICENSE=	MPL
+LICENSE=	MPL20
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/algorithm/string.hpp:devel/boost-libs
 LIB_DEPENDS=	librevenge-0.0.so:textproc/librevenge
diff --git a/textproc/libe-book/Makefile b/textproc/libe-book/Makefile
index b6114a3d8c50..a917a9050bf6 100644
--- a/textproc/libe-book/Makefile
+++ b/textproc/libe-book/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/libebook/${PORTNAME}-${PORTVERSION}/
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Library for import of reflowable e-book formats
 
-LICENSE=	MPL
+LICENSE=	MPL20
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/algorithm/string.hpp:devel/boost-libs
 LIB_DEPENDS=	libicui18n.so:devel/icu \
diff --git a/textproc/libodfgen01/Makefile b/textproc/libodfgen01/Makefile
index 49fb125d6d30..16ea1f8c590b 100644
--- a/textproc/libodfgen01/Makefile
+++ b/textproc/libodfgen01/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	01
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Library for generating documents in Open Document Format (ODF)
 
-LICENSE=	LGPL21 MPL
+LICENSE=	LGPL21 MPL20
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	librevenge-0.0.so:textproc/librevenge
diff --git a/textproc/librevenge/Makefile b/textproc/librevenge/Makefile
index 4b36ee852fb8..ff0be56aead2 100644
--- a/textproc/librevenge/Makefile
+++ b/textproc/librevenge/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/libwpd/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Base library for writing document import filters
 
-LICENSE=	LGPL21 MPL
+LICENSE=	LGPL21 MPL20
 LICENSE_COMB=	dual
 
 USES=		gmake libtool pathfix tar:xz
diff --git a/textproc/rubygem-itextomml/Makefile b/textproc/rubygem-itextomml/Makefile
index a8f53dfc3b4c..3e60b541ddd4 100644
--- a/textproc/rubygem-itextomml/Makefile
+++ b/textproc/rubygem-itextomml/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	RG
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Native Ruby bindings to itex2MML
 
-LICENSE=	GPLv2 LGPL20 MPL
+LICENSE=	GPLv2 LGPL20 MPL11
 LICENSE_COMB=	dual
 
 USE_RUBY=	yes
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index ba7dd29dee13..11b1cf69508e 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/sablotron/sablotron-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XML toolkit implementing XSLT 1.0, XPath 1.0 and DOM Level2
 
-LICENSE=	MPL GPLv2+
+LICENSE=	MPL11 GPLv2+
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2
diff --git a/textproc/saxon/Makefile b/textproc/saxon/Makefile
index 80ce3d5c1baf..cb9e00da25df 100644
--- a/textproc/saxon/Makefile
+++ b/textproc/saxon/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION:S/./-/g}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XSLT 1.0 processor for Java
 
-LICENSE=	MPL
+LICENSE=	MPL10
 
 USES=		zip
 USE_JAVA=	yes
diff --git a/www/geckodriver/Makefile b/www/geckodriver/Makefile
index 5b3db297e52a..4af3d90c6dcf 100644
--- a/www/geckodriver/Makefile
+++ b/www/geckodriver/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	www
 MAINTAINER=	daniel@blodan.se
 COMMENT=	Proxy for using WebDriver clients with Gecko-based browsers
 
-LICENSE=	MPL
+LICENSE=	MPL20
 
 USES=		cargo
 USE_GITHUB=	yes
diff --git a/www/google-appengine/Makefile b/www/google-appengine/Makefile
index b1a64426e950..669830bca5aa 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=	APACHE20 BSD3CLAUSE GPLv2 LGPL21 MIT MPL PSFL
+LICENSE=	APACHE20 BSD3CLAUSE GPLv2 LGPL21 MIT MPL11 PSFL
 LICENSE_COMB=	multi
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=${PYTHON_VER}:databases/py-sqlite3 \
diff --git a/www/iridium/Makefile b/www/iridium/Makefile
index 2493ff35e001..709e0cb09150 100644
--- a/www/iridium/Makefile
+++ b/www/iridium/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 MAINTAINER=	chromium@FreeBSD.org
 COMMENT=	Iridium browser
 
-LICENSE=	BSD3CLAUSE LGPL21 MPL
+LICENSE=	BSD3CLAUSE LGPL21 MPL11
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	gperf:devel/gperf \
diff --git a/www/sahi/Makefile b/www/sahi/Makefile
index b7eed8c6cf14..44fdb84fc43c 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=	APACHE20 MPL
+LICENSE=	APACHE20 MPL11
 LICENSE_COMB=	multi
 
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
diff --git a/www/sfnt2woff/Makefile b/www/sfnt2woff/Makefile
index e3f815e76f5e..1a3595eefe70 100644
--- a/www/sfnt2woff/Makefile
+++ b/www/sfnt2woff/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	woff-code-latest
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert TTF/OTF fonts to WOFF web embeddable format and back
 
-LICENSE=	GPLv2 LGPL21 MPL
+LICENSE=	GPLv2 LGPL21 MPL11
 LICENSE_COMB=	multi
 
 NO_WRKSUBDIR=	yes
diff --git a/www/tdom/Makefile b/www/tdom/Makefile
index d6fa20a995bc..59964a5d2adb 100644
--- a/www/tdom/Makefile
+++ b/www/tdom/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	GHC http://mirrors.rit.edu/zi/
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	High performance XML data processing with Tcl (ARGS for OpenACS)
 
-LICENSE=	MPL MIT
+LICENSE=	MPL11 MIT
 LICENSE_COMB=	multi
 LICENSE_FILE_MIT=	${WRKSRC}/expat/COPYING
 
diff --git a/www/xpi-conkeror/Makefile b/www/xpi-conkeror/Makefile
index ce383a8cb0dd..fc043fc9f95d 100644
--- a/www/xpi-conkeror/Makefile
+++ b/www/xpi-conkeror/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://distfiles.pirateparty.in/ashish/ \
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Keyboard-oriented, customizable web browser based on Mozilla XULRunner
 
-LICENSE=	GPLv1 GPLv2 MPL
+LICENSE=	GPLv1 GPLv2 MPL11
 LICENSE_COMB=	multi
 
 OPTIONS_SINGLE+=	XULRUNNER
diff --git a/www/xpi-jslib/Makefile b/www/xpi-jslib/Makefile
index 979c5e0250ef..701566cd62da 100644
--- a/www/xpi-jslib/Makefile
+++ b/www/xpi-jslib/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	jslib_${PORTVERSION}_lite
 MAINTAINER=	lapo@lapo.it
 COMMENT=	Library of common useful routines for XPI developers
 
-LICENSE=	MPL
+LICENSE=	MPL11
 
 XPI_ID=		{DF8E5247-8E0A-4de6-B393-0735A39DFD80}
 XPI_FILES=	application.ini chrome/jslib.jar chrome/jsliblive/contents.rdf chrome/jsliblive/jsliblive.xul chrome.manifest \
diff --git a/www/xpi-stumbleupon/Makefile b/www/xpi-stumbleupon/Makefile
index 00b1e23f5f46..44aa753efb83 100644
--- a/www/xpi-stumbleupon/Makefile
+++ b/www/xpi-stumbleupon/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	www
 MAINTAINER=	lapo@lapo.it
 COMMENT=	Collaborative surfing tool extension
 
-LICENSE=	MPL
+LICENSE=	MPL11
 
 XPI_NUM=	138
 XPI_ID=		{AE93811A-5C9A-4d34-8462-F7B864FC4696}
diff --git a/www/xpi-tagzilla/Makefile b/www/xpi-tagzilla/Makefile
index b7f762bfc7cf..7b00e21ee3c2 100644
--- a/www/xpi-tagzilla/Makefile
+++ b/www/xpi-tagzilla/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Lets you add a tagline to the end of an email or newsgroup posting
 
 RUN_DEPENDS=	${LOCALBASE}/lib/xpi/{DF8E5247-8E0A-4de6-B393-0735A39DFD80}/install.rdf:www/xpi-jslib
 
-LICENSE=	MPL # also "GPL" but doesn't specify version and doesn't contain license text
+LICENSE=	MPL11 # also "GPL" but doesn't specify version and doesn't contain license text
 
 XPI_ID=		{4eac6fec-f68b-4797-be7a-ffeea73e1495}
 XPI_FILES=	chrome/tagzilla.jar chrome.manifest components/tzprefs-service.js \
diff --git a/x11-toolkits/libgdiplus/Makefile b/x11-toolkits/libgdiplus/Makefile
index a9bc6c5b85ec..9b1a1944d9bb 100644
--- a/x11-toolkits/libgdiplus/Makefile
+++ b/x11-toolkits/libgdiplus/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://download.mono-project.com/sources/${PORTNAME}/
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	GDI+ API for System.Windows.Forms in Mono
 
-LICENSE=	MPL
+LICENSE=	MPL11
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libtiff.so:graphics/tiff \