Merge pull request #563 from antonlacon/license-updates

License updates and metadata typo correction
2014-11-26 14:20:54 +01:00 · 2014-11-26 14:20:54 +01:00 · 6c97ad84be
commit 6c97ad84be
parent 15df08bb33 1aff45c6dd
71 changed files with 79 additions and 69 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -16,8 +16,8 @@ Makefile contents should contain:
    (E.g.: PKG_MAINTAINER:= Joe D. Hacker `<jdh@jdhs-email-provider.org`>)
 * A PKG_LICENSE tag declaring the main license of the package.
    (E.g.: PKG_LICENSE:=GPL-2.0+) Please use SPDX identifiers if possible (see list at the bottom).
-* An optional PKG_LICENSE_FILE including the filename of the license-file in the source-package.
-    (E.g.: PKG_LICENSE_FILE:=COPYING)
+* An optional PKG_LICENSE_FILES including the filename of the license-file in the source-package.
+    (E.g.: PKG_LICENSE_FILES:=COPYING)

 Commits and pull-requests:

--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@ -17,7 +17,7 @@ PKG_SOURCE_URL:= http://www.erlang.org/download/ \
 PKG_MD5SUM:=1d0bb2d54dfe1bb6844756b99902ba20

 PKG_LICENSE:=ErlPL-1.1
-PKG_LICENSE_FILE:=EPLICENCE
+PKG_LICENSE_FILES:=EPLICENCE
 PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>

 PKG_BUILD_DEPENDS:=erlang/host openssl
--- a/lang/luasql/Makefile
+++ b/lang/luasql/Makefile
@ -16,7 +16,7 @@ PKG_SOURCE_URL:=https://github.com/keplerproject/luasql/archive/
 PKG_MD5SUM:=af9f0f3a2313a1fcf88c40700092048d

 PKG_LICENSE:=MIT
-PKG_LICENSE_FILE:=docs/us/license.html
+PKG_LICENSE_FILES:=docs/us/license.html
 PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
--- a/lang/python-dns/Makefile
+++ b/lang/python-dns/Makefile
@ -15,7 +15,7 @@ PKG_MD5SUM:=3f2601ef3c8b77fc6d21a9c77a81efeb
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MAINTAINER:=Denis Shulyaka <Shulyaka@gmail.com>
 PKG_LICENSE:=ISC
-PKG_LICENSE_FILE:=LICENSE
+PKG_LICENSE_FILES:=LICENSE

 include $(INCLUDE_DIR)/package.mk
 $(call include_mk, python-package.mk)
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@ -20,7 +20,7 @@ PKG_SOURCE_URL:=http://cache.ruby-lang.org/pub/ruby/$(PKG_LIBVER)/
 PKG_MD5SUM:=f4136e781d261e3cc20748005e1740b7
 PKG_MAINTAINER:=Luiz Angelo Daros de Luca <luizluca@gmail.com>
 PKG_LICENSE:=BSD-2-Clause
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING

 PKG_BUILD_DEPENDS:=ruby/host
 PKG_INSTALL:=1
--- a/libs/alsa-lib/Makefile
+++ b/libs/alsa-lib/Makefile
@ -18,7 +18,7 @@ PKG_MD5SUM:=c9e21b88a2b3e6e12ea7ba0f3b271fc3
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>

 PKG_LICENSE:=LGPLv2.1 GPLv2
-PKG_LICENSE_FILE:=COPYING aserver/COPYING
+PKG_LICENSE_FILES:=COPYING aserver/COPYING

 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
--- a/libs/libao/Makefile
+++ b/libs/libao/Makefile
@ -18,7 +18,7 @@ PKG_MD5SUM:=9f5dd20d7e95fd0dd72df5353829f097
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>

 PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING

 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
--- a/libs/libdbi-drivers/Makefile
+++ b/libs/libdbi-drivers/Makefile
@ -16,7 +16,7 @@ PKG_SOURCE_URL:=@SF/libdbi-drivers
 PKG_MD5SUM:=9f47b960e225eede2cdeaabf7d22f59f

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

 PKG_FIXUP:=autoreconf
