7 files changed, 12 insertions, 36 deletions
diff --git a/user/autoconf2.13/APKBUILD b/user/autoconf2.13/APKBUILD
index bd5b533a9..29222ea87 100644
--- a/user/autoconf2.13/APKBUILD
+++ b/user/autoconf2.13/APKBUILD
@@ -3,35 +3,33 @@ pkgname=autoconf2.13
 pkgver=2.13
 pkgrel=2
 pkgdesc="A GNU tool for automatically configuring source code"
+url="https://www.gnu.org/software/autoconf"
 arch="noarch"
 license="GPL-2.0"
-url="https://www.gnu.org/software/autoconf"
 depends="m4 perl"
 checkdepends="dejagnu flex gfortran"
-source="ftp://ftp.gnu.org/pub/gnu/autoconf/autoconf-${pkgver}.tar.gz
+makedepends=""
+subpackages="$pkgname-doc"
+source="https://ftp.gnu.org/pub/gnu/autoconf/autoconf-${pkgver}.tar.gz
 	getloadavg.patch
 	"
-subpackages="$pkgname-doc"
-
 builddir="$srcdir"/autoconf-$pkgver
+
 prepare() {
 	default_prepare
 	update_config_sub  # Required for AC_F77_LIBRARY_LDFLAGS
 }
 
 build() {
-	cd "$builddir"
 	M4=/usr/bin/m4 ./configure --prefix=/usr --program-suffix=-2.13
 	make
 }
 
 check() {
-	cd "$builddir"
 	F77=gfortran make check
 }
 
 package() {
-	cd "$builddir"
 	make prefix="$pkgdir/usr" infodir="$pkgdir/usr/share/info" install
 
 	rm -f "$pkgdir"/usr/share/info/dir
diff --git a/user/hunspell/APKBUILD b/user/hunspell/APKBUILD
index 6222d58a5..79da8d619 100644
--- a/user/hunspell/APKBUILD
+++ b/user/hunspell/APKBUILD
@@ -6,18 +6,17 @@ pkgdesc="Spell checker and morphological analyzer library and program"
 url="https://hunspell.github.io/"
 arch="all"
 license="GPL-2.0+ AND LGPL-2.0+ AND MPL-1.1"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
+depends=""
 makedepends="ncurses-dev autoconf automake libtool"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="$pkgname-$pkgver.tar.gz::https://github.com/hunspell/hunspell/archive/v$pkgver.tar.gz"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	autoreconf -vif
 }
 
 build() {
-	cd "$builddir"
 	LIBS="-ltinfo" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,12 +28,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libdbusmenu-qt/APKBUILD b/user/libdbusmenu-qt/APKBUILD
index b91995d28..a6ed9a0ac 100644
--- a/user/libdbusmenu-qt/APKBUILD
+++ b/user/libdbusmenu-qt/APKBUILD
@@ -17,25 +17,17 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="https://launchpad.net/ubuntu/+archive/primary/+files/${pkgname}_${_realver}.orig.tar.gz"
 builddir="$srcdir/$pkgname-$_realver"
 
-prepare() {
-	cd "$builddir"
-	default_prepare
-	mkdir -p "$builddir"/build
-}
-
 build() {
-	cd "$builddir"/build
 	cmake -DCMAKE_INSTALL_PREFIX=/usr \
 	      -DCMAKE_INSTALL_LIBDIR=lib \
 	      -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 	      -DUSE_QT5=ON \
-	      "$builddir"
-	make
+	      -Bbuild
+	make -C build
 }
 
 package() {
-	cd "$builddir"/build
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" -C build install
 }
 
 sha512sums="dfaba59cedd320e6a3b5a9c0a5e13fb9e0952224e39cdd6ee3b32b03d95ac850a533e2a73835a7c0ead93b2283b9c235472bacb84e3d761ebe9e9398345314a9  libdbusmenu-qt_0.9.3+16.04.20160218.orig.tar.gz"
diff --git a/user/libdmtx/APKBUILD b/user/libdmtx/APKBUILD
index ce8e9f442..1075dca3f 100644
--- a/user/libdmtx/APKBUILD
+++ b/user/libdmtx/APKBUILD
@@ -8,18 +8,16 @@ url="http://libdmtx.sourceforge.net/"
 arch="all"
 license="BSD-2-Clause"
 depends=""
-makedepends=""
+makedepends="autoconf automake libtool"
 subpackages="$pkgname-dev $pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/dmtx/$pkgname/archive/v$pkgver.tar.gz"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	./autogen.sh
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,13 +30,11 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make CFLAGS="-std=c99" check
 	test/simple_test/simple_test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libqrencode/APKBUILD b/user/libqrencode/APKBUILD
index 12690b8d7..efd3a54df 100644
--- a/user/libqrencode/APKBUILD
+++ b/user/libqrencode/APKBUILD
@@ -8,19 +8,18 @@ url="https://fukuchi.org/works/qrencode/index.html"
 arch="all"
 options="!check"  # No test suite.
 license="LGPL-2.1+"
+depends=""
 makedepends="libpng-dev libtool"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://fukuchi.org/works/qrencode/qrencode-$pkgver.tar.bz2"
 builddir="$srcdir/qrencode-$pkgver"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -33,7 +32,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libutempter/APKBUILD b/user/libutempter/APKBUILD
index 3e8a0601e..847c0be49 100644
--- a/user/libutempter/APKBUILD
+++ b/user/libutempter/APKBUILD
@@ -16,12 +16,10 @@ source="ftp://ftp.altlinux.org/pub/people/ldv/utempter/$pkgname-$pkgver.tar.bz2
 	"
 
 build() {
-	cd "$builddir"
 	make LDLIBS="-lutmps -lskarnet"
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	# we need to be setuid, not setgid
 	chmod 4711 "$pkgdir"/usr/lib/utempter/utempter
diff --git a/user/libxscrnsaver/APKBUILD b/user/libxscrnsaver/APKBUILD
index f793c67d5..2bdfb8a3d 100644
--- a/user/libxscrnsaver/APKBUILD
+++ b/user/libxscrnsaver/APKBUILD
@@ -14,7 +14,6 @@ source="https://www.X.Org/releases/individual/lib/libXScrnSaver-$pkgver.tar.bz2"
 builddir="$srcdir"/libXScrnSaver-$pkgver
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -28,12 +27,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }