boot, package: use SPDX short identifier for GPLv3/GPLv3+

We want to use SPDX identifier for license string as much as possible.
SPDX short identifier for GPLv3/GPLv3+ is GPL-3.0/GPL-3.0+.

This change is done using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/\<GPLv3\>/GPL-3.0/g'

Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

boot/grub2/grub2.mk

@@ -7,7 +7,7 @@
 GRUB2_VERSION = 2.00
 GRUB2_SITE = $(BR2_GNU_MIRROR)/grub
 GRUB2_SOURCE = grub-$(GRUB2_VERSION).tar.xz
-GRUB2_LICENSE = GPLv3+
+GRUB2_LICENSE = GPL-3.0+
 GRUB2_LICENSE_FILES = COPYING
 GRUB2_DEPENDENCIES = host-bison host-flex
 

package/4th/4th.mk

@@ -7,7 +7,7 @@
 4TH_VERSION = 3.62.4
 4TH_SOURCE = 4th-$(4TH_VERSION)-unix.tar.gz
 4TH_SITE = http://downloads.sourceforge.net/project/forth-4th/4th-$(4TH_VERSION)
-4TH_LICENSE = GPLv3+, LGPLv3+
+4TH_LICENSE = GPL-3.0+, LGPLv3+
 # The COPYING file only contains the text of the LGPLv3, but the
 # source code really contains parts under GPLv3+.
 4TH_LICENSE_FILES = COPYING

package/at/at.mk

@@ -11,7 +11,7 @@ AT_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/a
 AT_MAKE = $(MAKE1)
 AT_AUTORECONF = YES
 AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex) host-bison host-flex
-AT_LICENSE = GPL-2.0+, GPLv3+, ISC
+AT_LICENSE = GPL-2.0+, GPL-3.0+, ISC
 AT_LICENSE_FILES = Copyright COPYING
 
 AT_CONF_OPTS = \

package/aubio/aubio.mk

@@ -7,7 +7,7 @@
 AUBIO_VERSION = 0.4.3
 AUBIO_SITE = https://aubio.org/pub
 AUBIO_SOURCE = aubio-$(AUBIO_VERSION).tar.bz2
-AUBIO_LICENSE = GPLv3+
+AUBIO_LICENSE = GPL-3.0+
 AUBIO_LICENSE_FILES = COPYING
 AUBIO_INSTALL_STAGING = YES
 

package/autoconf-archive/autoconf-archive.mk

@@ -7,7 +7,7 @@
 AUTOCONF_ARCHIVE_VERSION = 2016.03.20
 AUTOCONF_ARCHIVE_SOURCE = autoconf-archive-$(AUTOCONF_ARCHIVE_VERSION).tar.xz
 AUTOCONF_ARCHIVE_SITE = $(BR2_GNU_MIRROR)/autoconf-archive
-AUTOCONF_ARCHIVE_LICENSE = GPLv3+ with exception
+AUTOCONF_ARCHIVE_LICENSE = GPL-3.0+ with exception
 AUTOCONF_ARCHIVE_LICENSE_FILES = COPYING COPYING.EXCEPTION
 HOST_AUTOCONF_ARCHIVE_INSTALL_OPTS = aclocaldir=$(HOST_DIR)/usr/share/autoconf-archive install
 

package/autoconf/autoconf.mk

@@ -8,7 +8,7 @@ AUTOCONF_VERSION = 2.69
 AUTOCONF_SOURCE = autoconf-$(AUTOCONF_VERSION).tar.xz
 AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf
 
-AUTOCONF_LICENSE = GPLv3+ with exceptions
+AUTOCONF_LICENSE = GPL-3.0+ with exceptions
 AUTOCONF_LICENSE_FILES = COPYINGv3 COPYING.EXCEPTION
 
 HOST_AUTOCONF_CONF_ENV = \

package/bash/bash.mk

@@ -10,7 +10,7 @@ BASH_SITE = $(BR2_GNU_MIRROR)/bash
 BASH_DEPENDENCIES = ncurses readline host-bison \
 	$(if $(BR2_PACKAGE_BUSYBOX),busybox)
 BASH_CONF_OPTS = --with-installed-readline
-BASH_LICENSE = GPLv3+
+BASH_LICENSE = GPL-3.0+
 BASH_LICENSE_FILES = COPYING
 
 BASH_CONF_ENV += \

package/binutils/binutils.mk

@@ -25,7 +25,7 @@ BINUTILS_SOURCE ?= binutils-$(BINUTILS_VERSION).tar.bz2
 BINUTILS_EXTRA_CONFIG_OPTIONS = $(call qstrip,$(BR2_BINUTILS_EXTRA_CONFIG_OPTIONS))
 BINUTILS_INSTALL_STAGING = YES
 BINUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
-BINUTILS_LICENSE = GPLv3+, libiberty LGPLv2.1+
+BINUTILS_LICENSE = GPL-3.0+, libiberty LGPLv2.1+
 BINUTILS_LICENSE_FILES = COPYING3 COPYING.LIB
 
 ifeq ($(BINUTILS_FROM_GIT),y)

package/bison/bison.mk

@@ -7,7 +7,7 @@
 BISON_VERSION = 3.0.4
 BISON_SOURCE = bison-$(BISON_VERSION).tar.xz
 BISON_SITE = $(BR2_GNU_MIRROR)/bison
-BISON_LICENSE = GPLv3+
+BISON_LICENSE = GPL-3.0+
 BISON_LICENSE_FILES = COPYING
 HOST_BISON_DEPENDENCIES = host-m4
 

package/ccache/ccache.mk

@@ -7,7 +7,7 @@
 CCACHE_VERSION = 3.3.4
 CCACHE_SITE = https://www.samba.org/ftp/ccache
 CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz
-CCACHE_LICENSE = GPLv3+, others
+CCACHE_LICENSE = GPL-3.0+, others
 CCACHE_LICENSE_FILES = LICENSE.txt GPL-3.0.txt
 
 # Force ccache to use its internal zlib. The problem is that without

package/cgroupfs-mount/cgroupfs-mount.mk

@@ -6,7 +6,7 @@
 
 CGROUPFS_MOUNT_VERSION = 7285bf44402029394808339f69f4f293730fc2c6
 CGROUPFS_MOUNT_SITE = $(call github,tianon,cgroupfs-mount,$(CGROUPFS_MOUNT_VERSION))
-CGROUPFS_MOUNT_LICENSE = GPLv3+
+CGROUPFS_MOUNT_LICENSE = GPL-3.0+
 CGROUPFS_MOUNT_LICENSE_FILES = debian/copyright
 
 define CGROUPFS_MOUNT_INSTALL_TARGET_CMDS

package/cifs-utils/cifs-utils.mk

@@ -7,7 +7,7 @@
 CIFS_UTILS_VERSION = 6.6
 CIFS_UTILS_SOURCE = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2
 CIFS_UTILS_SITE = http://ftp.samba.org/pub/linux-cifs/cifs-utils
-CIFS_UTILS_LICENSE = GPLv3+
+CIFS_UTILS_LICENSE = GPL-3.0+
 CIFS_UTILS_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),)

