treewide: Change .*GPL.*+ licenses to SPDX compatible identifier

The CONTRIBUTING.md requests an (or multiple) SPDX identifier for GPL licenses. But a lot of packages did use a different, non-SPDX style with a "+" at the end instead of "-or-later". Signed-off-by: Sven Eckelmann <sven@narfation.org> (cherry-picked from bbb1ea7345)
2019-09-02 15:15:08 +02:00 · 2019-09-02 15:15:08 +02:00 · 1142f52078
commit 1142f52078
parent 605383751e
164 changed files with 328 additions and 328 deletions
--- a/admin/gkrellmd/Makefile
+++ b/admin/gkrellmd/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=gkrellmd
 PKG_VERSION:=2.3.10
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=gkrellm-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://gkrellm.srcbox.net/releases
 PKG_HASH:=8b9ec8baadcd5830c6aff04ba86dc9ed317a15c1c3787440bd1e680fb2fcd766
 PKG_MAINTAINER:=Peter Denison <openwrt@marshadder.org>
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later

 PKG_BUILD_DIR:=$(BUILD_DIR)/gkrellm-$(PKG_VERSION)

--- a/admin/muninlite/Makefile
+++ b/admin/muninlite/Makefile
@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=muninlite
 PKG_VERSION:=1.0.4
-PKG_RELEASE:=9
+PKG_RELEASE:=10

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_HASH:=736482dd6d6849d014d975b1f5794f20dda6e123dbba2d8c2f169c8e787e6f7e
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=LICENSE

 include $(INCLUDE_DIR)/package.mk
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=autoconf
 PKG_VERSION:=2.69
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_SOURCE_URL:=@GNU/autoconf
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_HASH:=64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684
 PKG_MAINTAINER:=Heinrich Schuchardt <xypron.glpk@gmx.de>
-PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE:=GPL-3.0-or-later

 PKG_INSTALL:=1

--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=automake
 PKG_VERSION:=1.15.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=@GNU/automake
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_HASH:=af6ba39142220687c500f79b4aa2f181d9b24e4f8d8ec497cea4ba26c64bedaf
 PKG_MAINTAINER:=Heinrich Schuchardt <xypron.glpk@gmx.de>
-PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE:=GPL-3.0-or-later

 PKG_INSTALL:=1

--- a/devel/libtool-bin/Makefile
+++ b/devel/libtool-bin/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=libtool
 PKG_VERSION:=2.4.6
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/libtool
 PKG_HASH:=7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f
 PKG_MAINTAINER:=Heinrich Schuchardt <xypron.glpk@gmx.de>
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
 PKG_BUILD_DIR = $(BUILD_DIR)/libtool-bin/$(PKG_NAME)-$(PKG_VERSION)

 PKG_INSTALL:=1
--- a/devel/lpc21isp/Makefile
+++ b/devel/lpc21isp/Makefile
@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=lpc21isp
 PKG_VERSION:=197
-PKG_RELEASE:=2
-PKG_LICENSE:=LGPL-3.0+
+PKG_RELEASE:=3
+PKG_LICENSE:=LGPL-3.0-or-later
 PKG_LICENSE_FILES:=README gpl.txt lgpl-3.0.txt

 PKG_BUILD_DIR:=$(BUILD_DIR)/lpc21isp_$(PKG_VERSION)
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=m4
 PKG_VERSION:=1.4.18
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=@GNU/m4
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_HASH:=f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07
 PKG_MAINTAINER:=Heinrich Schuchardt <xypron.glpk@gmx.de>
-PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE:=GPL-3.0-or-later

 PKG_INSTALL:=1

--- a/devel/make/Makefile
+++ b/devel/make/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=make
 PKG_VERSION:=4.2.1
-PKG_RELEASE:=3
+PKG_RELEASE:=4

 PKG_SOURCE_URL:=@GNU/make
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_HASH:=d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589
 PKG_MAINTAINER:=Heinrich Schuchardt <xypron.glpk@gmx.de>
-PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE:=GPL-3.0-or-later

 PKG_INSTALL:=1

--- a/devel/patch/Makefile
+++ b/devel/patch/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=patch
 PKG_VERSION:=2.7.6
-PKG_RELEASE:=5
+PKG_RELEASE:=6

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/patch
 PKG_HASH:=ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd

-PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=COPYING
 PKG_CPE_ID:=cpe:/a:gnu:patch

--- a/devel/pkg-config/Makefile
+++ b/devel/pkg-config/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=pkg-config
 PKG_VERSION:=0.29.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=https://pkg-config.freedesktop.org/releases/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_HASH:=6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591
 PKG_MAINTAINER:=Heinrich Schuchardt <xypron.glpk@gmx.de>
-PKG_LICENSE:=GPL-2+
+PKG_LICENSE:=GPL-2.0-or-later

 PKG_ASLR_PIE:=1
 PKG_INSTALL:=1
--- a/lang/perl-authen-sasl-xs/Makefile
+++ b/lang/perl-authen-sasl-xs/Makefile
@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-authen-sasl-xs
 PKG_VERSION:=1.00
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_NAME:=Authen-SASL-XS
 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GB/GBARR/
 PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.gz
 PKG_HASH:=1b0eaa0e7ac3a45857147d837e3d34c80c6eca1d9fdcb826a213c2a105454234

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Philip Prindeville <philipp@redfish-solutions.com>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/$(PKG_SOURCE_NAME)-$(PKG_VERSION)
--- a/lang/perl-authen-sasl/Makefile
+++ b/lang/perl-authen-sasl/Makefile
@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-authen-sasl
 PKG_VERSION:=2.16
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_NAME:=Authen-SASL
 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GB/GBARR/
 PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.gz
 PKG_HASH:=6614fa7518f094f853741b63c73f3627168c5d3aca89b1d02b1016dc32854e09

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Philip Prindeville <philipp@redfish-solutions.com>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/$(PKG_SOURCE_NAME)-$(PKG_VERSION)
--- a/lang/perl-compress-bzip2/Makefile
+++ b/lang/perl-compress-bzip2/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-compress-bzip2
 PKG_VERSION:=2.24
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/R/RU/RURBAN/
 PKG_SOURCE:=Compress-Bzip2-$(PKG_VERSION).tar.gz
 PKG_HASH:=7956ac627fb373fae6effede3d21b3157122800224491b124afdd7bb426c8c3f

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Compress-Bzip2-$(PKG_VERSION)
--- a/lang/perl-dbi/Makefile
+++ b/lang/perl-dbi/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-dbi
 PKG_VERSION:=1.634
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/T/TI/TIMB/
 PKG_SOURCE:=DBI-$(PKG_VERSION).tar.gz
 PKG_HASH:=250712f385864818abfba409420d16d9ee61f1cc73ac85159d054a5ee86d1450

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/DBI-$(PKG_VERSION)
--- a/lang/perl-device-serialport/Makefile
+++ b/lang/perl-device-serialport/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-device-serialport
 PKG_VERSION:=1.04
-PKG_RELEASE:=3
+PKG_RELEASE:=4

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/C/CO/COOK/
 PKG_SOURCE:=Device-SerialPort-$(PKG_VERSION).tar.gz
 PKG_HASH:=d392567cb39b4ea606c0e0acafd8ed72320311b995336ece5fcefcf9b150e9d7

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Paul Oranje <por@xs4all.nl>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Device-SerialPort-$(PKG_VERSION)
--- a/lang/perl-encode-locale/Makefile
+++ b/lang/perl-encode-locale/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-encode-locale
 PKG_VERSION:=1.05
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS
 PKG_SOURCE:=Encode-Locale-$(PKG_VERSION).tar.gz
 PKG_HASH:=176fa02771f542a4efb1dbc2a4c928e8f4391bf4078473bd6040d8f11adb0ec1

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Encode-Locale-$(PKG_VERSION)
--- a/lang/perl-file-listing/Makefile
+++ b/lang/perl-file-listing/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-file-listing
 PKG_VERSION:=6.04
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS
 PKG_SOURCE:=File-Listing-$(PKG_VERSION).tar.gz
 PKG_HASH:=1e0050fcd6789a2179ec0db282bf1e90fb92be35d1171588bd9c47d52d959cf5

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/File-Listing-$(PKG_VERSION)
--- a/lang/perl-file-sharedir-install/Makefile
+++ b/lang/perl-file-sharedir-install/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-file-sharedir-install
 PKG_VERSION:=0.10
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GW/GWYN
 PKG_SOURCE:=File-ShareDir-Install-$(PKG_VERSION).tar.gz
 PKG_HASH:=708af71dec4dfb5a8cf9a5e863b566714c3f65f0a76722302de5a07ee202e6f7

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/perl/File-ShareDir-Install-$(PKG_VERSION)
--- a/lang/perl-html-form/Makefile
+++ b/lang/perl-html-form/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-html-form
 PKG_VERSION:=6.03
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS
 PKG_SOURCE:=HTML-Form-$(PKG_VERSION).tar.gz
 PKG_HASH:=68c01d94f005d5ca9c4d55ad2a1bf3a8d034a5fc6db187d91a4c42f3fdc9fc36

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTML-Form-$(PKG_VERSION)
--- a/lang/perl-html-parser/Makefile
+++ b/lang/perl-html-parser/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-html-parser
 PKG_VERSION:=3.72
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS/
 PKG_SOURCE:=HTML-Parser-$(PKG_VERSION).tar.gz
 PKG_HASH:=ec28c7e1d9e67c45eca197077f7cdc41ead1bb4c538c7f02a3296a4bb92f608b

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTML-Parser-$(PKG_VERSION)
--- a/lang/perl-html-tagset/Makefile
+++ b/lang/perl-html-tagset/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-html-tagset
 PKG_VERSION:=3.20
-PKG_RELEASE:=3
+PKG_RELEASE:=4

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/P/PE/PETDANCE/
 PKG_SOURCE:=HTML-Tagset-$(PKG_VERSION).tar.gz
 PKG_HASH:=adb17dac9e36cd011f5243881c9739417fd102fce760f8de4e9be4c7131108e2

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTML-Tagset-$(PKG_VERSION)
--- a/lang/perl-html-tree/Makefile
+++ b/lang/perl-html-tree/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-html-tree
 PKG_VERSION:=3.23
-PKG_RELEASE:=4
+PKG_RELEASE:=5

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/P/PE/PETEK/
 PKG_SOURCE:=HTML-Tree-$(PKG_VERSION).tar.gz
 PKG_HASH:=f5175acf262f3710dce899796ea3e353049939400b100706d03df2f08803c8de

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTML-Tree-$(PKG_VERSION)
--- a/lang/perl-http-cookies/Makefile
+++ b/lang/perl-http-cookies/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-http-cookies
 PKG_VERSION:=6.01
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS
 PKG_SOURCE:=HTTP-Cookies-$(PKG_VERSION).tar.gz
 PKG_HASH:=f5d3ade383ce6389d80cb0d0356b643af80435bb036afd8edce335215ec5eb20

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTTP-Cookies-$(PKG_VERSION)
--- a/lang/perl-http-daemon/Makefile
+++ b/lang/perl-http-daemon/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-http-daemon
 PKG_VERSION:=6.01
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS
 PKG_SOURCE:=HTTP-Daemon-$(PKG_VERSION).tar.gz
 PKG_HASH:=43fd867742701a3f9fcc7bd59838ab72c6490c0ebaf66901068ec6997514adc2

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTTP-Daemon-$(PKG_VERSION)
--- a/lang/perl-http-date/Makefile
+++ b/lang/perl-http-date/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-http-date
 PKG_VERSION:=6.02
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS
 PKG_SOURCE:=HTTP-Date-$(PKG_VERSION).tar.gz
 PKG_HASH:=e8b9941da0f9f0c9c01068401a5e81341f0e3707d1c754f8e11f42a7e629e333

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTTP-Date-$(PKG_VERSION)
--- a/lang/perl-http-message/Makefile
+++ b/lang/perl-http-message/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-http-message
 PKG_VERSION:=6.11
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/E/ET/ETHER
 PKG_SOURCE:=HTTP-Message-$(PKG_VERSION).tar.gz
 PKG_HASH:=e7b368077ae6a188d99920411d8f52a8e5acfb39574d4f5c24f46fd22533d81b

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTTP-Message-$(PKG_VERSION)
--- a/lang/perl-http-negotiate/Makefile
+++ b/lang/perl-http-negotiate/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-http-negotiate
 PKG_VERSION:=6.01
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS
 PKG_SOURCE:=HTTP-Negotiate-$(PKG_VERSION).tar.gz
 PKG_HASH:=1c729c1ea63100e878405cda7d66f9adfd3ed4f1d6cacaca0ee9152df728e016

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTTP-Negotiate-$(PKG_VERSION)
--- a/lang/perl-http-server-simple/Makefile
+++ b/lang/perl-http-server-simple/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-http-server-simple
 PKG_VERSION:=0.51
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/B/BP/BPS
 PKG_SOURCE:=HTTP-Server-Simple-$(PKG_VERSION).tar.gz
 PKG_HASH:=b9dc5c9f12c16ca39a96f0ede1e27a18a5594274ff8f583000788a7fca136dfb

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/HTTP-Server-Simple-$(PKG_VERSION)
--- a/lang/perl-io-html/Makefile
+++ b/lang/perl-io-html/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-io-html
 PKG_VERSION:=1.001
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/C/CJ/CJM
 PKG_SOURCE:=IO-HTML-$(PKG_VERSION).tar.gz
 PKG_HASH:=ea78d2d743794adc028bc9589538eb867174b4e165d7d8b5f63486e6b828e7e0

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/IO-HTML-$(PKG_VERSION)
--- a/lang/perl-lockfile-simple/Makefile
+++ b/lang/perl-lockfile-simple/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-lockfile-simple
 PKG_VERSION:=0.208
-PKG_RELEASE:=3
+PKG_RELEASE:=4

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/S/SC/SCHWIGON/lockfile-simple/
 PKG_SOURCE:=LockFile-Simple-$(PKG_VERSION).tar.gz
 PKG_HASH:=45c77896b2a5a0a45f6202a6f813f437ff8b283f84a1c60d0c4f3730802af3a2

-PKG_LICENSE:=GPL-2.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-2.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/LockFile-Simple-$(PKG_VERSION)
--- a/lang/perl-lwp-mediatypes/Makefile
+++ b/lang/perl-lwp-mediatypes/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-lwp-mediatypes
 PKG_VERSION:=6.02
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS
 PKG_SOURCE:=LWP-MediaTypes-$(PKG_VERSION).tar.gz
 PKG_HASH:=18790b0cc5f0a51468495c3847b16738f785a2d460403595001e0b932e5db676

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/LWP-MediaTypes-$(PKG_VERSION)
--- a/lang/perl-net-http/Makefile
+++ b/lang/perl-net-http/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-net-http
 PKG_VERSION:=6.09
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/E/ET/ETHER
 PKG_SOURCE:=Net-HTTP-$(PKG_VERSION).tar.gz
 PKG_HASH:=52762b939d84806908ba544581c5708375f7938c3c0e496c128ca3fbc425e58d

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Net-HTTP-$(PKG_VERSION)
--- a/lang/perl-net-telnet/Makefile
+++ b/lang/perl-net-telnet/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-net-telnet
 PKG_VERSION:=3.04
-PKG_RELEASE:=3
+PKG_RELEASE:=4

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/J/JR/JROGERS/
 PKG_SOURCE:=Net-Telnet-$(PKG_VERSION).tar.gz
 PKG_HASH:=e64d567a4e16295ecba949368e7a6b8b5ae2a16b3ad682121d9b007dc5d2a37a

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Net-Telnet-$(PKG_VERSION)
--- a/lang/perl-parse-recdescent/Makefile
+++ b/lang/perl-parse-recdescent/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-parse-recdescent
 PKG_VERSION:=1.967015
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=https://www.cpan.org/authors/id/J/JT/JTBRAUN
 PKG_SOURCE:=Parse-RecDescent-$(PKG_VERSION).tar.gz
 PKG_HASH:=1943336a4cb54f1788a733f0827c0c55db4310d5eae15e542639c9dd85656e37

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/perl/Parse-RecDescent-$(PKG_VERSION)
--- a/lang/perl-sub-uplevel/Makefile
+++ b/lang/perl-sub-uplevel/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-sub-uplevel
 PKG_VERSION:=0.25
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/D/DA/DAGOLDEN
 PKG_SOURCE:=Sub-Uplevel-$(PKG_VERSION).tar.gz
 PKG_HASH:=2dcca582a7ea5bada576eb27c4be1d1b064fb22175bdbd6d696c45d083560505

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Sub-Uplevel-$(PKG_VERSION)
--- a/lang/perl-test-harness/Makefile
+++ b/lang/perl-test-harness/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-test-harness
 PKG_VERSION:=3.36
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/L/LE/LEONT/
 PKG_SOURCE:=Test-Harness-$(PKG_VERSION).tar.gz
 PKG_HASH:=e7566f13b041d028b56f184b77ec2545ec6f0bb5a0f8f5368f7e4a08b496b63e

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Test-Harness-$(PKG_VERSION)
--- a/lang/perl-test-warn/Makefile
+++ b/lang/perl-test-warn/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-test-warn
 PKG_VERSION:=0.30
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/C/CH/CHORNY
 PKG_SOURCE:=Test-Warn-$(PKG_VERSION).tar.gz
 PKG_HASH:=8197555b94189d919349a03f7058f83861f145af9bee59f505bfe47562144e41

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Test-Warn-$(PKG_VERSION)
--- a/lang/perl-text-csv_xs/Makefile
+++ b/lang/perl-text-csv_xs/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-text-csv_xs
 PKG_VERSION:=1.39
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=https://www.cpan.org/authors/id/H/HM/HMBRAND/
 PKG_SOURCE:=Text-CSV_XS-$(PKG_VERSION).tgz
 PKG_HASH:=aa4e424eaf68bea0d0e8c16b961c942b64926e6183ce1dbbc6c799eafb0a9ebd

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Philip Prindeville <philipp@redfish-solutions.com>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Text-CSV_XS-$(PKG_VERSION)
--- a/lang/perl-uri/Makefile
+++ b/lang/perl-uri/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-uri
 PKG_VERSION:=1.72
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/E/ET/ETHER/
 PKG_SOURCE:=URI-$(PKG_VERSION).tar.gz
 PKG_HASH:=35f14431d4b300de4be1163b0b5332de2d7fbda4f05ff1ed198a8e9330d40a32

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/URI-$(PKG_VERSION)
--- a/lang/perl-www-curl/Makefile
+++ b/lang/perl-www-curl/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-www-curl
 PKG_VERSION:=4.17
