diff --git a/packages/textproc/jsoncpp/package.mk b/packages/textproc/jsoncpp/package.mk
index e520d42997..f6310bdae1 100644
--- a/packages/textproc/jsoncpp/package.mk
+++ b/packages/textproc/jsoncpp/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="1.9.4"
 PKG_SHA256="e34a628a8142643b976c7233ef381457efad79468c67cb1ae0b83a33d7493999"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/open-source-parsers/jsoncpp/"
-PKG_URL="https://github.com/open-source-parsers/jsoncpp/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/open-source-parsers/jsoncpp/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A C++ library for interacting with JSON."
 PKG_TOOLCHAIN="cmake"
diff --git a/packages/textproc/libidn2/package.mk b/packages/textproc/libidn2/package.mk
index f3024e164c..fa33d7a596 100644
--- a/packages/textproc/libidn2/package.mk
+++ b/packages/textproc/libidn2/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="2.3.0"
 PKG_SHA256="e1cb1db3d2e249a6a3eb6f0946777c2e892d5c5dc7bd91c74394fc3a01cab8b5"
 PKG_LICENSE="LGPL3"
 PKG_SITE="https://www.gnu.org/software/libidn/"
-PKG_URL="http://ftpmirror.gnu.org/gnu/libidn/libidn2-$PKG_VERSION.tar.gz"
+PKG_URL="http://ftpmirror.gnu.org/gnu/libidn/libidn2-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Free software implementation of IDNA2008, Punycode and TR46."
 
diff --git a/packages/textproc/libxml2/package.mk b/packages/textproc/libxml2/package.mk
index e1708f5f2e..a5175d8887 100644
--- a/packages/textproc/libxml2/package.mk
+++ b/packages/textproc/libxml2/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="2.9.10"
 PKG_SHA256="aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f"
 PKG_LICENSE="MIT"
 PKG_SITE="http://xmlsoft.org"
-PKG_URL="ftp://xmlsoft.org/libxml2/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="ftp://xmlsoft.org/libxml2/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="zlib:host Python3:host"
 PKG_DEPENDS_TARGET="toolchain zlib"
 PKG_LONGDESC="The libxml package contains an XML library, which allows you to manipulate XML files."
@@ -18,16 +18,16 @@ PKG_CONFIGURE_OPTS_ALL="ac_cv_header_ansidecl_h=no \
              --disable-silent-rules \
              --enable-ipv6 \
              --without-python \
-             --with-zlib=$TOOLCHAIN \
+             --with-zlib=${TOOLCHAIN} \
              --without-lzma"
 
-PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_ALL --with-zlib=$TOOLCHAIN --with-python"
+PKG_CONFIGURE_OPTS_HOST="${PKG_CONFIGURE_OPTS_ALL} --with-zlib=${TOOLCHAIN} --with-python"
 
-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_ALL --with-zlib=$SYSROOT_PREFIX/usr --with-sysroot=$SYSROOT_PREFIX"
+PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_ALL} --with-zlib=${SYSROOT_PREFIX}/usr --with-sysroot=${SYSROOT_PREFIX}"
 
 post_makeinstall_target() {
-  sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/xml2-config
+  sed -e "s:\(['= ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/bin/xml2-config
 
-  rm -rf $INSTALL/usr/bin
-  rm -rf $INSTALL/usr/lib/xml2Conf.sh
+  rm -rf ${INSTALL}/usr/bin
+  rm -rf ${INSTALL}/usr/lib/xml2Conf.sh
 }
diff --git a/packages/textproc/libxslt/package.mk b/packages/textproc/libxslt/package.mk
index fb2e89ef88..3408e94c64 100644
--- a/packages/textproc/libxslt/package.mk
+++ b/packages/textproc/libxslt/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="1.1.34"
 PKG_SHA256="98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"
 PKG_LICENSE="MIT"
 PKG_SITE="http://xmlsoft.org/xslt/"
