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

user/mac-fdisk/APKBUILD

@@ -7,8 +7,8 @@ pkgrel=2
 pkgdesc="68K and PowerPC fixed disk partitioning utility"
 url="https://adelielinux.org/"
 arch="all !aarch64"  # Literally does not support this arch.
-license="GPL-2.0"
 options="!check"  # No test suite.
+license="GPL-2.0"
 depends=""
 makedepends="linux-headers"
 subpackages="$pkgname-doc"
@@ -23,16 +23,15 @@ source="https://distfiles.adelielinux.org/source/mac-fdisk_0.1.orig.tar.gz
 	mac-fdisk-large-disk-support.patch
 	mac-fdisk-largerthan2gb.patch
 	mac-fdisk-non-glibc-support.patch
-	flush-stdout.patch"
+	flush-stdout.patch
+	"
 builddir="$srcdir/$pkgname-$_pkgver.orig"
 
 build() {
-	cd "$builddir"
 	make CFLAGS="-D_GNU_SOURCE"
 }
 
 package() {
-	cd "$builddir"
 	mkdir -p "$pkgdir"/sbin
 	make DESTDIR="$pkgdir" install
 

user/mactel-boot/APKBUILD

@@ -14,7 +14,6 @@ subpackages="$pkgname-doc"
 source="http://www.codon.org.uk/~mjg59/mactel-boot/mactel-boot-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	make hfs-bless
 }
 

user/mednafen/APKBUILD

@@ -6,12 +6,12 @@ pkgrel=0
 pkgdesc="Portable multi-system emulator"
 url="https://mednafen.github.io/"
 arch="all !s390x"
-options="!check !dbg" # mednafen does not ship actual tests
+options="!check !dbg"  # mednafen does not ship actual tests
 subpackages="$pkgname-lang"
 license="GPL-2.0-only"
 depends=""
 makedepends="alsa-lib-dev flac-dev libogg-dev libsndfile-dev libvorbis-dev
-	lzo-dev sdl2-dev zlib-dev"
+	lzo-dev sdl2-dev zlib-dev autoconf automake"
 source="https://mednafen.github.io/releases/files/$pkgname-$pkgver.tar.xz
 	ppc.patch
 	ppc64.patch

user/mesa-demos/APKBUILD

@@ -5,15 +5,15 @@ pkgname=mesa-demos
 pkgver=8.4.0
 pkgrel=1
 pkgdesc="Mesa demos and utils"
-url="http://mesa3d.org"
+url="https://mesa3d.org"
 arch="all"
+options="!check"  # No test suite.
 license="X11"
-options="!check"  # No testsuite
+depends=""
 makedepends="mesa-dev glew-dev glu-dev freeglut-dev freetype-dev libtool"
-source="ftp://ftp.freedesktop.org/pub/mesa/demos/$pkgname-$pkgver.tar.bz2"
+source="https://mesa.freedesktop.org/archive/demos/$pkgname-$pkgver.tar.bz2"
 
 build() {
-        cd "$builddir"
         export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
@@ -23,7 +23,6 @@ build() {
 }
 
 package() {
-        cd "$builddir"
         make -j1 DESTDIR="$pkgdir" install
 	# conflicts with X11 bitmap tool
 	mv "$pkgdir"/usr/bin/bitmap "$pkgdir"/usr/bin/bitmap-demo

user/mimetic/APKBUILD

@@ -16,13 +16,11 @@ source="http://www.codesink.org/download/mimetic-$pkgver.tar.gz
 	"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -34,12 +32,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 

user/minicom/APKBUILD

@@ -3,7 +3,7 @@
 pkgname=minicom
 pkgver=2.7.1
 pkgrel=0
-pkgdesc="menu driven communications program for terminals"
+pkgdesc="Menu-driven communications program for terminals"
 url="https://fossies.org/linux/minicom/"
 arch="all"
 license="GPL-2.0+"
@@ -11,10 +11,10 @@ depends=""
 makedepends="ncurses-dev gettext-tiny-dev linux-headers"
 subpackages="$pkgname-doc $pkgname-lang"
 source="https://fossies.org/linux/misc/$pkgname-$pkgver.tar.gz
-	fix-includes.patch"
+	fix-includes.patch
+	"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,12 +26,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 

user/mksh/APKBUILD

@@ -8,12 +8,12 @@ url="http://mirbsd.de/mksh"
 arch="all"
 license="MirOS OR ISC"
 depends=""
-makedepends=""
 checkdepends="ed perl"
+makedepends=""
 subpackages="$pkgname-doc"
 install="mksh.post-install mksh.post-upgrade mksh.pre-deinstall"
 source="http://www.mirbsd.org/MirOS/dist/mir/${pkgname}/${pkgname}-R${pkgver}.tgz"
-builddir=$srcdir/$pkgname
+builddir="$srcdir"/$pkgname
 
 build() {
 	# Build the main shell:
@@ -27,10 +27,10 @@ build() {
 }
 
 check() {
-	echo "Running the test suite for mksh:"
+	msg "Running the test suite for mksh"
 	./test_mksh.sh
 
-	echo "Running the test suite for lksh:"
+	msg "Running the test suite for lksh:"
 	./test_lksh.sh
 }
 

user/monoid/APKBUILD

@@ -15,8 +15,7 @@ source="https://raw.githubusercontent.com/larsenwork/monoid/2db2d289f4e61010dd3f
 builddir="$srcdir/"
 
 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="2776bbc7febf17c10f87bbdd3e6e4fd7c24b93286009d1dcb0ca8058e1e1437c3179068ab608c3f69ae07c08950ececb4d0ad88e82ccba4a6bd2d8b63f71a9c8  Monoid-Small.zip"

user/mousepad/APKBUILD

@@ -7,6 +7,7 @@ pkgdesc="Simple text editor for the XFCE desktop environment"
 url="https://xfce.org"
 arch="all"
 license="GPL-2.0+"
+depends=""
 makedepends="dbus-glib-dev glib-dev gtk+3.0-dev gtksourceview-3.0-dev intltool
 	xfconf-dev"
 subpackages="$pkgname-lang"

user/mtr/APKBUILD

@@ -41,15 +41,13 @@ build() {
 }
 
 package() {
-	cd "$builddir"/curses
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" -C curses install
 }
 
 gtk() {
 	pkgdesc="Graphical traceroute tool"
 	depends=""
-	cd "$builddir"/gtk
-	make DESTDIR="$subpkgdir" install
+	make DESTDIR="$subpkgdir" -C "$builddir"/gtk install
 	install -D -m 644 "$srcdir"/mtr-gtk.desktop \
 		"$subpkgdir"/usr/share/applications/mtr-gtk.desktop
 	install -D -m 644 "$builddir"/img/mtr_icon.xpm \

user/musl-obstack/APKBUILD

@@ -8,7 +8,7 @@ url=" "
 arch="all"
 license="GPL-2.0+"
 depends=""
-makedepends=""
+makedepends="autoconf automake libtool"
 subpackages="$pkgname-dev"
 source="musl-obstack-$pkgver.tar.gz::https://github.com/pullmoll/musl-obstack/archive/v$pkgver.tar.gz"
 

user/mythes/APKBUILD

@@ -8,13 +8,13 @@ url="http://hunspell.github.io/"
 arch="all"
 options="!check"  # No test suite.
 license="Custom"
-subpackages="$pkgname-dev"
+depends=""
 depends_dev="perl hunspell-dev"
 makedepends="$depends_dev"
-source="http://downloads.sourceforge.net/hunspell/$pkgname-$pkgver.tar.gz"
+subpackages="$pkgname-dev"
+source="https://downloads.sourceforge.net/hunspell/$pkgname-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,7 +30,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }

user/nasm/APKBUILD

@@ -6,12 +6,13 @@ pkgdesc="80x86 assembler designed for portability and modularity"
 url="https://www.nasm.us/"
 arch="all"
 license="BSD-2-Clause"
+depends=""
 checkdepends="perl"
+makedepends=""
 subpackages="$pkgname-doc"
 source="https://www.nasm.us/pub/nasm/releasebuilds/$pkgver/$pkgname-$pkgver.tar.bz2"
 
 build () {
-	cd "$builddir"
 	export CFLAGS=
 	export CXXFLAGS=
 	./configure \
@@ -22,12 +23,10 @@ build () {
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 

user/ncftp/APKBUILD

@@ -8,13 +8,12 @@ url="http://www.ncftp.com/"
 arch="all"
 options="!check"  # No test suite.
 license="ClArtistic"
+depends=""
 makedepends="ncurses-dev"
-source="ftp://ftp.ncftp.com/ncftp/$pkgname-$pkgver-src.tar.gz"
 subpackages="$pkgname-doc $pkgname-bookmarks"
+source="ftp://ftp.ncftp.com/ncftp/$pkgname-$pkgver-src.tar.gz"
 
-build () {
-	cd "$builddir"
-
+build() {
 	LIBS="-ltinfo" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -22,22 +21,18 @@ build () {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man
 
-	cd "$builddir"/libncftp
-	make shared
-	cd "$builddir"
+	make -C libncftp shared
 	make
 }
 
 package() {
-	cd "$builddir"/libncftp
-	make PREFIX="${pkgdir}"/usr soinstall
-	cd "$builddir"
+	make PREFIX="${pkgdir}"/usr -C libncftp soinstall
 	make DESTDIR="$pkgdir" install
 	install -D doc/LICENSE.txt \
 		"$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE
 }
 
-bookmarks () {
+bookmarks() {
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/ncftpbookmarks \
 		"$subpkgdir"/usr/bin/

user/ncompress/APKBUILD

@@ -8,6 +8,8 @@ url="https://github.com/vapier/ncompress"
 arch="all"
 options="!check"  # No test suite.
 license="Public-Domain"
+depends=""
+makedepends=""
 subpackages="$pkgname-doc"
 source="https://downloads.sourceforge.net/ncompress/ncompress-$pkgver.tar.gz
 	fix-9bit-compress.patch"

user/netifrc/APKBUILD

@@ -14,12 +14,10 @@ subpackages="$pkgname-doc $pkgname-openrc"
 source="https://gitweb.gentoo.org/proj/$pkgname.git/snapshot/$pkgname-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	make UDEVDIR=/lib/udev LIBEXECDIR=/lib/$pkgname PF="$pkgname-$pkgver"
 }
 
 package() {
-	cd "$builddir"
 	make UDEVDIR=/lib/udev LIBEXECDIR=/lib/$pkgname DESTDIR="$pkgdir" install
 	for doc in README CREDITS TODO; do
 		install -m 644 "$builddir"/$doc "$pkgdir"/usr/share/doc/$pkgname/

user/netqmail/APKBUILD

@@ -7,13 +7,13 @@ pkgdesc="The qmail mail transfer agent (community version)"
 url="http://www.netqmail.org/"
 arch="all"
 license="Public-Domain"
-provides=sendmail
 options="suid !check" # suid programs (qmail-queue); no test suite
 depends="execline s6 s6-networking"
 makedepends="utmps-dev"
 subpackages="$pkgname-doc $pkgname-openrc"
-install="$pkgname.post-install $pkgname.pre-deinstall"
 provider_priority=1
+provides="sendmail"
+install="$pkgname.post-install $pkgname.pre-deinstall"
 source="http://www.netqmail.org/$pkgname-$pkgver.tar.gz
 	0001-DESTDIR.patch
 	0002-qbiffutmpx-20170820.patch
@@ -66,7 +66,6 @@ makeservicedir()
 }
 
 build() {
-        cd "$builddir"
         echo "$CC $CFLAGS" > conf-cc
         echo "$CC $LDFLAGS -s -static" > conf-ld
         echo "$CC $LDFLAGS" > conf-ldi  # because fakeroot doesn't work with static programs
@@ -79,7 +78,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	mkdir -p -m 0755 "$pkgdir"/var/qmail/services "$pkgdir"/var/log/qmail "$pkgdir"/usr/bin "$pkgdir"/usr/sbin "$pkgdir"/usr/share/doc "$pkgdir"/etc/qmail/services "$pkgdir"/etc/conf.d "$pkgdir"/etc/init.d
 	chown qmaill:qmaill "$pkgdir"/var/log/qmail
 	chmod 2700 "$pkgdir"/var/log/qmail

user/newt/APKBUILD

@@ -10,7 +10,7 @@ arch="all"
 options="!check"  # No test suite.
 license="LGPL-2.0-only"
 depends=""
-makedepends="popt-dev slang-dev"
+makedepends="autoconf automake popt-dev slang-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="https://pagure.io/newt/archive/r$_pkgver/newt-r$_pkgver.tar.gz"
 builddir="$srcdir/newt-r$_pkgver"

user/numactl/APKBUILD

 # Contributor: Daniel Sabogal <dsabogalcc@gmail.com>
-# Maintainer:  Dan Theisen <djt@hxx.in>
+# Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=numactl
 pkgver=2.0.13
 pkgrel=0
@@ -8,10 +8,12 @@ url="https://github.com/numactl/numactl"
 # ARM lacks the __NR_migrate_pages syscall
 arch="all !armhf !armv7"
 license="GPL-2.0+ AND LGPL-2.1"
+depends=""
 makedepends="autoconf automake libtool linux-headers"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
 source="$pkgname-$pkgver.tar.gz::https://github.com/numactl/$pkgname/archive/v$pkgver.tar.gz
-	musl.patch"
+	musl.patch
+	"
 
 prepare() {
 	default_prepare

user/opengfx/APKBUILD

@@ -17,13 +17,10 @@ source="https://binaries.openttd.org/extra/opengfx/$pkgver/$pkgname-$pkgver-sour
 builddir="$srcdir/$pkgname-$pkgver-source"
 
 build() {
-	cd "$builddir"
 	make GIMP="" _V="" bundle_tar
 }
 
 package() {
-	cd "$builddir"
-	local _file
 	for _file in *.grf opengfx.obg; do
 		install -D -m644 -g games $_file \
 			"$pkgdir"/usr/share/games/openttd/data/$_file