diff --git a/packages/devel/arm-mem/package.mk b/packages/devel/arm-mem/package.mk
index 5080f48a9d..5836689ad9 100644
--- a/packages/devel/arm-mem/package.mk
+++ b/packages/devel/arm-mem/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="93240defef3abba7d42a7420e55ae4f8b90cc99ef16044fdfb8b5820a17e766d"
 PKG_ARCH="arm"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/bavison/arm-mem"
-PKG_URL="https://github.com/bavison/arm-mem/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/bavison/arm-mem/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_DEPENDS_INIT="toolchain arm-mem"
 PKG_LONGDESC="arm-mem is a ARM-accelerated versions of selected functions from string.h"
@@ -20,10 +20,10 @@ else
   PKG_LIB_ARM_MEM="libarmmem-v6l.so"
 fi
 
-PKG_MAKE_OPTS_TARGET="$PKG_LIB_ARM_MEM"
+PKG_MAKE_OPTS_TARGET="${PKG_LIB_ARM_MEM}"
 
 pre_make_target() {
-  export CROSS_COMPILE=$TARGET_PREFIX
+  export CROSS_COMPILE=${TARGET_PREFIX}
 }
 
 make_init() {
@@ -31,17 +31,17 @@ make_init() {
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/usr/lib
-    cp -P $PKG_LIB_ARM_MEM $INSTALL/usr/lib
+  mkdir -p ${INSTALL}/usr/lib
+    cp -P ${PKG_LIB_ARM_MEM} ${INSTALL}/usr/lib
 
-  mkdir -p $INSTALL/etc
-    echo "/usr/lib/$PKG_LIB_ARM_MEM" >> $INSTALL/etc/ld.so.preload
+  mkdir -p ${INSTALL}/etc
+    echo "/usr/lib/${PKG_LIB_ARM_MEM}" >> ${INSTALL}/etc/ld.so.preload
 }
 
 makeinstall_init() {
-  mkdir -p $INSTALL/usr/lib
-    cp -P $PKG_LIB_ARM_MEM $INSTALL/usr/lib
+  mkdir -p ${INSTALL}/usr/lib
+    cp -P ${PKG_LIB_ARM_MEM} ${INSTALL}/usr/lib
 
-  mkdir -p $INSTALL/etc
-    echo "/usr/lib/$PKG_LIB_ARM_MEM" >> $INSTALL/etc/ld.so.preload
+  mkdir -p ${INSTALL}/etc
+    echo "/usr/lib/${PKG_LIB_ARM_MEM}" >> ${INSTALL}/etc/ld.so.preload
 }
diff --git a/packages/devel/attr/package.mk b/packages/devel/attr/package.mk
index 6efffd49e2..12a624ee91 100644
--- a/packages/devel/attr/package.mk
+++ b/packages/devel/attr/package.mk
@@ -8,7 +8,7 @@ PKG_VERSION="2.4.48"
 PKG_SHA256="5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7"
 PKG_LICENSE="GPL"
 PKG_SITE="https://savannah.nongnu.org/projects/attr"
-PKG_URL="http://download.savannah.nongnu.org/releases/attr/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://download.savannah.nongnu.org/releases/attr/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Extended Attributes Of Filesystem Objects."
 PKG_BUILD_FLAGS="+pic"
@@ -19,15 +19,15 @@ PKG_CONFIGURE_OPTS_TARGET="OPTIMIZER= \
                            --disable-shared --enable-static"
 
 if build_with_debug; then
-  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET DEBUG=-DDEBUG"
+  PKG_CONFIGURE_OPTS_TARGET+=" DEBUG=-DDEBUG"
 else
-  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET DEBUG=-DNDEBUG"
+  PKG_CONFIGURE_OPTS_TARGET+=" DEBUG=-DNDEBUG"
 fi
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/
-    cp .libs/libattr.a $SYSROOT_PREFIX/usr/lib/
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/
+    cp .libs/libattr.a ${SYSROOT_PREFIX}/usr/lib/
 
-  mkdir -p $SYSROOT_PREFIX/usr/include/attr
-    cp include/*.h $SYSROOT_PREFIX/usr/include/attr
+  mkdir -p ${SYSROOT_PREFIX}/usr/include/attr
+    cp include/*.h ${SYSROOT_PREFIX}/usr/include/attr
 }
diff --git a/packages/devel/autoconf-archive/package.mk b/packages/devel/autoconf-archive/package.mk
index ce08052263..cfd912670b 100644
--- a/packages/devel/autoconf-archive/package.mk
+++ b/packages/devel/autoconf-archive/package.mk
@@ -7,16 +7,16 @@ PKG_VERSION="2019.01.06"
 PKG_SHA256="17195c833098da79de5778ee90948f4c5d90ed1a0cf8391b4ab348e2ec511e3f"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.gnu.org/software/autoconf-archive/"
-PKG_URL="http://ftpmirror.gnu.org/autoconf-archive/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://ftpmirror.gnu.org/autoconf-archive/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="ccache:host"
 PKG_LONGDESC="autoconf-archive is an package of m4 macros"
 
-PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME --prefix=$TOOLCHAIN"
+PKG_CONFIGURE_OPTS_HOST="--target=${TARGET_NAME} --prefix=${TOOLCHAIN}"
 
 makeinstall_host() {
 # make install
-  make prefix=$SYSROOT_PREFIX/usr install
+  make prefix=${SYSROOT_PREFIX}/usr install
 
 # remove problematic m4 file
-  rm -rf $SYSROOT_PREFIX/usr/share/aclocal/ax_prog_cc_for_build.m4
+  rm -rf ${SYSROOT_PREFIX}/usr/share/aclocal/ax_prog_cc_for_build.m4
 }
diff --git a/packages/devel/autoconf/package.mk b/packages/devel/autoconf/package.mk
index 5ab7b4b51d..18172507ab 100644
--- a/packages/devel/autoconf/package.mk
+++ b/packages/devel/autoconf/package.mk
@@ -6,15 +6,15 @@ PKG_VERSION="2.69"
 PKG_SHA256="64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684"
 PKG_LICENSE="GPL"
 PKG_SITE="http://sources.redhat.com/autoconf/"
-PKG_URL="http://ftpmirror.gnu.org/autoconf/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://ftpmirror.gnu.org/autoconf/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="ccache:host m4:host gettext:host"
 PKG_LONGDESC="A GNU tool for automatically configuring source code."
 
 PKG_CONFIGURE_OPTS_HOST="EMACS=no \
-                         ac_cv_path_M4=$TOOLCHAIN/bin/m4 \
+                         ac_cv_path_M4=${TOOLCHAIN}/bin/m4 \
                          ac_cv_prog_gnu_m4_gnu=no \
-                         --target=$TARGET_NAME"
+                         --target=${TARGET_NAME}"
 
 post_makeinstall_host() {
-  make prefix=$SYSROOT_PREFIX/usr install
+  make prefix=${SYSROOT_PREFIX}/usr install
 }
diff --git a/packages/devel/automake/package.mk b/packages/devel/automake/package.mk
index 0f371369e6..4b7ccd6a6f 100644
--- a/packages/devel/automake/package.mk
+++ b/packages/devel/automake/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="1.15.1"
 PKG_SHA256="af6ba39142220687c500f79b4aa2f181d9b24e4f8d8ec497cea4ba26c64bedaf"
 PKG_LICENSE="GPL"
 PKG_SITE="http://sources.redhat.com/automake/"
-PKG_URL="http://ftpmirror.gnu.org/automake/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://ftpmirror.gnu.org/automake/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="ccache:host autoconf:host"
 PKG_LONGDESC="A GNU tool for automatically creating Makefiles."
 
-PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME --disable-silent-rules"
+PKG_CONFIGURE_OPTS_HOST="--target=${TARGET_NAME} --disable-silent-rules"
 
 post_makeinstall_host() {
-  make prefix=$SYSROOT_PREFIX/usr install
+  make prefix=${SYSROOT_PREFIX}/usr install
 }
diff --git a/packages/devel/binutils/package.mk b/packages/devel/binutils/package.mk
index 0bdf46ab00..b730315409 100644
--- a/packages/devel/binutils/package.mk
+++ b/packages/devel/binutils/package.mk
@@ -7,14 +7,14 @@ PKG_VERSION="2.35.1"
 PKG_SHA256="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/binutils/"
-PKG_URL="http://ftp.gnu.org/gnu/binutils/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://ftp.gnu.org/gnu/binutils/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="ccache:host bison:host flex:host linux:host"
 PKG_DEPENDS_TARGET="toolchain zlib binutils:host"
 PKG_LONGDESC="A GNU collection of binary utilities."
 
-PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \
-                         --with-sysroot=$SYSROOT_PREFIX \
-                         --with-lib-path=$SYSROOT_PREFIX/lib:$SYSROOT_PREFIX/usr/lib \
+PKG_CONFIGURE_OPTS_HOST="--target=${TARGET_NAME} \
+                         --with-sysroot=${SYSROOT_PREFIX} \
+                         --with-lib-path=${SYSROOT_PREFIX}/lib:${SYSROOT_PREFIX}/usr/lib \
                          --without-ppl \
                          --without-cloog \
                          --disable-werror \
@@ -28,9 +28,9 @@ PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \
                          --enable-lto \
                          --disable-nls"
 
-PKG_CONFIGURE_OPTS_TARGET="--target=$TARGET_NAME \
-                         --with-sysroot=$SYSROOT_PREFIX \
-                         --with-lib-path=$SYSROOT_PREFIX/lib:$SYSROOT_PREFIX/usr/lib \
+PKG_CONFIGURE_OPTS_TARGET="--target=${TARGET_NAME} \
+                         --with-sysroot=${SYSROOT_PREFIX} \
+                         --with-lib-path=${SYSROOT_PREFIX}/lib:${SYSROOT_PREFIX}/usr/lib \
                          --with-system-zlib \
                          --without-ppl \
                          --without-cloog \
@@ -59,7 +59,7 @@ make_host() {
 }
 
 makeinstall_host() {
-  cp -v ../include/libiberty.h $SYSROOT_PREFIX/usr/include
+  cp -v ../include/libiberty.h ${SYSROOT_PREFIX}/usr/include
   make install
 }
 
@@ -72,10 +72,10 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib
-    cp libiberty/libiberty.a $SYSROOT_PREFIX/usr/lib
-  make DESTDIR="$SYSROOT_PREFIX" -C bfd install
-  make DESTDIR="$SYSROOT_PREFIX" -C opcodes install
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib
+    cp libiberty/libiberty.a ${SYSROOT_PREFIX}/usr/lib
+  make DESTDIR="${SYSROOT_PREFIX}" -C bfd install
+  make DESTDIR="${SYSROOT_PREFIX}" -C opcodes install
 
   mkdir -p ${INSTALL}/usr/bin
     cp binutils/strings ${INSTALL}/usr/bin
diff --git a/packages/devel/bison/package.mk b/packages/devel/bison/package.mk
index 65a0504743..4afde171f2 100644
--- a/packages/devel/bison/package.mk
+++ b/packages/devel/bison/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="3.7.4"
 PKG_SHA256="a3b5813f48a11e540ef26f46e4d288c0c25c7907d9879ae50e430ec49f63c010"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/bison/"
-PKG_URL="http://ftpmirror.gnu.org/bison/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://ftpmirror.gnu.org/bison/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="ccache:host m4:host"
 PKG_LONGDESC="A general-purpose parser generator."
 PKG_BUILD_FLAGS="-parallel"
@@ -17,6 +17,6 @@ PKG_CONFIGURE_OPTS_HOST="--disable-rpath --with-gnu-ld"
 post_configure_host() {
 # The configure system causes Bison to be built without support for
 # internationalization of error messages if a bison program is not already in
-# $PATH. The following addition will correct this:
+# ${PATH}. The following addition will correct this:
   echo '#define YYENABLE_NLS 1' >> lib/config.h
 }
diff --git a/packages/devel/boost/package.mk b/packages/devel/boost/package.mk
index 730ba69273..33bfb25f2d 100644
--- a/packages/devel/boost/package.mk
+++ b/packages/devel/boost/package.mk
@@ -20,31 +20,31 @@ make_host() {
 }
 
 makeinstall_host() {
-  mkdir -p $TOOLCHAIN/bin
-    cp bjam $TOOLCHAIN/bin
+  mkdir -p ${TOOLCHAIN}/bin
+    cp bjam ${TOOLCHAIN}/bin
 }
 
 pre_configure_target() {
-  export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/$PKG_PYTHON_VERSION"
-  export CXXFLAGS="$CXXFLAGS -I$SYSROOT_PREFIX/usr/include/$PKG_PYTHON_VERSION"
+  export CFLAGS="${CFLAGS} -I${SYSROOT_PREFIX}/usr/include/${PKG_PYTHON_VERSION}"
+  export CXXFLAGS="${CXXFLAGS} -I${SYSROOT_PREFIX}/usr/include/${PKG_PYTHON_VERSION}"
 }
 
 configure_target() {
   sh bootstrap.sh --prefix=/usr \
-                  --with-bjam=$TOOLCHAIN/bin/bjam \
-                  --with-python=$TOOLCHAIN/bin/python \
-                  --with-python-root=$SYSROOT_PREFIX/usr
+                  --with-bjam=${TOOLCHAIN}/bin/bjam \
+                  --with-python=${TOOLCHAIN}/bin/python \
+                  --with-python-root=${SYSROOT_PREFIX}/usr
 
-  echo "using gcc : `$CC -v 2>&1  | tail -n 1 |awk '{print $3}'` : $CC  : <compileflags>\"$CFLAGS\" <linkflags>\"$LDFLAGS\" ;" \
+  echo "using gcc : $(${CC} -v 2>&1  | tail -n 1 |awk '{print $3}') : ${CC}  : <compileflags>\"${CFLAGS}\" <linkflags>\"${LDFLAGS}\" ;" \
     > tools/build/src/user-config.jam
-  echo "using python : ${PKG_PYTHON_VERSION/#python} : $TOOLCHAIN : $SYSROOT_PREFIX/usr/include : $SYSROOT_PREFIX/usr/lib ;" \
+  echo "using python : ${PKG_PYTHON_VERSION/#python} : ${TOOLCHAIN} : ${SYSROOT_PREFIX}/usr/include : ${SYSROOT_PREFIX}/usr/lib ;" \
     >> tools/build/src/user-config.jam
 }
 
 makeinstall_target() {
-  $TOOLCHAIN/bin/bjam -d2 --ignore-site-config \
+  ${TOOLCHAIN}/bin/bjam -d2 --ignore-site-config \
                           --layout=system \
-                          --prefix=$SYSROOT_PREFIX/usr \
+                          --prefix=${SYSROOT_PREFIX}/usr \
                           --toolset=gcc link=static \
                           --with-chrono \
                           --with-date_time \
@@ -52,7 +52,7 @@ makeinstall_target() {
                           --with-iostreams \
                           --with-python \
                           --with-random \
-                          --with-regex -sICU_PATH="$SYSROOT_PREFIX/usr" \
+                          --with-regex -sICU_PATH="${SYSROOT_PREFIX}/usr" \
                           --with-serialization \
                           --with-system \
                           --with-thread \
diff --git a/packages/devel/ccache/package.mk b/packages/devel/ccache/package.mk
index 6860d9d193..7ed5c185ec 100644
--- a/packages/devel/ccache/package.mk
+++ b/packages/devel/ccache/package.mk
@@ -7,34 +7,34 @@ PKG_VERSION="3.7.12"
 PKG_SHA256="a02f4e8360dc6618bc494ca35b0ae21cea080f804a4898eab1ad3fcd108eb400"
 PKG_LICENSE="GPL"
 PKG_SITE="https://ccache.dev/download.html"
-PKG_URL="https://github.com/ccache/ccache/releases/download/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://github.com/ccache/ccache/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="make:host"
 PKG_LONGDESC="A compiler cache to speed up re-compilation of C/C++ code by caching."
 
 PKG_CONFIGURE_OPTS_HOST="--with-bundled-zlib"
 
 pre_configure_host() {
-  export CC=$LOCAL_CC
-  export CXX=$LOCAL_CXX
+  export CC=${LOCAL_CC}
+  export CXX=${LOCAL_CXX}
 }
 
 post_makeinstall_host() {
 # setup ccache
-  if [ -z "$CCACHE_DISABLE" ]; then
-    $TOOLCHAIN/bin/ccache --max-size=$CCACHE_CACHE_SIZE
+  if [ -z "${CCACHE_DISABLE}" ]; then
+    ${TOOLCHAIN}/bin/ccache --max-size=${CCACHE_CACHE_SIZE}
   fi
 
-  cat > $TOOLCHAIN/bin/host-gcc <<EOF
+  cat > ${TOOLCHAIN}/bin/host-gcc <<EOF
 #!/bin/sh
-$TOOLCHAIN/bin/ccache $CC "\$@"
+${TOOLCHAIN}/bin/ccache ${CC} "\$@"
 EOF
 
-  chmod +x $TOOLCHAIN/bin/host-gcc
+  chmod +x ${TOOLCHAIN}/bin/host-gcc
 
-  cat > $TOOLCHAIN/bin/host-g++ <<EOF
+  cat > ${TOOLCHAIN}/bin/host-g++ <<EOF
 #!/bin/sh
-$TOOLCHAIN/bin/ccache $CXX "\$@"
+${TOOLCHAIN}/bin/ccache ${CXX} "\$@"
 EOF
 
-  chmod +x $TOOLCHAIN/bin/host-g++
+  chmod +x ${TOOLCHAIN}/bin/host-g++
 }
diff --git a/packages/devel/configtools/package.mk b/packages/devel/configtools/package.mk
index f6e41b4762..6f4a009eb8 100644
--- a/packages/devel/configtools/package.mk
+++ b/packages/devel/configtools/package.mk
@@ -7,12 +7,12 @@ PKG_VERSION="c8ddc8472f8efcadafc1ef53ca1d863415fddd5f" # 2020-12-22
 PKG_SHA256="6389d62e4e55554c764c2c0deb5b42767f34d7f274728c28355fedbaa337165b"
 PKG_LICENSE="GPL"
 PKG_SITE="http://git.savannah.gnu.org/cgit/config.git"
-PKG_URL="http://git.savannah.gnu.org/cgit/config.git/snapshot/config-$PKG_VERSION.tar.gz"
+PKG_URL="http://git.savannah.gnu.org/cgit/config.git/snapshot/config-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST=""
 PKG_LONGDESC="configtools"
 PKG_TOOLCHAIN="manual"
 
 makeinstall_host() {
-  mkdir -p $TOOLCHAIN/configtools
-  cp config.* $TOOLCHAIN/configtools
+  mkdir -p ${TOOLCHAIN}/configtools
+  cp config.* ${TOOLCHAIN}/configtools
 }
diff --git a/packages/devel/crossguid/package.mk b/packages/devel/crossguid/package.mk
index aeab7a5faf..cb08fe613d 100644
--- a/packages/devel/crossguid/package.mk
+++ b/packages/devel/crossguid/package.mk
@@ -6,19 +6,19 @@ PKG_VERSION="8f399e8bd4252be9952f3dfa8199924cc8487ca4"
 PKG_SHA256="022c9f02cc36e865cd8fd0111a597ff2bd91988deeb348dbe2aba64aed1abd99"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/graeme-hill/crossguid"
-PKG_URL="https://github.com/graeme-hill/crossguid/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/graeme-hill/crossguid/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain util-linux"
 PKG_LONGDESC="minimal, cross platform, C++ GUID library"
 PKG_TOOLCHAIN="manual"
 
 make_target() {
-  $CXX -c guid.cpp -o guid.o $CXXFLAGS -std=c++11 -DGUID_LIBUUID
-  $AR rvs libcrossguid.a guid.o
+  ${CXX} -c guid.cpp -o guid.o ${CXXFLAGS} -std=c++11 -DGUID_LIBUUID
+  ${AR} rvs libcrossguid.a guid.o
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib/
-  cp libcrossguid.a $SYSROOT_PREFIX/usr/lib/
-  mkdir -p $SYSROOT_PREFIX/usr/include/
-  cp guid.h $SYSROOT_PREFIX/usr/include
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/
+  cp libcrossguid.a ${SYSROOT_PREFIX}/usr/lib/
+  mkdir -p ${SYSROOT_PREFIX}/usr/include/
+  cp guid.h ${SYSROOT_PREFIX}/usr/include
 }
diff --git a/packages/devel/dbus-glib/package.mk b/packages/devel/dbus-glib/package.mk
index c2fb9189d3..205973e03e 100644
--- a/packages/devel/dbus-glib/package.mk
+++ b/packages/devel/dbus-glib/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="0.110"
 PKG_SHA256="7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825"
 PKG_LICENSE="GPL"
 PKG_SITE="https://freedesktop.org/wiki/Software/dbus"
-PKG_URL="https://dbus.freedesktop.org/releases/dbus-glib/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://dbus.freedesktop.org/releases/dbus-glib/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain dbus glib expat"
 PKG_LONGDESC="A message bus, used for sending messages between applications."
 PKG_TOOLCHAIN="autotools"
@@ -23,5 +23,5 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_have_abstract_sockets=yes \
                            --enable-asserts=no"
 
 post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin/dbus-binding-tool
+  rm -rf ${INSTALL}/usr/bin/dbus-binding-tool
 }
diff --git a/packages/devel/elfutils/package.mk b/packages/devel/elfutils/package.mk
index 71f6fd82bb..48c56c45b6 100644
--- a/packages/devel/elfutils/package.mk
+++ b/packages/devel/elfutils/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="0.182"
 PKG_SHA256="ecc406914edf335f0b7fc084ebe6c460c4d6d5175bfdd6688c1c78d9146b8858"
 PKG_LICENSE="GPL"
 PKG_SITE="https://sourceware.org/elfutils/"
-PKG_URL="https://sourceware.org/elfutils/ftp/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="https://sourceware.org/elfutils/ftp/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_HOST="make:host zlib:host"
 PKG_DEPENDS_TARGET="toolchain zlib elfutils:host"
 PKG_LONGDESC="A collection of utilities to handle ELF objects."
diff --git a/packages/devel/fakeroot/package.mk b/packages/devel/fakeroot/package.mk
index f41c924ddd..fe858206dc 100644
--- a/packages/devel/fakeroot/package.mk
+++ b/packages/devel/fakeroot/package.mk
@@ -15,6 +15,6 @@ PKG_TOOLCHAIN="configure"
 PKG_CONFIGURE_OPTS_HOST="--with-gnu-ld"
 
 pre_configure_host() {
-  cd $PKG_BUILD
+  cd ${PKG_BUILD}
   ./bootstrap
 }
diff --git a/packages/devel/flatbuffers/package.mk b/packages/devel/flatbuffers/package.mk
index 08c68a407a..8679e74831 100644
--- a/packages/devel/flatbuffers/package.mk
+++ b/packages/devel/flatbuffers/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="1.12.0"
 PKG_SHA256="62f2223fb9181d1d6338451375628975775f7522185266cd5296571ac152bc45"
 PKG_LICENSE="Apache-2.0"
 PKG_SITE="https://github.com/google/flatbuffers"
-PKG_URL="https://github.com/google/flatbuffers/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/google/flatbuffers/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="An efficient cross platform serialization library for games and other memory constrained apps."
@@ -30,10 +30,10 @@ PKG_CMAKE_OPTS_TARGET="-DFLATBUFFERS_CODE_COVERAGE=OFF \
                        -DFLATBUFFERS_BUILD_SHAREDLIB=OFF"
 
 pre_configure_host() {
-  export CXXFLAGS="$CXXFLAGS -std=c++11"
+  export CXXFLAGS="${CXXFLAGS} -std=c++11"
 }
 
 post_makeinstall_host() {
-  mkdir -p $TOOLCHAIN/bin
-    cp -PR $PKG_BUILD/.$HOST_NAME/flatc $TOOLCHAIN/bin
+  mkdir -p ${TOOLCHAIN}/bin
+    cp -PR ${PKG_BUILD}/.${HOST_NAME}/flatc ${TOOLCHAIN}/bin
 }
diff --git a/packages/devel/flex/package.mk b/packages/devel/flex/package.mk
index a0981746a7..7a35ff90e1 100644
--- a/packages/devel/flex/package.mk
+++ b/packages/devel/flex/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="2.6.4"
 PKG_SHA256="e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/westes/flex"
-PKG_URL="https://github.com/westes/flex/releases/download/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/westes/flex/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="ccache:host m4:host autotools:host bison:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A tool for generating programs that perform pattern-matching on text."
@@ -19,10 +19,10 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_realloc_0_nonnull=yes \
                            ac_cv_func_malloc_0_nonnull=yes"
 
 post_makeinstall_host() {
-  cat > $TOOLCHAIN/bin/lex << "EOF"
+  cat > ${TOOLCHAIN}/bin/lex << "EOF"
 #!/bin/sh
 exec flex "$@"
 EOF
 
-  chmod -v 755 $TOOLCHAIN/bin/lex
+  chmod -v 755 ${TOOLCHAIN}/bin/lex
 }
diff --git a/packages/devel/fribidi/package.mk b/packages/devel/fribidi/package.mk
index e0352c8c18..9b86b4531b 100644
--- a/packages/devel/fribidi/package.mk
+++ b/packages/devel/fribidi/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="1.0.10"
 PKG_SHA256="7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://fribidi.freedesktop.org/"
-PKG_URL="https://github.com/fribidi/fribidi/releases/download/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://github.com/fribidi/fribidi/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A bidirectional algorithm library."
 PKG_TOOLCHAIN="meson"
@@ -18,9 +18,9 @@ PKG_MESON_OPTS_TARGET="-Ddeprecated=false \
                        -Ddefault_library=static"
 
 post_makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/bin
-    cp -f $PKG_DIR/scripts/fribidi-config $SYSROOT_PREFIX/usr/bin
-    chmod +x $SYSROOT_PREFIX/usr/bin/fribidi-config
+  mkdir -p ${SYSROOT_PREFIX}/usr/bin
+    cp -f ${PKG_DIR}/scripts/fribidi-config ${SYSROOT_PREFIX}/usr/bin
+    chmod +x ${SYSROOT_PREFIX}/usr/bin/fribidi-config
 
-  rm -rf $INSTALL/usr/bin
+  rm -rf ${INSTALL}/usr/bin
 }
diff --git a/packages/devel/gettext/package.mk b/packages/devel/gettext/package.mk
index 2e256fbaee..f98b53ad81 100644
--- a/packages/devel/gettext/package.mk
+++ b/packages/devel/gettext/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="0.21"
 PKG_SHA256="d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/s/gettext/"
-PKG_URL="http://ftp.gnu.org/pub/gnu/gettext/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://ftp.gnu.org/pub/gnu/gettext/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="ccache:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A program internationalization library and tools."
diff --git a/packages/devel/glib/package.mk b/packages/devel/glib/package.mk
index 478cfc5d7d..c157de8206 100644
--- a/packages/devel/glib/package.mk
+++ b/packages/devel/glib/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="2.67.2"
 PKG_SHA256="b41d42d6c572e1e420ffc38a077e0157e0b53b5a94c9647a3dc3701043c3b69b"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.gtk.org/"
-PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/$(get_pkg_version_maj_min)/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/$(get_pkg_version_maj_min)/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="libffi:host Python3:host meson:host ninja:host"
 PKG_DEPENDS_TARGET="toolchain pcre zlib libffi Python3:host util-linux"
 PKG_LONGDESC="A library which includes support routines for C such as lists, trees, hashes, memory allocation."
@@ -40,9 +40,9 @@ growing_stack=false
 va_val_copy=false"
 
 post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin
-  rm -rf $INSTALL/usr/lib/gdbus-2.0
-  rm -rf $INSTALL/usr/lib/glib-2.0
-  rm -rf $INSTALL/usr/lib/installed-tests
-  rm -rf $INSTALL/usr/share
+  rm -rf ${INSTALL}/usr/bin
+  rm -rf ${INSTALL}/usr/lib/gdbus-2.0
+  rm -rf ${INSTALL}/usr/lib/glib-2.0
+  rm -rf ${INSTALL}/usr/lib/installed-tests
+  rm -rf ${INSTALL}/usr/share
 }
diff --git a/packages/devel/glibc/package.mk b/packages/devel/glibc/package.mk
index 68b2ec98dd..bd0da7d7fc 100644
--- a/packages/devel/glibc/package.mk
+++ b/packages/devel/glibc/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="2.32"
 PKG_SHA256="1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/libc/"
-PKG_URL="http://ftp.gnu.org/pub/gnu/glibc/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://ftp.gnu.org/pub/gnu/glibc/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="ccache:host autotools:host linux:host gcc:bootstrap pigz:host Python3:host"
 PKG_DEPENDS_INIT="glibc"
 PKG_LONGDESC="The Glibc package contains the main C library."
@@ -25,8 +25,8 @@ PKG_CONFIGURE_OPTS_TARGET="BASH_SHELL=/bin/sh \
                            --with-elf \
                            --with-tls \
                            --with-__thread \
-                           --with-binutils=$BUILD/toolchain/bin \
-                           --with-headers=$SYSROOT_PREFIX/usr/include \
+                           --with-binutils=${BUILD}/toolchain/bin \
+                           --with-headers=${SYSROOT_PREFIX}/usr/include \
                            --enable-kernel=5.4.0 \
                            --without-cvs \
                            --without-gd \
@@ -36,9 +36,9 @@ PKG_CONFIGURE_OPTS_TARGET="BASH_SHELL=/bin/sh \
                            --disable-timezone-tools"
 
 if build_with_debug; then
-  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-debug"
+  PKG_CONFIGURE_OPTS_TARGET+=" --enable-debug"
 else
-  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-debug"
+  PKG_CONFIGURE_OPTS_TARGET+=" --disable-debug"
 fi
 
 post_unpack() {
@@ -46,7 +46,7 @@ post_unpack() {
 }
 
 pre_build_target() {
-  cd $PKG_BUILD
+  cd ${PKG_BUILD}
     aclocal --force --verbose
     autoconf --force --verbose
   cd -
@@ -54,26 +54,26 @@ pre_build_target() {
 
 pre_configure_target() {
 # Filter out some problematic *FLAGS
-  export CFLAGS=`echo $CFLAGS | sed -e "s|-ffast-math||g"`
-  export CFLAGS=`echo $CFLAGS | sed -e "s|-Ofast|-O2|g"`
-  export CFLAGS=`echo $CFLAGS | sed -e "s|-O.|-O2|g"`
+  export CFLAGS=$(echo ${CFLAGS} | sed -e "s|-ffast-math||g")
+  export CFLAGS=$(echo ${CFLAGS} | sed -e "s|-Ofast|-O2|g")
+  export CFLAGS=$(echo ${CFLAGS} | sed -e "s|-O.|-O2|g")
 
-  if [ -n "$PROJECT_CFLAGS" ]; then
-    export CFLAGS=`echo $CFLAGS | sed -e "s|$PROJECT_CFLAGS||g"`
+  if [ -n "${PROJECT_CFLAGS}" ]; then
+    export CFLAGS=$(echo ${CFLAGS} | sed -e "s|${PROJECT_CFLAGS}||g")
   fi
 
-  export LDFLAGS=`echo $LDFLAGS | sed -e "s|-ffast-math||g"`
-  export LDFLAGS=`echo $LDFLAGS | sed -e "s|-Ofast|-O2|g"`
-  export LDFLAGS=`echo $LDFLAGS | sed -e "s|-O.|-O2|g"`
+  export LDFLAGS=$(echo ${LDFLAGS} | sed -e "s|-ffast-math||g")
+  export LDFLAGS=$(echo ${LDFLAGS} | sed -e "s|-Ofast|-O2|g")
+  export LDFLAGS=$(echo ${LDFLAGS} | sed -e "s|-O.|-O2|g")
 
-  export LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
+  export LDFLAGS=$(echo ${LDFLAGS} | sed -e "s|-Wl,--as-needed||")
 
   unset LD_LIBRARY_PATH
 
   # set some CFLAGS we need
-  export CFLAGS="$CFLAGS -g -fno-stack-protector"
+  export CFLAGS="${CFLAGS} -g -fno-stack-protector"
 
-  export BUILD_CC=$HOST_CC
+  export BUILD_CC=${HOST_CC}
   export OBJDUMP_FOR_HOST=objdump
 
   cat >config.cache <<EOF
@@ -97,60 +97,60 @@ EOF
 }
 
 post_makeinstall_target() {
-  mkdir -p $INSTALL/.noinstall
-    cp -p $INSTALL/usr/bin/localedef $INSTALL/.noinstall
-    cp -a $INSTALL/usr/share/i18n/locales $INSTALL/.noinstall
-    mv $INSTALL/usr/share/i18n/charmaps $INSTALL/.noinstall
+  mkdir -p ${INSTALL}/.noinstall
+    cp -p ${INSTALL}/usr/bin/localedef ${INSTALL}/.noinstall
+    cp -a ${INSTALL}/usr/share/i18n/locales ${INSTALL}/.noinstall
+    mv ${INSTALL}/usr/share/i18n/charmaps ${INSTALL}/.noinstall
 
   # Generic "installer" needs localedef to define drawing chars
-  if [ "$PROJECT" != "Generic" ]; then
-    rm $INSTALL/usr/bin/localedef
+  if [ "${PROJECT}" != "Generic" ]; then
+    rm ${INSTALL}/usr/bin/localedef
   fi
 
 # we are linking against ld.so, so symlink
-  ln -sf $(basename $INSTALL/usr/lib/ld-*.so) $INSTALL/usr/lib/ld.so
+  ln -sf $(basename ${INSTALL}/usr/lib/ld-*.so) ${INSTALL}/usr/lib/ld.so
 
 # cleanup
 # remove any programs we don't want/need, keeping only those we want
-  for f in $(find $INSTALL/usr/bin -type f); do
+  for f in $(find ${INSTALL}/usr/bin -type f); do
     listcontains "${GLIBC_INCLUDE_BIN}" "$(basename "${f}")" || safe_remove "${f}"
   done
 
-  safe_remove $INSTALL/usr/lib/audit
-  safe_remove $INSTALL/usr/lib/glibc
-  safe_remove $INSTALL/usr/lib/libc_pic
-  safe_remove $INSTALL/usr/lib/*.o
-  safe_remove $INSTALL/usr/lib/*.map
-  safe_remove $INSTALL/var
+  safe_remove ${INSTALL}/usr/lib/audit
+  safe_remove ${INSTALL}/usr/lib/glibc
+  safe_remove ${INSTALL}/usr/lib/libc_pic
+  safe_remove ${INSTALL}/usr/lib/*.o
+  safe_remove ${INSTALL}/usr/lib/*.map
+  safe_remove ${INSTALL}/var
 
 # add UTF-8 charmap for Generic (charmap is needed for installer)
-  if [ "$PROJECT" = "Generic" ]; then
-    mkdir -p $INSTALL/usr/share/i18n/charmaps
-    cp -PR $PKG_BUILD/localedata/charmaps/UTF-8 $INSTALL/usr/share/i18n/charmaps
-    pigz --best --force $INSTALL/usr/share/i18n/charmaps/UTF-8
+  if [ "${PROJECT}" = "Generic" ]; then
+    mkdir -p ${INSTALL}/usr/share/i18n/charmaps
+    cp -PR ${PKG_BUILD}/localedata/charmaps/UTF-8 ${INSTALL}/usr/share/i18n/charmaps
+    pigz --best --force ${INSTALL}/usr/share/i18n/charmaps/UTF-8
   fi
 
-  if [ ! "$GLIBC_LOCALES" = yes ]; then
-    safe_remove $INSTALL/usr/share/i18n/locales
+  if [ ! "${GLIBC_LOCALES}" = yes ]; then
+    safe_remove ${INSTALL}/usr/share/i18n/locales
 
-    mkdir -p $INSTALL/usr/share/i18n/locales
-      cp -PR $PKG_BUILD/localedata/locales/POSIX $INSTALL/usr/share/i18n/locales
+    mkdir -p ${INSTALL}/usr/share/i18n/locales
+      cp -PR ${PKG_BUILD}/localedata/locales/POSIX ${INSTALL}/usr/share/i18n/locales
   fi
 
 # create default configs
-  mkdir -p $INSTALL/etc
-    cp $PKG_DIR/config/nsswitch-target.conf $INSTALL/etc/nsswitch.conf
-    cp $PKG_DIR/config/host.conf $INSTALL/etc
-    cp $PKG_DIR/config/gai.conf $INSTALL/etc
+  mkdir -p ${INSTALL}/etc
+    cp ${PKG_DIR}/config/nsswitch-target.conf ${INSTALL}/etc/nsswitch.conf
+    cp ${PKG_DIR}/config/host.conf ${INSTALL}/etc
+    cp ${PKG_DIR}/config/gai.conf ${INSTALL}/etc
 
-  if [ "$TARGET_ARCH" = "arm" -a "$TARGET_FLOAT" = "hard" ]; then
-    ln -sf ld.so $INSTALL/usr/lib/ld-linux.so.3
+  if [ "${TARGET_ARCH}" = "arm" -a "${TARGET_FLOAT}" = "hard" ]; then
+    ln -sf ld.so ${INSTALL}/usr/lib/ld-linux.so.3
   fi
 }
 
 configure_init() {
-  cd $PKG_BUILD
-    rm -rf $PKG_BUILD/.$TARGET_NAME-init
+  cd ${PKG_BUILD}
+    rm -rf ${PKG_BUILD}/.${TARGET_NAME}-init
 }
 
 make_init() {
@@ -158,22 +158,22 @@ make_init() {
 }
 
 makeinstall_init() {
-  mkdir -p $INSTALL/usr/lib
-    cp -PR $PKG_BUILD/.$TARGET_NAME/elf/ld*.so* $INSTALL/usr/lib
-    cp -PR $PKG_BUILD/.$TARGET_NAME/libc.so* $INSTALL/usr/lib
-    cp -PR $PKG_BUILD/.$TARGET_NAME/math/libm.so* $INSTALL/usr/lib
-    cp -PR $PKG_BUILD/.$TARGET_NAME/nptl/libpthread.so* $INSTALL/usr/lib
-    cp -PR $PKG_BUILD/.$TARGET_NAME/rt/librt.so* $INSTALL/usr/lib
-    cp -PR $PKG_BUILD/.$TARGET_NAME/resolv/libnss_dns.so* $INSTALL/usr/lib
-    cp -PR $PKG_BUILD/.$TARGET_NAME/resolv/libresolv.so* $INSTALL/usr/lib
+  mkdir -p ${INSTALL}/usr/lib
+    cp -PR ${PKG_BUILD}/.${TARGET_NAME}/elf/ld*.so* ${INSTALL}/usr/lib
+    cp -PR ${PKG_BUILD}/.${TARGET_NAME}/libc.so* ${INSTALL}/usr/lib
+    cp -PR ${PKG_BUILD}/.${TARGET_NAME}/math/libm.so* ${INSTALL}/usr/lib
+    cp -PR ${PKG_BUILD}/.${TARGET_NAME}/nptl/libpthread.so* ${INSTALL}/usr/lib
+    cp -PR ${PKG_BUILD}/.${TARGET_NAME}/rt/librt.so* ${INSTALL}/usr/lib
+    cp -PR ${PKG_BUILD}/.${TARGET_NAME}/resolv/libnss_dns.so* ${INSTALL}/usr/lib
+    cp -PR ${PKG_BUILD}/.${TARGET_NAME}/resolv/libresolv.so* ${INSTALL}/usr/lib
 
-    if [ "$TARGET_ARCH" = "arm" -a "$TARGET_FLOAT" = "hard" ]; then
-      ln -sf ld.so $INSTALL/usr/lib/ld-linux.so.3
+    if [ "${TARGET_ARCH}" = "arm" -a "${TARGET_FLOAT}" = "hard" ]; then
+      ln -sf ld.so ${INSTALL}/usr/lib/ld-linux.so.3
     fi
 }
 
 post_makeinstall_init() {
 # create default configs
-  mkdir -p $INSTALL/etc
-    cp $PKG_DIR/config/nsswitch-init.conf $INSTALL/etc/nsswitch.conf
+  mkdir -p ${INSTALL}/etc
+    cp ${PKG_DIR}/config/nsswitch-init.conf ${INSTALL}/etc/nsswitch.conf
 }
diff --git a/packages/devel/gmp/package.mk b/packages/devel/gmp/package.mk
index 57d8e23d36..0f2e70de5d 100644
--- a/packages/devel/gmp/package.mk
+++ b/packages/devel/gmp/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="6.2.1"
 PKG_SHA256="fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2"
 PKG_LICENSE="LGPLv3+"
 PKG_SITE="http://gmplib.org/"
-PKG_URL="https://gmplib.org/download/gmp/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://gmplib.org/download/gmp/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="ccache:host m4:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers."
@@ -16,5 +16,5 @@ PKG_BUILD_FLAGS="+pic:host"
 PKG_CONFIGURE_OPTS_HOST="--enable-cxx --enable-static --disable-shared"
 
 pre_configure_host() {
-  export CPPFLAGS="$CPPFLAGS -fexceptions"
+  export CPPFLAGS="${CPPFLAGS} -fexceptions"
 }
diff --git a/packages/devel/gnulib/package.mk b/packages/devel/gnulib/package.mk
index 4966470bd4..39db806fc4 100644
--- a/packages/devel/gnulib/package.mk
+++ b/packages/devel/gnulib/package.mk
@@ -7,6 +7,6 @@ PKG_VERSION="d271f868a8df9bbec29049d01e056481b7a1a263"
 PKG_SHA256="4e23415ae2977ffca15e07419ceff3e9334d0369eafc9e7ae2578f8dd9a4839c"
 PKG_LICENSE="GPL"
 PKG_SITE="https://savannah.gnu.org/git/?group=gnulib"
-PKG_URL="http://git.savannah.gnu.org/cgit/gnulib.git/snapshot/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://git.savannah.gnu.org/cgit/gnulib.git/snapshot/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_LONGDESC="GNU portability library"
 PKG_TOOLCHAIN="manual"
diff --git a/packages/devel/heimdal/package.mk b/packages/devel/heimdal/package.mk
index e7bc1fd73c..bff71ff3e2 100644
--- a/packages/devel/heimdal/package.mk
+++ b/packages/devel/heimdal/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="7.7.0"
 PKG_SHA256="f7d414d0914abb0e151a276b4de22cf4977fd6c28bd9ecdd990407b1138a945c"
 PKG_LICENSE="BSD-3c"
 PKG_SITE="http://www.h5l.org/"
-PKG_URL="https://github.com/heimdal/heimdal/archive/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/heimdal/heimdal/archive/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="toolchain:host Python3:host ncurses:host"
 PKG_LONGDESC="Kerberos 5, PKIX, CMS, GSS-API, SPNEGO, NTLM, Digest-MD5 and, SASL implementation."
 PKG_TOOLCHAIN="autotools"
@@ -29,7 +29,7 @@ PKG_CONFIGURE_OPTS_HOST="ac_cv_prog_COMPILE_ET=no \
                          --disable-heimdal-documentation"
 
 makeinstall_host() {
-  mkdir -p $TOOLCHAIN/bin
-    cp -PR lib/asn1/asn1_compile $TOOLCHAIN/bin/heimdal_asn1_compile
-    cp -PR lib/com_err/compile_et $TOOLCHAIN/bin/heimdal_compile_et
+  mkdir -p ${TOOLCHAIN}/bin
+    cp -PR lib/asn1/asn1_compile ${TOOLCHAIN}/bin/heimdal_asn1_compile
+    cp -PR lib/com_err/compile_et ${TOOLCHAIN}/bin/heimdal_compile_et
 }
diff --git a/packages/devel/intltool/package.mk b/packages/devel/intltool/package.mk
index d4f68b3fcb..4fb8320d10 100644
--- a/packages/devel/intltool/package.mk
+++ b/packages/devel/intltool/package.mk
@@ -6,11 +6,11 @@ PKG_VERSION="0.51.0"
 PKG_SHA256="67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnome.org"
-PKG_URL="http://launchpad.net/intltool/trunk/$PKG_VERSION/+download/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://launchpad.net/intltool/trunk/${PKG_VERSION}/+download/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="ccache:host"
 PKG_LONGDESC="Tools to translate strings from various source files (.xml.in, .glade, .desktop.in, .server.in, .oaf.in)."
 
 post_makeinstall_host() {
-  mkdir -p  $SYSROOT_PREFIX/usr/share/aclocal
-    cp ../intltool.m4 $SYSROOT_PREFIX/usr/share/aclocal
+  mkdir -p  ${SYSROOT_PREFIX}/usr/share/aclocal
+    cp ../intltool.m4 ${SYSROOT_PREFIX}/usr/share/aclocal
 }
diff --git a/packages/devel/libaio/package.mk b/packages/devel/libaio/package.mk
index 2ab465c71c..f503cca147 100644
--- a/packages/devel/libaio/package.mk
+++ b/packages/devel/libaio/package.mk
@@ -16,9 +16,9 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib
-    cp -PR src/libaio.a $SYSROOT_PREFIX/usr/lib
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib
+    cp -PR src/libaio.a ${SYSROOT_PREFIX}/usr/lib
 
-  mkdir -p $SYSROOT_PREFIX/usr/include
-    cp -PR src/libaio.h $SYSROOT_PREFIX/usr/include
+  mkdir -p ${SYSROOT_PREFIX}/usr/include
+    cp -PR src/libaio.h ${SYSROOT_PREFIX}/usr/include
 }
diff --git a/packages/devel/libcap/package.mk b/packages/devel/libcap/package.mk
index 92061be36b..fccd8ac04b 100644
--- a/packages/devel/libcap/package.mk
+++ b/packages/devel/libcap/package.mk
@@ -8,25 +8,25 @@ PKG_VERSION="2.46"
 PKG_SHA256="4ed3d11413fa6c9667e49f819808fbb581cd8864b839f87d7c2a02c70f21d8b4"
 PKG_LICENSE="GPL"
 PKG_SITE=""
-PKG_URL="http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="ccache:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A library for getting and setting POSIX.1e capabilities."
 
 post_unpack() {
-  mkdir -p $PKG_BUILD/.$HOST_NAME
-  cp -r $PKG_BUILD/* $PKG_BUILD/.$HOST_NAME
-  mkdir -p $PKG_BUILD/.$TARGET_NAME
-  cp -r $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME
+  mkdir -p ${PKG_BUILD}/.${HOST_NAME}
+  cp -r ${PKG_BUILD}/* ${PKG_BUILD}/.${HOST_NAME}
+  mkdir -p ${PKG_BUILD}/.${TARGET_NAME}
+  cp -r ${PKG_BUILD}/* ${PKG_BUILD}/.${TARGET_NAME}
 }
 
 make_host() {
-  cd $PKG_BUILD/.$HOST_NAME
-  make CC=$CC \
-       AR=$AR \
-       RANLIB=$RANLIB \
-       CFLAGS="$HOST_CFLAGS" \
-       BUILD_CFLAGS="$HOST_CFLAGS -I$PKG_BUILD/libcap/include" \
+  cd ${PKG_BUILD}/.${HOST_NAME}
+  make CC=${CC} \
+       AR=${AR} \
+       RANLIB=${RANLIB} \
+       CFLAGS="${HOST_CFLAGS}" \
+       BUILD_CFLAGS="${HOST_CFLAGS} -I${PKG_BUILD}/libcap/include" \
        PAM_CAP=no \
        lib=/lib \
        BUILD_GPERF=no \
@@ -34,13 +34,13 @@ make_host() {
 }
 
 make_target() {
-  cd $PKG_BUILD/.$TARGET_NAME
-  make CC=$CC \
-       AR=$AR \
-       RANLIB=$RANLIB \
-       CFLAGS="$TARGET_CFLAGS" \
-       BUILD_CC=$HOST_CC \
-       BUILD_CFLAGS="$HOST_CFLAGS -I$PKG_BUILD/libcap/include" \
+  cd ${PKG_BUILD}/.${TARGET_NAME}
+  make CC=${CC} \
+       AR=${AR} \
+       RANLIB=${RANLIB} \
+       CFLAGS="${TARGET_CFLAGS}" \
+       BUILD_CC=${HOST_CC} \
+       BUILD_CFLAGS="${HOST_CFLAGS} -I${PKG_BUILD}/libcap/include" \
        PAM_CAP=no \
        lib=/lib \
        BUILD_GPERF=no \
@@ -48,23 +48,23 @@ make_target() {
 }
 
 makeinstall_host() {
-  mkdir -p $TOOLCHAIN/lib
-    cp libcap/libcap.a $TOOLCHAIN/lib
+  mkdir -p ${TOOLCHAIN}/lib
+    cp libcap/libcap.a ${TOOLCHAIN}/lib
 
-  mkdir -p $TOOLCHAIN/lib/pkgconfig
-    cp libcap/libcap.pc $TOOLCHAIN/lib/pkgconfig
+  mkdir -p ${TOOLCHAIN}/lib/pkgconfig
+    cp libcap/libcap.pc ${TOOLCHAIN}/lib/pkgconfig
 
-  mkdir -p $TOOLCHAIN/include/sys
-    cp libcap/include/sys/capability.h $TOOLCHAIN/include/sys
+  mkdir -p ${TOOLCHAIN}/include/sys
+    cp libcap/include/sys/capability.h ${TOOLCHAIN}/include/sys
 }
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib
-    cp libcap/libcap.a $SYSROOT_PREFIX/usr/lib
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib
+    cp libcap/libcap.a ${SYSROOT_PREFIX}/usr/lib
 
-  mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
-    cp libcap/libcap.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/pkgconfig
+    cp libcap/libcap.pc ${SYSROOT_PREFIX}/usr/lib/pkgconfig
 
-  mkdir -p $SYSROOT_PREFIX/usr/include/sys
-    cp libcap/include/sys/capability.h $SYSROOT_PREFIX/usr/include/sys
+  mkdir -p ${SYSROOT_PREFIX}/usr/include/sys
+    cp libcap/include/sys/capability.h ${SYSROOT_PREFIX}/usr/include/sys
 }
diff --git a/packages/devel/libcec/package.mk b/packages/devel/libcec/package.mk
index 9702b1fa8b..5d079fe4ab 100644
--- a/packages/devel/libcec/package.mk
+++ b/packages/devel/libcec/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="4.0.7"
 PKG_SHA256="bcd92c376993a5721d346edcc09eb17289451f9156b1d1d113c9663c2046315a"
 PKG_LICENSE="GPL"
 PKG_SITE="http://libcec.pulse-eight.com/"
-PKG_URL="https://github.com/Pulse-Eight/libcec/archive/libcec-$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/Pulse-Eight/libcec/archive/libcec-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain systemd p8-platform swig:host"
 PKG_LONGDESC="libCEC is an open-source dual licensed library designed for communicating with the Pulse-Eight USB - CEC Adaptor."
 
@@ -21,22 +21,22 @@ PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=1 \
                        -DHAVE_RPI_LIB=0"
 
 # libX11 and xrandr to read the sink's EDID, used to determine the PC's HDMI physical address
-if [ "$DISPLAYSERVER" = "x11" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libX11 libXrandr"
+if [ "${DISPLAYSERVER}" = "x11" ]; then
+  PKG_DEPENDS_TARGET+=" libX11 libXrandr"
 fi
 
-if [ "$CEC_FRAMEWORK_SUPPORT" = "yes" ]; then
-  PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET -DHAVE_LINUX_API=1"
+if [ "${CEC_FRAMEWORK_SUPPORT}" = "yes" ]; then
+  PKG_CMAKE_OPTS_TARGET+=" -DHAVE_LINUX_API=1"
 else
-  PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET -DHAVE_LINUX_API=0"
+  PKG_CMAKE_OPTS_TARGET+=" -DHAVE_LINUX_API=0"
 fi
 
 post_makeinstall_target() {
   # Remove the Python3 demo - useless for us
-  rm -f $INSTALL/usr/bin/pyCecClient
+  rm -f ${INSTALL}/usr/bin/pyCecClient
 
-  PYTHON_DIR=$INSTALL/usr/lib/$PKG_PYTHON_VERSION
-  if [ -d $PYTHON_DIR/dist-packages ]; then
-    mv $PYTHON_DIR/dist-packages $PYTHON_DIR/site-packages
+  PYTHON_DIR=${INSTALL}/usr/lib/${PKG_PYTHON_VERSION}
+  if [ -d ${PYTHON_DIR}/dist-packages ]; then
+    mv ${PYTHON_DIR}/dist-packages ${PYTHON_DIR}/site-packages
   fi
 }
diff --git a/packages/devel/libdaemon/package.mk b/packages/devel/libdaemon/package.mk
index 56ad351277..076a34ee53 100644
--- a/packages/devel/libdaemon/package.mk
+++ b/packages/devel/libdaemon/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="0.14"
 PKG_SHA256="fd23eb5f6f986dcc7e708307355ba3289abe03cc381fc47a80bca4a50aa6b834"
 PKG_LICENSE="GPL"
 PKG_SITE="http://0pointer.de/lennart/projects/libdaemon/"
-PKG_URL="http://0pointer.de/lennart/projects/libdaemon/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://0pointer.de/lennart/projects/libdaemon/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A lightweight C library which eases the writing of UNIX daemons."
 
diff --git a/packages/devel/libffi/package.mk b/packages/devel/libffi/package.mk
index 912726ee52..aafb5f2eae 100644
--- a/packages/devel/libffi/package.mk
+++ b/packages/devel/libffi/package.mk
@@ -6,8 +6,8 @@ PKG_NAME="libffi"
 PKG_VERSION="3.3"
 PKG_SHA256="72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056"
 PKG_LICENSE="GPL"
-PKG_SITE="http://sourceware.org/$PKG_NAME/"
-PKG_URL="ftp://sourceware.org/pub/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_SITE="http://sourceware.org/${PKG_NAME}/"
+PKG_URL="ftp://sourceware.org/pub/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="ccache:host autoconf:host automake:host libtool:host pkg-config:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Foreign Function Interface Library."
diff --git a/packages/devel/libfmt/package.mk b/packages/devel/libfmt/package.mk
index df6d53ca04..435f258907 100644
--- a/packages/devel/libfmt/package.mk
+++ b/packages/devel/libfmt/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="7.1.3"
 PKG_SHA256="5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc"
 PKG_LICENSE="BSD"
 PKG_SITE="https://github.com/fmtlib/fmt"
-PKG_URL="https://github.com/fmtlib/fmt/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/fmtlib/fmt/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="fmt is an open-source formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams."
 
diff --git a/packages/devel/libfstrcmp/package.mk b/packages/devel/libfstrcmp/package.mk
index abddec9c5e..7347ce692d 100644
--- a/packages/devel/libfstrcmp/package.mk
+++ b/packages/devel/libfstrcmp/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="0.7.D001"
 PKG_SHA256="e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476"
 PKG_LICENSE="GPL"
 PKG_SITE="http://fstrcmp.sourceforge.net/"
-PKG_URL="https://downloads.sourceforge.net/project/fstrcmp/fstrcmp/$(get_pkg_version_maj_min)/fstrcmp-$PKG_VERSION.tar.gz"
+PKG_URL="https://downloads.sourceforge.net/project/fstrcmp/fstrcmp/$(get_pkg_version_maj_min)/fstrcmp-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="The fstrcmp project provides a library that is used to make fuzzy comparisons of strings and byte arrays, including multi-byte character strings."
 
 pre_configure_target() {
-  cd "$PKG_BUILD"
+  cd "${PKG_BUILD}"
 }
 
 make_target() {
@@ -19,5 +19,5 @@ make_target() {
 }
 
 makeinstall_target() {
-  make DESTDIR="$SYSROOT_PREFIX" install-include install-libdir
+  make DESTDIR="${SYSROOT_PREFIX}" install-include install-libdir
 }
diff --git a/packages/devel/libftdi1/package.mk b/packages/devel/libftdi1/package.mk
index 3668ffc02d..52da3f1c88 100644
--- a/packages/devel/libftdi1/package.mk
+++ b/packages/devel/libftdi1/package.mk
@@ -19,12 +19,12 @@ PKG_CMAKE_OPTS_TARGET="-DSTATICLIBS=ON \
                        -DPYTHON_BINDINGS=FALSE"
 
 makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/include/libftdi1
-    cp ../src/ftdi.h $SYSROOT_PREFIX/usr/include/libftdi1
+  mkdir -p ${SYSROOT_PREFIX}/usr/include/libftdi1
+    cp ../src/ftdi.h ${SYSROOT_PREFIX}/usr/include/libftdi1
 
-  mkdir -p $SYSROOT_PREFIX/usr/lib
-    cp src/libftdi1.a $SYSROOT_PREFIX/usr/lib
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib
+    cp src/libftdi1.a ${SYSROOT_PREFIX}/usr/lib
 
-  mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
-    cp libftdi1.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
+  mkdir -p ${SYSROOT_PREFIX}/usr/lib/pkgconfig
+    cp libftdi1.pc ${SYSROOT_PREFIX}/usr/lib/pkgconfig
 }
diff --git a/packages/devel/libirman/package.mk b/packages/devel/libirman/package.mk
index 772caf7262..7433065702 100644
--- a/packages/devel/libirman/package.mk
+++ b/packages/devel/libirman/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="0.5.2"
 PKG_SHA256="43e58d7cd22b3a4c4dc8dcf8542a269ebcb4d8f6ceea0577b9fc882898f09a47"
 PKG_LICENSE="GPL"
 PKG_SITE="https://sourceforge.net/projects/libirman"
-PKG_URL="http://downloads.sourceforge.net/project/libirman/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://downloads.sourceforge.net/project/libirman/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain systemd lirc"
 PKG_NEED_UNPACK="$(get_pkg_directory lirc)"
 PKG_LONGDESC="libirman library for lircd"
@@ -17,5 +17,5 @@ PKG_BUILD_FLAGS="+pic -parallel"
 PKG_CONFIGURE_OPTS_TARGET="--disable-swtest"
 
 post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin
+  rm -rf ${INSTALL}/usr/bin
 }
diff --git a/packages/devel/libplist/package.mk b/packages/devel/libplist/package.mk
index d9350c0810..9d501fa8c6 100644
--- a/packages/devel/libplist/package.mk
+++ b/packages/devel/libplist/package.mk
@@ -19,5 +19,5 @@ pre_configure_target() {
 }
 
 post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin
+  rm -rf ${INSTALL}/usr/bin
 }
diff --git a/packages/devel/libpthread-stubs/package.mk b/packages/devel/libpthread-stubs/package.mk
index 9969b69cb0..d92d3d5274 100644
--- a/packages/devel/libpthread-stubs/package.mk
+++ b/packages/devel/libpthread-stubs/package.mk
@@ -6,6 +6,6 @@ PKG_VERSION="0.4"
 PKG_SHA256="50d5686b79019ccea08bcbd7b02fe5a40634abcfd4146b6e75c6420cc170e9d9"
 PKG_LICENSE="OSS"
 PKG_SITE="http://xcb.freedesktop.org/"
-PKG_URL="http://xcb.freedesktop.org/dist/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://xcb.freedesktop.org/dist/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A library providing weak aliases for pthread functions."
diff --git a/packages/devel/libtool/package.mk b/packages/devel/libtool/package.mk
index 81f57682d3..29a69cc689 100644
--- a/packages/devel/libtool/package.mk
+++ b/packages/devel/libtool/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="2.4.6"
 PKG_SHA256="e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/libtool/"
-PKG_URL="http://ftpmirror.gnu.org/libtool/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://ftpmirror.gnu.org/libtool/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="ccache:host autoconf:host automake:host intltool:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A generic library support script."
@@ -16,6 +16,6 @@ PKG_TOOLCHAIN="autotools"
 PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared"
 
 post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin
-  rm -rf $INSTALL/usr/share
+  rm -rf ${INSTALL}/usr/bin
+  rm -rf ${INSTALL}/usr/share
 }
diff --git a/packages/devel/m4/package.mk b/packages/devel/m4/package.mk
index aa17f8148b..943c75ffce 100644
--- a/packages/devel/m4/package.mk
+++ b/packages/devel/m4/package.mk
@@ -6,12 +6,12 @@ PKG_VERSION="1.4.18"
 PKG_SHA256="6640d76b043bc658139c8903e293d5978309bf0f408107146505eca701e67cf6"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/m4/"
-PKG_URL="http://ftpmirror.gnu.org/m4/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://ftpmirror.gnu.org/m4/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_HOST="ccache:host"
 PKG_LONGDESC="The m4 macro processor."
 
-PKG_CONFIGURE_OPTS_HOST="gl_cv_func_gettimeofday_clobber=no --target=$TARGET_NAME"
+PKG_CONFIGURE_OPTS_HOST="gl_cv_func_gettimeofday_clobber=no --target=${TARGET_NAME}"
 
 post_makeinstall_host() {
-  make prefix=$SYSROOT_PREFIX/usr install
+  make prefix=${SYSROOT_PREFIX}/usr install
 }
diff --git a/packages/devel/make/package.mk b/packages/devel/make/package.mk
index d1716e769e..18cee105fc 100644
--- a/packages/devel/make/package.mk
+++ b/packages/devel/make/package.mk
@@ -7,14 +7,14 @@ PKG_VERSION="4.3"
 PKG_SHA256="e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19"
 PKG_LICENSE="GPLv3"
 PKG_SITE="https://www.gnu.org/software/make/"
-PKG_URL="http://ftpmirror.gnu.org/make/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://ftpmirror.gnu.org/make/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST=""
 PKG_LONGDESC="Utility to maintain groups of programs."
 
 pre_configure_host() {
-  export CC=$LOCAL_CC
+  export CC=${LOCAL_CC}
 }
 
 post_makeinstall_host() {
-  ln -sf make $TOOLCHAIN/bin/gmake
+  ln -sf make ${TOOLCHAIN}/bin/gmake
 }
diff --git a/packages/devel/mpc/package.mk b/packages/devel/mpc/package.mk
index 81176a2298..94ec78fc0d 100644
--- a/packages/devel/mpc/package.mk
+++ b/packages/devel/mpc/package.mk
@@ -7,11 +7,11 @@ PKG_VERSION="1.2.1"
 PKG_SHA256="17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.multiprecision.org"
-PKG_URL="http://ftpmirror.gnu.org/mpc/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://ftpmirror.gnu.org/mpc/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="ccache:host gmp:host mpfr:host"
 PKG_LONGDESC="A C library for the arithmetic of complex numbers with arbitrarily high precision and correct rounding of the result."
 
-PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \
+PKG_CONFIGURE_OPTS_HOST="--target=${TARGET_NAME} \
                          --enable-static --disable-shared \
-                         --with-gmp=$TOOLCHAIN \
-                         --with-mpfr=$TOOLCHAIN"
+                         --with-gmp=${TOOLCHAIN} \
+                         --with-mpfr=${TOOLCHAIN}"
diff --git a/packages/devel/mpfr/package.mk b/packages/devel/mpfr/package.mk
index 086c8c03dd..2747ba0fb6 100644
--- a/packages/devel/mpfr/package.mk
+++ b/packages/devel/mpfr/package.mk
@@ -7,12 +7,12 @@ PKG_VERSION="4.1.0"
 PKG_SHA256="0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.mpfr.org/"
-PKG_URL="http://ftpmirror.gnu.org/mpfr/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://ftpmirror.gnu.org/mpfr/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_HOST="ccache:host gmp:host"
 PKG_LONGDESC="A C library for multiple-precision floating-point computations with exact rounding."
 
-PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \
+PKG_CONFIGURE_OPTS_HOST="--target=${TARGET_NAME} \
                          --enable-static --disable-shared \
-                         --prefix=$TOOLCHAIN \
-                         --with-gmp-lib=$TOOLCHAIN/lib \
-                         --with-gmp-include=$TOOLCHAIN/include"
+                         --prefix=${TOOLCHAIN} \
+                         --with-gmp-lib=${TOOLCHAIN}/lib \
+                         --with-gmp-include=${TOOLCHAIN}/include"
diff --git a/packages/devel/ncurses/package.mk b/packages/devel/ncurses/package.mk
index d103ed7fbb..c7413bb7fa 100644
--- a/packages/devel/ncurses/package.mk
+++ b/packages/devel/ncurses/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="6.1-20181215"
 PKG_SHA256="08b07c3e792961f300829512c283d5fefc0b1c421a57b76922c3d13303ed677d"
 PKG_LICENSE="MIT"
 PKG_SITE="http://www.gnu.org/software/ncurses/"
-PKG_URL="http://invisible-mirror.net/archives/ncurses/current/ncurses-$PKG_VERSION.tgz"
+PKG_URL="http://invisible-mirror.net/archives/ncurses/current/ncurses-${PKG_VERSION}.tgz"
 PKG_DEPENDS_HOST="ccache:host"
 PKG_DEPENDS_TARGET="toolchain zlib ncurses:host"
 PKG_LONGDESC="A library is a free software emulation of curses in System V Release 4.0, and more."
@@ -67,8 +67,8 @@ PKG_CONFIGURE_OPTS_HOST="--enable-termcap \
                          --without-manpages"
 
 post_makeinstall_target() {
-  cp misc/ncurses-config $TOOLCHAIN/bin
-  chmod +x $TOOLCHAIN/bin/ncurses-config
-  sed -e "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $TOOLCHAIN/bin/ncurses-config
-  rm -rf $INSTALL/usr/bin
+  cp misc/ncurses-config ${TOOLCHAIN}/bin
+  chmod +x ${TOOLCHAIN}/bin/ncurses-config
+  sed -e "s:\(['=\" ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${TOOLCHAIN}/bin/ncurses-config
+  rm -rf ${INSTALL}/usr/bin
 }
diff --git a/packages/devel/pcre/package.mk b/packages/devel/pcre/package.mk
index 9b6f335204..e874607522 100644
--- a/packages/devel/pcre/package.mk
+++ b/packages/devel/pcre/package.mk
@@ -7,14 +7,14 @@ PKG_VERSION="8.44"
 PKG_SHA256="19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.pcre.org/"
-PKG_URL="https://ftp.pcre.org/pub/pcre/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="https://ftp.pcre.org/pub/pcre/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A set of functions that implement regular expression pattern matching."
 PKG_TOOLCHAIN="configure"
 PKG_BUILD_FLAGS="+pic"
 
-PKG_CONFIGURE_OPTS_HOST="--prefix=$TOOLCHAIN \
+PKG_CONFIGURE_OPTS_HOST="--prefix=${TOOLCHAIN} \
              --enable-static \
              --enable-utf8 \
              --enable-unicode-properties \
@@ -28,6 +28,6 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
              --with-gnu-ld"
 
 post_makeinstall_target() {
-  rm -rf $INSTALL/usr/bin
-  sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/$PKG_NAME-config
+  rm -rf ${INSTALL}/usr/bin
+  sed -e "s:\(['= ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/bin/${PKG_NAME}-config
 }
diff --git a/packages/devel/pkg-config/package.mk b/packages/devel/pkg-config/package.mk
index aa73ddb5c1..2adaab5765 100644
--- a/packages/devel/pkg-config/package.mk
+++ b/packages/devel/pkg-config/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="0.29.2"
 PKG_SHA256="6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.freedesktop.org/software/pkgconfig/"
-PKG_URL="http://pkg-config.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://pkg-config.freedesktop.org/releases/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="ccache:host gettext:host"
 PKG_LONGDESC="A system for managing library compile/link flags that works with automake and autoconf."
 
@@ -15,6 +15,6 @@ PKG_CONFIGURE_OPTS_HOST="--disable-silent-rules \
                          --with-gnu-ld"
 
 post_makeinstall_host() {
-  mkdir -p $SYSROOT_PREFIX/usr/share/aclocal
-    cp pkg.m4 $SYSROOT_PREFIX/usr/share/aclocal
+  mkdir -p ${SYSROOT_PREFIX}/usr/share/aclocal
+    cp pkg.m4 ${SYSROOT_PREFIX}/usr/share/aclocal
 }
diff --git a/packages/devel/popt/package.mk b/packages/devel/popt/package.mk
index c7a9a6f00c..1c0f708cac 100644
--- a/packages/devel/popt/package.mk
+++ b/packages/devel/popt/package.mk
@@ -7,16 +7,16 @@ PKG_VERSION="1.18"
 PKG_SHA256="5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24fdc5d1"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/rpm-software-management/popt"
-PKG_URL="http://ftp.rpm.org/popt/releases/popt-1.x/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://ftp.rpm.org/popt/releases/popt-1.x/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="The popt library exists essentially for parsing command-line options."
 
 pre_configure_target() {
- cd $PKG_BUILD
- rm -rf .$TARGET_NAME
+ cd ${PKG_BUILD}
+ rm -rf .${TARGET_NAME}
 }
 
 pre_configure_host() {
- cd $PKG_BUILD
- rm -rf .$HOST_NAME
+ cd ${PKG_BUILD}
+ rm -rf .${HOST_NAME}
 }
diff --git a/packages/devel/rapidjson/package.mk b/packages/devel/rapidjson/package.mk
index acdc35ea0a..bfaf3a9b7e 100644
--- a/packages/devel/rapidjson/package.mk
+++ b/packages/devel/rapidjson/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="1.1.0"
 PKG_SHA256="bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/miloyip/rapidjson"
-PKG_URL="https://github.com/miloyip/rapidjson/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/miloyip/rapidjson/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A fast JSON parser/generator for C++ with both SAX/DOM style API"
 
diff --git a/packages/devel/readline/package.mk b/packages/devel/readline/package.mk
index e7dbc50945..6d279fa9a1 100644
--- a/packages/devel/readline/package.mk
+++ b/packages/devel/readline/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="8.1"
 PKG_SHA256="f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02"
 PKG_LICENSE="MIT"
 PKG_SITE="http://www.gnu.org/software/readline/"
-PKG_URL="http://ftpmirror.gnu.org/readline/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://ftpmirror.gnu.org/readline/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain ncurses"
 PKG_LONGDESC="The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in."
 PKG_BUILD_FLAGS="+pic"
@@ -18,5 +18,5 @@ PKG_CONFIGURE_OPTS_TARGET="bash_cv_wcwidth_broken=no \
                            --with-curses"
 
 post_makeinstall_target() {
-  rm -rf $INSTALL/usr/share/readline
+  rm -rf ${INSTALL}/usr/share/readline
 }
diff --git a/packages/devel/slang/package.mk b/packages/devel/slang/package.mk
index 420f4f0d37..362d032f5f 100644
--- a/packages/devel/slang/package.mk
+++ b/packages/devel/slang/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="2.3.2"
 PKG_SHA256="fc9e3b0fc4f67c3c1f6d43c90c16a5c42d117b8e28457c5b46831b8b5d3ae31a"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.jedsoft.org/slang/"
-PKG_URL="https://www.jedsoft.org/releases/slang/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="https://www.jedsoft.org/releases/slang/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A library designed to allow a developer to create robust multi-platform software."
 PKG_BUILD_FLAGS="-parallel"
@@ -16,12 +16,12 @@ PKG_CONFIGURE_OPTS_TARGET="--without-onig"
 
 pre_configure_target() {
  # slang fails to build in subdirs
- cd $PKG_BUILD
- rm -rf .$TARGET_NAME
+ cd ${PKG_BUILD}
+ rm -rf .${TARGET_NAME}
 }
 
 pre_configure_host() {
  # slang fails to build in subdirs
- cd $PKG_BUILD
- rm -rf .$HOST_NAME
+ cd ${PKG_BUILD}
+ rm -rf .${HOST_NAME}
 }
diff --git a/packages/devel/spdlog/package.mk b/packages/devel/spdlog/package.mk
index ef857a375a..f2cb87af81 100644
--- a/packages/devel/spdlog/package.mk
+++ b/packages/devel/spdlog/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="1.8.2"
 PKG_SHA256="e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/gabime/spdlog"
-PKG_URL="https://github.com/gabime/spdlog/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/gabime/spdlog/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libfmt"
 PKG_LONGDESC="Very fast, header only, C++ logging library."
 PKG_TOOLCHAIN="cmake"
diff --git a/packages/devel/swig/package.mk b/packages/devel/swig/package.mk
index 9fdd3b5aaa..136eb07966 100644
--- a/packages/devel/swig/package.mk
+++ b/packages/devel/swig/package.mk
@@ -7,12 +7,12 @@ PKG_VERSION="4.0.2"
 PKG_SHA256="d53be9730d8d58a16bf0cbd1f8ac0c0c3e1090573168bfa151b01eb47fa906fc"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.swig.org"
-PKG_URL="$SOURCEFORGE_SRC/swig/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="${SOURCEFORGE_SRC}/swig/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="ccache:host"
 PKG_LONGDESC="SWIG is a software development tool that connects programs written in C and C++ with a variety of high-level programming languages."
 
 PKG_CONFIGURE_OPTS_HOST="--program-suffix=4.0 \
-                         --with-pcre-prefix=$TOOLCHAIN \
+                         --with-pcre-prefix=${TOOLCHAIN} \
                          --with-boost=no \
                          --without-pcre \
                          --without-x \
@@ -40,5 +40,5 @@ PKG_CONFIGURE_OPTS_HOST="--program-suffix=4.0 \
                          --without-d"
 
 post_makeinstall_host() {
-  ln -sf swig4.0 $TOOLCHAIN/bin/swig
+  ln -sf swig4.0 ${TOOLCHAIN}/bin/swig
 }
diff --git a/packages/devel/yajl/package.mk b/packages/devel/yajl/package.mk
index a534cc2187..3de3c00def 100644
--- a/packages/devel/yajl/package.mk
+++ b/packages/devel/yajl/package.mk
@@ -6,14 +6,14 @@ PKG_VERSION="2.1.0"
 PKG_SHA256="020f55a2dfc979ad63dc99b629b3fea7e7e4b9f20d8b10b856cfcb8850f03c61"
 PKG_LICENSE="ISC"
 PKG_SITE="http://lloyd.github.com/yajl/"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A small event-driven (SAX-style) JSON parser."
 
 post_makeinstall_target() {
-  mv $SYSROOT_PREFIX/usr/lib/libyajl_s.a $SYSROOT_PREFIX/usr/lib/libyajl.a
-  rm $SYSROOT_PREFIX/usr/lib/libyajl.so*
+  mv ${SYSROOT_PREFIX}/usr/lib/libyajl_s.a ${SYSROOT_PREFIX}/usr/lib/libyajl.a
+  rm ${SYSROOT_PREFIX}/usr/lib/libyajl.so*
 
-  rm -rf $INSTALL/usr/bin
-  rm -rf $INSTALL/usr/lib
+  rm -rf ${INSTALL}/usr/bin
+  rm -rf ${INSTALL}/usr/lib
 }