From 0d5a660ecab48aa1174dc3e82e95c27b8d11db79 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-adelie@skarnet.org>
Date: Mon, 15 Apr 2024 16:59:55 +0000
Subject: system/s6: simplify APKBUILD

---
 system/s6/APKBUILD | 43 +++++--------------------------------------
 1 file changed, 5 insertions(+), 38 deletions(-)

(limited to 'system/s6')

diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD
index c3460458c..4a6d060cf 100644
--- a/system/s6/APKBUILD
+++ b/system/s6/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Laurent Bercot <ska-adelie@skarnet.org>
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=s6
-pkgver=2.12.0.3
+pkgver=2.12.0.4
 pkgrel=0
 pkgdesc="skarnet.org's small & secure supervision software suite"
 url="https://skarnet.org/software/s6/"
@@ -12,7 +12,7 @@ _skalibs_version=2.14.1
 depends="execline"
 makedepends="skalibs-dev>=$_skalibs_version execline-dev"
 install="$pkgname.post-upgrade"
-subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
+subpackages="$pkgname-dev $pkgname-libs $pkgname-doc"
 triggers="$pkgname.trigger=/run/service"
 source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
 
@@ -30,41 +30,8 @@ build() {
 
 package() {
 	make DESTDIR="$pkgdir" install
-	mkdir -p -m 0755 "$pkgdir/var/lib/s6/services"
+	mkdir -p -m 0755 "$pkgdir/var/lib/s6/services" "$pkgdir/usr/share/doc"
+	cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname"
 }
 
-
-libs() {
-        pkgdesc="$pkgdesc (shared libraries)"
-        depends="skalibs-libs>=$_skalibs_version"
-        mkdir -p "$subpkgdir/lib"
-        mv "$pkgdir"/lib/*.so.* "$subpkgdir/lib/"
-}
-
-
-dev() {
-        pkgdesc="$pkgdesc (development files)"
-        depends="skalibs-dev>=$_skalibs_version"
-        install_if="dev $pkgname=$pkgver-r$pkgrel"
-        mkdir -p "$subpkgdir/usr"
-        mv "$pkgdir/usr/lib" "$pkgdir/usr/include" "$subpkgdir/usr/"
-}
-
-
-libsdev() {
-        pkgdesc="$pkgdesc (development files for dynamic linking)"
-        depends="$pkgname-dev"
-        mkdir -p "$subpkgdir/lib"
-        mv "$pkgdir"/lib/*.so "$subpkgdir/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"
-}
-
-sha512sums="ecc57b5a06fb413d74337324f8942c905075cf14d87c1471568a836c747271cf95d0edecac69dea54cee55f7a3dbd102493876356c2d36065ab35962b87b559a  s6-2.12.0.3.tar.gz"
+sha512sums="dfdb9c0189177762a89d1f47e1d6b0a82bba5554baef4fa899b1c0a85c192d5e1dac2b929173d750df3707f0d699b28591f1eab3e63b8791e4a51af1c65e3e56  s6-2.12.0.4.tar.gz"
-- 
cgit v1.2.3-60-g2f50