--- a/libs/libdbi/Makefile
+++ b/libs/libdbi/Makefile
@ -16,7 +16,7 @@ PKG_SOURCE_URL:=@SF/libdbi
 PKG_MD5SUM:=05e2ceeac4bc85fbe40de8b4b22d9ab3

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

 PKG_FIXUP:=autoreconf
--- a/libs/libimobiledevice/Makefile
+++ b/libs/libimobiledevice/Makefile
@ -13,7 +13,7 @@ PKG_RELEASE:=1

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

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/libimobiledevice/libimobiledevice.git
--- a/libs/liblo/Makefile
+++ b/libs/liblo/Makefile
@ -16,7 +16,7 @@ PKG_SOURCE_URL:=@SF/liblo
 PKG_MD5SUM:=e2a4391a08b49bb316c03e2034e06fa2

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

 PKG_INSTALL:=1
--- a/libs/libmcrypt/Makefile
+++ b/libs/libmcrypt/Makefile
@ -14,7 +14,7 @@ PKG_RELEASE:=2
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>

 PKG_LICENSE:=LGPLv2.1
-PKG_LICENSE_FILE:=COPYING.LIB
+PKG_LICENSE_FILES:=COPYING.LIB

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/mcrypt
--- a/libs/libmpdclient/Makefile
+++ b/libs/libmpdclient/Makefile
@ -17,7 +17,7 @@ PGK_MD5SUM:=4b101a36e5c0cf967dc063391260ddbf

 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING

 PKG_INSTALL:=1

--- a/libs/libnatpmp/Makefile
+++ b/libs/libnatpmp/Makefile
@ -16,7 +16,7 @@ PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_MD5SUM:=7c9a7c76e200ead4e6447fe4b105f676
 PKG_MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
 PKG_LICENSE:=BSD-3c
-PKG_LICENSE_FILE:=LICENSE
+PKG_LICENSE_FILES:=LICENSE

 PKG_INSTALL:=1

--- a/libs/libnetfilter-acct/Makefile
+++ b/libs/libnetfilter-acct/Makefile
@ -19,7 +19,7 @@ PKG_SOURCE_URL:= \
 PKG_MD5SUM:=2118d9514c079839ebd9cb3144ad2ad7

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

 PKG_FIXUP:=autoreconf
--- a/libs/libnetfilter-log/Makefile
+++ b/libs/libnetfilter-log/Makefile
@ -19,7 +19,7 @@ PKG_SOURCE_URL:= \
 PKG_MD5SUM:=2a4bb0654ae675a52d2e8d1c06090b94

 PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>

 PKG_FIXUP:=autoreconf
--- a/libs/libnetfilter-queue/Makefile
+++ b/libs/libnetfilter-queue/Makefile
@ -19,7 +19,7 @@ PKG_SOURCE_URL:= \
 PKG_MD5SUM:=df09befac35cb215865b39a36c96a3fa

 PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>

 PKG_FIXUP:=autoreconf
--- a/libs/liboil/Makefile
+++ b/libs/liboil/Makefile
@ -16,7 +16,7 @@ PKG_SOURCE_URL:=http://liboil.freedesktop.org/download/
 PKG_MD5SUM:=47dc734f82faeb2964d97771cfd2e701

 PKG_LICENSE:=FREE
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING

 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
--- a/libs/libplist/Makefile
+++ b/libs/libplist/Makefile
@ -13,7 +13,7 @@ PKG_RELEASE:=1

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

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/libimobiledevice/libplist.git
--- a/libs/libsamplerate/Makefile
+++ b/libs/libsamplerate/Makefile
@ -18,7 +18,7 @@ PKG_MD5SUM:=1c7fb25191b4e6e3628d198a66a84f47
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>

 PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING

 PKG_INSTALL:=1

--- a/libs/libsoup/Makefile
+++ b/libs/libsoup/Makefile
@ -16,7 +16,7 @@ PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.44
 PKG_MD5SUM:=92aa3667357157e8f3489bcca287f2fa

 PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING

 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
--- a/libs/libsoxr/Makefile
+++ b/libs/libsoxr/Makefile
@ -19,7 +19,7 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz

 PKG_LICENSE:=LGPL-2.1
-PKG_LICENSE_FILE:=LICENCE
+PKG_LICENSE_FILES:=LICENCE

 PKG_FIXUP:=libtool
 PKG_REMOVE_FILES:=autogen.sh
--- a/libs/libtheora/Makefile
+++ b/libs/libtheora/Makefile
@ -13,8 +13,11 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://downloads.xiph.org/releases/theora/
 PKG_MD5SUM:=292ab65cedd5021d6b7ddd117e07cd8e
-PKG_FIXUP:=autoreconf

+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=COPYING LICENSE
+
+PKG_FIXUP:=autoreconf
 PKG_BUILD_DEPENDS:=libvorbis

 include $(INCLUDE_DIR)/package.mk
--- a/libs/libuecc/Makefile
+++ b/libs/libuecc/Makefile
@ -17,7 +17,7 @@ PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/71
 PKG_MD5SUM:=7f44df5dc69cb8686947562e2a11eea9

 PKG_LICENSE:=BSD-2-Clause
-PKG_LICENSE_FILE:=COPYRIGHT
+PKG_LICENSE_FILES:=COPYRIGHT

 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
--- a/libs/libusbmuxd/Makefile
+++ b/libs/libusbmuxd/Makefile
@ -13,7 +13,7 @@ PKG_RELEASE:=1

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

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/libimobiledevice/libusbmuxd.git
--- a/libs/libv4l/Makefile
+++ b/libs/libv4l/Makefile
@ -20,7 +20,7 @@ PKG_MD5SUM:=4cc0fb4ded302ea9e89e5e1b56a7252b
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>

 PKG_LICENSE:=GPL-2.0 LGPL-2.1
-PKG_LICENSE_FILE:=COPYING COPYING.libv4l
+PKG_LICENSE_FILES:=COPYING COPYING.libv4l

 PKG_BUILD_DEPENDS:=argp-standalone

--- a/libs/opus/Makefile
+++ b/libs/opus/Makefile
@ -16,7 +16,7 @@ PKG_SOURCE_URL:=http://downloads.xiph.org/releases/opus/
 PKG_MD5SUM:=c5a8cf7c0b066759542bc4ca46817ac6

 PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>

 PKG_INSTALL:=1
--- a/libs/xmlrpc-c/Makefile
+++ b/libs/xmlrpc-c/Makefile
@ -20,7 +20,7 @@ PKG_SOURCE_PROTO:=svn

 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 PKG_LICENSE:=VARIOUS
-PKG_LICENSE_FILE:=doc/COPYING
+PKG_LICENSE_FILES:=doc/COPYING

 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@ -12,7 +12,7 @@ PKG_VERSION:=1.2.4
 PKG_RELEASE:=3

 PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/bogofilter
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@ -15,7 +15,7 @@ PKG_MD5SUM:=dc861ed9698a98499a951eaef7d4db9f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_MAINTAINER:=Denis Shulyaka <Shulyaka@gmail.com>
 PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILE:=gnu-COPYING-GPL
+PKG_LICENSE_FILES:=gnu-COPYING-GPL

 include $(INCLUDE_DIR)/package.mk

--- a/mail/mailsend/Makefile
+++ b/mail/mailsend/Makefile
@ -18,7 +18,7 @@ PKG_MD5SUM:=60103c411a8627e893d35e7836f904e8
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>

 PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILE:=COPYRIGHT
+PKG_LICENSE_FILES:=COPYRIGHT

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

--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@ -15,7 +15,7 @@ PKG_MD5SUM:=c3f0f51d8865559b40e9350eb3816011
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MAINTAINER:=Denis Shulyaka <Shulyaka@gmail.com>
 PKG_LICENSE:=IPL-1.0
