From e0ff0c85c2b776737d66506d309583b1a8fbd1b9 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-adelie@skarnet.org>
Date: Mon, 15 Apr 2024 17:38:22 +0000
Subject: user/s6-networking: simplify APKBUILD

---
 user/s6-networking/APKBUILD | 39 +++++----------------------------------
 1 file changed, 5 insertions(+), 34 deletions(-)

(limited to 'user')

diff --git a/user/s6-networking/APKBUILD b/user/s6-networking/APKBUILD
index 8450370a4..a129c6931 100644
--- a/user/s6-networking/APKBUILD
+++ b/user/s6-networking/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=s6-networking
 pkgver=2.7.0.2
-pkgrel=0
+pkgrel=1
 pkgdesc="skarnet.org's UCSPI TCP and TLS tools, access control tools, and network time management utilities."
 url="https://skarnet.org/software/s6-networking/"
 arch="all"
@@ -10,8 +10,8 @@ options="!check"  # No test suite.
 license="ISC"
 _skalibs_version=2.14.1
 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"
+makedepends="skalibs-dev>=$_skalibs_version execline-dev s6-dev s6-dns-dev bearssl-dev"
+subpackages="$pkgname-dev $pkgname-libs $pkgname-doc"
 source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
 
 build() {
@@ -29,37 +29,8 @@ build() {
 
 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"
-	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/"
-}
-
-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"
+	mkdir -p -m 0755 "$pkgdir/usr/share/doc"
+	cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname"
 }
 
 sha512sums="49f80c68d639f2b7ac7451ca2ace828ca4e8c1eeffec4a9b31f8157c26a87228275ea14d8b6495b0af0879a961b37910aa2b769d8db56d8731d0827c96053631  s6-networking-2.7.0.2.tar.gz"
-- 
cgit v1.2.3-70-g09d2