package/comix-cursors/comix-cursors.mk

@@ -7,7 +7,7 @@
 COMIX_CURSORS_VERSION = 0.8.2
 COMIX_CURSORS_SITE = http://limitland.de/downloads/comixcursors
 COMIX_CURSORS_SOURCE = ComixCursors-$(COMIX_CURSORS_VERSION).tar.bz2
-COMIX_CURSORS_LICENSE = GPLv3
+COMIX_CURSORS_LICENSE = GPL-3.0
 COMIX_CURSORS_STRIP_COMPONENTS = 0
 
 define COMIX_CURSORS_INSTALL_TARGET_CMDS

package/coreutils/coreutils.mk

@@ -7,7 +7,7 @@
 COREUTILS_VERSION = 8.26
 COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils
 COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz
-COREUTILS_LICENSE = GPLv3+
+COREUTILS_LICENSE = GPL-3.0+
 COREUTILS_LICENSE_FILES = COPYING
 
 # coreutils-01-fix-for-dummy-man-usage.patch triggers autoreconf on build

package/cpio/cpio.mk

@@ -8,7 +8,7 @@ CPIO_VERSION = 2.12
 CPIO_SITE = $(BR2_GNU_MIRROR)/cpio
 CPIO_CONF_OPTS = --bindir=/bin
 CPIO_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
-CPIO_LICENSE = GPLv3+
+CPIO_LICENSE = GPL-3.0+
 CPIO_LICENSE_FILES = COPYING
 
 # cpio uses argp.h which is not provided by uclibc or musl by default.

package/dc3dd/dc3dd.mk

@@ -8,7 +8,7 @@ DC3DD_VERSION_MAJOR = 7.2
 DC3DD_VERSION = $(DC3DD_VERSION_MAJOR).641
 DC3DD_SOURCE = dc3dd-$(DC3DD_VERSION).tar.xz
 DC3DD_SITE = https://downloads.sourceforge.net/project/dc3dd/dc3dd/$(DC3DD_VERSION_MAJOR)
-DC3DD_LICENSE = GPLv3+
+DC3DD_LICENSE = GPL-3.0+
 DC3DD_LICENSE_FILES = COPYING
 # We are patching the Makefile.am
 DC3DD_AUTORECONF = YES

package/diffutils/diffutils.mk

@@ -8,7 +8,7 @@ DIFFUTILS_VERSION = 3.5
 DIFFUTILS_SOURCE = diffutils-$(DIFFUTILS_VERSION).tar.xz
 DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils
 DIFFUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
-DIFFUTILS_LICENSE = GPLv3+
+DIFFUTILS_LICENSE = GPL-3.0+
 DIFFUTILS_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)

package/dillo/dillo.mk

@@ -7,7 +7,7 @@
 DILLO_VERSION = 3.0.5
 DILLO_SOURCE = dillo-$(DILLO_VERSION).tar.bz2
 DILLO_SITE = http://www.dillo.org/download
-DILLO_LICENSE = GPLv3+
+DILLO_LICENSE = GPL-3.0+
 DILLO_LICENSE_FILES = COPYING
 # configure.ac gets patched, so autoreconf is necessary
 DILLO_AUTORECONF = YES

package/ding-libs/ding-libs.mk

@@ -11,7 +11,7 @@ DING_LIBS_DEPENDENCIES = host-pkgconf \
 	$(if $(BR2_PACKAGE_GETTEXT),gettext) \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv)
 DING_LIBS_INSTALL_STAGING = YES
-DING_LIBS_LICENSE = LGPLv3+ (library),GPLv3+ (test programs)
+DING_LIBS_LICENSE = LGPLv3+ (library),GPL-3.0+ (test programs)
 DING_LIBS_LICENSE_FILES = COPYING COPYING.LESSER
 
 # autoconf/automake generated files not present in tarball

package/dnsmasq/dnsmasq.mk

@@ -11,7 +11,7 @@ DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)"
 DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
 DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)"
 DNSMASQ_DEPENDENCIES = host-pkgconf
-DNSMASQ_LICENSE = GPL-2.0 or GPLv3
+DNSMASQ_LICENSE = GPL-2.0 or GPL-3.0
 DNSMASQ_LICENSE_FILES = COPYING COPYING-v3
 
 ifneq ($(BR2_PACKAGE_DNSMASQ_DHCP),y)

package/domoticz/domoticz.mk

@@ -6,7 +6,7 @@
 
 DOMOTICZ_VERSION = 3.5877
 DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION))
-DOMOTICZ_LICENSE = GPLv3
+DOMOTICZ_LICENSE = GPL-3.0
 DOMOTICZ_LICENSE_FILES = License.txt
 DOMOTICZ_DEPENDENCIES = \
 	boost \

package/dosfstools/dosfstools.mk

@@ -7,7 +7,7 @@
 DOSFSTOOLS_VERSION = 4.0
 DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VERSION).tar.xz
 DOSFSTOOLS_SITE = https://github.com/dosfstools/dosfstools/releases/download/v$(DOSFSTOOLS_VERSION)
-DOSFSTOOLS_LICENSE = GPLv3+
+DOSFSTOOLS_LICENSE = GPL-3.0+
 DOSFSTOOLS_LICENSE_FILES = COPYING
 DOSFSTOOLS_CONF_OPTS = --enable-compat-symlinks --exec-prefix=/
 HOST_DOSFSTOOLS_CONF_OPTS = --enable-compat-symlinks

package/ed/ed.mk

@@ -10,7 +10,7 @@ ED_SOURCE = ed-$(ED_VERSION).tar.lz
 ED_CONF_OPTS = \
 	CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
 	LDFLAGS="$(TARGET_LDFLAGS)"
-ED_LICENSE = GPLv3+
+ED_LICENSE = GPL-3.0+
 ED_LICENSE_FILES = COPYING
 
 define ED_CONFIGURE_CMDS

package/elfutils/elfutils.mk

@@ -74,7 +74,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_ELFUTILS_PROGS),y)
 ELFUTILS_CONF_OPTS += --enable-progs
-ELFUTILS_LICENSE := $(ELFUTILS_LICENSE), GPLv3+ (programs)
+ELFUTILS_LICENSE := $(ELFUTILS_LICENSE), GPL-3.0+ (programs)
 ELFUTILS_LICENSE_FILES += COPYING
 else
 ELFUTILS_CONF_OPTS += --disable-progs

package/enscript/enscript.mk

@@ -6,7 +6,7 @@
 
 ENSCRIPT_VERSION = 1.6.6
 ENSCRIPT_SITE = $(BR2_GNU_MIRROR)/enscript
-ENSCRIPT_LICENSE = GPLv3+
+ENSCRIPT_LICENSE = GPL-3.0+
 ENSCRIPT_LICENSE_FILES = COPYING
 
 # Enable pthread threads if toolchain supports threads

package/espeak/espeak.mk

@@ -8,7 +8,7 @@ ESPEAK_VERSION_MAJOR = 1.48
 ESPEAK_VERSION = $(ESPEAK_VERSION_MAJOR).04
 ESPEAK_SOURCE = espeak-$(ESPEAK_VERSION)-source.zip
 ESPEAK_SITE = http://downloads.sourceforge.net/project/espeak/espeak/espeak-$(ESPEAK_VERSION_MAJOR)
