user/*: Modernise / fix syntax / metadata / deps

32 files changed, 37 insertions, 86 deletions

diff --git a/user/audacious-plugins/APKBUILD b/user/audacious-plugins/APKBUILD
index bd65db3b5..6a53e2d56 100644
--- a/user/audacious-plugins/APKBUILD
+++ b/user/audacious-plugins/APKBUILD
@@ -10,14 +10,14 @@ arch="all"
 options="!check"  # No test suite
 license="ISC"
 depends="audacious"
-install_if="audacious=$pkgver"
-makedepends="audacious-dev>=${pkgver%.*}
+makedepends="audacious-dev>=${pkgver%.*} autoconf automake
 	alsa-lib-dev curl-dev dbus-glib-dev faad2-dev ffmpeg-dev flac-dev
 	fluidsynth-dev lame-dev libcddb-dev libcdio-dev libcdio-paranoia-dev
 	libcue-dev libguess-dev libmodplug-dev libmms-dev libmowgli-dev
 	libnotify-dev libogg-dev libsamplerate-dev libsndfile-dev libvorbis-dev
 	libxcomposite-dev libxml2-dev mpg123-dev neon-dev pulseaudio-dev
 	qt5-qtmultimedia-dev sdl-dev wavpack-dev"
+install_if="audacious=$pkgver"
 subpackages="$pkgname-lang"
 source="https://distfiles.audacious-media-player.org/$pkgname-$pkgver.tar.bz2"
 
diff --git a/user/cantarell-fonts/APKBUILD b/user/cantarell-fonts/APKBUILD
index b5fec057f..16b5ef3f6 100644
--- a/user/cantarell-fonts/APKBUILD
+++ b/user/cantarell-fonts/APKBUILD
@@ -15,8 +15,7 @@ replaces="ttf-cantarell"
 source="https://download.gnome.org/sources/cantarell-fonts/$pkgver/cantarell-fonts-$pkgver.tar.xz"
 
 package() {
-	cd "$builddir"/prebuilt
-	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf
+	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$builddir"/prebuilt/*.otf
 }
 
 sha512sums="638298a6381a3ede862d1b100fcfea943bebb5e1c0dc4f1597ab2f841e933b484436b139090a669c770c02483a24f2b92bbd12bce71d7a40eb4c325573e3df9e  cantarell-fonts-0.111.tar.xz"
diff --git a/user/cbindgen/APKBUILD b/user/cbindgen/APKBUILD
index 65f609111..2a735e5ce 100644
--- a/user/cbindgen/APKBUILD
+++ b/user/cbindgen/APKBUILD
@@ -9,6 +9,7 @@ pkgdesc="Tool to generate C bindings from Rust code"
 url="https://github.com/eqrion/cbindgen"
 arch="all"
 license="MPL-2.0"
+depends=""
 makedepends="cargo"
 source=""
 
diff --git a/user/erl-rebar/APKBUILD b/user/erl-rebar/APKBUILD
index c4fe28bb2..5fdc774fd 100644
--- a/user/erl-rebar/APKBUILD
+++ b/user/erl-rebar/APKBUILD
@@ -6,8 +6,8 @@ pkgrel=0
 pkgdesc="Legacy Erlang build tool"
 url="https://github.com/rebar/rebar"
 arch="noarch"
-license="Apache-2"
 options="!tracedeps"
+license="Apache-2.0"
 depends="erlang"
 makedepends="erlang-dev"
 source="$pkgname-$pkgver.tar.gz::https://codeload.github.com/rebar/rebar/tar.gz/$pkgver"
diff --git a/user/erl-rebar3/APKBUILD b/user/erl-rebar3/APKBUILD
index a37633ae8..87ae5f2a5 100644
--- a/user/erl-rebar3/APKBUILD
+++ b/user/erl-rebar3/APKBUILD
@@ -6,8 +6,8 @@ pkgrel=0
 pkgdesc="Erlang build tool"
 url="http://www.rebar3.org/"
 arch="noarch"
-license="Apache-2"
 options="!tracedeps"
+license="Apache-2.0"
 depends="erlang"
 makedepends="erlang-dev"
 subpackages="$pkgname-doc"
diff --git a/user/farstream/APKBUILD b/user/farstream/APKBUILD
index f0d45c176..c5a6f422e 100644
--- a/user/farstream/APKBUILD
+++ b/user/farstream/APKBUILD
@@ -16,7 +16,6 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="https://freedesktop.org/software/farstream/releases/farstream/farstream-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,12 +28,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/gleam/APKBUILD b/user/gleam/APKBUILD
index b9cdc482a..2bf4dfdfb 100644
--- a/user/gleam/APKBUILD
+++ b/user/gleam/APKBUILD
@@ -8,7 +8,7 @@ url="https://gleam.run"
 arch="all"
 license="Apache-2.0"
 depends="erl-rebar3"
-makedepends="cargo erlang-dev"
+makedepends="cargo erlang-dev rust"
 source="$pkgname-$pkgver.tar.gz::https://github.com/gleam-lang/gleam/archive/v$pkgver.tar.gz"
 
 # dependencies taken from Cargo.lock
diff --git a/user/java-common/APKBUILD b/user/java-common/APKBUILD
index da94e271c..f285c9960 100644
--- a/user/java-common/APKBUILD
+++ b/user/java-common/APKBUILD
@@ -10,8 +10,8 @@ license="Public-Domain"
 depends="nss"  # for TLS, needed by all OpenJDKs.
 makedepends=""
 subpackages=""
-source="java.profd"
 triggers="java-common.trigger=/usr/lib/jvm"
+source="java.profd"
 
 package() {
 	mkdir -p "$pkgdir"/usr/bin
diff --git a/user/jomolhari/APKBUILD b/user/jomolhari/APKBUILD
index 566e5db55..2ddb69497 100644
--- a/user/jomolhari/APKBUILD
+++ b/user/jomolhari/APKBUILD
@@ -12,11 +12,9 @@ depends="fontconfig"
 makedepends=""
 subpackages=""
 source="https://collab.its.virginia.edu/access/content/group/26a34146-33a6-48ce-001e-f16ce7908a6a/Tibetan%20fonts/Tibetan%20Unicode%20Fonts/Jomolhari-alpha003.zip"
-builddir="$srcdir"
 
 package() {
-	cd "$builddir"
-	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf
+	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$srcdir"/*.ttf
 }
 
 sha512sums="d3dd179c84c5cfb5cdc4a82ea1356b594973ef056cbc8fa4e23e37f21573b138eded19ef7370803dbe796e80a0d2c72a0866eb9f36e4b511627c770a00e08270  Jomolhari-alpha003.zip"
diff --git a/user/jpegoptim/APKBUILD b/user/jpegoptim/APKBUILD
index d86c9c7f8..1556f8552 100644
--- a/user/jpegoptim/APKBUILD
+++ b/user/jpegoptim/APKBUILD
@@ -14,13 +14,11 @@ subpackages="$pkgname-doc"
 source="https://www.kokkonen.net/tjko/src/jpegoptim-$pkgver.tar.gz"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,7 +30,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/khmeros-fonts/APKBUILD b/user/khmeros-fonts/APKBUILD
index 4eca9227a..2b2b992aa 100644
--- a/user/khmeros-fonts/APKBUILD
+++ b/user/khmeros-fonts/APKBUILD
@@ -15,8 +15,7 @@ source="https://downloads.sourceforge.net/khmer/All_KhmerOS_$pkgver.zip"
 builddir="$srcdir/All_KhmerOS_$pkgver"
 
 package() {
-	cd "$builddir"
-	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf
+	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/*.ttf
 }
 
 sha512sums="5fded88a9149d0fd59a377f08d9e1ea63ecffede58cde42e28504a48b12b35dec699b1ea0e0bbb95465c281d5b19ddfbe808a3c4ef40cd46295aaa069bd9127f  All_KhmerOS_5.0.zip"
diff --git a/user/lesscpy/APKBUILD b/user/lesscpy/APKBUILD
index dba0fced1..00f5933d5 100644
--- a/user/lesscpy/APKBUILD
+++ b/user/lesscpy/APKBUILD
@@ -13,17 +13,14 @@ subpackages=""
 source="lesscpy-$pkgver.tar.gz::https://github.com/lesscpy/lesscpy/archive/$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	python3 setup.py build
 }
 
 check() {
-	cd "$builddir"
 	python3 setup.py check
 }
 
 package() {
-	cd "$builddir"
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
diff --git a/user/libe-book/APKBUILD b/user/libe-book/APKBUILD
index ee7097969..e1d509302 100644
--- a/user/libe-book/APKBUILD
+++ b/user/libe-book/APKBUILD
@@ -7,11 +7,13 @@ pkgdesc="Import filter and tools for various ebook formats"
 url="https://sourceforge.net/projects/libebook/"
 arch="all"
 license="MPL-2.0"
-depends_dev="boost-dev librevenge-dev liblangtag-dev"
-makedepends="$depends_dev icu-dev libxml2-dev zlib-dev doxygen gperf"
+depends=""
+depends_dev="boost-dev"
 checkdepends="cppunit-dev"
+makedepends="$depends_dev icu-dev liblangtag-dev librevenge-dev libxml2-dev
+	zlib-dev doxygen gperf"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
-source="http://downloads.sourceforge.net/project/libebook/libe-book-$pkgver/libe-book-$pkgver.tar.bz2"
+source="https://downloads.sourceforge.net/project/libebook/libe-book-$pkgver/libe-book-$pkgver.tar.bz2"
 
 prepare() {
 	default_prepare
@@ -19,7 +21,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -33,12 +34,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libepubgen/APKBUILD b/user/libepubgen/APKBUILD
index c8ac0d749..94ddc961a 100644
--- a/user/libepubgen/APKBUILD
+++ b/user/libepubgen/APKBUILD
@@ -8,13 +8,12 @@ url="https://sourceforge.net/projects/libepubgen/"
 arch="all"
 license="MPL-2.0"
 depends=""
-makedepends="librevenge-dev libxml2-dev doxygen"
 checkdepends="cppunit-dev"
+makedepends="librevenge-dev libxml2-dev doxygen"
 subpackages="$pkgname-dev $pkgname-doc"
 source="https://download.sourceforge.net/project/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libexttextcat/APKBUILD b/user/libexttextcat/APKBUILD
index 48fb2df18..e5fa3061e 100644
--- a/user/libexttextcat/APKBUILD
+++ b/user/libexttextcat/APKBUILD
@@ -8,13 +8,12 @@ url="https://wiki.documentfoundation.org/Libexttextcat"
 arch="all"
 license="BSD-3-Clause"
 depends=""
-makedepends=""
 checkdepends="bash"
+makedepends=""
 subpackages="$pkgname-dev"
 source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
 
 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
 }
 
diff --git a/user/libglade/APKBUILD b/user/libglade/APKBUILD
index 584e9d9c3..9b09c9104 100644
--- a/user/libglade/APKBUILD
+++ b/user/libglade/APKBUILD
@@ -13,13 +13,11 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="https://download.gnome.org/sources/libglade/${pkgver%.*}/libglade-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$builddir"
-	update_config_sub
 	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libmpd/APKBUILD b/user/libmpd/APKBUILD
index 9e1aedb1f..c1fa255fd 100644
--- a/user/libmpd/APKBUILD
+++ b/user/libmpd/APKBUILD
@@ -7,18 +7,17 @@ pkgdesc="GObject-based client library for the music player daemon"
 url="https://gmpclient.org/"
 arch="all"
 license="GPL-2.0+ AND BSD-3-Clause"
+depends=""
 makedepends="glib-dev"
 subpackages="$pkgname-dev"
 source="http://download.sarine.nl/Programs/gmpc/11.8/libmpd-$pkgver.tar.gz"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,12 +29,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libmspub/APKBUILD b/user/libmspub/APKBUILD
index 746c1a84e..0d528f945 100644
--- a/user/libmspub/APKBUILD
+++ b/user/libmspub/APKBUILD
@@ -8,13 +8,13 @@ url="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
 arch="all"
 options="!check"  # No test suite.
 license="MPL-2.0 AND (MPL-1.1 OR GPL-2.0+ OR LGPL-2.0+)"
-depends_dev="boost-dev librevenge-dev"
-makedepends="$depends_dev icu-dev doxygen"
+depends=""
+depends_dev="boost-dev"
+makedepends="$depends_dev doxygen icu-dev librevenge-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
 source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,7 +27,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libmwaw/APKBUILD b/user/libmwaw/APKBUILD
index 98bef424d..b3699997f 100644
--- a/user/libmwaw/APKBUILD
+++ b/user/libmwaw/APKBUILD
@@ -12,7 +12,7 @@ depends=""
 depends_dev="boost-dev attr-dev zlib-dev"
 makedepends="$depends_dev librevenge-dev doxygen"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
-source="http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"
+source="https://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"
 
 build() {
 	./configure \
diff --git a/user/libnumbertext/APKBUILD b/user/libnumbertext/APKBUILD
index 38bbb096c..9d1302bc6 100644
--- a/user/libnumbertext/APKBUILD
+++ b/user/libnumbertext/APKBUILD
@@ -27,9 +27,7 @@ build() {
 
 package() {
 	make DESTDIR="$pkgdir" install
-
-	cd data
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" -C data install
 }
 
 sha512sums="4d61464f26f631d272ef7285fbb931d3931b08240b58166b7e9a28c95ff5a537ca04af4c9673541b73997339d66061858c9cd18873b4c16f9ad2ccd1b68e81a3  libnumbertext-1.0.5.tar.xz"
diff --git a/user/libopenraw/APKBUILD b/user/libopenraw/APKBUILD
index 2e701fc57..a03e7c089 100644
--- a/user/libopenraw/APKBUILD
+++ b/user/libopenraw/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Library for decoding RAW camera image formats"
 url="https://libopenraw.freedesktop.org/"
 arch="all"
 license="LGPL-2.1+ AND LGPL-3.0+ AND GPL-2.0+"
+depends=""
 makedepends="boost-dev libjpeg-turbo-dev libxml2-dev glib-dev gdk-pixbuf-dev"
 subpackages="$pkgname-dev"
 source="https://libopenraw.freedesktop.org/download/libopenraw-$pkgver.tar.bz2"
diff --git a/user/libotr/APKBUILD b/user/libotr/APKBUILD
index 98c18ffff..513c9f47a 100644
--- a/user/libotr/APKBUILD
+++ b/user/libotr/APKBUILD
@@ -21,7 +21,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -33,12 +32,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libpagemaker/APKBUILD b/user/libpagemaker/APKBUILD
index d6194da5d..eab913f3c 100644
--- a/user/libpagemaker/APKBUILD
+++ b/user/libpagemaker/APKBUILD
@@ -9,13 +9,11 @@ arch="all"
 options="!check"  # No test suite.
 license="MPL-2.0"
 depends=""
-depends_dev="librevenge-dev"
-makedepends="$depends_dev boost-dev doxygen"
+makedepends="boost-dev doxygen librevenge-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
 source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,7 +27,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libpcap/APKBUILD b/user/libpcap/APKBUILD
index 714e098f2..17df8ba0f 100644
--- a/user/libpcap/APKBUILD
+++ b/user/libpcap/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
 pkgdesc="System-independent interface for user-level packet capture"
 url="http://www.tcpdump.org/"
 arch="all"
-options="!check"
+options="!check"  # No test suite.
 license="BSD-3-Clause"
 depends=""
 makedepends="autoconf bison bluez-dev flex linux-headers"
diff --git a/user/libpfm/APKBUILD b/user/libpfm/APKBUILD
index c30624312..9cfe4b7aa 100644
--- a/user/libpfm/APKBUILD
+++ b/user/libpfm/APKBUILD
@@ -14,12 +14,10 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="https://downloads.sourceforge.net/perfmon2/libpfm4/libpfm-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	CFLAGS="$CFLAGS -Wno-error=cpp" make
 }
 
 package() {
-	cd "$builddir"
 	make PREFIX="/usr" DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libquotient/APKBUILD b/user/libquotient/APKBUILD
index b954f5c95..003f53e3f 100644
--- a/user/libquotient/APKBUILD
+++ b/user/libquotient/APKBUILD
@@ -25,7 +25,7 @@ build() {
 		-DBUILD_SHARED_LIBS=True \
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
diff --git a/user/libqxp/APKBUILD b/user/libqxp/APKBUILD
index 89f03aa6f..7876ab2c9 100644
--- a/user/libqxp/APKBUILD
+++ b/user/libqxp/APKBUILD
@@ -8,8 +8,8 @@ url="https://wiki.documentfoundation.org/DLP/Libraries/libqxp"
 arch="all"
 license="MPL-2.0"
 depends=""
-makedepends="librevenge-dev icu-dev doxygen"
 checkdepends="cppunit-dev"
+makedepends="librevenge-dev icu-dev doxygen"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
 source="https://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
 
@@ -23,9 +23,7 @@ build() {
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
 	make
-
-	cd docs
-	make
+	make -C docs
 }
 
 check() {
diff --git a/user/libsexy/APKBUILD b/user/libsexy/APKBUILD
index d572034be..cdb914740 100644
--- a/user/libsexy/APKBUILD
+++ b/user/libsexy/APKBUILD
@@ -7,19 +7,17 @@ url="https://blog.chipx86.com/tag/libsexy/"
 arch="all"
 options="!check"  # Tests require manual intervention and X11 display.
 license="LGPL-2.1+"
-subpackages="$pkgname-dev $pkgname-doc"
+depends=""
 makedepends="gtk+2.0-dev iso-codes-dev libxml2-dev"
+subpackages="$pkgname-dev $pkgname-doc"
 source="http://releases.chipx86.com/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz"
 
 prepare() {
-	cd "$builddir"
-	update_config_sub
 	default_prepare
+	update_config_sub
 }
 
-build ()
-{
-	cd "$builddir"
+build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,7 +27,6 @@ build ()
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	rm -f "$pkgdir"/usr/lib/libsexy.a
 }
diff --git a/user/libstaroffice/APKBUILD b/user/libstaroffice/APKBUILD
index bad200ada..6f4829b12 100644
--- a/user/libstaroffice/APKBUILD
+++ b/user/libstaroffice/APKBUILD
@@ -9,13 +9,11 @@ arch="all"
 options="!check"  # No test suite.
 license="MPL-2.0 OR LGPL-2.0+"
 depends=""
-depends_dev="librevenge-dev"
-makedepends="$depends_dev zlib-dev boost-dev doxygen"
+makedepends="boost-dev doxygen librevenge-dev zlib-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
 source="https://github.com/fosnola/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,7 +25,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libxfce4util/APKBUILD b/user/libxfce4util/APKBUILD
index 06f02916e..823692e8e 100644
--- a/user/libxfce4util/APKBUILD
+++ b/user/libxfce4util/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Utility library for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
 license="LGPL-2.0+ GPL-2.0+"
+depends=""
 makedepends="intltool glib-dev gobject-introspection-dev vala"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="https://archive.xfce.org/src/xfce/libxfce4util/4.14/libxfce4util-$pkgver.tar.bz2"
diff --git a/user/libxp/APKBUILD b/user/libxp/APKBUILD
index 45cfad2bb..25953833a 100644
--- a/user/libxp/APKBUILD
+++ b/user/libxp/APKBUILD
@@ -14,7 +14,6 @@ source="https://www.x.org/releases/individual/lib/libXp-$pkgver.tar.bz2"
 builddir="$srcdir/libXp-$pkgver"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libzmf/APKBUILD b/user/libzmf/APKBUILD
index 6829fb3f8..c81460caa 100644
--- a/user/libzmf/APKBUILD
+++ b/user/libzmf/APKBUILD
@@ -9,8 +9,8 @@ arch="all"
 license="MPL-2.0"
 depends=""
 depends_dev="boost-dev icu-dev libpng-dev zlib-dev"
-makedepends="$depends_dev librevenge-dev doxygen"
 checkdepends="cppunit-dev"
+makedepends="$depends_dev librevenge-dev doxygen"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
 source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
 
@@ -20,7 +20,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -33,12 +32,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }