Fix some misspelled or duplicated LICENSE_*

40 files changed, 44 insertions, 51 deletions

diff --git a/audio/libaacplus/Makefile b/audio/libaacplus/Makefile
index 2ba447c42800..20459e7f2379 100644
--- a/audio/libaacplus/Makefile
+++ b/audio/libaacplus/Makefile
@@ -18,7 +18,6 @@ LICENSE=	libaacplus
 LICENSE_NAME=	3GPP
 LICENSE_TEXT=	${RESTRICTED}
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell auto-accept
-LICENSE_DISTFILES_LGPL=	${DISTNAME}${EXTRACT_SUFX}
 LICENSE_DISTFILES_3GPP=	${SRC26410}
 
 RESTRICTED=	unclear legal status, probably need licenses from 3GPP, Via Licensing and Coding Technologies
diff --git a/audio/splay/Makefile b/audio/splay/Makefile
index b6a205322085..8446dde7e242 100644
--- a/audio/splay/Makefile
+++ b/audio/splay/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Audio player that decodes MPEG Layer 1/2/3 and WAV files
 
 LICENSE=	GPLv2+ LGPL20+
 LICENSE_COMB=	multi
-LICENSE_FILE_GPLv2+=	COPYING
-LICENSE_FILE_LGPL20+=	COPYING.LIB
+LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
+LICENSE_FILE_LGPL20+ =	${WRKSRC}/COPYING.LIB
 
 GNU_CONFIGURE=	yes
 
diff --git a/biology/seqan1/Makefile b/biology/seqan1/Makefile
index a256864ec0d9..df8fb2117675 100644
--- a/biology/seqan1/Makefile
+++ b/biology/seqan1/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	h2+fbsdports@fsfe.org
 COMMENT=	C++ Sequence Analysis Library
 
 LICENSE=	BSD3CLAUSE
-LICENSE_FILE_BSD=${WRKSRC}/seqan/LICENSE
+LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/seqan/LICENSE
 
 USES=		zip
 NO_BUILD=	yes
diff --git a/converters/py-text-unidecode/Makefile b/converters/py-text-unidecode/Makefile
index 55fd1c198ee2..557f5fca4ca4 100644
--- a/converters/py-text-unidecode/Makefile
+++ b/converters/py-text-unidecode/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Most basic port of Perl's Text::Unidecode module
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE_ART10=	${WRKSRC}/LICENSE
-LICENSE_FILE_GPLv1=	${WRKSRC}/LICENSE
+LICENSE_FILE_GPLv1+ =	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile
index 7680045a394f..79dceeb0adf7 100644
--- a/databases/libgda5/Makefile
+++ b/databases/libgda5/Makefile
@@ -14,8 +14,8 @@ COMMENT?=	Provides uniform access to different kinds of data sources
 
 LICENSE=	GPLv2+ LGPL20+
 LICENSE_COMB=	multi
-LICENSE_FILE_GPLv20+ =	${WRKSRC}/COPYING
-LICENSE_FILE_LGPL2+ =	${WRKSRC}/COPYING.LIB
+LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
+LICENSE_FILE_LGPL20+ =	${WRKSRC}/COPYING.LIB
 
 USES=		python readline shebangfix tar:xz
 LIBGDA5_SLAVE?=	no
diff --git a/databases/libiodbc/Makefile b/databases/libiodbc/Makefile
index 69fa8a093be2..33516cb0be78 100644
--- a/databases/libiodbc/Makefile
+++ b/databases/libiodbc/Makefile
@@ -11,7 +11,7 @@ COMMENT=	ODBC 3.x driver manager, for universal data source access
 
 LICENSE=		BSD3CLAUSE LGPL20
 LICENSE_COMB=		dual
-LICENSE_FILE_BSD=	${WRKSRC}/LICENSE.BSD
+LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSE.BSD
 LICENSE_FILE_LGPL20=	${WRKSRC}/LICENSE.LGPL
 
 USES=		autoreconf libtool pathfix pkgconfig
diff --git a/databases/p5-DBIx-Abstract/Makefile b/databases/p5-DBIx-Abstract/Makefile
index 94c383d26dfd..ba3608b9e743 100644
--- a/databases/p5-DBIx-Abstract/Makefile
+++ b/databases/p5-DBIx-Abstract/Makefile
@@ -14,7 +14,7 @@ COMMENT=	DBIx::Abstract - DBI SQL abstraction
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE_ART10=	${WRKSRC}/LICENSE
-LICENSE_FILE_GPLv1=	${WRKSRC}/LICENSE
+LICENSE_FILE_GPLv1+ =	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	p5-Check-ISA>=0:devel/p5-Check-ISA \
 		p5-DBI>=0:databases/p5-DBI