-PKG_RELEASE:=4
+PKG_RELEASE:=5

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/S/SZ/SZBALINT/
 PKG_SOURCE:=WWW-Curl-$(PKG_VERSION).tar.gz
 PKG_HASH:=52ffab110e32348d775f241c973eb56f96b08eedbc110d77d257cdb0a24ab7ba

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

--- a/lang/perl-www-mechanize/Makefile
+++ b/lang/perl-www-mechanize/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-www-mechanize
 PKG_VERSION:=1.75
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=WWW-Mechanize-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/E/ET/ETHER/
 PKG_HASH:=5310051feb66c6ef9f7a4c070c66ec6092932129fc9cd18bba009ce999b7930b

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/WWW-Mechanize-$(PKG_VERSION)
--- a/lang/perl-www-robotrules/Makefile
+++ b/lang/perl-www-robotrules/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-www-robotrules
 PKG_VERSION:=6.02
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/G/GA/GAAS
 PKG_SOURCE:=WWW-RobotRules-$(PKG_VERSION).tar.gz
 PKG_HASH:=46b502e7a288d559429891eeb5d979461dd3ecc6a5c491ead85d165b6e03a51e

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/WWW-RobotRules-$(PKG_VERSION)
--- a/lang/perl-www/Makefile
+++ b/lang/perl-www/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-www
 PKG_VERSION:=6.15
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/E/ET/ETHER/
 PKG_SOURCE:=libwww-perl-$(PKG_VERSION).tar.gz
 PKG_HASH:=6f349d45c21b1ec0501c4437dfcb70570940e6c3d5bff783bd91d4cddead8322

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/libwww-perl-$(PKG_VERSION)
--- a/lang/perl-xml-parser/Makefile
+++ b/lang/perl-xml-parser/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=perl-xml-parser
 PKG_VERSION:=2.44
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=http://www.cpan.org/authors/id/T/TO/TODDR/
 PKG_SOURCE:=XML-Parser-$(PKG_VERSION).tar.gz
 PKG_HASH:=1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>

 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/XML-Parser-$(PKG_VERSION)
--- a/lang/perl/Makefile
+++ b/lang/perl/Makefile
@ -11,7 +11,7 @@ include perlver.mk

 PKG_NAME:=perl
 PKG_VERSION:=$(PERL_VERSION)
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=\
 		https://cpan.metacpan.org/src/5.0 \
@ -23,7 +23,7 @@ PKG_SOURCE_URL:=\
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_HASH:=fea7162d4cca940a387f0587b93f6737d884bf74d8a9d7cfd978bc12cd0b202d

-PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
 PKG_LICENSE_FILES:=Copying Artistic README
 PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>, \
 		Philip Prindeville <philipp@redfish-solutions.com>
--- a/lang/python/python-gmpy2/Makefile
+++ b/lang/python/python-gmpy2/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=python-gmpy2
 PKG_VERSION:=2.0.8
-PKG_RELEASE:=3
+PKG_RELEASE:=4

 PKG_SOURCE:=gmpy2-$(PKG_VERSION).zip
 PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/g/gmpy2
@ -17,7 +17,7 @@ PKG_HASH:=dd233e3288b90f21b0bb384bcc7a7e73557bb112ccf0032ad52aa614eb373d3f

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-gmpy2-$(PKG_VERSION)

-PKG_LICENSE:=LGPL-3.0+
+PKG_LICENSE:=LGPL-3.0-or-later
 PKG_LICENSE_FILES:=COPYING.LESSER
 PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>

--- a/lang/python/python-gnupg/Makefile
+++ b/lang/python/python-gnupg/Makefile
@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=python-gnupg
 PKG_VERSION:=0.4.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/p/python-gnupg
 PKG_HASH:=45daf020b370bda13a1429c859fcdff0b766c0576844211446f9266cae97fb0e

-PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>

--- a/lang/python/python-psycopg2/Makefile
+++ b/lang/python/python-psycopg2/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=python-psycopg2
 PKG_VERSION:=2.7.6.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=psycopg2-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/p/psycopg2
@ -17,7 +17,7 @@ PKG_HASH:=27959abe64ca1fc6d8cd11a71a1f421d8287831a3262bd4cacd43bbf43cc3c82
 PKG_BUILD_DIR:=$(BUILD_DIR)/psycopg2-$(PKG_VERSION)

 PKG_MAINTAINER:=Dmitry Trefilov <the-alien@live.ru>
-PKG_LICENSE:=LGPL-3.0+
+PKG_LICENSE:=LGPL-3.0-or-later
 PKG_LICENSE_FILES:=LICENSE

 PKG_BUILD_DEPENDS:=python/host
--- a/libs/check/Makefile
+++ b/libs/check/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=check
 PKG_VERSION:=0.12.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/libcheck/check/releases/download/$(PKG_VERSION)
 PKG_HASH:=464201098bee00e90f5c4bdfa94a5d3ead8d641f9025b560a27755a83b824234

-PKG_LICENSE:=LGPL-2.1+
+PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING.LESSER
 PKG_MAINTAINER:=Eduardo Abinader <eduardoabinader@gmail.com>

--- a/libs/fftw3/Makefile
+++ b/libs/fftw3/Makefile
@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=fftw3
 PKG_VERSION:=3.3.8
-PKG_RELEASE:=1
-PKG_LICENSE:=GPL-2.0+
+PKG_RELEASE:=2
+PKG_LICENSE:=GPL-2.0-or-later

 PKG_SOURCE:=fftw-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.fftw.org
--- a/libs/gnutls/Makefile
+++ b/libs/gnutls/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=gnutls
 PKG_VERSION:=3.6.9
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_USE_MIPS16:=0

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
@ -17,7 +17,7 @@ PKG_SOURCE_URL:=https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6
 PKG_HASH:=4331fca55817ecdd74450b908a6c29b4f05bb24dd13144c6284aa34d872e1fcb
 #PKG_FIXUP:=autoreconf gettext-version
 PKG_MAINTAINER:=Nikos Mavrogiannopoulos <nmav@gnutls.org>
-PKG_LICENSE:=LGPLv2.1+
+PKG_LICENSE:=LGPL-2.1-or-later
 PKG_CPE_ID:=cpe:/a:gnu:gnutls

 PKG_INSTALL:=1
--- a/libs/libavl/Makefile
+++ b/libs/libavl/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=libavl
 PKG_VERSION:=0.3.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_HASH:=4497b9e22cdd61ae2fa893b9d5fd6213dc306726d7c4be08c29e173622dca8a0

 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
@ -18,7 +18,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/avl-$(PKG_VERSION)
 PKG_INSTALL:=1

 PKG_MAINTAINER:=Espen Jürgensen <espenjurgensen+openwrt@gmail.com>
-PKG_LICENSE:=LGPL-2.0+
+PKG_LICENSE:=LGPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING

 include $(INCLUDE_DIR)/package.mk
--- a/libs/libcanfestival/Makefile
+++ b/libs/libcanfestival/Makefile
@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libcanfestival
-PKG_RELEASE:=6
+PKG_RELEASE:=7

 PKG_SOURCE_VERSION:=8bfe0ac00cdb
 PKG_SOURCE_URL:=http://dev.automforge.net/CanFestival-3/archive/$(PKG_SOURCE_VERSION).tar.bz2?_dummyfilename=
@ -18,7 +18,7 @@ PKG_SOURCE_SUBDIR:=CanFestival-3-$(PKG_SOURCE_VERSION)

 PKG_MAINTAINER:=Anton Glukhov <anton.a.glukhov@gmail.com>

-PKG_LICENSE:=LGPL-2.1+
+PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=LICENCE

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
--- a/libs/libcoap/Makefile
+++ b/libs/libcoap/Makefile
@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=libcoap
 PKG_VERSION:=4.2.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/obgm/libcoap/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=9523e38da6ee8b2a8f5ce83ded64107dd1e514c7ad00cd74ccfe3454b679c271

 PKG_MAINTAINER:=Anton Glukhov <anton.a.glukhov@gmail.com>
-PKG_LICENSE:=GPL-2.0+ BSD-2-Clause
+PKG_LICENSE:=GPL-2.0-or-later BSD-2-Clause
 PKG_LICENSE_FILES:=COPYING LICENSE.GPL LICENSE.BSD

 PKG_FIXUP:=autoreconf
--- a/libs/libesmtp/Makefile
+++ b/libs/libesmtp/Makefile
@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=libesmtp
 PKG_VERSION:=1.0.6
-PKG_RELEASE:=4
+PKG_RELEASE:=5

 PKG_MAINTAINER:=Othmar Truniger <github@truniger.ch>
-PKG_LICENSE:=LGPL-2.0+
+PKG_LICENSE:=LGPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
--- a/libs/libestr/Makefile
+++ b/libs/libestr/Makefile
@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=libestr
 PKG_VERSION:=0.1.11
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=http://libestr.adiscon.com/files/download/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_HASH:=46632b2785ff4a231dcf241eeb0dcb5fc0c7d4da8ee49cf5687722cdbe8b2024

 PKG_MAINTAINER:=Rosen Penev <rosenp@gmail.com>
-PKG_LICENSE:=LGPL-2.1+
+PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING

 PKG_FIXUP:=autoreconf
--- a/libs/libidn/Makefile
+++ b/libs/libidn/Makefile
@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=libidn
 PKG_VERSION:=1.35
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/libidn
 PKG_HASH:=f11af1005b46b7b15d057d7f107315a1ad46935c7fcdf243c16e46ec14f0fe1e

-PKG_LICENSE:=GPL-2.0+ GPL-3.0+ LGPL-2.1+ LGPL-3.0+ Apache-2.0
+PKG_LICENSE:=GPL-2.0-or-later GPL-3.0-or-later LGPL-2.1-or-later LGPL-3.0-or-later Apache-2.0
 PKG_LICENSE_FILES:=COPYING COPYINGv2 COPYINGv3 COPYING.LESSERv2 COPYING.LESSERv3 java/LICENSE-2.0.txt

 PKG_INSTALL:=1
--- a/libs/libimobiledevice/Makefile
+++ b/libs/libimobiledevice/Makefile
@ -10,10 +10,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=libimobiledevice
 PKG_SOURCE_DATE:=2019-02-16
 PKG_SOURCE_VERSION:=0584aa90c93ff6ce46927b8d67887cb987ab9545
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_MAINTAINER:=
-PKG_LICENSE:=LGPL-2.1+
+PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING.LESSER

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz
--- a/libs/liblo/Makefile
+++ b/libs/liblo/Makefile
@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=liblo
 PKG_VERSION:=0.30
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/liblo
 PKG_HASH:=30a7c9de49a25ed7f2425a7a7415f5b14739def62431423d3419ea26fb978d1b

 PKG_MAINTAINER:=
-PKG_LICENSE:=LGPL-2.1+
+PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING

 PKG_INSTALL:=1
--- a/libs/libmodbus/Makefile
+++ b/libs/libmodbus/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=libmodbus
 PKG_VERSION:=3.1.4
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://libmodbus.org/releases
@ -17,7 +17,7 @@ PKG_HASH:=c8c862b0e9a7ba699a49bc98f62bdffdfafd53a5716c0e162696b4bf108d3637

 PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>

-PKG_LICENSE:=GPL-3.0+ LGPL-2.1+
+PKG_LICENSE:=GPL-3.0-or-later LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING COPYING.LESSER

 PKG_FIXUP:=autoreconf
--- a/libs/libnetfilter-acct/Makefile
+++ b/libs/libnetfilter-acct/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=libnetfilter_acct
 PKG_VERSION:=1.0.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://netfilter.org/projects/libnetfilter_acct/files
 PKG_HASH:=4250ceef3efe2034f4ac05906c3ee427db31b9b0a2df41b2744f4bf79a959a1a

-PKG_LICENSE:=LGPL-2.1+
+PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>

--- a/libs/liboping/Makefile
+++ b/libs/liboping/Makefile
@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=liboping
 PKG_VERSION:=1.10.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
-PKG_LICENSE:=LGPL-2.1+
+PKG_LICENSE:=LGPL-2.1-or-later

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://noping.cc/files
--- a/libs/libp11/Makefile
+++ b/libs/libp11/Makefile
@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=libp11
 PKG_VERSION:=0.4.10
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE_URL:=https://github.com/OpenSC/libp11/releases/download/$(PKG_NAME)-$(PKG_VERSION)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_HASH:=639ea43c3341e267214b712e1e5e12397fd2d350899e673dd1220f3c6b8e3db4

 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
