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

4 files changed, 6 insertions, 14 deletions

diff --git a/user/chrony/APKBUILD b/user/chrony/APKBUILD
index 01f3a13b7..e6a8f7303 100644
--- a/user/chrony/APKBUILD
+++ b/user/chrony/APKBUILD
@@ -10,11 +10,12 @@ url="https://chrony.tuxfamily.org"
 pkgusers="$pkgname"
 pkggroups="$pkgname"
 arch="all"
+options="!check"  # Test suite no longer functions after 2020-01-01.
 license="GPL-2.0-only"
-install="$pkgname.pre-install $pkgname.pre-upgrade"
 depends=""
-makedepends="asciidoctor libcap-dev libedit-dev texinfo"
 checkdepends="bash"
+makedepends="asciidoctor libcap-dev libedit-dev texinfo"
+install="$pkgname.pre-install $pkgname.pre-upgrade"
 subpackages="$pkgname-doc $pkgname-openrc"
 source="https://download.tuxfamily.org/$pkgname/$pkgname-$pkgver.tar.gz
 	fix-tests.patch
@@ -41,7 +42,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	CPPFLAGS="$CPPFLAGS -I./pps-tools/" ./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
@@ -55,12 +55,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	mkdir -p "$pkgdir"/etc/logrotate.d
diff --git a/user/prosody/APKBUILD b/user/prosody/APKBUILD
index 2281b6635..3eefc6a67 100644
--- a/user/prosody/APKBUILD
+++ b/user/prosody/APKBUILD
@@ -21,7 +21,6 @@ source="https://prosody.im/downloads/source/$pkgname-$pkgver.tar.gz
 	"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc/prosody \
@@ -37,12 +36,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	install -d -o prosody -g prosody "$pkgdir/var/log/prosody"
@@ -54,4 +51,4 @@ package() {
 
 sha512sums="07239433c7c65184ca24d665c92b787ff9e4a5ee190ab90dede802ffd2cbd97855356d818858871e62284e9923f485b3468ab1baed5d3fb13aac0551a38967eb  prosody-0.11.3.tar.gz
 a6ca168fe3d11ee3b05295fb36dfaf8240c60a85507032b2502f9a97d3fd055f7eee38ba6efbb8f79472fc7cdd3556922194d0bd7099f7fb809be01890acc511  prosody.cfg.lua.patch
-24360603dbd5d2a92758e6c4b4aab4f02cbd05373580cba2df76df98b6045891e8108e8c2d16af9508e93968ed5880db952e7a21b2742ebeec6f14b167968c2c  prosody.initd"
+11b0f5e4fa488e047c26aa5e51c35983100cdbf7ebbf7c8b6d003c8db7f52e797f93e4744d54b3094c82d722d5e4de62b5734376cb5e69a4c6127f8cb07a4347  prosody.initd"
diff --git a/user/wireguard-module/APKBUILD b/user/wireguard-module/APKBUILD
index e77179680..17adf761d 100644
--- a/user/wireguard-module/APKBUILD
+++ b/user/wireguard-module/APKBUILD
@@ -9,11 +9,11 @@ _pkgreal="wireguard-linux-compat"
 pkgdesc="Kernel module for the WireGuard VPN, built for easy-kernel"
 url="https://www.wireguard.com/"
 arch="all"
-options="!check !dbg !strip" # no test suite
+options="!check !dbg !strip"  # No test suite.
 license="GPL-2.0-only"
-provides="$_pkgname=$pkgver"
 depends="easy-kernel-modules-$_kver"
 makedepends="easy-kernel-src-$_kver"
+provides="$_pkgname=$pkgver"
 subpackages="wireguard-patch:_patch:noarch"
 source="https://git.zx2c4.com/$_pkgreal/snapshot/$_pkgreal-$pkgver.tar.xz"
 builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/wireguard-tools/APKBUILD b/user/wireguard-tools/APKBUILD
index 37aeb1ab7..564f1d9bd 100644
--- a/user/wireguard-tools/APKBUILD
+++ b/user/wireguard-tools/APKBUILD
@@ -12,15 +12,12 @@ depends="bash iproute2"
 makedepends="libmnl-dev"
 subpackages="$pkgname-bash-completion:bashcomp:noarch $pkgname-doc"
 source="https://git.zx2c4.com/$pkgname/snapshot/$pkgname-$pkgver.tar.xz"
-builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
 	make RUNSTATEDIR=/run -C src
 }
 
 package() {
-	cd "$builddir"
 	make WITH_BASHCOMPLETION=yes WITH_WGQUICK=yes DESTDIR="$pkgdir" -C src install
 }