-ESPEAK_LICENSE = GPLv3+
+ESPEAK_LICENSE = GPL-3.0+
 ESPEAK_LICENSE_FILES = License.txt
 
 ifeq ($(BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_ALSA),y)

package/evemu/evemu.mk

@@ -7,7 +7,7 @@
 EVEMU_VERSION = 2.5.0
 EVEMU_SITE = http://www.freedesktop.org/software/evemu
 EVEMU_SOURCE = evemu-$(EVEMU_VERSION).tar.xz
-EVEMU_LICENSE = LGPLv3 (library), GPLv3 (tools)
+EVEMU_LICENSE = LGPLv3 (library), GPL-3.0 (tools)
 EVEMU_LICENSE_FILES = COPYING
 
 # asciidoc used to generate manpages, which we don't need, and if it's

package/exfat-utils/exfat-utils.mk

@@ -6,7 +6,7 @@
 
 EXFAT_UTILS_VERSION = 1.2.4
 EXFAT_UTILS_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_UTILS_VERSION)
-EXFAT_UTILS_LICENSE = GPLv3+
+EXFAT_UTILS_LICENSE = GPL-3.0+
 EXFAT_UTILS_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

package/exfat/exfat.mk

@@ -8,7 +8,7 @@ EXFAT_VERSION = 1.2.4
 EXFAT_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_VERSION)
 EXFAT_SOURCE = fuse-exfat-$(EXFAT_VERSION).tar.gz
 EXFAT_DEPENDENCIES = libfuse host-pkgconf
-EXFAT_LICENSE = GPLv3+
+EXFAT_LICENSE = GPL-3.0+
 EXFAT_LICENSE_FILES = COPYING
 EXFAT_CFLAGS = $(TARGET_CFLAGS) -std=c99
 

package/fakeroot/fakeroot.mk

@@ -16,7 +16,7 @@ HOST_FAKEROOT_CONF_ENV = \
 	ac_cv_header_sys_capability_h=no \
 	ac_cv_func_capset=no
 
-FAKEROOT_LICENSE = GPLv3+
+FAKEROOT_LICENSE = GPL-3.0+
 FAKEROOT_LICENSE_FILES = COPYING
 
 $(eval $(host-autotools-package))

package/findutils/findutils.mk

@@ -6,7 +6,7 @@
 
 FINDUTILS_VERSION = 4.6.0
 FINDUTILS_SITE = $(BR2_GNU_MIRROR)/findutils
-FINDUTILS_LICENSE = GPLv3+
+FINDUTILS_LICENSE = GPL-3.0+
 FINDUTILS_LICENSE_FILES = COPYING
 FINDUTILS_CONF_ENV = \
 	gl_cv_func_stdin=yes \

package/ftop/ftop.mk

@@ -7,7 +7,7 @@
 FTOP_VERSION = 1.0
 FTOP_SITE = http://ftop.googlecode.com/files
 FTOP_DEPENDENCIES = ncurses
-FTOP_LICENSE = GPLv3+
+FTOP_LICENSE = GPL-3.0+
 FTOP_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

package/gawk/gawk.mk

@@ -8,7 +8,7 @@ GAWK_VERSION = 4.1.4
 GAWK_SOURCE = gawk-$(GAWK_VERSION).tar.xz
 GAWK_SITE = $(BR2_GNU_MIRROR)/gawk
 GAWK_DEPENDENCIES = host-gawk
-GAWK_LICENSE = GPLv3+
+GAWK_LICENSE = GPL-3.0+
 GAWK_LICENSE_FILES = COPYING
 
 # Prefer full-blown gawk over busybox awk

package/gdb/gdb.mk

@@ -20,7 +20,7 @@ GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz
 GDB_FROM_GIT = y
 endif
 
-GDB_LICENSE = GPL-2.0+, LGPLv2+, GPLv3+, LGPLv3+
+GDB_LICENSE = GPL-2.0+, LGPLv2+, GPL-3.0+, LGPLv3+
 GDB_LICENSE_FILES = COPYING COPYING.LIB COPYING3 COPYING3.LIB
 
 # We only want gdbserver and not the entire debugger.

package/gdbm/gdbm.mk

@@ -6,7 +6,7 @@
 
 GDBM_VERSION = 1.12
 GDBM_SITE = $(BR2_GNU_MIRROR)/gdbm
-GDBM_LICENSE = GPLv3+
+GDBM_LICENSE = GPL-3.0+
 GDBM_LICENSE_FILES = COPYING
 GDBM_INSTALL_STAGING = YES
 

package/gengetopt/gengetopt.mk

@@ -6,7 +6,7 @@
 
 GENGETOPT_VERSION = 2.22.6
 GENGETOPT_SITE = $(BR2_GNU_MIRROR)/gengetopt
-GENGETOPT_LICENSE = GPLv3+
+GENGETOPT_LICENSE = GPL-3.0+
 GENGETOPT_LICENSE_FILES = COPYING LICENSE
 
 # Parallel build broken

package/gettext/gettext.mk

@@ -8,7 +8,7 @@ GETTEXT_VERSION = 0.19.8.1
 GETTEXT_SITE = $(BR2_GNU_MIRROR)/gettext
 GETTEXT_SOURCE = gettext-$(GETTEXT_VERSION).tar.xz
 GETTEXT_INSTALL_STAGING = YES
-GETTEXT_LICENSE = LGPLv2.1+ (libintl), GPLv3+ (the rest)
+GETTEXT_LICENSE = LGPLv2.1+ (libintl), GPL-3.0+ (the rest)
 GETTEXT_LICENSE_FILES = COPYING gettext-runtime/intl/COPYING.LIB
 
 GETTEXT_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)

package/git-crypt/git-crypt.mk

@@ -7,7 +7,7 @@
 GIT_CRYPT_VERSION = 0.5.0
 GIT_CRYPT_SITE = https://www.agwa.name/projects/git-crypt/downloads
 GIT_CRYPT_DEPENDENCIES = host-pkgconf openssl
-GIT_CRYPT_LICENSE = GPLv3+, MIT
+GIT_CRYPT_LICENSE = GPL-3.0+, MIT
 GIT_CRYPT_LICENSE_FILES = COPYING parse_options.hpp
 
 GIT_CRYPT_LIBS = `$(PKG_CONFIG_HOST_BINARY) --libs openssl`

package/glmark2/glmark2.mk

@@ -6,7 +6,7 @@
 
 GLMARK2_VERSION = 7215c0f337dae0b232535549c37fca441747a891
 GLMARK2_SITE = $(call github,glmark2,glmark2,$(GLMARK2_VERSION))
-GLMARK2_LICENSE = GPLv3+, SGIv1
+GLMARK2_LICENSE = GPL-3.0+, SGIv1
 GLMARK2_LICENSE_FILES = COPYING COPYING.SGI
 GLMARK2_DEPENDENCIES = host-pkgconf jpeg libpng \
 	$(if $(BR2_PACKAGE_HAS_LIBEGL),libegl) \

package/gnupg/gnupg.mk

@@ -7,7 +7,7 @@
 GNUPG_VERSION = 1.4.21
 GNUPG_SOURCE = gnupg-$(GNUPG_VERSION).tar.bz2
 GNUPG_SITE = ftp://ftp.gnupg.org/gcrypt/gnupg
-GNUPG_LICENSE = GPLv3+
+GNUPG_LICENSE = GPL-3.0+
 GNUPG_LICENSE_FILES = COPYING
 GNUPG_DEPENDENCIES = zlib ncurses $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 GNUPG_CONF_ENV = ac_cv_sys_symbol_underscore=no

package/gnupg2/gnupg2.mk

@@ -7,7 +7,7 @@
 GNUPG2_VERSION = 2.1.19
 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2
 GNUPG2_SITE = ftp://ftp.gnupg.org/gcrypt/gnupg
-GNUPG2_LICENSE = GPLv3+
+GNUPG2_LICENSE = GPL-3.0+
 GNUPG2_LICENSE_FILES = COPYING
 GNUPG2_DEPENDENCIES = zlib libgpg-error libgcrypt libassuan libksba libnpth \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf

package/gnuradio/gnuradio.mk

@@ -6,7 +6,7 @@
 
 GNURADIO_VERSION = 3.7.9.1
 GNURADIO_SITE = http://gnuradio.org/releases/gnuradio
-GNURADIO_LICENSE = GPLv3+
+GNURADIO_LICENSE = GPL-3.0+
 GNURADIO_LICENSE_FILES = COPYING
 
 GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO

package/gnutls/gnutls.mk

@@ -8,7 +8,7 @@ GNUTLS_VERSION_MAJOR = 3.5
 GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).10
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
 GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR)
-GNUTLS_LICENSE = LGPLv2.1+ (core library), GPLv3+ (gnutls-openssl library)
+GNUTLS_LICENSE = LGPLv2.1+ (core library), GPL-3.0+ (gnutls-openssl library)
 GNUTLS_LICENSE_FILES = doc/COPYING doc/COPYING.LESSER
 GNUTLS_DEPENDENCIES = host-pkgconf libunistring libtasn1 nettle pcre
 GNUTLS_CONF_OPTS = \

package/gperf/gperf.mk

@@ -6,7 +6,7 @@
 
 GPERF_VERSION = 3.0.4
 GPERF_SITE = $(BR2_GNU_MIRROR)/gperf
-GPERF_LICENSE = GPLv3+
+GPERF_LICENSE = GPL-3.0+
 GPERF_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

package/gqrx/gqrx.mk

@@ -6,7 +6,7 @@
 
 GQRX_VERSION = v2.6
 GQRX_SITE = $(call github,csete,gqrx,$(GQRX_VERSION))
-GQRX_LICENSE = GPLv3+, Apache-2.0
+GQRX_LICENSE = GPL-3.0+, Apache-2.0
 GQRX_LICENSE_FILES = COPYING LICENSE-CTK
 GQRX_DEPENDENCIES = boost gnuradio gr-osmosdr qt5base qt5svg
 

package/gr-osmosdr/gr-osmosdr.mk

@@ -6,7 +6,7 @@
 
 GR_OSMOSDR_VERSION = 164a09fc11cec2d8b15b38e8b512fa542d6cecc7
 GR_OSMOSDR_SITE = $(call github,osmocom,gr-osmosdr,$(GR_OSMOSDR_VERSION))
-GR_OSMOSDR_LICENSE = GPLv3+
+GR_OSMOSDR_LICENSE = GPL-3.0+
 GR_OSMOSDR_LICENSE_FILES = COPYING
 
 # gr-osmosdr prevents doing an in-source-tree build

package/grep/grep.mk

@@ -7,7 +7,7 @@
 GREP_VERSION = 3.0
 GREP_SITE = $(BR2_GNU_MIRROR)/grep
 GREP_SOURCE = grep-$(GREP_VERSION).tar.xz
-GREP_LICENSE = GPLv3+
+GREP_LICENSE = GPL-3.0+
 GREP_LICENSE_FILES = COPYING
 GREP_CONF_OPTS = --disable-perl-regexp \
 	$(if $(BR2_TOOLCHAIN_USES_MUSL),--with-included-regex)

package/gsl/gsl.mk

@@ -7,7 +7,7 @@
 GSL_VERSION = 1.16
 GSL_SITE = $(BR2_GNU_MIRROR)/gsl
 GSL_INSTALL_STAGING = YES
-GSL_LICENSE = GPLv3
+GSL_LICENSE = GPL-3.0
 GSL_LICENSE_FILES = COPYING
 GSL_CONFIG_SCRIPTS = gsl-config
 

package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk

@@ -12,7 +12,7 @@ GST_FFMPEG_DEPENDENCIES = host-pkgconf gstreamer gst-plugins-base
 
 ifeq ($(BR2_PACKAGE_GST_FFMPEG_GPL),y)
 GST_FFMPEG_CONF_OPTS += --disable-lgpl
-GST_FFMPEG_LICENSE = GPL-2.0+ (gst-ffmpeg), GPL-2.0+/GPLv3+ (libav)
+GST_FFMPEG_LICENSE = GPL-2.0+ (gst-ffmpeg), GPL-2.0+/GPL-3.0+ (libav)
 GST_FFMPEG_LICENSE_FILES = COPYING gst-libs/ext/libav/COPYING.GPLv2 gst-libs/ext/libav/COPYING.GPLv3
 else
 GST_FFMPEG_CONF_OPTS += --enable-lgpl

package/gzip/gzip.mk

@@ -11,7 +11,7 @@ GZIP_SITE = $(BR2_GNU_MIRROR)/gzip
 GZIP_CONF_OPTS = --exec-prefix=/
 # Prefer full gzip over potentially lightweight/slower from busybox
 GZIP_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
-GZIP_LICENSE = GPLv3+
+GZIP_LICENSE = GPL-3.0+
 GZIP_LICENSE_FILES = COPYING
 GZIP_CONF_ENV += gl_cv_func_fflush_stdin=yes
 # configure substitutes $(SHELL) for the shell shebang in scripts like

package/hans/hans.mk

@@ -6,7 +6,7 @@
 
 HANS_VERSION = 0.4.4
 HANS_SITE = http://downloads.sourceforge.net/project/hanstunnel/source
-HANS_LICENSE = GPLv3+
+HANS_LICENSE = GPL-3.0+
 HANS_LICENSE_FILES = LICENSE
 
 define HANS_BUILD_CMDS

package/haveged/haveged.mk

@@ -6,7 +6,7 @@
 
 HAVEGED_VERSION = 1.9.1
 HAVEGED_SITE = http://www.issihosts.com/haveged
-HAVEGED_LICENSE = GPLv3+
+HAVEGED_LICENSE = GPL-3.0+
 HAVEGED_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_sparc_v8)$(BR2_sparc_leon3),y)

package/hidapi/hidapi.mk

@@ -11,7 +11,7 @@ HIDAPI_SITE = $(call github,signal11,hidapi,$(HIDAPI_VERSION))
 HIDAPI_INSTALL_STAGING = YES
 # No configure provided, so we need to autoreconf.
 HIDAPI_AUTORECONF = YES
-HIDAPI_LICENSE = GPLv3 or BSD-3c or HIDAPI license
+HIDAPI_LICENSE = GPL-3.0 or BSD-3c or HIDAPI license
 HIDAPI_LICENSE_FILES = LICENSE.txt LICENSE-gpl3.txt LICENSE-bsd.txt LICENSE-orig.txt
 
 HIDAPI_DEPENDENCIES = libusb libgudev

package/ifenslave/ifenslave.mk

@@ -7,7 +7,7 @@
 IFENSLAVE_VERSION = 2.9
 IFENSLAVE_SOURCE = ifenslave_$(IFENSLAVE_VERSION).tar.xz
 IFENSLAVE_SITE = http://snapshot.debian.org/archive/debian/20170102T091407Z/pool/main/i/ifenslave
-IFENSLAVE_LICENSE = GPLv3+
+IFENSLAVE_LICENSE = GPL-3.0+
 IFENSLAVE_LICENSE_FILES = debian/copyright
 IFENSLAVE_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
 

package/janus-gateway/janus-gateway.mk

@@ -6,7 +6,7 @@
 
 JANUS_GATEWAY_VERSION = v0.2.2
 JANUS_GATEWAY_SITE = $(call github,meetecho,janus-gateway,$(JANUS_GATEWAY_VERSION))
-JANUS_GATEWAY_LICENSE = GPLv3
+JANUS_GATEWAY_LICENSE = GPL-3.0
 JANUS_GATEWAY_LICENSE_FILES = COPYING
 
 # ding-libs provides the ini_config library

package/kodi-adsp-basic/kodi-adsp-basic.mk

@@ -6,7 +6,7 @@
 
 KODI_ADSP_BASIC_VERSION = cb56e0eb6530fd50a286d47ef0be529001e9d556
 KODI_ADSP_BASIC_SITE = $(call github,kodi-adsp,adsp.basic,$(KODI_ADSP_BASIC_VERSION))
-KODI_ADSP_BASIC_LICENSE = GPLv3+
+KODI_ADSP_BASIC_LICENSE = GPL-3.0+
 KODI_ADSP_BASIC_LICENSE_FILES = LICENSE.md
 KODI_ADSP_BASIC_DEPENDENCIES = libplatform kodi-platform
 

package/kodi-adsp-freesurround/kodi-adsp-freesurround.mk

@@ -6,7 +6,7 @@
 
 KODI_ADSP_FREESURROUND_VERSION = 08b691d3d9a0382d2f6f789a31614fb02512036c
 KODI_ADSP_FREESURROUND_SITE = $(call github,kodi-adsp,adsp.freesurround,$(KODI_ADSP_FREESURROUND_VERSION))
-KODI_ADSP_FREESURROUND_LICENSE = GPLv3+
+KODI_ADSP_FREESURROUND_LICENSE = GPL-3.0+
 KODI_ADSP_FREESURROUND_LICENSE_FILES = LICENSE.md
 KODI_ADSP_FREESURROUND_DEPENDENCIES = libplatform kodi-platform
 

package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk

@@ -6,7 +6,7 @@
 
 KODI_SCREENSAVER_RSXS_VERSION = 195e0ec3fbbcb2ee2012cd560e42d05167f0f259
 KODI_SCREENSAVER_RSXS_SITE = $(call github,notspiff,screensavers.rsxs,$(KODI_SCREENSAVER_RSXS_VERSION))
-KODI_SCREENSAVER_RSXS_LICENSE = GPLv3
+KODI_SCREENSAVER_RSXS_LICENSE = GPL-3.0
 KODI_SCREENSAVER_RSXS_LICENSE_FILES = lib/rsxs-1.0/COPYING
 
 KODI_SCREENSAVER_RSXS_DEPENDENCIES = kodi xlib_libXmu

package/lensfun/lensfun.mk

@@ -6,7 +6,7 @@
 
 LENSFUN_VERSION = 0.3.2
 LENSFUN_SITE = https://sourceforge.net/projects/lensfun/files/$(LENSFUN_VERSION)
-LENSFUN_LICENSE = LGPLv3+ (libraries), GPLv3+ (programs)
+LENSFUN_LICENSE = LGPLv3+ (libraries), GPL-3.0+ (programs)
 LENSFUN_LICENSE_FILES = docs/gpl-3.0.txt docs/lgpl-3.0.txt
 LENSFUN_INSTALL_STAGING = YES
 LENSFUN_DEPENDENCIES = libglib2

package/less/less.mk

@@ -6,7 +6,7 @@
 
 LESS_VERSION = 481
 LESS_SITE = $(BR2_GNU_MIRROR)/less
-LESS_LICENSE = GPLv3+
+LESS_LICENSE = GPL-3.0+
 LESS_LICENSE_FILES = COPYING
 # Build after busybox, full-blown is better
 LESS_DEPENDENCIES = ncurses $(if $(BR2_PACKAGE_BUSYBOX),busybox)

package/lftp/lftp.mk

@@ -7,7 +7,7 @@
 LFTP_VERSION = 4.7.4
 LFTP_SOURCE = lftp-$(LFTP_VERSION).tar.xz
 LFTP_SITE = http://lftp.yar.ru/ftp
-LFTP_LICENSE = GPLv3+
+LFTP_LICENSE = GPL-3.0+
 LFTP_LICENSE_FILES = COPYING
 # Needed so that our libtool patch applies properly, and for patch
 # 0001-fix-static-link-with-readline.patch.

package/libasplib/libasplib.mk

@@ -6,7 +6,7 @@
 
 LIBASPLIB_VERSION = be7fac89218a84b75f7598e3d76625ece99296f2
 LIBASPLIB_SITE = $(call github,AchimTuran,asplib,$(LIBASPLIB_VERSION))
-LIBASPLIB_LICENSE = GPLv3+
+LIBASPLIB_LICENSE = GPL-3.0+
 LIBASPLIB_LICENSE_FILES = LICENSE
 LIBASPLIB_INSTALL_STAGING = YES
 

package/libassuan/libassuan.mk

@@ -7,7 +7,7 @@
 LIBASSUAN_VERSION = 2.4.3
 LIBASSUAN_SITE = ftp://ftp.gnupg.org/gcrypt/libassuan
 LIBASSUAN_SOURCE = libassuan-$(LIBASSUAN_VERSION).tar.bz2
-LIBASSUAN_LICENSE = LGPLv2.1+ (library), GPLv3 (tests, doc)
+LIBASSUAN_LICENSE = LGPLv2.1+ (library), GPL-3.0 (tests, doc)
 LIBASSUAN_LICENSE_FILES = COPYING.LIB COPYING
 LIBASSUAN_INSTALL_STAGING = YES
 LIBASSUAN_DEPENDENCIES = libgpg-error

package/libcdio/libcdio.mk

@@ -7,7 +7,7 @@
 LIBCDIO_VERSION = 0.94
 LIBCDIO_SITE = $(BR2_GNU_MIRROR)/libcdio
 LIBCDIO_INSTALL_STAGING = YES
-LIBCDIO_LICENSE = GPLv3+
+LIBCDIO_LICENSE = GPL-3.0+
 LIBCDIO_LICENSE_FILES = COPYING
 LIBCDIO_CONF_OPTS = --disable-example-progs --disable-cddb
 

package/libfreeimage/libfreeimage.mk

@@ -7,7 +7,7 @@
 LIBFREEIMAGE_VERSION = 3.17.0
 LIBFREEIMAGE_SITE = http://downloads.sourceforge.net/freeimage
 LIBFREEIMAGE_SOURCE = FreeImage$(subst .,,$(LIBFREEIMAGE_VERSION)).zip
-LIBFREEIMAGE_LICENSE = GPL-2.0 or GPLv3 or FreeImage Public License
+LIBFREEIMAGE_LICENSE = GPL-2.0 or GPL-3.0 or FreeImage Public License
 LIBFREEIMAGE_LICENSE_FILES = license-gplv2.txt license-gplv3.txt license-fi.txt
 LIBFREEIMAGE_INSTALL_STAGING = YES
 

package/libgpiod/libgpiod.mk

@@ -6,7 +6,7 @@
 
 LIBGPIOD_VERSION = v0.1.3
 LIBGPIOD_SITE = $(call github,brgl,libgpiod,$(LIBGPIOD_VERSION))
-LIBGPIOD_LICENSE = GPLv3+
+LIBGPIOD_LICENSE = GPL-3.0+
 LIBGPIOD_LICENSE_FILES = COPYING
 # fetched from github, no configure script provided
 LIBGPIOD_AUTORECONF = YES

package/libgsasl/libgsasl.mk

@@ -6,7 +6,7 @@
 
 LIBGSASL_VERSION = 1.8.0
 LIBGSASL_SITE = $(BR2_GNU_MIRROR)/gsasl
-LIBGSASL_LICENSE = LGPLv2.1+ (library), GPLv3+ (programs)
+LIBGSASL_LICENSE = LGPLv2.1+ (library), GPL-3.0+ (programs)
 LIBGSASL_LICENSE_FILES = README COPYING.LIB COPYING
 LIBGSASL_INSTALL_STAGING = YES
 # It doesn't seem to build with our libgcrypt so better be safe

package/libiconv/libiconv.mk

@@ -7,7 +7,7 @@
 LIBICONV_VERSION = 1.14
 LIBICONV_SITE = $(BR2_GNU_MIRROR)/libiconv
 LIBICONV_INSTALL_STAGING = YES
-LIBICONV_LICENSE = GPLv3+ (iconv program), LGPLv2+ (library)
+LIBICONV_LICENSE = GPL-3.0+ (iconv program), LGPLv2+ (library)
 LIBICONV_LICENSE_FILES = COPYING COPYING.LIB
 
 # Don't build the preloadable library, as we don't need it (it's only

package/libidn/libidn.mk

@@ -10,7 +10,7 @@ LIBIDN_INSTALL_STAGING = YES
 LIBIDN_CONF_ENV = EMACS="no"
 LIBIDN_CONF_OPTS = --disable-java --enable-csharp=no
 LIBIDN_DEPENDENCIES = host-pkgconf $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv)
-LIBIDN_LICENSE = GPL-2.0+, GPLv3+, LGPLv3+
+LIBIDN_LICENSE = GPL-2.0+, GPL-3.0+, LGPLv3+
 LIBIDN_LICENSE_FILES = COPYINGv2 COPYINGv3 COPYING.LESSERv3
 
 define LIBIDN_REMOVE_BINARY

package/libksba/libksba.mk

@@ -7,7 +7,7 @@
 LIBKSBA_VERSION = 1.3.5
 LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2
 LIBKSBA_SITE = ftp://ftp.gnupg.org/gcrypt/libksba
-LIBKSBA_LICENSE = LGPLv3+ or GPL-2.0+ (library, headers), GPLv3+ (manual, tests, build system)
+LIBKSBA_LICENSE = LGPLv3+ or GPL-2.0+ (library, headers), GPL-3.0+ (manual, tests, build system)
 LIBKSBA_LICENSE_FILES = AUTHORS COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3
 LIBKSBA_INSTALL_STAGING = YES
 LIBKSBA_DEPENDENCIES = libgpg-error

package/libllcp/libllcp.mk

@@ -10,7 +10,7 @@ LIBLLCP_DEPENDENCIES = host-pkgconf libnfc
 # There's no ./configure in the repository, so we need to autoreconf
 LIBLLCP_AUTORECONF = YES
 LIBLLCP_INSTALL_STAGING = YES
-LIBLLCP_LICENSE = GPLv3+
+LIBLLCP_LICENSE = GPL-3.0+
 LIBLLCP_LICENSE_FILES = COPYING
 # ensure graphviz isn't used
 LIBLLCP_CONF_ENV = ac_cv_path_DOT=

package/libsigrok/libsigrok.mk

@@ -6,7 +6,7 @@
 
 LIBSIGROK_VERSION = 0.4.0
 LIBSIGROK_SITE = http://sigrok.org/download/source/libsigrok
-LIBSIGROK_LICENSE = GPLv3+
+LIBSIGROK_LICENSE = GPL-3.0+
 LIBSIGROK_LICENSE_FILES = COPYING
 LIBSIGROK_INSTALL_STAGING = YES
 LIBSIGROK_DEPENDENCIES = libglib2 libzip host-pkgconf

package/libsigrokdecode/libsigrokdecode.mk

@@ -6,7 +6,7 @@
 
 LIBSIGROKDECODE_VERSION = 0.4.1
 LIBSIGROKDECODE_SITE = http://sigrok.org/download/source/libsigrokdecode
-LIBSIGROKDECODE_LICENSE = GPLv3+
+LIBSIGROKDECODE_LICENSE = GPL-3.0+
 LIBSIGROKDECODE_LICENSE_FILES = COPYING
 LIBSIGROKDECODE_INSTALL_STAGING = YES
 LIBSIGROKDECODE_DEPENDENCIES = host-pkgconf libglib2 python3

package/libstrophe/libstrophe.mk

@@ -9,7 +9,7 @@ LIBSTROPHE_SITE = $(call github,strophe,libstrophe,$(LIBSTROPHE_VERSION))
 LIBSTROPHE_DEPENDENCIES = openssl host-pkgconf
 # Doesn't ship configure
 LIBSTROPHE_AUTORECONF = YES
-LIBSTROPHE_LICENSE = MIT or GPLv3
+LIBSTROPHE_LICENSE = MIT or GPL-3.0
 LIBSTROPHE_LICENSE_FILES = MIT-LICENSE.txt GPL-LICENSE.txt
 LIBSTROPHE_INSTALL_STAGING = YES
 LIBSTROPHE_PATCH = https://github.com/msantos/libstrophe/commit/b08766c8e46956daba010044b00c97f78b598780.patch

package/libtasn1/libtasn1.mk

@@ -7,7 +7,7 @@
 LIBTASN1_VERSION = 4.9
 LIBTASN1_SITE = $(BR2_GNU_MIRROR)/libtasn1
 LIBTASN1_DEPENDENCIES = host-bison
-LIBTASN1_LICENSE = GPLv3+ (tests, tools), LGPLv2.1+ (library)
+LIBTASN1_LICENSE = GPL-3.0+ (tests, tools), LGPLv2.1+ (library)
 LIBTASN1_LICENSE_FILES = COPYING COPYING.LIB
 LIBTASN1_INSTALL_STAGING = YES
 # 'missing' fallback logic botched so disable it completely

package/liburcu/liburcu.mk

@@ -7,7 +7,7 @@
 LIBURCU_VERSION = 0.9.2
 LIBURCU_SITE = http://lttng.org/files/urcu
 LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
-LIBURCU_LICENSE = LGPLv2.1+ (library), MIT-like (few source files listed in LICENSE), GPL-2.0+ (test), GPLv3 (few *.m4 files)
+LIBURCU_LICENSE = LGPLv2.1+ (library), MIT-like (few source files listed in LICENSE), GPL-2.0+ (test), GPL-3.0 (few *.m4 files)
 LIBURCU_LICENSE_FILES = lgpl-2.1.txt lgpl-relicensing.txt gpl-2.0.txt LICENSE
 
 LIBURCU_INSTALL_STAGING = YES

package/m4/m4.mk

@@ -7,7 +7,7 @@
 M4_VERSION = 1.4.18
 M4_SOURCE = m4-$(M4_VERSION).tar.xz
 M4_SITE = $(BR2_GNU_MIRROR)/m4
-M4_LICENSE = GPLv3+
+M4_LICENSE = GPL-3.0+
 M4_LICENSE_FILES = COPYING
 HOST_M4_CONF_OPTS = --disable-static
 

package/make/make.mk

@@ -8,7 +8,7 @@ MAKE_VERSION = 4.2.1
 MAKE_SOURCE = make-$(MAKE_VERSION).tar.bz2
 MAKE_SITE = $(BR2_GNU_MIRROR)/make
 MAKE_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
-MAKE_LICENSE = GPLv3+
+MAKE_LICENSE = GPL-3.0+
 MAKE_LICENSE_FILES = COPYING
 
 MAKE_CONF_OPTS = --without-guile

package/mc/mc.mk

@@ -7,7 +7,7 @@
 MC_VERSION = 4.8.18
 MC_SOURCE = mc-$(MC_VERSION).tar.xz
 MC_SITE = http://ftp.midnight-commander.org
-MC_LICENSE = GPLv3+
+MC_LICENSE = GPL-3.0+
 MC_LICENSE_FILES = COPYING
 MC_DEPENDENCIES = libglib2 host-pkgconf
 

package/mcrypt/mcrypt.mk

@@ -11,7 +11,7 @@ MCRYPT_DEPENDENCIES = libmcrypt libmhash \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
 	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 MCRYPT_CONF_OPTS = --with-libmcrypt-prefix=$(STAGING_DIR)/usr
-MCRYPT_LICENSE = GPLv3
+MCRYPT_LICENSE = GPL-3.0
 MCRYPT_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))

package/modplugtools/modplugtools.mk

@@ -6,7 +6,7 @@
 
 MODPLUGTOOLS_VERSION = 0.5.3
 MODPLUGTOOLS_SITE = http://downloads.sourceforge.net/project/modplug-xmms/modplug-tools
-MODPLUGTOOLS_LICENSE = GPLv3
+MODPLUGTOOLS_LICENSE = GPL-3.0
 MODPLUGTOOLS_LICENSE_FILES = COPYING
 
 MODPLUGTOOLS_DEPENDENCIES = libao libmodplug

package/mosh/mosh.mk

@@ -7,7 +7,7 @@
 MOSH_VERSION = 1.2.6
 MOSH_SITE = https://mosh.mit.edu
 MOSH_DEPENDENCIES = zlib ncurses protobuf host-pkgconf
-MOSH_LICENSE = GPLv3+ with exception
+MOSH_LICENSE = GPL-3.0+ with exception
 MOSH_LICENSE_FILES = COPYING COPYING.iOS
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)

package/msmtp/msmtp.mk

@@ -12,7 +12,7 @@ MSMTP_CONF_OPTS = \
 	--without-libidn \
 	--disable-gai-idn \
 	--without-libgsasl
-MSMTP_LICENSE = GPLv3+
+MSMTP_LICENSE = GPL-3.0+
 MSMTP_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_LIBSECRET),y)

package/mtdev2tuio/mtdev2tuio.mk

@@ -7,7 +7,7 @@
 MTDEV2TUIO_VERSION = e1e7378d86abe751158e743586133022f32fa4d1
 MTDEV2TUIO_SITE = $(call github,olivopaolo,mtdev2tuio,$(MTDEV2TUIO_VERSION))
 MTDEV2TUIO_DEPENDENCIES = mtdev liblo
-MTDEV2TUIO_LICENSE = GPLv3+
+MTDEV2TUIO_LICENSE = GPL-3.0+
 MTDEV2TUIO_LICENSE_FILES = COPYING
 
 # mtdev2tuio Makefile misuses $(LD) as gcc, so we need to override LD

package/mtools/mtools.mk

@@ -7,7 +7,7 @@
 MTOOLS_VERSION = 4.0.18
 MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.bz2
 MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools
-MTOOLS_LICENSE = GPLv3+
+MTOOLS_LICENSE = GPL-3.0+
 MTOOLS_LICENSE_FILES = COPYING
 MTOOLS_CONF_OPTS = --without-x
 # info documentation not needed

package/nano/nano.mk

@@ -8,7 +8,7 @@ NANO_VERSION_MAJOR = 2.7
 NANO_VERSION = $(NANO_VERSION_MAJOR).4
 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR)
 NANO_SOURCE = nano-$(NANO_VERSION).tar.xz
-NANO_LICENSE = GPLv3+
+NANO_LICENSE = GPL-3.0+
 NANO_LICENSE_FILES = COPYING
 NANO_CONF_OPTS = \
 	--without-slang \

package/ndisc6/ndisc6.mk

@@ -9,7 +9,7 @@ NDISC6_SOURCE = ndisc6-$(NDISC6_VERSION).tar.bz2
 NDISC6_SITE = http://www.remlab.net/files/ndisc6
 NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=gnu99"
 NDISC6_CONF_OPTS = --disable-rpath --disable-suid-install
-NDISC6_LICENSE = GPL-2.0 or GPLv3
+NDISC6_LICENSE = GPL-2.0 or GPL-3.0
 NDISC6_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)

package/nmon/nmon.mk

@@ -7,7 +7,7 @@
 NMON_VERSION = 16f
 NMON_SITE = http://sourceforge.net/projects/nmon/files
 NMON_SOURCE = lmon$(NMON_VERSION).c
-NMON_LICENSE = GPLv3+
+NMON_LICENSE = GPL-3.0+
 NMON_LICENSE_FILES = $(NMON_SOURCE)
 NMON_DEPENDENCIES = ncurses
 NMON_CFLAGS = $(TARGET_CFLAGS) -D JFS -D GETUSER -D LARGEMEM -D DEBIAN

package/nut/nut.mk

@@ -7,7 +7,7 @@
 NUT_VERSION_MAJOR = 2.7
 NUT_VERSION = $(NUT_VERSION_MAJOR).4
 NUT_SITE = http://www.networkupstools.org/source/$(NUT_VERSION_MAJOR)
-NUT_LICENSE = GPL-2.0+, GPLv3+ (python scripts), GPL/Artistic (perl client)
+NUT_LICENSE = GPL-2.0+, GPL-3.0+ (python scripts), GPL/Artistic (perl client)
 NUT_LICENSE_FILES = COPYING LICENSE-GPL2 LICENSE-GPL3
 NUT_DEPENDENCIES = host-pkgconf
 

package/ocrad/ocrad.mk

@@ -7,7 +7,7 @@
 OCRAD_VERSION = 0.25
 OCRAD_SOURCE = ocrad-$(OCRAD_VERSION).tar.lz
 OCRAD_SITE = $(BR2_GNU_MIRROR)/ocrad
-OCRAD_LICENSE = GPLv3+
+OCRAD_LICENSE = GPL-3.0+
 OCRAD_LICENSE_FILES = COPYING
 OCRAD_INSTALL_STAGING = YES
 

package/openzwave/openzwave.mk

@@ -6,7 +6,7 @@
 
 OPENZWAVE_VERSION = V1.5
 OPENZWAVE_SITE = $(call github,OpenZWave,open-zwave,$(OPENZWAVE_VERSION))
-OPENZWAVE_LICENSE = LGPLv3+, GPLv3 (examples), Apache-2.0 (sh2ju.sh)
+OPENZWAVE_LICENSE = LGPLv3+, GPL-3.0 (examples), Apache-2.0 (sh2ju.sh)
 OPENZWAVE_LICENSE_FILES = license/license.txt license/lgpl.txt \
 	license/gpl.txt license/Apache-License-2.0.txt
 

package/parted/parted.mk

@@ -12,7 +12,7 @@ PARTED_INSTALL_STAGING = YES
 # For uclinux patch
 PARTED_AUTORECONF = YES
 PARTED_GETTEXTIZE = YES
-PARTED_LICENSE = GPLv3+
+PARTED_LICENSE = GPL-3.0+
 PARTED_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_READLINE),y)

package/patch/patch.mk

@@ -7,7 +7,7 @@
 PATCH_VERSION = 2.7.5
 PATCH_SOURCE = patch-$(PATCH_VERSION).tar.xz
 PATCH_SITE = $(BR2_GNU_MIRROR)/patch
-PATCH_LICENSE = GPLv3+
+PATCH_LICENSE = GPL-3.0+
 PATCH_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_ATTR),y)

package/patchelf/patchelf.mk

@@ -7,7 +7,7 @@
 PATCHELF_VERSION = 0.9
 PATCHELF_SITE = http://releases.nixos.org/patchelf/patchelf-$(PATCHELF_VERSION)
 PATCHELF_SOURCE = patchelf-$(PATCHELF_VERSION).tar.bz2
-PATCHELF_LICENSE = GPLv3+
+PATCHELF_LICENSE = GPL-3.0+
 PATCHELF_LICENSE_FILES = COPYING
 
 $(eval $(host-autotools-package))

package/pifmrds/pifmrds.mk

@@ -7,7 +7,7 @@
 PIFMRDS_VERSION = 0bf57f9ce0d954365a38d8af8e7be6f28521c3f2
 PIFMRDS_SITE = $(call github,ChristopheJacquet,PiFmRds,$(PIFMRDS_VERSION))
 PIFMRDS_DEPENDENCIES = libsndfile
-PIFMRDS_LICENSE = GPLv3+
+PIFMRDS_LICENSE = GPL-3.0+
 PIFMRDS_LICENSE_FILES = LICENSE
 
 define PIFMRDS_BUILD_CMDS

package/pound/pound.mk

@@ -7,7 +7,7 @@
 POUND_VERSION = 2.7
 POUND_SITE = http://www.apsis.ch/pound
 POUND_SOURCE = Pound-$(POUND_VERSION).tgz
-POUND_LICENSE = GPLv3+
+POUND_LICENSE = GPL-3.0+
 POUND_LICENSE_FILES = GPL.txt
 POUND_DEPENDENCIES = openssl
 

package/pulseview/pulseview.mk

@@ -8,7 +8,7 @@
 
 PULSEVIEW_VERSION = 0.3.0
 PULSEVIEW_SITE = http://sigrok.org/download/source/pulseview
-PULSEVIEW_LICENSE = GPLv3+
+PULSEVIEW_LICENSE = GPL-3.0+
 PULSEVIEW_LICENSE_FILES = COPYING
 PULSEVIEW_DEPENDENCIES = libsigrok qt5base qt5svg boost
 PULSEVIEW_CONF_OPTS = -DDISABLE_WERROR=TRUE

package/python-daemon/python-daemon.mk

@@ -6,7 +6,7 @@
 
 PYTHON_DAEMON_VERSION = 2.1.1
 PYTHON_DAEMON_SITE = https://pypi.python.org/packages/source/p/python-daemon
-PYTHON_DAEMON_LICENSE = Apache-2.0 (library), GPLv3+ (test, build)
+PYTHON_DAEMON_LICENSE = Apache-2.0 (library), GPL-3.0+ (test, build)
 PYTHON_DAEMON_LICENSE_FILES = LICENSE.ASF-2 LICENSE.GPL-3
 PYTHON_DAEMON_SETUP_TYPE = setuptools
 PYTHON_DAEMON_DEPENDENCIES = host-python-docutils

package/python-docutils/python-docutils.mk

@@ -7,7 +7,7 @@
 PYTHON_DOCUTILS_VERSION = 0.13.1
 PYTHON_DOCUTILS_SOURCE = docutils-$(PYTHON_DOCUTILS_VERSION).tar.gz
 PYTHON_DOCUTILS_SITE = https://pypi.python.org/packages/05/25/7b5484aca5d46915493f1fd4ecb63c38c333bd32aa9ad6e19da8d08895ae
-PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2c, GPLv3 (emacs mode), other
+PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2c, GPL-3.0 (emacs mode), other
 PYTHON_DOCUTILS_LICENSE_FILES = COPYING.txt
 PYTHON_DOCUTILS_SETUP_TYPE = distutils
 

package/python-enum/python-enum.mk

@@ -8,7 +8,7 @@ PYTHON_ENUM_VERSION = 0.4.6
 PYTHON_ENUM_SOURCE = enum-$(PYTHON_ENUM_VERSION).tar.gz
 PYTHON_ENUM_SITE = https://pypi.python.org/packages/0c/4e/1ea357e7783c756bb579333c1e4a026fb331371ee771f616ffedc781e531
 PYTHON_ENUM_SETUP_TYPE = setuptools
-PYTHON_ENUM_LICENSE = GPLv3+
+PYTHON_ENUM_LICENSE = GPL-3.0+
 PYTHON_ENUM_LICENSE_FILES = LICENSE.GPL-3
 
 $(eval $(python-package))