-PKG_URL="ftp://xmlsoft.org/libxml2/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="ftp://xmlsoft.org/libxml2/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="libxml2:host"
 PKG_DEPENDS_TARGET="toolchain libxml2"
 PKG_LONGDESC="A XSLT C library."
@@ -18,7 +18,7 @@ PKG_CONFIGURE_OPTS_HOST="  ac_cv_header_ansidecl_h=no \
                            --enable-static \
                            --disable-shared \
                            --without-python \
-                           --with-libxml-prefix=$TOOLCHAIN \
+                           --with-libxml-prefix=${TOOLCHAIN} \
                            --without-crypto"
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_ansidecl_h=no \
@@ -26,12 +26,12 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_ansidecl_h=no \
                            --enable-static \
                            --disable-shared \
                            --without-python \
-                           --with-libxml-prefix=$SYSROOT_PREFIX/usr \
+                           --with-libxml-prefix=${SYSROOT_PREFIX}/usr \
                            --without-crypto"
 
 post_makeinstall_target() {
-  sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/xslt-config
+  sed -e "s:\(['= ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/bin/xslt-config
 
-  rm -rf $INSTALL/usr/bin/xsltproc
-  rm -rf $INSTALL/usr/lib/xsltConf.sh
+  rm -rf ${INSTALL}/usr/bin/xsltproc
+  rm -rf ${INSTALL}/usr/lib/xsltConf.sh
 }
diff --git a/packages/textproc/nlohmann-json/package.mk b/packages/textproc/nlohmann-json/package.mk
index 8235d68db5..7e66803f6e 100644
--- a/packages/textproc/nlohmann-json/package.mk
+++ b/packages/textproc/nlohmann-json/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="3.9.1"
 PKG_SHA256="4cf0df69731494668bdd6460ed8cb269b68de9c19ad8c27abc24cd72605b2d5b"
 PKG_LICENSE="MIT"
 PKG_SITE="https://nlohmann.github.io/json/"
-PKG_URL="https://github.com/nlohmann/json/archive/v$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/nlohmann/json/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="JSON for Modern C++"
 PKG_TOOLCHAIN="cmake"
diff --git a/packages/textproc/tinyxml/package.mk b/packages/textproc/tinyxml/package.mk
index 86d2dc37b1..36c3fe67d0 100644
--- a/packages/textproc/tinyxml/package.mk
+++ b/packages/textproc/tinyxml/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="2.6.2"
 PKG_SHA256="8164c9ad48b9028667768a584d62f7760cfbfb90d0dd6214ad174403058da10c"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.grinninglizard.com/tinyxml/"
-PKG_URL="http://mirrors.xbmc.org/build-deps/sources/$PKG_NAME-${PKG_VERSION}_2.tar.gz"
+PKG_URL="http://mirrors.xbmc.org/build-deps/sources/${PKG_NAME}-${PKG_VERSION}_2.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="TinyXML is a simple, small, C++ XML parser."
 PKG_TOOLCHAIN="autotools"
@@ -15,5 +15,5 @@ PKG_BUILD_FLAGS="+pic"
 PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --with-pic"
 
 post_makeinstall_target() {
-  rm -rf $INSTALL/usr
+  rm -rf ${INSTALL}/usr
 }
diff --git a/packages/textproc/tinyxml2/package.mk b/packages/textproc/tinyxml2/package.mk
index 4420b9fe54..eca4fd2cee 100644
--- a/packages/textproc/tinyxml2/package.mk
+++ b/packages/textproc/tinyxml2/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="8.0.0"
 PKG_SHA256="6ce574fbb46751842d23089485ae73d3db12c1b6639cda7721bf3a7ee862012c"
 PKG_LICENSE="zlib"
 PKG_SITE="http://www.grinninglizard.com/tinyxml2/index.html"
-PKG_URL="https://github.com/leethomason/tinyxml2/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/leethomason/tinyxml2/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="TinyXML2 is a simple, small, C++ XML parser."
 
