From 8fa44569d896f7e032c761c7f16ffbbe69ffb0cb Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <goliath@infraroot.at>
Date: Wed, 6 Mar 2019 10:03:12 +0100
Subject: [PATCH] cleanup: remove deploy directory argument from package
 command

Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
---
 pkg/bash-completion/build     |  7 ++----
 pkg/bash/build                | 11 ++++-----
 pkg/bbstatic/build            |  9 +++-----
 pkg/boot-rpi3/build           | 12 +++++-----
 pkg/btrfs-progs/build         |  7 ++----
 pkg/bzip2/build               | 17 ++++++--------
 pkg/coreutils/build           |  9 +++-----
 pkg/dhcpcd/build              | 14 +++++-------
 pkg/diffutils/build           |  9 +++-----
 pkg/dnsmasq/build             | 12 +++++-----
 pkg/dosfstools/build          |  7 ++----
 pkg/ethtool/build             |  9 +++-----
 pkg/expat/build               |  9 +++-----
 pkg/file/build                |  9 +++-----
 pkg/findutils/build           |  9 +++-----
 pkg/firmware-rpi3/build       | 13 +++++------
 pkg/fortify-headers/build     |  4 ++--
 pkg/gawk/build                |  9 +++-----
 pkg/gcron/build               |  7 ++----
 pkg/gmp/build                 |  9 +++-----
 pkg/grep/build                |  9 +++-----
 pkg/gzip/build                |  9 +++-----
 pkg/hostapd/build             | 11 ++++-----
 pkg/iana-etc/build            | 11 +++++----
 pkg/inetutils/build           |  9 +++-----
 pkg/init-scripts/build        | 42 ++++++++++++++++-------------------
 pkg/init/build                |  7 ++----
 pkg/initrd/build              | 12 +++-------
 pkg/iproute2/build            |  7 ++----
 pkg/iw/build                  |  9 +++-----
 pkg/kbd/build                 |  9 +++-----
 pkg/kmod/build                | 10 ++++-----
 pkg/ldns/build                |  7 ++----
 pkg/less/build                |  9 +++-----
 pkg/libbsd/build              |  9 +++-----
 pkg/libmnl/build              |  9 +++-----
 pkg/libnftnl/build            |  9 +++-----
 pkg/libnl3/build              |  7 ++----
 pkg/libpcap/build             |  7 ++----
 pkg/libseccomp/build          |  7 ++----
 pkg/linux-firmware-rpi3/build |  4 ++--
 pkg/linux/build               | 34 +++++++++++++---------------
 pkg/linux_headers/build       | 20 +++++++++--------
 pkg/lzo/build                 |  9 +++-----
 pkg/musl/build                | 17 +++++++-------
 pkg/nano/build                |  9 +++-----
 pkg/ncurses/build             | 27 ++++++++++------------
 pkg/nftables/build            |  9 +++-----
 pkg/nginx/build               | 30 +++++++++++++------------
 pkg/ntp/build                 |  7 ++----
 pkg/openssh/build             | 13 +++++------
 pkg/openssl/build             |  7 ++----
 pkg/pcre/build                |  9 +++-----
 pkg/procps-ng/build           |  9 +++-----
 pkg/psmisc/build              |  9 +++-----
 pkg/readline/build            | 11 ++++-----
 pkg/release-alix/build        | 10 ++-------
 pkg/release-qemu/build        | 10 ++-------
 pkg/release-rpi3/build        | 10 ++-------
 pkg/rootfs/build              | 40 ++++++++++++++-------------------
 pkg/sed/build                 |  9 +++-----
 pkg/shadow/build              | 19 +++++++---------
 pkg/sqlite3/build             |  9 +++-----
 pkg/tar/build                 |  9 +++-----
 pkg/tc-binutils/build         |  9 +++-----
 pkg/tc-cloog/build            |  4 ++--
 pkg/tc-file/build             |  4 ++--
 pkg/tc-gcc1/build             |  4 ++--
 pkg/tc-gcc2/build             | 15 +++++--------
 pkg/tc-gmp/build              |  4 ++--
 pkg/tc-isl/build              |  4 ++--
 pkg/tc-mpc/build              |  4 ++--
 pkg/tc-mpfr/build             |  4 ++--
 pkg/tc-pkg-config/build       |  5 ++---
 pkg/tc-pkgtool/build          |  4 ++--
 pkg/tcpdump/build             |  7 ++----
 pkg/toolchain/build           |  4 ++--
 pkg/tzdata/build              | 13 +++++------
 pkg/unbound/build             | 10 ++++-----
 pkg/usyslog/build             |  7 ++----
 pkg/util-linux/build          | 14 +++++-------
 pkg/xz/build                  |  9 +++-----
 pkg/zlib/build                |  7 ++----
 util/pkgcmd.sh                |  2 +-
 84 files changed, 332 insertions(+), 543 deletions(-)

diff --git a/pkg/bash-completion/build b/pkg/bash-completion/build
index 6c9a963..6483691 100755
--- a/pkg/bash-completion/build
+++ b/pkg/bash-completion/build
@@ -17,11 +17,8 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
diff --git a/pkg/bash/build b/pkg/bash/build
index e4a4f54..9d31ca1 100755
--- a/pkg/bash/build
+++ b/pkg/bash/build
@@ -17,14 +17,11 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	ln -sv bash "$PKGDEPLOYDIR/bin/sh"
 
-	make DESTDIR="$DEPLOY" install
-	ln -sv bash "$DEPLOY/bin/sh"
-
-	cp -r "$SCRIPTDIR/pkg/$PKGNAME/etc" "$DEPLOY"
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	cp -r "$SCRIPTDIR/pkg/$PKGNAME/etc" "$PKGDEPLOYDIR"
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
diff --git a/pkg/bbstatic/build b/pkg/bbstatic/build
index b7dd75b..6c4ff02 100755
--- a/pkg/bbstatic/build
+++ b/pkg/bbstatic/build
@@ -24,12 +24,9 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	mkdir -p "$DEPLOY/bin"
-	cp "$PKGBUILDDIR/busybox" "$DEPLOY/bin"
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	mkdir -p "$PKGDEPLOYDIR/bin"
+	cp "$PKGBUILDDIR/busybox" "$PKGDEPLOYDIR/bin"
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
diff --git a/pkg/boot-rpi3/build b/pkg/boot-rpi3/build
index 23881b9..f904f43 100755
--- a/pkg/boot-rpi3/build
+++ b/pkg/boot-rpi3/build
@@ -8,14 +8,12 @@ build() {
 
 deploy() {
 	local SOURCE="$1"
-	local DEPLOY="$2"
 
-	cp -r ${SOURCE}/boot/* "$DEPLOY/"
+	cp -r ${SOURCE}/boot/* "$PKGDEPLOYDIR/"
 
-	rm $DEPLOY/kernel7.img
-	rm $DEPLOY/kernel.img
-	rm $DEPLOY/COPYING.linux
+	rm "$PKGDEPLOYDIR/kernel7.img" "$PKGDEPLOYDIR/kernel.img"
+	rm "$PKGDEPLOYDIR/COPYING.linux"
 
-	cp "$SCRIPTDIR/pkg/boot-rpi3/config.txt" "$DEPLOY/config.txt"
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	cp "$SCRIPTDIR/pkg/boot-rpi3/config.txt" "$PKGDEPLOYDIR/config.txt"
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
diff --git a/pkg/btrfs-progs/build b/pkg/btrfs-progs/build
index 1234f29..bd876cd 100755
--- a/pkg/btrfs-progs/build
+++ b/pkg/btrfs-progs/build
@@ -20,11 +20,8 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
diff --git a/pkg/bzip2/build b/pkg/bzip2/build
index e8c382d..7be1ee9 100755
--- a/pkg/bzip2/build
+++ b/pkg/bzip2/build
@@ -27,18 +27,15 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
+	make PREFIX="$PKGDEPLOYDIR" install
 
-	make PREFIX="$DEPLOY" install
+	rm ${PKGDEPLOYDIR}/bin/{bzegrep,bzfgrep,bzless,bzcmp}
 
-	rm ${DEPLOY}/bin/{bzegrep,bzfgrep,bzless,bzcmp}
-
-	ln -s "/bin/bzgrep" "$DEPLOY/bin/bzegrep"
-	ln -s "/bin/bzgrep" "$DEPLOY/bin/bzfgrep"
-	ln -s "/bin/bzmore" "$DEPLOY/bin/bzless"
-	ln -s "/bin/bzdiff" "$DEPLOY/bin/bzcmp"
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	ln -s "/bin/bzgrep" "$PKGDEPLOYDIR/bin/bzegrep"
+	ln -s "/bin/bzgrep" "$PKGDEPLOYDIR/bin/bzfgrep"
+	ln -s "/bin/bzmore" "$PKGDEPLOYDIR/bin/bzless"
+	ln -s "/bin/bzdiff" "$PKGDEPLOYDIR/bin/bzcmp"
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
diff --git a/pkg/coreutils/build b/pkg/coreutils/build
index 25ae32f..0a3415d 100755
--- a/pkg/coreutils/build
+++ b/pkg/coreutils/build
@@ -15,15 +15,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	curl --silent -L "$URL" | grep -o ">coreutils-[0-9.]*tar.xz<" | \
 	    sed 's/>coreutils-//g' | sed 's/.tar.xz<//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/dhcpcd/build b/pkg/dhcpcd/build
index 5012a0d..0c0a2f4 100755
--- a/pkg/dhcpcd/build
+++ b/pkg/dhcpcd/build
@@ -11,7 +11,6 @@ prepare() {
 
 build() {
 	local SOURCE="$1"
-	local DEPLOY="$2"
 
 	cp -r $SOURCE/* $PKGBUILDDIR
 
@@ -20,18 +19,15 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
+	make DESTDIR="$PKGDEPLOYDIR" install
 
-	make DESTDIR="$DEPLOY" install
-
-	chmod 755 $DEPLOY/bin/*
-	cat_file_override "dhcpcd.conf" > "$DEPLOY/etc/dhcpcd.conf"
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	chmod 755 $PKGDEPLOYDIR/bin/*
+	cat_file_override "dhcpcd.conf" > "$PKGDEPLOYDIR/etc/dhcpcd.conf"
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	curl --silent -L "$URL" | grep -o ">dhcpcd-[0-9.]*tar.xz<" | \
 	    sed 's/>dhcpcd-//g' | sed 's/.tar.xz<//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/diffutils/build b/pkg/diffutils/build
index d9ee84b..386dce1 100755
--- a/pkg/diffutils/build
+++ b/pkg/diffutils/build
@@ -15,15 +15,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	curl --silent -L "$URL" | grep -o ">diffutils-[0-9.]*tar.xz<" | \
 	    sed 's/>diffutils-//g' | sed 's/.tar.xz<//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/dnsmasq/build b/pkg/dnsmasq/build
index 8ede50f..a8727f2 100644
--- a/pkg/dnsmasq/build
+++ b/pkg/dnsmasq/build
@@ -26,13 +26,11 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make CC=${TARGET}-gcc PREFIX="/" BINDIR="/bin" DESTDIR="$DEPLOY" install
-	mkdir -p "$DEPLOY/etc"
-	cat_file_override "dnsmasq.conf" > "$DEPLOY/etc/dnsmasq.conf"
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make CC=${TARGET}-gcc PREFIX="/" BINDIR="/bin" \
+	     DESTDIR="$PKGDEPLOYDIR" install
+	mkdir -p "$PKGDEPLOYDIR/etc"
+	cat_file_override "dnsmasq.conf" > "$PKGDEPLOYDIR/etc/dnsmasq.conf"
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
diff --git a/pkg/dosfstools/build b/pkg/dosfstools/build
index cc19a75..451c3e7 100755
--- a/pkg/dosfstools/build
+++ b/pkg/dosfstools/build
@@ -15,11 +15,8 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
diff --git a/pkg/ethtool/build b/pkg/ethtool/build
index b537c4b..b786587 100755
--- a/pkg/ethtool/build
+++ b/pkg/ethtool/build
@@ -15,15 +15,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	curl --silent -L "$URL" | grep -o "ethtool-[0-9.]*tar.xz" | \
 	    sed 's/ethtool-//g' | sed 's/.tar.xz//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/expat/build b/pkg/expat/build
index 60556e7..1bf2612 100644
--- a/pkg/expat/build
+++ b/pkg/expat/build
@@ -16,11 +16,8 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
@@ -30,4 +27,4 @@ check_update() {
 	    grep -o "expat-[0-9.]*tar.bz2" | \
 	    sed 's/expat-//g' | sed 's/.tar.bz2//g' | \
 	    verson_find_greatest "$version"
-}
\ No newline at end of file
+}
diff --git a/pkg/file/build b/pkg/file/build
index 4336011..bd79b2a 100755
--- a/pkg/file/build
+++ b/pkg/file/build
@@ -16,15 +16,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	curl --silent --list-only "$URL/" | grep -o "file-[0-9.]*tar.gz" | \
 	    sed 's/file-//g' | sed 's/.tar.gz//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/findutils/build b/pkg/findutils/build
index f58e273..b437455 100755
--- a/pkg/findutils/build
+++ b/pkg/findutils/build
@@ -15,15 +15,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	curl --silent -L "$URL" | grep -o ">findutils-[0-9.]*tar.gz<" | \
 	    sed 's/>findutils-//g' | sed 's/.tar.gz<//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/firmware-rpi3/build b/pkg/firmware-rpi3/build
index ee3a379..64fb2ee 100755
--- a/pkg/firmware-rpi3/build
+++ b/pkg/firmware-rpi3/build
@@ -15,18 +15,17 @@ build() {
 
 deploy() {
 	local SOURCE="$1"
-	local DEPLOY="$2"
 
-	cp -r "$SOURCE/hardfp/opt" "$DEPLOY"
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	cp -r "$SOURCE/hardfp/opt" "$PKGDEPLOYDIR"
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 
-	strip_files ${DEPLOY}/opt/vc/{bin,sbin}/*
-	strip_files ${DEPLOY}/opt/vc/lib/*.so
-	strip_files ${DEPLOY}/opt/vc/lib/plugins/*.so
+	strip_files ${PKGDEPLOYDIR}/opt/vc/{bin,sbin}/*
+	strip_files ${PKGDEPLOYDIR}/opt/vc/lib/*.so
+	strip_files ${PKGDEPLOYDIR}/opt/vc/lib/plugins/*.so
 }
 
 check_update() {
 	curl --silent -L https://github.com/raspberrypi/firmware/releases | \
 	     grep -o "[0-9.]\+tar.gz" | sed 's/.tar.gz//g' | \
 	     verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/fortify-headers/build b/pkg/fortify-headers/build
index 94e4f05..c4e1512 100755
--- a/pkg/fortify-headers/build
+++ b/pkg/fortify-headers/build
@@ -14,8 +14,8 @@ build() {
 }
 
 deploy() {
-	make -C "$1" PREFIX="" DESTDIR="$2" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$2"
+	make -C "$1" PREFIX="" DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
diff --git a/pkg/gawk/build b/pkg/gawk/build
index 4a7810a..a843af9 100755
--- a/pkg/gawk/build
+++ b/pkg/gawk/build
@@ -16,15 +16,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	curl --silent -L "$URL" | grep -o ">gawk-[0-9.]*tar.xz<" | \
 	    sed 's/>gawk-//g' | sed 's/.tar.xz<//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/gcron/build b/pkg/gcron/build
index 2431275..0b747e8 100755
--- a/pkg/gcron/build
+++ b/pkg/gcron/build
@@ -15,11 +15,8 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
diff --git a/pkg/gmp/build b/pkg/gmp/build
index b849d30..b60d604 100755
--- a/pkg/gmp/build
+++ b/pkg/gmp/build
@@ -16,12 +16,9 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
 	unfuck_libtool
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 
@@ -29,4 +26,4 @@ check_update() {
 	curl --silent -L "$URL" | grep -o ">gmp-[0-9.]*tar.bz2<" | \
 	    sed 's/>gmp-//g' | sed 's/.tar.bz2<//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/grep/build b/pkg/grep/build
index e37adc0..6b49bfa 100755
--- a/pkg/grep/build
+++ b/pkg/grep/build
@@ -15,15 +15,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	curl --silent -L "$URL" | grep -o ">grep-[0-9.]*tar.xz<" | \
 	    sed 's/>grep-//g' | sed 's/.tar.xz<//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/gzip/build b/pkg/gzip/build
index ac00aef..1ee884f 100755
--- a/pkg/gzip/build
+++ b/pkg/gzip/build
@@ -15,15 +15,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	curl --silent -L "$URL" | grep -o ">gzip-[0-9.]*tar.xz<" | \
 	    sed 's/>gzip-//g' | sed 's/.tar.xz<//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/hostapd/build b/pkg/hostapd/build
index a25f968..ef561c3 100755
--- a/pkg/hostapd/build
+++ b/pkg/hostapd/build
@@ -28,14 +28,11 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
+	mkdir -p "$PKGDEPLOYDIR/etc"
+	cat_file_override "hostapd.conf" > "$PKGDEPLOYDIR/etc/hostapd.conf"
 
-	mkdir -p "$DEPLOY/etc"
-	cat_file_override "hostapd.conf" > "$DEPLOY/etc/hostapd.conf"
-
-	make -C hostapd BINDIR=/bin DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make -C hostapd BINDIR=/bin DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
diff --git a/pkg/iana-etc/build b/pkg/iana-etc/build
index d0fd994..5e03eb6 100755
--- a/pkg/iana-etc/build
+++ b/pkg/iana-etc/build
@@ -15,14 +15,13 @@ build() {
 
 deploy() {
 	local SOURCE="$1"
-	local DEPLOY="$2"
 
-	mkdir -p "$DEPLOY/etc"
-	cp "$SOURCE/protocols" "$DEPLOY/etc"
-	cp "$SOURCE/services" "$DEPLOY/etc"
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	mkdir -p "$PKGDEPLOYDIR/etc"
+	cp "$SOURCE/protocols" "$PKGDEPLOYDIR/etc"
+	cp "$SOURCE/services" "$PKGDEPLOYDIR/etc"
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	return
-}
\ No newline at end of file
+}
diff --git a/pkg/inetutils/build b/pkg/inetutils/build
index aadff22..9f9a614 100755
--- a/pkg/inetutils/build
+++ b/pkg/inetutils/build
@@ -19,15 +19,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	curl --silent -L "$URL" | grep -o ">inetutils-[0-9.]*tar.xz<" | \
 	    sed 's/>inetutils-//g' | sed 's/.tar.xz<//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/init-scripts/build b/pkg/init-scripts/build
index ec8cded..8a360ab 100755
--- a/pkg/init-scripts/build
+++ b/pkg/init-scripts/build
@@ -10,17 +10,15 @@ prepare() {
 }
 
 build() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
 	local extra_flags=""
 
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 	include_merge "INIT"
 
 	if [ "x$HWCLOCK" != "xyes" ]; then
 		extra_flags="$extra_flags --enable-swclock"
 
-		cat <<_EOF >> "$DEPLOY/$PKGNAME.files"
+		cat <<_EOF >> "$PKGDEPLOYDIR/$PKGNAME.files"
 dir etc 0755 0 0
 dir etc/crontab.d 0755 0 0
 file etc/crontab.d/swclock 0644 0 0
@@ -37,14 +35,14 @@ _EOF
 
 	if [ ! -z "$DHCP_PORTS" ]; then
 		extra_flags="$extra_flags --enable-dhcpclient"
-		cat <<_EOF >> "$DEPLOY/$PKGNAME.files"
+		cat <<_EOF >> "$PKGDEPLOYDIR/$PKGNAME.files"
 slink etc/init.d/dhcpcdmaster 0777 0 0 /share/init/dhcpcdmaster
 file share/init/dhcpcd 0644 0 0
 file share/init/dhcpcdmaster 0644 0 0
 _EOF
 
 		if [ "x$HWCLOCK" != "xyes" ]; then
-			cat <<_EOF >> "$DEPLOY/$PKGNAME.files"
+			cat <<_EOF >> "$PKGDEPLOYDIR/$PKGNAME.files"
 dir lib/libexec/dhcpcd-hooks 0755 0 0
 file lib/libexec/dhcpcd-hooks/40-ntpsetdate 0644 0 0
 _EOF
@@ -57,67 +55,65 @@ _EOF
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
 	local svc
 
-	make DESTDIR="$DEPLOY" install
+	make DESTDIR="$PKGDEPLOYDIR" install
 
 	include_merge "INIT"
 
 	if [ "x$HWCLOCK" == "xyes" ]; then
 		SERVICES="$SERVICES hwclock"
 	else
-		mkdir -p "$DEPLOY/var/lib"
-		date --utc +%m%d%H%M%Y.%S > "$DEPLOY/var/lib/swclock"
+		mkdir -p "$PKGDEPLOYDIR/var/lib"
+		date --utc +%m%d%H%M%Y.%S > "$PKGDEPLOYDIR/var/lib/swclock"
 	fi
 
 	svc=$(file_path_override "ifrename")
 	if [ ! -z "$svc" ]; then
-		cp "$svc" "$DEPLOY/etc/netcfg/ifrename"
+		cp "$svc" "$PKGDEPLOYDIR/etc/netcfg/ifrename"
 		SERVICES="$SERVICES ifrename"
 	fi
 
 	svc=$(file_path_override "nftables.rules")
 	if [ ! -z "$svc" ]; then
-		cp "$svc" "$DEPLOY/etc/nftables.rules"
-		echo "file etc/nftables.rules 0644 0 0" >> "$DEPLOY/$PKGNAME.files"
+		cp "$svc" "$PKGDEPLOYDIR/etc/nftables.rules"
+		echo "file etc/nftables.rules 0644 0 0" >> "$PKGDEPLOYDIR/$PKGNAME.files"
 		SERVICES="$SERVICES nft"
 	fi
 
 	svc=$(file_path_override "sysctl.conf")
 	if [ ! -z "$svc" ]; then
-		cp "$svc" "$DEPLOY/etc/sysctl.conf"
-		echo "file etc/sysctl.conf 0644 0 0" >> "$DEPLOY/$PKGNAME.files"
+		cp "$svc" "$PKGDEPLOYDIR/etc/sysctl.conf"
+		echo "file etc/sysctl.conf 0644 0 0" >> "$PKGDEPLOYDIR/$PKGNAME.files"
 	fi
 
 	svc=$(file_path_override "interfaces")
 	if [ ! -z "$svc" ]; then
 		for svc in $svc/*; do
 			[ -f "$svc" ] || continue
-			cp "$svc" "$DEPLOY/etc/netcfg/"
+			cp "$svc" "$PKGDEPLOYDIR/etc/netcfg/"
 			svc=$(basename $svc)
-			echo "file etc/netcfg/$svc 0644 0 0" >> "$DEPLOY/$PKGNAME.files"
+			echo "file etc/netcfg/$svc 0644 0 0" >> "$PKGDEPLOYDIR/$PKGNAME.files"
 		done
 	fi
 
 	for svc in $GETTY_TTY; do
-		echo "slink etc/init.d/agetty@$svc 0777 0 0 /share/init/agetty" >> "$DEPLOY/$PKGNAME.files"
+		echo "slink etc/init.d/agetty@$svc 0777 0 0 /share/init/agetty" >> "$PKGDEPLOYDIR/$PKGNAME.files"
 	done
 
 	if [ ! -z "$DHCP_PORTS" ]; then
 		for svc in $DHCP_PORTS; do
-			echo "slink etc/init.d/dhcpcd@$svc 0777 0 0 /share/init/dhcpcd" >> "$DEPLOY/$PKGNAME.files"
+			echo "slink etc/init.d/dhcpcd@$svc 0777 0 0 /share/init/dhcpcd" >> "$PKGDEPLOYDIR/$PKGNAME.files"
 		done
 	fi
 
 	for svc in $SERVICES; do
-		echo "slink etc/init.d/$svc 0777 0 0 /share/init/$svc" >> "$DEPLOY/$PKGNAME.files"
+		echo "slink etc/init.d/$svc 0777 0 0 /share/init/$svc" >> "$PKGDEPLOYDIR/$PKGNAME.files"
 	done
 
-	touch "$DEPLOY/etc/modules"
+	touch "$PKGDEPLOYDIR/etc/modules"
 	for svc in $MODULES; do
-		echo "$svc" >> "$DEPLOY/etc/modules"
+		echo "$svc" >> "$PKGDEPLOYDIR/etc/modules"
 	done
 
 	unset -v i GETTY_TTY HWCLOCK DHCP_PORTS SERVICES MODULES
diff --git a/pkg/init/build b/pkg/init/build
index 44eb48c..4569010 100755
--- a/pkg/init/build
+++ b/pkg/init/build
@@ -15,11 +15,8 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
diff --git a/pkg/initrd/build b/pkg/initrd/build
index 2d235e7..a08849f 100755
--- a/pkg/initrd/build
+++ b/pkg/initrd/build
@@ -1,25 +1,19 @@
 DEPENDS="bbstatic"
 
 build() {
-	local INPUT="$1"
-	local DEPLOY="$2"
-
 	mkdir -p ./{dev,lib,bin,sys,proc,newroot,images}
 
 	pkg install -omLD -r "$PKGBUILDDIR" -R "$REPODIR" $DEPENDS
 }
 
 deploy() {
-	local INPUT="$1"
-	local DEPLOY="$2"
-
-	cp $SCRIPTDIR/pkg/initrd/*.{desc,files} "$DEPLOY"
+	cp $SCRIPTDIR/pkg/initrd/*.{desc,files} "$PKGDEPLOYDIR"
 
 	pkg install -R "$REPODIR" -r "$PKGBUILDDIR" -l -F pkg $DEPENDS \
-	    >> "$DEPLOY/initrd.files"
+	    >> "$PKGDEPLOYDIR/initrd.files"
 
 	echo "file init 0775 0 0 $SCRIPTDIR/pkg/$PKGNAME/initrd.skel" \
-	     >> "$DEPLOY/initrd.files"
+	     >> "$PKGDEPLOYDIR/initrd.files"
 }
 
 check_update() {
diff --git a/pkg/iproute2/build b/pkg/iproute2/build
index 88a7351..d1d58f8 100755
--- a/pkg/iproute2/build
+++ b/pkg/iproute2/build
@@ -27,11 +27,8 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" SYSROOT="$TCDIR/$TARGET" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" SYSROOT="$TCDIR/$TARGET" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
diff --git a/pkg/iw/build b/pkg/iw/build
index 4bcb38a..71a70b7 100755
--- a/pkg/iw/build
+++ b/pkg/iw/build
@@ -24,18 +24,15 @@ build() {
 	LDFLAGS="$ldflags" \
 	PKG_CONFIG_SYSROOT_DIR="$TCDIR/$TARGET" \
 	make CC="${TARGET}-gcc" PKG_CONFIG="${TARGET}-pkg-config" PREFIX= \
-	     SBINDIR=/bin DESTDIR="$2" -j $NUMJOBS
+	     SBINDIR=/bin DESTDIR="$PKGDEPLOYDIR" -j $NUMJOBS
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
 	export PKG_CONFIG_SYSROOT_DIR="$TCDIR/$TARGET"
 	make CC="${TARGET}-gcc" PKG_CONFIG="${TARGET}-pkg-config" PREFIX= \
-	     SBINDIR=/bin DESTDIR="$DEPLOY" install
+	     SBINDIR=/bin DESTDIR="$PKGDEPLOYDIR" install
 
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
diff --git a/pkg/kbd/build b/pkg/kbd/build
index 78af5a9..1252aa1 100755
--- a/pkg/kbd/build
+++ b/pkg/kbd/build
@@ -17,15 +17,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	curl --silent -L "$URL" | grep -o ">kbd-[0-9.]*tar.xz<" | \
 	    sed 's/>kbd-//g' | sed 's/.tar.xz<//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/kmod/build b/pkg/kmod/build
index 5091315..1d2cbf0 100644
--- a/pkg/kmod/build
+++ b/pkg/kmod/build
@@ -16,15 +16,13 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
 	local target
 
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 
 	for target in depmod insmod lsmod modinfo modprobe rmmod; do
-		ln -sf kmod $DEPLOY/bin/$target
+		ln -sf kmod $PKGDEPLOYDIR/bin/$target
 	done
 }
 
@@ -32,4 +30,4 @@ check_update() {
 	curl --silent -L "$URL" | grep -o ">kmod-[0-9.]*tar.xz<" | \
 	    sed 's/>kmod-//g' | sed 's/.tar.xz<//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/ldns/build b/pkg/ldns/build
index 079eabb..5407286 100755
--- a/pkg/ldns/build
+++ b/pkg/ldns/build
@@ -18,11 +18,8 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
diff --git a/pkg/less/build b/pkg/less/build
index 3811d63..a8d4ecc 100755
--- a/pkg/less/build
+++ b/pkg/less/build
@@ -15,15 +15,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	curl --silent -L "$URL" | grep -o ">less-[0-9.]*tar.gz<" | \
 	    sed 's/>less-//g' | sed 's/.tar.gz<//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/libbsd/build b/pkg/libbsd/build
index 52d2147..9ce8608 100644
--- a/pkg/libbsd/build
+++ b/pkg/libbsd/build
@@ -16,15 +16,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	curl --silent -L "$URL" | grep -o ">libbsd-[0-9.]*tar.xz<" | \
 	    sed 's/>libbsd-//g' | sed 's/.tar.xz<//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/libmnl/build b/pkg/libmnl/build
index 2c13ccf..b87d57f 100644
--- a/pkg/libmnl/build
+++ b/pkg/libmnl/build
@@ -16,15 +16,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	curl --silent -L "$URL" | grep -o ">libmnl-[0-9.]*tar.bz2<" | \
 	    sed 's/>libmnl-//g' | sed 's/.tar.bz2<//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/libnftnl/build b/pkg/libnftnl/build
index 518ab0d..7773107 100644
--- a/pkg/libnftnl/build
+++ b/pkg/libnftnl/build
@@ -16,15 +16,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	curl --silent -L "$URL" | grep -o ">libnftnl-[0-9.]*tar.bz2<" | \
 	    sed 's/>libnftnl-//g' | sed 's/.tar.bz2<//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/libnl3/build b/pkg/libnl3/build
index 44fa794..a9a497a 100644
--- a/pkg/libnl3/build
+++ b/pkg/libnl3/build
@@ -16,12 +16,9 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
 	unfuck_libtool
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
diff --git a/pkg/libpcap/build b/pkg/libpcap/build
index 270b753..dd9c557 100755
--- a/pkg/libpcap/build
+++ b/pkg/libpcap/build
@@ -19,11 +19,8 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
diff --git a/pkg/libseccomp/build b/pkg/libseccomp/build
index e55f4d4..764bac9 100644
--- a/pkg/libseccomp/build
+++ b/pkg/libseccomp/build
@@ -15,14 +15,11 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
+	make DESTDIR="$PKGDEPLOYDIR" install
 }
 
 check_update() {
 	curl --silent -L https://github.com/seccomp/libseccomp/releases | \
 	    grep -o "libseccomp-[0-9.]*tar.gz" | sed 's/libseccomp-//g' | \
 	    sed 's/.tar.gz//g' | verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/linux-firmware-rpi3/build b/pkg/linux-firmware-rpi3/build
index 4a3e220..c973053 100755
--- a/pkg/linux-firmware-rpi3/build
+++ b/pkg/linux-firmware-rpi3/build
@@ -14,8 +14,8 @@ build() {
 }
 
 deploy() {
-	make DESTDIR="$2" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$2"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
diff --git a/pkg/linux/build b/pkg/linux/build
index 73674b7..ea6c50c 100755
--- a/pkg/linux/build
+++ b/pkg/linux/build
@@ -32,10 +32,7 @@ prepare() {
 }
 
 build() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	local INITRDDIR="$DEPLOY/initrd"
+	local INITRDDIR="$PKGDEPLOYDIR/initrd"
 	local INITRDLIST="$INITRDDIR/initrd.list"
 	local LINUX_CPU=$(get_linux_cpu)
 
@@ -57,39 +54,38 @@ build() {
 
 deploy() {
 	local SOURCE="$1"
-	local DEPLOY="$2"
 	local LINUX_CPU=$(get_linux_cpu)
 	local target
 
-	mkdir -p "$DEPLOY/boot" "$DEPLOY/lib/modules"
+	mkdir -p "$PKGDEPLOYDIR/boot" "$PKGDEPLOYDIR/lib/modules"
 
 	for target in $LINUX_TGT; do
 		case $target in
 		*Image)
-			cp "arch/$LINUX_CPU/boot/$target" "$DEPLOY/boot/vmlinuz"
-			echo "dir boot 0755 0 0" >> "$DEPLOY/$PKGNAME.files"
-			echo "file boot/vmlinuz 0755 0 0" >> "$DEPLOY/$PKGNAME.files"
+			cp "arch/$LINUX_CPU/boot/$target" "$PKGDEPLOYDIR/boot/vmlinuz"
+			echo "dir boot 0755 0 0" >> "$PKGDEPLOYDIR/$PKGNAME.files"
+			echo "file boot/vmlinuz 0755 0 0" >> "$PKGDEPLOYDIR/$PKGNAME.files"
 			;;
 		modules)
 			export KBUILD_OUTPUT="$PKGBUILDDIR"
-			make -C "$SOURCE" O="$PKGBUILDDIR" ARCH="$LINUX_CPU" CROSS_COMPILE="${TARGET}-" INSTALL_MOD_PATH="$DEPLOY" modules_install
+			make -C "$SOURCE" O="$PKGBUILDDIR" ARCH="$LINUX_CPU" CROSS_COMPILE="${TARGET}-" INSTALL_MOD_PATH="$PKGDEPLOYDIR" modules_install
 
-			echo "dir lib 0755 0 0" >> "$DEPLOY/$PKGNAME.files"
-			echo "dir lib/modules 0755 0 0" >> "$DEPLOY/$PKGNAME.files"
+			echo "dir lib 0755 0 0" >> "$PKGDEPLOYDIR/$PKGNAME.files"
+			echo "dir lib/modules 0755 0 0" >> "$PKGDEPLOYDIR/$PKGNAME.files"
 
-			find -H "$DEPLOY/lib" -type d -printf "dir %p 0%m 0 0\\n" |\
-				tail -n +2 | sed "s#$DEPLOY/##g" >> "$DEPLOY/$PKGNAME.files"
+			find -H "$PKGDEPLOYDIR/lib" -type d -printf "dir %p 0%m 0 0\\n" |\
+				tail -n +2 | sed "s#$PKGDEPLOYDIR/##g" >> "$PKGDEPLOYDIR/$PKGNAME.files"
 
-			find -H "$DEPLOY/lib" -type l -printf "slink %p 0%m 0 0 %l\\n" |\
-				sed "s#$DEPLOY/##g" >> "$DEPLOY/$PKGNAME.files"
+			find -H "$PKGDEPLOYDIR/lib" -type l -printf "slink %p 0%m 0 0 %l\\n" |\
+				sed "s#$PKGDEPLOYDIR/##g" >> "$PKGDEPLOYDIR/$PKGNAME.files"
 
-			find -H "$DEPLOY/lib" -type f -printf "file %p 0%m 0 0\\n" |\
-				sed "s#$DEPLOY/##g" >> "$DEPLOY/$PKGNAME.files"
+			find -H "$PKGDEPLOYDIR/lib" -type f -printf "file %p 0%m 0 0\\n" |\
+				sed "s#$PKGDEPLOYDIR/##g" >> "$PKGDEPLOYDIR/$PKGNAME.files"
 			;;
 		esac
 	done
 
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.desc "$DEPLOY"
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.desc "$PKGDEPLOYDIR"
 }
 
 check_update() {
diff --git a/pkg/linux_headers/build b/pkg/linux_headers/build
index fec997d..cf868ef 100755
--- a/pkg/linux_headers/build
+++ b/pkg/linux_headers/build
@@ -14,18 +14,20 @@ deploy() {
 	local LINUX_CPU=$(get_linux_cpu)
 
 	export KBUILD_OUTPUT="$PKGBUILDDIR"
-	make -C "$1" O="$PKGBUILDDIR" ARCH="$LINUX_CPU" INSTALL_HDR_PATH="$2" headers_install
+	make -C "$1" O="$PKGBUILDDIR" ARCH="$LINUX_CPU" INSTALL_HDR_PATH="$PKGDEPLOYDIR" headers_install
 
-	cp "$SCRIPTDIR/pkg/$PKGNAME/linux-dev.desc" "$2"
+	cp "$SCRIPTDIR/pkg/$PKGNAME/linux-dev.desc" "$PKGDEPLOYDIR"
 
-	echo "dir include 0755 0 0" > "$2/linux-dev.files"
+	echo "dir include 0755 0 0" > "$PKGDEPLOYDIR/linux-dev.files"
 
-	find -H "$2/include" -type d -printf "dir %p 0%m 0 0\\n" |\
-		tail -n +2 | sed "s#$2/##g" >> "$2/linux-dev.files"
+	find -H "$PKGDEPLOYDIR/include" -type d -printf "dir %p 0%m 0 0\\n" |\
+		tail -n +2 |\
+		sed "s#$PKGDEPLOYDIR/##g" >> "$PKGDEPLOYDIR/linux-dev.files"
 
-	find -H "$2/include" -type l -printf "slink %p 0%m 0 0 %l\\n" |\
-		sed "s#$2/##g" >> "$2/linux-dev.files"
+	find -H "$PKGDEPLOYDIR/include" -type l \
+	     -printf "slink %p 0%m 0 0 %l\\n" |\
+		sed "s#$PKGDEPLOYDIR/##g" >> "$PKGDEPLOYDIR/linux-dev.files"
 
-	find -H "$2/include" -type f -printf "file %p 0%m 0 0\\n" |\
-		sed "s#$2/##g" >> "$2/linux-dev.files"
+	find -H "$PKGDEPLOYDIR/include" -type f -printf "file %p 0%m 0 0\\n" |\
+		sed "s#$PKGDEPLOYDIR/##g" >> "$PKGDEPLOYDIR/linux-dev.files"
 }
diff --git a/pkg/lzo/build b/pkg/lzo/build
index 223c46a..c05cac9 100644
--- a/pkg/lzo/build
+++ b/pkg/lzo/build
@@ -16,15 +16,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	curl --silent -L "$URL" | grep -o ">lzo-[0-9.]*tar.gz<" | \
 	    sed 's/>lzo-//g' | sed 's/.tar.gz<//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/musl/build b/pkg/musl/build
index f48216b..7ee6b66 100755
--- a/pkg/musl/build
+++ b/pkg/musl/build
@@ -29,7 +29,6 @@ build() {
 
 deploy() {
 	local INPUT="$1"
-	local DEPLOY="$2"
 	local MUSL_CPU=""
 
 	case "$TARGET" in
@@ -51,20 +50,20 @@ deploy() {
 		;;
 	esac
 
-	DESTDIR="$DEPLOY" make install-headers
-	DESTDIR="$DEPLOY" make install-libs
+	DESTDIR="$PKGDEPLOYDIR" make install-headers
+	DESTDIR="$PKGDEPLOYDIR" make install-libs
 
-	cat_file_merge "LDPATH" > "$DEPLOY/LDPATH"
-	cp libssp_nonshared.a "$DEPLOY/lib"
+	cat_file_merge "LDPATH" > "$PKGDEPLOYDIR/LDPATH"
+	cp libssp_nonshared.a "$PKGDEPLOYDIR/lib"
 
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{desc,files} "$DEPLOY"
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{desc,files} "$PKGDEPLOYDIR"
 
-cat > "$DEPLOY/libc.files" <<_EOF
+cat > "$PKGDEPLOYDIR/libc.files" <<_EOF
 dir lib 0755 0 0
 dir etc 0755 0 0
-file lib/libc.so 0755 0 0 $DEPLOY/lib/libc.so
+file lib/libc.so 0755 0 0 $PKGDEPLOYDIR/lib/libc.so
 slink lib/ld-musl-${MUSL_CPU}.so.1 0777 0 0 libc.so
-file etc/ld-musl-${MUSL_CPU}.path 0644 0 0 $DEPLOY/LDPATH
+file etc/ld-musl-${MUSL_CPU}.path 0644 0 0 $PKGDEPLOYDIR/LDPATH
 _EOF
 }
 
diff --git a/pkg/nano/build b/pkg/nano/build
index c18c305..27094ff 100644
--- a/pkg/nano/build
+++ b/pkg/nano/build
@@ -15,15 +15,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	curl --silent -L "$URL" | grep -o ">nano-[0-9.]*tar.xz<" | \
 	    sed 's/>nano-//g' | sed 's/.tar.xz<//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/ncurses/build b/pkg/ncurses/build
index feb68d4..c246629 100755
--- a/pkg/ncurses/build
+++ b/pkg/ncurses/build
@@ -19,30 +19,27 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
+	rm "$PKGDEPLOYDIR/bin/ncursesw6-config"
+	mkdir -p "$PKGDEPLOYDIR/include/ncurses"
 
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
-	rm "$DEPLOY/bin/ncursesw6-config"
-	mkdir -p "${DEPLOY}/include/ncurses"
-
-	for hdr in ${DEPLOY}/include/ncursesw/*.h; do
+	for hdr in ${PKGDEPLOYDIR}/include/ncursesw/*.h; do
 		local fname=$(basename $hdr)
 		local target="../$fname"
 
-		mv "$hdr" "${DEPLOY}/include"
-		ln -s "$target" "${DEPLOY}/include/ncursesw/${fname}"
-		ln -s "$target" "${DEPLOY}/include/ncurses/${fname}"
+		mv "$hdr" "${PKGDEPLOYDIR}/include"
+		ln -s "$target" "${PKGDEPLOYDIR}/include/ncursesw/${fname}"
+		ln -s "$target" "${PKGDEPLOYDIR}/include/ncurses/${fname}"
 	done
 
-	ln -s "libncursesw.so.$VERSION" "$DEPLOY/lib/libtinfo.so"
-	ln -s "libncursesw.so.$VERSION" "$DEPLOY/lib/libtinfo.so.$VERSION"
-	ln -s "libncursesw.a" "$DEPLOY/lib/libtinfo.a"
+	ln -s "libncursesw.so.$VERSION" "$PKGDEPLOYDIR/lib/libtinfo.so"
+	ln -s "libncursesw.so.$VERSION" "$PKGDEPLOYDIR/lib/libtinfo.so.$VERSION"
+	ln -s "libncursesw.a" "$PKGDEPLOYDIR/lib/libtinfo.a"
 }
 
 check_update() {
 	curl --silent -L "$URL" | grep -o ">ncurses-[0-9.]*tar.gz<" | \
 	    sed 's/>ncurses-//g' | sed 's/.tar.gz<//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/nftables/build b/pkg/nftables/build
index f14fdc0..457faf5 100644
--- a/pkg/nftables/build
+++ b/pkg/nftables/build
@@ -16,15 +16,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	curl --silent -L "$URL" | grep -o ">nftables-[0-9.]*tar.bz2<" | \
 	    sed 's/>nftables-//g' | sed 's/.tar.bz2<//g' | grep -v 0.099 |\
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/nginx/build b/pkg/nginx/build
index 3a512f4..22bd4b1 100755
--- a/pkg/nginx/build
+++ b/pkg/nginx/build
@@ -71,31 +71,33 @@ _EOF
 
 deploy() {
 	local SOURCE="$1"
-	local DEPLOY="$2"
 
 	local wwwroot=$(file_path_override "wwwroot")
 
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 
 	if [ ! -z "$wwwroot" ] && [ -d "$wwwroot" ]; then
-		mkdir -p "$DEPLOY/srv"
-		cp -r "$wwwroot" "$DEPLOY/srv/www"
+		mkdir -p "$PKGDEPLOYDIR/srv"
+		cp -r "$wwwroot" "$PKGDEPLOYDIR/srv/www"
 
-		echo "dir srv 0755 0 0" >> "$DEPLOY/nginx.files"
-		echo "dir srv/www 0755 0 0" >> "$DEPLOY/nginx.files"
+		echo "dir srv 0755 0 0" >> "$PKGDEPLOYDIR/nginx.files"
+		echo "dir srv/www 0755 0 0" >> "$PKGDEPLOYDIR/nginx.files"
 
-		find -H "$DEPLOY/srv/www" -type d -printf "dir %p 0%m 0 0\\n" |\
-			tail -n +2 | sed "s#$DEPLOY/##g" >> "$DEPLOY/nginx.files"
+		find -H "$PKGDEPLOYDIR/srv/www" -type d \
+		     -printf "dir %p 0%m 0 0\\n" | tail -n +2 |\
+		     sed "s#$PKGDEPLOYDIR/##g" >> "$PKGDEPLOYDIR/nginx.files"
 
-		find -H "$DEPLOY/srv/www" -type l -printf "slink %p 0%m 0 0 %l\\n" |\
-			sed "s#$DEPLOY/##g" >> "$DEPLOY/nginx.files"
+		find -H "$PKGDEPLOYDIR/srv/www" -type l \
+		     -printf "slink %p 0%m 0 0 %l\\n" | \
+		     sed "s#$PKGDEPLOYDIR/##g" >> "$PKGDEPLOYDIR/nginx.files"
 
-		find -H "$DEPLOY/srv/www" -type f -printf "file %p 0%m 0 0\\n" |\
-			sed "s#$DEPLOY/##g" >> "$DEPLOY/nginx.files"
+		find -H "$PKGDEPLOYDIR/srv/www" -type f \
+		     -printf "file %p 0%m 0 0\\n" |\
+		     sed "s#$PKGDEPLOYDIR/##g" >> "$PKGDEPLOYDIR/nginx.files"
 	fi
 
-	cat_file_override "nginx.conf" > "$DEPLOY/etc/nginx/nginx.conf"
+	cat_file_override "nginx.conf" > "$PKGDEPLOYDIR/etc/nginx/nginx.conf"
 }
 
 check_update() {
diff --git a/pkg/ntp/build b/pkg/ntp/build
index 116021e..00e6313 100644
--- a/pkg/ntp/build
+++ b/pkg/ntp/build
@@ -22,11 +22,8 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
diff --git a/pkg/openssh/build b/pkg/openssh/build
index d63fbe0..e3d71da 100644
--- a/pkg/openssh/build
+++ b/pkg/openssh/build
@@ -20,14 +20,13 @@ build() {
 
 deploy() {
 	local SOURCE="$1"
-	local DEPLOY="$2"
 
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
-	mkdir -p "$DEPLOY/var/lib/sshd"
-	install -v -m755 "$SOURCE/contrib/ssh-copy-id" "$DEPLOY/bin"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
+	mkdir -p "$PKGDEPLOYDIR/var/lib/sshd"
+	install -v -m755 "$SOURCE/contrib/ssh-copy-id" "$PKGDEPLOYDIR/bin"
 
-	cat_file_override "sshd_config" > "$DEPLOY/etc/sshd_config"
+	cat_file_override "sshd_config" > "$PKGDEPLOYDIR/etc/sshd_config"
 }
 
 check_update() {
@@ -36,4 +35,4 @@ check_update() {
 	curl --silent -L "$URL" | grep -o ">openssh-[0-9.]*p[0-9]*.tar.gz<" | \
 	    sed 's/>openssh-//g' | sed 's/.tar.gz<//g' | sed 's/p/./g' | \
 	    verson_find_greatest "$version"
-}
\ No newline at end of file
+}
diff --git a/pkg/openssl/build b/pkg/openssl/build
index 30a991a..d6e2d2b 100755
--- a/pkg/openssl/build
+++ b/pkg/openssl/build
@@ -46,11 +46,8 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
diff --git a/pkg/pcre/build b/pkg/pcre/build
index a4a7ad2..cf8b99b 100755
--- a/pkg/pcre/build
+++ b/pkg/pcre/build
@@ -16,15 +16,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	curl --silent -L "$URL" | grep -o ">pcre-[0-9.]*tar.bz2<" | \
 	    sed 's/>pcre-//g' | sed 's/.tar.bz2<//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/procps-ng/build b/pkg/procps-ng/build
index 814f609..f372f56 100755
--- a/pkg/procps-ng/build
+++ b/pkg/procps-ng/build
@@ -18,15 +18,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	curl --silent -L "$URL" | grep -o ">procps-ng-[0-9.]*tar.xz<" | \
 	    sed 's/>procps-ng-//g' | sed 's/.tar.xz<//g' |\
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/psmisc/build b/pkg/psmisc/build
index 93e0333..c0fca61 100755
--- a/pkg/psmisc/build
+++ b/pkg/psmisc/build
@@ -15,15 +15,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	curl --silent -L $URL | grep -o ">psmisc-[0-9.]*tar.xz<" | \
 	    sed 's/>psmisc-//g' | sed 's/.tar.xz<//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/readline/build b/pkg/readline/build
index 4004366..124a269 100755
--- a/pkg/readline/build
+++ b/pkg/readline/build
@@ -16,16 +16,13 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make SHLIB_LIBS="-lncursesw" DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
-	chmod 755 ${DEPLOY}/lib/*
+	make SHLIB_LIBS="-lncursesw" DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
+	chmod 755 ${PKGDEPLOYDIR}/lib/*
 }
 
 check_update() {
 	curl --silent -L $URL | grep -o ">readline-[0-9.]*tar.gz<" | \
 	    sed 's/>readline-//g' | sed 's/.tar.gz<//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/release-alix/build b/pkg/release-alix/build
index 1c40ea1..5d79c72 100755
--- a/pkg/release-alix/build
+++ b/pkg/release-alix/build
@@ -1,9 +1,6 @@
 DEPENDS="rootfs"
 
 build() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
 	pkg install -om -r "$PKGBUILDDIR/$OS_RELEASE" -R "$REPODIR" $DEPENDS
 
 	# copy additional files from this package, subsitute filenames
@@ -22,13 +19,10 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
 	tar czf "$BUILDROOT/$PRODUCT/$PKGNAME.tar.gz" *
 
-	touch "$2/$PKGNAME.files"
-	cat > "$2/$PKGNAME.desc" <<_EOF
+	touch "$PKGDEPLOYDIR/$PKGNAME.files"
+	cat > "$PKGDEPLOYDIR/$PKGNAME.desc" <<_EOF
 name $PKGNAME
 _EOF
 }
diff --git a/pkg/release-qemu/build b/pkg/release-qemu/build
index 5032939..18cecf0 100755
--- a/pkg/release-qemu/build
+++ b/pkg/release-qemu/build
@@ -1,9 +1,6 @@
 DEPENDS="rootfs"
 
 build() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
 	pkg install -om -r "$PKGBUILDDIR/$OS_RELEASE" -R "$REPODIR" $DEPENDS
 
 	# copy helper scripts
@@ -26,13 +23,10 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
 	tar czf "$BUILDROOT/$PRODUCT/$PKGNAME.tar.gz" *
 
-	touch "$2/$PKGNAME.files"
-	cat > "$2/$PKGNAME.desc" <<_EOF
+	touch "$PKGDEPLOYDIR/$PKGNAME.files"
+	cat > "$PKGDEPLOYDIR/$PKGNAME.desc" <<_EOF
 name $PKGNAME
 _EOF
 }
diff --git a/pkg/release-rpi3/build b/pkg/release-rpi3/build
index 6a92d43..6a6e6fc 100755
--- a/pkg/release-rpi3/build
+++ b/pkg/release-rpi3/build
@@ -1,9 +1,6 @@
 DEPENDS="rootfs boot-rpi3"
 
 build() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
 	pkg install -om -r "$PKGBUILDDIR/boot" -R "$REPODIR" $DEPENDS
 
 	# copy files from this package
@@ -24,13 +21,10 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
 	tar czf "$BUILDROOT/$PRODUCT/$PKGNAME.tar.gz" *
 
-	touch "$2/$PKGNAME.files"
-	cat > "$2/$PKGNAME.desc" <<_EOF
+	touch "$PKGDEPLOYDIR/$PKGNAME.files"
+	cat > "$PKGDEPLOYDIR/$PKGNAME.desc" <<_EOF
 name $PKGNAME
 _EOF
 }
diff --git a/pkg/rootfs/build b/pkg/rootfs/build
index 1fce230..ed0517d 100755
--- a/pkg/rootfs/build
+++ b/pkg/rootfs/build
@@ -1,9 +1,6 @@
 DEPENDS=$(cat_file_merge "ROOTFS" | sort -u)
 
 build() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
 	# setup skeleton
 	mkdir -pv ${PKGBUILDDIR}/{bin,dev,sys,proc,tmp,run,boot,usr,mnt,share}
 	mkdir -pv ${PKGBUILDDIR}/cfg/{preserve,overlay}
@@ -13,21 +10,21 @@ build() {
 
 	cp -r "$SCRIPTDIR/pkg/$PKGNAME/etc" "$PKGBUILDDIR"
 	cp -r "$SCRIPTDIR/pkg/$PKGNAME/lib" "$PKGBUILDDIR"
-	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$DEPLOY/pseudo"
+	cp "$SCRIPTDIR/pkg/$PKGNAME/rootfs_files.txt" "$PKGDEPLOYDIR/pseudo"
 
 	# version info
 	local fname=$(echo "${OS_NAME}-release" | tr '[:upper:]' '[:lower:]')
 
 	echo $OS_RELEASE > $PKGBUILDDIR/etc/$fname
 
-	echo "etc/$fname m 644 0 0" >> "$DEPLOY/pseudo"
+	echo "etc/$fname m 644 0 0" >> "$PKGDEPLOYDIR/pseudo"
 
 	# local config files
 	fname=$(file_path_override "resolv.conf")
 
 	if [ ! -z "$fname" ]; then
 		cp "$fname" "./etc/resolv.conf"
-		echo "etc/resolv.conf m 644 0 0" >> "$DEPLOY/pseudo"
+		echo "etc/resolv.conf m 644 0 0" >> "$PKGDEPLOYDIR/pseudo"
 	fi
 
 	# gather rootfs dependencies
@@ -36,15 +33,15 @@ build() {
 
 	cat_file_merge "ROOTFS" | sort -u | \
 		xargs pkg install -R "$REPODIR" \
-		      -r "$PKGBUILDDIR" -F sqfs -l >> "$DEPLOY/pseudo"
+		      -r "$PKGBUILDDIR" -F sqfs -l >> "$PKGDEPLOYDIR/pseudo"
 
 	# setup root home directory
 	cp -r "$PKGBUILDDIR/etc/skel" "$PKGBUILDDIR/usr/root"
 
-	echo "usr/root m 700 0 0" >> "$DEPLOY/pseudo"
+	echo "usr/root m 700 0 0" >> "$PKGDEPLOYDIR/pseudo"
 
 	find "./usr/root" -exec stat {} --printf="%n m %a 0 0\\n" \; | \
-		sed 's#^./##g' | tail -n +2  >> "$DEPLOY/pseudo"
+		sed 's#^./##g' | tail -n +2  >> "$PKGDEPLOYDIR/pseudo"
 
 	# move configuration to preserve directory
 	mv "$PKGBUILDDIR/etc" "$PKGBUILDDIR/cfg/preserve/etc"
@@ -54,27 +51,24 @@ build() {
 
 	mkdir -p ${PKGBUILDDIR}/{etc,var,usr}
 
-	sed -i 's#etc/#cfg/preserve/etc/#g' "$DEPLOY/pseudo"
-	sed -i 's#var/lib/#cfg/preserve/var_lib/#g' "$DEPLOY/pseudo"
-	sed -i 's#usr/#cfg/preserve/usr/#g' "$DEPLOY/pseudo"
+	sed -i 's#etc/#cfg/preserve/etc/#g' "$PKGDEPLOYDIR/pseudo"
+	sed -i 's#var/lib/#cfg/preserve/var_lib/#g' "$PKGDEPLOYDIR/pseudo"
+	sed -i 's#usr/#cfg/preserve/usr/#g' "$PKGDEPLOYDIR/pseudo"
 
 	# don't add stuff for the boot partition to the squashfs image
-	mv ${PKGBUILDDIR}/boot/* "$DEPLOY"
+	mv ${PKGBUILDDIR}/boot/* "$PKGDEPLOYDIR"
 
-	grep -v "^boot/" "$DEPLOY/pseudo" > "$DEPLOY/pseudo.temp"
-	mv "$DEPLOY/pseudo.temp" "$DEPLOY/pseudo"
-	echo "boot m 750 0 0" >> "$DEPLOY/pseudo"
+	grep -v "^boot/" "$PKGDEPLOYDIR/pseudo" > "$PKGDEPLOYDIR/pseudo.temp"
+	mv "$PKGDEPLOYDIR/pseudo.temp" "$PKGDEPLOYDIR/pseudo"
+	echo "boot m 750 0 0" >> "$PKGDEPLOYDIR/pseudo"
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
+	mksquashfs "$PKGBUILDDIR" "$PKGDEPLOYDIR/rootfs.img" -comp xz \
+		-no-progress -no-xattrs -pf "$PKGDEPLOYDIR/pseudo"
 
-	mksquashfs "$PKGBUILDDIR" "$DEPLOY/rootfs.img" -comp xz \
-		-no-progress -no-xattrs -pf "$DEPLOY/pseudo"
-
-	rm "$DEPLOY/pseudo"
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	rm "$PKGDEPLOYDIR/pseudo"
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
diff --git a/pkg/sed/build b/pkg/sed/build
index 3615580..a90b226 100755
--- a/pkg/sed/build
+++ b/pkg/sed/build
@@ -15,15 +15,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	curl --silent -L $URL | grep -o ">sed-[0-9.]*tar.xz<" | \
 	    sed 's/>sed-//g' | sed 's/.tar.xz<//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/shadow/build b/pkg/shadow/build
index b8ff6ea..9ffab68 100755
--- a/pkg/shadow/build
+++ b/pkg/shadow/build
@@ -17,18 +17,15 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
-	cp "$SCRIPTDIR/pkg/$PKGNAME/login.defs" "$DEPLOY/etc"
-	cp "$SCRIPTDIR/pkg/$PKGNAME/useradd" "$DEPLOY/etc/default"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
+	cp "$SCRIPTDIR/pkg/$PKGNAME/login.defs" "$PKGDEPLOYDIR/etc"
+	cp "$SCRIPTDIR/pkg/$PKGNAME/useradd" "$PKGDEPLOYDIR/etc/default"
 
 	# *hrmpf*
-	if [ -e "$DEPLOY/sbin" ]; then
-		mv ${DEPLOY}/sbin/* ${DEPLOY}/bin
-		rmdir ${DEPLOY}/sbin
+	if [ -e "$PKGDEPLOYDIR/sbin" ]; then
+		mv ${PKGDEPLOYDIR}/sbin/* "$PKGDEPLOYDIR/bin"
+		rmdir "$PKGDEPLOYDIR/sbin"
 	fi
 }
 
@@ -37,4 +34,4 @@ check_update() {
 	    grep -o "shadow-[0-9.]*tar.xz" | \
 	    sed 's/shadow-//g' | sed 's/.tar.xz//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/sqlite3/build b/pkg/sqlite3/build
index ee62786..0adcc7c 100755
--- a/pkg/sqlite3/build
+++ b/pkg/sqlite3/build
@@ -15,15 +15,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	curl --silent -L https://sqlite.org/download.html | \
 	    grep -o sqlite-autoconf-[0-9]*.tar.gz | grep -o [0-9]* | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/tar/build b/pkg/tar/build
index ddecfb0..8304f29 100755
--- a/pkg/tar/build
+++ b/pkg/tar/build
@@ -15,15 +15,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	curl --silent -L $URL | grep -o ">tar-[0-9.]*tar.xz<" | \
 	    sed 's/>tar-//g' | sed 's/.tar.xz<//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/tc-binutils/build b/pkg/tc-binutils/build
index 0bfe51a..6a3eaaf 100755
--- a/pkg/tc-binutils/build
+++ b/pkg/tc-binutils/build
@@ -23,12 +23,9 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
 	make install
 
-	cat > "$DEPLOY/$PKGNAME.files" <<_EOF
+	cat > "$PKGDEPLOYDIR/$PKGNAME.files" <<_EOF
 dir bin 0755 0 0
 dir lib 0755 0 0
 dir lib/ldscripts 0755 0 0
@@ -46,9 +43,9 @@ _EOF
 
 	find -H "$TCDIR/$TARGET/lib/ldscripts" -type f \
 	     -printf "file lib/ldscripts/%f 0%m 0 0 %p\\n" \
-	     >> "$DEPLOY/$PKGNAME.files"
+	     >> "$PKGDEPLOYDIR/$PKGNAME.files"
 
-	cat > "$DEPLOY/$PKGNAME.desc" <<_EOF
+	cat > "$PKGDEPLOYDIR/$PKGNAME.desc" <<_EOF
 name $PKGNAME
 _EOF
 }
diff --git a/pkg/tc-cloog/build b/pkg/tc-cloog/build
index ff11433..81e6bcb 100755
--- a/pkg/tc-cloog/build
+++ b/pkg/tc-cloog/build
@@ -14,8 +14,8 @@ build() {
 }
 
 deploy() {
-	touch "$2/$PKGNAME.files"
-	cat > "$2/$PKGNAME.desc" <<_EOF
+	touch "$PKGDEPLOYDIR/$PKGNAME.files"
+	cat > "$PKGDEPLOYDIR/$PKGNAME.desc" <<_EOF
 name $PKGNAME
 _EOF
 }
diff --git a/pkg/tc-file/build b/pkg/tc-file/build
index 27be9ed..fdb7298 100755
--- a/pkg/tc-file/build
+++ b/pkg/tc-file/build
@@ -16,8 +16,8 @@ build() {
 deploy() {
 	make install
 
-	touch "$2/$PKGNAME.files"
-	cat > "$2/$PKGNAME.desc" <<_EOF
+	touch "$PKGDEPLOYDIR/$PKGNAME.files"
+	cat > "$PKGDEPLOYDIR/$PKGNAME.desc" <<_EOF
 name $PKGNAME
 _EOF
 }
diff --git a/pkg/tc-gcc1/build b/pkg/tc-gcc1/build
index a0d42f8..1f09565 100755
--- a/pkg/tc-gcc1/build
+++ b/pkg/tc-gcc1/build
@@ -63,8 +63,8 @@ build() {
 deploy() {
 	make install-gcc install-target-libgcc
 
-	touch "$2/$PKGNAME.files"
-	cat > "$2/$PKGNAME.desc" <<_EOF
+	touch "$PKGDEPLOYDIR/$PKGNAME.files"
+	cat > "$PKGDEPLOYDIR/$PKGNAME.desc" <<_EOF
 name $PKGNAME
 requires tc-binutils linux-dev fortify-headers
 _EOF
diff --git a/pkg/tc-gcc2/build b/pkg/tc-gcc2/build
index d6dd525..b0ac441 100755
--- a/pkg/tc-gcc2/build
+++ b/pkg/tc-gcc2/build
@@ -27,16 +27,13 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
 	make install
 
-	mkdir -p "$DEPLOY/lib"
-	mv ${TCDIR}/${TARGET}/{include,lib} "$DEPLOY"
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	mkdir -p "$PKGDEPLOYDIR/lib"
+	mv ${TCDIR}/${TARGET}/{include,lib} "$PKGDEPLOYDIR"
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 
-	cat >> "$DEPLOY/libstdc++-dev.files" <<_EOF
+	cat >> "$PKGDEPLOYDIR/libstdc++-dev.files" <<_EOF
 dir include 0755 0 0
 dir include/c++ 0755 0 0
 dir include/c++/8.2.0 0755 0 0
@@ -68,8 +65,8 @@ file include/c++/8.2.0/$TARGET/bits/messages_members.h 0644 0 0
 file include/c++/8.2.0/$TARGET/ext/opt_random.h 0644 0 0
 _EOF
 
-	if [ -f "$DEPLOY/lib/libmpx.a" ]; then
-		cat >> "$DEPLOY/libgcc-dev.files" <<_EOF
+	if [ -f "$PKGDEPLOYDIR/lib/libmpx.a" ]; then
+		cat >> "$PKGDEPLOYDIR/libgcc-dev.files" <<_EOF
 file lib/libmpx.a 0644 0 0
 file lib/libmpxwrappers.a 0644 0 0
 _EOF
diff --git a/pkg/tc-gmp/build b/pkg/tc-gmp/build
index 4fe07d8..89f1df8 100755
--- a/pkg/tc-gmp/build
+++ b/pkg/tc-gmp/build
@@ -12,8 +12,8 @@ build() {
 }
 
 deploy() {
-	touch "$2/$PKGNAME.files"
-	cat > "$2/$PKGNAME.desc" <<_EOF
+	touch "$PKGDEPLOYDIR/$PKGNAME.files"
+	cat > "$PKGDEPLOYDIR/$PKGNAME.desc" <<_EOF
 name $PKGNAME
 _EOF
 }
\ No newline at end of file
diff --git a/pkg/tc-isl/build b/pkg/tc-isl/build
index dd062b9..402cba1 100755
--- a/pkg/tc-isl/build
+++ b/pkg/tc-isl/build
@@ -14,8 +14,8 @@ build() {
 }
 
 deploy() {
-	touch "$2/$PKGNAME.files"
-	cat > "$2/$PKGNAME.desc" <<_EOF
+	touch "$PKGDEPLOYDIR/$PKGNAME.files"
+	cat > "$PKGDEPLOYDIR/$PKGNAME.desc" <<_EOF
 name $PKGNAME
 _EOF
 }
diff --git a/pkg/tc-mpc/build b/pkg/tc-mpc/build
index b70acea..9ddbdd5 100755
--- a/pkg/tc-mpc/build
+++ b/pkg/tc-mpc/build
@@ -14,8 +14,8 @@ build() {
 }
 
 deploy() {
-	touch "$2/$PKGNAME.files"
-	cat > "$2/$PKGNAME.desc" <<_EOF
+	touch "$PKGDEPLOYDIR/$PKGNAME.files"
+	cat > "$PKGDEPLOYDIR/$PKGNAME.desc" <<_EOF
 name $PKGNAME
 _EOF
 }
diff --git a/pkg/tc-mpfr/build b/pkg/tc-mpfr/build
index 5e3096e..49e896a 100755
--- a/pkg/tc-mpfr/build
+++ b/pkg/tc-mpfr/build
@@ -14,8 +14,8 @@ build() {
 }
 
 deploy() {
-	touch "$2/$PKGNAME.files"
-	cat > "$2/$PKGNAME.desc" <<_EOF
+	touch "$PKGDEPLOYDIR/$PKGNAME.files"
+	cat > "$PKGDEPLOYDIR/$PKGNAME.desc" <<_EOF
 name $PKGNAME
 _EOF
 }
diff --git a/pkg/tc-pkg-config/build b/pkg/tc-pkg-config/build
index 8ddc736..ee2f6db 100755
--- a/pkg/tc-pkg-config/build
+++ b/pkg/tc-pkg-config/build
@@ -10,7 +10,6 @@ prepare() {
 }
 
 build() {
-
 	$1/configure --prefix="$TCDIR" --target="$TARGET" \
 		     --build="$HOSTTUPLE" --host="$HOSTTUPLE" \
 		     --with-sysroot="$TCDIR/$TARGET" \
@@ -27,8 +26,8 @@ deploy() {
 
 	ln -s pkg-config "$TCDIR/bin/$TARGET-pkg-config"
 
-	touch "$2/$PKGNAME.files"
-	cat > "$2/$PKGNAME.desc" <<_EOF
+	touch "$PKGDEPLOYDIR/$PKGNAME.files"
+	cat > "$PKGDEPLOYDIR/$PKGNAME.desc" <<_EOF
 name $PKGNAME
 _EOF
 }
diff --git a/pkg/tc-pkgtool/build b/pkg/tc-pkgtool/build
index 328f484..eee9335 100755
--- a/pkg/tc-pkgtool/build
+++ b/pkg/tc-pkgtool/build
@@ -19,8 +19,8 @@ build() {
 deploy() {
 	make install
 
-	touch "$2/$PKGNAME.files"
-	cat > "$2/$PKGNAME.desc" <<_EOF
+	touch "$PKGDEPLOYDIR/$PKGNAME.files"
+	cat > "$PKGDEPLOYDIR/$PKGNAME.desc" <<_EOF
 name $PKGNAME
 _EOF
 }
diff --git a/pkg/tcpdump/build b/pkg/tcpdump/build
index 258b960..725c468 100755
--- a/pkg/tcpdump/build
+++ b/pkg/tcpdump/build
@@ -17,11 +17,8 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
diff --git a/pkg/toolchain/build b/pkg/toolchain/build
index bb13856..733a26e 100755
--- a/pkg/toolchain/build
+++ b/pkg/toolchain/build
@@ -22,8 +22,8 @@ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
 _EOF
 
-	touch "$2/$PKGNAME.files"
-	cat > "$2/$PKGNAME.desc" <<_EOF
+	touch "$PKGDEPLOYDIR/$PKGNAME.files"
+	cat > "$PKGDEPLOYDIR/$PKGNAME.desc" <<_EOF
 name $PKGNAME
 requires $DEPENDS
 _EOF
diff --git a/pkg/tzdata/build b/pkg/tzdata/build
index 18b98a5..28defd8 100644
--- a/pkg/tzdata/build
+++ b/pkg/tzdata/build
@@ -16,15 +16,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
+	make USRDIR="" DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 
-	make USRDIR="" DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
-
-	sed -i 's@/usr@@g' "$DEPLOY/bin/tzselect"
-	rm "$DEPLOY/bin/zdump"
-	rm "$DEPLOY/bin/zic"
+	sed -i 's@/usr@@g' "$PKGDEPLOYDIR/bin/tzselect"
+	rm "$PKGDEPLOYDIR/bin/zdump"
+	rm "$PKGDEPLOYDIR/bin/zic"
 }
 
 check_update() {
diff --git a/pkg/unbound/build b/pkg/unbound/build
index c81d134..62628ac 100644
--- a/pkg/unbound/build
+++ b/pkg/unbound/build
@@ -19,14 +19,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
 	local tag alg type digest
 
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 
-	cat_file_override "unbound.conf" > "$DEPLOY/etc/unbound/unbound.conf"
+	cat_file_override "unbound.conf" > "$PKGDEPLOYDIR/etc/unbound/unbound.conf"
 
 	echo "generating trust anchor root.key"
 
@@ -39,7 +37,7 @@ deploy() {
 		type=$(echo $line | grep -o -e "<DigestType>[0-9]*</" | grep -o -w "[0-9]*")
 		digest=$(echo $line | grep -o -e "<Digest>[A-F0-9]*</" | grep -o -w "[A-F0-9]*")
 
-		echo ". IN DS $tag $alg $type $digest" >> "$DEPLOY/etc/unbound/root.key"
+		echo ". IN DS $tag $alg $type $digest" >> "$PKGDEPLOYDIR/etc/unbound/root.key"
 	done
 }
 
diff --git a/pkg/usyslog/build b/pkg/usyslog/build
index d81ad90..efcde99 100755
--- a/pkg/usyslog/build
+++ b/pkg/usyslog/build
@@ -15,11 +15,8 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
diff --git a/pkg/util-linux/build b/pkg/util-linux/build
index cfa7371..4620879 100755
--- a/pkg/util-linux/build
+++ b/pkg/util-linux/build
@@ -22,20 +22,16 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-	local UTIL
-
-	mkdir -p "$DEPLOY/var/lib/hwclock"
+	mkdir -p "$PKGDEPLOYDIR/var/lib/hwclock"
 
 	unfuck_libtool
-	make DESTDIR="$DEPLOY" install
+	make DESTDIR="$PKGDEPLOYDIR" install
 
-	if [ -e "$DEPLOY/sbin" ]; then
-		mv ${DEPLOY}/sbin/* ${DEPLOY}/bin
+	if [ -e "$PKGDEPLOYDIR/sbin" ]; then
+		mv ${PKGDEPLOYDIR}/sbin/* "$PKGDEPLOYDIR/bin"
 	fi
 
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
diff --git a/pkg/xz/build b/pkg/xz/build
index b2f03a7..b661f6b 100644
--- a/pkg/xz/build
+++ b/pkg/xz/build
@@ -16,15 +16,12 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
 	curl --silent -L "$URL" | grep -o "xz-[0-9.]*tar.xz" | \
 	    sed 's/xz-//g' | sed 's/.tar.xz//g' | \
 	    verson_find_greatest "$VERSION"
-}
\ No newline at end of file
+}
diff --git a/pkg/zlib/build b/pkg/zlib/build
index f6e970e..8cdd178 100644
--- a/pkg/zlib/build
+++ b/pkg/zlib/build
@@ -27,11 +27,8 @@ build() {
 }
 
 deploy() {
-	local SOURCE="$1"
-	local DEPLOY="$2"
-
-	make DESTDIR="$DEPLOY" install
-	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$DEPLOY"
+	make DESTDIR="$PKGDEPLOYDIR" install
+	cp $SCRIPTDIR/pkg/$PKGNAME/*.{files,desc} "$PKGDEPLOYDIR"
 }
 
 check_update() {
diff --git a/util/pkgcmd.sh b/util/pkgcmd.sh
index fab9def..cadaba9 100644
--- a/util/pkgcmd.sh
+++ b/util/pkgcmd.sh
@@ -20,7 +20,7 @@ run_pkg_command() {
 	mkdir -p "$PKGBUILDDIR" "$PKGDEPLOYDIR"
 
 	pushd "$PKGBUILDDIR" > /dev/null
-	$FUNCTION "$SRC" "$PKGDEPLOYDIR" &>> "$LOGFILE" < /dev/null
+	$FUNCTION "$SRC" &>> "$LOGFILE" < /dev/null
 	popd > /dev/null
 
 	gzip "$LOGFILE"