CVS commit: pkgsrc/net/s6-networking

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue May 13 03:50:52 UTC 2025

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

Log Message:
s6-networking: update to 2.7.1.0. Changes:

- Bugfixes.
- pkg-config support.

pkgsrc changes:

- Enable execline option by default.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/s6-networking/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/s6-networking/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/s6-networking/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/s6-networking/options.mk

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.22 pkgsrc/net/s6-networking/Makefile:1.23
--- pkgsrc/net/s6-networking/Makefile:1.22      Thu Nov 14 14:12:48 2024
+++ pkgsrc/net/s6-networking/Makefile   Tue May 13 03:50:51 2025
@@ -1,40 +1,33 @@
-# $NetBSD: Makefile,v 1.22 2024/11/14 14:12:48 schmonz Exp $
+# $NetBSD: Makefile,v 1.23 2025/05/13 03:50:51 schmonz Exp $
 
-DISTNAME=      s6-networking-2.7.0.4
-CATEGORIES=    net
-MASTER_SITES=  ${HOMEPAGE}
-DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES_DIST}
-
-MAINTAINER=    schmonz%NetBSD.org@localhost
-HOMEPAGE=      https://skarnet.org/software/s6-networking/
-COMMENT=       Suite of small networking utilities
-LICENSE=       isc
-
-# man-pages version is usually not exactly in-sync with PKGVERSION_NOREV
+DISTNAME=              s6-networking-2.7.1.0
 MANPAGES_VERSION=      2.7.0.4.1
+CATEGORIES=            net
+MASTER_SITES=          ${HOMEPAGE}
 MANPAGES_DIST=         s6-networking-man-pages-${MANPAGES_VERSION}.tar.gz
-SITES.${MANPAGES_DIST}=        -https://git.sr.ht/~flexibeast/s6-networking-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-networking/
+COMMENT=               Suite of small networking utilities
+LICENSE=               isc
+
+TOOL_DEPENDS+=         coreutils-[0-9]*:../../sysutils/coreutils
+
+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+=       --enable-absolute-paths
+CONFIGURE_ARGS+=       --prefix=${PREFIX:Q}
+CONFIGURE_ARGS+=       --enable-pkgconfig
 
-INSTALLATION_DIRS+=    ${PKGMANDIR}/man7 ${PKGMANDIR}/man8
+INSTALL_DIRS+=         . ${WRKMANSRC}
+INSTALL_ENV+=          PREFIX=${PREFIX:Q} MAN_DIR=${PREFIX:Q}/${PKGMANDIR:Q}
 
 .include "options.mk"
 
-.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
-
 .include "../../devel/skalibs/buildlink3.mk"
 .include "../../net/s6-dns/buildlink3.mk"
 .include "../../sysutils/s6/buildlink3.mk"

Index: pkgsrc/net/s6-networking/PLIST
diff -u pkgsrc/net/s6-networking/PLIST:1.10 pkgsrc/net/s6-networking/PLIST:1.11
--- pkgsrc/net/s6-networking/PLIST:1.10 Thu Nov 14 14:12:48 2024
+++ pkgsrc/net/s6-networking/PLIST      Tue May 13 03:50:51 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2024/11/14 14:12:48 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.11 2025/05/13 03:50:51 schmonz Exp $
 bin/s6-clockadd
 bin/s6-clockview
 bin/s6-getservbyname
@@ -27,6 +27,8 @@ include/s6-networking/sbearssl.h
 include/s6-networking/stls.h
 lib/libs6net.a
 ${PLIST.tls}lib/libsbearssl.a
+lib/pkgconfig/libs6net.pc
+${PLIST.tls}lib/pkgconfig/libsbearssl.pc
 man/man7/s6-tls.7
 man/man8/s6-clockadd.8
 man/man8/s6-clockview.8

Index: pkgsrc/net/s6-networking/distinfo
diff -u pkgsrc/net/s6-networking/distinfo:1.20 pkgsrc/net/s6-networking/distinfo:1.21
--- pkgsrc/net/s6-networking/distinfo:1.20      Thu Nov 14 14:12:48 2024
+++ pkgsrc/net/s6-networking/distinfo   Tue May 13 03:50:51 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2024/11/14 14:12:48 schmonz Exp $
+$NetBSD: distinfo,v 1.21 2025/05/13 03:50:51 schmonz Exp $
 
-BLAKE2s (s6-networking-2.7.0.4.tar.gz) = 2491ebb9617bdb4891d0df69fad49981d70ea8180e9d3f833e11f40e38ca001e
-SHA512 (s6-networking-2.7.0.4.tar.gz) = 2a789cbc2f901e78fffb959fcbddf89c71de75c0d57d3fb1a927418fa8a43f71057c2b50b03e15aa45d5d7ee6521e76b697ae57eef2b7eea760ef9295314dc9b
-Size (s6-networking-2.7.0.4.tar.gz) = 116031 bytes
+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-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

Index: pkgsrc/net/s6-networking/options.mk
diff -u pkgsrc/net/s6-networking/options.mk:1.7 pkgsrc/net/s6-networking/options.mk:1.8
--- pkgsrc/net/s6-networking/options.mk:1.7     Mon Apr 26 15:05:30 2021
+++ pkgsrc/net/s6-networking/options.mk Tue May 13 03:50:51 2025
@@ -1,13 +1,15 @@
-# $NetBSD: options.mk,v 1.7 2021/04/26 15:05:30 schmonz Exp $
+# $NetBSD: options.mk,v 1.8 2025/05/13 03:50:51 schmonz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.s6-networking
 PKG_SUPPORTED_OPTIONS+=        execline tls
-PKG_SUGGESTED_OPTIONS+=        tls
+PKG_SUGGESTED_OPTIONS+=        execline tls
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mexecline)
+DEPENDS+=              execline-[0-9]*:../../lang/execline
 .  include "../../lang/execline/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-execline
 .else
 CONFIGURE_ARGS+=       --disable-execline
 .endif