CVS commit: pkgsrc/sysutils/s6

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue May 13 03:43:21 UTC 2025

Modified Files:
        pkgsrc/sysutils/s6: Makefile PLIST distinfo

Log Message:
s6: update to 2.13.2.0. Changes:

- Bugfixes.
- pkg-config support.
- s6-svstat now correctly reports services that haven't started yet.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/sysutils/s6/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/s6/PLIST
cvs rdiff -u -r1.25 -r1.26 pkgsrc/sysutils/s6/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/s6/Makefile
diff -u pkgsrc/sysutils/s6/Makefile:1.27 pkgsrc/sysutils/s6/Makefile:1.28
--- pkgsrc/sysutils/s6/Makefile:1.27    Thu Nov 14 14:12:09 2024
+++ pkgsrc/sysutils/s6/Makefile Tue May 13 03:43:21 2025
@@ -1,42 +1,33 @@
-# $NetBSD: Makefile,v 1.27 2024/11/14 14:12:09 schmonz Exp $
+# $NetBSD: Makefile,v 1.28 2025/05/13 03:43:21 schmonz Exp $
 
-DISTNAME=      s6-2.13.1.0
-CATEGORIES=    sysutils
-MASTER_SITES=  ${HOMEPAGE}
-DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES_DIST}
-
-MAINTAINER=    schmonz%NetBSD.org@localhost
-HOMEPAGE=      https://skarnet.org/software/s6/
-COMMENT=       The s6 supervision suite
-LICENSE=       isc
-
-# man-pages version is usually not exactly in-sync with PKGVERSION_NOREV
+DISTNAME=              s6-2.13.2.0
 MANPAGES_VERSION=      2.13.1.0.1
+CATEGORIES=            sysutils
+MASTER_SITES=          ${HOMEPAGE}
 MANPAGES_DIST=         s6-man-pages-${MANPAGES_VERSION}.tar.gz
-SITES.${MANPAGES_DIST}=        -https://git.sr.ht/~flexibeast/s6-man-pages/archive/v${MANPAGES_VERSION}.tar.gz
+DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES_DIST}
+SITES.${MANPAGES_DIST}=        -https://git.sr.ht/~flexibeast/${PKGBASE}-man-pages/archive/v${MANPAGES_VERSION}.tar.gz
+
+MAINTAINER=            schmonz%NetBSD.org@localhost
+HOMEPAGE=              https://skarnet.org/software/s6/
+COMMENT=               The s6 supervision suite
+LICENSE=               isc
+
+TOOL_DEPENDS+=         coreutils-[0-9]*:../../sysutils/coreutils
+# "for certain binaries that spawn scripts interpreted with execlineb"
+DEPENDS+=              execline-[0-9]*:../../lang/execline
+
+WRKMANSRC=             ${WRKDIR}/${PKGBASE}-man-pages-v${MANPAGES_VERSION}
 
 USE_TOOLS+=            gmake
+TOOLS_PLATFORM.install=        ${PREFIX}/bin/ginstall
 HAS_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --prefix=${PREFIX}
-CONFIGURE_ARGS+=       --with-sysdeps=${PREFIX}/lib/skalibs/sysdeps
-CONFIGURE_ARGS+=       --with-lib=${PREFIX}/lib/execline
-CONFIGURE_ARGS+=       --with-lib=${PREFIX}/lib/skalibs
-CONFIGURE_ARGS+=       --with-include=${PREFIX}/include
-
-INSTALLATION_DIRS+=    ${PKGMANDIR}/man7 ${PKGMANDIR}/man8
-
-.PHONY: do-install-manpages
-post-install: do-install-manpages
-do-install-manpages:
-       cd ${WRKDIR}/${PKGBASE}-man-pages-*; for i in 7 8; do \
-               for j in man$$i/*.$$i; do \
-                       ${INSTALL_MAN} $$j \
-                       ${DESTDIR}${PREFIX}/${PKGMANDIR}/man$$i; \
-               done \
-       done
+CONFIGURE_ARGS+=       --prefix=${PREFIX:Q}
+CONFIGURE_ARGS+=       --enable-pkgconfig
+
+INSTALL_DIRS+=         . ${WRKMANSRC}
+INSTALL_ENV+=          PREFIX=${PREFIX:Q} MAN_DIR=${PREFIX:Q}/${PKGMANDIR:Q}
 
 .include "../../devel/skalibs/buildlink3.mk"
-# "for certain binaries that spawn scripts interpreted with execlineb"
-BUILDLINK_DEPMETHOD.execline+=         full
 .include "../../lang/execline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/s6/PLIST
diff -u pkgsrc/sysutils/s6/PLIST:1.9 pkgsrc/sysutils/s6/PLIST:1.10
--- pkgsrc/sysutils/s6/PLIST:1.9        Thu Nov 14 14:12:09 2024
+++ pkgsrc/sysutils/s6/PLIST    Tue May 13 03:43:21 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2024/11/14 14:12:09 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.10 2025/05/13 03:43:21 schmonz Exp $
 bin/s6-accessrules-cdb-from-fs
 bin/s6-accessrules-fs-from-cdb
 bin/s6-applyuidgid
@@ -76,6 +76,8 @@ include/s6/servicedir.h
 include/s6/supervise.h
 lib/libs6.a
 lib/libs6auto.a
+lib/pkgconfig/libs6.pc
+lib/pkgconfig/libs6auto.pc
 man/man7/s6-accessrules.7
 man/man7/s6-fdholder-error-codes.7
 man/man7/s6-fdholder.7

Index: pkgsrc/sysutils/s6/distinfo
diff -u pkgsrc/sysutils/s6/distinfo:1.25 pkgsrc/sysutils/s6/distinfo:1.26
--- pkgsrc/sysutils/s6/distinfo:1.25    Thu Nov 14 14:12:09 2024
+++ pkgsrc/sysutils/s6/distinfo Tue May 13 03:43:21 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.25 2024/11/14 14:12:09 schmonz Exp $
+$NetBSD: distinfo,v 1.26 2025/05/13 03:43:21 schmonz Exp $
 
-BLAKE2s (s6-2.13.1.0.tar.gz) = 1705546b6a7c4dcd5d8245a1a5c1ffba7de6dac732baf69db21d0f113e30ca14
-SHA512 (s6-2.13.1.0.tar.gz) = 89912f627d239e9d0b830c97e3b35b0358ac3ea1b3b958de091318e19ee9ca0bac0a008f114682bc0ed8388e15592ffd683c4bbf1128fe7109cad16f18a1065b
-Size (s6-2.13.1.0.tar.gz) = 256614 bytes
+BLAKE2s (s6-2.13.2.0.tar.gz) = 57e3abd9512e1e7890d5e1ecf6ed234cdd13630650e6128829fb37e0ddf2db41
+SHA512 (s6-2.13.2.0.tar.gz) = 0ee3b319fb0731681e8823bd6c0b415c556b87819b1ca72be2ff622b4f35f87ffe7a71ccaa2c783933d76eedcde7ded1fe767ee44a63e1717b2299a2b5aa81e1
+Size (s6-2.13.2.0.tar.gz) = 261121 bytes
 BLAKE2s (s6-man-pages-2.13.1.0.1.tar.gz) = bfcb559e0042948d6a8e28122797630711c7c68f8f533f63a6d60a443ff6cfdb
 SHA512 (s6-man-pages-2.13.1.0.1.tar.gz) = bbdf1fc14bb1332697c6cf24bb39927dd20d2af9c6d1cd4eac98dcf5a421a79b9ed09850a69f675d8232dc84b749d8673fdc737f293dcbdf67364dcf4c561c3f
 Size (s6-man-pages-2.13.1.0.1.tar.gz) = 124303 bytes