main/s6-dns: upgrade to 2.4.0.0

Optimize build, make usrmerge-ready

Signed-off-by: Laurent Bercot <ska@appnovation.com>

main/s6-dns/APKBUILD

 # Contributor: John Regan <john@jrjrtech.com>
 # Maintainer: Laurent Bercot <ska-devel@skarnet.org>
 pkgname=s6-dns
-pkgver=2.3.7.2
+pkgver=2.4.0.0
 pkgrel=0
 pkgdesc="skarnet.org's DNS client libraries and command-line DNS client utilities"
 url=https://skarnet.org/software/s6-dns/
 arch="all"
 license="ISC"
 options="!check"
-makedepends="skalibs-dev>=2.14"
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="https://skarnet.org/software/s6-dns/s6-dns-$pkgver.tar.gz s6-dns.pc"
-
-prepare() {
-	default_prepare
-	sed -i -e "s/@@VERSION@@/$pkgver/g" -- "$srcdir"/*.pc
-}
+_skalibs_version=2.14.3
+makedepends="skalibs-dev>=${_skalibs_version}"
+subpackages="$pkgname-static $pkgname-libs $pkgname-dev $pkgname-doc"
+source="https://skarnet.org/software/s6-dns/s6-dns-$pkgver.tar.gz s6-dns.pc.in"
 
 build() {
 	./configure \
 		--enable-shared \
-		--enable-static \
 		--disable-allstatic \
 		--prefix=/usr \
-		--libdir=/usr/lib \
-		--libexecdir="/usr/lib/$pkgname" \
-		--with-dynlib=/lib
+		--libexecdir="/usr/lib/$pkgname"
 	make
 }
 
 package() {
 	make DESTDIR="$pkgdir" install
-	install -D -m644 "$srcdir/s6-dns.pc" "$pkgdir/usr/lib/pkgconfig/s6-dns.pc"
-}
-
-doc() {
-	default_doc
-	mkdir -p "$subpkgdir/usr/share/doc"
-	cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
-}
-
-static() {
-	default_static
-	rmdir -p "$pkgdir"/usr/lib/"$pkgname" || :
+	sed -e "s/@@VERSION@@/$pkgver/g; s/@@SKALIBS_VERSION@@/${_skalibs_version}/g;" "$srcdir/$pkgname.pc.in" > "$srcdir/$pkgname.pc"
+	install -D -m 0644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc"
+	mkdir -p "$pkgdir/usr/share/doc"
+	cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname"
 }
 
 sha512sums="
-4dc89e3b8ba22e4e63e8e5a84432ce444865712755c600b4bc62b49dda13c09c372ff2169b0db4790d0f07c392005dda76ed1df5ef8335d2f382d09919b53eae  s6-dns-2.3.7.2.tar.gz
-2b285cf8691ad30e8ada115d2ee81b4d356eda042b0ab18cf3006069707963bedc922c9f3bf2051c11e4abc30abed2932fd6c3f1f8d4e0d54bf11e30c3741090  s6-dns.pc
+6c9eb8ad4501ac20733747ae0065ed1d19abd2c61e29e98fc6d0421367ec9ece951daea287e4ec8c4301a74b6f96b8a0e376b4b3ba046cca515b8b57d69600e2  s6-dns-2.4.0.0.tar.gz
+fd93571da2d2a6c2dea00219414f9ee5fe3bc09a4a6a7fd002b9251c22ff682eddfeff4bf9c6c90d8b02681fc8117328a1fd9689839ab457d354870c522bf5e7  s6-dns.pc.in
 "

main/s6-dns/s6-dns.pc → main/s6-dns/s6-dns.pc.in

 Name: s6-dns
-Description: DNS clients and libraries from skarnet.org
+Description: A DNS client library for sync+async single-threaded resolution
 URL: https://skarnet.org/software/s6-dns/
 Version: @@VERSION@@
-Requires.private: skalibs
+Requires.private: skalibs >= @@SKALIBS_VERSION@@
 Libs: -ls6dns
-Cflags: -I/usr/include/s6-dns