diff --git a/packages/textproc/xmlstarlet/package.mk b/packages/textproc/xmlstarlet/package.mk
index 78967bb28e..09311c05ff 100644
--- a/packages/textproc/xmlstarlet/package.mk
+++ b/packages/textproc/xmlstarlet/package.mk
@@ -6,7 +6,7 @@ PKG_VERSION="1.6.1"
 PKG_SHA256="15d838c4f3375332fd95554619179b69e4ec91418a3a5296e7c631b7ed19e7ca"
 PKG_LICENSE="MIT"
 PKG_SITE="http://xmlstar.sourceforge.net"
-PKG_URL="http://netcologne.dl.sourceforge.net/project/xmlstar/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://netcologne.dl.sourceforge.net/project/xmlstar/${PKG_NAME}/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="libxml2:host libxslt:host"
 PKG_DEPENDS_TARGET="toolchain libxml2 libxslt"
 PKG_LONGDESC="XMLStarlet is a command-line XML utility which allows the modification and validation of XML documents."
@@ -14,27 +14,27 @@ PKG_LONGDESC="XMLStarlet is a command-line XML utility which allows the modifica
 PKG_CONFIGURE_OPTS_HOST="  ac_cv_func_malloc_0_nonnull=yes \
                            ac_cv_func_realloc_0_nonnull=yes \
                            --enable-static-libs \
-                           LIBXML_CONFIG=$TOOLCHAIN/bin/xml2-config \
-                           LIBXSLT_CONFIG=$TOOLCHAIN/bin/xslt-config \
-                           --with-libxml-include-prefix=$TOOLCHAIN/include/libxml2 \
-                           --with-libxml-libs-prefix=$TOOLCHAIN/lib \
-                           --with-libxslt-include-prefix=$TOOLCHAIN/include \
-                           --with-libxslt-libs-prefix=$TOOLCHAIN/lib"
+                           LIBXML_CONFIG=${TOOLCHAIN}/bin/xml2-config \
+                           LIBXSLT_CONFIG=${TOOLCHAIN}/bin/xslt-config \
+                           --with-libxml-include-prefix=${TOOLCHAIN}/include/libxml2 \
+                           --with-libxml-libs-prefix=${TOOLCHAIN}/lib \
+                           --with-libxslt-include-prefix=${TOOLCHAIN}/include \
+                           --with-libxslt-libs-prefix=${TOOLCHAIN}/lib"
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
                            ac_cv_func_realloc_0_nonnull=yes \
                            --enable-static-libs \
-                           LIBXML_CONFIG=$SYSROOT_PREFIX/usr/bin/xml2-config \
-                           LIBXSLT_CONFIG=$SYSROOT_PREFIX/usr/bin/xslt-config \
-                           --with-libxml-include-prefix=$SYSROOT_PREFIX/usr/include/libxml2 \
-                           --with-libxml-libs-prefix=$SYSROOT_PREFIX/usr/lib \
-                           --with-libxslt-include-prefix=$SYSROOT_PREFIX/usr/include \
-                           --with-libxslt-libs-prefix=$SYSROOT_PREFIX/usr/lib"
+                           LIBXML_CONFIG=${SYSROOT_PREFIX}/usr/bin/xml2-config \
+                           LIBXSLT_CONFIG=${SYSROOT_PREFIX}/usr/bin/xslt-config \
+                           --with-libxml-include-prefix=${SYSROOT_PREFIX}/usr/include/libxml2 \
+                           --with-libxml-libs-prefix=${SYSROOT_PREFIX}/usr/lib \
+                           --with-libxslt-include-prefix=${SYSROOT_PREFIX}/usr/include \
+                           --with-libxslt-libs-prefix=${SYSROOT_PREFIX}/usr/lib"
 
 post_makeinstall_host() {
-  ln -sf xml $TOOLCHAIN/bin/xmlstarlet
+  ln -sf xml ${TOOLCHAIN}/bin/xmlstarlet
 }
 
 post_makeinstall_target() {
-  ln -sf xml $INSTALL/usr/bin/xmlstarlet
+  ln -sf xml ${INSTALL}/usr/bin/xmlstarlet
 }