-PKG_LICENSE:=LGPL-2.1+
+PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING

 PKG_BUILD_PARALLEL:=1
--- a/libs/libplist/Makefile
+++ b/libs/libplist/Makefile
@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=libplist
 PKG_VERSION:=2.0.0
-PKG_RELEASE:=3
+PKG_RELEASE:=4

 PKG_MAINTAINER:=Lukasz Baj <l.baj@radytek.com>
-PKG_LICENSE:=LGPL-2.1+
+PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING.LESSER

 PKG_SOURCE_PROTO:=git
--- a/libs/libpng/Makefile
+++ b/libs/libpng/Makefile
@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=libpng
 PKG_VERSION:=1.6.37
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@SF/libpng
 PKG_HASH:=505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca

 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
-PKG_LICENSE:=Libpng GPL-2.0+ BSD-3-Clause
+PKG_LICENSE:=Libpng GPL-2.0-or-later BSD-3-Clause
 PKC_LICENSE_FILES:=LICENSE contrib/gregbook/COPYING contrib/gregbook/LICENSE
 PKG_CPE_ID:=cpe:/a:libpng:libpng

--- a/libs/libssh/Makefile
+++ b/libs/libssh/Makefile
@ -7,12 +7,12 @@

 include $(TOPDIR)/rules.mk

-PKG_LICENSE:=LGPL-2.1+ BSD-2-Clause
+PKG_LICENSE:=LGPL-2.1-or-later BSD-2-Clause
 PKG_MAINTAINER:=Mislav Novakovic <mislav.novakovic@sartura.hr>

 PKG_NAME:=libssh
 PKG_VERSION:=0.7.6
-PKG_RELEASE:=3
+PKG_RELEASE:=4

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://www.libssh.org/files/0.7/
--- a/libs/libtalloc/Makefile
+++ b/libs/libtalloc/Makefile
@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=talloc
 PKG_VERSION:=2.1.14
 MAJOR_VERSION:=2
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.samba.org/ftp/talloc
 PKG_HASH:=b185602756a628bac507fa8af8b9df92ace69d27c0add5dab93190ad7c3367ce

 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-PKG_LICENSE:=LGPL-3.0+
+PKG_LICENSE:=LGPL-3.0-or-later

 PKG_BUILD_PARALLEL:=0

--- a/libs/libtasn1/Makefile
+++ b/libs/libtasn1/Makefile
@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=libtasn1
 PKG_VERSION:=4.14
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
 PKG_HASH:=9e604ba5c5c8ea403487695c2e407405820d98540d9de884d6e844f9a9c5ba08

 PKG_MAINTAINER:=Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
-PKG_LICENSE:=LGPLv2.1-or-later
+PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING.LIB

 #PKG_FIXUP:=autoreconf
--- a/libs/libugpio/Makefile
+++ b/libs/libugpio/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=libugpio
 PKG_VERSION:=0.0.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://github.com/mhei/libugpio/releases/download/v$(PKG_VERSION)
 PKG_HASH:=07d96b46560f42843e46869f45f53d48afee71f9bbcf06f43267fafad0d50b05

-PKG_LICENSE:=LGPL-2.1+
+PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING.LESSER

 PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
--- a/libs/libusbmuxd/Makefile
+++ b/libs/libusbmuxd/Makefile
@ -10,10 +10,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=libusbmuxd
 PKG_SOURCE_DATE:=2019-03-23
 PKG_SOURCE_VERSION:=873252dc8b4e469c7dc692064ac616104fca5f65
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_MAINTAINER:=Lukasz Baj <l.baj@radytek.com>
-PKG_LICENSE:=LGPL-2.1+
+PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING.LGPLv2.1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz
--- a/libs/libyang/Makefile
+++ b/libs/libyang/Makefile
@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=libyang
 PKG_VERSION:=0.16-r3
-PKG_RELEASE:=3
+PKG_RELEASE:=4

-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
 PKG_MAINTAINER:=Mislav Novakovic <mislav.novakovic@sartura.hr>

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
--- a/libs/psqlodbc/Makefile
+++ b/libs/psqlodbc/Makefile
@ -6,14 +6,14 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=psqlodbc
 PKG_VERSION:=11.00.0000
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://ftp.postgresql.org/pub/odbc/versions/src
 PKG_HASH:=703e6b87022f95ffa00d9f86c8f0a877f8a55b9b3be0942081f382e794112a86

 PKG_MAINTAINER:=
-PKG_LICENSE:=LGPL-2.0+
+PKG_LICENSE:=LGPL-2.0-or-later
 PKG_LICENSE_FILES:=license.txt

 PKG_BUILD_DEPENDS:=unixodbc/host
--- a/libs/qrencode/Makefile
+++ b/libs/qrencode/Makefile
@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=qrencode
 PKG_VERSION:=4.0.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://fukuchi.org/works/qrencode
 PKG_HASH:=c9cb278d3b28dcc36b8d09e8cad51c0eca754eb004cb0247d4703cb4472b58b4

 PKG_MAINTAINER:=Jonathan Bennett <JBennett@incomsystems.biz>
-PKG_LICENSE:=LGPL-2.1+
+PKG_LICENSE:=LGPL-2.1-or-later

 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
--- a/libs/sbc/Makefile
+++ b/libs/sbc/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=sbc
 PKG_VERSION:=1.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/bluetooth/
 PKG_HASH:=518bf46e6bb3dc808a95e1eabad26fdebe8a099c1e781c27ed7fca6c2f4a54c9

-PKG_LICENSE:=LGPL-2.1+
+PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING.LIB
 PKG_MAINTAINER:=

--- a/libs/slang2/Makefile
+++ b/libs/slang2/Makefile
@ -11,14 +11,14 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=slang
 PKG_VERSION:=2.3.2
-PKG_RELEASE:=3
+PKG_RELEASE:=4

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://www.jedsoft.org/releases/slang \
 	https://www.jedsoft.org/releases/slang/old
 PKG_HASH:=fc9e3b0fc4f67c3c1f6d43c90c16a5c42d117b8e28457c5b46831b8b5d3ae31a

-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>

--- a/libs/vips/Makefile
+++ b/libs/vips/Makefile
@ -7,14 +7,14 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=vips
 PKG_VERSION:=8.7.4
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/libvips/libvips/releases/download/v$(PKG_VERSION)
 PKG_HASH:=ce7518a8f31b1d29a09b3d7c88e9852a5a2dcb3ee1501524ab477e433383f205

 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-PKG_LICENSE:=LGPL-2.1+
+PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=COPYING

 PKG_FIXUP:=autoreconf
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=mailman
 PKG_VERSION:=2.1.29
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
 PKG_HASH:=838872713601e8a124146e550f53709482c1ef168f1e16d201465c651cbf0d2c

 PKG_MAINTAINER:=Denis Shulyaka <Shulyaka@gmail.com>
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=gnu-COPYING-GPL
 PKG_CPE_ID:=cpe:2.3:a:gnu:mailman

--- a/mail/ssmtp/Makefile
+++ b/mail/ssmtp/Makefile
@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=ssmtp
 PKG_VERSION:=2.64
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later

 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.bz2
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/s/ssmtp
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=ffmpeg
 PKG_VERSION:=3.4.6
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://ffmpeg.org/releases/
@ -18,7 +18,7 @@ PKG_HASH:=3572279cb139d9e39dcfbc23edf438ff5311ec3fc5d0dcb3558e49591e5cb83e
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>, \
 		Ian Leonard <antonlacon@gmail.com>

-PKG_LICENSE:=LGPL-2.1+ GPL-2+ LGPL-3
+PKG_LICENSE:=LGPL-2.1-or-later GPL-2.0-or-later LGPL-3
 PKG_LICENSE_FILES:=COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 COPYING.LGPLv3
 PKG_CPE_ID:=cpe:/a:ffmpeg:ffmpeg

--- a/net/bcp38/Makefile
+++ b/net/bcp38/Makefile
@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=bcp38
 PKG_VERSION:=5
-PKG_RELEASE:=5
-PKG_LICENCE:=GPL-3.0+
+PKG_RELEASE:=6
+PKG_LICENCE:=GPL-3.0-or-later

 include $(INCLUDE_DIR)/package.mk

--- a/net/bridge-utils/Makefile
+++ b/net/bridge-utils/Makefile
@ -10,14 +10,14 @@ include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=bridge-utils
 PKG_VERSION:=1.6
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/net/$(PKG_NAME)
 PKG_HASH:=cc67efb5d5fb8928a6569b3fade2b4042ec17da04678dab127d96b46489e26c8
 PKG_MAINTAINER:=Nikolay Martynov <mar.kolya@gmail.com>

-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
 PKG_FIXUP:=autoreconf

--- a/net/cgi-io/Makefile
+++ b/net/cgi-io/Makefile
@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=cgi-io
-PKG_RELEASE:=6
+PKG_RELEASE:=7

-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later

 PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>

@ -37,7 +37,7 @@ endef
 define Package/cgi-io/install
 	$(INSTALL_DIR) $(1)/usr/libexec $(1)/www/cgi-bin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/cgi-io $(1)/usr/libexec
-	$(LN) ../../usr/libexec/cgi-io $(1)/www/cgi-bin/cgi-upload 
+	$(LN) ../../usr/libexec/cgi-io $(1)/www/cgi-bin/cgi-upload
 	$(LN) ../../usr/libexec/cgi-io $(1)/www/cgi-bin/cgi-backup
 endef

--- a/net/dynapoint/Makefile
+++ b/net/dynapoint/Makefile
@ -8,10 +8,10 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=dynapoint
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_MAINTAINER:=Tobias Ilte <tobias.ilte@campus.tu-berlin.de>
-PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE:=GPL-3.0-or-later

 include $(INCLUDE_DIR)/package.mk

--- a/net/fakeidentd/Makefile
+++ b/net/fakeidentd/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=fakeidentd
 PKG_VERSION:=2.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).c
 PKG_SOURCE_URL:=http://distfiles.gentoo.org/distfiles/
 PKG_HASH:=75b321e5d9dddcea2b38035b62ac30f2175ed43f3f187be6da19aaa67c4fe165
 PKG_MAINTAINER:=Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
 UNPACK_CMD=$(CP) $(DL_DIR)/$(PKG_SOURCE) $(1)/

 include $(INCLUDE_DIR)/package.mk
--- a/net/fwknop/Makefile
+++ b/net/fwknop/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=fwknop
 PKG_VERSION:=2.6.10
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://www.cipherdyne.org/fwknop/download
 PKG_HASH:=f6c09bec97ed8e474a98ae14f9f53e1bcdda33393f20667b6af3fb6bb894ca77
 PKG_MAINTAINER:=Jonathan Bennett <JBennett@incomsystems.biz>
-PKG_LICENSE:=GPLv2+
+PKG_LICENSE:=GPL-2.0-or-later
 PKG_INSTALL:=1

 include $(INCLUDE_DIR)/package.mk
--- a/net/geth/Makefile
+++ b/net/geth/Makefile
@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=go-ethereum
 PKG_VERSION:=1.9.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/ethereum/go-ethereum/tar.gz/v${PKG_VERSION}?
 PKG_HASH:=7394ae0eeac4b2aafa4bd56eef18c077088770bbce0962b215607b44369a5430

 PKG_MAINTAINER:=Mislav Novakovic <mislav.novakovic@sartura.hr>
-PKG_LICENSE:=GPL-3-or-later LGPL-3-or-later
+PKG_LICENSE:=GPL-3.0-or-later LGPL-3.0-or-later
 PKG_LICENSE_FILES:=COPYING COPYING.LESSER

 PKG_BUILD_DEPENDS:=golang/host
--- a/net/horst/Makefile
+++ b/net/horst/Makefile
@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=horst
 PKG_VERSION:=5.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/br101/horst/archive/v$(PKG_VERSION)/
 PKG_HASH:=74b4cb1143d93c73c3b4bbbe0c36f89a790401bde9e894e94e2a27339ca384d9

 PKG_MAINTAINER:=Bruno Randolf <br1@einfach.org>
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=LICENSE

 PKG_BUILD_PARALLEL:=1
--- a/net/htpdate/Makefile
+++ b/net/htpdate/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=htpdate
 PKG_VERSION:=1.1.1
-PKG_RELEASE:=3
+PKG_RELEASE:=4

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://www.vervest.org/htp/archive/c/
 PKG_HASH:=0d75f91cb61f8869c8298d198fa52b9a139ae505b366e9d4d331af8bc1c04880

-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=

 include $(INCLUDE_DIR)/package.mk
--- a/net/keepalived/Makefile
+++ b/net/keepalived/Makefile
@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=keepalived
 PKG_VERSION:=2.0.18
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.keepalived.org/software
 PKG_HASH:=1423a2b1b8e541211029b9e1e1452e683bbe5f4b0b287eddd609aaf5ff024fd0

 PKG_CPE_ID:=cpe:/a:keepalived:keepalived
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Ben Kelly <ben@benjii.net> \
 		Florian Eckert <fe@dev.tdt.de>
--- a/net/knxd/Makefile
+++ b/net/knxd/Makefile
@ -12,7 +12,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=knxd
 PKG_VERSION:=0.14.29
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/knxd/knxd/tar.gz/$(PKG_VERSION)?
@ -20,7 +20,7 @@ PKG_HASH:=4513328dd5ecfc17955e6884e938d652dbd33b82797893ae9ad768a247a0f63e

 PKG_MAINTAINER:=Othmar Truniger <github@truniger.ch>

-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=LICENSE

 PKG_BUILD_PARALLEL:=1
--- a/net/kplex/Makefile
+++ b/net/kplex/Makefile
@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=kplex
 PKG_VERSION:=1.4
-PKG_RELEASE=1
+PKG_RELEASE=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=http://www.stripydog.com/download
 PKG_HASH:=8c2f1ccba4a22cb3b683b73b9dab6ce317e7d858764f1c2c695970f94c726fc1

-PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=COPYING

 PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=lftp
 PKG_VERSION:=4.8.4
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://lftp.tech/ftp/ \
 		https://mirror.csclub.uwaterloo.ca/gentoo-distfiles/distfiles/
@ -17,7 +17,7 @@ PKG_SOURCE_URL:=http://lftp.tech/ftp/ \
 PKG_HASH:=4ebc271e9e5cea84a683375a0f7e91086e5dac90c5d51bb3f169f75386107a62


-PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=COPYING

 include $(INCLUDE_DIR)/uclibc++.mk
--- a/net/mac-telnet/Makefile
+++ b/net/mac-telnet/Makefile
@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=mac-telnet
 PKG_VERSION:=2015-09-02
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_RELEASE=$(PKG_SOURCE_VERSION)+1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/jow-/MAC-Telnet.git
@ -15,7 +15,7 @@ PKG_SOURCE_VERSION:=37d83cbc9c07266d6c957d27bf75285b305eceab
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=13429f1a870121cdbbfb687e0581967904798000eca1f8f9c1e9dc87dee5669b

-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>

 include $(INCLUDE_DIR)/package.mk
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=mtr
 PKG_VERSION:=0.92
-PKG_RELEASE:=5
+PKG_RELEASE:=6

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.bitwizard.nl/mtr/files
 PKG_HASH:=f2979db9e2f41aa8e6574e7771767c9afe111d9213814eb47f5e1e71876e4382

 PKG_MAINTAINER:=Jonathan McCrohan <jmccrohan@gmail.com>
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING

 PKG_INSTALL:=1
--- a/net/nbd/Makefile
+++ b/net/nbd/Makefile
@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=nbd
 PKG_VERSION:=3.19
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@SF/nbd
 PKG_HASH:=b4466412f13e057659f25d35e1e8e181afd62c7179bff22a6add81445ecb8690
-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later
 PKG_MAINTAINER:=Marcin Jurkowski <marcin1j@gmail.com>

 PKG_INSTALL:=1
--- a/net/netifyd/Makefile
+++ b/net/netifyd/Makefile
@ -6,9 +6,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=netifyd
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=Darryl Sokoloski <darryl@egloo.ca>
-PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE:=GPL-3.0-or-later

 PKG_BUILD_PARALLEL:=1
 PKG_FIXUP:=autoreconf
--- a/net/ntripcaster/Makefile
+++ b/net/ntripcaster/Makefile
@ -10,13 +10,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=ntripcaster
 PKG_VERSION:=0.1.5
-PKG_RELEASE:=2
+PKG_RELEASE:=3

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/nunojpg/ntripcaster/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=2184af9821cf73bac1df229f1e61ca1d3e288c9de6087bee1ae218b54c588452

-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later

 PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>

--- a/net/ntripclient/Makefile
+++ b/net/ntripclient/Makefile
@ -10,13 +10,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=ntripclient
 PKG_VERSION:=1.51
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/nunojpg/ntripclient/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=d668e87b2260ef262e2066ac0ed217ec77478170deaf76ff48f2116a23c48ae5

-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later

 PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>

--- a/net/ntripserver/Makefile
+++ b/net/ntripserver/Makefile
@ -10,13 +10,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=ntripserver
 PKG_VERSION:=1.51
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/nunojpg/ntripserver/tar.gz/v$(PKG_VERSION)?
 PKG_HASH:=3878c13d1b56e14085ce995565a2113aa592e3aa0b0eacfc65b6e3f5bdfc07e7

-PKG_LICENSE:=GPL-2.0+
+PKG_LICENSE:=GPL-2.0-or-later

 PKG_MAINTAINER:=Nuno Goncalves <nunojpg@gmail.com>

--- a/net/nut/Makefile
+++ b/net/nut/Makefile
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=nut
 PKG_VERSION:=2.7.4
-PKG_RELEASE:=16
+PKG_RELEASE:=17

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.networkupstools.org/source/2.7/
 PKG_HASH:=980e82918c52d364605c0703a5dcf01f74ad2ef06e3d365949e43b7d406d25a7
 PKG_MAINTAINER:=Daniel Dickinson <cshored@thecshore.com>
-PKG_LICENSE:=GPL-2.0+ GPL-3.0+ GPL-1.0+ Artistic-1.0-Perl
+PKG_LICENSE:=GPL-2.0-or-later GPL-3.0-or-later GPL-1.0-or-later Artistic-1.0-Perl
 PKG_LICENSE_FILES:=LICENSE-GPL2 LICENSE-GPL3 COPYING
 PKG_FIXUP:=autoreconf

--- a/Show more
+++ b/Show more