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

28 files changed, 58 insertions, 103 deletions

diff --git a/user/acpi/APKBUILD b/user/acpi/APKBUILD
index 8d2b49412..9dc1c2977 100644
--- a/user/acpi/APKBUILD
+++ b/user/acpi/APKBUILD
@@ -14,7 +14,6 @@ subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/acpiclient/$pkgname-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,7 +25,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/acpid/APKBUILD b/user/acpid/APKBUILD
index 4a46b0c93..e9bff1952 100644
--- a/user/acpid/APKBUILD
+++ b/user/acpid/APKBUILD
@@ -5,7 +5,6 @@
 # Contributor: Manolis Tzanidakis
 # Contributor: Jonathan Schmidt <j.schmidt@archlinux.us>
 # Contributor: multiplexd <multi@in-addr.xyz>
-
 pkgname=acpid
 pkgver=2.0.32
 pkgrel=0
diff --git a/user/ae_fonts/APKBUILD b/user/ae_fonts/APKBUILD
index 19535f00f..e23ca23a7 100644
--- a/user/ae_fonts/APKBUILD
+++ b/user/ae_fonts/APKBUILD
@@ -15,12 +15,8 @@ source="https://downloads.sourceforge.net/arabeyes/ae_fonts_$pkgver.tar.bz2"
 builddir="$srcdir"/${pkgname}_$pkgver
 
 package() {
-	cd "$builddir"
-	local _fontdir
 	for _fontdir in AAHS AGA FS Kasr MCS Shmookh; do
-		cd $_fontdir
-		install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf
-		cd "$OLDPWD"
+		install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/$_fontdir/*.ttf
 	done
 }
 
diff --git a/user/alegreya-sans/APKBUILD b/user/alegreya-sans/APKBUILD
index f14a5f467..1f731cc63 100644
--- a/user/alegreya-sans/APKBUILD
+++ b/user/alegreya-sans/APKBUILD
@@ -15,8 +15,7 @@ source="Alegreya-Sans-$pkgver.tar.gz::https://github.com/huertatipografica/Alegr
 builddir="$srcdir/Alegreya-Sans-$pkgver"
 
 package() {
-	cd "$builddir"/fonts/otf
-	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf
+	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$builddir"/fonts/otf/*.otf
 }
 
 sha512sums="8052fe15717ecdfd301d878b03282ff4fd472a7e13a1e581c84d6f3993780897354d103aeda2f027350d9e56466914be38e97417fe450ec32e5823769015d0a4  Alegreya-Sans-2.008.tar.gz"
diff --git a/user/alegreya/APKBUILD b/user/alegreya/APKBUILD
index 354b8c276..0c035efc2 100644
--- a/user/alegreya/APKBUILD
+++ b/user/alegreya/APKBUILD
@@ -15,7 +15,6 @@ source="Alegreya-$pkgver.tar.gz::https://github.com/huertatipografica/Alegreya/a
 builddir="$srcdir/Alegreya-$pkgver"
 
 package() {
-	cd "$builddir"
 	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ fonts/otf/*.otf
 }
 
diff --git a/user/alkimia/APKBUILD b/user/alkimia/APKBUILD
index b864f1105..d9e302a78 100644
--- a/user/alkimia/APKBUILD
+++ b/user/alkimia/APKBUILD
@@ -27,7 +27,7 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS}
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
diff --git a/user/alpine/APKBUILD b/user/alpine/APKBUILD
index b879bf772..194e501fe 100644
--- a/user/alpine/APKBUILD
+++ b/user/alpine/APKBUILD
@@ -9,19 +9,18 @@ arch="all"
 license="Apache-2.0"
 depends=""
 makedepends="aspell-dev krb5-dev linux-pam-dev ncurses-dev openldap-dev
-	openssl-dev"
+	openssl-dev autoconf automake libtool"
 subpackages="$pkgname-doc"
 source="http://alpine.x10host.com/alpine/release/src/alpine-$pkgver.tar.xz
-	support-musl.patch"
+	support-musl.patch
+	"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	autoreconf -vif
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -33,14 +32,12 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
 sha512sums="a2a36a033c8af79810816a7da7185c269808ba6d84d013691fd8b3764c63f5fb2284e6844ec5a5e99d168514ae636debf59fae962533a2916679e4e9109c6264  alpine-2.21.tar.xz
-cdf827b5947fd14b6a6c1ad86df4ff1b8be1ffd51279aaa02376b2b60f3de742c54364e18d73d9a75c5c87ed3c8668a3f0c9eb59733f8da195e85833b4364782  support-musl.patch"
+f26aaac4f81762227254e913f15c18b444e89d92b6885d62755d673d1f3097a126d297dc655b619d91b83bf5645ed0b4d5454c74a95cc142cd5fe3cb391e81cd  support-musl.patch"
diff --git a/user/alpine/support-musl.patch b/user/alpine/support-musl.patch
index ab3c2d857..a63a351d9 100644
--- a/user/alpine/support-musl.patch
+++ b/user/alpine/support-musl.patch
@@ -1,6 +1,6 @@
 --- ./configure.ac.orig
 +++ ./configure.ac
-@@ -723,7 +723,7 @@
+@@ -726,7 +726,7 @@
  else
    dnl preload c-client default locations/options
    case $host in
@@ -9,7 +9,7 @@
        if test -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/redhat_version ; then  
          alpine_SSLTYPE="nopwd"
  	if test -d /etc/pki/tls ; then  
-@@ -1059,7 +1059,7 @@
+@@ -1070,7 +1070,7 @@
  dnl build from c-client.  Most of this will go away when c-client
  dnl adopts configure
  case "$host" in
diff --git a/user/anonymous-pro/APKBUILD b/user/anonymous-pro/APKBUILD
index 33466e792..2ea302452 100644
--- a/user/anonymous-pro/APKBUILD
+++ b/user/anonymous-pro/APKBUILD
@@ -17,9 +17,8 @@ source="https://www.marksimonson.com/assets/content/fonts/AnonymousPro-$_prev.zi
 builddir="$srcdir/AnonymousPro-1.002.001"
 
 package() {
-	cd "$srcdir"
-	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ AnonymousPro-1.002.001/*.ttf
-	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ AnonymousProMinus-$pkgver/*.ttf
+	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$srcdir"/AnonymousPro-1.002.001/*.ttf
+	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$srcdir"/AnonymousProMinus-$pkgver/*.ttf
 }
 
 sha512sums="7606d520ad79fbf4e13d676c1aff61b764dce74e170f8783b8e606f7907c4b8db0871e5568504d15aa23ca26e925ada4eb6b60fcf27171dccee0d3d32d9a92a1  AnonymousPro-1.002.zip
diff --git a/user/audacious/APKBUILD b/user/audacious/APKBUILD
index d671e395d..42e37fd98 100644
--- a/user/audacious/APKBUILD
+++ b/user/audacious/APKBUILD
@@ -9,6 +9,7 @@ url="https://audacious-media-player.org/"
 arch="all"
 options="!check"  # No test suite.
 license="ISC"
+depends=""
 depends_dev="qt5-qtbase-dev dbus-glib-dev"
 makedepends="$depends_dev libguess-dev>=1.2 libxml2-dev autoconf automake"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
diff --git a/user/awesome/APKBUILD b/user/awesome/APKBUILD
index d3236b714..d6b140452 100644
--- a/user/awesome/APKBUILD
+++ b/user/awesome/APKBUILD
@@ -8,39 +8,35 @@ pkgrel=0
 pkgdesc="lua-configurable window manager framework"
 url="http://awesome.naquadah.org/"
 arch="all"
-license="GPL-2.0+"
 options="!check"  # Tests require X and D-Bus
+license="GPL-2.0+"
 depends="imagemagick lua-lgi cairo-gobject pango"
+checkdepends="xorg-server-xephyr"
 makedepends="lua5.3 lua5.3-dev libxcb-dev pango-dev cairo-dev cmake gperf glib-dev
 	imlib2-dev libxdg-basedir-dev libev-dev startup-notification-dev
 	xcb-util-keysyms-dev xcb-util-image-dev xcb-util-dev xcb-util-wm-dev
 	dbus-dev gdk-pixbuf-dev xcb-util-cursor-dev libxkbcommon-dev
 	xcb-util-xrm-dev libexecinfo-dev xmlto"
-checkdepends="xorg-server-xephyr"
 subpackages="$pkgname-doc"
 source="https://github.com/awesomeWM/$pkgname-releases/raw/master/$pkgname-$pkgver.tar.xz"
 
 build() {
 	# Awesome does not support in-tree builds
-        mkdir -p "$builddir/build"
-	cd "$builddir/build"
 	cmake -DCMAKE_INSTALL_PREFIX=/usr \
 		-DSYSCONFDIR=/etc \
-		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
                 -DLUA_INCLUDE_DIR=/usr/include/lua5.3 \
                 -DLUA_LIBRARIES=/usr/lib/lua5.3/liblua.so \
-		..
-	make
+		-Bbuild
+	make -C build
 }
 
 check() {
-	cd "$builddir/build"
-	make check
+	make -C build check
 }
 
 package() {
-	cd "$builddir/build"
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" -C build install
 }
 
 sha512sums="c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5  awesome-4.3.tar.xz"
diff --git a/user/baekmuk-ttf/APKBUILD b/user/baekmuk-ttf/APKBUILD
index 28b840f6b..2f885f9eb 100644
--- a/user/baekmuk-ttf/APKBUILD
+++ b/user/baekmuk-ttf/APKBUILD
@@ -14,8 +14,7 @@ subpackages=""
 source="http://kldp.net/baekmuk/release/865-baekmuk-ttf-$pkgver.tar.gz"
 
 package() {
-	cd "$builddir"
-	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ ttf/*.ttf
+	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/ttf/*.ttf
 }
 
 sha512sums="779e0bef5fe17e08e0e08ccdad9ad0e91123a5d5cbcb3d66256d517a0903c5fd91c4a8c75eb42f82fcb0d82e26455cf13aeec5ba3a04002133dbbaf1357ec14b  865-baekmuk-ttf-2.2.tar.gz"
diff --git a/user/bearssl/APKBUILD b/user/bearssl/APKBUILD
index ad6e8b20a..868c043af 100644
--- a/user/bearssl/APKBUILD
+++ b/user/bearssl/APKBUILD
@@ -1,5 +1,5 @@
-# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 # Contributor: Laurent Bercot <ska-adelie@skarnet.org>
+# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=bearssl
 pkgver=0.6
 pkgrel=1
@@ -7,18 +7,25 @@ pkgdesc="The BearSSL implementation of the SSL/TLS protocol"
 url="https://bearssl.org/"
 arch="all"
 license="MIT"
-builddir="$srcdir/$pkgname-$pkgver"
+depends=""
+makedepends=""
 subpackages="$pkgname-dev"
-source="https://bearssl.org/$pkgname-$pkgver.tar.gz bearssl-brssl-dynamic.patch"
+source="https://bearssl.org/$pkgname-$pkgver.tar.gz
+	bearssl-brssl-dynamic.patch
+	"
 
 build() {
-	cd "$builddir"
 	make \
-	  CC=gcc \
-	  LD=gcc \
-	  LDDLL=gcc \
-	  LDDLLFLAGS="-shared -Wl,-soname,libbearssl.so.${pkgver%%.*}" \
-	  D=".so.$pkgver"
+		CC=gcc \
+		LD=gcc \
+		LDDLL=gcc \
+		LDDLLFLAGS="-shared -Wl,-soname,libbearssl.so.${pkgver%%.*}" \
+		D=".so.$pkgver"
+}
+
+check() {
+	build/testx509
+	build/testcrypto all
 }
 
 package() {
@@ -31,10 +38,5 @@ package() {
 	ln -sf "libbearssl.so.${pkgver%%.*}" "$pkgdir/lib/libbearssl.so"
 }
 
-check() {
-	cd "$builddir/build"
-	./testx509 && ./testcrypto all
-}
-
 sha512sums="f9ed25683cfc6c4abe7f1203a2b82ed101ee4c9e0f9ab60755b6a09c8d1e8e4f64d413624e7bb9c4b0033f909a2e4568a1d916cc6ce4736222900691e1f8359a  bearssl-0.6.tar.gz
 f5fe047862eb355a662ccb1b95c2ca4a870ac0f8d3f4cada5396d2f6a6635647db53fbeb038f9a7651b84d6cda32b6415ce0f69a8da92636d3b3b76578114d5c  bearssl-brssl-dynamic.patch"
diff --git a/user/bengali-fonts/APKBUILD b/user/bengali-fonts/APKBUILD
index 974e0971a..1a2b7590a 100644
--- a/user/bengali-fonts/APKBUILD
+++ b/user/bengali-fonts/APKBUILD
@@ -19,14 +19,12 @@ source="https://savannah.nongnu.org/download/freebangfont/Akaash-0.8.5.tar.gz
 builddir="$srcdir"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	# don't capitalise extension
 	mv Ani/mitra.TTF Ani/mitra.ttf
 }
 
 package() {
-	cd "$builddir"
 	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF \
 		$(find . -name *.ttf)
 }
diff --git a/user/bitlbee/APKBUILD b/user/bitlbee/APKBUILD
index 91e613b4e..fbe734b75 100644
--- a/user/bitlbee/APKBUILD
+++ b/user/bitlbee/APKBUILD
@@ -6,15 +6,16 @@ pkgrel=0
 pkgdesc="IRC gateway server to IM services"
 url="https://www.bitlbee.org"
 arch="all"
+options="!check"  # Tests are not compatible with new check.
 license="GPL-2.0+ AND LGPL-2.1-only AND BSD-2-Clause AND GPL-2.0-only AND ISC"
 depends=""
-makedepends="glib-dev gnutls-dev libgcrypt-dev linux-pam-dev python3"
 checkdepends="check-dev"
+makedepends="glib-dev gnutls-dev libgcrypt-dev linux-pam-dev python3"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://get.bitlbee.org/src/bitlbee-$pkgver.tar.gz"
 
 build() {
-	./configure \
+	PYTHON=python3 ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
diff --git a/user/bsdwhois/APKBUILD b/user/bsdwhois/APKBUILD
index d5222238d..7fe28519f 100644
--- a/user/bsdwhois/APKBUILD
+++ b/user/bsdwhois/APKBUILD
@@ -15,13 +15,10 @@ source="http://utenti.gufi.org/~drizzt/codes/bsdwhois-$pkgver.tar.bz2"
 builddir="$srcdir/$pkgname"
 
 build() {
-	cd "$builddir"
 	make
 }
 
 package() {
-	cd "$builddir"
-
 	install -D -m755 "$builddir"/whois "$pkgdir"/usr/bin/whois
 	install -D -m644 "$builddir"/whois.1 "$pkgdir"/usr/share/man/man1/whois.1
 }
diff --git a/user/bugzilla/APKBUILD b/user/bugzilla/APKBUILD
index 5e0f6f31d..9217601b0 100644
--- a/user/bugzilla/APKBUILD
+++ b/user/bugzilla/APKBUILD
@@ -10,7 +10,7 @@ options="!check"  # "Cannot determine your time zone"; all other tests pass
 license="MPL-2.0"
 # First section are required deps.  Second section are optional features we use.
 depends="perl-cgi perl-datetime perl-datetime-timezone perl-dbi perl-email-mime
-	perl-email-sender perl-json-xs perl-list-moreutils
+	perl-email-sender perl-json-xs perl-list-moreutils perl
 	perl-math-random-isaac perl-template-toolkit perl-timedate perl-uri
 
 	patchutils perl-authen-sasl perl-chart perl-encode-detect
@@ -24,20 +24,17 @@ subpackages=""
 source="https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	perl Build.PL installdirs=vendor
 	./Build
 }
 
 check() {
-	cd "$builddir"
 	./Build test
 }
 
 package() {
-	cd "$srcdir"
 	mkdir -p "$pkgdir"/usr/share/webapps
-	mv bugzilla-$pkgver "$pkgdir"/usr/share/webapps/
+	mv "$srcdir"/bugzilla-$pkgver "$pkgdir"/usr/share/webapps/
 }
 
 sha512sums="8ca47ea1be2b433a6ce68e1a595d72f3d0f0fede44d1194dc6bc9a116dbde3ab7285212c71995e200d31544876e4c3c57b63da1f877a0cb22747ab87a5d598de  bugzilla-5.0.6.tar.gz"
diff --git a/user/bzflag/APKBUILD b/user/bzflag/APKBUILD
index 3e4b8be76..41ebe01f6 100644
--- a/user/bzflag/APKBUILD
+++ b/user/bzflag/APKBUILD
@@ -11,10 +11,10 @@ depends=""
 makedepends="c-ares-dev curl-dev glew-dev ncurses-dev sdl2-dev zlib-dev"
 subpackages="$pkgname-doc"
 source="https://download.bzflag.org/bzflag/source/$pkgver/$pkgname-$pkgver.tar.bz2
-	defineAddrLen.patch"
+	defineAddrLen.patch
+	"
 
 build() {
-	cd "$builddir"
 	LIBS="-ltinfo" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,12 +26,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/iptables/APKBUILD b/user/iptables/APKBUILD
index 98e621c05..3c470fda1 100644
--- a/user/iptables/APKBUILD
+++ b/user/iptables/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Molly Miller <adelie@m-squa.red>
-
 pkgname=iptables
 pkgver=1.8.4
 pkgrel=0
 pkgdesc="Linux kernel firewall, NAT and packet mangling tools"
 url="https://www.netfilter.org/projects/iptables/index.html"
 arch="all"
-options="!check" # no test suite
+options="!check"  # No test suite.
 license="GPL-2.0+"
+depends=""
 depends_dev="linux-headers"
 # extra functionality may be enabled in the future if libmnl and
 # libnetfilter_conntrack are packaged.
diff --git a/user/libcue/APKBUILD b/user/libcue/APKBUILD
index e989d4e41..13fb38c44 100644
--- a/user/libcue/APKBUILD
+++ b/user/libcue/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/lipnitsk/libcue/archive/v$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DBUILD_SHARED_LIBS=ON \
@@ -22,12 +21,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libmms/APKBUILD b/user/libmms/APKBUILD
index 85cec3b25..f48006114 100644
--- a/user/libmms/APKBUILD
+++ b/user/libmms/APKBUILD
@@ -16,13 +16,11 @@ source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	"
 
 prepare() {
-	cd "$builddir"
-	update_config_sub
 	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -35,7 +33,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libmowgli/APKBUILD b/user/libmowgli/APKBUILD
index 461075184..777ee35b6 100644
--- a/user/libmowgli/APKBUILD
+++ b/user/libmowgli/APKBUILD
@@ -12,7 +12,8 @@ depends=""
 makedepends="openssl-dev"
 subpackages="$pkgname-dev"
 source="https://github.com/atheme/libmowgli-2/archive/v$pkgver/libmowgli-$pkgver.tar.gz
-	cacheline.patch"
+	cacheline.patch
+	"
 builddir="$srcdir"/$pkgname-2-$pkgver
 
 build() {
diff --git a/user/libnftnl/APKBUILD b/user/libnftnl/APKBUILD
index 3d29f273d..3b08ef8cc 100644
--- a/user/libnftnl/APKBUILD
+++ b/user/libnftnl/APKBUILD
@@ -8,6 +8,7 @@ pkgdesc="Netfilter library providing interface to the nf_tables subsystem"
 url="https://netfilter.org/projects/libnftnl"
 arch="all"
 license="GPL-2.0+"
+depends=""
 makedepends="libmnl-dev"
 subpackages="$pkgname-dev"
 source="https://netfilter.org/projects/libnftnl/files/$pkgname-$pkgver.tar.bz2"
diff --git a/user/libxdg-basedir/APKBUILD b/user/libxdg-basedir/APKBUILD
index 50a1e7dfc..70fe0d512 100644
--- a/user/libxdg-basedir/APKBUILD
+++ b/user/libxdg-basedir/APKBUILD
@@ -1,27 +1,24 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Dan Theisen <djt@hxx.in>
-# TODO: Repackage from better source, rehost or something.
 pkgname=libxdg-basedir
 pkgver=1.2.0
 pkgrel=0
 pkgdesc="library for XDG base dir specification"
-url="https://nevill.ch/libxdg-basedir/"
+url=" "  # No URL.
 arch="all"
 license="MIT"
 depends=""
-makedepends=""
+makedepends="autoconf automake libtool"
 subpackages="$pkgname-dev"
-source="https://nevill.ch/libxdg-basedir/downloads/$pkgname-$pkgver.tar.gz"
+source="http://ponce.cc/slackware/sources/repo/libxdg-basedir-1.2.0.tar.xz"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
-	update_config_sub
+	./autogen.sh
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -31,13 +28,11 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="346553ddd9d0a0c854af9320f2ced695a0838adc18736b66120bea48ea60cb9ea3a7390672a42f83909db92f692e94de833d9e8bcfe51568a72ad1f4661fde06  libxdg-basedir-1.2.0.tar.gz"
+sha512sums="f1766cd94dd66fcba9211427910ef02c7f203c7bf655e74b903566a68521d1c156c9687cd89eca73428098c0a78a1458cada2057dd9268b6f6b48229c80b5d2e  libxdg-basedir-1.2.0.tar.xz"
diff --git a/user/lua-lgi/APKBUILD b/user/lua-lgi/APKBUILD
index f9b07ca3b..be1bd5334 100644
--- a/user/lua-lgi/APKBUILD
+++ b/user/lua-lgi/APKBUILD
@@ -6,8 +6,8 @@ pkgrel=0
 pkgdesc="Dynamic Lua binding to GObject libraries using GObject-Introspection"
 url="https://github.com/pavouk/lgi"
 arch="all"
+options="!check"  # Test suite requires D-Bus.
 license="MIT"
-options="!check" # checks require dbus
 depends=""
 makedepends="glib-dev gobject-introspection-dev libffi-dev lua5.3-dev"
 subpackages="$pkgname-doc"
@@ -15,18 +15,15 @@ source="lgi-$pkgver.tar.gz::https://github.com/pavouk/lgi/archive/$pkgver.tar.gz
 builddir="$srcdir"/lgi-$pkgver
 
 build() {
-	cd "$builddir"
 	make PREFIX=/usr LUA_VERSION="5.3" \
 		LUA_CFLAGS="$(pkg-config --cflags lua)"
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make install PREFIX=/usr LUA_VERSION="5.3" DESTDIR="$pkgdir"
 	
 	mkdir -p "$pkgdir"/usr/share/doc/lua-lgi
diff --git a/user/neon/APKBUILD b/user/neon/APKBUILD
index 8dda94d31..4b0c4349b 100644
--- a/user/neon/APKBUILD
+++ b/user/neon/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=3
 pkgdesc="HTTP and WebDAV client library with a C interface"
 url=" "
 arch="all"
-license="GPL LGPL"
+license="LGPL-2.0+"
 depends="ca-certificates"
 depends_dev="expat-dev openssl-dev zlib-dev"
 makedepends="$depends_dev"
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.gz"
 
 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
 }
 sha512sums="634caf87522e0bd2695c6fba39cae2465e403f9fbd8007eb10e4e035c765d24cb8da932c67bfa35c34aa51b90c7bc7037ebebaa1ec43259366d5d07233efc631  neon-0.30.2.tar.gz"
diff --git a/user/patchutils/APKBUILD b/user/patchutils/APKBUILD
index ac1322e2e..eabb82788 100644
--- a/user/patchutils/APKBUILD
+++ b/user/patchutils/APKBUILD
@@ -11,10 +11,8 @@ depends="diffutils"
 makedepends="xmlto"
 subpackages="$pkgname-doc"
 source="http://cyberelk.net/tim/data/patchutils/stable/patchutils-$pkgver.tar.xz"
-builddir="$srcdir/patchutils-$pkgver"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make -j1 check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xcb-util-xrm/APKBUILD b/user/xcb-util-xrm/APKBUILD
index d368f1544..dfdefaba7 100644
--- a/user/xcb-util-xrm/APKBUILD
+++ b/user/xcb-util-xrm/APKBUILD
@@ -8,12 +8,12 @@ pkgdesc="Utility functions for the X resource manager"
 url="https://github.com/Airblader/xcb-util-xrm"
 arch="all"
 license="MIT"
+depends=""
 makedepends="m4 bsd-compat-headers libx11-dev libxcb-dev util-macros xcb-util-dev"
-source="https://github.com/Airblader/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"
 subpackages="$pkgname-dev"
+source="https://github.com/Airblader/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -25,12 +25,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }