CVS commit: pkgsrc/net/s6-networking

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Jul  8 21:17:06 UTC 2025

Modified Files:
        pkgsrc/net/s6-networking: Makefile PLIST buildlink3.mk distinfo

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

Other changes from the next release-to-be:

- Add proxy-server


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/net/s6-networking/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/s6-networking/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/s6-networking/buildlink3.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/s6-networking/distinfo

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

Modified files:

Index: pkgsrc/net/s6-networking/Makefile
diff -u pkgsrc/net/s6-networking/Makefile:1.23 pkgsrc/net/s6-networking/Makefile:1.24
--- pkgsrc/net/s6-networking/Makefile:1.23      Tue May 13 03:50:51 2025
+++ pkgsrc/net/s6-networking/Makefile   Tue Jul  8 21:17:06 2025
@@ -1,11 +1,15 @@
-# $NetBSD: Makefile,v 1.23 2025/05/13 03:50:51 schmonz Exp $
+# $NetBSD: Makefile,v 1.24 2025/07/08 21:17:06 schmonz Exp $
 
-DISTNAME=              s6-networking-2.7.1.0
+DISTNAME=              ${GITHUB_PROJECT}-${GITHUB_TAG}
+PKGNAME=               s6-networking-2.7.1.0
+PKGREVISION=           1
 MANPAGES_VERSION=      2.7.0.4.1
-CATEGORIES=            net
-MASTER_SITES=          ${HOMEPAGE}
+CATEGORIES=            net security
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=skarnet/}
+GITHUB_PROJECT=                s6-networking
+GITHUB_TAG=            442b0d45ec12a0a383405f923d11f015adf0a25e
+DISTFILES=             ${_GITHUB_DEFAULT_DISTFILES} ${MANPAGES_DIST}
 MANPAGES_DIST=         s6-networking-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
@@ -22,6 +26,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/net/s6-networking/PLIST
diff -u pkgsrc/net/s6-networking/PLIST:1.12 pkgsrc/net/s6-networking/PLIST:1.13
--- pkgsrc/net/s6-networking/PLIST:1.12 Wed Jun  4 13:29:32 2025
+++ pkgsrc/net/s6-networking/PLIST      Tue Jul  8 21:17:06 2025
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.12 2025/06/04 13:29:32 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.13 2025/07/08 21:17:06 schmonz Exp $
+bin/proxy-server
 bin/s6-clockadd
 bin/s6-clockview
 bin/s6-getservbyname
@@ -25,9 +26,9 @@ include/s6-networking/ident.h
 include/s6-networking/s6net.h
 include/s6-networking/sbearssl.h
 include/s6-networking/stls.h
-lib/libs6net.a
-${PLIST.bearssl}lib/libsbearssl.a
-${PLIST.libtls}lib/libstls.a
+lib/libs6net.la
+${PLIST.bearssl}lib/libsbearssl.la
+${PLIST.libtls}lib/libstls.la
 lib/pkgconfig/libs6net.pc
 ${PLIST.bearssl}lib/pkgconfig/libsbearssl.pc
 ${PLIST.libtls}lib/pkgconfig/libstls.pc

Index: pkgsrc/net/s6-networking/buildlink3.mk
diff -u pkgsrc/net/s6-networking/buildlink3.mk:1.7 pkgsrc/net/s6-networking/buildlink3.mk:1.8
--- pkgsrc/net/s6-networking/buildlink3.mk:1.7  Thu Nov 14 14:12:48 2024
+++ pkgsrc/net/s6-networking/buildlink3.mk      Tue Jul  8 21:17:06 2025
@@ -1,15 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.7 2024/11/14 14:12:48 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2025/07/08 21:17:06 schmonz Exp $
 
 BUILDLINK_TREE+=       s6-networking
 
 .if !defined(S6_NETWORKING_BUILDLINK3_MK)
 S6_NETWORKING_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.s6-networking+=  s6-networking>=2.7.0.4
+BUILDLINK_API_DEPENDS.s6-networking+=  s6-networking>=2.7.1.0nb1
 BUILDLINK_PKGSRCDIR.s6-networking?=    ../../net/s6-networking
 BUILDLINK_INCDIRS.s6-networking+=      include/s6-networking
 BUILDLINK_LIBDIRS.s6-networking+=      lib/s6-networking
-BUILDLINK_DEPMETHOD.s6-networking?=    build
 .endif # S6_NETWORKING_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -s6-networking

Index: pkgsrc/net/s6-networking/distinfo
diff -u pkgsrc/net/s6-networking/distinfo:1.21 pkgsrc/net/s6-networking/distinfo:1.22
--- pkgsrc/net/s6-networking/distinfo:1.21      Tue May 13 03:50:51 2025
+++ pkgsrc/net/s6-networking/distinfo   Tue Jul  8 21:17:06 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2025/05/13 03:50:51 schmonz Exp $
+$NetBSD: distinfo,v 1.22 2025/07/08 21:17:06 schmonz Exp $
 
-BLAKE2s (s6-networking-2.7.1.0.tar.gz) = 1726783b56f393d17667242362e9c391799d058c3f3495a7b0bd7dd4b8d0cd3d
-SHA512 (s6-networking-2.7.1.0.tar.gz) = 33741efa5c1908f8e7396929df08c3591e25b7c58335b331a146db17a9b7e5c00b75dd3337aa46114723969b8490fb1b6754a25357003780bdfd0a2fd8e3283c
-Size (s6-networking-2.7.1.0.tar.gz) = 119190 bytes
+BLAKE2s (s6-networking-442b0d45ec12a0a383405f923d11f015adf0a25e-442b0d45ec12a0a383405f923d11f015adf0a25e.tar.gz) = abbc39200f75e29abe75b6a7a26a3004e634f8070a372bccf35ab5a558f89db1
+SHA512 (s6-networking-442b0d45ec12a0a383405f923d11f015adf0a25e-442b0d45ec12a0a383405f923d11f015adf0a25e.tar.gz) = 
df47bab6acc0f20e1c4d7f7bb5747ffb59a57e178d6b10ebf6d92e07c8776736e27aa25ef7c3f03db32661c1534f16a4d105261a7637130ca3aa5de1a4f76ead
+Size (s6-networking-442b0d45ec12a0a383405f923d11f015adf0a25e-442b0d45ec12a0a383405f923d11f015adf0a25e.tar.gz) = 119289 bytes
 BLAKE2s (s6-networking-man-pages-2.7.0.4.1.tar.gz) = 752df51dc9a47ee6c6e566b78e4fad1b3d5880b73665fab3106dc449a42917fe
 SHA512 (s6-networking-man-pages-2.7.0.4.1.tar.gz) = c332f6298eff0d3de9a9805e56962f45e1f42e02c414ce9a19203a1c684c8744734cc03b9c68cf314ca4449f333aeaadde684f5eb9246a02e5db1c5d46cac630
 Size (s6-networking-man-pages-2.7.0.4.1.tar.gz) = 24065 bytes