-PKG_LICENSE_FILE:=LICENSE
+PKG_LICENSE_FILES:=LICENSE
 PKG_BUILD_DEPENDS:=+POSTFIX_CDB:tinycdb

 include $(INCLUDE_DIR)/package.mk
--- a/multimedia/fswebcam/Makefile
+++ b/multimedia/fswebcam/Makefile
@ -17,7 +17,7 @@ PKG_SOURCE_URL:=http://www.firestorm.cx/fswebcam/files \
 PKG_MD5SUM:=1bfdb21904e816f100370ec8f4df986b

 PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILE:=LICENCE
+PKG_LICENSE_FILES:=LICENCE
 PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>

 PKG_INSTALL:=1
--- a/multimedia/gst1-libav/Makefile
+++ b/multimedia/gst1-libav/Makefile
@ -18,7 +18,7 @@ PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-libav
 PKG_MD5SUM:=58c7998a054d8d8ca041fa35738f72b6

 PKG_LICENSE:=GPL-2.0 LGPL-2.0
-PKG_LICENSE_FILE:=COPYING COPYING.LIB
+PKG_LICENSE_FILES:=COPYING COPYING.LIB

 PKG_BUILD_DIR:=$(BUILD_DIR)/gst-libav-$(PKG_VERSION)

--- a/multimedia/gst1-plugins-bad/Makefile
+++ b/multimedia/gst1-plugins-bad/Makefile
@ -14,7 +14,7 @@ PKG_RELEASE:=3
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>

 PKG_LICENSE:=LGPLv2 GPLv2
-PKG_LICENSE_FILE:=COPYING.LIB COPYING
+PKG_LICENSE_FILES:=COPYING.LIB COPYING

 PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-bad-$(PKG_VERSION)
 PKG_SOURCE:=gst-plugins-bad-$(PKG_VERSION).tar.xz
--- a/multimedia/gst1-plugins-base/Makefile
+++ b/multimedia/gst1-plugins-base/Makefile
@ -14,7 +14,7 @@ PKG_RELEASE:=3
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>

 PKG_LICENSE:=LGPLv2 GPLv2
-PKG_LICENSE_FILE:=COPYING.LIB COPYING
+PKG_LICENSE_FILES:=COPYING.LIB COPYING

 PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-base-$(PKG_VERSION)
 PKG_SOURCE:=gst-plugins-base-$(PKG_VERSION).tar.xz
--- a/multimedia/gst1-plugins-good/Makefile
+++ b/multimedia/gst1-plugins-good/Makefile
@ -14,7 +14,7 @@ PKG_RELEASE:=2
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>

 PKG_LICENSE:=LGPLv2
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING

 PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-good-$(PKG_VERSION)
 PKG_SOURCE:=gst-plugins-good-$(PKG_VERSION).tar.xz
--- a/multimedia/gst1-plugins-ugly/Makefile
+++ b/multimedia/gst1-plugins-ugly/Makefile
@ -14,7 +14,7 @@ PKG_RELEASE:=2
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>

 PKG_LICENSE:=LGPLv2
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING

 PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-ugly-$(PKG_VERSION)
 PKG_SOURCE:=gst-plugins-ugly-$(PKG_VERSION).tar.xz
--- a/multimedia/gstreamer1/Makefile
+++ b/multimedia/gstreamer1/Makefile
@ -14,7 +14,7 @@ PKG_RELEASE:=4
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>

 PKG_LICENSE:=LGPLv2
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING

 PKG_BUILD_DIR:=$(BUILD_DIR)/gstreamer-$(PKG_VERSION)
 PKG_SOURCE:=gstreamer-$(PKG_VERSION).tar.xz
--- a/multimedia/icecast/Makefile
+++ b/multimedia/icecast/Makefile
@ -10,6 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=icecast
 PKG_VERSION:=2.4.0
 PKG_RELEASE:=1
+PKG_LICENSE:=GPL-2.0
 PKG_MAINTAINER:=André Gaul <gaul@web-yard.de>

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
--- a/multimedia/mjpg-streamer/Makefile
+++ b/multimedia/mjpg-streamer/Makefile
@ -20,7 +20,7 @@ PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_PROTO:=svn

 PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILE:=LICENSE
+PKG_LICENSE_FILES:=LICENSE

 include $(INCLUDE_DIR)/package.mk

--- a/net/dmapd/Makefile
+++ b/net/dmapd/Makefile
@ -14,7 +14,7 @@ PKG_RELEASE:=1
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>

 PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.flyn.org/projects/dmapd
--- a/net/ethtool/Makefile
+++ b/net/ethtool/Makefile
@ -17,7 +17,7 @@ PKG_SOURCE_URL:=@KERNEL/software/network/ethtool
 PKG_MD5SUM:=e7bf0c355d2bf6ee281ebc713c5fb987

 PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING

 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
--- a/net/fastd/Makefile
+++ b/net/fastd/Makefile
@ -17,7 +17,7 @@ PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/78
 PKG_MD5SUM:=135b3083d2743e335738de3bd4bb0c3c

 PKG_LICENSE:=BSD-2-Clause
-PKG_LICENSE_FILE:=COPYRIGHT
+PKG_LICENSE_FILES:=COPYRIGHT

 PKG_CONFIG_DEPENDS:=\
 	CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST \
--- a/net/horst/Makefile
+++ b/net/horst/Makefile
@ -19,7 +19,7 @@ PKG_SOURCE_VERSION:=version-$(PKG_VERSION)

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

 PKG_BUILD_PARALLEL:=1

--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@ -14,6 +14,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://lftp.yar.ru/ftp \ http://lftp.cybermirror.org \ http://lftp.cybermirror.org/old
 PKG_MD5SUM:=e58fc886e3d7c6d994de5ce51de46087

+PKG_LICENSE:=GPL-3.0+
+PKG_LICENSE_FILES:=COPYING
+
 include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk

--- a/net/lighttpd/Makefile
+++ b/net/lighttpd/Makefile
@ -16,7 +16,7 @@ PKG_SOURCE_URL:=http://download.lighttpd.net/lighttpd/releases-1.4.x
 PKG_MD5SUM:=c7ae774eab4cb7ac85e41b712f4ee9ba

 PKG_LICENSE:=BSD-3c
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING

 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
--- a/net/mosquitto/Makefile
+++ b/net/mosquitto/Makefile
@ -12,7 +12,7 @@ PKG_NAME:=mosquitto
 PKG_VERSION:=1.3.5
 PKG_RELEASE:=1
 PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILE:=LICENSE.txt
+PKG_LICENSE_FILES:=LICENSE.txt

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://mosquitto.org/files/source/
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@ -21,7 +21,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://nmap.org/dist/
 PKG_MD5SUM:=edfe81f6763223c0a29bfa15a8526e2a
 PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING

 PKG_INSTALL:=1

--- a/net/ntpd/Makefile
+++ b/net/ntpd/Makefile
@ -15,6 +15,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/
 PKG_MD5SUM:=00df80a84ec9528fcfb09498075525bc

+PKG_LICENSE:=Unique
+PKG_LICENSE_FILES:=COPYRIGHT html/copyright.html
+
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)

 PKG_FIXUP:=autoreconf
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@ -17,7 +17,7 @@ PKG_SOURCE_URL:=http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
 PKG_MD5SUM:=3246aa79317b1d23cae783a3bf8275d6

 PKG_LICENSE:=BSD ISC
-PKG_LICENSE_FILE:=LICENCE
+PKG_LICENSE_FILES:=LICENCE


 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
--- a/net/openvswitch/Makefile
+++ b/net/openvswitch/Makefile
@ -15,7 +15,7 @@ PKG_RELEASE:=1
 PKG_VERSION:=2.3.0
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_LICENSE:=Apache-2.0
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING
 PKG_USE_MIPS16:=0

 PKG_SOURCE_PROTO:=git
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@ -18,7 +18,7 @@ PKG_SOURCE_VERSION:=6a3234eaa79f15857260df31f98711ef24266191
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz

 PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING

 PKG_FIXUP:=autoreconf
 PKG_BUILD_PARALLEL:=1
--- a/net/socat/Makefile
+++ b/net/socat/Makefile
@ -18,7 +18,7 @@ PKG_MD5SUM:=69b8155dd442a6f24e28ef5407d868eb
 PKG_MAINTAINER:= Ted Hess <thess@kitschensync.net>

 PKG_LICENSE:=GPL-2.0 OpenSSL
-PKG_LICENSE_FILE:=COPYING COPYING.OpenSSL
+PKG_LICENSE_FILES:=COPYING COPYING.OpenSSL

 PKG_INSTALL:=1

--- a/net/tcpproxy/Makefile
+++ b/net/tcpproxy/Makefile
@ -21,7 +21,7 @@ PKG_SOURCE_URL:=http://www.spreadspace.org/tcpproxy/releases/
 PKG_MD5SUM:=55126473bcde635f9ee019c6caf19bb7
 PKG_MAINTAINER:=Christian Pointner <equinox@spreadspace.org>
 PKG_LICENSE:=GPL-3.0+
-PKG_LICENSE_FILE:=LICENSE
+PKG_LICENSE_FILES:=LICENSE
 include $(INCLUDE_DIR)/package.mk


--- a/net/tor/Makefile
+++ b/net/tor/Makefile
@ -16,7 +16,7 @@ PKG_SOURCE_URL:=https://www.torproject.org/dist \
 	https://archive.torproject.org/tor-package-archive
 PKG_MD5SUM:=9acb86b529f0f48cc495da3801f85d1f
 PKG_MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
-PKG_LICENSE_FILE:=LICENSE
+PKG_LICENSE_FILES:=LICENSE

 PKG_BUILD_DEPENDS:=libminiupnpc libnatpmp
 PKG_INSTALL:=1
--- a/net/uanytun/Makefile
+++ b/net/uanytun/Makefile
@ -21,7 +21,7 @@ PKG_MD5SUM:=ce47ad45003ff1d84eaf5276941b9ddf
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_MAINTAINER:=Christian Pointner <equinox@spreadspace.org>
 PKG_LICENSE:=GPL-3.0+
-PKG_LICENSE_FILE:=LICENSE
+PKG_LICENSE_FILES:=LICENSE
 include $(INCLUDE_DIR)/package.mk


--- a/net/ulogd/Makefile
+++ b/net/ulogd/Makefile
@ -19,7 +19,7 @@ PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/ulogd/ \
 PKG_MD5SUM:=7c71ec460dfea5287eba27472c521ebc

 PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>

 PKG_FIXUP:=autoreconf
--- a/net/unbound/Makefile
+++ b/net/unbound/Makefile
@ -12,7 +12,7 @@ PKG_VERSION:=1.4.22
 PKG_RELEASE:=1

 PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILE:=LICENSE
+PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Michael Hanselmann <public@hansmi.ch>

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
--- a/sound/mocp/Makefile
+++ b/sound/mocp/Makefile
@ -18,7 +18,7 @@ PKG_MD5SUM:=da87b90b57934234589b63e347921458
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>

 PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING

 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
--- a/sound/mpd/Makefile
+++ b/sound/mpd/Makefile
@ -17,7 +17,7 @@ PKG_MD5SUM:=900657ff55726f4cc09a27eb7df57015
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>

 PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_PARALLEL:=1
--- a/utils/cmdpad/Makefile
+++ b/utils/cmdpad/Makefile
@ -17,7 +17,7 @@ PKG_MD5SUM:=6633b2354b7f23f9cd8e2bfb6e735965

 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 PKG_LICENSE:=MIT
-PKG_LICENSE_FILE:=doc/COPYING
+PKG_LICENSE_FILES:=doc/COPYING

 include $(INCLUDE_DIR)/package.mk

--- a/utils/gnupg/Makefile
+++ b/utils/gnupg/Makefile
@ -17,7 +17,7 @@ PKG_SOURCE_URL:=ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg
 PKG_MD5SUM:=54db1be9588b11afbbdd8b82d4ea883a

 PKG_LICENSE:=GPL-3.0
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>

 PKG_INSTALL:=1
--- a/utils/hd-idle/Makefile
+++ b/utils/hd-idle/Makefile
@ -13,7 +13,7 @@ PKG_RELEASE:=1

 PKG_MAINTAINER:=Lim Guo Wei <limguowei@gmail.com>
 PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILE:=
+PKG_LICENSE_FILES:=

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
--- a/utils/ntfs-3g/Makefile
+++ b/utils/ntfs-3g/Makefile
@ -16,7 +16,7 @@ PKG_SOURCE_URL:=http://www.tuxera.com/opensource/
 PKG_MD5SUM:=f11d563816249d730a00498983485f3a

 PKG_LICENSE:=GPL-2.0 LGPL-2.0
-PKG_LICENSE_FILE:=COPYING COPYING.LIB
+PKG_LICENSE_FILES:=COPYING COPYING.LIB

 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
--- a/utils/opus-tools/Makefile
+++ b/utils/opus-tools/Makefile
@ -16,7 +16,7 @@ PKG_SOURCE_URL:=http://downloads.xiph.org/releases/opus/
 PKG_MD5SUM:=20682e4d8d1ae9ec5af3cf43e808b8cb

 PKG_LICENSE:=BSD-2-Clause
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Nicolas Thill <nico@openwrt.org>

 PKG_INSTALL:=1
--- a/utils/stm32flash/Makefile
+++ b/utils/stm32flash/Makefile
@ -17,7 +17,7 @@ PKG_MD5SUM:=a806c6b10b186b7d06a7eab12c3bc880
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 PKG_MAINTAINER:=Christian Pointner <equinox@spreadspace.org>
 PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILE:=gpl-2.0.txt
+PKG_LICENSE_FILES:=gpl-2.0.txt
 include $(INCLUDE_DIR)/package.mk

 define Package/stm32flash
--- a/utils/tcsh/Makefile
+++ b/utils/tcsh/Makefile
@ -14,7 +14,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.astron.com/pub/tcsh/
 PKG_MD5SUM:=6eed09dbd4223ab5b6955378450d228a
 PKG_LICENSE:=BSD-4-Clause-UC
-PKG_LICENSE_FILE:=Copyright
+PKG_LICENSE_FILES:=Copyright

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

--- a/utils/triggerhappy/Makefile
+++ b/utils/triggerhappy/Makefile
@ -20,7 +20,7 @@ PKG_SOURCE_VERSION:=$(PKG_REV)

 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 PKG_LICENSE:=GPL-3.0+
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING

 include $(INCLUDE_DIR)/package.mk

--- a/utils/usbmuxd/Makefile
+++ b/utils/usbmuxd/Makefile
@ -14,7 +14,7 @@ PKG_SOURCE_PROTO:=git

 PKG_MAINTAINER:=Lukasz Baj <l.baj@radytek.com>
 PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILE:=COPYING.GPLv2
+PKG_LICENSE_FILES:=COPYING.GPLv2

 PKG_SOURCE_URL:=https://github.com/libimobiledevice/usbmuxd.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
--- a/utils/zile/Makefile
+++ b/utils/zile/Makefile
@ -17,7 +17,7 @@ PKG_MD5SUM:=fe77d801ba69e0fb9b4914a04b9ff506
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>

 PKG_LICENSE:=GPL-3.0+
-PKG_LICENSE_FILE:=COPYING
+PKG_LICENSE_FILES:=COPYING

 PKG_INSTALL:=1