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

1 files changed, 17 insertions, 24 deletions

diff --git a/user/s6-dns/APKBUILD b/user/s6-dns/APKBUILD
index c2d36c2df..4fbbfe04a 100644
--- a/user/s6-dns/APKBUILD
+++ b/user/s6-dns/APKBUILD
@@ -9,13 +9,12 @@ arch="all"
 options="!check"
 license="ISC"
 _skalibs_version=2.9
-depends=
+depends=""
 makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version"
 subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
 source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--enable-shared \
 		--enable-static \
@@ -28,42 +27,36 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-
 libs() {
-        pkgdesc="$pkgdesc (shared libraries)"
-        depends="skalibs-libs>=$_skalibs_version"
-        mkdir -p "$subpkgdir/usr/lib"
-        mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir/usr/lib/"
+	pkgdesc="$pkgdesc (shared libraries)"
+	depends="skalibs-libs>=$_skalibs_version"
+	mkdir -p "$subpkgdir/usr/lib"
+	mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir/usr/lib/"
 }
 
-
 dev() {
-        pkgdesc="$pkgdesc (development files)"
-        depends="skalibs-dev>=$_skalibs_version"
-        mkdir -p "$subpkgdir/usr/include" "$subpkgdir/usr/lib"
-        mv "$pkgdir/usr/include" "$subpkgdir/usr/"
+	pkgdesc="$pkgdesc (development files)"
+	depends="skalibs-dev>=$_skalibs_version"
+	install_if="dev $pkgname=$pkgver-r$pkgrel"
+	mkdir -p "$subpkgdir/usr/include" "$subpkgdir/usr/lib"
+	mv "$pkgdir/usr/include" "$subpkgdir/usr/"
 	mv "$pkgdir"/usr/lib/*.a "$subpkgdir/usr/lib/"
 }
 
-
 libsdev() {
-        pkgdesc="$pkgdesc (development files for dynamic linking)"
-        depends="$pkgname-dev"
-        mkdir -p "$subpkgdir/usr/lib"
-        mv "$pkgdir"/usr/lib/*.so "$subpkgdir/usr/lib/"
+	pkgdesc="$pkgdesc (development files for dynamic linking)"
+	depends="$pkgname-dev"
+	mkdir -p "$subpkgdir/usr/lib"
+	mv "$pkgdir"/usr/lib/*.so "$subpkgdir/usr/lib/"
 }
 
-
 doc() {
-        pkgdesc="$pkgdesc (documentation)"
-        depends=
-        install_if="docs $pkgname=$pkgver-r$pkgrel"
-        mkdir -p "$subpkgdir/usr/share/doc"
-        cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
+	default_doc
+	mkdir -p "$subpkgdir/usr/share/doc"
+	cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
 }
 
 sha512sums="e69ee16cb16139d344255adc4bb92bd73003464925bbd2df893e3b922add155308b547274a66e3f20a5d3c0310c8fadc877b656753299ff9a269b4e25c26f7a9  s6-dns-2.3.1.1.tar.gz"