From 5621ae50ffcda768811c275cec9c382f9ba8ab70 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sun, 7 Mar 2021 16:56:05 +0100
Subject: [PATCH] - rename *_VER => *_VERSION

---
 make/buildsystem-bootstrap.mk   |  10 +-
 make/crosstool.mk               |  32 +--
 make/environment-build.mk       |   6 +-
 make/environment-host.mk        |   2 +-
 make/environment-image.mk       |  18 +-
 make/environment-linux.mk       | 190 +++++++-------
 make/environment-target.mk      |   2 +-
 make/environment-update.mk      |   7 +-
 make/flash-images.mk            |  40 +--
 make/flash-updates.mk           |   2 +-
 make/host-tools.mk              | 138 +++++-----
 make/linux-drivers.mk           |  32 +--
 make/linux-kernel.mk            |   2 +-
 make/ni.mk                      |   1 -
 make/target-blobs.mk            | 312 +++++++++++-----------
 make/target-development.mk      |  24 +-
 make/target-ffmpeg.mk           |   8 +-
 make/target-libs-static.mk      |  10 +-
 make/target-libs-unused.mk      |  40 +--
 make/target-libs.mk             | 352 ++++++++++++-------------
 make/target-lua.mk              |  88 +++----
 make/target-neutrino-plugins.mk |  20 +-
 make/target-rootfs.mk           |   6 +-
 make/target-tools-unused.mk     |  88 +++----
 make/target-tools.mk            | 442 ++++++++++++++++----------------
 25 files changed, 945 insertions(+), 927 deletions(-)

diff --git a/make/buildsystem-bootstrap.mk b/make/buildsystem-bootstrap.mk
index 18c5419e..883fe447 100644
--- a/make/buildsystem-bootstrap.mk
+++ b/make/buildsystem-bootstrap.mk
@@ -93,11 +93,11 @@ libs-cross: | $(TARGET_DIR)
 	$(INSTALL_COPY) $(CROSS_DIR)/$(TARGET)/sys-root/lib/*so* $(TARGET_base_libdir)
 ifeq ($(BOXSERIES),hd2)
 	$(CD) $(TARGET_base_libdir); \
-		ln -sf libuClibc-$(UCLIBC_VER).so libcrypt.so.0; \
-		ln -sf libuClibc-$(UCLIBC_VER).so libdl.so.0; \
-		ln -sf libuClibc-$(UCLIBC_VER).so libm.so.0; \
-		ln -sf libuClibc-$(UCLIBC_VER).so libpthread.so.0; \
-		ln -sf libuClibc-$(UCLIBC_VER).so librt.so.0
+		ln -sf libuClibc-$(UCLIBC_VERSION).so libcrypt.so.0; \
+		ln -sf libuClibc-$(UCLIBC_VERSION).so libdl.so.0; \
+		ln -sf libuClibc-$(UCLIBC_VERSION).so libm.so.0; \
+		ln -sf libuClibc-$(UCLIBC_VERSION).so libpthread.so.0; \
+		ln -sf libuClibc-$(UCLIBC_VERSION).so librt.so.0
 endif
 ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd5x hd6x vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse))
 	$(CD) $(TARGET_base_libdir); \
diff --git a/make/crosstool.mk b/make/crosstool.mk
index b453510b..6bf3ca32 100644
--- a/make/crosstool.mk
+++ b/make/crosstool.mk
@@ -13,7 +13,7 @@ crosstools:
 
 # -----------------------------------------------------------------------------
 
-CROSSTOOL_BACKUP = $(DL_DIR)/crosstool-ng-$(TARGET_ARCH)-linux-$(KERNEL_VER)-backup.tar.gz
+CROSSTOOL_BACKUP = $(DL_DIR)/crosstool-ng-$(TARGET_ARCH)-linux-$(KERNEL_VERSION)-backup.tar.gz
 
 $(CROSSTOOL_BACKUP):
 	$(call draw_line);
@@ -45,21 +45,21 @@ crosstools-renew:
 # -----------------------------------------------------------------------------
 
 # wrapper for manually call
-kernel-tarball: $(BUILD_DIR)/linux-$(KERNEL_VER).tar
+kernel-tarball: $(BUILD_DIR)/linux-$(KERNEL_VERSION).tar
 
 # create kernel-tarball
-$(BUILD_DIR)/linux-$(KERNEL_VER).tar: | $(BUILD_DIR)
+$(BUILD_DIR)/linux-$(KERNEL_VERSION).tar: | $(BUILD_DIR)
 	$(MAKE) kernel.do_prepare_$(if $(filter $(KERNEL_SOURCE),git),git,tar)
 	tar cf $(@) --exclude-vcs -C $(BUILD_DIR)/$(KERNEL_DIR) .
 
 # -----------------------------------------------------------------------------
 
-CROSSTOOL_NG_VER    = git
-CROSSTOOL_NG_DIR    = crosstool-ng.$(CROSSTOOL_NG_VER)
-CROSSTOOL_NG_SOURCE = crosstool-ng.$(CROSSTOOL_NG_VER)
-CROSSTOOL_NG_SITE   = https://github.com/neutrino-images
+CROSSTOOL_NG_VERSION = git
+CROSSTOOL_NG_DIR = crosstool-ng.$(CROSSTOOL_NG_VERSION)
+CROSSTOOL_NG_SOURCE = crosstool-ng.$(CROSSTOOL_NG_VERSION)
+CROSSTOOL_NG_SITE = https://github.com/neutrino-images
 
-CROSSTOOL_NG_PATCH  = crosstool-ng-bash-version.patch
+CROSSTOOL_NG_PATCH = crosstool-ng-bash-version.patch
 
 CROSSTOOL_NG_CONFIG = $(PACKAGE_DIR)/crosstool-ng/files/ct-ng-$(BOXTYPE).config
 ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2))
@@ -67,14 +67,14 @@ ifeq ($(BOXSERIES),$(filter $(BOXSERIES),hd1 hd2))
 endif
 
 # crosstool for hd2 depends on gcc-linaro
-GCC_LINARO_VER    = 4.9-2017.01
-GCC_LINARO_SOURCE = gcc-linaro-$(GCC_LINARO_VER).tar.xz
-GCC_LINARO_SITE   = https://releases.linaro.org/components/toolchain/gcc-linaro/$(GCC_LINARO_VER)
+GCC_LINARO_VERSION = 4.9-2017.01
+GCC_LINARO_SOURCE = gcc-linaro-$(GCC_LINARO_VERSION).tar.xz
+GCC_LINARO_SITE = https://releases.linaro.org/components/toolchain/gcc-linaro/$(GCC_LINARO_VERSION)
 
 $(DL_DIR)/$(GCC_LINARO_SOURCE):
 	$(DOWNLOAD) $(GCC_LINARO_SITE)/$(GCC_LINARO_SOURCE)
 
-UCLIBC_VER = 1.0.24
+UCLIBC_VERSION = 1.0.24
 
 # -----------------------------------------------------------------------------
 
@@ -82,7 +82,7 @@ UCLIBC_VER = 1.0.24
 $(CROSS_BASE)/arm/hd2: $(DL_DIR)/$(GCC_LINARO_SOURCE)
 
 $(CROSS_DIR): | $(BUILD_DIR)
-	make $(BUILD_DIR)/linux-$(KERNEL_VER).tar
+	make $(BUILD_DIR)/linux-$(KERNEL_VERSION).tar
 	#
 	$(REMOVE)/$(CROSSTOOL_NG_DIR)
 	$(GET-GIT-SOURCE) $(CROSSTOOL_NG_SITE)/$(CROSSTOOL_NG_SOURCE) $(DL_DIR)/$(CROSSTOOL_NG_SOURCE)
@@ -102,9 +102,9 @@ endif
 		$(SED) "s|^CT_PARALLEL_JOBS=.*|CT_PARALLEL_JOBS=$(PARALLEL_JOBS)|" .config; \
 		export NI_LOCAL_TARBALLS_DIR=$(DL_DIR); \
 		export NI_PREFIX_DIR=$(@); \
-		export NI_KERNEL_VERSION=$(KERNEL_VER); \
-		export NI_KERNEL_LOCATION=$(BUILD_DIR)/linux-$(KERNEL_VER).tar; \
-		export NI_LIBC_UCLIBC_CONFIG_FILE=$(PACKAGE_DIR)/crosstool-ng/files/ct-ng-uClibc-$(UCLIBC_VER).config; \
+		export NI_KERNEL_VERSION=$(KERNEL_VERSION); \
+		export NI_KERNEL_LOCATION=$(BUILD_DIR)/linux-$(KERNEL_VERSION).tar; \
+		export NI_LIBC_UCLIBC_CONFIG_FILE=$(PACKAGE_DIR)/crosstool-ng/files/ct-ng-uClibc-$(UCLIBC_VERSION).config; \
 		export LD_LIBRARY_PATH=; \
 		test -f ./configure || ./bootstrap; \
 		./configure --enable-local; \
diff --git a/make/environment-build.mk b/make/environment-build.mk
index e8c89608..b6bfa102 100644
--- a/make/environment-build.mk
+++ b/make/environment-build.mk
@@ -113,9 +113,9 @@ STAGING_DIR   = $(BASE_DIR)/staging
 IMAGE_DIR     = $(STAGING_DIR)/images
 UPDATE_DIR    = $(STAGING_DIR)/updates
 CROSS_BASE    = $(BASE_DIR)/cross
-CROSS_DIR    ?= $(CROSS_BASE)/$(TARGET_ARCH)-linux-$(KERNEL_VER)
+CROSS_DIR    ?= $(CROSS_BASE)/$(TARGET_ARCH)-linux-$(KERNEL_VERSION)
 STATIC_BASE   = $(BASE_DIR)/static
-STATIC_DIR    = $(STATIC_BASE)/$(TARGET_ARCH)-linux-$(KERNEL_VER)
+STATIC_DIR    = $(STATIC_BASE)/$(TARGET_ARCH)-linux-$(KERNEL_VERSION)
 CONFIGS       = $(BASE_DIR)/configs
 PATCHES       = $(BASE_DIR)/patches
 SKEL_ROOT     = $(BASE_DIR)/skel-root/$(BOXSERIES)
@@ -190,7 +190,7 @@ PKG_UPPER       = $(call UPPERCASE,$(PKG_NAME))
 PKG_LOWER       = $(call LOWERCASE,$(PKG_NAME))
 PKG             = $(PKG_UPPER)
 
-PKG_VER         = $($(PKG)_VER)
+PKG_VERSION     = $($(PKG)_VERSION)
 PKG_DIR         = $($(PKG)_DIR)
 PKG_SOURCE      = $($(PKG)_SOURCE)
 PKG_SITE        = $($(PKG)_SITE)
diff --git a/make/environment-host.mk b/make/environment-host.mk
index 8bd0f150..08ac0df0 100644
--- a/make/environment-host.mk
+++ b/make/environment-host.mk
@@ -3,7 +3,7 @@
 #
 # -----------------------------------------------------------------------------
 
-HOST_DIR      = $(BASE_DIR)/host
+HOST_DIR = $(BASE_DIR)/host
 HOST_DEPS_DIR = $(HOST_DIR)/deps
 
 # -----------------------------------------------------------------------------
diff --git a/make/environment-image.mk b/make/environment-image.mk
index d48543e5..eb8a763f 100644
--- a/make/environment-image.mk
+++ b/make/environment-image.mk
@@ -10,27 +10,31 @@ DEBUG ?= no
 GITTAG=$(shell git tag -l "NI-*" | tail -n1)
 GITREV=$(shell git rev-list $(GITTAG)..HEAD --count)
 
-IMAGE_VER_MAJOR = 4
-IMAGE_VER_MINOR = 00
-IMAGE_VER_MICRO = $(GITREV)
-IMAGE_VER = $(IMAGE_VER_MAJOR)$(IMAGE_VER_MINOR)
+# *Must* be a one-digit number
+IMAGE_VERSION_MAJOR = 4
+# *Must* be a two-digit number
+IMAGE_VERSION_MINOR = 00
+IMAGE_VERSION_MICRO = $(GITREV)
 
-IMAGE_VERSION = $(IMAGE_VER_MAJOR).$(IMAGE_VER_MINOR).$(IMAGE_VER_MICRO)
+IMAGE_VERSION = $(IMAGE_VERSION_MAJOR).$(IMAGE_VERSION_MINOR).$(IMAGE_VERSION_MICRO)
 
 # Release date
 IMAGE_DATE = $(shell date +%Y%m%d%H%M)
 
 # Image names
-IMAGE_PREFIX = ni$(IMAGE_VER)-$(IMAGE_DATE)
+IMAGE_PREFIX = ni$(IMAGE_VERSION_MAJOR)$(IMAGE_VERSION_MINOR)-$(IMAGE_DATE)
 IMAGE_SUFFIX = $(BOXTYPE_SC)-$(BOXMODEL)
-
 IMAGE_NAME   = $(IMAGE_PREFIX)-$(IMAGE_SUFFIX)
+
+# Image type
 IMAGE_TYPE  ?= 9
 # Release    = 0
 # Beta       = 1
 # Nightly    = 2
 # Selfmade   = 9
 
+IMAGE_VERSION_STRING = $(IMAGE_TYPE)$(IMAGE_VERSION_MAJOR)$(IMAGE_VERSION_MINOR)$(IMAGE_DATE)
+
 # JFFS2-Summary
 IMAGE_SUMMARIZE = yes
 
diff --git a/make/environment-linux.mk b/make/environment-linux.mk
index 35ecee78..7724fb32 100644
--- a/make/environment-linux.mk
+++ b/make/environment-linux.mk
@@ -4,202 +4,202 @@
 # -----------------------------------------------------------------------------
 
 ifeq ($(BOXMODEL),nevis)
-  KERNEL_VER    = 2.6.34.13
-  KERNEL_DIR    = linux-$(KERNEL_VER)
+  KERNEL_VERSION = 2.6.34.13
+  KERNEL_DIR = linux-$(KERNEL_VERSION)
   KERNEL_SOURCE = git
-  KERNEL_SITE   = $(empty)
+  KERNEL_SITE = $(empty)
 
   KERNEL_BRANCH = ni/linux-2.6.34.15
-  KERNEL_DTB    = $(empty)
+  KERNEL_DTB = $(empty)
 
 else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),apollo shiner kronos kronos_v2))
-  KERNEL_VER    = 3.10.93
-  KERNEL_DIR    = linux-$(KERNEL_VER)
+  KERNEL_VERSION = 3.10.93
+  KERNEL_DIR = linux-$(KERNEL_VERSION)
   KERNEL_SOURCE = git
-  KERNEL_SITE   = $(empty)
+  KERNEL_SITE = $(empty)
 
   KERNEL_BRANCH = ni/linux-3.10.108
   ifeq ($(BOXMODEL),$(filter $(BOXMODEL),apollo shiner))
-    KERNEL_DTB    = $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/kernel-dtb/hd849x.dtb
+    KERNEL_DTB = $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/kernel-dtb/hd849x.dtb
     KERNEL_CONFIG = $(PKG_FILES_DIR)/kernel-apollo.defconfig
   else
-    KERNEL_DTB    = $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/kernel-dtb/en75x1.dtb
+    KERNEL_DTB = $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/kernel-dtb/en75x1.dtb
     KERNEL_CONFIG = $(PKG_FILES_DIR)/kernel-kronos.defconfig
   endif
 
 else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd51 bre2ze4k h7))
-  KERNEL_VER    = 4.10.12
-  KERNEL_DIR    = linux-$(KERNEL_VER)
-  KERNEL_SOURCE = linux-$(KERNEL_VER)-arm.tar.gz
-  KERNEL_SITE   = http://downloads.mutant-digital.net
+  KERNEL_VERSION = 4.10.12
+  KERNEL_DIR = linux-$(KERNEL_VERSION)
+  KERNEL_SOURCE = linux-$(KERNEL_VERSION)-arm.tar.gz
+  KERNEL_SITE = http://downloads.mutant-digital.net
 
   KERNEL_BRANCH = $(empty)
-  KERNEL_DTB    = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(TARGET_ARCH)/boot/dts/bcm7445-bcm97445svmb.dtb
+  KERNEL_DTB = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(TARGET_ARCH)/boot/dts/bcm7445-bcm97445svmb.dtb
   KERNEL_CONFIG = $(PKG_FILES_DIR)/kernel-hd5x.defconfig
 
   BOOT_PARTITION = 1
 
 else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd60))
-  KERNEL_VER    = 4.4.35
-  KERNEL_DATE   = 20200219
-  KERNEL_DIR    = linux-$(KERNEL_VER)
-  KERNEL_SOURCE = linux-$(KERNEL_VER)-$(KERNEL_DATE)-arm.tar.gz
-  KERNEL_SITE   = http://source.mynonpublic.com/gfutures
+  KERNEL_VERSION = 4.4.35
+  KERNEL_DATE = 20200219
+  KERNEL_DIR = linux-$(KERNEL_VERSION)
+  KERNEL_SOURCE = linux-$(KERNEL_VERSION)-$(KERNEL_DATE)-arm.tar.gz
+  KERNEL_SITE = http://source.mynonpublic.com/gfutures
 
   KERNEL_BRANCH = $(empty)
-  KERNEL_DTB    = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(TARGET_ARCH)/boot/dts/hi3798mv200.dtb
+  KERNEL_DTB = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(TARGET_ARCH)/boot/dts/hi3798mv200.dtb
   KERNEL_CONFIG = $(PKG_FILES_DIR)/kernel-hd6x.defconfig
 
   BOOT_PARTITION = 4
 
 else ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd61))
-  KERNEL_VER    = 4.4.35
-  KERNEL_DATE   = 20181228
-  KERNEL_DIR    = linux-$(KERNEL_VER)
-  KERNEL_SOURCE = linux-$(KERNEL_VER)-$(KERNEL_DATE)-arm.tar.gz
-  KERNEL_SITE   = http://source.mynonpublic.com/gfutures
+  KERNEL_VERSION = 4.4.35
+  KERNEL_DATE = 20181228
+  KERNEL_DIR = linux-$(KERNEL_VERSION)
+  KERNEL_SOURCE = linux-$(KERNEL_VERSION)-$(KERNEL_DATE)-arm.tar.gz
+  KERNEL_SITE = http://source.mynonpublic.com/gfutures
 
   KERNEL_BRANCH = $(empty)
-  KERNEL_DTB    = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(TARGET_ARCH)/boot/dts/hi3798mv200.dtb
+  KERNEL_DTB = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(TARGET_ARCH)/boot/dts/hi3798mv200.dtb
   KERNEL_CONFIG = $(PKG_FILES_DIR)/kernel-hd6x.defconfig
 
   BOOT_PARTITION = 4
 
 else ifeq ($(BOXMODEL),vusolo4k)
-  KERNEL_VER    = 3.14.28-1.8
-  KERNEL_DIR    = linux
+  KERNEL_VERSION = 3.14.28-1.8
+  KERNEL_DIR = linux
   KERNEL_SOURCE = stblinux-3.14-1.8.tar.bz2
-  KERNEL_SITE   = http://code.vuplus.com/download/release/kernel
+  KERNEL_SITE = http://code.vuplus.com/download/release/kernel
 
   KERNEL_BRANCH = $(empty)
-  KERNEL_DTB    = $(empty)
+  KERNEL_DTB = $(empty)
 
-  VMLINUZ_INITRD_VER    = 20190911
-  VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz
-  VMLINUZ_INITRD_SITE   = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
-  VMLINUZ_INITRD        = vmlinuz-initrd-7366c0
+  VMLINUZ_INITRD_VERSION = 20190911
+  VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VERSION).tar.gz
+  VMLINUZ_INITRD_SITE = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
+  VMLINUZ_INITRD = vmlinuz-initrd-7366c0
 
   BOOT_PARTITION = 1
 
 else ifeq ($(BOXMODEL),vuduo4k)
-  KERNEL_VER    = 4.1.45-1.17
-  KERNEL_DIR    = linux
+  KERNEL_VERSION = 4.1.45-1.17
+  KERNEL_DIR = linux
   KERNEL_SOURCE = stblinux-4.1-1.17.tar.bz2
-  KERNEL_SITE   = http://code.vuplus.com/download/release/kernel
+  KERNEL_SITE = http://code.vuplus.com/download/release/kernel
 
   KERNEL_BRANCH = $(empty)
-  KERNEL_DTB    = $(empty)
+  KERNEL_DTB = $(empty)
 
-  VMLINUZ_INITRD_VER    = 20190911
-  VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz
-  VMLINUZ_INITRD_SITE   = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
-  VMLINUZ_INITRD        = vmlinuz-initrd-7278b1
+  VMLINUZ_INITRD_VERSION = 20190911
+  VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VERSION).tar.gz
+  VMLINUZ_INITRD_SITE = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
+  VMLINUZ_INITRD = vmlinuz-initrd-7278b1
 
   BOOT_PARTITION = 6
 
 else ifeq ($(BOXMODEL),vuduo4kse)
-  KERNEL_VER    = 4.1.45-1.17
-  KERNEL_DIR    = linux
+  KERNEL_VERSION = 4.1.45-1.17
+  KERNEL_DIR = linux
   KERNEL_SOURCE = stblinux-4.1-1.17.tar.bz2
-  KERNEL_SITE   = http://code.vuplus.com/download/release/kernel
+  KERNEL_SITE = http://code.vuplus.com/download/release/kernel
 
   KERNEL_BRANCH = $(empty)
-  KERNEL_DTB    = $(empty)
+  KERNEL_DTB = $(empty)
 
-  VMLINUZ_INITRD_VER    = 20201010
-  VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz
-  VMLINUZ_INITRD_SITE   = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
-  VMLINUZ_INITRD        = vmlinuz-initrd-7445d0
+  VMLINUZ_INITRD_VERSION = 20201010
+  VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VERSION).tar.gz
+  VMLINUZ_INITRD_SITE = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
+  VMLINUZ_INITRD = vmlinuz-initrd-7445d0
 
   BOOT_PARTITION = 6
 
 else ifeq ($(BOXMODEL),vuultimo4k)
-  KERNEL_VER    = 3.14.28-1.12
-  KERNEL_DIR    = linux
+  KERNEL_VERSION = 3.14.28-1.12
+  KERNEL_DIR = linux
   KERNEL_SOURCE = stblinux-3.14-1.12.tar.bz2
-  KERNEL_SITE   = http://code.vuplus.com/download/release/kernel
+  KERNEL_SITE = http://code.vuplus.com/download/release/kernel
 
   KERNEL_BRANCH = $(empty)
-  KERNEL_DTB    = $(empty)
+  KERNEL_DTB = $(empty)
 
-  VMLINUZ_INITRD_VER    = 20190911
-  VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz
-  VMLINUZ_INITRD_SITE   = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
-  VMLINUZ_INITRD        = vmlinuz-initrd-7445d0
+  VMLINUZ_INITRD_VERSION = 20190911
+  VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VERSION).tar.gz
+  VMLINUZ_INITRD_SITE = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
+  VMLINUZ_INITRD = vmlinuz-initrd-7445d0
 
   BOOT_PARTITION = 1
 
 else ifeq ($(BOXMODEL),vuzero4k)
-  KERNEL_VER    = 4.1.20-1.9
-  KERNEL_DIR    = linux
+  KERNEL_VERSION = 4.1.20-1.9
+  KERNEL_DIR = linux
   KERNEL_SOURCE = stblinux-4.1-1.9.tar.bz2
-  KERNEL_SITE   = http://code.vuplus.com/download/release/kernel
+  KERNEL_SITE = http://code.vuplus.com/download/release/kernel
 
   KERNEL_BRANCH = $(empty)
-  KERNEL_DTB    = $(empty)
+  KERNEL_DTB = $(empty)
 
-  VMLINUZ_INITRD_VER    = 20190911
-  VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz
-  VMLINUZ_INITRD_SITE   = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
-  VMLINUZ_INITRD        = vmlinuz-initrd-7260a0
+  VMLINUZ_INITRD_VERSION = 20190911
+  VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VERSION).tar.gz
+  VMLINUZ_INITRD_SITE = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
+  VMLINUZ_INITRD = vmlinuz-initrd-7260a0
 
   BOOT_PARTITION = 4
 
 else ifeq ($(BOXMODEL),vuuno4k)
-  KERNEL_VER    = 3.14.28-1.12
-  KERNEL_DIR    = linux
+  KERNEL_VERSION = 3.14.28-1.12
+  KERNEL_DIR = linux
   KERNEL_SOURCE = stblinux-3.14-1.12.tar.bz2
-  KERNEL_SITE   = http://code.vuplus.com/download/release/kernel
+  KERNEL_SITE = http://code.vuplus.com/download/release/kernel
 
   KERNEL_BRANCH = $(empty)
-  KERNEL_DTB    = $(empty)
+  KERNEL_DTB = $(empty)
 
-  VMLINUZ_INITRD_VER    = 20191010
-  VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz
-  VMLINUZ_INITRD_SITE   = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
-  VMLINUZ_INITRD        = vmlinuz-initrd-7439b0
+  VMLINUZ_INITRD_VERSION = 20191010
+  VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VERSION).tar.gz
+  VMLINUZ_INITRD_SITE = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
+  VMLINUZ_INITRD = vmlinuz-initrd-7439b0
 
   BOOT_PARTITION = 1
 
 else ifeq ($(BOXMODEL),vuuno4kse)
-  KERNEL_VER    = 4.1.20-1.9
-  KERNEL_DIR    = linux
+  KERNEL_VERSION = 4.1.20-1.9
+  KERNEL_DIR = linux
   KERNEL_SOURCE = stblinux-4.1-1.9.tar.bz2
-  KERNEL_SITE   = http://code.vuplus.com/download/release/kernel
+  KERNEL_SITE = http://code.vuplus.com/download/release/kernel
 
   KERNEL_BRANCH = $(empty)
-  KERNEL_DTB    = $(empty)
+  KERNEL_DTB = $(empty)
 
-  VMLINUZ_INITRD_VER    = 20191010
-  VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VER).tar.gz
-  VMLINUZ_INITRD_SITE   = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
-  VMLINUZ_INITRD        = vmlinuz-initrd-7439b0
+  VMLINUZ_INITRD_VERSION = 20191010
+  VMLINUZ_INITRD_SOURCE = vmlinuz-initrd_$(BOXMODEL)_$(VMLINUZ_INITRD_VERSION).tar.gz
+  VMLINUZ_INITRD_SITE = https://bitbucket.org/max_10/vmlinuz-initrd-$(BOXMODEL)/downloads
+  VMLINUZ_INITRD = vmlinuz-initrd-7439b0
 
   BOOT_PARTITION = 1
 
 else ifeq ($(BOXMODEL),vuduo)
-  KERNEL_VER    = 3.9.6
-  KERNEL_DIR    = linux
-  KERNEL_SOURCE = stblinux-$(KERNEL_VER).tar.bz2
-  KERNEL_SITE   = http://code.vuplus.com/download/release/kernel
+  KERNEL_VERSION = 3.9.6
+  KERNEL_DIR = linux
+  KERNEL_SOURCE = stblinux-$(KERNEL_VERSION).tar.bz2
+  KERNEL_SITE = http://code.vuplus.com/download/release/kernel
 
   KERNEL_BRANCH = $(empty)
-  KERNEL_DTB    = $(empty)
+  KERNEL_DTB = $(empty)
 
 endif
 
-KERNEL_PATCH    = $($(call UPPERCASE,$(BOXMODEL))_PATCH)
+KERNEL_PATCH = $($(call UPPERCASE,$(BOXMODEL))_PATCH)
 
-KERNEL_OBJ      = linux-$(KERNEL_VER)-obj
-KERNEL_MODULES  = linux-$(KERNEL_VER)-modules
-KERNEL_HEADERS  = linux-$(KERNEL_VER)-headers
+KERNEL_OBJ     = linux-$(KERNEL_VERSION)-obj
+KERNEL_MODULES = linux-$(KERNEL_VERSION)-modules
+KERNEL_HEADERS = linux-$(KERNEL_VERSION)-headers
 
-KERNEL_CONFIG  ?= $(PKG_FILES_DIR)/kernel-$(BOXMODEL).defconfig
-KERNEL_NAME     = NI $(shell echo $(BOXFAMILY) | sed 's/.*/\u&/') Kernel
+KERNEL_CONFIG ?= $(PKG_FILES_DIR)/kernel-$(BOXMODEL).defconfig
+KERNEL_NAME    = NI $(shell echo $(BOXFAMILY) | sed 's/.*/\u&/') Kernel
 
 # -----------------------------------------------------------------------------
 
-KERNEL_modulesdir = $(BUILD_DIR)/$(KERNEL_MODULES)/lib/modules/$(KERNEL_VER)
+KERNEL_modulesdir = $(BUILD_DIR)/$(KERNEL_MODULES)/lib/modules/$(KERNEL_VERSION)
 
 ifeq ($(BOXMODEL),nevis)
   KERNEL_UIMAGE   = $(BUILD_DIR)/$(KERNEL_OBJ)/arch/$(TARGET_ARCH)/boot/Image
@@ -222,7 +222,7 @@ KERNEL_MAKE_VARS = \
 
 # Compatibility variables
 KERNEL_MAKE_VARS += \
-	KVER=$(KERNEL_VER) \
+	KVER=$(KERNEL_VERSION) \
 	KSRC=$(BUILD_DIR)/$(KERNEL_DIR)
 
 ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vuduo))
diff --git a/make/environment-target.mk b/make/environment-target.mk
index 585ebc6f..c0379d32 100644
--- a/make/environment-target.mk
+++ b/make/environment-target.mk
@@ -16,7 +16,7 @@ base_datadir		= $(base_datarootdir)
 base_includedir		= $(base_prefix)/include
 base_libdir		= $(base_prefix)/lib
 
-modulesdir		= $(base_libdir)/modules/$(KERNEL_VER)
+modulesdir		= $(base_libdir)/modules/$(KERNEL_VERSION)
 
 # -----------------------------------------------------------------------------
 
diff --git a/make/environment-update.mk b/make/environment-update.mk
index 12be61c0..1f91e88a 100644
--- a/make/environment-update.mk
+++ b/make/environment-update.mk
@@ -13,11 +13,12 @@ PREINSTALL_SH	= $(UPDATE_CTRL_DIR)/preinstall.sh
 
 # defaults for Neutrino-Update
 UPDATE_DATE	= $(shell date +%Y%m%d%H%M)
-UPDATE_VER	= $(IMAGE_VER)
+UPDATE_VERSION_MAJOR = $(IMAGE_VERSION_MAJOR)
+UPDATE_VERSION_MINOR = $(IMAGE_VERSION_MINOR)
 UPDATE_VERSION	= $(IMAGE_VERSION)
 
 UPDATE_PREFIX	= $(IMAGE_PREFIX)
-UPDATE_SUFFIX	= $(BOXTYPE_SC)-$(BOXSERIES)-update
+UPDATE_SUFFIX	= $(IMAGE_SUFFIX)-update
 
 UPDATE_NAME	= $(UPDATE_PREFIX)-$(UPDATE_SUFFIX)
 UPDATE_DESC	= "Neutrino [$(BOXTYPE_SC)][$(BOXSERIES)] Update"
@@ -32,6 +33,8 @@ UPDATE_TYPE	= U
 # Addon		= A
 # Text		= T
 
+UPDATE_VERSION_STRING = $(UPDATE_TYPE)$(UPDATE_VERSION_MAJOR)$(UPDATE_VERSION_MINOR)$(UPDATE_DATE)
+
 UPDATE_SITE	= $(NI_SERVER)/$(NI_SUBDIR)
 UPDATE_MD5FILE	= update.txt
 UPDATE_MD5FILE_BOXSERIES= update-$(BOXTYPE_SC)-$(BOXSERIES).txt
diff --git a/make/flash-images.mk b/make/flash-images.mk
index b540c6d9..2eaea453 100644
--- a/make/flash-images.mk
+++ b/make/flash-images.mk
@@ -3,19 +3,19 @@
 #
 # -----------------------------------------------------------------------------
 
-MKFSFLAGS	= -U -D $(BUILD_DIR)/devtable-$(BOXSERIES).txt -r $(ROOTFS)
+MKFSFLAGS = -U -D $(BUILD_DIR)/devtable-$(BOXSERIES).txt -r $(ROOTFS)
 ifeq ($(BOXSERIES),hd1)
-  MKFSFLAGS	+= -p
+  MKFSFLAGS += -p
 endif
 ifeq ($(BOXSERIES),hd2)
-  MKFSFLAGS	+= -n -l
+  MKFSFLAGS += -n -l
 endif
 
 ifeq ($(BOXSERIES),hd1)
-  SUMFLAGS	= -p
+  SUMFLAGS = -p
 endif
 ifeq ($(BOXSERIES),hd2)
-  SUMFLAGS	= -n -l
+  SUMFLAGS = -n -l
 endif
 
 # -----------------------------------------------------------------------------
@@ -49,6 +49,12 @@ devtable-remove:
 
 # -----------------------------------------------------------------------------
 
+define create_md5file # image-file
+	echo $(IMAGE_SITE)/$(1) $(IMAGE_VERSION_STRING) $$(md5sum $(IMAGE_DIR)/$(1) | cut -c1-32) $(IMAGE_DESC) $(IMAGE_VERSION) >> $(IMAGE_DIR)/$(IMAGE_MD5FILE)
+endef
+
+# -----------------------------------------------------------------------------
+
 flash-image:
 ifeq ($(BOXMODEL),$(filter $(BOXMODEL),nevis kronos kronos_v2))
 	make flash-image-coolstream ERASE_SIZE=0x20000
@@ -85,7 +91,7 @@ ifeq ($(IMAGE_SUMMARIZE),yes)
 	rm -f $(IMAGE_DIR)/$(IMAGE_NAME).img
 	mv $(IMAGE_DIR)/$(IMAGE_NAME)-sum.img $(IMAGE_DIR)/$(IMAGE_NAME).img
 endif
-	echo $(IMAGE_SITE)/$(IMAGE_NAME).img $(IMAGE_TYPE)$(IMAGE_VER)$(IMAGE_DATE) `md5sum $(IMAGE_DIR)/$(IMAGE_NAME).img | cut -c1-32` $(IMAGE_DESC) $(IMAGE_VERSION) >> $(IMAGE_DIR)/$(IMAGE_MD5FILE)
+	$(call create_md5file,$(IMAGE_NAME).img)
 	make check-image-size IMAGE_TO_CHECK=$(IMAGE_DIR)/$(IMAGE_NAME).img
 
 # -----------------------------------------------------------------------------
@@ -124,7 +130,7 @@ flash-image-hd5x: | $(IMAGE_DIR)
 	# Create minimal image
 	$(CD) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR); \
 		tar -czf $(IMAGE_DIR)/$(IMAGE_NAME).tgz kernel.bin rootfs.tar.bz2
-	echo $(IMAGE_SITE)/$(IMAGE_NAME).tgz $(IMAGE_TYPE)$(IMAGE_VER)$(IMAGE_DATE) `md5sum $(IMAGE_DIR)/$(IMAGE_NAME).tgz | cut -c1-32` $(IMAGE_DESC) $(IMAGE_VERSION) >> $(IMAGE_DIR)/$(IMAGE_MD5FILE)
+	$(call create_md5file,$(IMAGE_NAME).tgz)
 	rm -rf $(IMAGE_BUILD_DIR)
 
 # -----------------------------------------------------------------------------
@@ -227,7 +233,7 @@ flash-image-hd6x: | $(IMAGE_DIR)
 	# Create minimal image
 	$(CD) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR); \
 		tar -czf $(IMAGE_DIR)/$(IMAGE_NAME).tgz uImage rootfs.tar.bz2
-	echo $(IMAGE_SITE)/$(IMAGE_NAME).tgz $(IMAGE_TYPE)$(IMAGE_VER)$(IMAGE_DATE) `md5sum $(IMAGE_DIR)/$(IMAGE_NAME).tgz | cut -c1-32` $(IMAGE_DESC) $(IMAGE_VERSION) >> $(IMAGE_DIR)/$(IMAGE_MD5FILE)
+	$(call create_md5file,$(IMAGE_NAME).tgz)
 	rm -rf $(IMAGE_BUILD_DIR)
 
 # -----------------------------------------------------------------------------
@@ -239,16 +245,16 @@ HD6x_IMAGE_LINK = $(HD6x_IMAGE_NAME).ext4
 
 # partition offsets/sizes
 HD6x_BOOTOPTIONS_PARTITION_SIZE = 32768
-HD6x_IMAGE_ROOTFS_SIZE          = 1024M
+HD6x_IMAGE_ROOTFS_SIZE = 1024M
 
-HD6x_BOOTARGS_DATE    = 20200504
-HD6x_BOOTARGS_SOURCE  = $(BOXMODEL)-bootargs-$(HD6x_BOOTARGS_DATE).zip
-HD6x_PARTITONS_DATE   = 20200319
+HD6x_BOOTARGS_DATE = 20200504
+HD6x_BOOTARGS_SOURCE = $(BOXMODEL)-bootargs-$(HD6x_BOOTARGS_DATE).zip
+HD6x_PARTITONS_DATE = 20200319
 HD6x_PARTITONS_SOURCE = $(BOXMODEL)-partitions-$(HD6x_PARTITONS_DATE).zip
-HD6x_RECOVERY_DATE    = 20200424
-HD6x_RECOVERY_SOURCE  = $(BOXMODEL)-recovery-$(HD6x_RECOVERY_DATE).zip
+HD6x_RECOVERY_DATE = 20200424
+HD6x_RECOVERY_SOURCE = $(BOXMODEL)-recovery-$(HD6x_RECOVERY_DATE).zip
 
-HD6x_MULTI_DISK_VER  = 1.0
+HD6x_MULTI_DISK_VERSION = 1.0
 HD6x_MULTI_DISK_SITE = http://downloads.mutant-digital.net/$(BOXMODEL)
 
 $(DL_DIR)/$(HD6x_BOOTARGS_SOURCE):
@@ -352,9 +358,11 @@ flash-image-vuplus: | $(IMAGE_DIR)
 		tar -cvf $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \
 		bzip2 $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/rootfs.tar
 	# Create minimal image
+	echo $(IMAGE_DATE)
+	echo $(IMAGE_NAME)
 	$(CD) $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR); \
 		tar -czf $(IMAGE_DIR)/$(IMAGE_NAME).tgz kernel_auto.bin rootfs.tar.bz2
-	echo $(IMAGE_SITE)/$(IMAGE_NAME).tgz $(IMAGE_TYPE)$(IMAGE_VER)$(IMAGE_DATE) `md5sum $(IMAGE_DIR)/$(IMAGE_NAME).tgz | cut -c1-32` $(IMAGE_DESC) $(IMAGE_VERSION) >> $(IMAGE_DIR)/$(IMAGE_MD5FILE)
+	$(call create_md5file,$(IMAGE_NAME).tgz)
 	rm -rf $(IMAGE_BUILD_DIR)
 
 flash-image-vuplus-multi: vmlinuz-initrd
diff --git a/make/flash-updates.mk b/make/flash-updates.mk
index 7fc359ce..fca04060 100644
--- a/make/flash-updates.mk
+++ b/make/flash-updates.mk
@@ -199,7 +199,7 @@ u-clean-all: u-clean
 u-update-bin:
 	$(CD) $(BUILD_DIR); \
 		tar -czvf $(UPDATE_DIR)/$(UPDATE_NAME).bin temp_inst
-	echo $(UPDATE_SITE)/$(UPDATE_NAME).bin $(UPDATE_TYPE)$(UPDATE_VER)$(UPDATE_DATE) `md5sum $(UPDATE_DIR)/$(UPDATE_NAME).bin | cut -c1-32` $(UPDATE_DESC) $(UPDATE_VERSION) >> $(UPDATE_DIR)/$(UPDATE_MD5FILE)
+	echo $(UPDATE_SITE)/$(UPDATE_NAME).bin $(UPDATE_VERSION_STRING) `md5sum $(UPDATE_DIR)/$(UPDATE_NAME).bin | cut -c1-32` $(UPDATE_DESC) $(UPDATE_VERSION) >> $(UPDATE_DIR)/$(UPDATE_MD5FILE)
 	$(MAKE) u-clean
 
 # -----------------------------------------------------------------------------
diff --git a/make/host-tools.mk b/make/host-tools.mk
index 49d31e65..6fe6074b 100644
--- a/make/host-tools.mk
+++ b/make/host-tools.mk
@@ -38,10 +38,10 @@ HOST_PKG-CONFIG = $(HOST_DIR)/bin/pkg-config
 
 # -----------------------------------------------------------------------------
 
-HOST_PKGCONF_VER    = 1.7.3
-HOST_PKGCONF_DIR    = pkgconf-$(HOST_PKGCONF_VER)
-HOST_PKGCONF_SOURCE = pkgconf-$(HOST_PKGCONF_VER).tar.gz
-HOST_PKGCONF_SITE   = https://distfiles.dereferenced.org/pkgconf
+HOST_PKGCONF_VERSION = 1.7.3
+HOST_PKGCONF_DIR = pkgconf-$(HOST_PKGCONF_VERSION)
+HOST_PKGCONF_SOURCE = pkgconf-$(HOST_PKGCONF_VERSION).tar.gz
+HOST_PKGCONF_SITE = https://distfiles.dereferenced.org/pkgconf
 
 $(DL_DIR)/$(HOST_PKGCONF_SOURCE):
 	$(DOWNLOAD) $(HOST_PKGCONF_SITE)/$(HOST_PKGCONF_SOURCE)
@@ -67,10 +67,10 @@ $(PKG_CONFIG): $(PKG_CONFIG_DEPS) | $(HOST_DIR)
 
 # -----------------------------------------------------------------------------
 
-HOST_MTD_UTILS_VER    = $(MTD_UTILS_VER)
-HOST_MTD_UTILS_DIR    = mtd-utils-$(HOST_MTD_UTILS_VER)
-HOST_MTD_UTILS_SOURCE = mtd-utils-$(HOST_MTD_UTILS_VER).tar.bz2
-HOST_MTD_UTILS_SITE   = ftp://ftp.infradead.org/pub/mtd-utils
+HOST_MTD_UTILS_VERSION = $(MTD_UTILS_VERSION)
+HOST_MTD_UTILS_DIR = mtd-utils-$(HOST_MTD_UTILS_VERSION)
+HOST_MTD_UTILS_SOURCE = mtd-utils-$(HOST_MTD_UTILS_VERSION).tar.bz2
+HOST_MTD_UTILS_SITE = ftp://ftp.infradead.org/pub/mtd-utils
 
 #$(DL_DIR)/$(HOST_MTD_UTILS_SOURCE):
 #	$(DOWNLOAD) $(HOST_MTD_UTILS_SITE)/$(HOST_MTD_UTILS_SOURCE)
@@ -98,10 +98,10 @@ host-mtd-utils: $(DL_DIR)/$(HOST_MTD_UTILS_SOURCE) | $(HOST_DIR)
 
 # -----------------------------------------------------------------------------
 
-HOST_U_BOOT_VER    = 2018.09
-HOST_U_BOOT_DIR    = u-boot-$(HOST_U_BOOT_VER)
-HOST_U_BOOT_SOURCE = u-boot-$(HOST_U_BOOT_VER).tar.bz2
-HOST_U_BOOT_SITE   = ftp://ftp.denx.de/pub/u-boot
+HOST_U_BOOT_VERSION = 2018.09
+HOST_U_BOOT_DIR = u-boot-$(HOST_U_BOOT_VERSION)
+HOST_U_BOOT_SOURCE = u-boot-$(HOST_U_BOOT_VERSION).tar.bz2
+HOST_U_BOOT_SITE = ftp://ftp.denx.de/pub/u-boot
 
 $(DL_DIR)/$(HOST_U_BOOT_SOURCE):
 	$(DOWNLOAD) $(HOST_U_BOOT_SITE)/$(HOST_U_BOOT_SOURCE)
@@ -121,10 +121,10 @@ host-u-boot: $(DL_DIR)/$(HOST_U_BOOT_SOURCE) | $(HOST_DIR)
 
 # -----------------------------------------------------------------------------
 
-HOST_ZIC_VER    = 2020f
-HOST_ZIC_DIR    = tzcode$(HOST_ZIC_VER)
-HOST_ZIC_SOURCE = tzcode$(HOST_ZIC_VER).tar.gz
-HOST_ZIC_SITE   = ftp://ftp.iana.org/tz/releases
+HOST_ZIC_VERSION = 2020f
+HOST_ZIC_DIR = tzcode$(HOST_ZIC_VERSION)
+HOST_ZIC_SOURCE = tzcode$(HOST_ZIC_VERSION).tar.gz
+HOST_ZIC_SITE = ftp://ftp.iana.org/tz/releases
 
 $(DL_DIR)/$(HOST_ZIC_SOURCE):
 	$(DOWNLOAD) $(HOST_ZIC_SITE)/$(HOST_ZIC_SOURCE)
@@ -144,10 +144,10 @@ host-zic: $(DL_DIR)/$(HOST_ZIC_SOURCE) | $(HOST_DIR)
 
 # -----------------------------------------------------------------------------
 
-HOST_PARTED_VER    = $(PARTED_VER)
-HOST_PARTED_DIR    = parted-$(HOST_PARTED_VER)
-HOST_PARTED_SOURCE = parted-$(HOST_PARTED_VER).tar.xz
-HOST_PARTED_SITE   = $(GNU_MIRROR)/parted
+HOST_PARTED_VERSION = $(PARTED_VERSION)
+HOST_PARTED_DIR = parted-$(HOST_PARTED_VERSION)
+HOST_PARTED_SOURCE = parted-$(HOST_PARTED_VERSION).tar.xz
+HOST_PARTED_SITE = $(GNU_MIRROR)/parted
 
 #$(DL_DIR)/$(HOST_PARTED_SOURCE):
 #	$(DOWNLOAD) $(HOST_PARTED_SITE)/$(HOST_PARTED_SOURCE)
@@ -173,10 +173,10 @@ host-parted: $(DL_DIR)/$(HOST_PARTED_SOURCE) | $(HOST_DIR)
 
 # -----------------------------------------------------------------------------
 
-HOST_DOSFSTOOLS_VER    = $(DOSFSTOOLS_VER)
-HOST_DOSFSTOOLS_DIR    = dosfstools-$(HOST_DOSFSTOOLS_VER)
-HOST_DOSFSTOOLS_SOURCE = dosfstools-$(HOST_DOSFSTOOLS_VER).tar.xz
-HOST_DOSFSTOOLS_SITE   = https://github.com/dosfstools/dosfstools/releases/download/v$(HOST_DOSFSTOOLS_VER)
+HOST_DOSFSTOOLS_VERSION = $(DOSFSTOOLS_VERSION)
+HOST_DOSFSTOOLS_DIR = dosfstools-$(HOST_DOSFSTOOLS_VERSION)
+HOST_DOSFSTOOLS_SOURCE = dosfstools-$(HOST_DOSFSTOOLS_VERSION).tar.xz
+HOST_DOSFSTOOLS_SITE = https://github.com/dosfstools/dosfstools/releases/download/v$(HOST_DOSFSTOOLS_VERSION)
 
 #$(DL_DIR)/$(HOST_DOSFSTOOLS_SOURCE):
 #	$(DOWNLOAD) $(HOST_DOSFSTOOLS_SITE)/$(HOST_DOSFSTOOLS_SOURCE)
@@ -199,10 +199,10 @@ host-dosfstools: $(DL_DIR)/$(HOST_DOSFSTOOLS_SOURCE) | $(HOST_DIR)
 
 # -----------------------------------------------------------------------------
 
-HOST_MTOOLS_VER    = 4.0.19
-HOST_MTOOLS_DIR    = mtools-$(HOST_MTOOLS_VER)
-HOST_MTOOLS_SOURCE = mtools-$(HOST_MTOOLS_VER).tar.gz
-HOST_MTOOLS_SITE   = $(GNU_MIRROR)/mtools
+HOST_MTOOLS_VERSION = 4.0.19
+HOST_MTOOLS_DIR = mtools-$(HOST_MTOOLS_VERSION)
+HOST_MTOOLS_SOURCE = mtools-$(HOST_MTOOLS_VERSION).tar.gz
+HOST_MTOOLS_SITE = $(GNU_MIRROR)/mtools
 
 $(DL_DIR)/$(HOST_MTOOLS_SOURCE):
 	$(DOWNLOAD) $(HOST_MTOOLS_SITE)/$(HOST_MTOOLS_SOURCE)
@@ -219,10 +219,10 @@ host-mtools: $(DL_DIR)/$(HOST_MTOOLS_SOURCE) | $(HOST_DIR)
 
 # -----------------------------------------------------------------------------
 
-HOST_E2FSPROGS_VER    = $(E2FSPROGS_VER)
-HOST_E2FSPROGS_DIR    = e2fsprogs-$(HOST_E2FSPROGS_VER)
-HOST_E2FSPROGS_SOURCE = e2fsprogs-$(HOST_E2FSPROGS_VER).tar.gz
-HOST_E2FSPROGS_SITE   = https://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/v$(HOST_E2FSPROGS_VER)
+HOST_E2FSPROGS_VERSION = $(E2FSPROGS_VERSION)
+HOST_E2FSPROGS_DIR = e2fsprogs-$(HOST_E2FSPROGS_VERSION)
+HOST_E2FSPROGS_SOURCE = e2fsprogs-$(HOST_E2FSPROGS_VERSION).tar.gz
+HOST_E2FSPROGS_SITE = https://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/v$(HOST_E2FSPROGS_VERSION)
 
 #$(DL_DIR)/$(HOST_E2FSPROGS_SOURCE):
 #	$(DOWNLOAD) $(HOST_E2FSPROGS_SITE)/$(HOST_E2FSPROGS_SOURCE)
@@ -243,10 +243,10 @@ host-e2fsprogs: $(DL_DIR)/$(HOST_E2FSPROGS_SOURCE) | $(HOST_DIR)
 
 # -----------------------------------------------------------------------------
 
-HOST_MESON_VER    = 0.56.0
-HOST_MESON_DIR    = meson-$(HOST_MESON_VER)
-HOST_MESON_SOURCE = meson-$(HOST_MESON_VER).tar.gz
-HOST_MESON_SITE   = https://github.com/mesonbuild/meson/releases/download/$(HOST_MESON_VER)
+HOST_MESON_VERSION = 0.56.0
+HOST_MESON_DIR = meson-$(HOST_MESON_VERSION)
+HOST_MESON_SOURCE = meson-$(HOST_MESON_VERSION).tar.gz
+HOST_MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(HOST_MESON_VERSION)
 
 $(DL_DIR)/$(HOST_MESON_SOURCE):
 	$(DOWNLOAD) $(HOST_MESON_SITE)/$(HOST_MESON_SOURCE)
@@ -267,10 +267,10 @@ host-meson: $(HOST_MESON_DEPS) $(DL_DIR)/$(HOST_MESON_SOURCE) | $(HOST_DIR)
 
 # -----------------------------------------------------------------------------
 
-HOST_NINJA_VER    = 1.10.0
-HOST_NINJA_DIR    = ninja-$(HOST_NINJA_VER)
-HOST_NINJA_SOURCE = ninja-$(HOST_NINJA_VER).tar.gz
-HOST_NINJA_SITE   = $(call github,ninja-build,ninja,v$(HOST_NINJA_VER))
+HOST_NINJA_VERSION = 1.10.0
+HOST_NINJA_DIR = ninja-$(HOST_NINJA_VERSION)
+HOST_NINJA_SOURCE = ninja-$(HOST_NINJA_VERSION).tar.gz
+HOST_NINJA_SITE = $(call github,ninja-build,ninja,v$(HOST_NINJA_VERSION))
 
 $(DL_DIR)/$(HOST_NINJA_SOURCE):
 	$(DOWNLOAD) $(HOST_NINJA_SITE)/$(HOST_NINJA_SOURCE)
@@ -290,10 +290,10 @@ host-ninja: $(DL_DIR)/$(HOST_NINJA_SOURCE) | $(HOST_DIR)
 
 # -----------------------------------------------------------------------------
 
-HOST_EXPAT_VER    = $(EXPAT_VER)
-HOST_EXPAT_DIR    = expat-$(EXPAT_VER)
-HOST_EXPAT_SOURCE = expat-$(EXPAT_VER).tar.bz2
-HOST_EXPAT_SITE   = https://sourceforge.net/projects/expat/files/expat/$(EXPAT_VER)
+HOST_EXPAT_VERSION = $(EXPAT_VERSION)
+HOST_EXPAT_DIR = expat-$(EXPAT_VERSION)
+HOST_EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.bz2
+HOST_EXPAT_SITE = https://sourceforge.net/projects/expat/files/expat/$(EXPAT_VERSION)
 
 #$(DL_DIR)/$(HOST_EXPAT_SOURCE):
 #	$(DOWNLOAD) $(HOST_EXPAT_SITE)/$(EXPAT_SOURCE)
@@ -313,13 +313,13 @@ host-expat: $(DL_DIR)/$(HOST_EXPAT_SOURCE) | $(HOST_DIR)
 
 # -----------------------------------------------------------------------------
 
-HOST_PYTHON3_VER    = 3.9.0
-HOST_PYTHON3_DIR    = Python-$(HOST_PYTHON3_VER)
-HOST_PYTHON3_SOURCE = Python-$(HOST_PYTHON3_VER).tar.xz
-HOST_PYTHON3_SITE   = https://www.python.org/ftp/python/$(HOST_PYTHON3_VER)
+HOST_PYTHON3_VERSION = 3.9.0
+HOST_PYTHON3_DIR = Python-$(HOST_PYTHON3_VERSION)
+HOST_PYTHON3_SOURCE = Python-$(HOST_PYTHON3_VERSION).tar.xz
+HOST_PYTHON3_SITE = https://www.python.org/ftp/python/$(HOST_PYTHON3_VERSION)
 
-HOST_PYTHON3_BASE_DIR    = lib/python$(basename $(HOST_PYTHON3_VER))
-HOST_PYTHON3_INCLUDE_DIR = include/python$(basename $(HOST_PYTHON3_VER))
+HOST_PYTHON3_BASE_DIR = lib/python$(basename $(HOST_PYTHON3_VERSION))
+HOST_PYTHON3_INCLUDE_DIR = include/python$(basename $(HOST_PYTHON3_VERSION))
 
 $(DL_DIR)/$(HOST_PYTHON3_SOURCE):
 	$(DOWNLOAD) $(HOST_PYTHON3_SITE)/$(HOST_PYTHON3_SOURCE)
@@ -357,10 +357,10 @@ host-python3: $(HOST_PYTHON3_DEPS) $(DL_DIR)/$(HOST_PYTHON3_SOURCE) | $(HOST_DIR
 
 # -----------------------------------------------------------------------------
 
-HOST_PYTHON3_SETUPTOOLS_VER    = 44.0.0
-HOST_PYTHON3_SETUPTOOLS_DIR    = setuptools-$(HOST_PYTHON3_SETUPTOOLS_VER)
-HOST_PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(HOST_PYTHON3_SETUPTOOLS_VER).zip
-HOST_PYTHON3_SETUPTOOLS_SITE   = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485
+HOST_PYTHON3_SETUPTOOLS_VERSION = 44.0.0
+HOST_PYTHON3_SETUPTOOLS_DIR = setuptools-$(HOST_PYTHON3_SETUPTOOLS_VERSION)
+HOST_PYTHON3_SETUPTOOLS_SOURCE = setuptools-$(HOST_PYTHON3_SETUPTOOLS_VERSION).zip
+HOST_PYTHON3_SETUPTOOLS_SITE = https://files.pythonhosted.org/packages/b0/f3/44da7482ac6da3f36f68e253cb04de37365b3dba9036a3c70773b778b485
 
 $(DL_DIR)/$(HOST_PYTHON3_SETUPTOOLS_SOURCE):
 	$(DOWNLOAD) $(HOST_PYTHON3_SETUPTOOLS_SITE)/$(HOST_PYTHON3_SETUPTOOLS_SOURCE)
@@ -379,10 +379,10 @@ host-python3-setuptools: $(HOST_PYTHON3_SETUPTOOLS_DEPS) $(DL_DIR)/$(HOST_PYTHON
 
 # -----------------------------------------------------------------------------
 
-HOST_LIBFFI_VER    = $(LIBFFI_VER)
-HOST_LIBFFI_DIR    = libffi-$(HOST_LIBFFI_VER)
-HOST_LIBFFI_SOURCE = libffi-$(HOST_LIBFFI_VER).tar.gz
-HOST_LIBFFI_SITE   = https://github.com/libffi/libffi/releases/download/v$(HOST_LIBFFI_VER)
+HOST_LIBFFI_VERSION = $(LIBFFI_VERSION)
+HOST_LIBFFI_DIR = libffi-$(HOST_LIBFFI_VERSION)
+HOST_LIBFFI_SOURCE = libffi-$(HOST_LIBFFI_VERSION).tar.gz
+HOST_LIBFFI_SITE = https://github.com/libffi/libffi/releases/download/v$(HOST_LIBFFI_VERSION)
 
 #$(DL_DIR)/$(HOST_LIBFFI_SOURCE):
 #	$(DOWNLOAD) $(HOST_LIBFFI_SITE)/$(HOST_LIBFFI_SOURCE)
@@ -400,10 +400,10 @@ host-libffi: $(DL_DIR)/$(HOST_LIBFFI_SOURCE) | $(HOST_DIR)
 
 # -----------------------------------------------------------------------------
 
-HOST_LUA_VER    = $(LUA_VER)
-HOST_LUA_DIR    = lua-$(HOST_LUA_VER)
-HOST_LUA_SOURCE = lua-$(HOST_LUA_VER).tar.gz
-HOST_LUA_SITE   = http://www.lua.org/ftp
+HOST_LUA_VERSION = $(LUA_VERSION)
+HOST_LUA_DIR = lua-$(HOST_LUA_VERSION)
+HOST_LUA_SOURCE = lua-$(HOST_LUA_VERSION).tar.gz
+HOST_LUA_SITE = http://www.lua.org/ftp
 
 #$(DL_DIR)/$(HOST_LUA_SOURCE):
 #	$(DOWNLOAD) $(HOST_LUA_SITE)/$(HOST_LUA_SOURCE)
@@ -425,20 +425,20 @@ host-lua: $(DL_DIR)/$(HOST_LUA_SOURCE) | $(HOST_DIR)
 
 # -----------------------------------------------------------------------------
 
-HOST_LUAROCKS_VER    = 3.1.3
-HOST_LUAROCKS_DIR    = luarocks-$(HOST_LUAROCKS_VER)
-HOST_LUAROCKS_SOURCE = luarocks-$(HOST_LUAROCKS_VER).tar.gz
-HOST_LUAROCKS_SITE   = https://luarocks.github.io/luarocks/releases
+HOST_LUAROCKS_VERSION = 3.1.3
+HOST_LUAROCKS_DIR = luarocks-$(HOST_LUAROCKS_VERSION)
+HOST_LUAROCKS_SOURCE = luarocks-$(HOST_LUAROCKS_VERSION).tar.gz
+HOST_LUAROCKS_SITE = https://luarocks.github.io/luarocks/releases
 
 $(DL_DIR)/$(HOST_LUAROCKS_SOURCE):
 	$(DOWNLOAD) $(HOST_LUAROCKS_SITE)/$(HOST_LUAROCKS_SOURCE)
 
 HOST_LUAROCKS_DEPS = host-lua
 
-HOST_LUAROCKS_CONFIG = $(HOST_DIR)/etc/luarocks/config-$(LUA_ABIVER).lua
+HOST_LUAROCKS_CONFIG = $(HOST_DIR)/etc/luarocks/config-$(LUA_ABIVERSION).lua
 
 HOST_LUAROCKS_MAKE_ENV = \
-	LUA_PATH="$(HOST_DIR)/share/lua/$(LUA_ABIVER)/?.lua" \
+	LUA_PATH="$(HOST_DIR)/share/lua/$(LUA_ABIVERSION)/?.lua" \
 	TARGET_CC="$(TARGET_CC)" \
 	TARGET_LD="$(TARGET_LD)" \
 	TARGET_CFLAGS="$(TARGET_CFLAGS) -fPIC" \
@@ -474,7 +474,7 @@ CCACHE := ccache
 endif
 CCACHE := $(shell which $(CCACHE) || type -p $(CCACHE) || echo ccache)
 
-CCACHE_DIR = $(HOME)/.ccache-$(call LOWERCASE,$(TARGET_VENDOR))-$(TARGET_ARCH)-$(TARGET_OS)-$(KERNEL_VER)
+CCACHE_DIR = $(HOME)/.ccache-$(call LOWERCASE,$(TARGET_VENDOR))-$(TARGET_ARCH)-$(TARGET_OS)-$(KERNEL_VERSION)
 export CCACHE_DIR
 
 host-ccache: find-ccache $(CCACHE) | $(HOST_DIR)
diff --git a/make/linux-drivers.mk b/make/linux-drivers.mk
index 42578ddc..a2e8f20e 100644
--- a/make/linux-drivers.mk
+++ b/make/linux-drivers.mk
@@ -3,10 +3,10 @@
 #
 # -----------------------------------------------------------------------------
 
-RTL8192EU_VER    = git
-RTL8192EU_DIR    = rtl8192eu-linux-driver.$(RTL8192EU_VER)
-RTL8192EU_SOURCE = rtl8192eu-linux-driver.$(RTL8192EU_VER)
-RTL8192EU_SITE   = https://github.com/mange/$(RTL8192EU_SOURCE)
+RTL8192EU_VERSION = git
+RTL8192EU_DIR = rtl8192eu-linux-driver.$(RTL8192EU_VERSION)
+RTL8192EU_SOURCE = rtl8192eu-linux-driver.$(RTL8192EU_VERSION)
+RTL8192EU_SITE = https://github.com/mange/$(RTL8192EU_SOURCE)
 
 rtl8192eu: kernel-$(BOXTYPE) | $(TARGET_DIR)
 	$(REMOVE)/$(RTL8192EU_DIR)
@@ -21,10 +21,10 @@ rtl8192eu: kernel-$(BOXTYPE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-RTL8812AU_VER    = 4.3.14
-RTL8812AU_DIR    = rtl8812AU-driver-$(RTL8812AU_VER)
-RTL8812AU_SOURCE = rtl8812AU-driver-$(RTL8812AU_VER).zip
-RTL8812AU_SITE   = http://source.mynonpublic.com
+RTL8812AU_VERSION = 4.3.14
+RTL8812AU_DIR = rtl8812AU-driver-$(RTL8812AU_VERSION)
+RTL8812AU_SOURCE = rtl8812AU-driver-$(RTL8812AU_VERSION).zip
+RTL8812AU_SITE = http://source.mynonpublic.com
 
 $(DL_DIR)/$(RTL8812AU_SOURCE):
 	$(DOWNLOAD) $(RTL8812AU_SITE)/$(RTL8812AU_SOURCE)
@@ -42,10 +42,10 @@ rtl8812au: kernel-$(BOXTYPE) $(DL_DIR)/$(RTL8812AU_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-RTL8822BU_VER    = 1.0.0.9-20180511a
-RTL8822BU_DIR    = rtl8822bu
-RTL8822BU_SOURCE = rtl8822bu-driver-$(RTL8822BU_VER).zip
-RTL8822BU_SITE   = http://source.mynonpublic.com
+RTL8822BU_VERSION = 1.0.0.9-20180511a
+RTL8822BU_DIR = rtl8822bu
+RTL8822BU_SOURCE = rtl8822bu-driver-$(RTL8822BU_VERSION).zip
+RTL8822BU_SITE = http://source.mynonpublic.com
 
 $(DL_DIR)/$(RTL8822BU_SOURCE):
 	$(DOWNLOAD) $(RTL8822BU_SITE)/$(RTL8822BU_SOURCE)
@@ -63,10 +63,10 @@ rtl8822bu: kernel-$(BOXTYPE) $(DL_DIR)/$(RTL8822BU_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-HD6x_MALI_DRIVERS_VER    = DX910-SW-99002-r7p0-00rel0
-HD6x_MALI_DRIVERS_DIR    = $(HD6x_MALI_DRIVERS_VER)
-HD6x_MALI_DRIVERS_SOURCE = $(HD6x_MALI_DRIVERS_VER).tgz
-HD6x_MALI_DRIVERS_SITE   = https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu
+HD6x_MALI_DRIVERS_VERSION = DX910-SW-99002-r7p0-00rel0
+HD6x_MALI_DRIVERS_DIR = $(HD6x_MALI_DRIVERS_VERSION)
+HD6x_MALI_DRIVERS_SOURCE = $(HD6x_MALI_DRIVERS_VERSION).tgz
+HD6x_MALI_DRIVERS_SITE = https://developer.arm.com/-/media/Files/downloads/mali-drivers/kernel/mali-utgard-gpu
 
 $(DL_DIR)/$(HD6x_MALI_DRIVERS_SOURCE):
 	$(DOWNLOAD) $(HD6x_MALI_DRIVERS_SITE)/$(HD6x_MALI_DRIVERS_SOURCE)
diff --git a/make/linux-kernel.mk b/make/linux-kernel.mk
index 0d32d53a..5131116b 100644
--- a/make/linux-kernel.mk
+++ b/make/linux-kernel.mk
@@ -351,7 +351,7 @@ vmlinuz-initrd: $(DL_DIR)/$(VMLINUZ_INITRD_SOURCE)
 # -----------------------------------------------------------------------------
 
 depmod:
-	PATH=$(PATH):/sbin:/usr/sbin depmod -b $(TARGET_DIR) $(KERNEL_VER)
+	PATH=$(PATH):/sbin:/usr/sbin depmod -b $(TARGET_DIR) $(KERNEL_VERSION)
 ifeq ($(BOXSERIES),hd1)
 	mv $(TARGET_modulesdir)/modules.dep $(TARGET_modulesdir)/.modules.dep
 	rm $(TARGET_modulesdir)/modules.*
diff --git a/make/ni.mk b/make/ni.mk
index aba4e9ee..32b44f42 100644
--- a/make/ni.mk
+++ b/make/ni.mk
@@ -31,7 +31,6 @@ ni-image:
 	$(MAKE) neutrino
 	make plugins
 	make fbshot
-	$(MAKE) luacurl
 	$(MAKE) tzdata
 	$(MAKE) smartmontools
 	$(MAKE) sg3_utils
diff --git a/make/target-blobs.mk b/make/target-blobs.mk
index 1b8307b6..5fd52888 100644
--- a/make/target-blobs.mk
+++ b/make/target-blobs.mk
@@ -17,14 +17,17 @@ endif
 ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vusolo4k vuduo4k vuduo4kse vuultimo4k vuzero4k vuuno4k vuuno4kse))
 	$(MAKE) vuplus-platform-util
 endif
+	$(TOUCH)
 
 # -----------------------------------------------------------------------------
 
 firmware: firmware-boxmodel firmware-wireless
+	$(TOUCH)
 
 firmware-boxmodel: $(SOURCE_DIR)/$(NI_DRIVERS_BIN) | $(TARGET_DIR)
 	$(call INSTALL_EXIST,$(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/lib-firmware/.,$(TARGET_base_libdir)/firmware)
 	$(call INSTALL_EXIST,$(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/lib-firmware-dvb/.,$(TARGET_base_libdir)/firmware)
+	$(TOUCH)
 
 ifeq ($(BOXMODEL),nevis)
   FIRMWARE_WIRELESS  = rt2870.bin
@@ -40,82 +43,83 @@ firmware-wireless: $(SOURCE_DIR)/$(NI_DRIVERS_BIN) | $(TARGET_DIR)
 	for firmware in $(FIRMWARE_WIRELESS); do \
 		$(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/general/firmware-wireless/$$firmware $(TARGET_base_libdir)/firmware/$$firmware; \
 	done
+	$(TOUCH)
 
 # -----------------------------------------------------------------------------
 
-HD51_DRIVERS_VER    = 20191120
-HD51_DRIVERS_SOURCE = hd51-drivers-$(KERNEL_VER)-$(HD51_DRIVERS_VER).zip
-HD51_DRIVERS_SITE   = http://source.mynonpublic.com/gfutures
+HD51_DRIVERS_VERSION = 20191120
+HD51_DRIVERS_SOURCE = hd51-drivers-$(KERNEL_VERSION)-$(HD51_DRIVERS_VERSION).zip
+HD51_DRIVERS_SITE = http://source.mynonpublic.com/gfutures
 
-BRE2ZE4K_DRIVERS_VER    = 20191120
-BRE2ZE4K_DRIVERS_SOURCE = bre2ze4k-drivers-$(KERNEL_VER)-$(BRE2ZE4K_DRIVERS_VER).zip
-BRE2ZE4K_DRIVERS_SITE   = http://source.mynonpublic.com/gfutures
+BRE2ZE4K_DRIVERS_VERSION = 20191120
+BRE2ZE4K_DRIVERS_SOURCE = bre2ze4k-drivers-$(KERNEL_VERSION)-$(BRE2ZE4K_DRIVERS_VERSION).zip
+BRE2ZE4K_DRIVERS_SITE = http://source.mynonpublic.com/gfutures
 
-H7_DRIVERS_VER    = 20191123
-H7_DRIVERS_SOURCE = h7-drivers-$(KERNEL_VER)-$(H7_DRIVERS_VER).zip
-H7_DRIVERS_SITE   = http://source.mynonpublic.com/zgemma
+H7_DRIVERS_VERSION = 20191123
+H7_DRIVERS_SOURCE = h7-drivers-$(KERNEL_VERSION)-$(H7_DRIVERS_VERSION).zip
+H7_DRIVERS_SITE = http://source.mynonpublic.com/zgemma
 
-HD60_DRIVERS_VER    = 20200731
-HD60_DRIVERS_SOURCE = hd60-drivers-$(KERNEL_VER)-$(HD60_DRIVERS_VER).zip
-HD60_DRIVERS_SITE   = http://source.mynonpublic.com/gfutures
+HD60_DRIVERS_VERSION = 20200731
+HD60_DRIVERS_SOURCE = hd60-drivers-$(KERNEL_VERSION)-$(HD60_DRIVERS_VERSION).zip
+HD60_DRIVERS_SITE = http://source.mynonpublic.com/gfutures
 
-HD61_DRIVERS_VER    = 20200731
-HD61_DRIVERS_SOURCE = hd61-drivers-$(KERNEL_VER)-$(HD61_DRIVERS_VER).zip
-HD61_DRIVERS_SITE   = http://source.mynonpublic.com/gfutures
+HD61_DRIVERS_VERSION = 20200731
+HD61_DRIVERS_SOURCE = hd61-drivers-$(KERNEL_VERSION)-$(HD61_DRIVERS_VERSION).zip
+HD61_DRIVERS_SITE = http://source.mynonpublic.com/gfutures
 
-VUSOLO4K_DRIVERS_VER    = 20190424
-VUSOLO4K_DRIVERS_SOURCE = vuplus-dvb-proxy-vusolo4k-3.14.28-$(VUSOLO4K_DRIVERS_VER).r0.tar.gz
-VUSOLO4K_DRIVERS_SITE   = http://code.vuplus.com/download/release/vuplus-dvb-proxy
+VUSOLO4K_DRIVERS_VERSION = 20190424
+VUSOLO4K_DRIVERS_SOURCE = vuplus-dvb-proxy-vusolo4k-3.14.28-$(VUSOLO4K_DRIVERS_VERSION).r0.tar.gz
+VUSOLO4K_DRIVERS_SITE = http://code.vuplus.com/download/release/vuplus-dvb-proxy
 
 ifeq ($(VUPLUS_DRIVERS_LATEST),yes)
-VUDUO4K_DRIVERS_VER    = 20191218
+VUDUO4K_DRIVERS_VERSION = 20191218
 else
-VUDUO4K_DRIVERS_VER    = 20190212
+VUDUO4K_DRIVERS_VERSION = 20190212
 endif
-VUDUO4K_DRIVERS_SOURCE = vuplus-dvb-proxy-vuduo4k-4.1.45-$(VUDUO4K_DRIVERS_VER).r0.tar.gz
-VUDUO4K_DRIVERS_SITE   = http://code.vuplus.com/download/release/vuplus-dvb-proxy
+VUDUO4K_DRIVERS_SOURCE = vuplus-dvb-proxy-vuduo4k-4.1.45-$(VUDUO4K_DRIVERS_VERSION).r0.tar.gz
+VUDUO4K_DRIVERS_SITE = http://code.vuplus.com/download/release/vuplus-dvb-proxy
 
-VUDUO4KSE_DRIVERS_VER    = 20200903
-VUDUO4KSE_DRIVERS_SOURCE = vuplus-dvb-proxy-vuduo4kse-4.1.45-$(VUDUO4KSE_DRIVERS_VER).r0.tar.gz
-VUDUO4KSE_DRIVERS_SITE   = http://code.vuplus.com/download/release/vuplus-dvb-proxy
+VUDUO4KSE_DRIVERS_VERSION = 20200903
+VUDUO4KSE_DRIVERS_SOURCE = vuplus-dvb-proxy-vuduo4kse-4.1.45-$(VUDUO4KSE_DRIVERS_VERSION).r0.tar.gz
+VUDUO4KSE_DRIVERS_SITE = http://code.vuplus.com/download/release/vuplus-dvb-proxy
 
 ifeq ($(VUPLUS_DRIVERS_LATEST),yes)
-VUULTIMO4K_DRIVERS_VER    = 20190424
+VUULTIMO4K_DRIVERS_VERSION = 20190424
 else
-VUULTIMO4K_DRIVERS_VER    = 20190104
+VUULTIMO4K_DRIVERS_VERSION = 20190104
 endif
-VUULTIMO4K_DRIVERS_SOURCE = vuplus-dvb-proxy-vuultimo4k-3.14.28-$(VUULTIMO4K_DRIVERS_VER).r0.tar.gz
-VUULTIMO4K_DRIVERS_SITE   = http://code.vuplus.com/download/release/vuplus-dvb-proxy
+VUULTIMO4K_DRIVERS_SOURCE = vuplus-dvb-proxy-vuultimo4k-3.14.28-$(VUULTIMO4K_DRIVERS_VERSION).r0.tar.gz
+VUULTIMO4K_DRIVERS_SITE = http://code.vuplus.com/download/release/vuplus-dvb-proxy
 
-VUZERO4K_DRIVERS_VER    = 20190424
-VUZERO4K_DRIVERS_SOURCE = vuplus-dvb-proxy-vuzero4k-4.1.20-$(VUZERO4K_DRIVERS_VER).r0.tar.gz
-VUZERO4K_DRIVERS_SITE   = http://code.vuplus.com/download/release/vuplus-dvb-proxy
+VUZERO4K_DRIVERS_VERSION = 20190424
+VUZERO4K_DRIVERS_SOURCE = vuplus-dvb-proxy-vuzero4k-4.1.20-$(VUZERO4K_DRIVERS_VERSION).r0.tar.gz
+VUZERO4K_DRIVERS_SITE = http://code.vuplus.com/download/release/vuplus-dvb-proxy
 
 ifeq ($(VUPLUS_DRIVERS_LATEST),yes)
-VUUNO4K_DRIVERS_VER    = 20190424
+VUUNO4K_DRIVERS_VERSION = 20190424
 else
-VUUNO4K_DRIVERS_VER    = 20190104
+VUUNO4K_DRIVERS_VERSION = 20190104
 endif
-VUUNO4K_DRIVERS_SOURCE = vuplus-dvb-proxy-vuuno4k-3.14.28-$(VUUNO4K_DRIVERS_VER).r0.tar.gz
-VUUNO4K_DRIVERS_SITE   = http://code.vuplus.com/download/release/vuplus-dvb-proxy
+VUUNO4K_DRIVERS_SOURCE = vuplus-dvb-proxy-vuuno4k-3.14.28-$(VUUNO4K_DRIVERS_VERSION).r0.tar.gz
+VUUNO4K_DRIVERS_SITE = http://code.vuplus.com/download/release/vuplus-dvb-proxy
 
 ifeq ($(VUPLUS_DRIVERS_LATEST),yes)
-VUUNO4KSE_DRIVERS_VER    = 20190424
+VUUNO4KSE_DRIVERS_VERSION = 20190424
 else
-VUUNO4KSE_DRIVERS_VER    = 20190104
+VUUNO4KSE_DRIVERS_VERSION = 20190104
 endif
-VUUNO4KSE_DRIVERS_SOURCE = vuplus-dvb-proxy-vuuno4kse-4.1.20-$(VUUNO4KSE_DRIVERS_VER).r0.tar.gz
-VUUNO4KSE_DRIVERS_SITE   = http://code.vuplus.com/download/release/vuplus-dvb-proxy
+VUUNO4KSE_DRIVERS_SOURCE = vuplus-dvb-proxy-vuuno4kse-4.1.20-$(VUUNO4KSE_DRIVERS_VERSION).r0.tar.gz
+VUUNO4KSE_DRIVERS_SITE = http://code.vuplus.com/download/release/vuplus-dvb-proxy
 
-VUDUO_DRIVERS_VER    = 20151124
-VUDUO_DRIVERS_SOURCE = vuplus-dvb-modules-bm750-3.9.6-$(VUDUO_DRIVERS_VER).tar.gz
-VUDUO_DRIVERS_SITE   = http://code.vuplus.com/download/release/vuplus-dvb-modules
+VUDUO_DRIVERS_VERSION = 20151124
+VUDUO_DRIVERS_SOURCE = vuplus-dvb-modules-bm750-3.9.6-$(VUDUO_DRIVERS_VERSION).tar.gz
+VUDUO_DRIVERS_SITE = http://code.vuplus.com/download/release/vuplus-dvb-modules
 
 # -----------------------------------------------------------------------------
 
-BOXMODEL_DRIVERS_VER    = $($(call UPPERCASE,$(BOXMODEL))_DRIVERS_VER)
+BOXMODEL_DRIVERS_VERSION = $($(call UPPERCASE,$(BOXMODEL))_DRIVERS_VERSION)
 BOXMODEL_DRIVERS_SOURCE = $($(call UPPERCASE,$(BOXMODEL))_DRIVERS_SOURCE)
-BOXMODEL_DRIVERS_SITE   = $($(call UPPERCASE,$(BOXMODEL))_DRIVERS_SITE)
+BOXMODEL_DRIVERS_SITE = $($(call UPPERCASE,$(BOXMODEL))_DRIVERS_SITE)
 
 ifneq ($(BOXMODEL_DRIVERS_SOURCE),$(empty))
 $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE):
@@ -135,9 +139,9 @@ ifeq ($(BOXMODEL),nevis)
 	ln -sf libnxp.so $(TARGET_libdir)/libconexant.so
 endif
 	mkdir -p $(TARGET_modulesdir)
-	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/lib-modules/$(KERNEL_VER)/. $(TARGET_modulesdir)
+	$(INSTALL_COPY) $(SOURCE_DIR)/$(NI_DRIVERS_BIN)/$(DRIVERS_BIN_DIR)/lib-modules/$(KERNEL_VERSION)/. $(TARGET_modulesdir)
 ifeq ($(BOXMODEL),nevis)
-	ln -sf $(KERNEL_VER) $(TARGET_modulesdir)-$(BOXMODEL)
+	ln -sf $(KERNEL_VERSION) $(TARGET_modulesdir)-$(BOXMODEL)
 endif
 	make depmod
 	$(TOUCH)
@@ -175,75 +179,75 @@ vuplus-drivers: $(DL_DIR)/$(BOXMODEL_DRIVERS_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-HD51_LIBGLES_VER    = 20191101
-HD51_LIBGLES_DIR    = $(empty)
-HD51_LIBGLES_SOURCE = hd51-v3ddriver-$(HD51_LIBGLES_VER).zip
-HD51_LIBGLES_SITE   = http://downloads.mutant-digital.net/v3ddriver
+HD51_LIBGLES_VERSION = 20191101
+HD51_LIBGLES_DIR = $(empty)
+HD51_LIBGLES_SOURCE = hd51-v3ddriver-$(HD51_LIBGLES_VERSION).zip
+HD51_LIBGLES_SITE = http://downloads.mutant-digital.net/v3ddriver
 
-BRE2ZE4K_LIBGLES_VER    = 20191101
-BRE2ZE4K_LIBGLES_DIR    = $(empty)
-BRE2ZE4K_LIBGLES_SOURCE = bre2ze4k-v3ddriver-$(BRE2ZE4K_LIBGLES_VER).zip
-BRE2ZE4K_LIBGLES_SITE   = http://downloads.mutant-digital.net/v3ddriver
+BRE2ZE4K_LIBGLES_VERSION = 20191101
+BRE2ZE4K_LIBGLES_DIR = $(empty)
+BRE2ZE4K_LIBGLES_SOURCE = bre2ze4k-v3ddriver-$(BRE2ZE4K_LIBGLES_VERSION).zip
+BRE2ZE4K_LIBGLES_SITE = http://downloads.mutant-digital.net/v3ddriver
 
-H7_LIBGLES_VER    = 20191110
-H7_LIBGLES_DIR    = $(empty)
-H7_LIBGLES_SOURCE = h7-v3ddriver-$(H7_LIBGLES_VER).zip
-H7_LIBGLES_SITE   = http://source.mynonpublic.com/zgemma
+H7_LIBGLES_VERSION = 20191110
+H7_LIBGLES_DIR = $(empty)
+H7_LIBGLES_SOURCE = h7-v3ddriver-$(H7_LIBGLES_VERSION).zip
+H7_LIBGLES_SITE = http://source.mynonpublic.com/zgemma
 
-HD60_LIBGLES_VER    = 20181201
-HD60_LIBGLES_DIR    = $(empty)
-HD60_LIBGLES_SOURCE = hd60-mali-$(HD60_LIBGLES_VER).zip
-HD60_LIBGLES_SITE   = http://downloads.mutant-digital.net/hd60
+HD60_LIBGLES_VERSION = 20181201
+HD60_LIBGLES_DIR = $(empty)
+HD60_LIBGLES_SOURCE = hd60-mali-$(HD60_LIBGLES_VERSION).zip
+HD60_LIBGLES_SITE = http://downloads.mutant-digital.net/hd60
 
-HD61_LIBGLES_VER    = 20181201
-HD61_LIBGLES_DIR    = $(empty)
-HD61_LIBGLES_SOURCE = hd61-mali-$(HD61_LIBGLES_VER).zip
-HD61_LIBGLES_SITE   = http://downloads.mutant-digital.net/hd61
+HD61_LIBGLES_VERSION = 20181201
+HD61_LIBGLES_DIR = $(empty)
+HD61_LIBGLES_SOURCE = hd61-mali-$(HD61_LIBGLES_VERSION).zip
+HD61_LIBGLES_SITE = http://downloads.mutant-digital.net/hd61
 
 HD6x_LIBGLES_HEADERS_SOURCE = libgles-mali-utgard-headers.zip
-HD6x_LIBGLES_HEADERS_SITE   = https://github.com/HD-Digital/meta-gfutures/raw/release-6.2/recipes-bsp/mali/files
-
-VUSOLO4K_LIBGLES_VER    = $(VUSOLO4K_DRIVERS_VER)
-VUSOLO4K_LIBGLES_DIR    = libgles-vusolo4k
-VUSOLO4K_LIBGLES_SOURCE = libgles-vusolo4k-17.1-$(VUSOLO4K_LIBGLES_VER).r0.tar.gz
-VUSOLO4K_LIBGLES_SITE   = http://code.vuplus.com/download/release/libgles
-
-VUDUO4K_LIBGLES_VER    = $(VUDUO4K_DRIVERS_VER)
-VUDUO4K_LIBGLES_DIR    = libgles-vuduo4k
-VUDUO4K_LIBGLES_SOURCE = libgles-vuduo4k-18.1-$(VUDUO4K_LIBGLES_VER).r0.tar.gz
-VUDUO4K_LIBGLES_SITE   = http://code.vuplus.com/download/release/libgles
-
-VUDUO4KSE_LIBGLES_VER    = $(VUDUO4KSE_DRIVERS_VER)
-VUDUO4KSE_LIBGLES_DIR    = libgles-vuduo4kse
-VUDUO4KSE_LIBGLES_SOURCE = libgles-vuduo4kse-17.1-$(VUDUO4KSE_LIBGLES_VER).r0.tar.gz
-VUDUO4KSE_LIBGLES_SITE   = http://code.vuplus.com/download/release/libgles
-
-VUULTIMO4K_LIBGLES_VER    = $(VUULTIMO4K_DRIVERS_VER)
-VUULTIMO4K_LIBGLES_DIR    = libgles-vuultimo4k
-VUULTIMO4K_LIBGLES_SOURCE = libgles-vuultimo4k-17.1-$(VUULTIMO4K_LIBGLES_VER).r0.tar.gz
-VUULTIMO4K_LIBGLES_SITE   = http://code.vuplus.com/download/release/libgles
-
-VUZERO4K_LIBGLES_VER    = $(VUZERO4K_DRIVERS_VER)
-VUZERO4K_LIBGLES_DIR    = libgles-vuzero4k
-VUZERO4K_LIBGLES_SOURCE = libgles-vuzero4k-17.1-$(VUZERO4K_LIBGLES_VER).r0.tar.gz
-VUZERO4K_LIBGLES_SITE   = http://code.vuplus.com/download/release/libgles
-
-VUUNO4K_LIBGLES_VER    = $(VUUNO4K_DRIVERS_VER)
-VUUNO4K_LIBGLES_DIR    = libgles-vuuno4k
-VUUNO4K_LIBGLES_SOURCE = libgles-vuuno4k-17.1-$(VUUNO4K_LIBGLES_VER).r0.tar.gz
-VUUNO4K_LIBGLES_SITE   = http://code.vuplus.com/download/release/libgles
-
-VUUNO4KSE_LIBGLES_VER    = $(VUUNO4KSE_DRIVERS_VER)
-VUUNO4KSE_LIBGLES_DIR    = libgles-vuuno4kse
-VUUNO4KSE_LIBGLES_SOURCE = libgles-vuuno4kse-17.1-$(VUUNO4KSE_LIBGLES_VER).r0.tar.gz
-VUUNO4KSE_LIBGLES_SITE   = http://code.vuplus.com/download/release/libgles
+HD6x_LIBGLES_HEADERS_SITE = https://github.com/HD-Digital/meta-gfutures/raw/release-6.2/recipes-bsp/mali/files
+
+VUSOLO4K_LIBGLES_VERSION = $(VUSOLO4K_DRIVERS_VERSION)
+VUSOLO4K_LIBGLES_DIR = libgles-vusolo4k
+VUSOLO4K_LIBGLES_SOURCE = libgles-vusolo4k-17.1-$(VUSOLO4K_LIBGLES_VERSION).r0.tar.gz
+VUSOLO4K_LIBGLES_SITE = http://code.vuplus.com/download/release/libgles
+
+VUDUO4K_LIBGLES_VERSION = $(VUDUO4K_DRIVERS_VERSION)
+VUDUO4K_LIBGLES_DIR = libgles-vuduo4k
+VUDUO4K_LIBGLES_SOURCE = libgles-vuduo4k-18.1-$(VUDUO4K_LIBGLES_VERSION).r0.tar.gz
+VUDUO4K_LIBGLES_SITE = http://code.vuplus.com/download/release/libgles
+
+VUDUO4KSE_LIBGLES_VERSION = $(VUDUO4KSE_DRIVERS_VERSION)
+VUDUO4KSE_LIBGLES_DIR = libgles-vuduo4kse
+VUDUO4KSE_LIBGLES_SOURCE = libgles-vuduo4kse-17.1-$(VUDUO4KSE_LIBGLES_VERSION).r0.tar.gz
+VUDUO4KSE_LIBGLES_SITE = http://code.vuplus.com/download/release/libgles
+
+VUULTIMO4K_LIBGLES_VERSION = $(VUULTIMO4K_DRIVERS_VERSION)
+VUULTIMO4K_LIBGLES_DIR = libgles-vuultimo4k
+VUULTIMO4K_LIBGLES_SOURCE = libgles-vuultimo4k-17.1-$(VUULTIMO4K_LIBGLES_VERSION).r0.tar.gz
+VUULTIMO4K_LIBGLES_SITE = http://code.vuplus.com/download/release/libgles
+
+VUZERO4K_LIBGLES_VERSION = $(VUZERO4K_DRIVERS_VERSION)
+VUZERO4K_LIBGLES_DIR = libgles-vuzero4k
+VUZERO4K_LIBGLES_SOURCE = libgles-vuzero4k-17.1-$(VUZERO4K_LIBGLES_VERSION).r0.tar.gz
+VUZERO4K_LIBGLES_SITE = http://code.vuplus.com/download/release/libgles
+
+VUUNO4K_LIBGLES_VERSION = $(VUUNO4K_DRIVERS_VERSION)
+VUUNO4K_LIBGLES_DIR = libgles-vuuno4k
+VUUNO4K_LIBGLES_SOURCE = libgles-vuuno4k-17.1-$(VUUNO4K_LIBGLES_VERSION).r0.tar.gz
+VUUNO4K_LIBGLES_SITE = http://code.vuplus.com/download/release/libgles
+
+VUUNO4KSE_LIBGLES_VERSION = $(VUUNO4KSE_DRIVERS_VERSION)
+VUUNO4KSE_LIBGLES_DIR = libgles-vuuno4kse
+VUUNO4KSE_LIBGLES_SOURCE = libgles-vuuno4kse-17.1-$(VUUNO4KSE_LIBGLES_VERSION).r0.tar.gz
+VUUNO4KSE_LIBGLES_SITE = http://code.vuplus.com/download/release/libgles
 
 # -----------------------------------------------------------------------------
 
-BOXMODEL_LIBGLES_VER    = $($(call UPPERCASE,$(BOXMODEL))_LIBGLES_VER)
-BOXMODEL_LIBGLES_DIR    = $($(call UPPERCASE,$(BOXMODEL))_LIBGLES_DIR)
+BOXMODEL_LIBGLES_VERSION = $($(call UPPERCASE,$(BOXMODEL))_LIBGLES_VERSION)
+BOXMODEL_LIBGLES_DIR = $($(call UPPERCASE,$(BOXMODEL))_LIBGLES_DIR)
 BOXMODEL_LIBGLES_SOURCE = $($(call UPPERCASE,$(BOXMODEL))_LIBGLES_SOURCE)
-BOXMODEL_LIBGLES_SITE   = $($(call UPPERCASE,$(BOXMODEL))_LIBGLES_SITE)
+BOXMODEL_LIBGLES_SITE = $($(call UPPERCASE,$(BOXMODEL))_LIBGLES_SITE)
 
 ifneq ($(BOXMODEL_LIBGLES_SOURCE),$(empty))
 $(DL_DIR)/$(BOXMODEL_LIBGLES_SOURCE):
@@ -295,22 +299,22 @@ vuplus-libgles: $(DL_DIR)/$(BOXMODEL_LIBGLES_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-HD60_LIBS_VER    = 20200622
-HD60_LIBS_DIR    = hiplay
-HD60_LIBS_SOURCE = gfutures-libs-3798mv200-$(HD60_LIBS_VER).zip
-HD60_LIBS_SITE   = http://source.mynonpublic.com/gfutures
+HD60_LIBS_VERSION = 20200622
+HD60_LIBS_DIR = hiplay
+HD60_LIBS_SOURCE = gfutures-libs-3798mv200-$(HD60_LIBS_VERSION).zip
+HD60_LIBS_SITE = http://source.mynonpublic.com/gfutures
 
-HD61_LIBS_VER    = 20200622
-HD61_LIBS_DIR    = hiplay
-HD61_LIBS_SOURCE = gfutures-libs-3798mv200-$(HD61_LIBS_VER).zip
-HD61_LIBS_SITE   = http://source.mynonpublic.com/gfutures
+HD61_LIBS_VERSION = 20200622
+HD61_LIBS_DIR = hiplay
+HD61_LIBS_SOURCE = gfutures-libs-3798mv200-$(HD61_LIBS_VERSION).zip
+HD61_LIBS_SITE = http://source.mynonpublic.com/gfutures
 
 # -----------------------------------------------------------------------------
 
-BOXMODEL_LIBS_VER    = $($(call UPPERCASE,$(BOXMODEL))_LIBS_VER)
-BOXMODEL_LIBS_DIR    = $($(call UPPERCASE,$(BOXMODEL))_LIBS_DIR)
+BOXMODEL_LIBS_VERSION = $($(call UPPERCASE,$(BOXMODEL))_LIBS_VERSION)
+BOXMODEL_LIBS_DIR = $($(call UPPERCASE,$(BOXMODEL))_LIBS_DIR)
 BOXMODEL_LIBS_SOURCE = $($(call UPPERCASE,$(BOXMODEL))_LIBS_SOURCE)
-BOXMODEL_LIBS_SITE   = $($(call UPPERCASE,$(BOXMODEL))_LIBS_SITE)
+BOXMODEL_LIBS_SITE = $($(call UPPERCASE,$(BOXMODEL))_LIBS_SITE)
 
 ifneq ($(BOXMODEL_LIBS_SOURCE),$(empty))
 $(DL_DIR)/$(BOXMODEL_LIBS_SOURCE):
@@ -330,47 +334,47 @@ hd61-libs: $(DL_DIR)/$(BOXMODEL_LIBS_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-VUSOLO4K_PLATFORM_UTIL_VER    = $(VUSOLO4K_DRIVERS_VER)
-VUSOLO4K_PLATFORM_UTIL_DIR    = platform-util-vusolo4k
-VUSOLO4K_PLATFORM_UTIL_SOURCE = platform-util-vusolo4k-17.1-$(VUSOLO4K_PLATFORM_UTIL_VER).r0.tar.gz
-VUSOLO4K_PLATFORM_UTIL_SITE   = http://code.vuplus.com/download/release/platform-util
-
-VUDUO4K_PLATFORM_UTIL_VER    = $(VUDUO4K_DRIVERS_VER)
-VUDUO4K_PLATFORM_UTIL_DIR    = platform-util-vuduo4k
-VUDUO4K_PLATFORM_UTIL_SOURCE = platform-util-vuduo4k-18.1-$(VUDUO4K_PLATFORM_UTIL_VER).r0.tar.gz
-VUDUO4K_PLATFORM_UTIL_SITE   = http://code.vuplus.com/download/release/platform-util
-
-VUDUO4KSE_PLATFORM_UTIL_VER    = $(VUDUO4KSE_DRIVERS_VER)
-VUDUO4KSE_PLATFORM_UTIL_DIR    = platform-util-vuduo4kse
-VUDUO4KSE_PLATFORM_UTIL_SOURCE = platform-util-vuduo4kse-17.1-$(VUDUO4KSE_PLATFORM_UTIL_VER).r0.tar.gz
-VUDUO4KSE_PLATFORM_UTIL_SITE   = http://code.vuplus.com/download/release/platform-util
-
-VUULTIMO4K_PLATFORM_UTIL_VER    = $(VUULTIMO4K_DRIVERS_VER)
-VUULTIMO4K_PLATFORM_UTIL_DIR    = platform-util-vuultimo4k
-VUULTIMO4K_PLATFORM_UTIL_SOURCE = platform-util-vuultimo4k-17.1-$(VUULTIMO4K_PLATFORM_UTIL_VER).r0.tar.gz
-VUULTIMO4K_PLATFORM_UTIL_SITE   = http://code.vuplus.com/download/release/platform-util
-
-VUZERO4K_PLATFORM_UTIL_VER    = $(VUZERO4K_DRIVERS_VER)
-VUZERO4K_PLATFORM_UTIL_DIR    = platform-util-vuzero4k
-VUZERO4K_PLATFORM_UTIL_SOURCE = platform-util-vuzero4k-17.1-$(VUZERO4K_PLATFORM_UTIL_VER).r0.tar.gz
-VUZERO4K_PLATFORM_UTIL_SITE   = http://code.vuplus.com/download/release/platform-util
-
-VUUNO4K_PLATFORM_UTIL_VER    = $(VUUNO4K_DRIVERS_VER)
-VUUNO4K_PLATFORM_UTIL_DIR    = platform-util-vuuno4k
-VUUNO4K_PLATFORM_UTIL_SOURCE = platform-util-vuuno4k-17.1-$(VUUNO4K_PLATFORM_UTIL_VER).r0.tar.gz
-VUUNO4K_PLATFORM_UTIL_SITE   = http://code.vuplus.com/download/release/platform-util
-
-VUUNO4KSE_PLATFORM_UTIL_VER    = $(VUUNO4KSE_DRIVERS_VER)
-VUUNO4KSE_PLATFORM_UTIL_DIR    = platform-util-vuuno4kse
-VUUNO4KSE_PLATFORM_UTIL_SOURCE = platform-util-vuuno4kse-17.1-$(VUUNO4KSE_PLATFORM_UTIL_VER).r0.tar.gz
-VUUNO4KSE_PLATFORM_UTIL_SITE   = http://code.vuplus.com/download/release/platform-util
+VUSOLO4K_PLATFORM_UTIL_VERSION = $(VUSOLO4K_DRIVERS_VERSION)
+VUSOLO4K_PLATFORM_UTIL_DIR = platform-util-vusolo4k
+VUSOLO4K_PLATFORM_UTIL_SOURCE = platform-util-vusolo4k-17.1-$(VUSOLO4K_PLATFORM_UTIL_VERSION).r0.tar.gz
+VUSOLO4K_PLATFORM_UTIL_SITE = http://code.vuplus.com/download/release/platform-util
+
+VUDUO4K_PLATFORM_UTIL_VERSION = $(VUDUO4K_DRIVERS_VERSION)
+VUDUO4K_PLATFORM_UTIL_DIR = platform-util-vuduo4k
+VUDUO4K_PLATFORM_UTIL_SOURCE = platform-util-vuduo4k-18.1-$(VUDUO4K_PLATFORM_UTIL_VERSION).r0.tar.gz
+VUDUO4K_PLATFORM_UTIL_SITE = http://code.vuplus.com/download/release/platform-util
+
+VUDUO4KSE_PLATFORM_UTIL_VERSION = $(VUDUO4KSE_DRIVERS_VERSION)
+VUDUO4KSE_PLATFORM_UTIL_DIR = platform-util-vuduo4kse
+VUDUO4KSE_PLATFORM_UTIL_SOURCE = platform-util-vuduo4kse-17.1-$(VUDUO4KSE_PLATFORM_UTIL_VERSION).r0.tar.gz
+VUDUO4KSE_PLATFORM_UTIL_SITE = http://code.vuplus.com/download/release/platform-util
+
+VUULTIMO4K_PLATFORM_UTIL_VERSION = $(VUULTIMO4K_DRIVERS_VERSION)
+VUULTIMO4K_PLATFORM_UTIL_DIR = platform-util-vuultimo4k
+VUULTIMO4K_PLATFORM_UTIL_SOURCE = platform-util-vuultimo4k-17.1-$(VUULTIMO4K_PLATFORM_UTIL_VERSION).r0.tar.gz
+VUULTIMO4K_PLATFORM_UTIL_SITE = http://code.vuplus.com/download/release/platform-util
+
+VUZERO4K_PLATFORM_UTIL_VERSION = $(VUZERO4K_DRIVERS_VERSION)
+VUZERO4K_PLATFORM_UTIL_DIR = platform-util-vuzero4k
+VUZERO4K_PLATFORM_UTIL_SOURCE = platform-util-vuzero4k-17.1-$(VUZERO4K_PLATFORM_UTIL_VERSION).r0.tar.gz
+VUZERO4K_PLATFORM_UTIL_SITE = http://code.vuplus.com/download/release/platform-util
+
+VUUNO4K_PLATFORM_UTIL_VERSION = $(VUUNO4K_DRIVERS_VERSION)
+VUUNO4K_PLATFORM_UTIL_DIR = platform-util-vuuno4k
+VUUNO4K_PLATFORM_UTIL_SOURCE = platform-util-vuuno4k-17.1-$(VUUNO4K_PLATFORM_UTIL_VERSION).r0.tar.gz
+VUUNO4K_PLATFORM_UTIL_SITE = http://code.vuplus.com/download/release/platform-util
+
+VUUNO4KSE_PLATFORM_UTIL_VERSION = $(VUUNO4KSE_DRIVERS_VERSION)
+VUUNO4KSE_PLATFORM_UTIL_DIR = platform-util-vuuno4kse
+VUUNO4KSE_PLATFORM_UTIL_SOURCE = platform-util-vuuno4kse-17.1-$(VUUNO4KSE_PLATFORM_UTIL_VERSION).r0.tar.gz
+VUUNO4KSE_PLATFORM_UTIL_SITE = http://code.vuplus.com/download/release/platform-util
 
 # -----------------------------------------------------------------------------
 
-BOXMODEL_PLATFORM_UTIL_VER    = $($(call UPPERCASE,$(BOXMODEL))_PLATFORM_UTIL_VER)
-BOXMODEL_PLATFORM_UTIL_DIR    = $($(call UPPERCASE,$(BOXMODEL))_PLATFORM_UTIL_DIR)
+BOXMODEL_PLATFORM_UTIL_VERSION = $($(call UPPERCASE,$(BOXMODEL))_PLATFORM_UTIL_VERSION)
+BOXMODEL_PLATFORM_UTIL_DIR = $($(call UPPERCASE,$(BOXMODEL))_PLATFORM_UTIL_DIR)
 BOXMODEL_PLATFORM_UTIL_SOURCE = $($(call UPPERCASE,$(BOXMODEL))_PLATFORM_UTIL_SOURCE)
-BOXMODEL_PLATFORM_UTIL_SITE   = $($(call UPPERCASE,$(BOXMODEL))_PLATFORM_UTIL_SITE)
+BOXMODEL_PLATFORM_UTIL_SITE = $($(call UPPERCASE,$(BOXMODEL))_PLATFORM_UTIL_SITE)
 
 ifneq ($(BOXMODEL_PLATFORM_UTIL_SOURCE),$(empty))
 $(DL_DIR)/$(BOXMODEL_PLATFORM_UTIL_SOURCE):
diff --git a/make/target-development.mk b/make/target-development.mk
index 51783621..08d067f9 100644
--- a/make/target-development.mk
+++ b/make/target-development.mk
@@ -3,10 +3,10 @@
 #
 # -----------------------------------------------------------------------------
 
-VALGRIND_VER    = 3.13.0
-VALGRIND_DIR    = valgrind-$(VALGRIND_VER)
-VALGRIND_SOURCE = valgrind-$(VALGRIND_VER).tar.bz2
-VALGRIND_SITE   = ftp://sourceware.org/pub/valgrind
+VALGRIND_VERSION = 3.13.0
+VALGRIND_DIR = valgrind-$(VALGRIND_VERSION)
+VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2
+VALGRIND_SITE = ftp://sourceware.org/pub/valgrind
 
 $(DL_DIR)/$(VALGRIND_SOURCE):
 	$(DOWNLOAD) $(VALGRIND_SITE)/$(VALGRIND_SOURCE)
@@ -34,10 +34,10 @@ valgrind: $(DL_DIR)/$(VALGRIND_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-STRACE_VER    = 5.1
-STRACE_DIR    = strace-$(STRACE_VER)
-STRACE_SOURCE = strace-$(STRACE_VER).tar.xz
-STRACE_SITE   = https://strace.io/files/$(STRACE_VER)
+STRACE_VERSION = 5.1
+STRACE_DIR = strace-$(STRACE_VERSION)
+STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz
+STRACE_SITE = https://strace.io/files/$(STRACE_VERSION)
 
 $(DL_DIR)/$(STRACE_SOURCE):
 	$(DOWNLOAD) $(STRACE_SITE)/$(STRACE_SOURCE)
@@ -55,10 +55,10 @@ strace: $(DL_DIR)/$(STRACE_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-GDB_VER    = 8.3
-GDB_DIR    = gdb-$(GDB_VER)
-GDB_SOURCE = gdb-$(GDB_VER).tar.xz
-GDB_SITE   = https://sourceware.org/pub/gdb/releases
+GDB_VERSION = 8.3
+GDB_DIR = gdb-$(GDB_VERSION)
+GDB_SOURCE = gdb-$(GDB_VERSION).tar.xz
+GDB_SITE = https://sourceware.org/pub/gdb/releases
 
 $(DL_DIR)/$(GDB_SOURCE):
 	$(DOWNLOAD) $(GDB_SITE)/$(GDB_SOURCE)
diff --git a/make/target-ffmpeg.mk b/make/target-ffmpeg.mk
index 1f234b58..2cdd24e2 100644
--- a/make/target-ffmpeg.mk
+++ b/make/target-ffmpeg.mk
@@ -3,10 +3,10 @@
 #
 # -----------------------------------------------------------------------------
 
-FFMPEG_VER    = 4.3.1
-FFMPEG_DIR    = ffmpeg-$(FFMPEG_VER)
-FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VER).tar.xz
-FFMPEG_SITE   = http://www.ffmpeg.org/releases
+FFMPEG_VERSION = 4.3.1
+FFMPEG_DIR = ffmpeg-$(FFMPEG_VERSION)
+FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
+FFMPEG_SITE = http://www.ffmpeg.org/releases
 
 $(DL_DIR)/$(FFMPEG_SOURCE):
 	$(DOWNLOAD) $(FFMPEG_SITE)/$(FFMPEG_SOURCE)
diff --git a/make/target-libs-static.mk b/make/target-libs-static.mk
index 17f61260..e7f8f099 100644
--- a/make/target-libs-static.mk
+++ b/make/target-libs-static.mk
@@ -14,13 +14,13 @@ libs-static: $(LIBS-STATIC) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-CORTEX_STRINGS_VER    = 48fd30c
-CORTEX_STRINGS_DIR    = cortex-strings-$(CORTEX_STRINGS_VER)
-CORTEX_STRINGS_SOURCE = cortex-strings-$(CORTEX_STRINGS_VER).tar.bz2
-CORTEX_STRINGS_SITE   = http://git.linaro.org/git-ro/toolchain/cortex-strings.git
+CORTEX_STRINGS_VERSION = 48fd30c
+CORTEX_STRINGS_DIR = cortex-strings-$(CORTEX_STRINGS_VERSION)
+CORTEX_STRINGS_SOURCE = cortex-strings-$(CORTEX_STRINGS_VERSION).tar.bz2
+CORTEX_STRINGS_SITE = http://git.linaro.org/git-ro/toolchain/cortex-strings.git
 
 $(DL_DIR)/$(CORTEX_STRINGS_SOURCE):
-	$(GET-GIT-ARCHIVE) $(CORTEX_STRINGS_SITE) $(CORTEX_STRINGS_VER) $(@F) $(DL_DIR)
+	$(GET-GIT-ARCHIVE) $(CORTEX_STRINGS_SITE) $(CORTEX_STRINGS_VERSION) $(@F) $(DL_DIR)
 
 CORTEX_STRINGS_CONF_ENV = \
 	CFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_includedir)" \
diff --git a/make/target-libs-unused.mk b/make/target-libs-unused.mk
index 954ff641..4215ea13 100644
--- a/make/target-libs-unused.mk
+++ b/make/target-libs-unused.mk
@@ -3,10 +3,10 @@
 #
 # -----------------------------------------------------------------------------
 
-LIBID3TAG_VER    = 0.15.1b
-LIBID3TAG_DIR    = libid3tag-$(LIBID3TAG_VER)
-LIBID3TAG_SOURCE = libid3tag-$(LIBID3TAG_VER).tar.gz
-LIBID3TAG_SITE   = https://sourceforge.net/projects/mad/files/libid3tag/$(LIBID3TAG_VER)
+LIBID3TAG_VERSION = 0.15.1b
+LIBID3TAG_DIR = libid3tag-$(LIBID3TAG_VERSION)
+LIBID3TAG_SOURCE = libid3tag-$(LIBID3TAG_VERSION).tar.gz
+LIBID3TAG_SITE = https://sourceforge.net/projects/mad/files/libid3tag/$(LIBID3TAG_VERSION)
 
 $(DL_DIR)/$(LIBID3TAG_SOURCE):
 	$(DOWNLOAD) $(LIBID3TAG_SITE)/$(LIBID3TAG_SOURCE)
@@ -32,10 +32,10 @@ libid3tag: $(LIBID3TAG_DEPS) $(DL_DIR)/$(LIBID3TAG_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-FONTCONFIG_VER    = 2.11.93
-FONTCONFIG_DIR    = fontconfig-$(FONTCONFIG_VER)
-FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VER).tar.bz2
-FONTCONFIG_SITE   = https://www.freedesktop.org/software/fontconfig/release
+FONTCONFIG_VERSION = 2.11.93
+FONTCONFIG_DIR = fontconfig-$(FONTCONFIG_VERSION)
+FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.bz2
+FONTCONFIG_SITE = https://www.freedesktop.org/software/fontconfig/release
 
 $(DL_DIR)/$(FONTCONFIG_SOURCE):
 	$(DOWNLOAD) $(FONTCONFIG_SITE)/$(FONTCONFIG_SOURCE)
@@ -62,10 +62,10 @@ fontconfig: $(FONTCONFIG_DEPS) $(DL_DIR)/$(FONTCONFIG_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-PIXMAN_VER    = 0.34.0
-PIXMAN_DIR    = pixman-$(PIXMAN_VER)
-PIXMAN_SOURCE = pixman-$(PIXMAN_VER).tar.gz
-PIXMAN_SITE   = https://www.cairographics.org/releases
+PIXMAN_VERSION = 0.34.0
+PIXMAN_DIR = pixman-$(PIXMAN_VERSION)
+PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.gz
+PIXMAN_SITE = https://www.cairographics.org/releases
 
 $(DL_DIR)/$(PIXMAN_SOURCE):
 	$(DOWNLOAD) $(PIXMAN_SITE)/$(PIXMAN_SOURCE)
@@ -92,10 +92,10 @@ pixman: $(PIXMAN_DEPS) $(DL_DIR)/$(PIXMAN_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-CAIRO_VER    = 1.16.0
-CAIRO_DIR    = cairo-$(CAIRO_VER)
-CAIRO_SOURCE = cairo-$(CAIRO_VER).tar.xz
-CAIRO_SITE   = https://www.cairographics.org/releases
+CAIRO_VERSION = 1.16.0
+CAIRO_DIR = cairo-$(CAIRO_VERSION)
+CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz
+CAIRO_SITE = https://www.cairographics.org/releases
 
 $(DL_DIR)/$(CAIRO_SOURCE):
 	$(DOWNLOAD) $(CAIRO_SITE)/$(CAIRO_SOURCE)
@@ -134,10 +134,10 @@ cairo: $(CAIRO_DEPS) $(DL_DIR)/$(CAIRO_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-HARFBUZZ_VER    = 1.8.8
-HARFBUZZ_DIR    = harfbuzz-$(HARFBUZZ_VER)
-HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VER).tar.bz2
-HARFBUZZ_SITE   = https://www.freedesktop.org/software/harfbuzz/release
+HARFBUZZ_VERSION = 1.8.8
+HARFBUZZ_DIR = harfbuzz-$(HARFBUZZ_VERSION)
+HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.bz2
+HARFBUZZ_SITE = https://www.freedesktop.org/software/harfbuzz/release
 
 $(DL_DIR)/$(HARFBUZZ_SOURCE):
 	$(DOWNLOAD) $(HARFBUZZ_SITE)/$(HARFBUZZ_SOURCE)
diff --git a/make/target-libs.mk b/make/target-libs.mk
index bb8c94d0..5689a557 100644
--- a/make/target-libs.mk
+++ b/make/target-libs.mk
@@ -3,10 +3,10 @@
 #
 # -----------------------------------------------------------------------------
 
-ZLIB_VER    = 1.2.11
-ZLIB_DIR    = zlib-$(ZLIB_VER)
-ZLIB_SOURCE = zlib-$(ZLIB_VER).tar.xz
-ZLIB_SITE   = https://sourceforge.net/projects/libpng/files/zlib/$(ZLIB_VER)
+ZLIB_VERSION = 1.2.11
+ZLIB_DIR = zlib-$(ZLIB_VERSION)
+ZLIB_SOURCE = zlib-$(ZLIB_VERSION).tar.xz
+ZLIB_SITE = https://sourceforge.net/projects/libpng/files/zlib/$(ZLIB_VERSION)
 
 $(DL_DIR)/$(ZLIB_SOURCE):
 	$(DOWNLOAD) $(ZLIB_SITE)/$(ZLIB_SOURCE)
@@ -33,10 +33,10 @@ zlib: $(DL_DIR)/$(ZLIB_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBFUSE_VER    = 2.9.9
-LIBFUSE_DIR    = fuse-$(LIBFUSE_VER)
-LIBFUSE_SOURCE = fuse-$(LIBFUSE_VER).tar.gz
-LIBFUSE_SITE   = https://github.com/libfuse/libfuse/releases/download/fuse-$(LIBFUSE_VER)
+LIBFUSE_VERSION = 2.9.9
+LIBFUSE_DIR = fuse-$(LIBFUSE_VERSION)
+LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz
+LIBFUSE_SITE = https://github.com/libfuse/libfuse/releases/download/fuse-$(LIBFUSE_VERSION)
 
 $(DL_DIR)/$(LIBFUSE_SOURCE):
 	$(DOWNLOAD) $(LIBFUSE_SITE)/$(LIBFUSE_SOURCE)
@@ -66,10 +66,10 @@ libfuse: $(DL_DIR)/$(LIBFUSE_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBUPNP_VER    = 1.6.25
-LIBUPNP_DIR    = libupnp-$(LIBUPNP_VER)
-LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VER).tar.bz2
-LIBUPNP_SITE   = http://sourceforge.net/projects/pupnp/files/pupnp/libUPnP%20$(LIBUPNP_VER)
+LIBUPNP_VERSION = 1.6.25
+LIBUPNP_DIR = libupnp-$(LIBUPNP_VERSION)
+LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2
+LIBUPNP_SITE = http://sourceforge.net/projects/pupnp/files/pupnp/libUPnP%20$(LIBUPNP_VERSION)
 
 $(DL_DIR)/$(LIBUPNP_SOURCE):
 	$(DOWNLOAD) $(LIBUPNP_SITE)/$(LIBUPNP_SOURCE)
@@ -91,10 +91,10 @@ libupnp: $(DL_DIR)/$(LIBUPNP_SOURCE) | $(TARGET_DIR)
 	
 # -----------------------------------------------------------------------------
 
-LIBDVBSI_VER    = 0.3.9
-LIBDVBSI_DIR    = libdvbsi++-$(LIBDVBSI_VER)
-LIBDVBSI_SOURCE = libdvbsi++-$(LIBDVBSI_VER).tar.bz2
-LIBDVBSI_SITE   = https://github.com/mtdcr/libdvbsi/releases/download/$(LIBDVBSI_VER)
+LIBDVBSI_VERSION = 0.3.9
+LIBDVBSI_DIR = libdvbsi++-$(LIBDVBSI_VERSION)
+LIBDVBSI_SOURCE = libdvbsi++-$(LIBDVBSI_VERSION).tar.bz2
+LIBDVBSI_SITE = https://github.com/mtdcr/libdvbsi/releases/download/$(LIBDVBSI_VERSION)
 
 $(DL_DIR)/$(LIBDVBSI_SOURCE):
 	$(DOWNLOAD) $(LIBDVBSI_SITE)/$(LIBDVBSI_SOURCE)
@@ -118,10 +118,10 @@ libdvbsi: $(DL_DIR)/$(LIBDVBSI_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBDVBCSA_VER    = git
-LIBDVBCSA_DIR    = libdvbcsa.$(LIBDVBCSA_VER)
-LIBDVBCSA_SOURCE = libdvbcsa.$(LIBDVBCSA_VER)
-LIBDVBCSA_SITE   = https://code.videolan.org/videolan
+LIBDVBCSA_VERSION = git
+LIBDVBCSA_DIR = libdvbcsa.$(LIBDVBCSA_VERSION)
+LIBDVBCSA_SOURCE = libdvbcsa.$(LIBDVBCSA_VERSION)
+LIBDVBCSA_SITE = https://code.videolan.org/videolan
 
 LIBDVBCSA_AUTORECONF = YES
 
@@ -139,10 +139,10 @@ libdvbcsa: | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-GIFLIB_VER    = 5.2.1
-GIFLIB_DIR    = giflib-$(GIFLIB_VER)
-GIFLIB_SOURCE = giflib-$(GIFLIB_VER).tar.gz
-GIFLIB_SITE   = https://sourceforge.net/projects/giflib/files
+GIFLIB_VERSION = 5.2.1
+GIFLIB_DIR = giflib-$(GIFLIB_VERSION)
+GIFLIB_SOURCE = giflib-$(GIFLIB_VERSION).tar.gz
+GIFLIB_SITE = https://sourceforge.net/projects/giflib/files
 
 $(DL_DIR)/$(GIFLIB_SOURCE):
 	$(DOWNLOAD) $(GIFLIB_SITE)/$(GIFLIB_SOURCE)
@@ -159,10 +159,10 @@ giflib: $(DL_DIR)/$(GIFLIB_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBCURL_VER    = 7.74.0
-LIBCURL_DIR    = curl-$(LIBCURL_VER)
-LIBCURL_SOURCE = curl-$(LIBCURL_VER).tar.bz2
-LIBCURL_SITE   = https://curl.haxx.se/download
+LIBCURL_VERSION = 7.74.0
+LIBCURL_DIR = curl-$(LIBCURL_VERSION)
+LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
+LIBCURL_SITE = https://curl.haxx.se/download
 
 $(DL_DIR)/$(LIBCURL_SOURCE):
 	$(DOWNLOAD) $(LIBCURL_SITE)/$(LIBCURL_SOURCE)
@@ -210,10 +210,10 @@ libcurl: $(LIBCURL_DEPS) $(DL_DIR)/$(LIBCURL_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBPNG_VER    = 1.6.37
-LIBPNG_DIR    = libpng-$(LIBPNG_VER)
-LIBPNG_SOURCE = libpng-$(LIBPNG_VER).tar.xz
-LIBPNG_SITE   = https://sourceforge.net/projects/libpng/files/libpng16/$(LIBPNG_VER)
+LIBPNG_VERSION = 1.6.37
+LIBPNG_DIR = libpng-$(LIBPNG_VERSION)
+LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz
+LIBPNG_SITE = https://sourceforge.net/projects/libpng/files/libpng16/$(LIBPNG_VERSION)
 
 $(DL_DIR)/$(LIBPNG_SOURCE):
 	$(DOWNLOAD) $(LIBPNG_SITE)/$(LIBPNG_SOURCE)
@@ -242,10 +242,10 @@ libpng: $(LIBPNG_DEPS) $(DL_DIR)/$(LIBPNG_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-FREETYPE_VER    = 2.10.4
-FREETYPE_DIR    = freetype-$(FREETYPE_VER)
-FREETYPE_SOURCE = freetype-$(FREETYPE_VER).tar.xz
-FREETYPE_SITE   = https://sourceforge.net/projects/freetype/files/freetype2/$(FREETYPE_VER)
+FREETYPE_VERSION = 2.10.4
+FREETYPE_DIR = freetype-$(FREETYPE_VERSION)
+FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.xz
+FREETYPE_SITE = https://sourceforge.net/projects/freetype/files/freetype2/$(FREETYPE_VERSION)
 
 $(DL_DIR)/$(FREETYPE_SOURCE):
 	$(DOWNLOAD) $(FREETYPE_SITE)/$(FREETYPE_SOURCE)
@@ -286,10 +286,10 @@ freetype: $(FREETYPE_DEPS) $(DL_DIR)/$(FREETYPE_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBJPEG_TURBO_VER    = 2.0.6
-LIBJPEG_TURBO_DIR    = libjpeg-turbo-$(LIBJPEG_TURBO_VER)
-LIBJPEG_TURBO_SOURCE = libjpeg-turbo-$(LIBJPEG_TURBO_VER).tar.gz
-LIBJPEG_TURBO_SITE   = https://sourceforge.net/projects/libjpeg-turbo/files/$(LIBJPEG_TURBO_VER)
+LIBJPEG_TURBO_VERSION = 2.0.6
+LIBJPEG_TURBO_DIR = libjpeg-turbo-$(LIBJPEG_TURBO_VERSION)
+LIBJPEG_TURBO_SOURCE = libjpeg-turbo-$(LIBJPEG_TURBO_VERSION).tar.gz
+LIBJPEG_TURBO_SITE = https://sourceforge.net/projects/libjpeg-turbo/files/$(LIBJPEG_TURBO_VERSION)
 
 $(DL_DIR)/$(LIBJPEG_TURBO_SOURCE):
 	$(DOWNLOAD) $(LIBJPEG_TURBO_SITE)/$(LIBJPEG_TURBO_SOURCE)
@@ -312,10 +312,10 @@ libjpeg-turbo: $(DL_DIR)/$(LIBJPEG_TURBO_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-OPENSSL_VER    = 1.0.2t
-OPENSSL_DIR    = openssl-$(OPENSSL_VER)
-OPENSSL_SOURCE = openssl-$(OPENSSL_VER).tar.gz
-OPENSSL_SITE   = https://www.openssl.org/source
+OPENSSL_VERSION = 1.0.2t
+OPENSSL_DIR = openssl-$(OPENSSL_VERSION)
+OPENSSL_SOURCE = openssl-$(OPENSSL_VERSION).tar.gz
+OPENSSL_SITE = https://www.openssl.org/source
 
 $(DL_DIR)/$(OPENSSL_SOURCE):
 	$(DOWNLOAD) $(OPENSSL_SITE)/$(OPENSSL_SOURCE)
@@ -379,10 +379,10 @@ endif
 
 # -----------------------------------------------------------------------------
 
-NCURSES_VER    = 6.1
-NCURSES_DIR    = ncurses-$(NCURSES_VER)
-NCURSES_SOURCE = ncurses-$(NCURSES_VER).tar.gz
-NCURSES_SITE   = $(GNU_MIRROR)/ncurses
+NCURSES_VERSION = 6.1
+NCURSES_DIR = ncurses-$(NCURSES_VERSION)
+NCURSES_SOURCE = ncurses-$(NCURSES_VERSION).tar.gz
+NCURSES_SITE = $(GNU_MIRROR)/ncurses
 
 $(DL_DIR)/$(NCURSES_SOURCE):
 	$(DOWNLOAD) $(NCURSES_SITE)/$(NCURSES_SOURCE)
@@ -437,10 +437,10 @@ openthreads: $(SOURCE_DIR)/$(NI_OPENTHREADS) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBUSB_VER    = 1.0.23
-LIBUSB_DIR    = libusb-$(LIBUSB_VER)
-LIBUSB_SOURCE = libusb-$(LIBUSB_VER).tar.bz2
-LIBUSB_SITE   = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VER)
+LIBUSB_VERSION = 1.0.23
+LIBUSB_DIR = libusb-$(LIBUSB_VERSION)
+LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2
+LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VERSION)
 
 $(DL_DIR)/$(LIBUSB_SOURCE):
 	$(DOWNLOAD) $(LIBUSB_SITE)/$(LIBUSB_SOURCE)
@@ -461,10 +461,10 @@ libusb: $(DL_DIR)/$(LIBUSB_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBUSB_COMPAT_VER    = 0.1.7
-LIBUSB_COMPAT_DIR    = libusb-compat-$(LIBUSB_COMPAT_VER)
-LIBUSB_COMPAT_SOURCE = libusb-compat-$(LIBUSB_COMPAT_VER).tar.bz2
-LIBUSB_COMPAT_SITE   = https://github.com/libusb/libusb-compat-0.1/releases/download/v$(LIBUSB_COMPAT_VER)
+LIBUSB_COMPAT_VERSION = 0.1.7
+LIBUSB_COMPAT_DIR = libusb-compat-$(LIBUSB_COMPAT_VERSION)
+LIBUSB_COMPAT_SOURCE = libusb-compat-$(LIBUSB_COMPAT_VERSION).tar.bz2
+LIBUSB_COMPAT_SITE = https://github.com/libusb/libusb-compat-0.1/releases/download/v$(LIBUSB_COMPAT_VERSION)
 
 $(DL_DIR)/$(LIBUSB_COMPAT_SOURCE):
 	$(DOWNLOAD) $(LIBUSB_COMPAT_SITE)/$(LIBUSB_COMPAT_SOURCE)
@@ -488,10 +488,10 @@ libusb-compat: $(LIBUSB_COMPAT_DEPS) $(DL_DIR)/$(LIBUSB_COMPAT_SOURCE) | $(TARGE
 
 # -----------------------------------------------------------------------------
 
-LIBGD_VER    = 2.2.5
-LIBGD_DIR    = libgd-$(LIBGD_VER)
-LIBGD_SOURCE = libgd-$(LIBGD_VER).tar.xz
-LIBGD_SITE   = https://github.com/libgd/libgd/releases/download/gd-$(LIBGD_VER)
+LIBGD_VERSION = 2.2.5
+LIBGD_DIR = libgd-$(LIBGD_VERSION)
+LIBGD_SOURCE = libgd-$(LIBGD_VERSION).tar.xz
+LIBGD_SITE = https://github.com/libgd/libgd/releases/download/gd-$(LIBGD_VERSION)
 
 $(DL_DIR)/$(LIBGD_SOURCE):
 	$(DOWNLOAD) $(LIBGD_SITE)/$(LIBGD_SOURCE)
@@ -517,10 +517,10 @@ libgd: $(LIBGD_DEPS) $(DL_DIR)/$(LIBGD_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBDPF_VER    = git
-LIBDPF_DIR    = dpf-ax.$(LIBDPF_VER)
-LIBDPF_SOURCE = dpf-ax.$(LIBDPF_VER)
-LIBDPF_SITE   = $(GITHUB)/MaxWiesel
+LIBDPF_VERSION = git
+LIBDPF_DIR = dpf-ax.$(LIBDPF_VERSION)
+LIBDPF_SOURCE = dpf-ax.$(LIBDPF_VERSION)
+LIBDPF_SITE = $(GITHUB)/MaxWiesel
 
 LIBDPF_DEPS = libusb-compat
 
@@ -543,10 +543,10 @@ libdpf: $(LIBDPF_DEPS) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LZO_VER    = 2.10
-LZO_DIR    = lzo-$(LZO_VER)
-LZO_SOURCE = lzo-$(LZO_VER).tar.gz
-LZO_SITE   = https://www.oberhumer.com/opensource/lzo/download
+LZO_VERSION = 2.10
+LZO_DIR = lzo-$(LZO_VERSION)
+LZO_SOURCE = lzo-$(LZO_VERSION).tar.gz
+LZO_SITE = https://www.oberhumer.com/opensource/lzo/download
 
 $(DL_DIR)/$(LZO_SOURCE):
 	$(DOWNLOAD) $(LZO_SITE)/$(LZO_SOURCE)
@@ -564,10 +564,10 @@ lzo: $(DL_DIR)/$(LZO_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBSIGC_VER    = 2.10.3
-LIBSIGC_DIR    = libsigc++-$(LIBSIGC_VER)
-LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VER).tar.xz
-LIBSIGC_SITE   = https://download.gnome.org/sources/libsigc++/$(basename $(LIBSIGC_VER))
+LIBSIGC_VERSION = 2.10.3
+LIBSIGC_DIR = libsigc++-$(LIBSIGC_VERSION)
+LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VERSION).tar.xz
+LIBSIGC_SITE = https://download.gnome.org/sources/libsigc++/$(basename $(LIBSIGC_VERSION))
 
 $(DL_DIR)/$(LIBSIGC_SOURCE):
 	$(DOWNLOAD) $(LIBSIGC_SITE)/$(LIBSIGC_SOURCE)
@@ -593,10 +593,10 @@ libsigc: $(DL_DIR)/$(LIBSIGC_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-EXPAT_VER    = 2.2.9
-EXPAT_DIR    = expat-$(EXPAT_VER)
-EXPAT_SOURCE = expat-$(EXPAT_VER).tar.bz2
-EXPAT_SITE   = https://sourceforge.net/projects/expat/files/expat/$(EXPAT_VER)
+EXPAT_VERSION = 2.2.9
+EXPAT_DIR = expat-$(EXPAT_VERSION)
+EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.bz2
+EXPAT_SITE = https://sourceforge.net/projects/expat/files/expat/$(EXPAT_VERSION)
 
 $(DL_DIR)/$(EXPAT_SOURCE):
 	$(DOWNLOAD) $(EXPAT_SITE)/$(EXPAT_SOURCE)
@@ -622,10 +622,10 @@ expat: $(DL_DIR)/$(EXPAT_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBBLURAY_VER    = 0.9.3
-LIBBLURAY_DIR    = libbluray-$(LIBBLURAY_VER)
-LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VER).tar.bz2
-LIBBLURAY_SITE   = ftp.videolan.org/pub/videolan/libbluray/$(LIBBLURAY_VER)
+LIBBLURAY_VERSION = 0.9.3
+LIBBLURAY_DIR = libbluray-$(LIBBLURAY_VERSION)
+LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VERSION).tar.bz2
+LIBBLURAY_SITE = ftp.videolan.org/pub/videolan/libbluray/$(LIBBLURAY_VERSION)
 
 $(DL_DIR)/$(LIBBLURAY_SOURCE):
 	$(DOWNLOAD) $(LIBBLURAY_SITE)/$(LIBBLURAY_SOURCE)
@@ -664,10 +664,10 @@ libbluray: $(LIBBLURAY_DEPS) $(DL_DIR)/$(LIBBLURAY_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBASS_VER    = 0.14.0
-LIBASS_DIR    = libass-$(LIBASS_VER)
-LIBASS_SOURCE = libass-$(LIBASS_VER).tar.xz
-LIBASS_SITE   = https://github.com/libass/libass/releases/download/$(LIBASS_VER)
+LIBASS_VERSION = 0.14.0
+LIBASS_DIR = libass-$(LIBASS_VERSION)
+LIBASS_SOURCE = libass-$(LIBASS_VERSION).tar.xz
+LIBASS_SITE = https://github.com/libass/libass/releases/download/$(LIBASS_VERSION)
 
 $(DL_DIR)/$(LIBASS_SOURCE):
 	$(DOWNLOAD) $(LIBASS_SITE)/$(LIBASS_SOURCE)
@@ -695,10 +695,10 @@ libass: $(LIBASS_DEPS) $(DL_DIR)/$(LIBASS_SOURCE) | $(TARGET_DIR)
 	
 # -----------------------------------------------------------------------------
 
-LIBGPG_ERROR_VER    = 1.37
-LIBGPG_ERROR_DIR    = libgpg-error-$(LIBGPG_ERROR_VER)
-LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VER).tar.bz2
-LIBGPG_ERROR_SITE   = ftp://ftp.gnupg.org/gcrypt/libgpg-error
+LIBGPG_ERROR_VERSION = 1.37
+LIBGPG_ERROR_DIR = libgpg-error-$(LIBGPG_ERROR_VERSION)
+LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2
+LIBGPG_ERROR_SITE = ftp://ftp.gnupg.org/gcrypt/libgpg-error
 
 $(DL_DIR)/$(LIBGPG_ERROR_SOURCE):
 	$(DOWNLOAD) $(LIBGPG_ERROR_SITE)/$(LIBGPG_ERROR_SOURCE)
@@ -735,10 +735,10 @@ libgpg-error: $(DL_DIR)/$(LIBGPG_ERROR_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBGCRYPT_VER    = 1.8.5
-LIBGCRYPT_DIR    = libgcrypt-$(LIBGCRYPT_VER)
-LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VER).tar.gz
-LIBGCRYPT_SITE   = ftp://ftp.gnupg.org/gcrypt/libgcrypt
+LIBGCRYPT_VERSION = 1.8.5
+LIBGCRYPT_DIR = libgcrypt-$(LIBGCRYPT_VERSION)
+LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.gz
+LIBGCRYPT_SITE = ftp://ftp.gnupg.org/gcrypt/libgcrypt
 
 $(DL_DIR)/$(LIBGCRYPT_SOURCE):
 	$(DOWNLOAD) $(LIBGCRYPT_SITE)/$(LIBGCRYPT_SOURCE)
@@ -770,10 +770,10 @@ libgcrypt: $(LIBGCRYPT_DEPS) $(DL_DIR)/$(LIBGCRYPT_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBAACS_VER    = 0.9.0
-LIBAACS_DIR    = libaacs-$(LIBAACS_VER)
-LIBAACS_SOURCE = libaacs-$(LIBAACS_VER).tar.bz2
-LIBAACS_SITE   = ftp://ftp.videolan.org/pub/videolan/libaacs/$(LIBAACS_VER)
+LIBAACS_VERSION = 0.9.0
+LIBAACS_DIR = libaacs-$(LIBAACS_VERSION)
+LIBAACS_SOURCE = libaacs-$(LIBAACS_VERSION).tar.bz2
+LIBAACS_SITE = ftp://ftp.videolan.org/pub/videolan/libaacs/$(LIBAACS_VERSION)
 
 $(DL_DIR)/$(LIBAACS_SOURCE):
 	$(DOWNLOAD) $(LIBAACS_SITE)/$(LIBAACS_SOURCE)
@@ -802,10 +802,10 @@ libaacs: $(LIBAACS_DEPS) $(DL_DIR)/$(LIBAACS_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBBDPLUS_VER    = 0.1.2
-LIBBDPLUS_DIR    = libbdplus-$(LIBBDPLUS_VER)
-LIBBDPLUS_SOURCE = libbdplus-$(LIBBDPLUS_VER).tar.bz2
-LIBBDPLUS_SITE   = ftp://ftp.videolan.org/pub/videolan/libbdplus/$(LIBBDPLUS_VER)
+LIBBDPLUS_VERSION = 0.1.2
+LIBBDPLUS_DIR = libbdplus-$(LIBBDPLUS_VERSION)
+LIBBDPLUS_SOURCE = libbdplus-$(LIBBDPLUS_VERSION).tar.bz2
+LIBBDPLUS_SITE = ftp://ftp.videolan.org/pub/videolan/libbdplus/$(LIBBDPLUS_VERSION)
 
 $(DL_DIR)/$(LIBBDPLUS_SOURCE):
 	$(DOWNLOAD) $(LIBBDPLUS_SITE)/$(LIBBDPLUS_SOURCE)
@@ -834,10 +834,10 @@ libbdplus: $(LIBBDPLUS_DEPS) $(DL_DIR)/$(LIBBDPLUS_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBXML2_VER    = 2.9.10
-LIBXML2_DIR    = libxml2-$(LIBXML2_VER)
-LIBXML2_SOURCE = libxml2-$(LIBXML2_VER).tar.gz
-LIBXML2_SITE   = http://xmlsoft.org/sources
+LIBXML2_VERSION = 2.9.10
+LIBXML2_DIR = libxml2-$(LIBXML2_VERSION)
+LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.gz
+LIBXML2_SITE = http://xmlsoft.org/sources
 
 $(DL_DIR)/$(LIBXML2_SOURCE):
 	$(DOWNLOAD) $(LIBXML2_SITE)/$(LIBXML2_SOURCE)
@@ -875,10 +875,10 @@ libxml2: $(DL_DIR)/$(LIBXML2_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-PUGIXML_VER    = 1.11.1
-PUGIXML_DIR    = pugixml-$(PUGIXML_VER)
-PUGIXML_SOURCE = pugixml-$(PUGIXML_VER).tar.gz
-PUGIXML_SITE   = https://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VER)
+PUGIXML_VERSION = 1.11.1
+PUGIXML_DIR = pugixml-$(PUGIXML_VERSION)
+PUGIXML_SOURCE = pugixml-$(PUGIXML_VERSION).tar.gz
+PUGIXML_SITE = https://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION)
 
 $(DL_DIR)/$(PUGIXML_SOURCE):
 	$(DOWNLOAD) $(PUGIXML_SITE)/$(PUGIXML_SOURCE)
@@ -897,10 +897,10 @@ pugixml: $(DL_DIR)/$(PUGIXML_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBROXML_VER    = 3.0.2
-LIBROXML_DIR    = libroxml-$(LIBROXML_VER)
-LIBROXML_SOURCE = libroxml-$(LIBROXML_VER).tar.gz
-LIBROXML_SITE   = http://download.libroxml.net/pool/v3.x
+LIBROXML_VERSION = 3.0.2
+LIBROXML_DIR = libroxml-$(LIBROXML_VERSION)
+LIBROXML_SOURCE = libroxml-$(LIBROXML_VERSION).tar.gz
+LIBROXML_SITE = http://download.libroxml.net/pool/v3.x
 
 $(DL_DIR)/$(LIBROXML_SOURCE):
 	$(DOWNLOAD) $(LIBROXML_SITE)/$(LIBROXML_SOURCE)
@@ -921,10 +921,10 @@ libroxml: $(DL_DIR)/$(LIBROXML_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBXSLT_VER    = 1.1.34
-LIBXSLT_DIR    = libxslt-$(LIBXSLT_VER)
-LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VER).tar.gz
-LIBXSLT_SITE   = ftp://xmlsoft.org/libxml2
+LIBXSLT_VERSION = 1.1.34
+LIBXSLT_DIR = libxslt-$(LIBXSLT_VERSION)
+LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.gz
+LIBXSLT_SITE = ftp://xmlsoft.org/libxml2
 
 $(DL_DIR)/$(LIBXSLT_SOURCE):
 	$(DOWNLOAD) $(LIBXSLT_SITE)/$(LIBXSLT_SOURCE)
@@ -981,10 +981,10 @@ rtmpdump: $(RTMPDUMP_DEPS) $(SOURCE_DIR)/$(NI_RTMPDUMP) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBTIRPC_VER    = 1.2.6
-LIBTIRPC_DIR    = libtirpc-$(LIBTIRPC_VER)
-LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VER).tar.bz2
-LIBTIRPC_SITE   = https://sourceforge.net/projects/libtirpc/files/libtirpc/$(LIBTIRPC_VER)
+LIBTIRPC_VERSION = 1.2.6
+LIBTIRPC_DIR = libtirpc-$(LIBTIRPC_VERSION)
+LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2
+LIBTIRPC_SITE = https://sourceforge.net/projects/libtirpc/files/libtirpc/$(LIBTIRPC_VERSION)
 
 $(DL_DIR)/$(LIBTIRPC_SOURCE):
 	$(DOWNLOAD) $(LIBTIRPC_SITE)/$(LIBTIRPC_SOURCE)
@@ -1012,10 +1012,10 @@ endif
 
 # -----------------------------------------------------------------------------
 
-CONFUSE_VER    = 3.2.2
-CONFUSE_DIR    = confuse-$(CONFUSE_VER)
-CONFUSE_SOURCE = confuse-$(CONFUSE_VER).tar.xz
-CONFUSE_SITE   = https://github.com/martinh/libconfuse/releases/download/v$(CONFUSE_VER)
+CONFUSE_VERSION = 3.2.2
+CONFUSE_DIR = confuse-$(CONFUSE_VERSION)
+CONFUSE_SOURCE = confuse-$(CONFUSE_VERSION).tar.xz
+CONFUSE_SITE = https://github.com/martinh/libconfuse/releases/download/v$(CONFUSE_VERSION)
 
 $(DL_DIR)/$(CONFUSE_SOURCE):
 	$(DOWNLOAD) $(CONFUSE_SITE)/$(CONFUSE_SOURCE)
@@ -1038,10 +1038,10 @@ confuse: $(DL_DIR)/$(CONFUSE_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBITE_VER    = 2.0.2
-LIBITE_DIR    = libite-$(LIBITE_VER)
-LIBITE_SOURCE = libite-$(LIBITE_VER).tar.xz
-LIBITE_SITE   = https://github.com/troglobit/libite/releases/download/v$(LIBITE_VER)
+LIBITE_VERSION = 2.0.2
+LIBITE_DIR = libite-$(LIBITE_VERSION)
+LIBITE_SOURCE = libite-$(LIBITE_VERSION).tar.xz
+LIBITE_SITE = https://github.com/troglobit/libite/releases/download/v$(LIBITE_VERSION)
 
 $(DL_DIR)/$(LIBITE_SOURCE):
 	$(DOWNLOAD) $(LIBITE_SITE)/$(LIBITE_SOURCE)
@@ -1064,10 +1064,10 @@ libite: $(DL_DIR)/$(LIBITE_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBMAD_VER    = 0.15.1b
-LIBMAD_DIR    = libmad-$(LIBMAD_VER)
-LIBMAD_SOURCE = libmad-$(LIBMAD_VER).tar.gz
-LIBMAD_SITE   = https://sourceforge.net/projects/mad/files/libmad/$(LIBMAD_VER)
+LIBMAD_VERSION = 0.15.1b
+LIBMAD_DIR = libmad-$(LIBMAD_VERSION)
+LIBMAD_SOURCE = libmad-$(LIBMAD_VERSION).tar.gz
+LIBMAD_SITE = https://sourceforge.net/projects/mad/files/libmad/$(LIBMAD_VERSION)
 
 $(DL_DIR)/$(LIBMAD_SOURCE):
 	$(DOWNLOAD) $(LIBMAD_SITE)/$(LIBMAD_SOURCE)
@@ -1094,10 +1094,10 @@ libmad: $(DL_DIR)/$(LIBMAD_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBVORBIS_VER    = 1.3.7
-LIBVORBIS_DIR    = libvorbis-$(LIBVORBIS_VER)
-LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VER).tar.xz
-LIBVORBIS_SITE   = https://downloads.xiph.org/releases/vorbis
+LIBVORBIS_VERSION = 1.3.7
+LIBVORBIS_DIR = libvorbis-$(LIBVORBIS_VERSION)
+LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.xz
+LIBVORBIS_SITE = https://downloads.xiph.org/releases/vorbis
 
 $(DL_DIR)/$(LIBVORBIS_SOURCE):
 	$(DOWNLOAD) $(LIBVORBIS_SITE)/$(LIBVORBIS_SOURCE)
@@ -1126,10 +1126,10 @@ libvorbis: $(LIBVORBIS_DEPS) $(DL_DIR)/$(LIBVORBIS_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBVORBISIDEC_VER    = 1.2.1+git20180316
-LIBVORBISIDEC_DIR    = libvorbisidec-$(LIBVORBISIDEC_VER)
-LIBVORBISIDEC_SOURCE = libvorbisidec_$(LIBVORBISIDEC_VER).orig.tar.gz
-LIBVORBISIDEC_SITE   = https://ftp.de.debian.org/debian/pool/main/libv/libvorbisidec
+LIBVORBISIDEC_VERSION = 1.2.1+git20180316
+LIBVORBISIDEC_DIR = libvorbisidec-$(LIBVORBISIDEC_VERSION)
+LIBVORBISIDEC_SOURCE = libvorbisidec_$(LIBVORBISIDEC_VERSION).orig.tar.gz
+LIBVORBISIDEC_SITE = https://ftp.de.debian.org/debian/pool/main/libv/libvorbisidec
 
 $(DL_DIR)/$(LIBVORBISIDEC_SOURCE):
 	$(DOWNLOAD) $(LIBVORBISIDEC_SITE)/$(LIBVORBISIDEC_SOURCE)
@@ -1152,10 +1152,10 @@ libvorbisidec: $(LIBVORBISIDEC_DEPS) $(DL_DIR)/$(LIBVORBISIDEC_SOURCE) | $(TARGE
 
 # -----------------------------------------------------------------------------
 
-LIBOGG_VER    = 1.3.4
-LIBOGG_DIR    = libogg-$(LIBOGG_VER)
-LIBOGG_SOURCE = libogg-$(LIBOGG_VER).tar.gz
-LIBOGG_SITE   = http://downloads.xiph.org/releases/ogg
+LIBOGG_VERSION = 1.3.4
+LIBOGG_DIR = libogg-$(LIBOGG_VERSION)
+LIBOGG_SOURCE = libogg-$(LIBOGG_VERSION).tar.gz
+LIBOGG_SITE = http://downloads.xiph.org/releases/ogg
 
 $(DL_DIR)/$(LIBOGG_SOURCE):
 	$(DOWNLOAD) $(LIBOGG_SITE)/$(LIBOGG_SOURCE)
@@ -1177,10 +1177,10 @@ libogg: $(DL_DIR)/$(LIBOGG_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBEXIF_VER    = 0.6.22
-LIBEXIF_DIR    = libexif-$(LIBEXIF_VER)
-LIBEXIF_SOURCE = libexif-$(LIBEXIF_VER).tar.xz
-LIBEXIF_SITE   = https://github.com/libexif/libexif/releases/download/libexif-$(subst .,_,$(LIBEXIF_VER))-release
+LIBEXIF_VERSION = 0.6.22
+LIBEXIF_DIR = libexif-$(LIBEXIF_VERSION)
+LIBEXIF_SOURCE = libexif-$(LIBEXIF_VERSION).tar.xz
+LIBEXIF_SITE = https://github.com/libexif/libexif/releases/download/libexif-$(subst .,_,$(LIBEXIF_VERSION))-release
 
 $(DL_DIR)/$(LIBEXIF_SOURCE):
 	$(DOWNLOAD) $(LIBEXIF_SITE)/$(LIBEXIF_SOURCE)
@@ -1203,10 +1203,10 @@ libexif: $(DL_DIR)/$(LIBEXIF_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-FRIBIDI_VER    = 1.0.10
-FRIBIDI_DIR    = fribidi-$(FRIBIDI_VER)
-FRIBIDI_SOURCE = fribidi-$(FRIBIDI_VER).tar.xz
-FRIBIDI_SITE   = https://github.com/fribidi/fribidi/releases/download/v$(FRIBIDI_VER)
+FRIBIDI_VERSION = 1.0.10
+FRIBIDI_DIR = fribidi-$(FRIBIDI_VERSION)
+FRIBIDI_SOURCE = fribidi-$(FRIBIDI_VERSION).tar.xz
+FRIBIDI_SITE = https://github.com/fribidi/fribidi/releases/download/v$(FRIBIDI_VERSION)
 
 $(DL_DIR)/$(FRIBIDI_SOURCE):
 	$(DOWNLOAD) $(FRIBIDI_SITE)/$(FRIBIDI_SOURCE)
@@ -1228,10 +1228,10 @@ fribidi: $(DL_DIR)/$(FRIBIDI_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBFFI_VER    = 3.3
-LIBFFI_DIR    = libffi-$(LIBFFI_VER)
-LIBFFI_SOURCE = libffi-$(LIBFFI_VER).tar.gz
-LIBFFI_SITE   = https://github.com/libffi/libffi/releases/download/v$(HOST_LIBFFI_VER)
+LIBFFI_VERSION = 3.3
+LIBFFI_DIR = libffi-$(LIBFFI_VERSION)
+LIBFFI_SOURCE = libffi-$(LIBFFI_VERSION).tar.gz
+LIBFFI_SITE = https://github.com/libffi/libffi/releases/download/v$(HOST_LIBFFI_VERSION)
 
 $(DL_DIR)/$(LIBFFI_SOURCE):
 	$(DOWNLOAD) $(LIBFFI_SITE)/$(LIBFFI_SOURCE)
@@ -1256,10 +1256,10 @@ libffi: $(DL_DIR)/$(LIBFFI_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-GLIB2_VER    = 2.56.3
-GLIB2_DIR    = glib-$(GLIB2_VER)
-GLIB2_SOURCE = glib-$(GLIB2_VER).tar.xz
-GLIB2_SITE   = https://ftp.gnome.org/pub/gnome/sources/glib/$(basename $(GLIB2_VER))
+GLIB2_VERSION = 2.56.3
+GLIB2_DIR = glib-$(GLIB2_VERSION)
+GLIB2_SOURCE = glib-$(GLIB2_VERSION).tar.xz
+GLIB2_SITE = https://ftp.gnome.org/pub/gnome/sources/glib/$(basename $(GLIB2_VERSION))
 
 $(DL_DIR)/$(GLIB2_SOURCE):
 	$(DOWNLOAD) $(GLIB2_SITE)/$(GLIB2_SOURCE)
@@ -1312,10 +1312,10 @@ glib2: $(GLIB2_DEPS) $(DL_DIR)/$(GLIB2_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-ALSA_LIB_VER    = 1.2.4
-ALSA_LIB_DIR    = alsa-lib-$(ALSA_LIB_VER)
-ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VER).tar.bz2
-ALSA_LIB_SITE   = https://www.alsa-project.org/files/pub/lib
+ALSA_LIB_VERSION = 1.2.4
+ALSA_LIB_DIR = alsa-lib-$(ALSA_LIB_VERSION)
+ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
+ALSA_LIB_SITE = https://www.alsa-project.org/files/pub/lib
 
 $(DL_DIR)/$(ALSA_LIB_SOURCE):
 	$(DOWNLOAD) $(ALSA_LIB_SITE)/$(ALSA_LIB_SOURCE)
@@ -1356,10 +1356,10 @@ alsa-lib: $(DL_DIR)/$(ALSA_LIB_SOURCE)
 
 # -----------------------------------------------------------------------------
 
-POPT_VER    = 1.16
-POPT_DIR    = popt-$(POPT_VER)
-POPT_SOURCE = popt-$(POPT_VER).tar.gz
-POPT_SITE   = ftp://anduin.linuxfromscratch.org/BLFS/popt
+POPT_VERSION = 1.16
+POPT_DIR = popt-$(POPT_VERSION)
+POPT_SOURCE = popt-$(POPT_VERSION).tar.gz
+POPT_SITE = ftp://anduin.linuxfromscratch.org/BLFS/popt
 
 $(DL_DIR)/$(POPT_SOURCE):
 	$(DOWNLOAD) $(POPT_SITE)/$(POPT_SOURCE)
@@ -1380,10 +1380,10 @@ popt: $(DL_DIR)/$(POPT_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBICONV_VER    = 1.15
-LIBICONV_DIR    = libiconv-$(LIBICONV_VER)
-LIBICONV_SOURCE = libiconv-$(LIBICONV_VER).tar.gz
-LIBICONV_SITE   = $(GNU_MIRROR)/libiconv
+LIBICONV_VERSION = 1.15
+LIBICONV_DIR = libiconv-$(LIBICONV_VERSION)
+LIBICONV_SOURCE = libiconv-$(LIBICONV_VERSION).tar.gz
+LIBICONV_SITE = $(GNU_MIRROR)/libiconv
 
 $(DL_DIR)/$(LIBICONV_SOURCE):
 	$(DOWNLOAD) $(LIBICONV_SITE)/$(LIBICONV_SOURCE)
@@ -1411,10 +1411,10 @@ libiconv: $(DL_DIR)/$(LIBICONV_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-GRAPHLCD_BASE_VER    = git
-GRAPHLCD_BASE_DIR    = graphlcd-base.$(GRAPHLCD_BASE_VER)
-GRAPHLCD_BASE_SOURCE = graphlcd-base.$(GRAPHLCD_BASE_VER)
-GRAPHLCD_BASE_SITE   = git://projects.vdr-developer.org
+GRAPHLCD_BASE_VERSION = git
+GRAPHLCD_BASE_DIR = graphlcd-base.$(GRAPHLCD_BASE_VERSION)
+GRAPHLCD_BASE_SOURCE = graphlcd-base.$(GRAPHLCD_BASE_VERSION)
+GRAPHLCD_BASE_SITE = git://projects.vdr-developer.org
 
 GRAPHLCD_BASE_PATCH  = graphlcd.patch
 GRAPHLCD_BASE_PATCH += 0003-strip-graphlcd-conf.patch
diff --git a/make/target-lua.mk b/make/target-lua.mk
index 6a298037..fbaa7521 100644
--- a/make/target-lua.mk
+++ b/make/target-lua.mk
@@ -3,11 +3,11 @@
 #
 # -----------------------------------------------------------------------------
 
-LUA_ABIVER = 5.2
-LUA_VER    = 5.2.4
-LUA_DIR    = lua-$(LUA_VER)
-LUA_SOURCE = lua-$(LUA_VER).tar.gz
-LUA_SITE   = https://www.lua.org
+LUA_ABIVERSION = 5.2
+LUA_VERSION = 5.2.4
+LUA_DIR = lua-$(LUA_VERSION)
+LUA_SOURCE = lua-$(LUA_VERSION).tar.gz
+LUA_SITE = https://www.lua.org
 
 $(DL_DIR)/$(LUA_SOURCE):
 	$(DOWNLOAD) $(LUA_SITE)/ftp/$(LUA_SOURCE)
@@ -20,7 +20,7 @@ lua: $(LUA_DEPS) $(DL_DIR)/$(LUA_SOURCE) | $(TARGET_DIR)
 	$(CHDIR)/$(LUA_DIR); \
 		$(APPLY_PATCHES); \
 		$(MAKE) linux \
-			PKG_VERSION=$(LUA_VER) \
+			PKG_VERSION=$(LUA_VERSION) \
 			$(TARGET_MAKE_OPTS) \
 			AR="$(TARGET_AR) rcu" \
 			LDFLAGS="$(TARGET_LDFLAGS)" \
@@ -33,13 +33,13 @@ lua: $(LUA_DEPS) $(DL_DIR)/$(LUA_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LUAEXPAT_VER    = 1.3.3
-LUAEXPAT_DIR    = luaexpat-$(LUAEXPAT_VER)
-LUAEXPAT_SOURCE = luaexpat-$(LUAEXPAT_VER).tar.gz
-LUAEXPAT_SITE   = https://github.com/tomasguisasola/luaexpat/archive
+LUAEXPAT_VERSION = 1.3.3
+LUAEXPAT_DIR = luaexpat-$(LUAEXPAT_VERSION)
+LUAEXPAT_SOURCE = luaexpat-$(LUAEXPAT_VERSION).tar.gz
+LUAEXPAT_SITE = https://github.com/tomasguisasola/luaexpat/archive
 
 $(DL_DIR)/$(LUAEXPAT_SOURCE):
-	$(DOWNLOAD) $(LUAEXPAT_SITE)/v$(LUAEXPAT_VER).tar.gz -O $(@)
+	$(DOWNLOAD) $(LUAEXPAT_SITE)/v$(LUAEXPAT_VERSION).tar.gz -O $(@)
 
 LUAEXPAT_DEPS = expat lua
 
@@ -48,7 +48,7 @@ LUAEXPAT_MAKE_ENV = \
 
 LUAEXPAT_MAKE_OPTS = \
 	PREFIX=$(TARGET_prefix) \
-	LUA_SYS_VER=$(LUA_ABIVER)
+	LUA_SYS_VER=$(LUA_ABIVERSION)
 
 luaexpat: $(LUAEXPAT_DEPS) $(DL_DIR)/$(LUAEXPAT_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(PKG_DIR)
@@ -64,13 +64,13 @@ luaexpat: $(LUAEXPAT_DEPS) $(DL_DIR)/$(LUAEXPAT_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LUA_FEEDPARSER_VER    = 0.71
-LUA_FEEDPARSER_DIR    = lua-feedparser-$(LUA_FEEDPARSER_VER)
-LUA_FEEDPARSER_SOURCE = lua-feedparser-$(LUA_FEEDPARSER_VER).tar.gz
-LUA_FEEDPARSER_SITE   = https://github.com/slact/lua-feedparser/archive
+LUA_FEEDPARSER_VERSION = 0.71
+LUA_FEEDPARSER_DIR = lua-feedparser-$(LUA_FEEDPARSER_VERSION)
+LUA_FEEDPARSER_SOURCE = lua-feedparser-$(LUA_FEEDPARSER_VERSION).tar.gz
+LUA_FEEDPARSER_SITE = https://github.com/slact/lua-feedparser/archive
 
 $(DL_DIR)/$(LUA_FEEDPARSER_SOURCE):
-	$(DOWNLOAD) $(LUA_FEEDPARSER_SITE)/$(LUA_FEEDPARSER_VER).tar.gz -O $(@)
+	$(DOWNLOAD) $(LUA_FEEDPARSER_SITE)/$(LUA_FEEDPARSER_VERSION).tar.gz -O $(@)
 
 LUA_FEEDPARSER_DEPS = luaexpat
 
@@ -87,7 +87,7 @@ lua-feedparser: $(LUA-DEEDPARSER_DEPS) $(DL_DIR)/$(LUA_FEEDPARSER_SOURCE) | $(TA
 # -----------------------------------------------------------------------------
 
 LUAJSON_SOURCE = JSON.lua
-LUAJSON_SITE   = http://regex.info/code
+LUAJSON_SITE = http://regex.info/code
 
 $(DL_DIR)/$(LUAJSON_SOURCE):
 	$(DOWNLOAD) $(LUAJSON_SITE)/$(LUAJSON_SOURCE)
@@ -95,29 +95,29 @@ $(DL_DIR)/$(LUAJSON_SOURCE):
 luajson: $(DL_DIR)/$(LUAJSON_SOURCE) | $(TARGET_DIR)
 	$(CD) $(DL_DIR); \
 		curl --remote-name --time-cond $(PKG_SOURCE) $(PKG_SITE)/$(PKG_SOURCE) || true
-	$(INSTALL_DATA) -D $(DL_DIR)/$(PKG_SOURCE) $(TARGET_datadir)/lua/$(LUA_ABIVER)
-	ln -sf $(PKG_SOURCE) $(TARGET_datadir)/lua/$(LUA_ABIVER)/json.lua
+	$(INSTALL_DATA) -D $(DL_DIR)/$(PKG_SOURCE) $(TARGET_datadir)/lua/$(LUA_ABIVERSION)
+	ln -sf $(PKG_SOURCE) $(TARGET_datadir)/lua/$(LUA_ABIVERSION)/json.lua
 	$(TOUCH)
 
 # -----------------------------------------------------------------------------
 
-LUACURL_VER    = git
-LUACURL_DIR    = lua-curlv3.$(LUACURL_VER)
-LUACURL_SOURCE = lua-curlv3.$(LUACURL_VER)
-LUACURL_SITE   = https://github.com/lua-curl/$(LUACURL_SOURCE)
+LUA_CURL_VERSION = git
+LUA_CURL_DIR = lua-curlv3.$(LUA_CURL_VERSION)
+LUA_CURL_SOURCE = lua-curlv3.$(LUA_CURL_VERSION)
+LUA_CURL_SITE = https://github.com/lua-curl/$(LUA_CURL_SOURCE)
 
-LUACURL_DEPS = libcurl lua
+LUA_CURL_DEPS = libcurl lua
 
-LUACURL_MAKE_ENV = \
+LUA_CURL_MAKE_ENV = \
 	$(TARGET_CONFIGURE_ENV)
 
-LUACURL_MAKE_OPTS = \
+LUA_CURL_MAKE_OPTS = \
 	LIBDIR=$(TARGET_libdir) \
 	LUA_INC=$(TARGET_includedir) \
-	LUA_CMOD=$(libdir)/lua/$(LUA_ABIVER) \
-	LUA_LMOD=$(datadir)/lua/$(LUA_ABIVER)
+	LUA_CMOD=$(libdir)/lua/$(LUA_ABIVERSION) \
+	LUA_LMOD=$(datadir)/lua/$(LUA_ABIVERSION)
 
-luacurl: $(LUACURL_DEPS) | $(TARGET_DIR)
+lua-curl: $(LUA_CURL_DEPS) | $(TARGET_DIR)
 	$(REMOVE)/$(PKG_DIR)
 	$(GET-GIT-SOURCE) $(PKG_SITE) $(DL_DIR)/$(PKG_SOURCE)
 	$(CPDIR)/$(PKG_SOURCE)
@@ -129,13 +129,13 @@ luacurl: $(LUACURL_DEPS) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LUAPOSIX_VER    = 31
-LUAPOSIX_DIR    = luaposix-$(LUAPOSIX_VER)
-LUAPOSIX_SOURCE = luaposix-$(LUAPOSIX_VER).tar.gz
-LUAPOSIX_SITE   = https://github.com/luaposix/luaposix/archive
+LUAPOSIX_VERSION = 31
+LUAPOSIX_DIR = luaposix-$(LUAPOSIX_VERSION)
+LUAPOSIX_SOURCE = luaposix-$(LUAPOSIX_VERSION).tar.gz
+LUAPOSIX_SITE = https://github.com/luaposix/luaposix/archive
 
 $(DL_DIR)/$(LUAPOSIX_SOURCE):
-	$(DOWNLOAD) $(LUAPOSIX_SITE)/v$(LUAPOSIX_VER).tar.gz -O $(@)
+	$(DOWNLOAD) $(LUAPOSIX_SITE)/v$(LUAPOSIX_VERSION).tar.gz -O $(@)
 
 LUAPOSIX_DEPS = $(HOST_LUA) lua luaexpat
 
@@ -145,25 +145,25 @@ LUAPOSIX_CONF_ENV = \
 	LUA=$(HOST_LUA)
 
 LUAPOSIX_CONF_OPTS = \
-	--libdir=$(TARGET_libdir)/lua/$(LUA_ABIVER) \
-	--datadir=$(TARGET_datadir)/lua/$(LUA_ABIVER) \
+	--libdir=$(TARGET_libdir)/lua/$(LUA_ABIVERSION) \
+	--datadir=$(TARGET_datadir)/lua/$(LUA_ABIVERSION) \
 	--mandir=$(TARGET_DIR)$(REMOVE_mandir) \
 	--docdir=$(TARGET_DIR)$(REMOVE_docdir) \
 	--enable-silent-rules
 
-GNULIB_VER    = 20140202
-GNULIB_SOURCE = gnulib-$(GNULIB_VER)-stable.tar.gz
-GNULIB_SITE   = http://erislabs.net/ianb/projects/gnulib
+GNULIB_VERSION = 20140202
+GNULIB_SOURCE = gnulib-$(GNULIB_VERSION)-stable.tar.gz
+GNULIB_SITE = http://erislabs.net/ianb/projects/gnulib
 
 $(DL_DIR)/$(GNULIB_SOURCE):
 	$(DOWNLOAD) $(GNULIB_SITE)/$(GNULIB_SOURCE)
 
-SLINGSHOT_VER    = 6
-SLINGSHOT_SOURCE = slingshot-$(SLINGSHOT_VER).tar.gz
-SLINGSHOT_SITE   = https://github.com/gvvaughan/slingshot/archive
+SLINGSHOT_VERSION = 6
+SLINGSHOT_SOURCE = slingshot-$(SLINGSHOT_VERSION).tar.gz
+SLINGSHOT_SITE = https://github.com/gvvaughan/slingshot/archive
 
 $(DL_DIR)/$(SLINGSHOT_SOURCE):
-	$(DOWNLOAD) $(SLINGSHOT_SITE)/v$(SLINGSHOT_VER).tar.gz -O $(@)
+	$(DOWNLOAD) $(SLINGSHOT_SITE)/v$(SLINGSHOT_VERSION).tar.gz -O $(@)
 
 luaposix: $(LUAPOSIX_DEPS) $(DL_DIR)/$(SLINGSHOT_SOURCE) $(DL_DIR)/$(GNULIB_SOURCE) $(DL_DIR)/$(LUAPOSIX_SOURCE) | $(TARGET_DIR)
 	$(REMOVE)/$(PKG_DIR)
diff --git a/make/target-neutrino-plugins.mk b/make/target-neutrino-plugins.mk
index 0080a484..73806192 100644
--- a/make/target-neutrino-plugins.mk
+++ b/make/target-neutrino-plugins.mk
@@ -28,11 +28,11 @@ NEUTRINO_PLUGINS_DEPS += libpng
 NEUTRINO_PLUGINS_DEPS += libjpeg-turbo
 NEUTRINO_PLUGINS_DEPS += giflib
 NEUTRINO_PLUGINS_DEPS += freetype
+NEUTRINO_PLUGINS_DEPS += lua-curl
+NEUTRINO_PLUGINS_DEPS += lua-feedparser
 NEUTRINO_PLUGINS_DEPS += luaexpat
 NEUTRINO_PLUGINS_DEPS += luajson
-NEUTRINO_PLUGINS_DEPS += luacurl
 NEUTRINO_PLUGINS_DEPS += luaposix
-NEUTRINO_PLUGINS_DEPS += lua-feedparser
 
 # -----------------------------------------------------------------------------
 
@@ -194,10 +194,10 @@ doscam-webif-skin:
 
 # -----------------------------------------------------------------------------
 
-NEUTRINO_MEDIATHEK_VER    = git
-NEUTRINO_MEDIATHEK_DIR    = mediathek.$(NEUTRINO_MEDIATHEK_VER)
-NEUTRINO_MEDIATHEK_SOURCE = mediathek.$(NEUTRINO_MEDIATHEK_VER)
-NEUTRINO_MEDIATHEK_SITE   = https://github.com/neutrino-mediathek
+NEUTRINO_MEDIATHEK_VERSION = git
+NEUTRINO_MEDIATHEK_DIR = mediathek.$(NEUTRINO_MEDIATHEK_VERSION)
+NEUTRINO_MEDIATHEK_SOURCE = mediathek.$(NEUTRINO_MEDIATHEK_VERSION)
+NEUTRINO_MEDIATHEK_SITE = https://github.com/neutrino-mediathek
 
 neutrino-mediathek: $(SHARE_PLUGINS) | $(TARGET_DIR)
 	$(REMOVE)/$(PKG_DIR)
@@ -214,10 +214,10 @@ neutrino-mediathek: $(SHARE_PLUGINS) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LINKS_VER    = 2.20.2
-LINKS_DIR    = links-$(LINKS_VER)
-LINKS_SOURCE = links-$(LINKS_VER).tar.bz2
-LINKS_SITE   = http://links.twibright.com/download
+LINKS_VERSION = 2.20.2
+LINKS_DIR = links-$(LINKS_VERSION)
+LINKS_SOURCE = links-$(LINKS_VERSION).tar.bz2
+LINKS_SITE = http://links.twibright.com/download
 
 $(DL_DIR)/$(LINKS_SOURCE):
 	$(DOWNLOAD) $(LINKS_SITE)/$(LINKS_SOURCE)
diff --git a/make/target-rootfs.mk b/make/target-rootfs.mk
index af085197..e34cec62 100644
--- a/make/target-rootfs.mk
+++ b/make/target-rootfs.mk
@@ -16,7 +16,7 @@ $(TARGET_DIR)/.version: | $(TARGET_DIR)
 	echo "imagename=NI \o/ Neutrino-Image"					>> $(@)
 	echo "imagedescription=$(IMAGE_DESC)"					>> $(@)
 	echo "imageversion=$(IMAGE_VERSION)"					>> $(@)
-	echo "version=$(IMAGE_TYPE)$(IMAGE_VER)$(IMAGE_DATE)"	 		>> $(@)
+	echo "version=$(IMAGE_VERSION_STRING)"			 		>> $(@)
 	echo "describe=$$(git describe --always --long --tags | sed 's/-/./2')"	>> $(@)
 	echo "builddate=$$(date)"						>> $(@)
 	echo "box_model=$(BOXMODEL)"						>> $(@)
@@ -55,7 +55,7 @@ endif
 
 # -----------------------------------------------------------------------------
 
-e2-multiboot: | $(TARGET_DIR)
+e2-multiboot: .version | $(TARGET_DIR)
 	mkdir -p $(TARGET_bindir)
 	echo -e "#!/bin/sh\necho Nope!" > $(TARGET_bindir)/enigma2
 	chmod 0755 $(TARGET_bindir)/enigma2
@@ -140,7 +140,7 @@ ifneq ($(DEBUG),yes)
 		-type f -print0 | xargs -0 $(TARGET_STRIP) || true; \
 	done
   ifeq ($(BOXSERIES),hd2)
-	find $(ROOTFS)/lib/modules/$(KERNEL_VER)/kernel -type f -name '*.ko' | xargs -n 1 $(TARGET_OBJCOPY) --strip-unneeded
+	find $(ROOTFS)/lib/modules/$(KERNEL_VERSION)/kernel -type f -name '*.ko' | xargs -n 1 $(TARGET_OBJCOPY) --strip-unneeded
   endif
 	@$(call MESSAGE,"After strip: $$(du -sh $(ROOTFS))")
 endif
diff --git a/make/target-tools-unused.mk b/make/target-tools-unused.mk
index c5a3666c..9086ded0 100644
--- a/make/target-tools-unused.mk
+++ b/make/target-tools-unused.mk
@@ -4,10 +4,10 @@
 # -----------------------------------------------------------------------------
 
 # usbutils-008 needs udev
-USBUTILS_VER    = 007
-USBUTILS_DIR    = usbutils-$(USBUTILS_VER)
-USBUTILS_SOURCE = usbutils-$(USBUTILS_VER).tar.xz
-USBUTILS_SITE   = $(KERNEL_MIRROR)/linux/utils/usb/usbutils
+USBUTILS_VERSION = 007
+USBUTILS_DIR = usbutils-$(USBUTILS_VERSION)
+USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.xz
+USBUTILS_SITE = $(KERNEL_MIRROR)/linux/utils/usb/usbutils
 
 $(DL_DIR)/$(USBUTILS_SOURCE):
 	$(DOWNLOAD) $(USBUTILS_SITE)/$(USBUTILS_SOURCE)
@@ -32,10 +32,10 @@ usbutils: $(USBUTILS_DEPS) $(DL_DIR)/$(USBUTILS_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-BINUTILS_VER    = 2.35
-BINUTILS_DIR    = binutils-$(BINUTILS_VER)
-BINUTILS_SOURCE = binutils-$(BINUTILS_VER).tar.bz2
-BINUTILS_SITE   = $(GNU_MIRROR)/binutils
+BINUTILS_VERSION = 2.35
+BINUTILS_DIR = binutils-$(BINUTILS_VERSION)
+BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.bz2
+BINUTILS_SITE = $(GNU_MIRROR)/binutils
 
 $(DL_DIR)/$(BINUTILS_SOURCE):
 	$(DOWNLOAD) $(BINUTILS_SITE)/$(BINUTILS_SOURCE)
@@ -64,10 +64,10 @@ binutils: $(DL_DIR)/$(BINUTILS_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-BASE_PASSWD_VER    = 3.5.29
-BASE_PASSWD_DIR    = base-passwd-$(BASE_PASSWD_VER)
-BASE_PASSWD_SOURCE = base-passwd_$(BASE_PASSWD_VER).tar.gz
-BASE_PASSWD_SITE   = https://launchpad.net/debian/+archive/primary/+files
+BASE_PASSWD_VERSION = 3.5.29
+BASE_PASSWD_DIR = base-passwd-$(BASE_PASSWD_VERSION)
+BASE_PASSWD_SOURCE = base-passwd_$(BASE_PASSWD_VERSION).tar.gz
+BASE_PASSWD_SITE = https://launchpad.net/debian/+archive/primary/+files
 
 $(DL_DIR)/$(BASE_PASSWD_SOURCE):
 	$(DOWNLOAD) $(BASE_PASSWD_SITE)/$(BASE_PASSWD_SOURCE)
@@ -87,10 +87,10 @@ base-passwd: $(DL_DIR)/$(BASE_PASSWD_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-SHADOW_VER    = 4.8.1
-SHADOW_DIR    = shadow-$(SHADOW_VER)
-SHADOW_SOURCE = shadow-$(SHADOW_VER).tar.xz
-SHADOW_SITE   = https://github.com/shadow-maint/shadow/releases/download/$(SHADOW_VER)
+SHADOW_VERSION = 4.8.1
+SHADOW_DIR = shadow-$(SHADOW_VERSION)
+SHADOW_SOURCE = shadow-$(SHADOW_VERSION).tar.xz
+SHADOW_SITE = https://github.com/shadow-maint/shadow/releases/download/$(SHADOW_VERSION)
 
 $(DL_DIR)/$(SHADOW_SOURCE):
 	$(DOWNLOAD) $(SHADOW_SITE)/$(SHADOW_SOURCE)
@@ -113,10 +113,10 @@ shadow: $(DL_DIR)/$(SHADOW_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-BZIP2_VER    = 1.0.8
-BZIP2_DIR    = bzip2-$(BZIP2_VER)
-BZIP2_SOURCE = bzip2-$(BZIP2_VER).tar.gz
-BZIP2_SITE   = https://sourceware.org/pub/bzip2
+BZIP2_VERSION = 1.0.8
+BZIP2_DIR = bzip2-$(BZIP2_VERSION)
+BZIP2_SOURCE = bzip2-$(BZIP2_VERSION).tar.gz
+BZIP2_SITE = https://sourceware.org/pub/bzip2
 
 $(DL_DIR)/$(BZIP2_SOURCE):
 	$(DOWNLOAD) $(BZIP2_SITE)/$(BZIP2_SOURCE)
@@ -136,10 +136,10 @@ bzip2: $(DL_DIR)/$(BZIP2_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-ASTRA_SM_VER    = git
-ASTRA_SM_DIR    = astra-sm.$(ASTRA_SM_VER)
-ASTRA_SM_SOURCE = astra-sm.$(ASTRA_SM_VER)
-ASTRA_SM_SITE   = https://gitlab.com/crazycat69
+ASTRA_SM_VERSION = git
+ASTRA_SM_DIR = astra-sm.$(ASTRA_SM_VERSION)
+ASTRA_SM_SOURCE = astra-sm.$(ASTRA_SM_VERSION)
+ASTRA_SM_SITE = https://gitlab.com/crazycat69
 
 ASTRA_SM_DEPS = openssl
 
@@ -162,10 +162,10 @@ astra-sm: $(ASTRA_SM_DEPS) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-IOZONE_VER    = 3_490
-IOZONE_DIR    = iozone$(IOZONE_VER)
-IOZONE_SOURCE = iozone$(IOZONE_VER).tar
-IOZONE_SITE   = http://www.iozone.org/src/current
+IOZONE_VERSION = 3_490
+IOZONE_DIR = iozone$(IOZONE_VERSION)
+IOZONE_SOURCE = iozone$(IOZONE_VERSION).tar
+IOZONE_SITE = http://www.iozone.org/src/current
 
 $(DL_DIR)/$(IOZONE_SOURCE):
 	$(DOWNLOAD) $(IOZONE_SITE)/$(IOZONE_SOURCE)
@@ -184,10 +184,10 @@ iozone: $(DL_DIR)/$(IOZONE_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-READLINE_VER    = 8.1
-READLINE_DIR    = readline-$(READLINE_VER)
-READLINE_SOURCE = readline-$(READLINE_VER).tar.gz
-READLINE_SITE   = $(GNU_MIRROR)/readline
+READLINE_VERSION = 8.1
+READLINE_DIR = readline-$(READLINE_VERSION)
+READLINE_SOURCE = readline-$(READLINE_VERSION).tar.gz
+READLINE_SITE = $(GNU_MIRROR)/readline
 
 $(DL_DIR)/$(READLINE_SOURCE):
 	$(DOWNLOAD) $(READLINE_SITE)/$(READLINE_SOURCE)
@@ -207,10 +207,10 @@ readline: $(DL_DIR)/$(READLINE_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBZEN_VER    = 0.4.38
-LIBZEN_DIR    = ZenLib
-LIBZEN_SOURCE = libzen_$(LIBZEN_VER).tar.bz2
-LIBZEN_SITE   = https://mediaarea.net/download/source/libzen/$(LIBZEN_VER)
+LIBZEN_VERSION = 0.4.38
+LIBZEN_DIR = ZenLib
+LIBZEN_SOURCE = libzen_$(LIBZEN_VERSION).tar.bz2
+LIBZEN_SITE = https://mediaarea.net/download/source/libzen/$(LIBZEN_VERSION)
 
 $(DL_DIR)/$(LIBZEN_SOURCE):
 	$(DOWNLOAD) $(LIBZEN_SITE)/$(LIBZEN_SOURCE)
@@ -232,10 +232,10 @@ libzen: $(LIBZEN_DEPS) $(DL_DIR)/$(LIBZEN_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LIBMEDIAINFO_VER    = 20.08
-LIBMEDIAINFO_DIR    = MediaInfoLib
-LIBMEDIAINFO_SOURCE = libmediainfo_$(LIBMEDIAINFO_VER).tar.bz2
-LIBMEDIAINFO_SITE   = https://mediaarea.net/download/source/libmediainfo/$(LIBMEDIAINFO_VER)
+LIBMEDIAINFO_VERSION = 20.08
+LIBMEDIAINFO_DIR = MediaInfoLib
+LIBMEDIAINFO_SOURCE = libmediainfo_$(LIBMEDIAINFO_VERSION).tar.bz2
+LIBMEDIAINFO_SITE = https://mediaarea.net/download/source/libmediainfo/$(LIBMEDIAINFO_VERSION)
 
 $(DL_DIR)/$(LIBMEDIAINFO_SOURCE):
 	$(DOWNLOAD) $(LIBMEDIAINFO_SITE)/$(LIBMEDIAINFO_SOURCE)
@@ -257,10 +257,10 @@ libmediainfo: $(LIBMEDIAINFO_DEPS) $(DL_DIR)/$(LIBMEDIAINFO_SOURCE) | $(TARGET_D
 
 # -----------------------------------------------------------------------------
 
-MEDIAINFO_VER    = 20.08
-MEDIAINFO_DIR    = MediaInfo
-MEDIAINFO_SOURCE = mediainfo_$(MEDIAINFO_VER).tar.bz2
-MEDIAINFO_SITE   = https://mediaarea.net/download/source/mediainfo/$(MEDIAINFO_VER)
+MEDIAINFO_VERSION = 20.08
+MEDIAINFO_DIR = MediaInfo
+MEDIAINFO_SOURCE = mediainfo_$(MEDIAINFO_VERSION).tar.bz2
+MEDIAINFO_SITE = https://mediaarea.net/download/source/mediainfo/$(MEDIAINFO_VERSION)
 
 $(DL_DIR)/$(MEDIAINFO_SOURCE):
 	$(DOWNLOAD) $(MEDIAINFO_SITE)/$(MEDIAINFO_SOURCE)
diff --git a/make/target-tools.mk b/make/target-tools.mk
index 4aa08218..6b6f8cbe 100644
--- a/make/target-tools.mk
+++ b/make/target-tools.mk
@@ -8,10 +8,10 @@
 #
 # -----------------------------------------------------------------------------
 
-BUSYBOX_VER    = 1.31.1
-BUSYBOX_DIR    = busybox-$(BUSYBOX_VER)
-BUSYBOX_SOURCE = busybox-$(BUSYBOX_VER).tar.bz2
-BUSYBOX_SITE   = https://busybox.net/downloads
+BUSYBOX_VERSION = 1.31.1
+BUSYBOX_DIR = busybox-$(BUSYBOX_VERSION)
+BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2
+BUSYBOX_SITE = https://busybox.net/downloads
 
 $(DL_DIR)/$(BUSYBOX_SOURCE):
 	$(DOWNLOAD) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE)
@@ -164,10 +164,10 @@ busybox: $(BUSYBOX_DEPS) $(DL_DIR)/$(BUSYBOX_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-BASH_VER    = 5.0
-BASH_DIR    = bash-$(BASH_VER)
-BASH_SOURCE = bash-$(BASH_VER).tar.gz
-BASH_SITE   = $(GNU_MIRROR)/bash
+BASH_VERSION = 5.0
+BASH_DIR = bash-$(BASH_VERSION)
+BASH_SOURCE = bash-$(BASH_VERSION).tar.gz
+BASH_SITE = $(GNU_MIRROR)/bash
 
 $(DL_DIR)/$(BASH_SOURCE):
 	$(DOWNLOAD) $(BASH_SITE)/$(BASH_SOURCE)
@@ -205,10 +205,10 @@ bash: $(DL_DIR)/$(BASH_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-SYSVINIT_VER    = 2.98
-SYSVINIT_DIR    = sysvinit-$(SYSVINIT_VER)
-SYSVINIT_SOURCE = sysvinit-$(SYSVINIT_VER).tar.xz
-SYSVINIT_SITE   = http://download.savannah.nongnu.org/releases/sysvinit
+SYSVINIT_VERSION = 2.98
+SYSVINIT_DIR = sysvinit-$(SYSVINIT_VERSION)
+SYSVINIT_SOURCE = sysvinit-$(SYSVINIT_VERSION).tar.xz
+SYSVINIT_SITE = http://download.savannah.nongnu.org/releases/sysvinit
 
 $(DL_DIR)/$(SYSVINIT_SOURCE):
 	$(DOWNLOAD) $(SYSVINIT_SITE)/$(SYSVINIT_SOURCE)
@@ -250,10 +250,10 @@ sysvinit: $(DL_DIR)/$(SYSVINIT_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-COREUTILS_VER    = 8.30
-COREUTILS_DIR    = coreutils-$(COREUTILS_VER)
-COREUTILS_SOURCE = coreutils-$(COREUTILS_VER).tar.xz
-COREUTILS_SITE   = $(GNU_MIRROR)/coreutils
+COREUTILS_VERSION = 8.30
+COREUTILS_DIR = coreutils-$(COREUTILS_VERSION)
+COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz
+COREUTILS_SITE = $(GNU_MIRROR)/coreutils
 
 $(DL_DIR)/$(COREUTILS_SOURCE):
 	$(DOWNLOAD) $(COREUTILS_SITE)/$(COREUTILS_SOURCE)
@@ -295,10 +295,10 @@ coreutils: $(DL_DIR)/$(COREUTILS_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-PROCPS_NG_VER    = 3.3.16
-PROCPS_NG_DIR    = procps-ng-$(PROCPS_NG_VER)
-PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VER).tar.xz
-PROCPS_NG_SITE   = http://sourceforge.net/projects/procps-ng/files/Production
+PROCPS_NG_VERSION = 3.3.16
+PROCPS_NG_DIR = procps-ng-$(PROCPS_NG_VERSION)
+PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz
+PROCPS_NG_SITE = http://sourceforge.net/projects/procps-ng/files/Production
 
 $(DL_DIR)/$(PROCPS_NG_SOURCE):
 	$(DOWNLOAD) $(PROCPS_NG_SITE)/$(PROCPS_NG_SOURCE)
@@ -343,10 +343,10 @@ procps-ng: $(PROCPS_NG_DEPS) $(DL_DIR)/$(PROCPS_NG_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-MTD_UTILS_VER    = 2.0.2
-MTD_UTILS_DIR    = mtd-utils-$(MTD_UTILS_VER)
-MTD_UTILS_SOURCE = mtd-utils-$(MTD_UTILS_VER).tar.bz2
-MTD_UTILS_SITE   = ftp://ftp.infradead.org/pub/mtd-utils
+MTD_UTILS_VERSION = 2.0.2
+MTD_UTILS_DIR = mtd-utils-$(MTD_UTILS_VERSION)
+MTD_UTILS_SOURCE = mtd-utils-$(MTD_UTILS_VERSION).tar.bz2
+MTD_UTILS_SITE = ftp://ftp.infradead.org/pub/mtd-utils
 
 $(DL_DIR)/$(MTD_UTILS_SOURCE):
 	$(DOWNLOAD) $(MTD_UTILS_SITE)/$(MTD_UTILS_SOURCE)
@@ -394,10 +394,10 @@ mtd-utils: $(MTD_UTILS_DEPS) $(DL_DIR)/$(MTD_UTILS_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-DOSFSTOOLS_VER    = 4.1
-DOSFSTOOLS_DIR    = dosfstools-$(DOSFSTOOLS_VER)
-DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VER).tar.xz
-DOSFSTOOLS_SITE   = https://github.com/dosfstools/dosfstools/releases/download/v$(DOSFSTOOLS_VER)
+DOSFSTOOLS_VERSION = 4.1
+DOSFSTOOLS_DIR = dosfstools-$(DOSFSTOOLS_VERSION)
+DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VERSION).tar.xz
+DOSFSTOOLS_SITE = https://github.com/dosfstools/dosfstools/releases/download/v$(DOSFSTOOLS_VERSION)
 
 $(DL_DIR)/$(DOSFSTOOLS_SOURCE):
 	$(DOWNLOAD) $(DOSFSTOOLS_SITE)/$(DOSFSTOOLS_SOURCE)
@@ -427,10 +427,10 @@ dosfstools: $(DL_DIR)/$(DOSFSTOOLS_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-NTFS_3G_VER    = 2017.3.23
-NTFS_3G_DIR    = ntfs-3g_ntfsprogs-$(NTFS_3G_VER)
-NTFS_3G_SOURCE = ntfs-3g_ntfsprogs-$(NTFS_3G_VER).tgz
-NTFS_3G_SITE   = https://tuxera.com/opensource
+NTFS_3G_VERSION = 2017.3.23
+NTFS_3G_DIR = ntfs-3g_ntfsprogs-$(NTFS_3G_VERSION)
+NTFS_3G_SOURCE = ntfs-3g_ntfsprogs-$(NTFS_3G_VERSION).tgz
+NTFS_3G_SITE = https://tuxera.com/opensource
 
 $(DL_DIR)/$(NTFS_3G_SOURCE):
 	$(DOWNLOAD) $(NTFS_3G_SITE)/$(NTFS_3G_SOURCE)
@@ -464,10 +464,10 @@ ntfs-3g: $(NTFS_3G_DEPS) $(DL_DIR)/$(NTFS_3G_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-FUSE_EXFAT_VER    = 1.3.0
-FUSE_EXFAT_DIR    = fuse-exfat-$(FUSE_EXFAT_VER)
-FUSE_EXFAT_SOURCE = fuse-exfat-$(FUSE_EXFAT_VER).tar.gz
-FUSE_EXFAT_SITE   = https://github.com/relan/exfat/releases/download/v$(FUSE_EXFAT_VER)
+FUSE_EXFAT_VERSION = 1.3.0
+FUSE_EXFAT_DIR = fuse-exfat-$(FUSE_EXFAT_VERSION)
+FUSE_EXFAT_SOURCE = fuse-exfat-$(FUSE_EXFAT_VERSION).tar.gz
+FUSE_EXFAT_SITE = https://github.com/relan/exfat/releases/download/v$(FUSE_EXFAT_VERSION)
 
 $(DL_DIR)/$(FUSE_EXFAT_SOURCE):
 	$(DOWNLOAD) $(FUSE_EXFAT_SITE)/$(FUSE_EXFAT_SOURCE)
@@ -495,10 +495,10 @@ fuse-exfat: $(FUSE_EXFAT_DEPS) $(DL_DIR)/$(FUSE_EXFAT_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-EXFAT_UTILS_VER    = 1.3.0
-EXFAT_UTILS_DIR    = exfat-utils-$(EXFAT_UTILS_VER)
-EXFAT_UTILS_SOURCE = exfat-utils-$(EXFAT_UTILS_VER).tar.gz
-EXFAT_UTILS_SITE   = https://github.com/relan/exfat/releases/download/v$(EXFAT_UTILS_VER)
+EXFAT_UTILS_VERSION = 1.3.0
+EXFAT_UTILS_DIR = exfat-utils-$(EXFAT_UTILS_VERSION)
+EXFAT_UTILS_SOURCE = exfat-utils-$(EXFAT_UTILS_VERSION).tar.gz
+EXFAT_UTILS_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_UTILS_VERSION)
 
 $(DL_DIR)/$(EXFAT_UTILS_SOURCE):
 	$(DOWNLOAD) $(EXFAT_UTILS_SITE)/$(EXFAT_UTILS_SOURCE)
@@ -526,10 +526,10 @@ exfat-utils: $(EXFAT_UTILS_DEPS) $(DL_DIR)/$(EXFAT_UTILS_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-XFSPROGS_VER    = 5.8.0
-XFSPROGS_DIR    = xfsprogs-$(XFSPROGS_VER)
-XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VER).tar.xz
-XFSPROGS_SITE   = $(KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs
+XFSPROGS_VERSION = 5.8.0
+XFSPROGS_DIR = xfsprogs-$(XFSPROGS_VERSION)
+XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz
+XFSPROGS_SITE = $(KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs
 
 $(DL_DIR)/$(XFSPROGS_SOURCE):
 	$(DOWNLOAD) $(XFSPROGS_SITE)/$(XFSPROGS_SOURCE)
@@ -565,10 +565,10 @@ xfsprogs: $(XFSPROGS_DEPS) $(DL_DIR)/$(XFSPROGS_SOURCE) | $(TARGET_DIR)
 # -----------------------------------------------------------------------------
 
 # for coolstream: formatting ext4 failes with newer versions then 1.43.8
-E2FSPROGS_VER    = $(if $(filter $(BOXTYPE),coolstream),1.43.8,1.45.6)
-E2FSPROGS_DIR    = e2fsprogs-$(E2FSPROGS_VER)
-E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VER).tar.gz
-E2FSPROGS_SITE   = https://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/v$(E2FSPROGS_VER)
+E2FSPROGS_VERSION = $(if $(filter $(BOXTYPE),coolstream),1.43.8,1.45.6)
+E2FSPROGS_DIR = e2fsprogs-$(E2FSPROGS_VERSION)
+E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.gz
+E2FSPROGS_SITE = https://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/v$(E2FSPROGS_VERSION)
 
 $(DL_DIR)/$(E2FSPROGS_SOURCE):
 	$(DOWNLOAD) $(E2FSPROGS_SITE)/$(E2FSPROGS_SOURCE)
@@ -628,10 +628,10 @@ e2fsprogs: $(E2FSPROGS_DEPS) $(DL_DIR)/$(E2FSPROGS_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-HDPARM_VER    = 9.60
-HDPARM_DIR    = hdparm-$(HDPARM_VER)
-HDPARM_SOURCE = hdparm-$(HDPARM_VER).tar.gz
-HDPARM_SITE   = https://sourceforge.net/projects/hdparm/files/hdparm
+HDPARM_VERSION = 9.60
+HDPARM_DIR = hdparm-$(HDPARM_VERSION)
+HDPARM_SOURCE = hdparm-$(HDPARM_VERSION).tar.gz
+HDPARM_SITE = https://sourceforge.net/projects/hdparm/files/hdparm
 
 $(DL_DIR)/$(HDPARM_SOURCE):
 	$(DOWNLOAD) $(HDPARM_SITE)/$(HDPARM_SOURCE)
@@ -649,10 +649,10 @@ hdparm: $(DL_DIR)/$(HDPARM_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-F2FS_TOOLS_VER    = 1.14.0
-F2FS_TOOLS_DIR    = f2fs-tools-$(F2FS_TOOLS_VER)
-F2FS_TOOLS_SOURCE = f2fs-tools-$(F2FS_TOOLS_VER).tar.gz
-F2FS_TOOLS_SITE   = https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot
+F2FS_TOOLS_VERSION = 1.14.0
+F2FS_TOOLS_DIR = f2fs-tools-$(F2FS_TOOLS_VERSION)
+F2FS_TOOLS_SOURCE = f2fs-tools-$(F2FS_TOOLS_VERSION).tar.gz
+F2FS_TOOLS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot
 
 $(DL_DIR)/$(F2FS_TOOLS_SOURCE):
 	$(DOWNLOAD) $(F2FS_TOOLS_SITE)/$(F2FS_TOOLS_SOURCE)
@@ -685,10 +685,10 @@ f2fs-tools: $(F2FS_TOOLS_DEPS) $(DL_DIR)/$(F2FS_TOOLS_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-UTIL_LINUX_VER    = 2.36.2
-UTIL_LINUX_DIR    = util-linux-$(UTIL_LINUX_VER)
-UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VER).tar.xz
-UTIL_LINUX_SITE   = $(KERNEL_MIRROR)/linux/utils/util-linux/v$(basename $(UTIL_LINUX_VER))
+UTIL_LINUX_VERSION = 2.36.2
+UTIL_LINUX_DIR = util-linux-$(UTIL_LINUX_VERSION)
+UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz
+UTIL_LINUX_SITE = $(KERNEL_MIRROR)/linux/utils/util-linux/v$(basename $(UTIL_LINUX_VERSION))
 
 $(DL_DIR)/$(UTIL_LINUX_SOURCE):
 	$(DOWNLOAD) $(UTIL_LINUX_SITE)/$(UTIL_LINUX_SOURCE)
@@ -750,10 +750,10 @@ util-linux: $(UTIL_LINUX_DEPS) $(DL_DIR)/$(UTIL_LINUX_SOURCE) | $(TARGET_DIR)
 #
 # -----------------------------------------------------------------------------
 
-OPENVPN_VER    = 2.5.0
-OPENVPN_DIR    = openvpn-$(OPENVPN_VER)
-OPENVPN_SOURCE = openvpn-$(OPENVPN_VER).tar.xz
-OPENVPN_SITE   = http://build.openvpn.net/downloads/releases
+OPENVPN_VERSION = 2.5.0
+OPENVPN_DIR = openvpn-$(OPENVPN_VERSION)
+OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz
+OPENVPN_SITE = http://build.openvpn.net/downloads/releases
 
 $(DL_DIR)/$(OPENVPN_SOURCE):
 	$(DOWNLOAD) $(OPENVPN_SITE)/$(OPENVPN_SOURCE)
@@ -790,10 +790,10 @@ openvpn: $(OPENVPN_DEPS) $(DL_DIR)/$(OPENVPN_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-OPENSSH_VER    = 8.4p1
-OPENSSH_DIR    = openssh-$(OPENSSH_VER)
-OPENSSH_SOURCE = openssh-$(OPENSSH_VER).tar.gz
-OPENSSH_SITE   = https://artfiles.org/openbsd/OpenSSH/portable
+OPENSSH_VERSION = 8.4p1
+OPENSSH_DIR = openssh-$(OPENSSH_VERSION)
+OPENSSH_SOURCE = openssh-$(OPENSSH_VERSION).tar.gz
+OPENSSH_SITE = https://artfiles.org/openbsd/OpenSSH/portable
 
 $(DL_DIR)/$(OPENSSH_SOURCE):
 	$(DOWNLOAD) $(OPENSSH_SITE)/$(OPENSSH_SOURCE)
@@ -832,10 +832,10 @@ openssh: $(OPENSSH_DEPS) $(DL_DIR)/$(OPENSSH_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-TZDATA_VER    = 2020f
-TZDATA_DIR    = tzdata$(TZDATA_VER)
-TZDATA_SOURCE = tzdata$(TZDATA_VER).tar.gz
-TZDATA_SITE   = ftp://ftp.iana.org/tz/releases
+TZDATA_VERSION = 2020f
+TZDATA_DIR = tzdata$(TZDATA_VERSION)
+TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz
+TZDATA_SITE = ftp://ftp.iana.org/tz/releases
 
 $(DL_DIR)/$(TZDATA_SOURCE):
 	$(DOWNLOAD) $(TZDATA_SITE)/$(TZDATA_SOURCE)
@@ -875,10 +875,10 @@ tzdata: $(TZDATA_DEPS) $(DL_DIR)/$(TZDATA_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-IPERF_VER    = 3.1.3
-IPERF_DIR    = iperf-$(IPERF_VER)
-IPERF_SOURCE = iperf-$(IPERF_VER)-source.tar.gz
-IPERF_SITE   = https://iperf.fr/download/source
+IPERF_VERSION = 3.1.3
+IPERF_DIR = iperf-$(IPERF_VERSION)
+IPERF_SOURCE = iperf-$(IPERF_VERSION)-source.tar.gz
+IPERF_SITE = https://iperf.fr/download/source
 
 $(DL_DIR)/$(IPERF_SOURCE):
 	$(DOWNLOAD) $(IPERF_SITE)/$(IPERF_SOURCE)
@@ -896,10 +896,10 @@ iperf: $(DL_DIR)/$(IPERF_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-PARTED_VER    = 3.2
-PARTED_DIR    = parted-$(PARTED_VER)
-PARTED_SOURCE = parted-$(PARTED_VER).tar.xz
-PARTED_SITE   = $(GNU_MIRROR)/parted
+PARTED_VERSION = 3.2
+PARTED_DIR = parted-$(PARTED_VERSION)
+PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz
+PARTED_SITE = $(GNU_MIRROR)/parted
 
 $(DL_DIR)/$(PARTED_SOURCE):
 	$(DOWNLOAD) $(PARTED_SITE)/$(PARTED_SOURCE)
@@ -936,10 +936,10 @@ parted: $(PARTED_DEPS) $(DL_DIR)/$(PARTED_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-HD_IDLE_VER    = 1.05
-HD_IDLE_DIR    = hd-idle
-HD_IDLE_SOURCE = hd-idle-$(HD_IDLE_VER).tgz
-HD_IDLE_SITE   = https://sourceforge.net/projects/hd-idle/files
+HD_IDLE_VERSION = 1.05
+HD_IDLE_DIR = hd-idle
+HD_IDLE_SOURCE = hd-idle-$(HD_IDLE_VERSION).tgz
+HD_IDLE_SITE = https://sourceforge.net/projects/hd-idle/files
 
 $(DL_DIR)/$(HD_IDLE_SOURCE):
 	$(DOWNLOAD) $(HD_IDLE_SITE)/$(HD_IDLE_SOURCE)
@@ -956,10 +956,10 @@ hd-idle: $(DL_DIR)/$(HD_IDLE_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LESS_VER    = 563
-LESS_DIR    = less-$(LESS_VER)
-LESS_SOURCE = less-$(LESS_VER).tar.gz
-LESS_SITE   = $(GNU_MIRROR)/less
+LESS_VERSION = 563
+LESS_DIR = less-$(LESS_VERSION)
+LESS_SOURCE = less-$(LESS_VERSION).tar.gz
+LESS_SITE = $(GNU_MIRROR)/less
 
 $(DL_DIR)/$(LESS_SOURCE):
 	$(DOWNLOAD) $(LESS_SITE)/$(LESS_SOURCE)
@@ -978,10 +978,10 @@ less: $(LESS_DEPS) $(DL_DIR)/$(LESS_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-NTP_VER    = 4.2.8p15
-NTP_DIR    = ntp-$(NTP_VER)
-NTP_SOURCE = ntp-$(NTP_VER).tar.gz
-NTP_SITE   = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(basename $(NTP_VER))
+NTP_VERSION = 4.2.8p15
+NTP_DIR = ntp-$(NTP_VERSION)
+NTP_SOURCE = ntp-$(NTP_VERSION).tar.gz
+NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(basename $(NTP_VERSION))
 
 $(DL_DIR)/$(NTP_SOURCE):
 	$(DOWNLOAD) $(NTP_SITE)/$(NTP_SOURCE)
@@ -1010,10 +1010,10 @@ ntp: $(NTP_DEPS) $(DL_DIR)/$(NTP_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-DJMOUNT_VER    = 0.71
-DJMOUNT_DIR    = djmount-$(DJMOUNT_VER)
-DJMOUNT_SOURCE = djmount-$(DJMOUNT_VER).tar.gz
-DJMOUNT_SITE   = https://sourceforge.net/projects/djmount/files/djmount/$(DJMOUNT_VER)
+DJMOUNT_VERSION = 0.71
+DJMOUNT_DIR = djmount-$(DJMOUNT_VERSION)
+DJMOUNT_SOURCE = djmount-$(DJMOUNT_VERSION).tar.gz
+DJMOUNT_SITE = https://sourceforge.net/projects/djmount/files/djmount/$(DJMOUNT_VERSION)
 
 $(DL_DIR)/$(DJMOUNT_SOURCE):
 	$(DOWNLOAD) $(DJMOUNT_SITE)/$(DJMOUNT_SOURCE)
@@ -1042,10 +1042,10 @@ djmount: $(DJMOUNT_DEPS) $(DL_DIR)/$(DJMOUNT_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-USHARE_VER    = 1.1a
-USHARE_DIR    = ushare-uShare_v$(USHARE_VER)
-USHARE_SOURCE = uShare_v$(USHARE_VER).tar.gz
-USHARE_SITE   = https://github.com/GeeXboX/ushare/archive
+USHARE_VERSION = 1.1a
+USHARE_DIR = ushare-uShare_v$(USHARE_VERSION)
+USHARE_SOURCE = uShare_v$(USHARE_VERSION).tar.gz
+USHARE_SITE = https://github.com/GeeXboX/ushare/archive
 
 $(DL_DIR)/$(USHARE_SOURCE):
 	$(DOWNLOAD) $(USHARE_SITE)/$(USHARE_SOURCE)
@@ -1078,10 +1078,10 @@ ushare: $(USHARE_DEPS) $(DL_DIR)/$(USHARE_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-SQLITE_VER    = 3330000
-SQLITE_DIR    = sqlite-autoconf-$(SQLITE_VER)
-SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VER).tar.gz
-SQLITE_SITE   = http://www.sqlite.org/2020
+SQLITE_VERSION = 3330000
+SQLITE_DIR = sqlite-autoconf-$(SQLITE_VERSION)
+SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
+SQLITE_SITE = http://www.sqlite.org/2020
 
 $(DL_DIR)/$(SQLITE_SOURCE):
 	$(DOWNLOAD) $(SQLITE_SITE)/$(SQLITE_SOURCE)
@@ -1102,10 +1102,10 @@ sqlite: $(DL_DIR)/$(SQLITE_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-MINIDLNA_VER    = 1.3.0
-MINIDLNA_DIR    = minidlna-$(MINIDLNA_VER)
-MINIDLNA_SOURCE = minidlna-$(MINIDLNA_VER).tar.gz
-MINIDLNA_SITE   = https://sourceforge.net/projects/minidlna/files/minidlna/$(MINIDLNA_VER)
+MINIDLNA_VERSION = 1.3.0
+MINIDLNA_DIR = minidlna-$(MINIDLNA_VERSION)
+MINIDLNA_SOURCE = minidlna-$(MINIDLNA_VERSION).tar.gz
+MINIDLNA_SITE = https://sourceforge.net/projects/minidlna/files/minidlna/$(MINIDLNA_VERSION)
 
 $(DL_DIR)/$(MINIDLNA_SOURCE):
 	$(DOWNLOAD) $(MINIDLNA_SITE)/$(MINIDLNA_SOURCE)
@@ -1137,10 +1137,10 @@ minidlna: $(MINIDLNA_DEPS) $(DL_DIR)/$(MINIDLNA_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-SMARTMONTOOLS_VER    = 7.1
-SMARTMONTOOLS_DIR    = smartmontools-$(SMARTMONTOOLS_VER)
-SMARTMONTOOLS_SOURCE = smartmontools-$(SMARTMONTOOLS_VER).tar.gz
-SMARTMONTOOLS_SITE   = https://sourceforge.net/projects/smartmontools/files/smartmontools/$(SMARTMONTOOLS_VER)
+SMARTMONTOOLS_VERSION = 7.1
+SMARTMONTOOLS_DIR = smartmontools-$(SMARTMONTOOLS_VERSION)
+SMARTMONTOOLS_SOURCE = smartmontools-$(SMARTMONTOOLS_VERSION).tar.gz
+SMARTMONTOOLS_SITE = https://sourceforge.net/projects/smartmontools/files/smartmontools/$(SMARTMONTOOLS_VERSION)
 
 $(DL_DIR)/$(SMARTMONTOOLS_SOURCE):
 	$(DOWNLOAD) $(SMARTMONTOOLS_SITE)/$(SMARTMONTOOLS_SOURCE)
@@ -1157,10 +1157,10 @@ smartmontools: $(DL_DIR)/$(SMARTMONTOOLS_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-INADYN_VER    = 2.6
-INADYN_DIR    = inadyn-$(INADYN_VER)
-INADYN_SOURCE = inadyn-$(INADYN_VER).tar.xz
-INADYN_SITE   = https://github.com/troglobit/inadyn/releases/download/v$(INADYN_VER)
+INADYN_VERSION = 2.6
+INADYN_DIR = inadyn-$(INADYN_VERSION)
+INADYN_SOURCE = inadyn-$(INADYN_VERSION).tar.xz
+INADYN_SITE = https://github.com/troglobit/inadyn/releases/download/v$(INADYN_VERSION)
 
 $(DL_DIR)/$(INADYN_SOURCE):
 	$(DOWNLOAD) $(INADYN_SITE)/$(INADYN_SOURCE)
@@ -1189,10 +1189,10 @@ inadyn: $(INADYN_DEPS) $(DL_DIR)/$(INADYN_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-VSFTPD_VER    = 3.0.3
-VSFTPD_DIR    = vsftpd-$(VSFTPD_VER)
-VSFTPD_SOURCE = vsftpd-$(VSFTPD_VER).tar.gz
-VSFTPD_SITE   = https://security.appspot.com/downloads
+VSFTPD_VERSION = 3.0.3
+VSFTPD_DIR = vsftpd-$(VSFTPD_VERSION)
+VSFTPD_SOURCE = vsftpd-$(VSFTPD_VERSION).tar.gz
+VSFTPD_SITE = https://security.appspot.com/downloads
 
 $(DL_DIR)/$(VSFTPD_SOURCE):
 	$(DOWNLOAD) $(VSFTPD_SITE)/$(VSFTPD_SOURCE)
@@ -1221,10 +1221,10 @@ vsftpd: $(VSFTPD_DEPS) $(DL_DIR)/$(VSFTPD_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-NANO_VER    = 5.4
-NANO_DIR    = nano-$(NANO_VER)
-NANO_SOURCE = nano-$(NANO_VER).tar.gz
-NANO_SITE   = $(GNU_MIRROR)/nano
+NANO_VERSION = 5.4
+NANO_DIR = nano-$(NANO_VERSION)
+NANO_SOURCE = nano-$(NANO_VERSION).tar.gz
+NANO_SITE = $(GNU_MIRROR)/nano
 
 $(DL_DIR)/$(NANO_SOURCE):
 	$(DOWNLOAD) $(NANO_SITE)/$(NANO_SOURCE)
@@ -1256,10 +1256,10 @@ nano: $(NANO_DEPS) $(DL_DIR)/$(NANO_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-MINICOM_VER    = 2.7.1
-MINICOM_DIR    = minicom-$(MINICOM_VER)
-MINICOM_SOURCE = minicom-$(MINICOM_VER).tar.gz
-MINICOM_SITE   = http://fossies.org/linux/misc
+MINICOM_VERSION = 2.7.1
+MINICOM_DIR = minicom-$(MINICOM_VERSION)
+MINICOM_SOURCE = minicom-$(MINICOM_VERSION).tar.gz
+MINICOM_SITE = http://fossies.org/linux/misc
 
 $(DL_DIR)/$(MINICOM_SOURCE):
 	$(DOWNLOAD) $(MINICOM_SITE)/$(MINICOM_SOURCE)
@@ -1282,10 +1282,10 @@ minicom: $(MINICOM_DEPS) $(DL_DIR)/$(MINICOM_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-AUTOFS_VER    = 5.1.6
-AUTOFS_DIR    = autofs-$(AUTOFS_VER)
-AUTOFS_SOURCE = autofs-$(AUTOFS_VER).tar.xz
-AUTOFS_SITE   = $(KERNEL_MIRROR)/linux/daemons/autofs/v5
+AUTOFS_VERSION = 5.1.6
+AUTOFS_DIR = autofs-$(AUTOFS_VERSION)
+AUTOFS_SOURCE = autofs-$(AUTOFS_VERSION).tar.xz
+AUTOFS_SITE = $(KERNEL_MIRROR)/linux/daemons/autofs/v5
 
 $(DL_DIR)/$(AUTOFS_SOURCE):
 	$(DOWNLOAD) $(AUTOFS_SITE)/$(AUTOFS_SOURCE)
@@ -1342,10 +1342,10 @@ samba: $(if $(filter $(BOXSERIES),hd1),samba33,samba36)
 
 # -----------------------------------------------------------------------------
 
-SAMBA33_VER    = 3.3.16
-SAMBA33_DIR    = samba-$(SAMBA33_VER)
-SAMBA33_SOURCE = samba-$(SAMBA33_VER).tar.gz
-SAMBA33_SITE   = https://download.samba.org/pub/samba
+SAMBA33_VERSION = 3.3.16
+SAMBA33_DIR = samba-$(SAMBA33_VERSION)
+SAMBA33_SOURCE = samba-$(SAMBA33_VERSION).tar.gz
+SAMBA33_SITE = https://download.samba.org/pub/samba
 
 $(DL_DIR)/$(SAMBA33_SOURCE):
 	$(DOWNLOAD) $(SAMBA33_SITE)/$(SAMBA33_SOURCE)
@@ -1414,10 +1414,10 @@ samba33: $(SAMBA33_DEPS) $(DL_DIR)/$(SAMBA33_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-SAMBA36_VER    = 3.6.25
-SAMBA36_DIR    = samba-$(SAMBA36_VER)
-SAMBA36_SOURCE = samba-$(SAMBA36_VER).tar.gz
-SAMBA36_SITE   = https://download.samba.org/pub/samba/stable
+SAMBA36_VERSION = 3.6.25
+SAMBA36_DIR = samba-$(SAMBA36_VERSION)
+SAMBA36_SOURCE = samba-$(SAMBA36_VERSION).tar.gz
+SAMBA36_SITE = https://download.samba.org/pub/samba/stable
 
 $(DL_DIR)/$(SAMBA36_SOURCE):
 	$(DOWNLOAD) $(SAMBA36_SITE)/$(SAMBA36_SOURCE)
@@ -1484,10 +1484,10 @@ samba36: $(SAMBA36_DEPS) $(DL_DIR)/$(SAMBA36_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-DROPBEAR_VER    = 2019.78
-DROPBEAR_DIR    = dropbear-$(DROPBEAR_VER)
-DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VER).tar.bz2
-DROPBEAR_SITE   = http://matt.ucc.asn.au/dropbear/releases
+DROPBEAR_VERSION = 2019.78
+DROPBEAR_DIR = dropbear-$(DROPBEAR_VERSION)
+DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
+DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
 
 $(DL_DIR)/$(DROPBEAR_SOURCE):
 	$(DOWNLOAD) $(DROPBEAR_SITE)/$(DROPBEAR_SOURCE)
@@ -1530,10 +1530,10 @@ dropbear: $(DROPBEAR_DEPS) $(DL_DIR)/$(DROPBEAR_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-SG3_UTILS_VER    = 1.45
-SG3_UTILS_DIR    = sg3_utils-$(SG3_UTILS_VER)
-SG3_UTILS_SOURCE = sg3_utils-$(SG3_UTILS_VER).tar.xz
-SG3_UTILS_SITE   = http://sg.danny.cz/sg/p
+SG3_UTILS_VERSION = 1.45
+SG3_UTILS_DIR = sg3_utils-$(SG3_UTILS_VERSION)
+SG3_UTILS_SOURCE = sg3_utils-$(SG3_UTILS_VERSION).tar.xz
+SG3_UTILS_SITE = http://sg.danny.cz/sg/p
 
 $(DL_DIR)/$(SG3_UTILS_SOURCE):
 	$(DOWNLOAD) $(SG3_UTILS_SITE)/$(SG3_UTILS_SOURCE)
@@ -1563,10 +1563,10 @@ sg3_utils: $(DL_DIR)/$(SG3_UTILS_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-FBSHOT_VER    = 0.3
-FBSHOT_DIR    = fbshot-$(FBSHOT_VER)
-FBSHOT_SOURCE = fbshot-$(FBSHOT_VER).tar.gz
-FBSHOT_SITE   = http://distro.ibiblio.org/amigolinux/download/Utils/fbshot
+FBSHOT_VERSION = 0.3
+FBSHOT_DIR = fbshot-$(FBSHOT_VERSION)
+FBSHOT_SOURCE = fbshot-$(FBSHOT_VERSION).tar.gz
+FBSHOT_SITE = http://distro.ibiblio.org/amigolinux/download/Utils/fbshot
 
 $(DL_DIR)/$(FBSHOT_SOURCE):
 	$(DOWNLOAD) $(FBSHOT_SITE)/$(FBSHOT_SOURCE)
@@ -1587,10 +1587,10 @@ fbshot: $(FBSHOT_DEPS) $(DL_DIR)/$(FBSHOT_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LCD4LINUX_VER    = git
-LCD4LINUX_DIR    = lcd4linux.$(LCD4LINUX_VER)
-LCD4LINUX_SOURCE = lcd4linux.$(LCD4LINUX_VER)
-LCD4LINUX_SITE   = https://github.com/TangoCash
+LCD4LINUX_VERSION = git
+LCD4LINUX_DIR = lcd4linux.$(LCD4LINUX_VERSION)
+LCD4LINUX_SOURCE = lcd4linux.$(LCD4LINUX_VERSION)
+LCD4LINUX_SITE = https://github.com/TangoCash
 
 LCD4LINUX_DEPS = ncurses libgd libdpf
 
@@ -1620,10 +1620,10 @@ lcd4linux: $(LCD4LINUX_DEPS) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-SAMSUNGLCD4LINUX_VER    = git
-SAMSUNGLCD4LINUX_DIR    = samsunglcd4linux.$(LCD4LINUX_VER)
-SAMSUNGLCD4LINUX_SOURCE = samsunglcd4linux.$(LCD4LINUX_VER)
-SAMSUNGLCD4LINUX_SITE   = https://github.com/horsti58
+SAMSUNGLCD4LINUX_VERSION = git
+SAMSUNGLCD4LINUX_DIR = samsunglcd4linux.$(LCD4LINUX_VERSION)
+SAMSUNGLCD4LINUX_SOURCE = samsunglcd4linux.$(LCD4LINUX_VERSION)
+SAMSUNGLCD4LINUX_SITE = https://github.com/horsti58
 
 samsunglcd4linux: | $(TARGET_DIR)
 	$(REMOVE)/$(PKG_DIR)
@@ -1637,10 +1637,10 @@ samsunglcd4linux: | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-WPA_SUPPLICANT_VER    = 0.7.3
-WPA_SUPPLICANT_DIR    = wpa_supplicant-$(WPA_SUPPLICANT_VER)
-WPA_SUPPLICANT_SOURCE = wpa_supplicant-$(WPA_SUPPLICANT_VER).tar.gz
-WPA_SUPPLICANT_SITE   = https://w1.fi/releases
+WPA_SUPPLICANT_VERSION = 0.7.3
+WPA_SUPPLICANT_DIR = wpa_supplicant-$(WPA_SUPPLICANT_VERSION)
+WPA_SUPPLICANT_SOURCE = wpa_supplicant-$(WPA_SUPPLICANT_VERSION).tar.gz
+WPA_SUPPLICANT_SITE = https://w1.fi/releases
 
 $(DL_DIR)/$(WPA_SUPPLICANT_SOURCE):
 	$(DOWNLOAD) $(WPA_SUPPLICANT_SITE)/$(WPA_SUPPLICANT_SOURCE)
@@ -1665,10 +1665,10 @@ wpa_supplicant: $(WPA_SUPPLICANT_DEPS) $(DL_DIR)/$(WPA_SUPPLICANT_SOURCE) | $(TA
 
 # -----------------------------------------------------------------------------
 
-XUPNPD_VER    = git
-XUPNPD_DIR    = xupnpd.$(XUPNPD_VER)
-XUPNPD_SOURCE = xupnpd.$(XUPNPD_VER)
-XUPNPD_SITE   = https://github.com/clark15b
+XUPNPD_VERSION = git
+XUPNPD_DIR = xupnpd.$(XUPNPD_VERSION)
+XUPNPD_SOURCE = xupnpd.$(XUPNPD_VERSION)
+XUPNPD_SITE = https://github.com/clark15b
 
 XUPNPD_CHECKOUT = 25d6d44
 
@@ -1702,10 +1702,10 @@ xupnpd: $(XUPNPD_DEPS) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-NFS_UTILS_VER    = 2.2.1
-NFS_UTILS_DIR    = nfs-utils-$(NFS_UTILS_VER)
-NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VER).tar.xz
-NFS_UTILS_SITE   = $(KERNEL_MIRROR)/linux/utils/nfs-utils/$(NFS_UTILS_VER)
+NFS_UTILS_VERSION = 2.2.1
+NFS_UTILS_DIR = nfs-utils-$(NFS_UTILS_VERSION)
+NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz
+NFS_UTILS_SITE = $(KERNEL_MIRROR)/linux/utils/nfs-utils/$(NFS_UTILS_VERSION)
 
 $(DL_DIR)/$(NFS_UTILS_SOURCE):
 	$(DOWNLOAD) $(NFS_UTILS_SITE)/$(NFS_UTILS_SOURCE)
@@ -1754,10 +1754,10 @@ nfs-utils: $(NFS_UTILS_DEPS) $(DL_DIR)/$(NFS_UTILS_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-RPCBIND_VER    = 1.2.5
-RPCBIND_DIR    = rpcbind-$(RPCBIND_VER)
-RPCBIND_SOURCE = rpcbind-$(RPCBIND_VER).tar.bz2
-RPCBIND_SITE   = https://sourceforge.net/projects/rpcbind/files/rpcbind/$(RPCBIND_VER)
+RPCBIND_VERSION = 1.2.5
+RPCBIND_DIR = rpcbind-$(RPCBIND_VERSION)
+RPCBIND_SOURCE = rpcbind-$(RPCBIND_VERSION).tar.bz2
+RPCBIND_SITE = https://sourceforge.net/projects/rpcbind/files/rpcbind/$(RPCBIND_VERSION)
 
 $(DL_DIR)/$(RPCBIND_SOURCE):
 	$(DOWNLOAD) $(RPCBIND_SITE)/$(RPCBIND_SOURCE)
@@ -1812,10 +1812,10 @@ streamripper: $(STREAMRIPPER_DEPS) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-GETTEXT_VER    = 0.19.8.1
-GETTEXT_DIR    = gettext-$(GETTEXT_VER)
-GETTEXT_SOURCE = gettext-$(GETTEXT_VER).tar.xz
-GETTEXT_SITE   = $(GNU_MIRROR)/gettext
+GETTEXT_VERSION = 0.19.8.1
+GETTEXT_DIR = gettext-$(GETTEXT_VERSION)
+GETTEXT_SOURCE = gettext-$(GETTEXT_VERSION).tar.xz
+GETTEXT_SITE = $(GNU_MIRROR)/gettext
 
 $(DL_DIR)/$(GETTEXT_SOURCE):
 	$(DOWNLOAD) $(GETTEXT_SITE)/$(GETTEXT_SOURCE)
@@ -1847,10 +1847,10 @@ gettext: $(DL_DIR)/$(GETTEXT_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-MC_VER    = 4.8.25
-MC_DIR    = mc-$(MC_VER)
-MC_SOURCE = mc-$(MC_VER).tar.xz
-MC_SITE   = ftp.midnight-commander.org
+MC_VERSION = 4.8.25
+MC_DIR = mc-$(MC_VERSION)
+MC_SOURCE = mc-$(MC_VERSION).tar.xz
+MC_SITE = ftp.midnight-commander.org
 
 $(DL_DIR)/$(MC_SOURCE):
 	$(DOWNLOAD) $(MC_SITE)/$(MC_SOURCE)
@@ -1889,10 +1889,10 @@ mc: $(MC_DEPS) $(DL_DIR)/$(MC_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-WGET_VER    = 1.20.3
-WGET_DIR    = wget-$(WGET_VER)
-WGET_SOURCE = wget-$(WGET_VER).tar.gz
-WGET_SITE   = $(GNU_MIRROR)/wget
+WGET_VERSION = 1.20.3
+WGET_DIR = wget-$(WGET_VERSION)
+WGET_SOURCE = wget-$(WGET_VERSION).tar.gz
+WGET_SITE = $(GNU_MIRROR)/wget
 
 $(DL_DIR)/$(WGET_SOURCE):
 	$(DOWNLOAD) $(WGET_SITE)/$(WGET_SOURCE)
@@ -1935,10 +1935,10 @@ ofgwrite: $(SOURCE_DIR)/$(NI_OFGWRITE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-AIO_GRAB_VER    = git
-AIO_GRAB_DIR    = aio-grab.$(AIO_GRAB_VER)
-AIO_GRAB_SOURCE = aio-grab.$(AIO_GRAB_VER)
-AIO_GRAB_SITE   = https://github.com/oe-alliance
+AIO_GRAB_VERSION = git
+AIO_GRAB_DIR = aio-grab.$(AIO_GRAB_VERSION)
+AIO_GRAB_SOURCE = aio-grab.$(AIO_GRAB_VERSION)
+AIO_GRAB_SITE = https://github.com/oe-alliance
 
 AIO_GRAB_DEPS   = zlib libpng libjpeg-turbo
 
@@ -1960,10 +1960,10 @@ aio-grab: $(AIO_GRAB_DEPS) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-DVBSNOOP_VER    = git
-DVBSNOOP_DIR    = dvbsnoop.$(DVBSNOOP_VER)
-DVBSNOOP_SOURCE = dvbsnoop.$(DVBSNOOP_VER)
-DVBSNOOP_SITE   = https://github.com/Duckbox-Developers
+DVBSNOOP_VERSION = git
+DVBSNOOP_DIR = dvbsnoop.$(DVBSNOOP_VERSION)
+DVBSNOOP_SOURCE = dvbsnoop.$(DVBSNOOP_VERSION)
+DVBSNOOP_SITE = https://github.com/Duckbox-Developers
 
 DVBSNOOP_CONF-OPTS = \
 	--enable-silent-rules
@@ -1981,10 +1981,10 @@ dvbsnoop: | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-DVB_APPS_VER    = git
-DVB_APPS_DIR    = dvb-apps.$(DVB_APPS_VER)
-DVB_APPS_SOURCE = dvb-apps.$(DVB_APPS_VER)
-DVB_APPS_SITE   = https://github.com/openpli-arm
+DVB_APPS_VERSION = git
+DVB_APPS_DIR = dvb-apps.$(DVB_APPS_VERSION)
+DVB_APPS_SOURCE = dvb-apps.$(DVB_APPS_VERSION)
+DVB_APPS_SITE = https://github.com/openpli-arm
 
 DVB_APPS_DEPS = kernel libiconv
 
@@ -2007,10 +2007,10 @@ dvb-apps: $(DVB_APPS_DEPS) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-MINISATIP_VER    = git
-MINISATIP_DIR    = minisatip.$(MINISATIP_VER)
-MINISATIP_SOURCE = minisatip.$(MINISATIP_VER)
-MINISATIP_SITE   = https://github.com/catalinii
+MINISATIP_VERSION = git
+MINISATIP_DIR = minisatip.$(MINISATIP_VERSION)
+MINISATIP_SOURCE = minisatip.$(MINISATIP_VERSION)
+MINISATIP_SITE = https://github.com/catalinii
 
 MINISATIP_DEPS = libdvbcsa openssl dvb-apps
 
@@ -2039,10 +2039,10 @@ minisatip: $(MINISATIP_DEPS) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-ETHTOOL_VER    = 5.10
-ETHTOOL_DIR    = ethtool-$(ETHTOOL_VER)
-ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VER).tar.xz
-ETHTOOL_SITE   = $(KERNEL_MIRROR)/software/network/ethtool
+ETHTOOL_VERSION = 5.10
+ETHTOOL_DIR = ethtool-$(ETHTOOL_VERSION)
+ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz
+ETHTOOL_SITE = $(KERNEL_MIRROR)/software/network/ethtool
 
 $(DL_DIR)/$(ETHTOOL_SOURCE):
 	$(DOWNLOAD) $(ETHTOOL_SITE)/$(ETHTOOL_SOURCE)
@@ -2064,10 +2064,10 @@ ethtool: $(DL_DIR)/$(ETHTOOL_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-GPTFDISK_VER    = 1.0.4
-GPTFDISK_DIR    = gptfdisk-$(GPTFDISK_VER)
-GPTFDISK_SOURCE = gptfdisk-$(GPTFDISK_VER).tar.gz
-GPTFDISK_SITE   = https://sourceforge.net/projects/gptfdisk/files/gptfdisk/$(GPTFDISK_VER)
+GPTFDISK_VERSION = 1.0.4
+GPTFDISK_DIR = gptfdisk-$(GPTFDISK_VERSION)
+GPTFDISK_SOURCE = gptfdisk-$(GPTFDISK_VERSION).tar.gz
+GPTFDISK_SITE = https://sourceforge.net/projects/gptfdisk/files/gptfdisk/$(GPTFDISK_VERSION)
 
 $(DL_DIR)/$(GPTFDISK_SOURCE):
 	$(DOWNLOAD) $(GPTFDISK_SITE)/$(GPTFDISK_SOURCE)
@@ -2091,10 +2091,10 @@ gptfdisk: $(GPTFDISK_DEPS) $(DL_DIR)/$(GPTFDISK_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-RSYNC_VER    = 3.1.3
-RSYNC_DIR    = rsync-$(RSYNC_VER)
-RSYNC_SOURCE = rsync-$(RSYNC_VER).tar.gz
-RSYNC_SITE   = https://download.samba.org/pub/rsync/src/
+RSYNC_VERSION = 3.1.3
+RSYNC_DIR = rsync-$(RSYNC_VERSION)
+RSYNC_SOURCE = rsync-$(RSYNC_VERSION).tar.gz
+RSYNC_SITE = https://download.samba.org/pub/rsync/src/
 
 $(DL_DIR)/$(RSYNC_SOURCE):
 	$(DOWNLOAD) $(RSYNC_SITE)/$(RSYNC_SOURCE)
@@ -2120,10 +2120,10 @@ rsync: $(RSYNC_DEPS) $(DL_DIR)/$(RSYNC_SOURCE) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-FLAC_VER    = 1.3.3
-FLAC_DIR    = flac-$(FLAC_VER)
-FLAC_SOURCE = flac-$(FLAC_VER).tar.xz
-FLAC_SITE   = http://downloads.xiph.org/releases/flac
+FLAC_VERSION = 1.3.3
+FLAC_DIR = flac-$(FLAC_VERSION)
+FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz
+FLAC_SITE = http://downloads.xiph.org/releases/flac
 
 $(DL_DIR)/$(FLAC_SOURCE):
 	$(DOWNLOAD) $(FLAC_SITE)/$(FLAC_SOURCE)
@@ -2155,7 +2155,7 @@ flac: $(DL_DIR)/$(FLAC_SOURCE) | $(TARGET_DIR)
 # -----------------------------------------------------------------------------
 
 CA_BUNDLE_SOURCE = cacert.pem
-CA_BUNDLE_SITE   = https://curl.se/ca
+CA_BUNDLE_SITE = https://curl.se/ca
 
 $(DL_DIR)/$(CA_BUNDLE_SOURCE):
 	$(DOWNLOAD) $(CA_BUNDLE_SITE)/$(CA_BUNDLE_SOURCE)