CVS commit: pkgsrc/sysutils/s6

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Jul  8 21:15:16 UTC 2025

Modified Files:
        pkgsrc/sysutils/s6: Makefile PLIST buildlink3.mk distinfo

Log Message:
s6: build from git to get macOS shlibs. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/sysutils/s6/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/s6/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/s6/buildlink3.mk
cvs rdiff -u -r1.26 -r1.27 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.28 pkgsrc/sysutils/s6/Makefile:1.29
--- pkgsrc/sysutils/s6/Makefile:1.28    Tue May 13 03:43:21 2025
+++ pkgsrc/sysutils/s6/Makefile Tue Jul  8 21:15:15 2025
@@ -1,11 +1,15 @@
-# $NetBSD: Makefile,v 1.28 2025/05/13 03:43:21 schmonz Exp $
+# $NetBSD: Makefile,v 1.29 2025/07/08 21:15:15 schmonz Exp $
 
-DISTNAME=              s6-2.13.2.0
+DISTNAME=              ${GITHUB_PROJECT}-${GITHUB_TAG}
+PKGNAME=               s6-2.13.2.0
+PKGREVISION=           1
 MANPAGES_VERSION=      2.13.1.0.1
 CATEGORIES=            sysutils
-MASTER_SITES=          ${HOMEPAGE}
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=skarnet/}
+GITHUB_PROJECT=                s6
+GITHUB_TAG=            9310225247a826cffb950680dd07929fa6d970a8
+DISTFILES=             ${_GITHUB_DEFAULT_DISTFILES} ${MANPAGES_DIST}
 MANPAGES_DIST=         s6-man-pages-${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
@@ -24,6 +28,8 @@ TOOLS_PLATFORM.install=       ${PREFIX}/bin/gi
 HAS_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --prefix=${PREFIX:Q}
 CONFIGURE_ARGS+=       --enable-pkgconfig
+CONFIGURE_ARGS+=       --enable-shared
+CONFIGURE_ARGS+=       --disable-allstatic
 
 INSTALL_DIRS+=         . ${WRKMANSRC}
 INSTALL_ENV+=          PREFIX=${PREFIX:Q} MAN_DIR=${PREFIX:Q}/${PKGMANDIR:Q}

Index: pkgsrc/sysutils/s6/PLIST
diff -u pkgsrc/sysutils/s6/PLIST:1.10 pkgsrc/sysutils/s6/PLIST:1.11
--- pkgsrc/sysutils/s6/PLIST:1.10       Tue May 13 03:43:21 2025
+++ pkgsrc/sysutils/s6/PLIST    Tue Jul  8 21:15:15 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2025/05/13 03:43:21 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.11 2025/07/08 21:15:15 schmonz Exp $
 bin/s6-accessrules-cdb-from-fs
 bin/s6-accessrules-fs-from-cdb
 bin/s6-applyuidgid
@@ -74,8 +74,8 @@ include/s6/lock.h
 include/s6/s6.h
 include/s6/servicedir.h
 include/s6/supervise.h
-lib/libs6.a
-lib/libs6auto.a
+lib/libs6.la
+lib/libs6auto.la
 lib/pkgconfig/libs6.pc
 lib/pkgconfig/libs6auto.pc
 man/man7/s6-accessrules.7

Index: pkgsrc/sysutils/s6/buildlink3.mk
diff -u pkgsrc/sysutils/s6/buildlink3.mk:1.8 pkgsrc/sysutils/s6/buildlink3.mk:1.9
--- pkgsrc/sysutils/s6/buildlink3.mk:1.8        Thu Nov 14 14:12:09 2024
+++ pkgsrc/sysutils/s6/buildlink3.mk    Tue Jul  8 21:15:15 2025
@@ -1,15 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.8 2024/11/14 14:12:09 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2025/07/08 21:15:15 schmonz Exp $
 
 BUILDLINK_TREE+=       s6
 
 .if !defined(S6_BUILDLINK3_MK)
 S6_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.s6+=     s6>=2.13.1.0
+BUILDLINK_API_DEPENDS.s6+=     s6>=2.13.2.0nb1
 BUILDLINK_PKGSRCDIR.s6?=       ../../sysutils/s6
 BUILDLINK_INCDIRS.s6+=         include/s6
 BUILDLINK_LIBDIRS.s6+=         lib/s6
-BUILDLINK_DEPMETHOD.s6?=       build
 .endif # S6_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -s6

Index: pkgsrc/sysutils/s6/distinfo
diff -u pkgsrc/sysutils/s6/distinfo:1.26 pkgsrc/sysutils/s6/distinfo:1.27
--- pkgsrc/sysutils/s6/distinfo:1.26    Tue May 13 03:43:21 2025
+++ pkgsrc/sysutils/s6/distinfo Tue Jul  8 21:15:15 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2025/05/13 03:43:21 schmonz Exp $
+$NetBSD: distinfo,v 1.27 2025/07/08 21:15:15 schmonz Exp $
 
-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-9310225247a826cffb950680dd07929fa6d970a8-9310225247a826cffb950680dd07929fa6d970a8.tar.gz) = e9d72d8ee73800dfda23988a521b90564ac752e877addfc17986ac2df8ae501b
+SHA512 (s6-9310225247a826cffb950680dd07929fa6d970a8-9310225247a826cffb950680dd07929fa6d970a8.tar.gz) = 
bebc8a25f45fec2e2168586a430ca76aceb776c888827ca8001c181d432801f64a95041d9afce040e129f4712c80c454b170a70aee00e7f463e3345708a62805
+Size (s6-9310225247a826cffb950680dd07929fa6d970a8-9310225247a826cffb950680dd07929fa6d970a8.tar.gz) = 257193 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