user/s6-networking: upgrade to 2.3.0.4

1 files changed, 38 insertions, 8 deletions

diff --git a/user/s6-networking/APKBUILD b/user/s6-networking/APKBUILD
index 39b08026f..09ba89702 100644
--- a/user/s6-networking/APKBUILD
+++ b/user/s6-networking/APKBUILD
@@ -1,16 +1,17 @@
 # Contributor: Laurent Bercot <ska-adelie@skarnet.org>
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=s6-networking
-pkgver=2.3.0.3
+pkgver=2.3.0.4
 pkgrel=0
-pkgdesc="skarnet.org's UCSPI Unix and TCP tools, access control tools, and network time management utilities."
+pkgdesc="skarnet.org's UCSPI TCP tools, access control tools, and network time management utilities."
 url="https://skarnet.org/software/$pkgname/"
 arch="all"
-license="ISC"
 options="!check"  # No test suite.
-depends_dev="skalibs-dev bearssl-dev"
-makedepends="skalibs-dev execline-dev s6-dev s6-dns-dev bearssl-dev"
-subpackages="$pkgname-dev $pkgname-doc"
+license="ISC"
+_skalibs_version=2.8
+depends="execline"
+makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version execline-dev s6-dev s6-libs-dev s6-dns-dev s6-dns-libs-dev bearssl-dev"
+subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
 source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
 
 build() {
@@ -20,6 +21,7 @@ build() {
                 --enable-static \
                 --disable-allstatic \
                 --prefix=/usr \
+		--libdir=/usr/lib \
                 --libexecdir="/usr/lib/$pkgname" \
                 --with-dynlib=/lib \
                 --enable-ssl=bearssl
@@ -31,10 +33,38 @@ package() {
         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/"
+}
+
+
+dev() {
+        pkgdesc="$pkgdesc (development files)"
+        depends="skalibs-dev>=$_skalibs_version"
+        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/"
+}
+
+
 doc() {
-        default_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"
 }
 
-sha512sums="f710c8c67b88523d4d461ab775ad3a56ca148e0e5ee4c02fe40d0783ff43af8779e598548db5048cc32852be6659f2feb7ac29ba07a953daa0039cec0fc14762  s6-networking-2.3.0.3.tar.gz"
+sha512sums="e0a6dbaf3420beae5b6bab1cedeaeb5d58dea36c9a6e1c3f7140515c83eaf3e872f896d90e43771d74669edcc0a3f25ba8135cc3a21d378a297d92ba2abc62d3  s6-networking-2.3.0.4.tar.gz"