# HG changeset patch
# User David Demelier <markand@malikania.fr>
# Date 1563427603 -7200
# Node ID 25cecc6dca483649950fde413562635df3e02dbb
# Parent  860ab66f5f71e247f14a48b3a85104b55561314f
vanilla: use POSIX shell and busybox tar

diff -r 860ab66f5f71 -r 25cecc6dca48 Templates/autotools.sh
--- a/Templates/autotools.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/Templates/autotools.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -36,8 +36,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -52,6 +52,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 Templates/cmake.sh
--- a/Templates/cmake.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/Templates/cmake.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,10 +32,10 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
-	mkdir build && pushd build
+	mkdir build && cd build
 	cmake .. \
 		-DBUILD_SHARED_LIBS=On \
 		-DCMAKE_BUILD_TYPE=Release \
@@ -46,8 +46,8 @@
 		-DCMAKE_INSTALL_PREFIX=
 	make
 	make install DESTDIR=$DESTDIR
-	popd
+	cd ..
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 Templates/mate.sh
--- a/Templates/mate.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/Templates/mate.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -34,8 +34,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -48,6 +48,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 Templates/meson.sh
--- a/Templates/meson.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/Templates/meson.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -49,7 +49,7 @@
 	ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
 
diff -r 860ab66f5f71 -r 25cecc6dca48 Templates/perl.sh
--- a/Templates/perl.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/Templates/perl.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -27,12 +27,12 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	perl Makefile.PL INSTALLDIRS=vendor
 	make DESTDIR=$DESTDIR install
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 Templates/python-hybrid.sh
--- a/Templates/python-hybrid.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/Templates/python-hybrid.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -28,13 +28,13 @@
 {
 	for py in python python2; do
 		rm -rf $PKGNAME-$PKGVERSION
-		tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-		pushd $PKGNAME-$PKGVERSION
+		tar xvf $PKGNAME-$PKGVERSION.tar.gz
+		cd $PKGNAME-$PKGVERSION
 
 		$py setup.py build
 		$py setup.py install --root=${DESTDIR:-/} -O1
 
-		popd
+		cd ..
 		rm -rf $PKGNAME-$PKGVERSION
 	done
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 Templates/python.sh
--- a/Templates/python.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/Templates/python.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -27,12 +27,12 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	python setup.py build
 	python setup.py install --root=${DESTDIR:-/} -O1
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 Templates/xfce.sh
--- a/Templates/xfce.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/Templates/xfce.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -34,8 +34,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -48,6 +48,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 accessibility/at-spi2-atk/at-spi2-atk.sh
--- a/accessibility/at-spi2-atk/at-spi2-atk.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/accessibility/at-spi2-atk/at-spi2-atk.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -48,7 +48,7 @@
 	ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
 
diff -r 860ab66f5f71 -r 25cecc6dca48 accessibility/at-spi2-core/at-spi2-core.sh
--- a/accessibility/at-spi2-core/at-spi2-core.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/accessibility/at-spi2-core/at-spi2-core.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -41,8 +41,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	# https://git.alpinelinux.org/aports/plain/main/at-spi2-core/fix-meson-subdir.patch
 	patch -p1 < ../fix-meson-subdir.patch
@@ -60,7 +60,7 @@
 	CC="$CC" ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
 
diff -r 860ab66f5f71 -r 25cecc6dca48 accessibility/atk/atk.sh
--- a/accessibility/atk/atk.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/accessibility/atk/atk.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -48,7 +48,7 @@
 	CC="$CC" ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
 
diff -r 860ab66f5f71 -r 25cecc6dca48 audio/alsa-lib/alsa-lib.sh
--- a/audio/alsa-lib/alsa-lib.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/audio/alsa-lib/alsa-lib.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -30,8 +30,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -42,6 +42,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libasound.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 audio/alsa-lib/alsa-lib.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/alsa-lib/alsa-lib.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+018523741f0b78ad5aa928202c11e6694a8c10c2  alsa-lib-1.1.8.tar.bz2
diff -r 860ab66f5f71 -r 25cecc6dca48 audio/libcanberra/libcanberra.sh
--- a/audio/libcanberra/libcanberra.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/audio/libcanberra/libcanberra.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -63,8 +63,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -84,6 +84,6 @@
 	rm -f $DESTDIR/lib/gtk-3.0/modules/libcanberra-gtk3-module.la
 	rm -f $DESTDIR/lib/libcanberra*.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 audio/libcanberra/libcanberra.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/libcanberra/libcanberra.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+fd4c16e341ffc456d688ed3462930d17ca6f6c20  libcanberra-0.30.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 audio/libcddb/libcddb.sh
--- a/audio/libcddb/libcddb.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/audio/libcddb/libcddb.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -30,8 +30,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -45,6 +45,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libcddb.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 audio/libcddb/libcddb.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/libcddb/libcddb.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+2a7855918689692ff5ca3316d078a859d51959ce  libcddb-1.3.2.tar.bz2
diff -r 860ab66f5f71 -r 25cecc6dca48 audio/libogg/libogg.sh
--- a/audio/libogg/libogg.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/audio/libogg/libogg.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -49,6 +49,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libogg.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 audio/libogg/libogg.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/libogg/libogg.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+ba54760b8f44bd85b79222286faf5d6a21e356fe  libogg-1.3.3.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 audio/libvorbis/libvorbis.sh
--- a/audio/libvorbis/libvorbis.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/audio/libvorbis/libvorbis.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -34,8 +34,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -51,6 +51,6 @@
 	make install DESTDIR=$DESTDIR docdir=/share/doc/$PKGNAME
 	rm -f $DESTDIR/lib/libvorbis{,file,enc}.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 audio/libvorbis/libvorbis.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/libvorbis/libvorbis.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+237e3d1c66452734fd9b32f494f44238b4f0185e  libvorbis-1.3.6.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 compression/bzip2/bzip2.sh
--- a/compression/bzip2/bzip2.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/compression/bzip2/bzip2.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	sed -i -e 's/$(PREFIX)/$(DESTDIR)$(PREFIX)/g' Makefile
 	patch -p1 < ../CVE-2016-3189.patch
@@ -45,6 +45,6 @@
 	ln -s libbz2.so.$PKGVERSION $DESTDIR/lib/libbz2.so.${PKGVERSION%%.*}
 	rm -f $DESTDIR/lib/libbz2.a
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 compression/bzip2/bzip2.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compression/bzip2/bzip2.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+3f89f861209ce81a6bab1fd1998c0ef311712002  bzip2-1.0.6.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 compression/gzip/gzip.sh
--- a/compression/gzip/gzip.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/compression/gzip/gzip.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -46,6 +46,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 compression/lbzip2/lbzip2.sh
--- a/compression/lbzip2/lbzip2.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/compression/lbzip2/lbzip2.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -46,6 +46,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 compression/libarchive/libarchive.sh
--- a/compression/libarchive/libarchive.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/compression/libarchive/libarchive.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -107,8 +107,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -140,6 +140,6 @@
 	make install DESTDIR=$DESTDIR
         rm -f $DESTDIR/lib/libarchive.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 compression/libzip/libzip.sh
--- a/compression/libzip/libzip.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/compression/libzip/libzip.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,10 +33,10 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
-	mkdir build && pushd build
+	mkdir build && cd build
 	cmake .. \
 		-DBUILD_SHARED_LIBS=On \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
@@ -46,8 +46,8 @@
 		-DCMAKE_INSTALL_PREFIX=
 	make
 	make install DESTDIR=$DESTDIR
-	popd
+	cd ..
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 compression/libzip/libzip.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compression/libzip/libzip.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+4033cccb7544a3eab6d0ee28be94cf45bea60b0b  libzip-1.5.1.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 compression/lz4/lz4.sh
--- a/compression/lz4/lz4.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/compression/lz4/lz4.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -28,12 +28,12 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf v$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf v$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	make CC="$CC" CFLAGS="$CFLAGS" BUILD_STATIC=no PREFIX=/
 	make BUILD_STATIC=no DESTDIR=$DESTDIR PREFIX=/ install
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 compression/lz4/lz4.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compression/lz4/lz4.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+070867abcd93a7245b80ec6fc2ced27c6b8e3e0c  v1.8.3.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 compression/lzip/lzip.sh
--- a/compression/lzip/lzip.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/compression/lzip/lzip.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -28,14 +28,14 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	# custom configure script.
 	./configure --prefix= CXX="$CXX" CXXFLAGS="$CXXFLAGS"
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 compression/unzip/unzip.sh
--- a/compression/unzip/unzip.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/compression/unzip/unzip.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -28,8 +28,8 @@
 build()
 {
 	rm -rf ${PKGNAME}60
-	tar xvaf ${PKGNAME}60.tar.gz
-	pushd ${PKGNAME}60
+	tar xvf ${PKGNAME}60.tar.gz
+	cd ${PKGNAME}60
 
 	patch -p1 < ../CVE-2014-8139.patch
 	patch -p1 < ../CVE-2014-8140.patch
@@ -46,6 +46,6 @@
 		MANDIR=$DESTDIR/share/man/man1 \
 		install
 
-	popd
+	cd ..
 	rm -rf ${PKGNAME}60
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 compression/unzip/unzip.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compression/unzip/unzip.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+abf7de8a4018a983590ed6f5cbd990d4740f8a22  unzip60.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 compression/xz/xz.sh
--- a/compression/xz/xz.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/compression/xz/xz.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -41,8 +41,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -59,6 +59,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/liblzma.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 compression/zip/zip.sh
--- a/compression/zip/zip.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/compression/zip/zip.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -28,8 +28,8 @@
 build()
 {
 	rm -rf ${PKGNAME}30
-	tar xvaf ${PKGNAME}30.tar.gz
-	pushd ${PKGNAME}30
+	tar xvf ${PKGNAME}30.tar.gz
+	cd ${PKGNAME}30
 
 	# does not support DESTDIR, fake it with prefix.
 	make -f unix/Makefile CC="$CC" generic
@@ -38,6 +38,6 @@
 		MANDIR=$DESTDIR/share/man/man1 \
 		install
 
-	popd
+	cd ..
 	rm -rf ${PKGNAME}30
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 compression/zip/zip.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compression/zip/zip.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+c9f4099ecf2772b53c2dd4a8e508064ce015d182  zip30.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 compression/zlib/zlib.sh
--- a/compression/zlib/zlib.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/compression/zlib/zlib.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -28,8 +28,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	# custom configure script.
 	CC="$CC" CFLAGS="$CFLAGS" ./configure --prefix=
@@ -37,6 +37,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libz.a
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 compression/zlib/zlib.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compression/zlib/zlib.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+e6d119755acdf9104d7ba236b1242696940ed6dd  zlib-1.2.11.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 compression/zstd/zstd.sh
--- a/compression/zstd/zstd.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/compression/zstd/zstd.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -28,8 +28,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	sed -i \
 		-e '/^lib:/ s/libzstd.a //' \
@@ -38,6 +38,6 @@
 	make CC="$CC" CFLAGS="$CFLAGS"
 	make PREFIX=/ LIBDIR=/lib DESTDIR=$DESTDIR install
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 compression/zstd/zstd.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compression/zstd/zstd.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+08f5f75bf5dc067d95c77878725638e370f74fa2  zstd-1.3.8.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 core/acl/acl.sh
--- a/core/acl/acl.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/acl/acl.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -42,8 +42,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -60,6 +60,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libacl.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/attr/attr.sh
--- a/core/attr/attr.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/attr/attr.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -41,8 +41,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -59,6 +59,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libattr.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/bash-completion/bash-completion.sh
--- a/core/bash-completion/bash-completion.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/bash-completion/bash-completion.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/bc/bc.sh
--- a/core/bc/bc.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/bc/bc.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -48,6 +48,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/busybox/busybox.sh
--- a/core/busybox/busybox.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/busybox/busybox.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -35,8 +35,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	#
 	# Allow user to specify a full config if specified, otherwise change
@@ -85,6 +85,6 @@
 	install -Dm0644 ../busybox.mdev $DESTDIR/etc/rc.d/busybox.mdev
 	install -Dm0644 ../busybox.syslogd $DESTDIR/etc/rc.d/busybox.syslogd
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/consolekit2/consolekit2.sh
--- a/core/consolekit2/consolekit2.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/consolekit2/consolekit2.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -65,8 +65,8 @@
 build()
 {
 	rm -rf ConsoleKit2-$PKGVERSION
-	tar xvaf ConsoleKit2-$PKGVERSION.tar.bz2
-	pushd ConsoleKit2-$PKGVERSION
+	tar xvf ConsoleKit2-$PKGVERSION.tar.bz2
+	cd ConsoleKit2-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -89,6 +89,6 @@
 	rm -f $DESTDIR/lib/libck-connector.la
 	rm -f $DESTDIR/lib/libconsolekit.la
 
-	popd
+	cd ..
 	rm -rf ConsoleKit2-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/coreutils/coreutils.sh
--- a/core/coreutils/coreutils.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/coreutils/coreutils.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -55,8 +55,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	# kill is provided by util-linux and shells
 	# uptime is provided by procps-ng
@@ -76,6 +76,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/cpio/cpio.sh
--- a/core/cpio/cpio.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/cpio/cpio.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -41,8 +41,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -56,6 +56,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/diffutils/diffutils.sh
--- a/core/diffutils/diffutils.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/diffutils/diffutils.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -41,8 +41,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -56,6 +56,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/e2fsprogs/e2fsprogs.sh
--- a/core/e2fsprogs/e2fsprogs.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/e2fsprogs/e2fsprogs.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -42,8 +42,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	# disable-{fsck,uuid,libuuid,libblkid} => util-linux provides them.
 	CC="$CC" \
@@ -65,6 +65,6 @@
 	make
 	make install install-libs DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/ed/ed.sh
--- a/core/ed/ed.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/ed/ed.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -28,14 +28,14 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.lz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.lz
+	cd $PKGNAME-$PKGVERSION
 
 	# custom configure script.
 	./configure --prefix= CC="$CC" CFLAGS="$CFLAGS"
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/efibootmgr/efibootmgr.sh
--- a/core/efibootmgr/efibootmgr.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/efibootmgr/efibootmgr.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -28,8 +28,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	# https://github.com/rhboot/efibootmgr/pull/96
 	patch -p0 < ../clang.patch
@@ -38,6 +38,6 @@
 	CC="$CC" PCDIR=/lib/pkgconfig EFIDIR=/boot/efi make
 	EFIDIR=/boot/efi DESTDIR=$DESTDIR prefix= sbindir=/bin make install
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/elfutils/elfutils.sh
--- a/core/elfutils/elfutils.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/elfutils/elfutils.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -37,8 +37,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	# credits to void linux and alpine linux.
 	# https://github.com/void-linux/void-packages/tree/master/srcpkgs/elfutils
@@ -57,6 +57,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/lib{asm,dw,ebl,elf}.a
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/eudev/eudev.sh
--- a/core/eudev/eudev.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/eudev/eudev.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -34,8 +34,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf v$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf v$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	autoreconf -fi
 	CC="$CC" \
@@ -55,6 +55,6 @@
 	rm -f $DESTDIR/lib/libudev.la
 	install -Dm0755 ../udevd $DESTDIR/etc/rc.d/udevd
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/file/file.sh
--- a/core/file/file.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/file/file.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -49,6 +49,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libmagic.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/findutils/findutils.sh
--- a/core/findutils/findutils.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/findutils/findutils.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -41,8 +41,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -57,6 +57,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/gawk/gawk.sh
--- a/core/gawk/gawk.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/gawk/gawk.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -40,8 +40,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -55,6 +55,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/gettext/gettext.sh
--- a/core/gettext/gettext.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/gettext/gettext.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CFLAGS="$CFLAGS" \
 	CXXFLAGS="$CXXFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/lib{gettextpo,gettextsrc,gettextlib,intl,asprintf}.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/grep/grep.sh
--- a/core/grep/grep.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/grep/grep.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -42,8 +42,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -57,6 +57,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/grub/grub.sh
--- a/core/grub/grub.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/grub/grub.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -58,7 +58,7 @@
 
 build_grub()
 {
-	mkdir build && pushd build
+	mkdir build && cd build
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -81,20 +81,20 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf build
 }
 
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	for p in $platforms; do
 		build_grub $p
 	done
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/kbd/kbd.sh
--- a/core/kbd/kbd.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/kbd/kbd.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -42,8 +42,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	# disable vlock until we get PAM.
 	CC="$CC" \
@@ -61,6 +61,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/kmod/kmod.sh
--- a/core/kmod/kmod.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/kmod/kmod.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -56,8 +56,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -79,6 +79,6 @@
 		ln -sf kmod $DESTDIR/bin/$tool
 	done
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/less/less.sh
--- a/core/less/less.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/less/less.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -48,6 +48,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/libcap/libcap.sh
--- a/core/libcap/libcap.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/libcap/libcap.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -30,13 +30,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	patch -p0 < ../disable-static.patch
 	make BUILD_CC="$CC" CC="$CC" CFLAGS="$CFLAGS"
 	make install RAISE_SETFCAP=no SBINDIR=/bin DESTDIR=$DESTDIR prefix= lib=/lib
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/lvm2/lvm2.sh
--- a/core/lvm2/lvm2.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/lvm2/lvm2.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -41,8 +41,8 @@
 build()
 {
 	rm -rf LVM2.$PKGVERSION
-	tar xvaf LVM2.$PKGVERSION.tgz
-	pushd LVM2.$PKGVERSION
+	tar xvf LVM2.$PKGVERSION.tgz
+	cd LVM2.$PKGVERSION
 
 	# --disable-nls: does not build with --enable-nls
 	patch -p1 < ../lld.patch
@@ -65,6 +65,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf LVM2.$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/mandoc/mandoc.sh
--- a/core/mandoc/mandoc.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/mandoc/mandoc.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -31,8 +31,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	sed -i -e "/^CC=/ s/CC=.*/CC=$CC/" configure
 	echo "UTF8_LOCALE=en_US.UTF-8" > configure.local
@@ -43,6 +43,6 @@
 	make CC="$CC" CFLAGS="$CFLAGS"
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/procps/procps.sh
--- a/core/procps/procps.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/procps/procps.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -42,8 +42,8 @@
 build()
 {
 	rm -rf $PKGNAME-v$PKGVERSION
-	tar xvaf $PKGNAME-v$PKGVERSION.tar.gz
-	pushd $PKGNAME-v$PKGVERSION
+	tar xvf $PKGNAME-v$PKGVERSION.tar.gz
+	cd $PKGNAME-v$PKGVERSION
 
 	./autogen.sh
 	CC="$CC" \
@@ -64,6 +64,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libprocps.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-v$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/rhash/rhash.sh
--- a/core/rhash/rhash.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/rhash/rhash.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -48,8 +48,8 @@
 build()
 {
 	rm -rf RHash-$PKGVERSION
-	tar xvaf v$PKGVERSION.tar.gz
-	pushd RHash-$PKGVERSION
+	tar xvf v$PKGVERSION.tar.gz
+	cd RHash-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -70,6 +70,6 @@
 		install-lib-shared \
 		install-so-link
 
-	popd
+	cd ..
 	rm -rf RHash-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/sed/sed.sh
--- a/core/sed/sed.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/sed/sed.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -48,8 +48,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -64,6 +64,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/sysklogd/sysklogd.sh
--- a/core/sysklogd/sysklogd.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/sysklogd/sysklogd.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -51,6 +51,6 @@
 	install -D -m 0766 ../syslog.conf $DESTDIR/etc/syslog.conf
 	install -D -m 0644 ../sysklogd $DESTDIR/etc/rc.d/sysklogd
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/sysvinit/sysvinit.sh
--- a/core/sysvinit/sysvinit.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/sysvinit/sysvinit.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -29,8 +29,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	patch -p0 < ../disable-components.patch
 	patch -p0 < ../message-style.patch
@@ -42,6 +42,6 @@
 	make install ROOT=$DESTDIR MANDIR=/share/man
 	install -Dm0644 ../inittab $DESTDIR/etc/inittab
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/tar/tar.sh
--- a/core/tar/tar.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/tar/tar.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -48,8 +48,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -65,6 +65,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/texinfo/texinfo.sh
--- a/core/texinfo/texinfo.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/texinfo/texinfo.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -42,8 +42,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -58,6 +58,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/texinfo/{Parsetexi,MiscXS,XSParagraph}.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/tmux/tmux.sh
--- a/core/tmux/tmux.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/tmux/tmux.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/tree/tree.sh
--- a/core/tree/tree.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/tree/tree.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -29,7 +29,7 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tgz
+	tar xvf $PKGNAME-$PKGVERSION.tgz
 	cd $PKGNAME-$PKGVERSION
 
 	patch -p0 < ../patch-Makefile.patch
diff -r 860ab66f5f71 -r 25cecc6dca48 core/tzdata/tzdata.sh
--- a/core/tzdata/tzdata.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/tzdata/tzdata.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -30,13 +30,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	mkdir $PKGNAME-$PKGVERSION && pushd $PKGNAME-$PKGVERSION
-	tar xvaf ../tzdata$PKGVERSION.tar.gz
-	tar xvaf ../tzcode$PKGVERSION.tar.gz
+	mkdir $PKGNAME-$PKGVERSION && cd $PKGNAME-$PKGVERSION
+	tar xvf ../tzdata$PKGVERSION.tar.gz
+	tar xvf ../tzcode$PKGVERSION.tar.gz
 
 	make CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
 	make install DESTDIR=$DESTDIR USRDIR=
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/util-linux/util-linux.sh
--- a/core/util-linux/util-linux.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/util-linux/util-linux.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -80,8 +80,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	sed -i -e 's|/sbin|/bin|' configure.ac
 	autoreconf -vif
@@ -116,6 +116,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/lib{fdisk,smartcols,mount,blkid,uuid}.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 core/which/which.sh
--- a/core/which/which.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/core/which/which.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -46,6 +46,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 crypto/gnutls/gnutls.sh
--- a/crypto/gnutls/gnutls.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/crypto/gnutls/gnutls.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -35,8 +35,8 @@
 build()
 {
 	rm -rf $PKGNAME-3.6.7
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-3.6.7
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-3.6.7
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -53,6 +53,6 @@
 	rm -f $DESTDIR/lib/libgnutlsxx.la
 	rm -f $DESTDIR/lib/libgnutls.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-3.6.7
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 crypto/gnutls/gnutls.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/gnutls/gnutls.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+3baed10464c3924b12c0831deaafb47b887201cd  gnutls-3.6.7.1.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 crypto/nettle/nettle.sh
--- a/crypto/nettle/nettle.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/crypto/nettle/nettle.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -34,8 +34,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -52,6 +52,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 crypto/nettle/nettle.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/nettle/nettle.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+56a81ed4a8d35489d8bddd99d5262fe3958a52b4  nettle-3.4.1.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 crypto/p11-kit/p11-kit.sh
--- a/crypto/p11-kit/p11-kit.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/crypto/p11-kit/p11-kit.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -51,6 +51,6 @@
 	rm -f $DESTDIR/lib/pkcs11/*.la
 	rm -f $DESTDIR/lib/libp11-kit.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 crypto/p11-kit/p11-kit.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/p11-kit/p11-kit.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+06a9976d92861e5286fbb0b239821b7a250b177b  p11-kit-0.23.15.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 databases/db/db.sh
--- a/databases/db/db.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/databases/db/db.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -30,12 +30,12 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	patch -p0 < ../atomic.patch
 	patch -p0 < ../disable-docs.patch
-	pushd build_unix
+	cd build_unix
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \
@@ -44,8 +44,8 @@
 	make
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libdb{_stl-5.3,_cxx-5.3,-5.3}.la
-	popd
+	cd ..
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 databases/db/db.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/db/db.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+fa3f8a41ad5101f43d08bc0efb6241c9b6fc1ae9  db-5.3.28.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 databases/gdbm/gdbm.sh
--- a/databases/gdbm/gdbm.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/databases/gdbm/gdbm.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libgdbm.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 databases/gdbm/gdbm.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/gdbm/gdbm.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+4a923ebfac06bb05c1c7699b206719e06a938f0d  gdbm-1.18.1.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 databases/sqlite/sqlite.sh
--- a/databases/sqlite/sqlite.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/databases/sqlite/sqlite.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -50,7 +50,7 @@
 {
 	rm -rf $PKGNAME-src-$PKGVERSION
 	unzip $PKGNAME-src-$PKGVERSION.zip
-	pushd $PKGNAME-src-$PKGVERSION
+	cd $PKGNAME-src-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -66,6 +66,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libsqlite3.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-src-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 databases/sqlite/sqlite.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/sqlite/sqlite.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+823a77ee707b56722cd201aaf2f82e7bef57c042  sqlite-src-3270200.zip
diff -r 860ab66f5f71 -r 25cecc6dca48 desktop/dconf/dconf.sh
--- a/desktop/dconf/dconf.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/desktop/dconf/dconf.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -30,8 +30,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	# TODO: enable documentation once docbook-xml is there.
 	# https://gitlab.gnome.org/GNOME/dconf/issues/47
@@ -49,7 +49,7 @@
 	ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
 
diff -r 860ab66f5f71 -r 25cecc6dca48 desktop/icon-naming-utils/icon-naming-utils.sh
--- a/desktop/icon-naming-utils/icon-naming-utils.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/desktop/icon-naming-utils/icon-naming-utils.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR pkgconfigdir=/lib/pkgconfig
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 desktop/libnotify/libnotify.sh
--- a/desktop/libnotify/libnotify.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/desktop/libnotify/libnotify.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -36,8 +36,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -53,7 +53,7 @@
 	CC="$CC" ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
 
diff -r 860ab66f5f71 -r 25cecc6dca48 desktop/libwnck/libwnck.sh
--- a/desktop/libwnck/libwnck.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/desktop/libwnck/libwnck.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	NOCONFIGURE=1 ./autogen.sh
 	CC="$CC" \
@@ -49,7 +49,7 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libwnck-3.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
 
diff -r 860ab66f5f71 -r 25cecc6dca48 desktop/libwnck2/libwnck2.sh
--- a/desktop/libwnck2/libwnck2.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/desktop/libwnck2/libwnck2.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -36,8 +36,8 @@
 build()
 {
 	rm -rf libwnck-$PKGVERSION
-	tar xvaf libwnck-$PKGVERSION.tar.xz
-	pushd libwnck-$PKGVERSION
+	tar xvf libwnck-$PKGVERSION.tar.xz
+	cd libwnck-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -52,6 +52,6 @@
 	make install DESTDIR=$DESTDIR itlocaledir=/share/locale
 	rm -f $DESTDIR/lib/libwnck-1.la
 
-	popd
+	cd ..
 	rm -rf libwnck-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 desktop/startup-notification/startup-notification.sh
--- a/desktop/startup-notification/startup-notification.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/desktop/startup-notification/startup-notification.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -31,8 +31,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -46,6 +46,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libstartup-notification-1.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 desktop/zenity/zenity.sh
--- a/desktop/zenity/zenity.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/desktop/zenity/zenity.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -42,8 +42,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -58,6 +58,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/autoconf-archive/autoconf-archive.sh
--- a/dev/autoconf-archive/autoconf-archive.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/autoconf-archive/autoconf-archive.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -25,13 +25,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/autoconf-archive/autoconf-archive.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/autoconf-archive/autoconf-archive.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+25986729b9a156a6aee058e6bcf90406659eac83  autoconf-archive-2019.01.06.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/autoconf/autoconf.sh
--- a/dev/autoconf/autoconf.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/autoconf/autoconf.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -31,8 +31,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -42,6 +42,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/autoconf/autoconf.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/autoconf/autoconf.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+e891c3193029775e83e0534ac0ee0c4c711f6d23  autoconf-2.69.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/autoconf213/autoconf213.sh
--- a/dev/autoconf213/autoconf213.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/autoconf213/autoconf213.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,8 +26,8 @@
 build()
 {
 	rm -rf autoconf-$PKGVERSION
-	tar xvaf autoconf-$PKGVERSION.tar.gz
-	pushd autoconf-$PKGVERSION
+	tar xvf autoconf-$PKGVERSION.tar.gz
+	cd autoconf-$PKGVERSION
 
 	# http://www.linuxfromscratch.org/blfs/view/svn/general/autoconf213.html
 	patch -p1 < ../autoconf.patch
@@ -37,6 +37,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf autoconf-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/autoconf213/autoconf213.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/autoconf213/autoconf213.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+e4826c8bd85325067818f19b2b2ad2b625da66fc  autoconf-2.13.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/automake/automake.sh
--- a/dev/automake/automake.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/automake/automake.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -46,6 +46,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/automake/automake.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/automake/automake.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+1012bc79956013d53da0890f8493388a6cb20831  automake-1.16.1.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/binutils/binutils.sh
--- a/dev/binutils/binutils.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/binutils/binutils.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -51,8 +51,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CFLAGS="$CFLAGS" \
 	CXXFLAGS="$CXXFLAGS" \
@@ -82,6 +82,6 @@
 	rm -f $DESTDIR/lib/libbfd.la
 	rm -f $DESTDIR/lib/libopcodes.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/binutils/binutils.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/binutils/binutils.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+cd45a512af1c8a508976c1beb4f5825b3bb89f4d  binutils-2.32.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/bison/bison.sh
--- a/dev/bison/bison.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/bison/bison.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -44,8 +44,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	# TODO: check how to build liby as shared.
 	CC="$CC" \
@@ -63,6 +63,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/bison/bison.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/bison/bison.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+6a09cd588f7a0f985839fc8cecdc80da948f7de7  bison-3.3.2.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/clang/clang.sh
--- a/dev/clang/clang.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/clang/clang.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -51,16 +51,16 @@
 build()
 {
 	rm -rf cfe-$PKGVERSION.src
-	tar xvaf cfe-$PKGVERSION.src.tar.xz
-	pushd cfe-$PKGVERSION.src
+	tar xvf cfe-$PKGVERSION.src.tar.xz
+	cd cfe-$PKGVERSION.src
 
 	# Extract clang-extra-tools as tools/extra if requested.
 	if [ "$TOOLS" = "yes" ]; then
-		tar xvaf ../clang-tools-extra-$PKGVERSION.src.tar.xz -C tools
+		tar xvf ../clang-tools-extra-$PKGVERSION.src.tar.xz -C tools
 		mv tools/clang-tools-extra-$PKGVERSION.src tools/extra
 	fi
 
-	mkdir build && pushd build
+	mkdir build && cd build
 	cmake .. -Wno-dev \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_CXX_COMPILER="$CXX" \
@@ -77,8 +77,8 @@
 		$with_lld
 	make
 	make DESTDIR=$DESTDIR install
-	popd
+	cd ..
 
-	popd
+	cd ..
 	rm -rf cfe-$PKGVERSION.src
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/clang/clang.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/clang/clang.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,2 @@
+f341ba17494ba756fd404b2744e6f5991b50389f  clang-tools-extra-8.0.0.src.tar.xz
+3cb1e10af3955174a3ca5e560f674f24fac2a02f  cfe-8.0.0.src.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/cmake/cmake.sh
--- a/dev/cmake/cmake.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/cmake/cmake.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -49,8 +49,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure \
 		CC="$CC" \
@@ -65,6 +65,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/cmake/cmake.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/cmake/cmake.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+242ac4986ab38ddb06c7bfb7eb950e4c1b1ca770  cmake-3.13.4.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/diffstat/diffstat.sh
--- a/dev/diffstat/diffstat.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/diffstat/diffstat.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -46,6 +46,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/diffstat/diffstat.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/diffstat/diffstat.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+130583610b846c1ba042e92c5e3b47cbab37170c  diffstat-1.62.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/flex/flex.sh
--- a/dev/flex/flex.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/flex/flex.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -34,8 +34,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -53,6 +53,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libfl.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/flex/flex.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/flex/flex.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+fafece095a0d9890ebd618adb1f242d8908076e1  flex-2.6.4.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/gcc/gcc.sh
--- a/dev/gcc/gcc.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/gcc/gcc.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -45,14 +45,14 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	# on Vanilla Linux we use /lib rather than /lib64.
 	sed -i -e '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
 	sed -i -e 's/lib64/lib/' gcc/config/i386/linux64.h
 
-	mkdir build && pushd build
+	mkdir build && cd build
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
 	CXX="$CXX" \
@@ -88,8 +88,8 @@
 	rm -f usr/lib/libsupc++.la
 	rm -f usr/lib/gcc/x86_64-linux-musl/8.3.0/plugin/libcc1plugin.la
 	rm -f usr/lib/gcc/x86_64-linux-musl/8.3.0/plugin/libcp1plugin.la
-	popd
+	cd ..
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/gcc/gcc.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/gcc/gcc.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+c27f4499dd263fe4fb01bcc5565917f3698583b2  gcc-8.3.0.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/gobject-introspection/gobject-introspection.sh
--- a/dev/gobject-introspection/gobject-introspection.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/gobject-introspection/gobject-introspection.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -30,8 +30,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -44,7 +44,7 @@
 	CC="$CC" ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
 
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/gobject-introspection/gobject-introspection.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/gobject-introspection/gobject-introspection.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+550d9b503062b6a85a87ba2a2abe6dc2ebe33ed0  gobject-introspection-1.60.0.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/gperf/gperf.sh
--- a/dev/gperf/gperf.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/gperf/gperf.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -46,6 +46,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/gperf/gperf.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/gperf/gperf.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+e3c0618c2d2e5586eda9498c867d5e4858a3b0e2  gperf-3.1.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/gtk-doc/gtk-doc.sh
--- a/dev/gtk-doc/gtk-doc.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/gtk-doc/gtk-doc.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make
 	make install DESTDIR=$DESTDIR pkgconfigdir=/lib/pkgconfig
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/gtk-doc/gtk-doc.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/gtk-doc/gtk-doc.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+c3dc579d84221c43ce2b0b5f523c46b13525416b  gtk-doc-1.29.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/help2man/help2man.sh
--- a/dev/help2man/help2man.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/help2man/help2man.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -43,8 +43,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -58,6 +58,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/help2man/help2man.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/help2man/help2man.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+235010369c9b92afbca66f61f80c14d9527a0a63  help2man-1.47.10.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/intltool/intltool.sh
--- a/dev/intltool/intltool.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/intltool/intltool.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/intltool/intltool.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/intltool/intltool.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+a0c3bcb99d1bcfc5db70f8d848232a47c47da090  intltool-0.51.0.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/libtool/libtool.sh
--- a/dev/libtool/libtool.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/libtool/libtool.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -49,6 +49,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libltdl.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/libtool/libtool.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/libtool/libtool.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+3e7504b832eb2dd23170c91b6af72e15b56eb94e  libtool-2.4.6.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/lld/lld.sh
--- a/dev/lld/lld.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/lld/lld.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -31,10 +31,10 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION.src
-	tar xvaf $PKGNAME-$PKGVERSION.src.tar.xz
-	pushd $PKGNAME-$PKGVERSION.src
+	tar xvf $PKGNAME-$PKGVERSION.src.tar.xz
+	cd $PKGNAME-$PKGVERSION.src
 
-	mkdir build && pushd build
+	mkdir build && cd build
 	cmake .. -Wno-dev \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_CXX_COMPILER="$CXX" \
@@ -44,8 +44,8 @@
 		-DCMAKE_INSTALL_PREFIX=
 	make
 	make DESTDIR=$DESTDIR install
-	popd
+	cd ..
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION.src
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/lld/lld.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/lld/lld.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+b9062249ef61316e3450fc26e7238432673036bb  lld-8.0.0.src.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/lldb/lldb.sh
--- a/dev/lldb/lldb.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/lldb/lldb.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -31,10 +31,10 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION.src
-	tar xvaf $PKGNAME-$PKGVERSION.src.tar.xz
-	pushd $PKGNAME-$PKGVERSION.src
+	tar xvf $PKGNAME-$PKGVERSION.src.tar.xz
+	cd $PKGNAME-$PKGVERSION.src
 
-	mkdir build && pushd build
+	mkdir build && cd build
 	cmake .. -Wno-dev \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_CXX_COMPILER="$CXX" \
@@ -46,8 +46,8 @@
 		-DLLVM_ENABLE_RTTI=On
 	make
 	make DESTDIR=$DESTDIR install
-	popd
+	cd ..
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION.src
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/lldb/lldb.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/lldb/lldb.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+ca188f74b4896cd243ed1c3797d27c3371185146  lldb-8.0.0.src.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/llvm/llvm.sh
--- a/dev/llvm/llvm.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/llvm/llvm.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -64,10 +64,10 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION.src
-	tar xvaf $PKGNAME-$PKGVERSION.src.tar.xz
-	pushd $PKGNAME-$PKGVERSION.src
+	tar xvf $PKGNAME-$PKGVERSION.src.tar.xz
+	cd $PKGNAME-$PKGVERSION.src
 
-	mkdir build && pushd build
+	mkdir build && cd build
 	cmake .. \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX= \
@@ -87,8 +87,8 @@
 		$with_sphinx
 	make
 	make DESTDIR=$DESTDIR install
-	popd
+	cd ..
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION.src
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/llvm/llvm.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/llvm/llvm.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+0689345d73911e24a07b24cc82dab4fb46b8c323  llvm-8.0.0.src.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/m4/m4.sh
--- a/dev/m4/m4.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/m4/m4.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -46,6 +46,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/m4/m4.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/m4/m4.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+228604686ca23f42e48b98930babeb5d217f1899  m4-1.4.18.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/make/make.sh
--- a/dev/make/make.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/make/make.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -51,8 +51,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -69,6 +69,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/make/make.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/make/make.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+9cb7f45f6e32c977164ba790e626c359d3a24fee  make-4.2.1.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/mercurial/mercurial.sh
--- a/dev/mercurial/mercurial.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/mercurial/mercurial.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -29,8 +29,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -41,6 +41,6 @@
 	install -Dm0644 contrib/zsh_completion $DESTDIR/share/zsh/site-functions/_$PKGNAME
 	install -Dm0644 contrib/bash_completion $DESTDIR/share/bash-completion/completions/$PKGNAME
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/mercurial/mercurial.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/mercurial/mercurial.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+b6364e3fb3ba609bfaeb30b0ff3d3878909453b0  mercurial-4.9.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/meson/meson.sh
--- a/dev/meson/meson.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/meson/meson.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,11 +26,11 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	python setup.py install --root=${DESTDIR:-/} --prefix=/. -O1
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/meson/meson.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/meson/meson.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+d57ab2983d472d05eca9ca788ac12a2a986c4693  meson-0.50.0.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/nasm/nasm.sh
--- a/dev/nasm/nasm.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/nasm/nasm.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -46,6 +46,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/ninja/ninja.sh
--- a/dev/ninja/ninja.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/ninja/ninja.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -25,14 +25,14 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf v$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf v$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	# https://git.alpinelinux.org/aports/tree/main/ninja
 	patch -p1 < ../musl.patch
 	python3 ./configure.py --bootstrap
 	install -Dm0755 ninja $DESTDIR/bin/ninja
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/ninja/ninja.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/ninja/ninja.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+d130e8cb7ed883125af978ec165199065e830d6a  v1.9.0.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/patch/patch.sh
--- a/dev/patch/patch.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/patch/patch.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -46,6 +46,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/patch/patch.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/patch/patch.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+6f64fa75993bdb285ac4ed6eca6c9212725bff91  patch-2.7.6.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/pkgconf/pkgconf.sh
--- a/dev/pkgconf/pkgconf.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/pkgconf/pkgconf.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME
 
 	./autogen.sh
 	CC="$CC" \
@@ -52,6 +52,6 @@
 	rm -f $DESTDIR/lib/libpkgconf.la
 	ln -sf pkgconf $DESTDIR/bin/pkg-config
 
-	popd
+	cd ..
 	rm -rf $PKGNAME
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/pkgconf/pkgconf.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/pkgconf/pkgconf.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+8590aefff47e9eab389f0a5cb5666e5246e5461f  pkgconf-1.6.0.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/swig/swig.sh
--- a/dev/swig/swig.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/swig/swig.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -43,8 +43,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -60,6 +60,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/swig/swig.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/swig/swig.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+5cc1af41d041e4cc609580b99bb3dcf720effa25  swig-3.0.12.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/tcl/tcl.sh
--- a/dev/tcl/tcl.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dev/tcl/tcl.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,7 +33,7 @@
 build()
 {
 	rm -rf ${PKGNAME}${PKGVERSION}
-	tar xvaf ${PKGNAME}${PKGVERSION}-src.tar.gz
+	tar xvf ${PKGNAME}${PKGVERSION}-src.tar.gz
 	cd ${PKGNAME}${PKGVERSION}/unix
 
 	CC="$CC" \
diff -r 860ab66f5f71 -r 25cecc6dca48 dev/tcl/tcl.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/tcl/tcl.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+861c5c8bbce9eda892c5e63b6035e09fad90a25f  tcl8.6.9-src.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 dns/libidn2/libidn2.sh
--- a/dns/libidn2/libidn2.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/dns/libidn2/libidn2.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -42,8 +42,8 @@
 build()
 {
 	rm -rf $PKGNAME-2.1.1
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-2.1.1
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-2.1.1
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -60,6 +60,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libidn2.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-2.1.1
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 dns/libidn2/libidn2.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dns/libidn2/libidn2.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+3a668f43efb6c36e32e9841775efff04aef18c0b  libidn2-2.1.1a.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 editors/nano/nano.sh
--- a/editors/nano/nano.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/editors/nano/nano.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -63,8 +63,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -82,6 +82,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 editors/nano/nano.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/nano/nano.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+723128dc1eade35a24a57c1d60d954b5cf308654  nano-3.2.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 editors/vim/vim.sh
--- a/editors/vim/vim.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/editors/vim/vim.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -47,8 +47,8 @@
 build()
 {
 	rm -rf vim81
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd vim81
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd vim81
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -69,6 +69,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf vim81
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 editors/vim/vim.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/vim/vim.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+cbca219d11990d866976da309d7ce5b76be48b96  vim-8.1.tar.bz2
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-adobe-100dpi/font-adobe-100dpi.sh
--- a/fonts/font-adobe-100dpi/font-adobe-100dpi.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-adobe-100dpi/font-adobe-100dpi.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-adobe-75dpi/font-adobe-75dpi.sh
--- a/fonts/font-adobe-75dpi/font-adobe-75dpi.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-adobe-75dpi/font-adobe-75dpi.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi.sh
--- a/fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-adobe-utopia-100dpi/font-adobe-utopia-100dpi.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi.sh
--- a/fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-adobe-utopia-75dpi/font-adobe-utopia-75dpi.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-adobe-utopia-type1/font-adobe-utopia-type1.sh
--- a/fonts/font-adobe-utopia-type1/font-adobe-utopia-type1.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-adobe-utopia-type1/font-adobe-utopia-type1.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-arabic-misc/font-arabic-misc.sh
--- a/fonts/font-arabic-misc/font-arabic-misc.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-arabic-misc/font-arabic-misc.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-bh-100dpi/font-bh-100dpi.sh
--- a/fonts/font-bh-100dpi/font-bh-100dpi.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-bh-100dpi/font-bh-100dpi.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-bh-75dpi/font-bh-75dpi.sh
--- a/fonts/font-bh-75dpi/font-bh-75dpi.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-bh-75dpi/font-bh-75dpi.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi.sh
--- a/fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-bh-lucidatypewriter-100dpi/font-bh-lucidatypewriter-100dpi.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi.sh
--- a/fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-bh-lucidatypewriter-75dpi/font-bh-lucidatypewriter-75dpi.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-bh-ttf/font-bh-ttf.sh
--- a/fonts/font-bh-ttf/font-bh-ttf.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-bh-ttf/font-bh-ttf.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-bh-type1/font-bh-type1.sh
--- a/fonts/font-bh-type1/font-bh-type1.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-bh-type1/font-bh-type1.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-bitstream-100dpi/font-bitstream-100dpi.sh
--- a/fonts/font-bitstream-100dpi/font-bitstream-100dpi.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-bitstream-100dpi/font-bitstream-100dpi.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-bitstream-75dpi/font-bitstream-75dpi.sh
--- a/fonts/font-bitstream-75dpi/font-bitstream-75dpi.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-bitstream-75dpi/font-bitstream-75dpi.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-bitstream-speedo/font-bitstream-speedo.sh
--- a/fonts/font-bitstream-speedo/font-bitstream-speedo.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-bitstream-speedo/font-bitstream-speedo.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-bitstream-type1/font-bitstream-type1.sh
--- a/fonts/font-bitstream-type1/font-bitstream-type1.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-bitstream-type1/font-bitstream-type1.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-cronyx-cyrillic/font-cronyx-cyrillic.sh
--- a/fonts/font-cronyx-cyrillic/font-cronyx-cyrillic.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-cronyx-cyrillic/font-cronyx-cyrillic.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-cursor-misc/font-cursor-misc.sh
--- a/fonts/font-cursor-misc/font-cursor-misc.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-cursor-misc/font-cursor-misc.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-daewoo-misc/font-daewoo-misc.sh
--- a/fonts/font-daewoo-misc/font-daewoo-misc.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-daewoo-misc/font-daewoo-misc.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-dec-misc/font-dec-misc.sh
--- a/fonts/font-dec-misc/font-dec-misc.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-dec-misc/font-dec-misc.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-ibm-type1/font-ibm-type1.sh
--- a/fonts/font-ibm-type1/font-ibm-type1.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-ibm-type1/font-ibm-type1.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-isas-misc/font-isas-misc.sh
--- a/fonts/font-isas-misc/font-isas-misc.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-isas-misc/font-isas-misc.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-jis-misc/font-jis-misc.sh
--- a/fonts/font-jis-misc/font-jis-misc.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-jis-misc/font-jis-misc.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-micro-misc/font-micro-misc.sh
--- a/fonts/font-micro-misc/font-micro-misc.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-micro-misc/font-micro-misc.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-misc-cyrillic/font-misc-cyrillic.sh
--- a/fonts/font-misc-cyrillic/font-misc-cyrillic.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-misc-cyrillic/font-misc-cyrillic.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-misc-ethiopic/font-misc-ethiopic.sh
--- a/fonts/font-misc-ethiopic/font-misc-ethiopic.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-misc-ethiopic/font-misc-ethiopic.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-misc-meltho/font-misc-meltho.sh
--- a/fonts/font-misc-meltho/font-misc-meltho.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-misc-meltho/font-misc-meltho.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-misc-misc/font-misc-misc.sh
--- a/fonts/font-misc-misc/font-misc-misc.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-misc-misc/font-misc-misc.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-mutt-misc/font-mutt-misc.sh
--- a/fonts/font-mutt-misc/font-mutt-misc.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-mutt-misc/font-mutt-misc.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-schumacher-misc/font-schumacher-misc.sh
--- a/fonts/font-schumacher-misc/font-schumacher-misc.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-schumacher-misc/font-schumacher-misc.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-screen-cyrillic/font-screen-cyrillic.sh
--- a/fonts/font-screen-cyrillic/font-screen-cyrillic.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-screen-cyrillic/font-screen-cyrillic.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-sony-misc/font-sony-misc.sh
--- a/fonts/font-sony-misc/font-sony-misc.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-sony-misc/font-sony-misc.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-sun-misc/font-sun-misc.sh
--- a/fonts/font-sun-misc/font-sun-misc.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-sun-misc/font-sun-misc.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-winitzki-cyrillic/font-winitzki-cyrillic.sh
--- a/fonts/font-winitzki-cyrillic/font-winitzki-cyrillic.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-winitzki-cyrillic/font-winitzki-cyrillic.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/font-xfree86-type1/font-xfree86-type1.sh
--- a/fonts/font-xfree86-type1/font-xfree86-type1.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/font-xfree86-type1/font-xfree86-type1.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/fontconfig/fontconfig.sh
--- a/fonts/fontconfig/fontconfig.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/fontconfig/fontconfig.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -34,8 +34,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -51,6 +51,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libfontconfig.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/freetype/freetype.sh
--- a/fonts/freetype/freetype.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/freetype/freetype.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -57,8 +57,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -77,6 +77,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libfreetype.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/harfbuzz/harfbuzz.sh
--- a/fonts/harfbuzz/harfbuzz.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/harfbuzz/harfbuzz.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -75,8 +75,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -97,6 +97,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libharfbuzz{,-gobject,-subset}.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 fonts/pango/pango.sh
--- a/fonts/pango/pango.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/fonts/pango/pango.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -49,8 +49,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -65,7 +65,7 @@
 	CC="$CC" CXX="$CXX" ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
 
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/cairo/cairo.sh
--- a/graphics/cairo/cairo.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/graphics/cairo/cairo.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -133,8 +133,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -164,6 +164,6 @@
 	rm -f $DESTDIR/lib/libcairo-script-interpreter.la
 	rm -f $DESTDIR/lib/libcairo{,-gobject}.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/cairo/cairo.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/cairo/cairo.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+00e81842ae5e81bb0343108884eb5205be0eac14  cairo-1.16.0.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/gdk-pixbuf/gdk-pixbuf.sh
--- a/graphics/gdk-pixbuf/gdk-pixbuf.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/graphics/gdk-pixbuf/gdk-pixbuf.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -73,8 +73,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	# TODO: enable documentation once docbook-xml is there.
 	CC="$CC" \
@@ -98,7 +98,7 @@
 	CC="$CC" ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
 
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/gdk-pixbuf/gdk-pixbuf.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gdk-pixbuf/gdk-pixbuf.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+52a3ac673ec558e3eabb611256b74432b29945d7  gdk-pixbuf-2.38.1.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/graphviz/graphviz.sh
--- a/graphics/graphviz/graphviz.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/graphics/graphviz/graphviz.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -104,8 +104,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	# TODO: enable features as they become available.
 	# --disable-tcl because it installs to /lib64.
@@ -166,6 +166,6 @@
 	rm -f $DESTDIR/lib/libpathplan.la
 	rm -f $DESTDIR/lib/libxdot.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/graphviz/graphviz.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/graphviz/graphviz.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+8a44d19bcdb50df1bd8e649de472ebf868468888  graphviz-2.40.1.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/gtk/gtk.sh
--- a/graphics/gtk/gtk.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/graphics/gtk/gtk.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -79,8 +79,8 @@
 build()
 {
 	rm -rf gtk+-$PKGVERSION
-	tar xvaf gtk+-$PKGVERSION.tar.xz
-	pushd gtk+-$PKGVERSION
+	tar xvf gtk+-$PKGVERSION.tar.xz
+	cd gtk+-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -100,7 +100,7 @@
 	rm -f $DESTDIR/lib/gtk-3.0/3.0.0/immodules/*.la
 	rm -f $DESTDIR/lib/gtk-3.0/3.0.0/printbackends/*.la
 
-	popd
+	cd ..
 	rm -rf gtk+-$PKGVERSION
 }
 
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/gtk/gtk.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gtk/gtk.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+6e16097250b1e1d0eab34a3426b4616e6555e0d8  gtk+-3.24.0.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/gtk2/gtk2.sh
--- a/graphics/gtk2/gtk2.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/graphics/gtk2/gtk2.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -61,9 +61,9 @@
 
 build()
 {
-	#rm -rf gtk+-$PKGVERSION
-	#tar xvaf gtk+-$PKGVERSION.tar.xz
-	pushd gtk+-$PKGVERSION
+	rm -rf gtk+-$PKGVERSION
+	tar xvf gtk+-$PKGVERSION.tar.xz
+	cd gtk+-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -87,7 +87,7 @@
 	rm -f $DESTDIR/lib/libgailutil.la
 	rm -f $DESTDIR/lib/lib{gdk,gtk}-x11-2.0.la
 
-	popd
-	#rm -rf gtk+-$PKGVERSION
+	cd ..
+	rm -rf gtk+-$PKGVERSION
 }
 
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/gtk2/gtk2.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gtk2/gtk2.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+c885ade62b06854590822c8eb906daf7dd15d90a  gtk+-2.24.32.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/libdrm/libdrm.sh
--- a/graphics/libdrm/libdrm.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/graphics/libdrm/libdrm.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -48,8 +48,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -66,6 +66,6 @@
 	rm -f $DESTDIR/lib/libkms.la
 	rm -f $DESTDIR/graphics/libdrm{,_amdgpu,_intel,_nouveau,_radeon}.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/libdrm/libdrm.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/libdrm/libdrm.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+7635bec769a17edd140282fa2c46838c4a44bc91  libdrm-2.4.97.tar.bz2
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/libepoxy/libepoxy.sh
--- a/graphics/libepoxy/libepoxy.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/graphics/libepoxy/libepoxy.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -41,8 +41,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -60,6 +60,6 @@
 	ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/libepoxy/libepoxy.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/libepoxy/libepoxy.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+e00d0bf270a99ded2a2f4abe7874b765cd338d1f  libepoxy-1.5.3.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/libgd/libgd.sh
--- a/graphics/libgd/libgd.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/graphics/libgd/libgd.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -105,8 +105,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -131,6 +131,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libgd.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/libgd/libgd.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/libgd/libgd.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+b777b005c401b6fa310ccf09eeb29f6c6e17ab2c  libgd-2.2.5.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/libjpeg-turbo/libjpeg-turbo.sh
--- a/graphics/libjpeg-turbo/libjpeg-turbo.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/graphics/libjpeg-turbo/libjpeg-turbo.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -29,10 +29,10 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
-	mkdir build && pushd build
+	mkdir build && cd build
 	cmake .. \
 		-DBUILD_SHARED_LIBS=On \
 		-DCMAKE_BUILD_TYPE=Release \
@@ -43,8 +43,8 @@
 		-DENABLE_STATIC=Off
 	make
 	make install DESTDIR=$DESTDIR
-	popd
+	cd ..
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/libjpeg-turbo/libjpeg-turbo.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/libjpeg-turbo/libjpeg-turbo.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+1cff52d50b81755d0bdcf9055eb22157f39a1695  libjpeg-turbo-2.0.2.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/libpng/libpng.sh
--- a/graphics/libpng/libpng.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/graphics/libpng/libpng.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -49,6 +49,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libpng{,16}.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/libpng/libpng.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/libpng/libpng.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+aec9548c8319104226cc4c31d1f5e524f1b55295  libpng-1.6.36.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/librsvg/librsvg.sh
--- a/graphics/librsvg/librsvg.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/graphics/librsvg/librsvg.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -48,8 +48,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -67,6 +67,6 @@
 	rm -f $DESTDIR/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.la
 	rm -f $DESTDIR/lib/librsvg-2.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/librsvg/librsvg.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/librsvg/librsvg.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+244441b0f83ea8b3888cea2e9337eed3426f0149  librsvg-2.40.20.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/libtiff/libtiff.sh
--- a/graphics/libtiff/libtiff.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/graphics/libtiff/libtiff.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -67,8 +67,8 @@
 build()
 {
 	rm -rf tiff-$PKGVERSION
-	tar xvaf tiff-$PKGVERSION.tar.gz
-	pushd tiff-$PKGVERSION
+	tar xvf tiff-$PKGVERSION.tar.gz
+	cd tiff-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -91,6 +91,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libtiff{,xx}.la
 
-	popd
+	cd ..
 	rm -rf tiff-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/libtiff/libtiff.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/libtiff/libtiff.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+c783b80f05cdacf282aa022dc5f5b0ede5e021ae  tiff-4.0.10.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/mesa/mesa.sh
--- a/graphics/mesa/mesa.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/graphics/mesa/mesa.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -66,9 +66,9 @@
 
 build()
 {
-	#rm -rf $PKGNAME-$PKGVERSION
-	#tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	rm -rf $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	patch -p0 < ../disable-tls.patch
 	# https://git.alpinelinux.org/aports/plain/main/mesa/musl-fix-includes.patch
@@ -95,7 +95,7 @@
 	ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
 
-	popd
-	#rm -rf $PKGNAME-$PKGVERSION
+	cd ..
+	rm -rf $PKGNAME-$PKGVERSION
 }
 
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/mesa/mesa.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/mesa/mesa.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+5ee4dfa398948d9b6c89e844c426b16e4f4b8aaf  mesa-18.3.5.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/pixman/pixman.sh
--- a/graphics/pixman/pixman.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/graphics/pixman/pixman.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -49,8 +49,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -70,6 +70,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libpixman-1.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/pixman/pixman.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/pixman/pixman.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+1068cc4633c39d527a5d607c418fbc0979f80b2a  pixman-0.38.0.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/wayland-protocols/wayland-protocols.sh
--- a/graphics/wayland-protocols/wayland-protocols.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/graphics/wayland-protocols/wayland-protocols.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -25,13 +25,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/wayland-protocols/wayland-protocols.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/wayland-protocols/wayland-protocols.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+7d2569c838c776545e3eb1b1049b9c37178aae24  wayland-protocols-1.17.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/wayland/wayland.sh
--- a/graphics/wayland/wayland.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/graphics/wayland/wayland.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -50,8 +50,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -68,6 +68,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libwayland-{egl,server,client,cursor}.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/wayland/wayland.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/wayland/wayland.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+7951873d5d58228e8d6511fe8223990c79d45f80  wayland-1.16.93.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/weston/weston.sh
--- a/graphics/weston/weston.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/graphics/weston/weston.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -57,8 +57,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	# https://gitlab.freedesktop.org/wayland/weston/merge_requests/135
 	patch -p1 < ../musl.patch
@@ -81,6 +81,6 @@
 	rm -f $DESTDIR/lib/libweston{,-desktop}-5.la
 	rm -f $DESTDIR/lib/weston/*.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 graphics/weston/weston.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/weston/weston.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+56b42b1fbea9e120a8127736328e4c71ac781a57  weston-5.0.0.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 lang/mozjs52/mozjs52.sh
--- a/lang/mozjs52/mozjs52.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lang/mozjs52/mozjs52.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -29,12 +29,12 @@
 build()
 {
 	rm -rf firefox-${PKGVERSION}esr
-	tar xvaf firefox-${PKGVERSION}esr.source.tar.xz
-	pushd firefox-${PKGVERSION}esr
+	tar xvf firefox-${PKGVERSION}esr.source.tar.xz
+	cd firefox-${PKGVERSION}esr
 
 	# credits to FreeBSD.
 	patch -p0 < ../patch-clang.patch
-	pushd js/src
+	cd js/src
 	CC="$CC" HOST_CC="$CC" \
 	CXX="$CXX" HOST_CXX="$CXX" \
 	SHELL="/bin/bash" PYTHON="/bin/python2" \
@@ -50,8 +50,8 @@
 	SHELL="/bin/bash" PYTHON="/bin/python2" \
 	make
 	make install DESTDIR=$DESTDIR
-	popd
+	cd ..
 
-	popd
+	cd ..
 	rm -rf firefox-${PKGVERSION}esr
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lang/mozjs52/mozjs52.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/mozjs52/mozjs52.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+df3d47518b380fe934e32a288515c25435fd82a7  firefox-52.9.0esr.source.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 lang/vala/vala.sh
--- a/lang/vala/vala.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lang/vala/vala.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -34,8 +34,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -54,6 +54,6 @@
 	rm -f $DESTDIR/lib/vala-*/*.la
 	rm -f $DESTDIR/lib/valadoc/doclets/*/*.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lang/vala/vala.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/vala/vala.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+a98eb4e3622341940c725e7f92c4e05a0f646668  vala-0.44.1.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/argp-standalone/argp-standalone.sh
--- a/lib/argp-standalone/argp-standalone.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/argp-standalone/argp-standalone.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -36,8 +36,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	# TODO: build as shared instead of static.
 	patch -p1 < ../gnu89-inline.patch
@@ -55,6 +55,6 @@
 	install -D -m 0644 argp.h $DESTDIR/include/argp.h
 	install -D -m 0755 libargp.a $DESTDIR/lib/libargp.a
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/compiler-rt/compiler-rt.sh
--- a/lib/compiler-rt/compiler-rt.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/compiler-rt/compiler-rt.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -30,12 +30,12 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION.src
-	tar xvaf $PKGNAME-$PKGVERSION.src.tar.xz
-	pushd $PKGNAME-$PKGVERSION.src
+	tar xvf $PKGNAME-$PKGVERSION.src.tar.xz
+	cd $PKGNAME-$PKGVERSION.src
 
 	# LLVM 9.0.0: remove this patch and the links created below.
 	patch -p1 < ../D28791.diff
-	mkdir build && pushd build
+	mkdir build && cd build
 	cmake .. \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_CXX_COMPILER="$CXX" \
@@ -58,8 +58,8 @@
 		$DESTDIR/lib/clang/$PKGVERSION/lib/linux/crtbeginT.o
 	ln -sf clang_rt.crtend-$(uname -m).o \
 		$DESTDIR/lib/clang/$PKGVERSION/lib/linux/crtend.o
-	popd
+	cd ..
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION.src
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/dbus-glib/dbus-glib.sh
--- a/lib/dbus-glib/dbus-glib.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/dbus-glib/dbus-glib.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -49,6 +49,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libdbus-glib-1.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/efivar/efivar.sh
--- a/lib/efivar/efivar.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/efivar/efivar.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -28,8 +28,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	make \
 		CC="$CC" \
@@ -39,6 +39,6 @@
 		PREFIX= \
 		DESTDIR=$DESTDIR all install
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/expat/expat.sh
--- a/lib/expat/expat.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/expat/expat.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -49,6 +49,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libexpat.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/fribidi/fribidi.sh
--- a/lib/fribidi/fribidi.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/fribidi/fribidi.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libfribidi.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/fuse2/fuse2.sh
--- a/lib/fuse2/fuse2.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/fuse2/fuse2.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf fuse-$PKGVERSION
-	tar xvaf fuse-$PKGVERSION.tar.gz
-	pushd fuse-$PKGVERSION
+	tar xvf fuse-$PKGVERSION.tar.gz
+	cd fuse-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	rm -f $DESTDIR/lib/libfuse.la
 	rm -f $DESTDIR/lib/libulockmgr.la
 
-	popd
+	cd ..
 	rm -rf fuse-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/glib/glib.sh
--- a/lib/glib/glib.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/glib/glib.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -45,8 +45,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -62,7 +62,7 @@
 	ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
 
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/gmp/gmp.sh
--- a/lib/gmp/gmp.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/gmp/gmp.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -51,6 +51,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libgmp{,xx}.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/icu/icu.sh
--- a/lib/icu/icu.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/icu/icu.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -34,8 +34,8 @@
 build()
 {
 	rm -rf $PKGNAME
-	tar xvaf icu4c-${PKGVERSION}_1-src.tgz
-	pushd $PKGNAME/source
+	tar xvf icu4c-${PKGVERSION}_1-src.tgz
+	cd $PKGNAME/source
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/isl/isl.sh
--- a/lib/isl/isl.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/isl/isl.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -35,8 +35,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -55,6 +55,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libisl.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/jansson/jansson.sh
--- a/lib/jansson/jansson.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/jansson/jansson.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -29,10 +29,10 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
-	mkdir build && pushd build
+	mkdir build && cd build
 	cmake .. \
 		-DJANSSON_BUILD_SHARED_LIBS=On \
 		-DCMAKE_BUILD_TYPE=Release \
@@ -41,8 +41,8 @@
 		-DCMAKE_INSTALL_PREFIX=
 	make
 	make install DESTDIR=$DESTDIR
-	popd
+	cd ..
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/jsoncpp/jsoncpp.sh
--- a/lib/jsoncpp/jsoncpp.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/jsoncpp/jsoncpp.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/libaio/libaio.sh
--- a/lib/libaio/libaio.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/libaio/libaio.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -28,8 +28,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf ${PKGNAME}_${PKGVERSION}.orig.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf ${PKGNAME}_${PKGVERSION}.orig.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	# TODO: honor CFLAGS.
 	patch -p0 < ../disable-static.patch
@@ -39,6 +39,6 @@
 		mandir=$DESTDIR/share/man \
 		infodir=$DESTDIR/share/info
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/libc++/libc++.sh
--- a/lib/libc++/libc++.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/libc++/libc++.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -46,10 +46,10 @@
 build()
 {
 	rm -rf libcxx-$PKGVERSION.src
-	tar xvaf libcxx-$PKGVERSION.src.tar.xz
-	pushd libcxx-$PKGVERSION.src
+	tar xvf libcxx-$PKGVERSION.src.tar.xz
+	cd libcxx-$PKGVERSION.src
 
-	mkdir build && pushd build
+	mkdir build && cd build
 	cmake .. \
 		-DBUILD_SHARED_LIBS=On \
 		-DCMAKE_BUILD_TYPE=Release \
@@ -64,8 +64,8 @@
 		$with_libunwind
 	make
 	make install DESTDIR=$DESTDIR
-	popd
+	cd ..
 
-	popd
+	cd ..
 	rm -rf libcxx-$PKGVERSION.src
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/libc++abi/libc++abi.sh
--- a/lib/libc++abi/libc++abi.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/libc++abi/libc++abi.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -45,10 +45,10 @@
 build()
 {
 	rm -rf libcxxabi-$PKGVERSION.src
-	tar xvaf libcxxabi-$PKGVERSION.src.tar.xz
-	pushd libcxxabi-$PKGVERSION.src
+	tar xvf libcxxabi-$PKGVERSION.src.tar.xz
+	cd libcxxabi-$PKGVERSION.src
 
-	mkdir build && pushd build
+	mkdir build && cd build
 	cmake .. \
 		-DBUILD_SHARED_LIBS=On \
 		-DCMAKE_BUILD_TYPE=Release \
@@ -64,8 +64,8 @@
 	make install DESTDIR=$DESTDIR
 	mkdir -p $DESTDIR/include
 	cp ../include/* $DESTDIR/include
-	popd
+	cd ..
 
-	popd
+	cd ..
 	rm -rf libcxxabi-$PKGVERSION.src
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/libedit/libedit.sh
--- a/lib/libedit/libedit.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/libedit/libedit.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	patch -p0 < ../clang.patch
 	CC="$CC" \
@@ -51,6 +51,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libedit.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/libevdev/libevdev.sh
--- a/lib/libevdev/libevdev.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/libevdev/libevdev.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -49,6 +49,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libevdev.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/libevent/libevent.sh
--- a/lib/libevent/libevent.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/libevent/libevent.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -41,8 +41,8 @@
 build()
 {
 	rm -rf $PKGNAME-${PKGVERSION}-stable
-	tar xvaf $PKGNAME-${PKGVERSION}-stable.tar.gz
-	pushd $PKGNAME-${PKGVERSION}-stable
+	tar xvf $PKGNAME-${PKGVERSION}-stable.tar.gz
+	cd $PKGNAME-${PKGVERSION}-stable
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -59,6 +59,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libevent{_openssl,_extra,_pthreads,_core,}.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-${PKGVERSION}-stable
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/libffi/libffi.sh
--- a/lib/libffi/libffi.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/libffi/libffi.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -34,8 +34,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	patch -p0 < ../set-libdir.patch
 	sed -i -e 's|$(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@|$(prefix)|' include/Makefile.am
@@ -58,6 +58,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libffi.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/libgudev/libgudev.sh
--- a/lib/libgudev/libgudev.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/libgudev/libgudev.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -49,6 +49,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libgudev-1.0.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/libinput/libinput.sh
--- a/lib/libinput/libinput.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/libinput/libinput.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -48,8 +48,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -67,6 +67,6 @@
 	ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/libmnl/libmnl.sh
--- a/lib/libmnl/libmnl.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/libmnl/libmnl.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -51,6 +51,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libmnl.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/libnftnl/libnftnl.sh
--- a/lib/libnftnl/libnftnl.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/libnftnl/libnftnl.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -52,6 +52,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libnftnl.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/libnl/libnl.sh
--- a/lib/libnl/libnl.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/libnl/libnl.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	# https://git.alpinelinux.org/aports/plain/main/libnl3/libnl3-musl.patch
 	patch -p1 < ../musl.patch
@@ -49,6 +49,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/libtasn1/libtasn1.sh
--- a/lib/libtasn1/libtasn1.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/libtasn1/libtasn1.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -49,6 +49,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libtasn1.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/libunistring/libunistring.sh
--- a/lib/libunistring/libunistring.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/libunistring/libunistring.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libunistring.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/libunwind/libunwind.sh
--- a/lib/libunwind/libunwind.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/libunwind/libunwind.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -30,10 +30,10 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION.src
-	tar xvaf $PKGNAME-$PKGVERSION.src.tar.xz
-	pushd $PKGNAME-$PKGVERSION.src
+	tar xvf $PKGNAME-$PKGVERSION.src.tar.xz
+	cd $PKGNAME-$PKGVERSION.src
 
-	mkdir build && pushd build
+	mkdir build && cd build
 	cmake .. \
 		-DBUILD_SHARED_LIBS=On \
 		-DCMAKE_BUILD_TYPE=Release \
@@ -47,8 +47,8 @@
 	make install DESTDIR=$DESTDIR
 	mkdir -p $DESTDIR/include
 	cp ../include/*.h $DESTDIR/include
-	popd
+	cd ..
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION.src
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/libuv/libuv.sh
--- a/lib/libuv/libuv.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/libuv/libuv.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-v$PKGVERSION
-	tar xvaf $PKGNAME-v$PKGVERSION.tar.gz
-	pushd $PKGNAME-v$PKGVERSION
+	tar xvf $PKGNAME-v$PKGVERSION.tar.gz
+	cd $PKGNAME-v$PKGVERSION
 
 	./autogen.sh
 	CC="$CC" \
@@ -51,6 +51,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libuv.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-v$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/libxkbcommon/libxkbcommon.sh
--- a/lib/libxkbcommon/libxkbcommon.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/libxkbcommon/libxkbcommon.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -58,8 +58,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -78,6 +78,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libxkbcommon{,-x11}.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/libxklavier/libxklavier.sh
--- a/lib/libxklavier/libxklavier.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/libxklavier/libxklavier.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -38,8 +38,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -52,6 +52,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libxklavier.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/linux-headers/linux-headers.sh
--- a/lib/linux-headers/linux-headers.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/linux-headers/linux-headers.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -25,5 +25,5 @@
 build()
 {
 	mkdir -p $DESTDIR
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz -C $DESTDIR
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz -C $DESTDIR
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/lzo/lzo.sh
--- a/lib/lzo/lzo.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/lzo/lzo.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -49,6 +49,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/liblzo2.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/mpc/mpc.sh
--- a/lib/mpc/mpc.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/mpc/mpc.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -49,6 +49,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libmpc.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/mpfr/mpfr.sh
--- a/lib/mpfr/mpfr.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/mpfr/mpfr.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -51,6 +51,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libmpfr.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/mtdev/mtdev.sh
--- a/lib/mtdev/mtdev.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/mtdev/mtdev.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -30,8 +30,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -45,6 +45,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libmtdev.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/musl-fts/musl-fts.sh
--- a/lib/musl-fts/musl-fts.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/musl-fts/musl-fts.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf v$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf v$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./bootstrap.sh
 	CC="$CC" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libfts.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/musl-obstack/musl-obstack.sh
--- a/lib/musl-obstack/musl-obstack.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/musl-obstack/musl-obstack.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf v$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf v$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./bootstrap.sh
 	CC="$CC" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libobstack.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/musl/musl.sh
--- a/lib/musl/musl.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/musl/musl.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix= --disable-static
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/ncurses/ncurses.sh
--- a/lib/ncurses/ncurses.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/ncurses/ncurses.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -34,7 +34,7 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
 	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/nspr/nspr.sh
--- a/lib/nspr/nspr.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/nspr/nspr.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -42,8 +42,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION/nspr
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION/nspr
 
 	sed -i -e 's#$(LIBRARY) ##' config/rules.mk
 	CC="$CC" \
@@ -62,6 +62,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/openmp/openmp.sh
--- a/lib/openmp/openmp.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/openmp/openmp.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -30,10 +30,10 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION.src
-	tar xvaf $PKGNAME-$PKGVERSION.src.tar.xz
-	pushd $PKGNAME-$PKGVERSION.src
+	tar xvf $PKGNAME-$PKGVERSION.src.tar.xz
+	cd $PKGNAME-$PKGVERSION.src
 
-	mkdir build && pushd build
+	mkdir build && cd build
 	cmake .. \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_CXX_COMPILER="$CXX" \
@@ -43,8 +43,8 @@
 		-DCMAKE_INSTALL_PREFIX=
 	make
 	make install DESTDIR=$DESTDIR
-	popd
+	cd ..
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION.src
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/pcre/pcre.sh
--- a/lib/pcre/pcre.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/pcre/pcre.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -35,8 +35,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -60,6 +60,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libpcre{,cpp,posix}.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/pcre2/pcre2.sh
--- a/lib/pcre2/pcre2.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/pcre2/pcre2.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -35,8 +35,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -55,6 +55,6 @@
 	rm -f $DESTDIR/lib/libpcre2-posix.la
 	rm -f $DESTDIR/lib/libpcre2-8.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/popt/popt.sh
--- a/lib/popt/popt.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/popt/popt.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -41,8 +41,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -57,6 +57,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libpopt.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/readline/readline.sh
--- a/lib/readline/readline.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/readline/readline.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -53,6 +53,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 lib/vte/vte.sh
--- a/lib/vte/vte.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/lib/vte/vte.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -39,8 +39,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	# https://gitlab.gnome.org/GNOME/vte/issues/72
 	patch -p1 < ../musl.patch
@@ -60,6 +60,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libvte-*.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/libmatekbd/libmatekbd.sh
--- a/mate/libmatekbd/libmatekbd.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/mate/libmatekbd/libmatekbd.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/libmatekbd/libmatekbd.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mate/libmatekbd/libmatekbd.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+82589e13d7e0425dc1eb094577e781b6580eab1e  libmatekbd-1.22.0.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/libmatemixer/libmatemixer.sh
--- a/mate/libmatemixer/libmatemixer.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/mate/libmatemixer/libmatemixer.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -49,8 +49,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -69,6 +69,6 @@
 	rm -f $DESTDIR/lib/libmatemixer.la
 	rm -f $DESTDIR/lib/libmatemixer/*.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/libmatemixer/libmatemixer.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mate/libmatemixer/libmatemixer.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+5de47ba121492eba4ea3236a3e2f98b8c637ef63  libmatemixer-1.22.0.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/libmateweather/libmateweather.sh
--- a/mate/libmateweather/libmateweather.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/mate/libmateweather/libmateweather.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -36,8 +36,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -51,6 +51,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libmateweather.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/libmateweather/libmateweather.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mate/libmateweather/libmateweather.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+b8558da0eed165838a24624b804937af5738403a  libmateweather-1.22.0.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/marco/marco.sh
--- a/mate/marco/marco.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/mate/marco/marco.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -45,8 +45,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	# credits to void-linux.
 	patch -p0 < ../musl.patch
@@ -64,6 +64,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libmarco-private.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/marco/marco.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mate/marco/marco.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+db7da41c718f8d66b2e644c5f1be66f9e3df09aa  marco-1.22.0.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/mate-backgrounds/mate-backgrounds.sh
--- a/mate/mate-backgrounds/mate-backgrounds.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/mate/mate-backgrounds/mate-backgrounds.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -25,13 +25,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/mate-backgrounds/mate-backgrounds.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mate/mate-backgrounds/mate-backgrounds.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+770051d0057e88afc7bbf112d9d397227c06863d  mate-backgrounds-1.22.0.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/mate-calc/mate-calc.sh
--- a/mate/mate-calc/mate-calc.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/mate/mate-calc/mate-calc.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -42,8 +42,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -57,6 +57,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/mate-calc/mate-calc.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mate/mate-calc/mate-calc.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+3d2b00423c3ac3e65acd3b272bd426843b7cd5b8  mate-calc-1.22.0.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/mate-common/mate-common.sh
--- a/mate/mate-common/mate-common.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/mate/mate-common/mate-common.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -46,6 +46,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/mate-common/mate-common.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mate/mate-common/mate-common.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+0ad47fd5215e42b3008732129dcc834511c2b012  mate-common-1.22.0.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/mate-desktop/mate-desktop.sh
--- a/mate/mate-desktop/mate-desktop.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/mate/mate-desktop/mate-desktop.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -42,8 +42,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -57,6 +57,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/mate-desktop/mate-desktop.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mate/mate-desktop/mate-desktop.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+1411f186b26024299e1e7d2d10a975ef35b105d5  mate-desktop-1.22.0.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/mate-icon-theme/mate-icon-theme.sh
--- a/mate/mate-icon-theme/mate-icon-theme.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/mate/mate-icon-theme/mate-icon-theme.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/mate-icon-theme/mate-icon-theme.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mate/mate-icon-theme/mate-icon-theme.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+04889d9ccc6dbcc1e588126112b6eaba8fb26b1c  mate-icon-theme-1.22.0.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/mate-menus/mate-menus.sh
--- a/mate/mate-menus/mate-menus.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/mate/mate-menus/mate-menus.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -42,8 +42,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -60,6 +60,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libmate-menu.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/mate-menus/mate-menus.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mate/mate-menus/mate-menus.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+feea3d833bdea442cf6e48559988741e4d3ad6fe  mate-menus-1.22.0.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/mate-panel/mate-panel.sh
--- a/mate/mate-panel/mate-panel.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/mate/mate-panel/mate-panel.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -59,8 +59,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -78,6 +78,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libmate-panel-applet-4.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/mate-panel/mate-panel.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mate/mate-panel/mate-panel.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+28372f85a8a2fe92375562086b507977796e01ae  mate-panel-1.22.0.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/mate-polkit/mate-polkit.sh
--- a/mate/mate-polkit/mate-polkit.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/mate/mate-polkit/mate-polkit.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/mate-polkit/mate-polkit.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mate/mate-polkit/mate-polkit.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+84c665fcde65af59d21a63987a42877fe223d15c  mate-polkit-1.22.0.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/mate-session-manager/mate-session-manager.sh
--- a/mate/mate-session-manager/mate-session-manager.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/mate/mate-session-manager/mate-session-manager.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -52,8 +52,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	# https://git.alpinelinux.org/aports/plain/community/mate-session-manager/systemd-dependency.patch
 	patch -p1 < ../systemd-dependency.patch
@@ -70,6 +70,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/mate-session-manager/mate-session-manager.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mate/mate-session-manager/mate-session-manager.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+f23b6cd78b5aa81052e10dde3e9504089a34278f  mate-session-manager-1.22.0.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/mate-settings-daemon/mate-settings-daemon.sh
--- a/mate/mate-settings-daemon/mate-settings-daemon.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/mate/mate-settings-daemon/mate-settings-daemon.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -66,8 +66,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	# TODO: libcanberra
 	CC="$CC" \
@@ -86,6 +86,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/mate-settings-daemon/mate-settings-daemon.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mate/mate-settings-daemon/mate-settings-daemon.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+eef05c20e8b3af1baf8ec0db8dcc3b6f55f1c14e  mate-settings-daemon-1.22.0.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/mate-terminal/mate-terminal.sh
--- a/mate/mate-terminal/mate-terminal.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/mate/mate-terminal/mate-terminal.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -38,8 +38,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -52,6 +52,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 mate/mate-terminal/mate-terminal.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mate/mate-terminal/mate-terminal.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+684de823f059b61d11c59403deb498f046edf755  mate-terminal-1.22.0.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 misc/iso-codes/iso-codes.sh
--- a/misc/iso-codes/iso-codes.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/misc/iso-codes/iso-codes.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 misc/iso-codes/iso-codes.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/iso-codes/iso-codes.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+7562a89e6c894eb39932ad5868bac06bb7aca5c3  iso-codes-4.1.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 misc/itstool/itstool.sh
--- a/misc/itstool/itstool.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/misc/itstool/itstool.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,8 +26,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	./configure \
 		--build=$CBUILD \
@@ -36,6 +36,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 misc/itstool/itstool.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/itstool/itstool.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+0341f6e980c00f95c6a5652228578cb13ebf0d98  itstool-2.0.5.tar.bz2
diff -r 860ab66f5f71 -r 25cecc6dca48 misc/shared-mime-info/shared-mime-info.sh
--- a/misc/shared-mime-info/shared-mime-info.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/misc/shared-mime-info/shared-mime-info.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -42,8 +42,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -57,6 +57,6 @@
 	make
 	make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 misc/shared-mime-info/shared-mime-info.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/shared-mime-info/shared-mime-info.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+d126fa5a0b16bb5440c6b4c56bf65f83c189e129  shared-mime-info-1.10.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 multimedia/libbluray/libbluray.sh
--- a/multimedia/libbluray/libbluray.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/multimedia/libbluray/libbluray.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -57,8 +57,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	# TODO: re-enable bdjava-jar once ant is there.
 	CC="$CC" \
@@ -79,6 +79,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libbluray.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 network/curl/curl.sh
--- a/network/curl/curl.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/network/curl/curl.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -72,8 +72,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -100,6 +100,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libcurl.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 network/curl/curl.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/network/curl/curl.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+7539acc0742c2fb1472bc2904f0bd58eeebc011a  curl-7.64.0.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 network/dbus/dbus.sh
--- a/network/dbus/dbus.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/network/dbus/dbus.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -52,8 +52,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -76,6 +76,6 @@
 	rm -f $DESTDIR/lib/libdbus-1.la
 	install -Dm0644 ../dbus $DESTDIR/etc/rc.d/dbus
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 network/dbus/dbus.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/network/dbus/dbus.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+6e9a99e0140f71800c1ed6283af80c26f7e3f39b  dbus-1.13.8.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 network/dhcpcd/dhcpcd.sh
--- a/network/dhcpcd/dhcpcd.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/network/dhcpcd/dhcpcd.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -35,8 +35,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -54,6 +54,6 @@
 	make install DESTDIR=$DESTDIR
 	install -Dm0644 ../dhcpcd $DESTDIR/etc/rc.d/dhcpcd
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 network/dhcpcd/dhcpcd.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/network/dhcpcd/dhcpcd.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+39445fac21200463ca5a08a261408c6abb9a263a  dhcpcd-7.0.8.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 network/inetutils/inetutils.sh
--- a/network/inetutils/inetutils.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/network/inetutils/inetutils.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -41,8 +41,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	# --disable-rcp: does not build with musl.
 	# --disable-rlogin: does not build with musl.
@@ -62,6 +62,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 network/inetutils/inetutils.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/network/inetutils/inetutils.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+5e515cc9da142cb73bb1beda137b4c2dcf2b528c  inetutils-1.9.4.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 network/iproute2/iproute2.sh
--- a/network/iproute2/iproute2.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/network/iproute2/iproute2.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -48,8 +48,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	# custom configure script is not customizable.
 	echo CC="$CC" > config.mk
@@ -70,6 +70,6 @@
 	make CC="$CC"
 	make PREFIX=/ SBINDIR=/bin DESTDIR=$DESTDIR install
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 network/iproute2/iproute2.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/network/iproute2/iproute2.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+3713570a68fd31539737fcf639c15abef566b606  iproute2-4.20.0.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 network/iputils/iputils.sh
--- a/network/iputils/iputils.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/network/iputils/iputils.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -49,8 +49,8 @@
 build()
 {
 	rm -rf $PKGNAME-s$PKGVERSION
-	tar xvaf s$PKGVERSION.tar.gz
-	pushd $PKGNAME-s$PKGVERSION
+	tar xvf s$PKGVERSION.tar.gz
+	cd $PKGNAME-s$PKGVERSION
 
 	# https://git.alpinelinux.org/aports/tree/main/iputils/fix-defines.patch
 	patch -p1 < ../fix-defines.patch
@@ -59,6 +59,6 @@
 		install -D -m 0755 $p $DESTDIR/bin/$p
 	done
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-s$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 network/iputils/iputils.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/network/iputils/iputils.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+353df20691bf027ad35fcaaf6894b122c39d8f2d  s20180629.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 network/libpsl/libpsl.sh
--- a/network/libpsl/libpsl.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/network/libpsl/libpsl.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libpsl.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 network/libpsl/libpsl.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/network/libpsl/libpsl.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+890376d6038652911cfa853ccfb5b993ae0743ee  libpsl-0.20.2.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 network/libsoup/libsoup.sh
--- a/network/libsoup/libsoup.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/network/libsoup/libsoup.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -54,8 +54,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -71,7 +71,7 @@
 	CC="$CC" ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
 
diff -r 860ab66f5f71 -r 25cecc6dca48 network/libsoup/libsoup.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/network/libsoup/libsoup.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+58eea71b23abc070c29efa926f3692652767d736  libsoup-2.66.0.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 network/libssh/libssh.sh
--- a/network/libssh/libssh.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/network/libssh/libssh.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -29,10 +29,10 @@
 build()
 {
 	rm -rf libssh2-$PKGVERSION
-	tar xvaf libssh2-$PKGVERSION.tar.gz
-	pushd libssh2-$PKGVERSION
+	tar xvf libssh2-$PKGVERSION.tar.gz
+	cd libssh2-$PKGVERSION
 
-	mkdir build && pushd build
+	mkdir build && cd build
 	cmake .. \
 		-DBUILD_SHARED_LIBS=On \
 		-DCMAKE_BUILD_TYPE=Release \
@@ -47,8 +47,8 @@
 		-DENABLE_ZLIB_COMPRESSION=On
 	make
 	make install DESTDIR=$DESTDIR
-	popd
+	cd ..
 
-	popd
+	cd ..
 	rm -rf libssh2-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 network/libssh/libssh.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/network/libssh/libssh.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+21e98282b103307a16792e5e2d4c99beaf0b3b9c  libssh2-1.9.0.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 network/libssh0/libssh0.sh
--- a/network/libssh0/libssh0.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/network/libssh0/libssh0.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -29,7 +29,7 @@
 build()
 {
 	rm -rf libssh-$PKGVERSION
-	tar xvJf libssh-$PKGVERSION.tar.xz
+	tar xvf libssh-$PKGVERSION.tar.xz
 	cd libssh-$PKGVERSION
 
 	mkdir build && cd build
diff -r 860ab66f5f71 -r 25cecc6dca48 network/libssh0/libssh0.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/network/libssh0/libssh0.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+570bffef68af6c1211673bc9a8036c9265935b2b  libssh-0.9.0.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 network/ntp/ntp.sh
--- a/network/ntp/ntp.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/network/ntp/ntp.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -57,8 +57,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -74,6 +74,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 network/ntp/ntp.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/network/ntp/ntp.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+cff200a987d64e891fb349a22313ecb0feaea090  ntp-4.2.8p13.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 network/openssh/openssh.sh
--- a/network/openssh/openssh.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/network/openssh/openssh.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -51,8 +51,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	patch -p1 < ../CVE-2018-20685.patch
 	patch -p1 < ../CVE-2019-6109.patch
@@ -74,6 +74,6 @@
 	make install DESTDIR=$DESTDIR
 	install -D -m 0644 ../sshd /etc/rc.d/sshd
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 network/openssh/openssh.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/network/openssh/openssh.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+993aceedea8ecabb1d0dd7293508a361891c4eaa  openssh-7.9p1.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 network/openssl/openssl.sh
--- a/network/openssl/openssl.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/network/openssl/openssl.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -40,8 +40,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	patch -p0 < ../ca-directory.patch
 	./Configure \
@@ -55,6 +55,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/lib{crypto,ssl}.a
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 network/openssl/openssl.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/network/openssl/openssl.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+8fae27b4f34445a5500c9dc50ae66b4d6472ce29  openssl-1.1.1a.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 network/wget/wget.sh
--- a/network/wget/wget.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/network/wget/wget.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -61,8 +61,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.lz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.lz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -79,6 +79,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 network/wget/wget.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/network/wget/wget.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+6c46afab96031eba0429ceba7e1d6f8206b9a036  wget-1.20.1.tar.lz
diff -r 860ab66f5f71 -r 25cecc6dca48 network/wireless-tools/wireless-tools.sh
--- a/network/wireless-tools/wireless-tools.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/network/wireless-tools/wireless-tools.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -31,8 +31,8 @@
 build()
 {
 	rm -rf wireless_tools.$PKGVERSION
-	tar xvaf wireless_tools.$PKGVERSION.tar.gz
-	pushd wireless_tools.$PKGVERSION
+	tar xvf wireless_tools.$PKGVERSION.tar.gz
+	cd wireless_tools.$PKGVERSION
 
 	make \
 		CC="$CC" \
@@ -44,6 +44,6 @@
 		PREFIX=$DESTDIR \
 		all install
 
-	popd
+	cd ..
 	rm -rf wireless_tools.$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 network/wireless-tools/wireless-tools.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/network/wireless-tools/wireless-tools.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+22040ac1497f4c5f8ddeca365591b01ae3475710  wireless_tools.29.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 network/wpa-supplicant/wpa-supplicant.sh
--- a/network/wpa-supplicant/wpa-supplicant.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/network/wpa-supplicant/wpa-supplicant.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -44,8 +44,8 @@
 build()
 {
 	rm -rf wpa_supplicant-$PKGVERSION
-	tar xvaf wpa_supplicant-$PKGVERSION.tar.gz
-	pushd wpa_supplicant-$PKGVERSION/wpa_supplicant
+	tar xvf wpa_supplicant-$PKGVERSION.tar.gz
+	cd wpa_supplicant-$PKGVERSION/wpa_supplicant
 
 	cp defconfig .config
 
@@ -64,6 +64,6 @@
 		DESTDIR=$DESTDIR \
 		all install
 
-	popd
+	cd ..
 	rm -rf wpa_supplicant-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 network/wpa-supplicant/wpa-supplicant.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/network/wpa-supplicant/wpa-supplicant.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+1536ec9689ae718ea76ab0d1716c2a1b3e69f0d4  wpa_supplicant-2.8.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 perl/perl-locale-gettext/perl-locale-gettext.sh
--- a/perl/perl-locale-gettext/perl-locale-gettext.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/perl/perl-locale-gettext/perl-locale-gettext.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,12 +26,12 @@
 build()
 {
 	rm -rf Locale-gettext-$PKGVERSION
-	tar xvaf Locale-gettext-$PKGVERSION.tar.gz
-	pushd Locale-gettext-$PKGVERSION
+	tar xvf Locale-gettext-$PKGVERSION.tar.gz
+	cd Locale-gettext-$PKGVERSION
 
 	perl Makefile.PL INSTALLDIRS=vendor
 	make DESTDIR=$DESTDIR install
 
-	popd
+	cd ..
 	rm -rf Locale-gettext-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 perl/perl-locale-gettext/perl-locale-gettext.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/perl/perl-locale-gettext/perl-locale-gettext.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+a23d0b35269c8db49418fa8585a8dbbed6b8fefa  Locale-gettext-1.07.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 perl/perl-uri/perl-uri.sh
--- a/perl/perl-uri/perl-uri.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/perl/perl-uri/perl-uri.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,12 +26,12 @@
 build()
 {
 	rm -rf URI-$PKGVERSION
-	tar xvaf URI-$PKGVERSION.tar.gz
-	pushd URI-$PKGVERSION
+	tar xvf URI-$PKGVERSION.tar.gz
+	cd URI-$PKGVERSION
 
 	perl Makefile.PL INSTALLDIRS=vendor
 	make DESTDIR=$DESTDIR install
 
-	popd
+	cd ..
 	rm -rf URI-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 perl/perl-uri/perl-uri.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/perl/perl-uri/perl-uri.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+d75380f8b1ad792d230216d8712fd37533ebedf0  URI-1.76.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 perl/perl-xml-namespacesupport/perl-xml-namespacesupport.sh
--- a/perl/perl-xml-namespacesupport/perl-xml-namespacesupport.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/perl/perl-xml-namespacesupport/perl-xml-namespacesupport.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,12 +26,12 @@
 build()
 {
 	rm -rf XML-NamespaceSupport-$PKGVERSION
-	tar xvaf XML-NamespaceSupport-$PKGVERSION.tar.gz
-	pushd XML-NamespaceSupport-$PKGVERSION
+	tar xvf XML-NamespaceSupport-$PKGVERSION.tar.gz
+	cd XML-NamespaceSupport-$PKGVERSION
 
 	perl Makefile.PL INSTALLDIRS=vendor
 	make DESTDIR=$DESTDIR install
 
-	popd
+	cd ..
 	rm -rf XML-NamespaceSupport-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 perl/perl-xml-namespacesupport/perl-xml-namespacesupport.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/perl/perl-xml-namespacesupport/perl-xml-namespacesupport.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+f07cf650e0bd52714fc3da39d19a95bc6290e4ef  XML-NamespaceSupport-1.12.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 perl/perl-xml-parser/perl-xml-parser.sh
--- a/perl/perl-xml-parser/perl-xml-parser.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/perl/perl-xml-parser/perl-xml-parser.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -28,12 +28,12 @@
 build()
 {
 	rm -rf XML-Parser-$PKGVERSION
-	tar xvaf XML-Parser-$PKGVERSION.tar.gz
-	pushd XML-Parser-$PKGVERSION
+	tar xvf XML-Parser-$PKGVERSION.tar.gz
+	cd XML-Parser-$PKGVERSION
 
 	perl Makefile.PL INSTALLDIRS=vendor
 	make CC="$CC" DESTDIR=$DESTDIR install
 
-	popd
+	cd ..
 	rm -rf XML-Parser-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 perl/perl-xml-parser/perl-xml-parser.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/perl/perl-xml-parser/perl-xml-parser.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+0ab6b932713ec1f9927a1b1c619b6889a5c12849  XML-Parser-2.44.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 perl/perl-xml-sax-base/perl-xml-sax-base.sh
--- a/perl/perl-xml-sax-base/perl-xml-sax-base.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/perl/perl-xml-sax-base/perl-xml-sax-base.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,12 +26,12 @@
 build()
 {
 	rm -rf XML-SAX-Base-$PKGVERSION
-	tar xvaf XML-SAX-Base-$PKGVERSION.tar.gz
-	pushd XML-SAX-Base-$PKGVERSION
+	tar xvf XML-SAX-Base-$PKGVERSION.tar.gz
+	cd XML-SAX-Base-$PKGVERSION
 
 	perl Makefile.PL INSTALLDIRS=vendor
 	make DESTDIR=$DESTDIR install
 
-	popd
+	cd ..
 	rm -rf XML-SAX-Base-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 perl/perl-xml-sax-base/perl-xml-sax-base.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/perl/perl-xml-sax-base/perl-xml-sax-base.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+bf2c97ed35d5de09015d5a6f6ab8a8ee50aedd4a  XML-SAX-Base-1.09.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 perl/perl-xml-sax-expat/perl-xml-sax-expat.sh
--- a/perl/perl-xml-sax-expat/perl-xml-sax-expat.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/perl/perl-xml-sax-expat/perl-xml-sax-expat.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -30,14 +30,14 @@
 build()
 {
 	rm -rf XML-SAX-Expat-$PKGVERSION
-	tar xvaf XML-SAX-Expat-$PKGVERSION.tar.gz
-	pushd XML-SAX-Expat-$PKGVERSION
+	tar xvf XML-SAX-Expat-$PKGVERSION.tar.gz
+	cd XML-SAX-Expat-$PKGVERSION
 
 	perl Makefile.PL INSTALLDIRS=vendor
 	make DESTDIR=$DESTDIR pure_install
 	rm -f $DESTDIR/lib/perl5/vendor_perl/auto/XML/SAX/Expat/.packlist
 
-	popd
+	cd ..
 	rm -rf XML-SAX-Expat-$PKGVERSION
 	echo "=> OK"
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 perl/perl-xml-sax-expat/perl-xml-sax-expat.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/perl/perl-xml-sax-expat/perl-xml-sax-expat.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+74609fe5ee5011eac193fbf1ae20e327ce12372c  XML-SAX-Expat-0.51.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 perl/perl-xml-sax/perl-xml-sax.sh
--- a/perl/perl-xml-sax/perl-xml-sax.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/perl/perl-xml-sax/perl-xml-sax.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,14 +26,14 @@
 build()
 {
 	rm -rf XML-SAX-$PKGVERSION
-	tar xvaf XML-SAX-$PKGVERSION.tar.gz
-	pushd XML-SAX-$PKGVERSION
+	tar xvf XML-SAX-$PKGVERSION.tar.gz
+	cd XML-SAX-$PKGVERSION
 
 	perl Makefile.PL INSTALLDIRS=vendor
 	PERLLIB=blib/lib make DESTDIR=$DESTDIR install
 	rm -f $DESTDIR/lib/perl5/core_perl/perllocal.pod
 	rm -f $DESTDIR/lib/perl5/vendor_perl/auto/XML/SAX/.packlist
 
-	popd
+	cd ..
 	rm -rf XML-SAX-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 perl/perl-xml-sax/perl-xml-sax.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/perl/perl-xml-sax/perl-xml-sax.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+1151e38f305dd1362372c6f9834fae2200d90dbc  XML-SAX-1.00.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 perl/perl-xml-simple/perl-xml-simple.sh
--- a/perl/perl-xml-simple/perl-xml-simple.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/perl/perl-xml-simple/perl-xml-simple.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,12 +26,12 @@
 build()
 {
 	rm -rf XML-Simple-$PKGVERSION
-	tar xvaf XML-Simple-$PKGVERSION.tar.gz
-	pushd XML-Simple-$PKGVERSION
+	tar xvf XML-Simple-$PKGVERSION.tar.gz
+	cd XML-Simple-$PKGVERSION
 
 	perl Makefile.PL INSTALLDIRS=vendor
 	make DESTDIR=$DESTDIR install
 
-	popd
+	cd ..
 	rm -rf XML-Simple-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 perl/perl-xml-simple/perl-xml-simple.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/perl/perl-xml-simple/perl-xml-simple.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+2642718bf55485798de4693ac34f051c1eaff5c9  XML-Simple-2.25.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 perl/perl/perl.sh
--- a/perl/perl/perl.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/perl/perl/perl.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	BUILD_ZLIB=0 \
 	BUILD_BZIP2=0 \
@@ -69,6 +69,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 perl/perl/perl.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/perl/perl/perl.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+5fc239bebb8c484c3f5c58e663274ce668981651  perl-5.28.1.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 python/py-ansicolor/py-ansicolor.sh
--- a/python/py-ansicolor/py-ansicolor.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/python/py-ansicolor/py-ansicolor.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -27,11 +27,11 @@
 build()
 {
 	rm -rf ansicolor-$PKGVERSION
-	tar xvaf ansicolor-$PKGVERSION.tar.gz
-	pushd ansicolor-$PKGVERSION
+	tar xvf ansicolor-$PKGVERSION.tar.gz
+	cd ansicolor-$PKGVERSION
 
 	python setup.py install --root=${DESTDIR:-/} -O1
 
-	popd
+	cd ..
 	rm -rf ansicolor-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 python/py-ansicolor/py-ansicolor.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/python/py-ansicolor/py-ansicolor.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+51e09ec6da93ed0b370c7867e6b585e8fda9e1b4  ansicolor-0.2.6.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 python/py-commonmark/py-commonmark.sh
--- a/python/py-commonmark/py-commonmark.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/python/py-commonmark/py-commonmark.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -27,11 +27,11 @@
 build()
 {
 	rm -rf CommonMark-py-$PKGVERSION
-	tar xvaf $PKGVERSION.tar.gz
-	pushd CommonMark-py-$PKGVERSION
+	tar xvf $PKGVERSION.tar.gz
+	cd CommonMark-py-$PKGVERSION
 
 	python setup.py install --root=${DESTDIR:-/} -O1
 
-	popd
+	cd ..
 	rm -rf CommonMark-py-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 python/py-commonmark/py-commonmark.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/python/py-commonmark/py-commonmark.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+88eb4e1d7b02b3e083008841da804b145214e71a  0.8.0.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 python/py-daemon/py-daemon.sh
--- a/python/py-daemon/py-daemon.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/python/py-daemon/py-daemon.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -27,11 +27,11 @@
 build()
 {
 	rm -rf python-daemon-$PKGVERSION
-	tar xvaf python-daemon-$PKGVERSION.tar.gz
-	pushd python-daemon-$PKGVERSION
+	tar xvf python-daemon-$PKGVERSION.tar.gz
+	cd python-daemon-$PKGVERSION
 
 	python setup.py install --root=${DESTDIR:-/} -O1
 
-	popd
+	cd ..
 	rm -rf python-daemon-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 python/py-daemon/py-daemon.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/python/py-daemon/py-daemon.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+9135b7edafa5bcd457d88bb2c0dfae024b3d8778  python-daemon-2.2.0.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 python/py-dateutil/py-dateutil.sh
--- a/python/py-dateutil/py-dateutil.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/python/py-dateutil/py-dateutil.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -27,11 +27,11 @@
 build()
 {
 	rm -rf python-dateutil-$PKGVERSION
-	tar xvaf python-dateutil-$PKGVERSION.tar.gz
-	pushd python-dateutil-$PKGVERSION
+	tar xvf python-dateutil-$PKGVERSION.tar.gz
+	cd python-dateutil-$PKGVERSION
 
 	python setup.py install --root=${DESTDIR:-/}
 
-	popd
+	cd ..
 	rm -rf python-dateutil-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 python/py-dateutil/py-dateutil.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/python/py-dateutil/py-dateutil.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+140cbe261ba86ff30970bd8ca3326f543de91e4d  python-dateutil-2.8.0.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 python/py-docker/py-docker.sh
--- a/python/py-docker/py-docker.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/python/py-docker/py-docker.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -27,11 +27,11 @@
 build()
 {
 	rm -rf docker-py-$PKGVERSION
-	tar xvaf $PKGVERSION.tar.gz
-	pushd docker-py-$PKGVERSION
+	tar xvf $PKGVERSION.tar.gz
+	cd docker-py-$PKGVERSION
 
 	python setup.py install --root=${DESTDIR:-/} -O1
 
-	popd
+	cd ..
 	rm -rf docker-py-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 python/py-docker/py-docker.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/python/py-docker/py-docker.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+82758352012f8303d9924d31c3165efdf9f98022  3.7.0.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 python/py-docutils/py-docutils.sh
--- a/python/py-docutils/py-docutils.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/python/py-docutils/py-docutils.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -28,13 +28,13 @@
 {
 	for py in python python2; do
 		rm -rf docutils-$PKGVERSION
-		tar xvaf docutils-$PKGVERSION.tar.gz
-		pushd docutils-$PKGVERSION
+		tar xvf docutils-$PKGVERSION.tar.gz
+		cd docutils-$PKGVERSION
 
 		$py setup.py build
 		$py setup.py install --root=${DESTDIR:-/} --prefix=/. -O1
 
-		popd
+		cd ..
 		rm -rf docutils-$PKGVERSION
 	done
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 python/py-docutils/py-docutils.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/python/py-docutils/py-docutils.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+32cefb69ac3dab5b04c4d150776f35419cc4c863  docutils-0.14.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 python/py-editorconfig/py-editorconfig.sh
--- a/python/py-editorconfig/py-editorconfig.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/python/py-editorconfig/py-editorconfig.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -27,11 +27,11 @@
 build()
 {
 	rm -rf EditorConfig-$PKGVERSION
-	tar xvaf EditorConfig-$PKGVERSION.tar.gz
-	pushd EditorConfig-$PKGVERSION
+	tar xvf EditorConfig-$PKGVERSION.tar.gz
+	cd EditorConfig-$PKGVERSION
 
 	python setup.py install --root=${DESTDIR:-/} -O1
 
-	popd
+	cd ..
 	rm -rf EditorConfig-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 python/py-editorconfig/py-editorconfig.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/python/py-editorconfig/py-editorconfig.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+2a382d04ee96250215907ce51a3673702aa3f283  EditorConfig-0.12.2.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 python/py-isodate/py-isodate.sh
--- a/python/py-isodate/py-isodate.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/python/py-isodate/py-isodate.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -27,11 +27,11 @@
 build()
 {
 	rm -rf isodate-$PKGVERSION
-	tar xvaf isodate-$PKGVERSION.tar.gz
-	pushd isodate-$PKGVERSION
+	tar xvf isodate-$PKGVERSION.tar.gz
+	cd isodate-$PKGVERSION
 
 	python setup.py install --root=${DESTDIR:-/} -O1
 
-	popd
+	cd ..
 	rm -rf isodate-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 python/py-isodate/py-isodate.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/python/py-isodate/py-isodate.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+2c69e08c9894a9cd96c627146463260f5731df62  isodate-0.6.0.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 python/py-mako/py-mako.sh
--- a/python/py-mako/py-mako.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/python/py-mako/py-mako.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,12 +26,12 @@
 build()
 {
 	rm -rf Mako-$PKGVERSION
-	tar xvaf Mako-$PKGVERSION.tar.gz
-	pushd Mako-$PKGVERSION
+	tar xvf Mako-$PKGVERSION.tar.gz
+	cd Mako-$PKGVERSION
 
 	python setup.py build
 	python setup.py install --root=${DESTDIR:-/} -O1
 
-	popd
+	cd ..
 	rm -rf Mako-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 python/py-mako/py-mako.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/python/py-mako/py-mako.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+88bada040544509dec4a4040245e1087a7a330cf  Mako-1.0.8.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 python/py-pygments/py-pygments.sh
--- a/python/py-pygments/py-pygments.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/python/py-pygments/py-pygments.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,11 +26,11 @@
 build()
 {
 	rm -rf Pygments-$PKGVERSION
-	tar xvaf Pygments-$PKGVERSION.tar.gz
-	pushd Pygments-$PKGVERSION
+	tar xvf Pygments-$PKGVERSION.tar.gz
+	cd Pygments-$PKGVERSION
 
 	python setup.py install --root=${DESTDIR:-/}
 
-	popd
+	cd ..
 	rm -rf Pygments-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 python/py-pygments/py-pygments.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/python/py-pygments/py-pygments.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+88f8da2d10cb21362a9e04b154932892c2695670  Pygments-2.3.1.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 python/py-setuptools/py-setuptools.sh
--- a/python/py-setuptools/py-setuptools.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/python/py-setuptools/py-setuptools.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -27,13 +27,13 @@
 {
 	for py in python python2; do
 		rm -rf v$PKGVERSION
-		tar xvaf v$PKGVERSION.tar.gz
-		pushd setuptools-$PKGVERSION
+		tar xvf v$PKGVERSION.tar.gz
+		cd setuptools-$PKGVERSION
 
 		$py bootstrap.py
 		$py setup.py install --root=${DESTDIR:-/} --prefix=/. -O1
 
-		popd
+		cd ..
 		rm -rf v$PKGVERSION
 	done
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 python/py-setuptools/py-setuptools.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/python/py-setuptools/py-setuptools.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+53ba20ea669654617cfa6dfa2ede77ab39f04781  v40.8.0.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 python/python/python.sh
--- a/python/python/python.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/python/python/python.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -42,8 +42,8 @@
 build()
 {
 	rm -rf Python-$PKGVERSION
-	tar xvaf Python-$PKGVERSION.tar.xz
-	pushd Python-$PKGVERSION
+	tar xvf Python-$PKGVERSION.tar.xz
+	cd Python-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS -I/include/ncurses" \
@@ -63,6 +63,6 @@
 	make install DESTDIR=$DESTDIR
 	ln -sf python3.7 $DESTDIR/bin/python
 
-	popd
+	cd ..
 	rm -rf Python-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 python/python/python.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/python/python/python.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+c3dc6928516bcb934cf4740461044c79c7c35494  Python-3.7.2.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 python/python2/python2.sh
--- a/python/python2/python2.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/python/python2/python2.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -42,8 +42,8 @@
 build()
 {
 	rm -rf Python-$PKGVERSION
-	tar xvaf Python-$PKGVERSION.tar.xz
-	pushd Python-$PKGVERSION
+	tar xvf Python-$PKGVERSION.tar.xz
+	cd Python-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -68,6 +68,6 @@
 	mv $DESTDIR/bin/idle{,2.7}
 	mv $DESTDIR/bin/pydoc{,2.7}
 
-	popd
+	cd ..
 	rm -rf Python-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 python/python2/python2.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/python/python2/python2.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+e9543af127d958b12b0edfb9340d4f0af3d0d90e  Python-2.7.16.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 security/linux-pam/linux-pam.sh
--- a/security/linux-pam/linux-pam.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/security/linux-pam/linux-pam.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -61,8 +61,8 @@
 build()
 {
 	rm -rf Linux-PAM-$PKGVERSION
-	tar xvaf Linux-PAM-$PKGVERSION.tar.xz
-	pushd Linux-PAM-$PKGVERSION
+	tar xvf Linux-PAM-$PKGVERSION.tar.xz
+	cd Linux-PAM-$PKGVERSION
 
 	# https://git.alpinelinux.org/aports/tree/main/linux-pam/APKBUILD#n32
 	sed -i -e 's/pam_rhosts//g' modules/Makefile.am
@@ -97,6 +97,6 @@
 	rm -f $DESTDIR/lib/libpam{,c,_misc}.la
 	rm -f $DESTDIR/lib/security/pam*.la
 
-	popd
+	cd ..
 	rm -rf Linux-PAM-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 security/linux-pam/linux-pam.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/security/linux-pam/linux-pam.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+e89b6d279c9bf8cb495dfc0b3f3931eb50f818e9  Linux-PAM-1.3.1.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 security/polkit/polkit.sh
--- a/security/polkit/polkit.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/security/polkit/polkit.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -45,8 +45,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	# credits to void-linux.
 	patch -p0 < ../CVE-2018-19788.patch
@@ -66,6 +66,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 security/polkit/polkit.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/security/polkit/polkit.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+208b7e44fcf0f515d067d37307af9ea1419eb305  polkit-0.115.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 security/shadow/shadow.sh
--- a/security/shadow/shadow.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/security/shadow/shadow.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -73,8 +73,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	# disable groups, it's provided by coreutils and documentation by man-pages.
 	sed -i 's/groups$(EXEEXT) //' src/Makefile.in
@@ -112,6 +112,6 @@
 		sed -i -e "/pam_console.so/d" $DESTDIR/etc/pam.d/login
 	fi
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 security/shadow/shadow.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/security/shadow/shadow.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+0b84eb1010fda5edca2a9d1733f9480200e02de6  shadow-4.6.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 shells/bash/bash.sh
--- a/shells/bash/bash.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/shells/bash/bash.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -41,8 +41,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -58,6 +58,6 @@
 	make install DESTDIR=$DESTDIR
 	ln -sf bash $DESTDIR/bin/sh
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 shells/bash/bash.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/shells/bash/bash.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+d116b469b9e6ea5264a74661d3a4c797da7f997b  bash-5.0.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 shells/dash/dash.sh
--- a/shells/dash/dash.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/shells/dash/dash.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -41,7 +41,7 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
 	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
diff -r 860ab66f5f71 -r 25cecc6dca48 shells/dash/dash.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/shells/dash/dash.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+69e05d3fc6289de0927670d910b1388bbb458e1a  dash-0.5.10.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 shells/zsh/zsh.sh
--- a/shells/zsh/zsh.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/shells/zsh/zsh.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -60,8 +60,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -80,6 +80,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 shells/zsh/zsh.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/shells/zsh/zsh.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+fedd82419881323b1087241d536d2fb1528a9deb  zsh-5.7.1.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 system/accountsservice/accountsservice.sh
--- a/system/accountsservice/accountsservice.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/system/accountsservice/accountsservice.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -30,8 +30,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	# credits to void-linux.
 	patch -p0 < ../musl-fgetspent_r.patch
@@ -51,7 +51,7 @@
 	CC="$CC" ninja -C build
 	DESTDIR=$DESTDIR ninja -C build install
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
 
diff -r 860ab66f5f71 -r 25cecc6dca48 system/accountsservice/accountsservice.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/system/accountsservice/accountsservice.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+db2c9341530ad689f1bc5803b777ce997e5c6597  accountsservice-0.6.54.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 system/acpid/acpid.sh
--- a/system/acpid/acpid.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/system/acpid/acpid.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -48,6 +48,6 @@
 	mkdir -p $DESTDIR/etc/rc.d
 	cp ../acpid $DESTDIR/etc/rc.d
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 system/acpid/acpid.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/system/acpid/acpid.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+7ca1975093476b6e8e08a13f55e8676bb3cc47e0  acpid-2.0.31.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 system/rsync/rsync.sh
--- a/system/rsync/rsync.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/system/rsync/rsync.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -38,8 +38,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -56,6 +56,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 system/rsync/rsync.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/system/rsync/rsync.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+82e7829c0b3cefbd33c233005341e2073c425629  rsync-3.1.3.tar.gz
diff -r 860ab66f5f71 -r 25cecc6dca48 terminals/xterm/xterm.sh
--- a/terminals/xterm/xterm.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/terminals/xterm/xterm.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -42,8 +42,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tgz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tgz
+	cd $PKGNAME-$PKGVERSION
 
 	# https://git.alpinelinux.org/aports/tree/community/xterm/posix-ptys.patch
 	patch -p1 < ../posix-ptys.patch
@@ -65,6 +65,6 @@
 	install -Dm0644 xterm.desktop $DESTDIR/share/applications/xterm.desktop
 	install -Dm0644 uxterm.desktop $DESTDIR/share/applications/uxterm.desktop
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 text/docbook-xsl/docbook-xsl.sh
--- a/text/docbook-xsl/docbook-xsl.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/text/docbook-xsl/docbook-xsl.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -25,8 +25,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	install -dm755 $DESTDIR/share/xml/docbook/xsl-stylesheets-$PKGVERSION
 
@@ -38,6 +38,6 @@
 		$DESTDIR/share/xml/docbook/xsl-stylesheets-$PKGVERSION
 	ln -s VERSION $DESTDIR/share/xml/docbook/xsl-stylesheets-$PKGVERSION/VERSION.xsl
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 text/libcroco/libcroco.sh
--- a/text/libcroco/libcroco.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/text/libcroco/libcroco.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libcroco-0.6.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 text/libxml2/libxml2.sh
--- a/text/libxml2/libxml2.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/text/libxml2/libxml2.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -65,8 +65,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	sed -i -e '/SUBDIRS/ s/tests//' python/Makefile.am
 	autoreconf -vif
@@ -95,6 +95,6 @@
 		install
 	rm -f $DESTDIR/lib/libxml2.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 text/libxslt/libxslt.sh
--- a/text/libxslt/libxslt.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/text/libxslt/libxslt.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -44,8 +44,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -66,6 +66,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/lib*xslt.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 themes/hicolor-icon-theme/hicolor-icon-theme.sh
--- a/themes/hicolor-icon-theme/hicolor-icon-theme.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/themes/hicolor-icon-theme/hicolor-icon-theme.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -25,13 +25,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.xz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.xz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 themes/hicolor-icon-theme/hicolor-icon-theme.sha1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/themes/hicolor-icon-theme/hicolor-icon-theme.sha1	Thu Jul 18 07:26:43 2019 +0200
@@ -0,0 +1,1 @@
+192d95efc13adf1fd35442d086733df25826cf2c  hicolor-icon-theme-0.17.tar.xz
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/appres/appres.sh
--- a/x11/appres/appres.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/appres/appres.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/bdftopcf/bdftopcf.sh
--- a/x11/bdftopcf/bdftopcf.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/bdftopcf/bdftopcf.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/bitmap/bitmap.sh
--- a/x11/bitmap/bitmap.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/bitmap/bitmap.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -38,8 +38,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -52,6 +52,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/font-util/font-util.sh
--- a/x11/font-util/font-util.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/font-util/font-util.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/iceauth/iceauth.sh
--- a/x11/iceauth/iceauth.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/iceauth/iceauth.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/imake/imake.sh
--- a/x11/imake/imake.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/imake/imake.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libdmx/libdmx.sh
--- a/x11/libdmx/libdmx.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libdmx/libdmx.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libdmx.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libfontenc/libfontenc.sh
--- a/x11/libfontenc/libfontenc.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libfontenc/libfontenc.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libfontenc.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libfs/libfs.sh
--- a/x11/libfs/libfs.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libfs/libfs.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -31,8 +31,8 @@
 build()
 {
 	rm -rf libFS-$PKGVERSION
-	tar xvaf libFS-$PKGVERSION.tar.gz
-	pushd libFS-$PKGVERSION
+	tar xvf libFS-$PKGVERSION.tar.gz
+	cd libFS-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -43,6 +43,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libFS.la
 
-	popd
+	cd ..
 	rm -rf libFS-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libice/libice.sh
--- a/x11/libice/libice.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libice/libice.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf libICE-$PKGVERSION
-	tar xvaf libICE-$PKGVERSION.tar.gz
-	pushd libICE-$PKGVERSION
+	tar xvf libICE-$PKGVERSION.tar.gz
+	cd libICE-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libICE.la
 
-	popd
+	cd ..
 	rm -rf libICE-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libpciaccess/libpciaccess.sh
--- a/x11/libpciaccess/libpciaccess.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libpciaccess/libpciaccess.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libpciaccess.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libpthread-stubs/libpthread-stubs.sh
--- a/x11/libpthread-stubs/libpthread-stubs.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libpthread-stubs/libpthread-stubs.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -46,6 +46,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libsm/libsm.sh
--- a/x11/libsm/libsm.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libsm/libsm.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -42,8 +42,8 @@
 build()
 {
 	rm -rf libSM-$PKGVERSION
-	tar xvaf libSM-$PKGVERSION.tar.gz
-	pushd libSM-$PKGVERSION
+	tar xvf libSM-$PKGVERSION.tar.gz
+	cd libSM-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -60,6 +60,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libSM.la
 
-	popd
+	cd ..
 	rm -rf libSM-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libx11/libx11.sh
--- a/x11/libx11/libx11.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libx11/libx11.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -36,8 +36,8 @@
 build()
 {
 	rm -rf libX11-$PKGVERSION
-	tar xvaf libX11-$PKGVERSION.tar.gz
-	pushd libX11-$PKGVERSION
+	tar xvf libX11-$PKGVERSION.tar.gz
+	cd libX11-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -53,6 +53,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libX11{,-xcb}.la
 
-	popd
+	cd ..
 	rm -rf libX11-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxau/libxau.sh
--- a/x11/libxau/libxau.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxau/libxau.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf libXau-$PKGVERSION
-	tar xvaf libXau-$PKGVERSION.tar.gz
-	pushd libXau-$PKGVERSION
+	tar xvf libXau-$PKGVERSION.tar.gz
+	cd libXau-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXau.la
 
-	popd
+	cd ..
 	rm -rf libXau-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxaw/libxaw.sh
--- a/x11/libxaw/libxaw.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxaw/libxaw.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -39,8 +39,8 @@
 build()
 {
 	rm -rf libXaw-$PKGVERSION
-	tar xvaf libXaw-$PKGVERSION.tar.gz
-	pushd libXaw-$PKGVERSION
+	tar xvf libXaw-$PKGVERSION.tar.gz
+	cd libXaw-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -56,6 +56,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXaw{6,7}.la
 
-	popd
+	cd ..
 	rm -rf libXaw-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxcb/libxcb.sh
--- a/x11/libxcb/libxcb.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxcb/libxcb.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -37,8 +37,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -58,6 +58,6 @@
 	rm -f $DESTDIR/lib/libxcb-{screensaver,shape,shm,sync,xf86dri,xv}.la
 	rm -f $DESTDIR/lib/libxcb-{xfixes,xinerama,xinput,xkb,xtest,xvmc}.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxcomposite/libxcomposite.sh
--- a/x11/libxcomposite/libxcomposite.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxcomposite/libxcomposite.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf libXcomposite-$PKGVERSION
-	tar xvaf libXcomposite-$PKGVERSION.tar.gz
-	pushd libXcomposite-$PKGVERSION
+	tar xvf libXcomposite-$PKGVERSION.tar.gz
+	cd libXcomposite-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXcomposite.la
 
-	popd
+	cd ..
 	rm -rf libXcomposite-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxcursor/libxcursor.sh
--- a/x11/libxcursor/libxcursor.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxcursor/libxcursor.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -37,8 +37,8 @@
 build()
 {
 	rm -rf libXcursor-$PKGVERSION
-	tar xvaf libXcursor-$PKGVERSION.tar.gz
-	pushd libXcursor-$PKGVERSION
+	tar xvf libXcursor-$PKGVERSION.tar.gz
+	cd libXcursor-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -52,6 +52,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXcursor.la
 
-	popd
+	cd ..
 	rm -rf libXcursor-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxdamage/libxdamage.sh
--- a/x11/libxdamage/libxdamage.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxdamage/libxdamage.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf libXdamage-$PKGVERSION
-	tar xvaf libXdamage-$PKGVERSION.tar.gz
-	pushd libXdamage-$PKGVERSION
+	tar xvf libXdamage-$PKGVERSION.tar.gz
+	cd libXdamage-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXdamage.la
 
-	popd
+	cd ..
 	rm -rf libXdamage-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxdmcp/libxdmcp.sh
--- a/x11/libxdmcp/libxdmcp.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxdmcp/libxdmcp.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf libXdmcp-$PKGVERSION
-	tar xvaf libXdmcp-$PKGVERSION.tar.gz
-	pushd libXdmcp-$PKGVERSION
+	tar xvf libXdmcp-$PKGVERSION.tar.gz
+	cd libXdmcp-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -51,6 +51,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXdmcp.la
 
-	popd
+	cd ..
 	rm -rf libXdmcp-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxext/libxext.sh
--- a/x11/libxext/libxext.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxext/libxext.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf libXext-$PKGVERSION
-	tar xvaf libXext-$PKGVERSION.tar.gz
-	pushd libXext-$PKGVERSION
+	tar xvf libXext-$PKGVERSION.tar.gz
+	cd libXext-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXext.la
 
-	popd
+	cd ..
 	rm -rf libXext-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxfixes/libxfixes.sh
--- a/x11/libxfixes/libxfixes.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxfixes/libxfixes.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf libXfixes-$PKGVERSION
-	tar xvaf libXfixes-$PKGVERSION.tar.gz
-	pushd libXfixes-$PKGVERSION
+	tar xvf libXfixes-$PKGVERSION.tar.gz
+	cd libXfixes-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXfixes.la
 
-	popd
+	cd ..
 	rm -rf libXfixes-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxfont2/libxfont2.sh
--- a/x11/libxfont2/libxfont2.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxfont2/libxfont2.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -50,8 +50,8 @@
 build()
 {
 	rm -rf libXfont2-$PKGVERSION
-	tar xvaf libXfont2-$PKGVERSION.tar.gz
-	pushd libXfont2-$PKGVERSION
+	tar xvf libXfont2-$PKGVERSION.tar.gz
+	cd libXfont2-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -69,6 +69,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXfont2.la
 
-	popd
+	cd ..
 	rm -rf libXfont2-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxft/libxft.sh
--- a/x11/libxft/libxft.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxft/libxft.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -36,8 +36,8 @@
 build()
 {
 	rm -rf libXft-$PKGVERSION
-	tar xvaf libXft-$PKGVERSION.tar.gz
-	pushd libXft-$PKGVERSION
+	tar xvf libXft-$PKGVERSION.tar.gz
+	cd libXft-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -53,6 +53,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXft.la
 
-	popd
+	cd ..
 	rm -rf libXft-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxi/libxi.sh
--- a/x11/libxi/libxi.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxi/libxi.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -37,8 +37,8 @@
 build()
 {
 	rm -rf libXi-$PKGVERSION
-	tar xvaf libXi-$PKGVERSION.tar.gz
-	pushd libXi-$PKGVERSION
+	tar xvf libXi-$PKGVERSION.tar.gz
+	cd libXi-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -54,6 +54,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXi.la
 
-	popd
+	cd ..
 	rm -rf libXi-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxinerama/libxinerama.sh
--- a/x11/libxinerama/libxinerama.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxinerama/libxinerama.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf libXinerama-$PKGVERSION
-	tar xvaf libXinerama-$PKGVERSION.tar.gz
-	pushd libXinerama-$PKGVERSION
+	tar xvf libXinerama-$PKGVERSION.tar.gz
+	cd libXinerama-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXinerama.la
 
-	popd
+	cd ..
 	rm -rf libXinerama-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxkbfile/libxkbfile.sh
--- a/x11/libxkbfile/libxkbfile.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxkbfile/libxkbfile.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libxkbfile.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxmu/libxmu.sh
--- a/x11/libxmu/libxmu.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxmu/libxmu.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -37,8 +37,8 @@
 build()
 {
 	rm -rf libXmu-$PKGVERSION
-	tar xvaf libXmu-$PKGVERSION.tar.gz
-	pushd libXmu-$PKGVERSION
+	tar xvf libXmu-$PKGVERSION.tar.gz
+	cd libXmu-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -54,6 +54,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXmu{,u}.la
 
-	popd
+	cd ..
 	rm -rf libXmu-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxpm/libxpm.sh
--- a/x11/libxpm/libxpm.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxpm/libxpm.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -37,8 +37,8 @@
 build()
 {
 	rm -rf libXpm-$PKGVERSION
-	tar xvaf libXpm-$PKGVERSION.tar.gz
-	pushd libXpm-$PKGVERSION
+	tar xvf libXpm-$PKGVERSION.tar.gz
+	cd libXpm-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -55,6 +55,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXpm.la
 
-	popd
+	cd ..
 	rm -rf libXpm-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxpresent/libxpresent.sh
--- a/x11/libxpresent/libxpresent.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxpresent/libxpresent.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf libXpresent-$PKGVERSION
-	tar xvaf libXpresent-$PKGVERSION.tar.gz
-	pushd libXpresent-$PKGVERSION
+	tar xvf libXpresent-$PKGVERSION.tar.gz
+	cd libXpresent-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXpresent.la
 
-	popd
+	cd ..
 	rm -rf libXpresent-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxrandr/libxrandr.sh
--- a/x11/libxrandr/libxrandr.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxrandr/libxrandr.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -37,8 +37,8 @@
 build()
 {
 	rm -rf libXrandr-$PKGVERSION
-	tar xvaf libXrandr-$PKGVERSION.tar.gz
-	pushd libXrandr-$PKGVERSION
+	tar xvf libXrandr-$PKGVERSION.tar.gz
+	cd libXrandr-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -54,6 +54,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXrandr.la
 
-	popd
+	cd ..
 	rm -rf libXrandr-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxrender/libxrender.sh
--- a/x11/libxrender/libxrender.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxrender/libxrender.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf libXrender-$PKGVERSION
-	tar xvaf libXrender-$PKGVERSION.tar.gz
-	pushd libXrender-$PKGVERSION
+	tar xvf libXrender-$PKGVERSION.tar.gz
+	cd libXrender-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXrender.la
 
-	popd
+	cd ..
 	rm -rf libXrender-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxres/libxres.sh
--- a/x11/libxres/libxres.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxres/libxres.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf libXres-$PKGVERSION
-	tar xvaf libXres-$PKGVERSION.tar.gz
-	pushd libXres-$PKGVERSION
+	tar xvf libXres-$PKGVERSION.tar.gz
+	cd libXres-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXRes.la
 
-	popd
+	cd ..
 	rm -rf libXres-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxscrnsaver/libxscrnsaver.sh
--- a/x11/libxscrnsaver/libxscrnsaver.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxscrnsaver/libxscrnsaver.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -36,8 +36,8 @@
 build()
 {
 	rm -rf libXScrnSaver-$PKGVERSION
-	tar xvaf libXScrnSaver-$PKGVERSION.tar.gz
-	pushd libXScrnSaver-$PKGVERSION
+	tar xvf libXScrnSaver-$PKGVERSION.tar.gz
+	cd libXScrnSaver-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -53,6 +53,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXss.la
 
-	popd
+	cd ..
 	rm -rf libXScrnSaver-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxshmfence/libxshmfence.sh
--- a/x11/libxshmfence/libxshmfence.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxshmfence/libxshmfence.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -51,6 +51,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libxshmfence.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxt/libxt.sh
--- a/x11/libxt/libxt.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxt/libxt.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -37,8 +37,8 @@
 build()
 {
 	rm -rf libXt-$PKGVERSION
-	tar xvaf libXt-$PKGVERSION.tar.gz
-	pushd libXt-$PKGVERSION
+	tar xvf libXt-$PKGVERSION.tar.gz
+	cd libXt-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -54,6 +54,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXt.la
 
-	popd
+	cd ..
 	rm -rf libXt-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxtrap/libxtrap.sh
--- a/x11/libxtrap/libxtrap.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxtrap/libxtrap.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -37,8 +37,8 @@
 build()
 {
 	rm -rf libXTrap-$PKGVERSION
-	tar xvaf libXTrap-$PKGVERSION.tar.gz
-	pushd libXTrap-$PKGVERSION
+	tar xvf libXTrap-$PKGVERSION.tar.gz
+	cd libXTrap-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -54,6 +54,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXTrap.la
 
-	popd
+	cd ..
 	rm -rf libXTrap-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxtst/libxtst.sh
--- a/x11/libxtst/libxtst.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxtst/libxtst.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -37,8 +37,8 @@
 build()
 {
 	rm -rf libXtst-$PKGVERSION
-	tar xvaf libXtst-$PKGVERSION.tar.gz
-	pushd libXtst-$PKGVERSION
+	tar xvf libXtst-$PKGVERSION.tar.gz
+	cd libXtst-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -54,6 +54,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXtst.la
 
-	popd
+	cd ..
 	rm -rf libXtst-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxv/libxv.sh
--- a/x11/libxv/libxv.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxv/libxv.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf libXv-$PKGVERSION
-	tar xvaf libXv-$PKGVERSION.tar.gz
-	pushd libXv-$PKGVERSION
+	tar xvf libXv-$PKGVERSION.tar.gz
+	cd libXv-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXv.la
 
-	popd
+	cd ..
 	rm -rf libXv-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxvmc/libxvmc.sh
--- a/x11/libxvmc/libxvmc.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxvmc/libxvmc.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -37,8 +37,8 @@
 build()
 {
 	rm -rf libXvMC-$PKGVERSION
-	tar xvaf libXvMC-$PKGVERSION.tar.gz
-	pushd libXvMC-$PKGVERSION
+	tar xvf libXvMC-$PKGVERSION.tar.gz
+	cd libXvMC-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -54,6 +54,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXvMC{,W}.la
 
-	popd
+	cd ..
 	rm -rf libXvMC-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxxf86dga/libxxf86dga.sh
--- a/x11/libxxf86dga/libxxf86dga.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxxf86dga/libxxf86dga.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf libXxf86dga-$PKGVERSION
-	tar xvaf libXxf86dga-$PKGVERSION.tar.gz
-	pushd libXxf86dga-$PKGVERSION
+	tar xvf libXxf86dga-$PKGVERSION.tar.gz
+	cd libXxf86dga-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXxf86dga.la
 
-	popd
+	cd ..
 	rm -rf libXxf86dga-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxxf86misc/libxxf86misc.sh
--- a/x11/libxxf86misc/libxxf86misc.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxxf86misc/libxxf86misc.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf libXxf86misc-$PKGVERSION
-	tar xvaf libXxf86misc-$PKGVERSION.tar.gz
-	pushd libXxf86misc-$PKGVERSION
+	tar xvf libXxf86misc-$PKGVERSION.tar.gz
+	cd libXxf86misc-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXxf86misc.la
 
-	popd
+	cd ..
 	rm -rf libXxf86misc-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/libxxf86vm/libxxf86vm.sh
--- a/x11/libxxf86vm/libxxf86vm.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/libxxf86vm/libxxf86vm.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf libXxf86vm-$PKGVERSION
-	tar xvaf libXxf86vm-$PKGVERSION.tar.gz
-	pushd libXxf86vm-$PKGVERSION
+	tar xvf libXxf86vm-$PKGVERSION.tar.gz
+	cd libXxf86vm-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libXxf86vm.la
 
-	popd
+	cd ..
 	rm -rf libXxf86vm-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/luit/luit.sh
--- a/x11/luit/luit.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/luit/luit.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -34,8 +34,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -45,6 +45,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/makedepend/makedepend.sh
--- a/x11/makedepend/makedepend.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/makedepend/makedepend.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/mkfontscale/mkfontscale.sh
--- a/x11/mkfontscale/mkfontscale.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/mkfontscale/mkfontscale.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -46,8 +46,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -61,6 +61,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/rendercheck/rendercheck.sh
--- a/x11/rendercheck/rendercheck.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/rendercheck/rendercheck.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -36,8 +36,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/rgb/rgb.sh
--- a/x11/rgb/rgb.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/rgb/rgb.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/sessreg/sessreg.sh
--- a/x11/sessreg/sessreg.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/sessreg/sessreg.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	# https://git.alpinelinux.org/aports/plain/main/sessreg/missing_path_wtmpx.patch
 	patch -p1 < ../wtmpx.patch
@@ -50,6 +50,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/setxkbmap/setxkbmap.sh
--- a/x11/setxkbmap/setxkbmap.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/setxkbmap/setxkbmap.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/twm/twm.sh
--- a/x11/twm/twm.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/twm/twm.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -40,8 +40,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -54,6 +54,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/util-macros/util-macros.sh
--- a/x11/util-macros/util-macros.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/util-macros/util-macros.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -46,6 +46,6 @@
 	make
 	make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/x11perf/x11perf.sh
--- a/x11/x11perf/x11perf.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/x11perf/x11perf.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -39,8 +39,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -53,6 +53,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xauth/xauth.sh
--- a/x11/xauth/xauth.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xauth/xauth.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -38,8 +38,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -52,6 +52,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xbacklight/xbacklight.sh
--- a/x11/xbacklight/xbacklight.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xbacklight/xbacklight.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xbitmaps/xbitmaps.sh
--- a/x11/xbitmaps/xbitmaps.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xbitmaps/xbitmaps.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make
 	make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xcalc/xcalc.sh
--- a/x11/xcalc/xcalc.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xcalc/xcalc.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -37,8 +37,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -51,6 +51,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xcb-proto/xcb-proto.sh
--- a/x11/xcb-proto/xcb-proto.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xcb-proto/xcb-proto.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -26,13 +26,13 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	./configure --prefix=
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xcb-util-cursor/xcb-util-cursor.sh
--- a/x11/xcb-util-cursor/xcb-util-cursor.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xcb-util-cursor/xcb-util-cursor.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libxcb-cursor.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xcb-util-image/xcb-util-image.sh
--- a/x11/xcb-util-image/xcb-util-image.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xcb-util-image/xcb-util-image.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libxcb-image.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xcb-util-keysyms/xcb-util-keysyms.sh
--- a/x11/xcb-util-keysyms/xcb-util-keysyms.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xcb-util-keysyms/xcb-util-keysyms.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libxcb-keysyms.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xcb-util-renderutil/xcb-util-renderutil.sh
--- a/x11/xcb-util-renderutil/xcb-util-renderutil.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xcb-util-renderutil/xcb-util-renderutil.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libxcb-render-util.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xcb-util-wm/xcb-util-wm.sh
--- a/x11/xcb-util-wm/xcb-util-wm.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xcb-util-wm/xcb-util-wm.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libxcb-{ewmh,icccm}.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xcb-util/xcb-util.sh
--- a/x11/xcb-util/xcb-util.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xcb-util/xcb-util.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -32,8 +32,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -49,6 +49,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/libxcb-util.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xclock/xclock.sh
--- a/x11/xclock/xclock.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xclock/xclock.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -46,8 +46,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -61,6 +61,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xcompmgr/xcompmgr.sh
--- a/x11/xcompmgr/xcompmgr.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xcompmgr/xcompmgr.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -39,8 +39,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -53,6 +53,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xcursorgen/xcursorgen.sh
--- a/x11/xcursorgen/xcursorgen.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xcursorgen/xcursorgen.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -37,8 +37,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -51,6 +51,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xdm/xdm.sh
--- a/x11/xdm/xdm.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xdm/xdm.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -57,8 +57,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -75,6 +75,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/X11/xdm/libXdmGreet.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xdpyinfo/xdpyinfo.sh
--- a/x11/xdpyinfo/xdpyinfo.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xdpyinfo/xdpyinfo.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -45,8 +45,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -59,6 +59,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xdriinfo/xdriinfo.sh
--- a/x11/xdriinfo/xdriinfo.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xdriinfo/xdriinfo.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xev/xev.sh
--- a/x11/xev/xev.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xev/xev.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -36,8 +36,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xf86-input-evdev/xf86-input-evdev.sh
--- a/x11/xf86-input-evdev/xf86-input-evdev.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xf86-input-evdev/xf86-input-evdev.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -38,8 +38,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -53,6 +53,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/xorg/modules/input/evdev_drv.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xf86-input-keyboard/xf86-input-keyboard.sh
--- a/x11/xf86-input-keyboard/xf86-input-keyboard.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xf86-input-keyboard/xf86-input-keyboard.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -48,6 +48,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/xorg/modules/input/kbd_drv.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xf86-input-libinput/xf86-input-libinput.sh
--- a/x11/xf86-input-libinput/xf86-input-libinput.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xf86-input-libinput/xf86-input-libinput.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -36,8 +36,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -51,6 +51,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/xorg/modules/input/libinput_drv.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xf86-input-mouse/xf86-input-mouse.sh
--- a/x11/xf86-input-mouse/xf86-input-mouse.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xf86-input-mouse/xf86-input-mouse.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -48,6 +48,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/xorg/modules/input/mouse_drv.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xf86-video-vesa/xf86-video-vesa.sh
--- a/x11/xf86-video-vesa/xf86-video-vesa.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xf86-video-vesa/xf86-video-vesa.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -48,6 +48,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/xorg/modules/drivers/vesa_drv.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xfontsel/xfontsel.sh
--- a/x11/xfontsel/xfontsel.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xfontsel/xfontsel.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -38,8 +38,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -52,6 +52,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xgamma/xgamma.sh
--- a/x11/xgamma/xgamma.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xgamma/xgamma.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -36,8 +36,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -50,6 +50,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xhost/xhost.sh
--- a/x11/xhost/xhost.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xhost/xhost.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -38,8 +38,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -52,6 +52,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xinit/xinit.sh
--- a/x11/xinit/xinit.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xinit/xinit.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xinput/xinput.sh
--- a/x11/xinput/xinput.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xinput/xinput.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -39,8 +39,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -53,6 +53,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xkbcomp/xkbcomp.sh
--- a/x11/xkbcomp/xkbcomp.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xkbcomp/xkbcomp.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -37,8 +37,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -51,6 +51,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xkeyboard-config/xkeyboard-config.sh
--- a/x11/xkeyboard-config/xkeyboard-config.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xkeyboard-config/xkeyboard-config.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -42,8 +42,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -57,6 +57,6 @@
 	make
 	make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xkill/xkill.sh
--- a/x11/xkill/xkill.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xkill/xkill.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xlsfonts/xlsfonts.sh
--- a/x11/xlsfonts/xlsfonts.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xlsfonts/xlsfonts.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xmag/xmag.sh
--- a/x11/xmag/xmag.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xmag/xmag.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -38,8 +38,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -52,6 +52,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xmodmap/xmodmap.sh
--- a/x11/xmodmap/xmodmap.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xmodmap/xmodmap.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xorg-server/xorg-server.sh
--- a/x11/xorg-server/xorg-server.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xorg-server/xorg-server.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -58,8 +58,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -82,6 +82,6 @@
 	rm -f $DESTDIR/lib/xorg/modules/extensions/*.la
 	rm -f $DESTDIR/lib/xorg/modules/*.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xorgproto/xorgproto.sh
--- a/x11/xorgproto/xorgproto.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xorgproto/xorgproto.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -48,6 +48,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xprop/xprop.sh
--- a/x11/xprop/xprop.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xprop/xprop.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xrandr/xrandr.sh
--- a/x11/xrandr/xrandr.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xrandr/xrandr.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -37,8 +37,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -51,6 +51,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xrdb/xrdb.sh
--- a/x11/xrdb/xrdb.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xrdb/xrdb.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xset/xset.sh
--- a/x11/xset/xset.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xset/xset.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -37,8 +37,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	# --without-fontcache => libXfontcache is outdated.
 	CC="$CC" \
@@ -53,6 +53,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xsetroot/xsetroot.sh
--- a/x11/xsetroot/xsetroot.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xsetroot/xsetroot.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -38,8 +38,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -52,6 +52,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xtrans/xtrans.sh
--- a/x11/xtrans/xtrans.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xtrans/xtrans.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make
 	make install pkgconfigdir=/lib/pkgconfig DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xvinfo/xvinfo.sh
--- a/x11/xvinfo/xvinfo.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xvinfo/xvinfo.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 x11/xwininfo/xwininfo.sh
--- a/x11/xwininfo/xwininfo.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/x11/xwininfo/xwininfo.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.gz
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -47,6 +47,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 xfce/exo/exo.sh
--- a/xfce/exo/exo.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/xfce/exo/exo.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -38,8 +38,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -54,6 +54,6 @@
 	make install DESTDIR=$DESTDIR itlocaledir=/share/locale
 	rm -f $DESTDIR/lib/libexo-1.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 xfce/garcon/garcon.sh
--- a/xfce/garcon/garcon.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/xfce/garcon/garcon.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -49,6 +49,6 @@
 	rm -f $DESTDIR/lib/libgarcon-gtk2-1.la
 	rm -f $DESTDIR/lib/libgarcon-1.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 xfce/gtk-xfce-engine/gtk-xfce-engine.sh
--- a/xfce/gtk-xfce-engine/gtk-xfce-engine.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/xfce/gtk-xfce-engine/gtk-xfce-engine.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -33,8 +33,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -48,6 +48,6 @@
 	make install DESTDIR=$DESTDIR
 	rm -f $DESTDIR/lib/gtk-2.0/2.10.0/engines/libxfce.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 xfce/libxfce4ui/libxfce4ui.sh
--- a/xfce/libxfce4ui/libxfce4ui.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/xfce/libxfce4ui/libxfce4ui.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -39,8 +39,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -59,6 +59,6 @@
 	rm -f $DESTDIR/lib/libxfce4ui-1.la
 	rm -f $DESTDIR/lib/libxfce4ui-2.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 xfce/libxfce4util/libxfce4util.sh
--- a/xfce/libxfce4util/libxfce4util.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/xfce/libxfce4util/libxfce4util.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -34,8 +34,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -51,6 +51,6 @@
 	make install DESTDIR=$DESTDIR itlocaledir=/share/locale
 	rm -f $DESTDIR/lib/libxfce4util.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 xfce/xfce4-panel/xfce4-panel.sh
--- a/xfce/xfce4-panel/xfce4-panel.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/xfce/xfce4-panel/xfce4-panel.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -43,8 +43,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -62,6 +62,6 @@
 	rm -f $DESTDIR/lib/libxfce4panel-*.la
 	rm -f $DESTDIR/lib/xfce4/panel/plugins/*.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 xfce/xfce4-session/xfce4-session.sh
--- a/xfce/xfce4-session/xfce4-session.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/xfce/xfce4-session/xfce4-session.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -59,8 +59,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -78,6 +78,6 @@
 	rm -f $DESTDIR/lib/xfce4/session/splash-engines/*.la
 
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 xfce/xfce4-settings/xfce4-settings.sh
--- a/xfce/xfce4-settings/xfce4-settings.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/xfce/xfce4-settings/xfce4-settings.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -47,8 +47,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -63,6 +63,6 @@
 	make
 	make install DESTDIR=$DESTDIR itlocaledir=/share/locale
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 xfce/xfconf/xfconf.sh
--- a/xfce/xfconf/xfconf.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/xfce/xfconf/xfconf.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -36,8 +36,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -53,6 +53,6 @@
 	make install DESTDIR=$DESTDIR itlocaledir=/share/locale
 	rm -f $DESTDIR/lib/libxfconf-0.la
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 xfce/xfdesktop/xfdesktop.sh
--- a/xfce/xfdesktop/xfdesktop.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/xfce/xfdesktop/xfdesktop.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -41,8 +41,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -57,6 +57,6 @@
 	make
 	make install DESTDIR=$DESTDIR
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }
diff -r 860ab66f5f71 -r 25cecc6dca48 xfce/xfwm4/xfwm4.sh
--- a/xfce/xfwm4/xfwm4.sh	Mon Jul 15 20:10:00 2019 +0200
+++ b/xfce/xfwm4/xfwm4.sh	Thu Jul 18 07:26:43 2019 +0200
@@ -47,8 +47,8 @@
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
-	pushd $PKGNAME-$PKGVERSION
+	tar xvf $PKGNAME-$PKGVERSION.tar.bz2
+	cd $PKGNAME-$PKGVERSION
 
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
@@ -61,6 +61,6 @@
 	make
 	make install DESTDIR=$DESTDIR itlocaledir=/share/locale
 
-	popd
+	cd ..
 	rm -rf $PKGNAME-$PKGVERSION
 }