diff --git a/devel/gettext-runtime/Makefile b/devel/gettext-runtime/Makefile
index 711eb65e489b..33dbbcf4637b 100644
--- a/devel/gettext-runtime/Makefile
+++ b/devel/gettext-runtime/Makefile
@@ -11,8 +11,8 @@ COMMENT=	GNU gettext runtime libraries and programs
 
 LICENSE=	LGPL21+ GPLv3+
 LICENSE_COMB=	multi
-LICENSE_FILE_LGPL21=	${WRKSRC}/intl/COPYING.LIB
-LICENSE_FILE_GPLv3=	${WRKSRC}/../COPYING
+LICENSE_FILE_LGPL21+ =	${WRKSRC}/intl/COPYING.LIB
+LICENSE_FILE_GPLv3+ =	${WRKSRC}/../COPYING
 
 .include "${.CURDIR}/../gettext/Makefile.common"
 
diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index f28e5edeaab5..988ac3e8aa7e 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Generate interface introspection data for GObject libraries
 
 LICENSE=	GPLv2+ LGPL20+
 LICENSE_COMB=	multi
-LICENSE_FILE_LGPL2+=	${WRKSRC}/COPYING.LGPL
-LICENSE_FILE_GPLv2+=	${WRKSRC}/COPYING.GPL
+LICENSE_FILE_LGPL20+ =	${WRKSRC}/COPYING.LGPL
+LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING.GPL
 
 # we need cairo otherwise the generated Cairo gir is broken
 BUILD_DEPENDS=	cairo-trace:graphics/cairo
diff --git a/devel/kf5-kcoreaddons/Makefile b/devel/kf5-kcoreaddons/Makefile
index 1ac9b4a2a18f..0551099ee9ce 100644
--- a/devel/kf5-kcoreaddons/Makefile
+++ b/devel/kf5-kcoreaddons/Makefile
@@ -9,7 +9,7 @@ COMMENT=	KF5 addons to QtCore
 
 LICENSE=	LGPL21+ BSD3CLAUSE
 LICENSE_COMB=	multi
-LICENSE_FILE_LGPL21+=	${WRKSRC}/COPYING.LIB
+LICENSE_FILE_LGPL21+ =	${WRKSRC}/COPYING.LIB
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/COPYING-CMAKE-SCRIPTS
 
 USES=		cmake compiler:c++11-lib kde:5 qt:5 shared-mime-info tar:xz
diff --git a/devel/p5-SPOPS/Makefile b/devel/p5-SPOPS/Makefile
index 71d6906564dc..b282d0897347 100644
--- a/devel/p5-SPOPS/Makefile
+++ b/devel/p5-SPOPS/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple Perl Object Persistence with Security
 
 LICENSE=	ART10 GPLv2+
 LICENSE_COMB=	dual
-LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
+LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-Accessor>=0.17:devel/p5-Class-Accessor \
diff --git a/devel/rubygem-native-package-installer/Makefile b/devel/rubygem-native-package-installer/Makefile
index 3a4db2b8ceaf..29e09dade48d 100644
--- a/devel/rubygem-native-package-installer/Makefile
+++ b/devel/rubygem-native-package-installer/Makefile
@@ -9,7 +9,7 @@ MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Helper to install native packages on "gem install"
 
 LICENSE=	LGPL3+
-LICENSE_FILE_LGPL3=	${WRKSRC}/doc/text/lgpl-3.txt
+LICENSE_FILE_LGPL3+ =	${WRKSRC}/doc/text/lgpl-3.txt
 
 USES=		gem
 USE_RUBY=	yes
diff --git a/emulators/mgba/Makefile b/emulators/mgba/Makefile
index 36542fade23c..413f600ad019 100644
--- a/emulators/mgba/Makefile
+++ b/emulators/mgba/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Game Boy Advance (GBA) emulator/debugger
 LICENSE=	MPL20 BSD3CLAUSE LGPL21+
 LICENSE_COMB=	multi
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/src/third-party/inih/LICENSE.txt
-LICENSE_FILE_LGPL21+=	${WRKSRC}/src/third-party/blip_buf/license.txt
+LICENSE_FILE_LGPL21+ =	${WRKSRC}/src/third-party/blip_buf/license.txt
 LICENSE_FILE_MPL20=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libepoxy.so:graphics/libepoxy \
diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile
index c1584d7c8484..c970386bd286 100644
--- a/emulators/yuzu/Makefile
+++ b/emulators/yuzu/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	emulators
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Nintendo Switch emulator/debugger
 
-LICENSE=	APACHE20 BSD2CLAUSE BSD3CLAUSE BSL GPLv2+ ISCL LGPL21+ MIT OpenSSL UNLICENSE
+LICENSE=	APACHE20 BSD2CLAUSE BSD3CLAUSE BSL GPLv2+ ISCL LGPL21+ LGPL3+ MIT OpenSSL UNLICENSE
 LICENSE_COMB=	multi
 LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/externals/fmt/LICENSE.rst
 LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/externals/inih/inih/LICENSE.txt
diff --git a/games/motogt/Makefile b/games/motogt/Makefile
index 672fa6ff04b4..afe6b6e3c54a 100644
--- a/games/motogt/Makefile
+++ b/games/motogt/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libsfml1-system.so:devel/sfml1 \
 
 LICENSE=	GPLv2 CC-BY-SA-3.0
 LICENSE_COMB=	multi
-LICENSE_FILE_GPLv20=	${WRKSRC}/doc/gpl.txt
+LICENSE_FILE_GPLv2=	${WRKSRC}/doc/gpl.txt
 LICENSE_FILE_CC-BY-SA-3.0=	${WRKSRC}/doc/cc-by-sa.txt
 
 USES=		localbase:ldflags zip
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 40ef6afdb19e..44b44c8b502d 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Full featured open source SVG editor
 
 LICENSE=	GPLv2+ GPLv3+ LGPL21 MPL11
 LICENSE_COMB=	multi
-LICENSE_FILE_GPLv2=	${WRKSRC}/GPL2.txt
-LICENSE_FILE_GPLv3=	${WRKSRC}/GPL3.txt
+LICENSE_FILE_GPLv2+ =	${WRKSRC}/GPL2.txt
+LICENSE_FILE_GPLv3+ =	${WRKSRC}/GPL3.txt
 LICENSE_FILE_LGPL21=	${WRKSRC}/LGPL2.1.txt
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/concept_check.hpp:devel/boost-libs
diff --git a/graphics/libheif/Makefile b/graphics/libheif/Makefile
index 4d92b8a9627b..c149ebca168c 100644
--- a/graphics/libheif/Makefile
+++ b/graphics/libheif/Makefile
@@ -11,7 +11,7 @@ COMMENT=		Libheif is an ISO/IEC 23008-12:2017 HEIF file format de- and encoder
 
 # N.B., subsequent revisions in Git relicense examples from GPL3+ to MIT.
 LICENSE=		LGPL3+
-LICENSE_FILE_LGPL3+=	${WRKSRC}/COPYING
+LICENSE_FILE_LGPL3+ =	${WRKSRC}/COPYING
 
 USES=			autoreconf compiler:c++11-lang libtool localbase pkgconfig \
 			shebangfix
diff --git a/graphics/silgraphite/Makefile b/graphics/silgraphite/Makefile
index 1979cc521304..470d21781216 100644
--- a/graphics/silgraphite/Makefile
+++ b/graphics/silgraphite/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Font engine for complex non-Roman writing systems
 LICENSE=	CPL05 LGPL21+
 LICENSE_COMB=	dual
 LICENSE_FILE_CPL05=	${WRKSRC}/license/License_CPLv05.txt
-LICENSE_FILE_LGPL21=	${WRKSRC}/license/License_LGPLv21.txt
+LICENSE_FILE_LGPL21+ =	${WRKSRC}/license/License_LGPLv21.txt
 LICENSE_NAME_CPL05=	Common Public License Version 0.5
 LICENSE_PERMS_CPL05=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index 1bc20551d6ee..1c323f7f8888 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -10,9 +10,6 @@ CATEGORIES=	japanese
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT?=	Mozc Japanese Input Method, Server
 
-LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
 BUILD_DEPENDS=	ninja:devel/ninja \
 		gyp:devel/py-gyp@${PY_FLAVOR}
 EXTRACT_DEPENDS=${PYTHON_CMD}:${PYTHON_PORTSDIR}
diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
index ca93fafe0e54..aa2bf5088677 100644
--- a/lang/gjs/Makefile
+++ b/lang/gjs/Makefile
@@ -14,7 +14,7 @@ COMMENT=	GNOME Javascript binding
 LICENSE=	MPL11 LGPL20+ GPLv2+
 LICENSE_COMB=	multi
 LICENSE_FILE_MPL11=	${WRKSRC}/COPYING
-LICENSE_FILE_LGPL20+=	${WRKSRC}/COPYING.LGPL
+LICENSE_FILE_LGPL20+ =	${WRKSRC}/COPYING.LGPL
 
 LIB_DEPENDS=	libmozjs-52.so:lang/spidermonkey52 \
 		libffi.so:devel/libffi
diff --git a/math/cocoalib/Makefile b/math/cocoalib/Makefile
index 9fdb73ce54ec..26a48696565b 100644
--- a/math/cocoalib/Makefile
+++ b/math/cocoalib/Makefile
@@ -12,7 +12,7 @@ COMMENT=	C++ library for doing Computations in Commutative Algebra
 
 LICENSE=			GPLv3+ GFDL PD
 LICENSE_COMB=			multi
-LICENSE_FILE_GPL3+ =		${WRKSRC}/COPYING-GPLv3
+LICENSE_FILE_GPLv3+ =		${WRKSRC}/COPYING-GPLv3
 LICENSE_FILE_GFDL=		${WRKSRC}/doc/COPYING
 
 BUILD_DEPENDS=	bash:shells/bash
diff --git a/math/vampire/Makefile b/math/vampire/Makefile
index 7c2e9e6ab983..16a2a252ab1c 100644
--- a/math/vampire/Makefile
+++ b/math/vampire/Makefile
@@ -8,7 +8,7 @@ MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Automatic theorem prover
 
 LICENSE=	BSD2CLAUSE
-xLICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_FILE=	${WRKSRC}/LICENCE
 
 USES=		compiler:c++11-lang gmake
 USE_GITHUB=	yes
diff --git a/misc/rubygem-rabbit/Makefile b/misc/rubygem-rabbit/Makefile
index 2a1908d726a6..3092749b75a8 100644
--- a/misc/rubygem-rabbit/Makefile
+++ b/misc/rubygem-rabbit/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	tota@FreeBSD.org
 COMMENT=	RD-document-based presentation application
 
 LICENSE=	GPLv2+
-LICENSE_FILE_GPLv2=	${WRKSRC}/GPL
+LICENSE_FILE_GPLv2+ =	${WRKSRC}/GPL
 
 RUN_DEPENDS=	rubygem-coderay>=1.0.0:textproc/rubygem-coderay \
 		rubygem-faraday>0:www/rubygem-faraday \
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 0d9b11f0c6ba..e817377d4f55 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -576,8 +576,8 @@ ZVBI_CONFIGURE_ENABLE=	libzvbi
 # License knobs
 GPL3_CONFIGURE_ENABLE=	version3
 GPL3_VARS=		LICENSE="GPLv3+ LGPL3+"
-LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING.GPLv3
-LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LGPLv3
+LICENSE_FILE_GPLv3+ =	${WRKSRC}/COPYING.GPLv3
+LICENSE_FILE_LGPL3+ =	${WRKSRC}/COPYING.LGPLv3
 
 NONFREE_CONFIGURE_ENABLE=nonfree
 NONFREE_VARS=		RESTRICTED="enabling OPENSSL or FDK_AAC restricts redistribution"
diff --git a/multimedia/libquvi-scripts/Makefile b/multimedia/libquvi-scripts/Makefile
index 82a2805ab462..125fd8b994b1 100644
--- a/multimedia/libquvi-scripts/Makefile
+++ b/multimedia/libquvi-scripts/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Embedded lua scripts for libquvi and utility scripts
 
 LICENSE=	LGPL21+
-LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING
+LICENSE_FILE_LGPL21+ =	${WRKSRC}/COPYING
 
 PORTSCOUT=	limit:^0\.4\.
 
diff --git a/multimedia/libquvi/Makefile b/multimedia/libquvi/Makefile
index b6f913f0bb47..f6ee30f64a93 100644
--- a/multimedia/libquvi/Makefile
+++ b/multimedia/libquvi/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Cross-platform library for parsing flash media stream URLs
 
 LICENSE=	LGPL21+
-LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING
+LICENSE_FILE_LGPL21+ =	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 LIB_DEPENDS=	libcurl.so:ftp/curl
diff --git a/multimedia/quvi/Makefile b/multimedia/quvi/Makefile
index 94eda167f1ac..3cb9a0088eaf 100644
--- a/multimedia/quvi/Makefile
+++ b/multimedia/quvi/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Command line tool for parsing flash media stream URLs
 
 LICENSE=	LGPL21+
-LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING
+LICENSE_FILE_LGPL21+ =	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 LIB_DEPENDS=	libcurl.so:ftp/curl
diff --git a/net-mgmt/p5-Net-CIDR/Makefile b/net-mgmt/p5-Net-CIDR/Makefile
index ed1e6c040937..900d59735114 100644
--- a/net-mgmt/p5-Net-CIDR/Makefile
+++ b/net-mgmt/p5-Net-CIDR/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perl module to manipulate IPv4/IPv6 netblocks in CIDR notation
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE_ART10=	${WRKSRC}/COPYING
-LICENSE_FILE_GPLv1=	${WRKSRC}/COPYING
+LICENSE_FILE_GPLv1+ =	${WRKSRC}/COPYING
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index e7cca3cb6687..94a4be80df89 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	bar@FreeBSD.org
 COMMENT=	All-platform eMule p2p client
 
 LICENSE=	GPLv2+
-LICENSE_FILE_GPLv2=${WRKSRC}/docs/COPYING
+LICENSE_FILE_GPLv2+ =	${WRKSRC}/docs/COPYING
 
 LIB_DEPENDS=	libcryptopp.so:security/cryptopp
 
diff --git a/net/p5-Net-Flow/Makefile b/net/p5-Net-Flow/Makefile
index 19ba0d86995a..470769945441 100644
--- a/net/p5-Net-Flow/Makefile
+++ b/net/p5-Net-Flow/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Decode and encode NetFlow/IPFIX datagrams
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE_ART10=	${WRKSRC}/LICENSE
-LICENSE_FILE_GPLv1=	${WRKSRC}/LICENSE
+LICENSE_FILE_GPLv1+ =	${WRKSRC}/LICENSE
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/net/p5-Net-SFTP-Foreign/Makefile b/net/p5-Net-SFTP-Foreign/Makefile
index 6d0e926765c4..28f0491c0152 100644
--- a/net/p5-Net-SFTP-Foreign/Makefile
+++ b/net/p5-Net-SFTP-Foreign/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Net::SFTP::Foreign - Secure File Transfer Protocol client
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE_ART10=	${WRKSRC}/LICENSE
-LICENSE_FILE_GPLv1=	${WRKSRC}/LICENSE
+LICENSE_FILE_GPLv1+ =	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	p5-Sort-Key>=0:devel/p5-Sort-Key
 TEST_DEPENDS=	p5-File-Which>=0:sysutils/p5-File-Which
diff --git a/net/p5-NetAddr-MAC/Makefile b/net/p5-NetAddr-MAC/Makefile
index ce0221b3ac3f..a430d8898768 100644
--- a/net/p5-NetAddr-MAC/Makefile
+++ b/net/p5-NetAddr-MAC/Makefile
@@ -13,7 +13,7 @@ COMMENT=	NetAddr::MAC - Handles hardware MAC Addresses (EUI-48 and EUI-64)
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE_ART10=	${WRKSRC}/LICENSE
-LICENSE_FILE_GPLv1=	${WRKSRC}/LICENSE
+LICENSE_FILE_GPLv1+ =	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	p5-Test-Trap>=0:devel/p5-Test-Trap
 
diff --git a/security/nettle/Makefile b/security/nettle/Makefile
index 0fcd2d7ad332..ea391461b2c0 100644
--- a/security/nettle/Makefile
+++ b/security/nettle/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Low-level cryptographic library
 
 LICENSE=	GPLv2+ LGPL3
 LICENSE_COMB=	multi
-LICENSE_FILE_GPLv2=	${WRKSRC}/COPYINGv2
-LICENSE_FILE_GPLv3=	${WRKSRC}/COPYINGv3
+LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYINGv2
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LESSERv3
 
 BUILD_DEPENDS=	gmp>=6.0.0:math/gmp
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index a680ed061c49..12801f8b987c 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -14,7 +14,7 @@ LICENSE?=	GPLv2+
 .if !defined(_no_license_file)
 LICENSE_FILE?=	${WRKSRC}/NOTICE
 .endif
-LICENSE_DISTFILES_GPLv2=	${DISTNAME}${EXTRACT_SUFX}
+LICENSE_DISTFILES_GPLv2+ =	${DISTNAME}${EXTRACT_SUFX}
 
 PORTSCOUT=	ignore	# cannot handle the version in the directory
 
diff --git a/textproc/hyphen/Makefile b/textproc/hyphen/Makefile
index 38b095a31cb0..1b2158f82a58 100644
--- a/textproc/hyphen/Makefile
+++ b/textproc/hyphen/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Library for high quality hyphenation and justification
 
 LICENSE=	LGPL21+ MPL11
 LICENSE_COMB=	dual
-LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LGPL
+LICENSE_FILE_LGPL21+ =	${WRKSRC}/COPYING.LGPL
 LICENSE_FILE_MPL11=	${WRKSRC}/COPYING.MPL
 
 GNU_CONFIGURE=	yes
diff --git a/textproc/p5-PPIx-Regexp/Makefile b/textproc/p5-PPIx-Regexp/Makefile
index 91d0f78e65fa..108035916cd6 100644
--- a/textproc/p5-PPIx-Regexp/Makefile
+++ b/textproc/p5-PPIx-Regexp/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PPI regular expression parser
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE_ART10=	${WRKSRC}/LICENSES/Artistic
-LICENSE_FILE_GPLv1=	${WRKSRC}/LICENSES/Copying
+LICENSE_FILE_GPLv1+ =	${WRKSRC}/LICENSES/Copying
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
diff --git a/textproc/rubygem-diff-lcs/Makefile b/textproc/rubygem-diff-lcs/Makefile
index 5ed47157e4bf..4a1a24f039b9 100644
--- a/textproc/rubygem-diff-lcs/Makefile
+++ b/textproc/rubygem-diff-lcs/Makefile
@@ -12,7 +12,7 @@ COMMENT=	LCS-based diff library for ruby
 LICENSE=	ART20 GPLv2+ MIT
 LICENSE_COMB=	dual
 LICENSE_FILE_ART20=	${WRKSRC}/docs/artistic.txt
-LICENSE_FILE_GPLv2=	${WRKSRC}/docs/COPYING.txt
+LICENSE_FILE_GPLv2+ =	${WRKSRC}/docs/COPYING.txt
 LICENSE_FILE_MIT=	${WRKSRC}/License.md
 
 NO_ARCH=	yes
diff --git a/x11-fonts/linuxlibertine/Makefile b/x11-fonts/linuxlibertine/Makefile
index 6bbe1a48ba2b..c0552284eaa0 100644
--- a/x11-fonts/linuxlibertine/Makefile
+++ b/x11-fonts/linuxlibertine/Makefile
@@ -23,9 +23,7 @@ LICENSE_NAME_LINUXLIBERTINE=	LinuxLibertine License
 LICENSE_FILE_LINUXLIBERTINE=	${WRKSRC}/LICENCE.txt
 LICENSE_PERMS_LINUXLIBERTINE=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LICENSE_NAME_OFL=	Open Fonts License
-LICENSE_FILE_OFL=	${WRKSRC}/OFL.txt
-LICENSE_PERMS_OFL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_FILE_OFL10=	${WRKSRC}/OFL.txt
 
 WRKSRC=		${WRKDIR}/LinLibertine
 NO_BUILD=	yes
diff --git a/x11-toolkits/p5-Gtk3/Makefile b/x11-toolkits/p5-Gtk3/Makefile
index 1a351a006700..a148164b9a65 100644
--- a/x11-toolkits/p5-Gtk3/Makefile
+++ b/x11-toolkits/p5-Gtk3/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	hiroto.kagotani@gmail.com
 COMMENT=	Perl module for Gtk+ 3.x graphical user interface library
 
 LICENSE=	LGPL21+
-LICENSE_FILE_LGPL21=	${WRKSRC}/LICENSE
+LICENSE_FILE_LGPL21+ =	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Cairo-GObject>=1:devel/p5-Cairo-GObject \
diff --git a/x11/sddm/Makefile b/x11/sddm/Makefile
index bd7a1587deb3..8c5d8ad2a58b 100644
--- a/x11/sddm/Makefile
+++ b/x11/sddm/Makefile
@@ -15,7 +15,7 @@ COMMENT=	QML based login manager
 #  - Apache20 (font included with maya)
 LICENSE=	GPLv2+ CC-BY-3.0 CC-BY-4.0 APACHE20
 LICENSE_COMB=	multi
-LICENSE_FILE_GPLv2+=	${WRKSRC}/LICENSE
+LICENSE_FILE_GPLv2+ =	${WRKSRC}/LICENSE
 LICENSE_FILE_CC-BY-3.0=	${WRKSRC}/LICENSE.CC-BY-3.0
 
 BUILD_DEPENDS=	rst2man.py-${PYTHON_VER}:textproc/py-docutils@${PY_FLAVOR}