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

39 files changed, 67 insertions, 114 deletions

diff --git a/user/efibootmgr/APKBUILD b/user/efibootmgr/APKBUILD
index 0cde72c5a..5f2149b22 100644
--- a/user/efibootmgr/APKBUILD
+++ b/user/efibootmgr/APKBUILD
@@ -14,12 +14,10 @@ subpackages="$pkgname-doc"
 source="https://github.com/rhboot/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	make EFIDIR="Adelie" libdir="/usr/lib" LIBS="intl"
 }
 
 package() {
-	cd "$builddir"
 	make EFIDIR="Adelie" libdir="/usr/lib" LIBS="intl" DESTDIR="$pkgdir" install
 }
 
diff --git a/user/efivar/APKBUILD b/user/efivar/APKBUILD
index bcfcc3a2a..13b1b64bd 100644
--- a/user/efivar/APKBUILD
+++ b/user/efivar/APKBUILD
@@ -17,12 +17,10 @@ source="https://github.com/rhboot/$pkgname/releases/download/$pkgver/$pkgname-$p
 	"
 
 build() {
-	cd "$builddir"
 	make prefix="/usr" libdir="/usr/lib"
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" prefix="/usr" libdir="/usr/lib" install
 }
 
diff --git a/user/fantasque-sans-mono/APKBUILD b/user/fantasque-sans-mono/APKBUILD
index d6c2ad111..3d4712524 100644
--- a/user/fantasque-sans-mono/APKBUILD
+++ b/user/fantasque-sans-mono/APKBUILD
@@ -15,8 +15,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/belluzj/fantasque-sans/relea
 builddir="$srcdir"/OTF
 
 package() {
-	cd "$builddir"
-	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf
+	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$builddir"/*.otf
 }
 
 sha512sums="3afbd441d192769ea44fd7730e728844d13c15b0dd52e3968e6e1659ffa11a173d21891c09ceb7465b83a0b8c923129df2554e159620c9611ee9bb6ff35c90c6  fantasque-sans-mono-1.8.0.tar.gz"
diff --git a/user/fastjar/APKBUILD b/user/fastjar/APKBUILD
index b821b2419..249f3a9b1 100644
--- a/user/fastjar/APKBUILD
+++ b/user/fastjar/APKBUILD
@@ -17,13 +17,11 @@ source="https://download.savannah.nongnu.org/releases/fastjar/fastjar-$pkgver.ta
 	"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -35,12 +33,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	rm -f "$pkgdir"/usr/lib/charset.alias
 }
diff --git a/user/fdupes/APKBUILD b/user/fdupes/APKBUILD
index 1cd4e02b3..944256215 100644
--- a/user/fdupes/APKBUILD
+++ b/user/fdupes/APKBUILD
@@ -14,12 +14,10 @@ subpackages="$pkgname-doc"
 source="fdupes-$pkgver.tar.gz::https://github.com/adrianlopezroche/fdupes/archive/v$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	make PREFIX=/usr
 }
 
 package() {
-	cd "$builddir"
 	make PREFIX=/usr DESTDIR="$pkgdir" install
 }
 
diff --git a/user/fifth-leg/APKBUILD b/user/fifth-leg/APKBUILD
index c80ecb5a6..43cf5b2b3 100644
--- a/user/fifth-leg/APKBUILD
+++ b/user/fifth-leg/APKBUILD
@@ -15,8 +15,7 @@ source="https://api.opensuse.org/public/source/openSUSE:Factory/fifth-leg-font/o
 builddir="$srcdir"
 
 package() {
-	cd "$builddir"
-	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF *.otf
+	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF "$builddir"/*.otf
 }
 
 sha512sums="7c2ee6aab8d5bc54d3a0d3a7d02ff5514cdc9e6672fcd28e827197061e5aa3f023b1d6cbe7077458f8cb3046a22e4aac085d4a56398d59845d004edde67622f9  opensuse-font-fifth-leg-0.6.tar.bz2"
diff --git a/user/figlet/APKBUILD b/user/figlet/APKBUILD
index 1d44369c4..da4121dc4 100644
--- a/user/figlet/APKBUILD
+++ b/user/figlet/APKBUILD
@@ -11,20 +11,18 @@ depends=""
 makedepends=""
 subpackages="$pkgname-doc"
 source="ftp://ftp.figlet.org/pub/figlet/program/unix/${pkgname}-${pkgver}.tar.gz
-        musl-fix-cplusplus-decls.patch"
+        musl-fix-cplusplus-decls.patch
+	"
 
 build() {
-	cd "$builddir"
 	make DEFAULTFONTDIR=/usr/share/figlet/fonts all
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="${pkgdir}" BINDIR=/usr/bin MANDIR=/usr/share/man \
 	     DEFAULTFONTDIR=/usr/share/figlet/fonts install
 	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
diff --git a/user/fish/APKBUILD b/user/fish/APKBUILD
index 271690df5..9754c4a0b 100644
--- a/user/fish/APKBUILD
+++ b/user/fish/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Modern interactive commandline shell"
 url="http://www.fishshell.com"
 arch="all"
-options="!check" # no tests
+options="!check"  # No test suite.
 license="BSD-3-Clause AND BSD-2-Clause AND GPL-2.0+ AND GPL-2.0-only AND ISC"
 depends="bc"
 depends_dev="$pkgname-tools"
diff --git a/user/flite/APKBUILD b/user/flite/APKBUILD
index 6818f19ee..dcd9d98f2 100644
--- a/user/flite/APKBUILD
+++ b/user/flite/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Small, fast text-to-speech synthesizer based on Festival"
 url="http://www.festvox.org/flite/"
 arch="all"
-options="!check" # testsuite refuses to cooperate
+options="!check"  # Test suite refuses to cooperate.
 license="MIT AND Apache-2.0 AND BSD-3-Clause AND Public-Domain AND BSD-2-Clause"
 depends=""
 makedepends="alsa-lib-dev"
diff --git a/user/fluxbox/APKBUILD b/user/fluxbox/APKBUILD
index 73c076d15..c45ce0ec9 100644
--- a/user/fluxbox/APKBUILD
+++ b/user/fluxbox/APKBUILD
@@ -6,8 +6,8 @@ pkgrel=1
 pkgdesc="A lightweight and highly-configurable window manager"
 url="http://www.fluxbox.org"
 arch="all"
+options="!check"  # This package has a broken test suite.
 license="MIT"
-options="!check"  # This package has a broken testsuite
 depends="gxmessage"
 makedepends="libxinerama-dev libxpm-dev libxrandr imlib2-dev libxrender-dev
 	libxrandr-dev libxinerama-dev freetype-dev libxft-dev xorgproto"
@@ -15,7 +15,6 @@ subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
         # TODO: Enable NLS when we get 'gencat'
 	./configure \
 		--build=$CBUILD \
@@ -27,7 +26,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/freeglut/APKBUILD b/user/freeglut/APKBUILD
index 34b38ebf2..184882c91 100644
--- a/user/freeglut/APKBUILD
+++ b/user/freeglut/APKBUILD
@@ -15,10 +15,11 @@ source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
 
 build() {
 	cmake . \
-		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
-		-DFREEGLUT_BUILD_STATIC_LIBS=0
+		-DFREEGLUT_BUILD_STATIC_LIBS=0 \
+		.
 	make
 }
 
diff --git a/user/ftmenu/APKBUILD b/user/ftmenu/APKBUILD
index 3f8e2d157..b5c291a24 100644
--- a/user/ftmenu/APKBUILD
+++ b/user/ftmenu/APKBUILD
@@ -9,13 +9,17 @@ arch="all"
 options="!check"  # there is currently no testsuite to run
 license="GPL-3.0-only"
 depends=""
-makedepends="gtk+2.0-dev"
+makedepends="autoconf automake gtk+2.0-dev libtool"
 source="https://downloads.sourceforge.net/project/ftmenu/ftmenu/ftmenu-0.4/ftmenu-$pkgver.tar.gz
-	include-stdlib.patch"
+	include-stdlib.patch
+	"
 
-build() {
-	cd "$builddir"
+prepare() {
+	default_prepare
 	autoreconf -if
+}
+
+build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,12 +31,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/fts/APKBUILD b/user/fts/APKBUILD
index 2864ee250..d75403d6a 100644
--- a/user/fts/APKBUILD
+++ b/user/fts/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Provides the fts(3) functions, which are missing in musl libc"
 url="https://github.com/pullmoll/musl-fts/"
 arch="all"
 license="BSD-3-Clause"
+depends=""
 makedepends="automake autoconf libtool"
 subpackages="$pkgname-dev"
 source="$pkgname-$pkgver.zip::https://github.com/pullmoll/musl-fts/archive/v$pkgver.zip"
@@ -14,12 +15,10 @@ builddir="$srcdir/musl-$pkgname-$pkgver"
 
 prepare() {
 	default_prepare
-	cd "$builddir"
 	./bootstrap.sh
 }
 
 build() {
-	cd "$builddir"
 	CFLAGS=-fPIC ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -31,12 +30,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	mkdir -p "$pkgdir"/usr/lib/pkgconfig
diff --git a/user/gamin/APKBUILD b/user/gamin/APKBUILD
index b7d0461fc..140e44fc7 100644
--- a/user/gamin/APKBUILD
+++ b/user/gamin/APKBUILD
@@ -6,9 +6,9 @@ pkgdesc="Library for file and directory monitoring"
 url="http://www.gnome.org/~veillard/gamin"
 arch="all"
 license="LGPL-2.0+"
-subpackages="$pkgname-dev"
 depends=""
 makedepends="glib-dev"
+subpackages="$pkgname-dev"
 source="https://www.gnome.org/~veillard/$pkgname/sources/$pkgname-$pkgver.tar.gz
 	fix-deprecated-const.patch
 	fix-pthread-mutex.patch
diff --git a/user/gcompat/APKBUILD b/user/gcompat/APKBUILD
index e6b142f84..bbc4eedc9 100644
--- a/user/gcompat/APKBUILD
+++ b/user/gcompat/APKBUILD
@@ -25,12 +25,10 @@ ppc64*) _ld="ld64.so.2" ;;
 esac
 
 build() {
-	cd "$builddir"
 	make LINKER_PATH="/lib/ld-musl-${_link_arch}.so.1" LOADER_NAME="$_ld" WITH_LIBUCONTEXT=YesPlease
 }
 
 package() {
-	cd "$builddir"
 	make LINKER_PATH="/lib/ld-musl-${_link_arch}.so.1" LOADER_NAME="$_ld" WITH_LIBUCONTEXT=YesPlease DESTDIR="$pkgdir" install
 }
 
diff --git a/user/gdbm/APKBUILD b/user/gdbm/APKBUILD
index 230f62e28..351236639 100644
--- a/user/gdbm/APKBUILD
+++ b/user/gdbm/APKBUILD
@@ -11,10 +11,9 @@ license="GPL-2.0+ AND GPL-3.0+"
 depends=""
 makedepends=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="ftp://ftp.gnu.org/gnu/gdbm/$pkgname-$pkgver.tar.gz"
+source="https://ftp.gnu.org/gnu/gdbm/$pkgname-$pkgver.tar.gz"
 
 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/genmenu/APKBUILD b/user/genmenu/APKBUILD
index 2e34c5192..098f47e30 100644
--- a/user/genmenu/APKBUILD
+++ b/user/genmenu/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Menu generator for Enlightenment, Blackbox, Openbox, Fluxbox, and WindowMaker"
 url="https://f00l.de/genmenu/"
 arch="noarch"
-options="!check" # this is just a bash script, no tests
+options="!check"  # This is just a bash script, no tests
 license="GPL-2.0+"
 depends="bash"
 makedepends=""
@@ -14,8 +14,7 @@ subpackages=""
 source="https://f00l.de/$pkgname/$pkgname-$pkgver.tar.bz2"
 
 package() {
-	cd "$builddir"
-	install -D -m755 -t $pkgdir/usr/bin/ genmenu
+	install -D -m755 -t $pkgdir/usr/bin/ "$builddir"/genmenu
 }
 
 sha512sums="eb87db30f6787570ffe844c7b9b25542652e485296ec061ab1da8f2b1bae40942630c9ca141cf8c7b55ce4d99d1b173511850247a5e07243256eb71588515e54  genmenu-1.1.0.tar.bz2"
diff --git a/user/giblib/APKBUILD b/user/giblib/APKBUILD
index 22f125ef3..85f255925 100644
--- a/user/giblib/APKBUILD
+++ b/user/giblib/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: 
 pkgname=giblib
 pkgver=1.2.4
-pkgrel=10
+pkgrel=11
 pkgdesc="Graphics library built atop Imlib2"
 url="http://linuxbrit.co.uk/details.html"
 arch="all"
@@ -10,16 +10,15 @@ subpackages="$pkgname-doc $pkgname-dev"
 depends=""
 depends_dev="freetype-dev imlib2-dev libx11-dev libxext-dev zlib-dev"
 makedepends="$depends_dev"
+subpackages="$pkgname-doc"
 source="http://distfiles.gentoo.org/distfiles/$pkgname-$pkgver.tar.gz"
 
 prepare() {
-	cd "$builddir"
-	update_config_sub
 	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -28,12 +27,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" docsdir=/usr/share/doc/giblib install
 	install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
 }
diff --git a/user/gidole/APKBUILD b/user/gidole/APKBUILD
index f20bf594f..2cfa018ec 100644
--- a/user/gidole/APKBUILD
+++ b/user/gidole/APKBUILD
@@ -15,8 +15,7 @@ source="https://dev.gentoo.org/~jstein/dist/gidole-$pkgver.zip"
 builddir="$srcdir/GidoleFont"
 
 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="adc58657a4ea0331cda6261de293ab997c8d862fd23824f92860710e4a017267835d5c1fbfc6accace20ce172d5586d5f9568de08adf0266a07a191d9499e727  gidole-2.0.2.zip"
diff --git a/user/glass-tty-vt220/APKBUILD b/user/glass-tty-vt220/APKBUILD
index 54b89f38c..12d39dda5 100644
--- a/user/glass-tty-vt220/APKBUILD
+++ b/user/glass-tty-vt220/APKBUILD
@@ -12,11 +12,9 @@ depends="fontconfig"
 makedepends=""
 subpackages=""
 source="http://sensi.org/~svo/glasstty/Glass_TTY_VT220.ttf"
-builddir="$srcdir"
 
 package() {
-	cd "$builddir"
-	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF Glass_TTY_VT220.ttf
+	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF "$srcdir"/Glass_TTY_VT220.ttf
 }
 
 sha512sums="0b3b598bbdcc8f1177b48a7cedd2ad035a8a95d17d162d868e7c988a9d918f2756a8fe674bef3f30357225a87ea4e3adde01889502540d6920210161edc37023  Glass_TTY_VT220.ttf"
diff --git a/user/gptfdisk/APKBUILD b/user/gptfdisk/APKBUILD
index 265d5f8c3..21249e469 100644
--- a/user/gptfdisk/APKBUILD
+++ b/user/gptfdisk/APKBUILD
@@ -14,13 +14,10 @@ subpackages="$pkgname-doc"
 source="https://www.rodsbooks.com/gdisk/gptfdisk-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	make LDFLAGS="$LDFLAGS -ltinfo"
 }
 
 package() {
-	cd "$builddir"
-	local _app
 	for _app in cgdisk fixparts gdisk sgdisk; do
 		install -D -m755 $_app "$pkgdir"/usr/sbin/$_app
 		install -D -m644 $_app.8 "$pkgdir"/usr/share/man/man8/$_app.8
diff --git a/user/grfcodec/APKBUILD b/user/grfcodec/APKBUILD
index 7ca60e872..b80f73c3d 100644
--- a/user/grfcodec/APKBUILD
+++ b/user/grfcodec/APKBUILD
@@ -16,12 +16,10 @@ source="https://binaries.openttd.org/extra/grfcodec/$pkgver/grfcodec-$pkgver-sou
 	"
 
 build() {
-	cd "$builddir"
 	make
 }
 
 package() {
-	cd "$builddir"
 	make prefix=/usr DESTDIR="$pkgdir" install
 }
 
diff --git a/user/gtkspell/APKBUILD b/user/gtkspell/APKBUILD
index e76b7f813..df4d65932 100644
--- a/user/gtkspell/APKBUILD
+++ b/user/gtkspell/APKBUILD
@@ -6,7 +6,8 @@ pkgdesc="Highlighting and replacement of misspelled words in Gtk software"
 url="http://gtkspell.sourceforge.net/"
 arch="all"
 license="GPL-2.0-only"
-makedepends="gtk+2.0-dev enchant-dev intltool"
+depends=""
+makedepends="autoconf automake enchant-dev gtk+2.0-dev gtk-doc intltool libtool"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="http://$pkgname.sourceforge.net/download/$pkgname-$pkgver.tar.gz
 	enchant-2.patch
@@ -15,13 +16,15 @@ source="http://$pkgname.sourceforge.net/download/$pkgname-$pkgver.tar.gz
 prepare() {
 	default_prepare
 	update_config_sub
+	autoreconf -vif
 }
 
 build() {
 	LIBS="-lintl" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr
+		--prefix=/usr \
+		--disable-gtk-doc
 	make
 }
 
diff --git a/user/guile20/APKBUILD b/user/guile20/APKBUILD
index ceafb8a28..c088637e0 100644
--- a/user/guile20/APKBUILD
+++ b/user/guile20/APKBUILD
@@ -17,7 +17,6 @@ source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz
 	"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -28,7 +27,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	rm "$pkgdir"/usr/lib/charset.alias
 }
diff --git a/user/gutenprint/APKBUILD b/user/gutenprint/APKBUILD
index 42198e73d..e3f0d111d 100644
--- a/user/gutenprint/APKBUILD
+++ b/user/gutenprint/APKBUILD
@@ -9,13 +9,13 @@ arch="all"
 options="!check"  # Times out even on 64-thread POWER9.
 license="GPL-2.0-only"
 depends=""
-makedepends="cups-dev"
+makedepends="bash cups-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs"
 install="$pkgname.post-install $pkgname.post-upgrade"
 source="https://downloads.sourceforge.net/gimp-print/gutenprint-$pkgver.tar.xz"
 
 build() {
-	./configure \
+	bash ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
diff --git a/user/hdparm/APKBUILD b/user/hdparm/APKBUILD
index f6e5a8f8e..f1ab5fe96 100644
--- a/user/hdparm/APKBUILD
+++ b/user/hdparm/APKBUILD
@@ -6,11 +6,12 @@ pkgrel=0
 pkgdesc="Utility for manipulating IDE device parameters"
 url="https://sourceforge.net/projects/hdparm"
 arch="all"
+options="!check"  # This application has no tests.
 license="BSD-2-clause OR GPL-2.0-or-later"
+depends=""
 makedepends="linux-headers"
-options="!check"  # this application has no tests
 subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
+source="https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
 
 prepare() {
 	default_prepare
@@ -18,13 +19,11 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -D -m755 contrib/idectl "$pkgdir"/sbin
 	install -D -m755 contrib/ultrabayd "$pkgdir"/sbin
diff --git a/user/hermit/APKBUILD b/user/hermit/APKBUILD
index aa9fbb046..c36f6fe1c 100644
--- a/user/hermit/APKBUILD
+++ b/user/hermit/APKBUILD
@@ -12,11 +12,9 @@ depends="fontconfig"
 makedepends=""
 subpackages=""
 source="https://pcaro.es/d/otf-$pkgname-$pkgver.tar.gz"
-builddir="$srcdir"
 
 package() {
-	cd "$builddir"
-	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf
+	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$srcdir"/*.otf
 }
 
 sha512sums="ee41f8cbcdedfff568cd47ab7730c462ddd67d6170c05d35eaf64a7f954a4bb72d6ac99a383749f7032d9cf7b407b7a5ef3270b4209692c1572beb9744a21d42  otf-hermit-2.0.tar.gz"
diff --git a/user/heuristica-otf/APKBUILD b/user/heuristica-otf/APKBUILD
index 728909071..e0438bd67 100644
--- a/user/heuristica-otf/APKBUILD
+++ b/user/heuristica-otf/APKBUILD
@@ -12,11 +12,9 @@ depends="fontconfig"
 makedepends=""
 subpackages=""
 source="https://downloads.sourceforge.net/heuristica/heuristica-otf-$pkgver.tar.xz"
-builddir="$srcdir"
 
 package() {
-	cd "$builddir"
-	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf
+	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$srcdir"/*.otf
 }
 
 sha512sums="d3336c6fcfd5ab5bfb041230659c41ecbaa9e2d2f92d5c1c8c0dc8dff89a777ac87d8713467c94b065febde30c131cd05376573308f69d698d63e18eee433783  heuristica-otf-1.0.2.tar.xz"
diff --git a/user/humor-sans/APKBUILD b/user/humor-sans/APKBUILD
index af9ba8484..476f85c72 100644
--- a/user/humor-sans/APKBUILD
+++ b/user/humor-sans/APKBUILD
@@ -12,11 +12,9 @@ depends="fontconfig"
 makedepends=""
 subpackages=""
 source="http://antiyawn.com/uploads/Humor-Sans-$pkgver.ttf"
-builddir="$srcdir"
 
 package() {
-	cd "$builddir"
-	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ Humor-Sans-$pkgver.ttf
+	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$srcdir"/Humor-Sans-$pkgver.ttf
 }
 
 sha512sums="f0ed2f61f5cedb93ff955d9d5562fd110db750b6d4d91a74346ff94c16c87cac294c061e6ded97ffea372970912f51ee0792a611a6224cd3a38585812971b3dd  Humor-Sans-1.0.ttf"
diff --git a/user/hunkyfonts/APKBUILD b/user/hunkyfonts/APKBUILD
index c8c2411a5..714812e7b 100644
--- a/user/hunkyfonts/APKBUILD
+++ b/user/hunkyfonts/APKBUILD
@@ -14,8 +14,7 @@ subpackages=""
 source="https://downloads.sourceforge.net/hunkyfonts/hunkyfonts-$pkgver.tar.bz2"
 
 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="0e9a5cff20c467ae441c442f269d3b8a9ea5d2534cbabcf08f65a594121840727003bdb038981e983430602306147e5dca146503b310a742d3c6e44d36ae7375  hunkyfonts-0.3.1.tar.bz2"
diff --git a/user/i3wm/APKBUILD b/user/i3wm/APKBUILD
index ccbb5f9e5..7cf320dd9 100644
--- a/user/i3wm/APKBUILD
+++ b/user/i3wm/APKBUILD
@@ -7,13 +7,14 @@ pkgrel=0
 pkgdesc="Improved dynamic tiling window manager"
 url="https://i3wm.org"
 arch="all"
-license="BSD-3-Clause"
 options="!check"  # The test suite requires X
+license="BSD-3-Clause"
+depends=""
+checkdepends="perl-x11-xcb perl-anyevent perl-json-xs perl-ipc-run
+	perl-inline-c perl-dev libxcb-dev xcb-util-dev xorg-server-xephyr"
 makedepends="bison flex libxcb-dev xcb-util-cursor-dev xcb-util-keysyms-dev
 	xcb-util-wm-dev libev-dev pango-dev cairo-dev yajl-dev
 	startup-notification-dev pcre-dev libxkbcommon-dev xcb-util-xrm-dev"
-checkdepends="perl-x11-xcb perl-anyevent perl-json-xs perl-ipc-run
-	perl-inline-c perl-dev libxcb-dev xcb-util-dev xorg-server-xephyr"
 subpackages="$pkgname-doc"
 source="https://i3wm.org/downloads/i3-$pkgver.tar.bz2
 	i3wm-musl-glob-tilde.patch
diff --git a/user/imake/APKBUILD b/user/imake/APKBUILD
index db1fd9f55..d2092acd9 100644
--- a/user/imake/APKBUILD
+++ b/user/imake/APKBUILD
@@ -4,23 +4,22 @@ pkgname=imake
 pkgver=1.0.8
 pkgrel=0
 pkgdesc="X Windows make utility"
-url="https://www.x.org"
+url="https://www.X.Org/"
 arch="all"
+options="!check"  # No test suite.
 license="X11"
-options="!check"  # No testsuite
 depends=""
 makedepends="util-macros xorgproto-dev"
 subpackages="$pkgname-doc"
-source="http://ftp.x.org/pub/individual/util/$pkgname-$pkgver.tar.bz2"
+source="https://www.X.org/releases/individual/util/$pkgname-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
-	./configure --prefix=/usr
+	./configure \
+		--prefix=/usr
 	make
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/inconsolata-lgc/APKBUILD b/user/inconsolata-lgc/APKBUILD
index f8d3de1a6..c4748657c 100644
--- a/user/inconsolata-lgc/APKBUILD
+++ b/user/inconsolata-lgc/APKBUILD
@@ -15,8 +15,7 @@ source="https://github.com/MihailJP/Inconsolata-LGC/releases/download/LGC-$pkgve
 builddir="$srcdir/InconsolataLGC-OT"
 
 package() {
-	cd "$builddir"
-	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF *.otf
+	install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF "$builddir"/*.otf
 }
 
 sha512sums="3e985618b0c067d981620a461655d176a41bbef3d225d7d609b8dc9d5c04361b1df322eefab58f9620cfdff323e2bd7127c7e4f5f21f291b173a769cefa93ece  InconsolataLGC-OT-1.3.0.tar.xz"
diff --git a/user/intlfonts/APKBUILD b/user/intlfonts/APKBUILD
index 35f39ccb6..ef31cd0be 100644
--- a/user/intlfonts/APKBUILD
+++ b/user/intlfonts/APKBUILD
@@ -14,7 +14,6 @@ subpackages=""
 source="https://ftp.gnu.org/gnu/intlfonts/intlfonts-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,7 +29,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	mv "$pkgdir"/usr/share/fonts/X11/misc/TrueType \
 		"$pkgdir"/usr/share/fonts/X11/TTF
diff --git a/user/iperf3/APKBUILD b/user/iperf3/APKBUILD
index 906d8cd30..f167ef0c3 100644
--- a/user/iperf3/APKBUILD
+++ b/user/iperf3/APKBUILD
@@ -11,17 +11,16 @@ arch="all"
 license="BSD-3-Clause"
 depends=""
 makedepends=""
-install=""
 subpackages="$pkgname-doc $pkgname-openrc"
 source="$pkgname-$pkgver.tar.gz::https://downloads.es.net/pub/$_pkgname/$_pkgname-$pkgver.tar.gz
 	$_pkgname.initd
 	$_pkgname.confd
 
-	build-fixes.patch"
+	build-fixes.patch
+	"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
 	CFLAGS="$CFLAGS -D_GNU_SOURCE"
 	./configure \
 		--build=$CBUILD \
@@ -35,12 +34,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	install -Dm755 "$srcdir"/$_pkgname.initd \
diff --git a/user/iputils/APKBUILD b/user/iputils/APKBUILD
index f3cca0f7e..1d625f8f7 100644
--- a/user/iputils/APKBUILD
+++ b/user/iputils/APKBUILD
@@ -8,9 +8,9 @@ url="https://github.com/iputils/iputils/"
 arch="all"
 options="suid"
 license="BSD-3-Clause AND GPL-2.0-or-later"
+depends=""
 makedepends="docbook-xsl docbook-xsl-ns libcap-dev libgcrypt-dev libxslt meson
 	openssl-dev"
-replaces="bbsuid"
 subpackages="$pkgname-doc $pkgname-lang $pkgname-openrc"
 source="$pkgname-$pkgver.tgz::https://github.com/$pkgname/$pkgname/archive/s$pkgver.tar.gz"
 builddir="$srcdir/$pkgname-s$pkgver"
diff --git a/user/irssi/APKBUILD b/user/irssi/APKBUILD
index 2a89e8d9b..3e6319e30 100644
--- a/user/irssi/APKBUILD
+++ b/user/irssi/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Text-based IRC client"
 url="https://irssi.org"
 arch="all"
 license="GPL-2.0+ AND ISC"
+depends=""
 makedepends="ncurses-dev glib-dev openssl-dev perl-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-perl"
 source="https://github.com/irssi/irssi/releases/download/$pkgver/irssi-$pkgver.tar.xz"
diff --git a/user/isync/APKBUILD b/user/isync/APKBUILD
index afe53112f..5b922eb90 100644
--- a/user/isync/APKBUILD
+++ b/user/isync/APKBUILD
@@ -6,15 +6,14 @@ pkgrel=0
 pkgdesc="IMAP and MailDir mailbox synchronizer"
 url="http://isync.sourceforge.net/"
 arch="all"
+options="!check"  # No test suite.
 license="GPL-2.0+"
-options="!check" # No test suite
 depends=""
 makedepends="db-dev cyrus-sasl-dev openssl-dev zlib-dev"
 subpackages="$pkgname-doc"
 source="https://downloads.sourceforge.net/isync/$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/yajl/APKBUILD b/user/yajl/APKBUILD
index 6a1f5991d..5be54b007 100644
--- a/user/yajl/APKBUILD
+++ b/user/yajl/APKBUILD
@@ -7,30 +7,30 @@ url="http://lloyd.github.com/yajl/"
 arch="all"
 license="ISC"
 depends=""
-makedepends="cmake"
 checkdepends="cmd:which"
+makedepends="cmake"
 subpackages="$pkgname-dev $pkgname-tools"
 source="yajl-$pkgver.tar.gz::https://github.com/lloyd/yajl/archive/$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
-	cmake -DCMAKE_INSTALL_PREFIX="/usr" .
+	cmake \
+		-DCMAKE_INSTALL_PREFIX="/usr" \
+		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+		.
 	make
 }
 
-package() {
-	cd "$builddir"
-	make install DESTDIR="$pkgdir"
-	mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib/
-}
-
 check() {
-	cd "$builddir"
 	make test
 	# make test-api just checks the return status of gen-extra-close
 	# and also forkbombs, so elide that
 }
 
+package() {
+	make install DESTDIR="$pkgdir"
+	mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib/
+}
+
 tools() {
 	pkgdesc="JSON tools based on Yajl"
 	mkdir -p "$subpkgdir"/usr/