5 files changed, 7 insertions, 24 deletions
diff --git a/user/gperf/APKBUILD b/user/gperf/APKBUILD
index b11af06da..84297a740 100644
--- a/user/gperf/APKBUILD
+++ b/user/gperf/APKBUILD
@@ -12,9 +12,7 @@ depends=""
 makedepends=""
 source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
 
-build ()
-{
-	cd "$builddir"
+build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -23,12 +21,11 @@ build ()
 }
 
 check() {
-	cd "$builddir"
 	make -j1 check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
+
 sha512sums="855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4  gperf-3.1.tar.gz"
diff --git a/user/ninja/APKBUILD b/user/ninja/APKBUILD
index e0638a176..2b82aef51 100644
--- a/user/ninja/APKBUILD
+++ b/user/ninja/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Small build system with a focus on speed"
 url="https://ninja-build.org/"
 arch="all"
 license="Apache-2.0"
+depends=""
 makedepends="asciidoctor gtest python3 re2c"
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/martine/ninja/archive/v$pkgver.tar.gz
@@ -14,20 +15,16 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/martine/ninja/archive/v$pkgv
 	"
 
 build() {
-	cd "$builddir"
 	python3 ./configure.py --bootstrap
 	asciidoctor doc/manual.asciidoc
 }
 
 check() {
-	cd "$builddir"
-
 	./ninja ninja_test
 	./ninja_test --gtest_filter=-SubprocessTest.SetWithLots
 }
 
 package() {
-	cd "$builddir"
 	install -m755 -D ninja "$pkgdir/usr/bin/ninja"
 	install -m644 -D doc/manual.asciidoc \
 		"$pkgdir/usr/share/doc/ninja/manual.asciidoc"
diff --git a/user/xcb-util-image/APKBUILD b/user/xcb-util-image/APKBUILD
index cd4ffccb2..947b9a0f0 100644
--- a/user/xcb-util-image/APKBUILD
+++ b/user/xcb-util-image/APKBUILD
@@ -9,15 +9,12 @@ arch="all"
 license="MIT"
 depends=""
 depends_dev="xcb-util-dev"
-makedepends="$depends_dev m4 util-macros"
 checkdepends="check-dev"
-replaces="xcb-util"
+makedepends="$depends_dev m4 util-macros"
 subpackages="$pkgname-dev"
 source="https://xcb.freedesktop.org/dist/xcb-util-image-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
-	export CFLAGS="$CFLAGS -std=gnu99"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,12 +27,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xcb-util-renderutil/APKBUILD b/user/xcb-util-renderutil/APKBUILD
index 07bafe5ba..b75ab9e8f 100644
--- a/user/xcb-util-renderutil/APKBUILD
+++ b/user/xcb-util-renderutil/APKBUILD
@@ -9,14 +9,12 @@ arch="all"
 license="MIT"
 depends=""
 depends_dev="xcb-util-dev"
-makedepends="$depends_dev m4 util-macros"
 checkdepends="check-dev"
-replaces="xcb-util"
+makedepends="$depends_dev m4 util-macros"
 subpackages="$pkgname-dev"
 source="https://xcb.freedesktop.org/dist/xcb-util-renderutil-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,12 +27,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xcb-util/APKBUILD b/user/xcb-util/APKBUILD
index 90b9053bf..cb0f0046e 100644
--- a/user/xcb-util/APKBUILD
+++ b/user/xcb-util/APKBUILD
@@ -6,14 +6,14 @@ pkgdesc="Utility libraries for X C-language Binding"
 url="https://xcb.freedesktop.org/"
 arch="all"
 license="X11"
+depends=""
 depends_dev="libxcb-dev util-macros"
-makedepends="$depends_dev m4 gperf"
 checkdepends="check-dev"
+makedepends="$depends_dev m4 gperf"
 subpackages="$pkgname-dev"
 source="https://xcb.freedesktop.org/dist/$pkgname-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -23,12 +23,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }