CVS commit: pkgsrc/misc/s6-portable-utils

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue May 13 03:49:29 UTC 2025

Modified Files:
        pkgsrc/misc/s6-portable-utils: Makefile distinfo

Log Message:
s6-portable-utils: update to 2.3.1.0. Changes:

- Bugfixes.
- pkg-config support.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/misc/s6-portable-utils/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/misc/s6-portable-utils/distinfo

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

Modified files:

Index: pkgsrc/misc/s6-portable-utils/Makefile
diff -u pkgsrc/misc/s6-portable-utils/Makefile:1.18 pkgsrc/misc/s6-portable-utils/Makefile:1.19
--- pkgsrc/misc/s6-portable-utils/Makefile:1.18 Thu Nov 14 14:13:20 2024
+++ pkgsrc/misc/s6-portable-utils/Makefile      Tue May 13 03:49:29 2025
@@ -1,38 +1,30 @@
-# $NetBSD: Makefile,v 1.18 2024/11/14 14:13:20 schmonz Exp $
+# $NetBSD: Makefile,v 1.19 2025/05/13 03:49:29 schmonz Exp $
 
-DISTNAME=      s6-portable-utils-2.3.0.4
-CATEGORIES=    misc
-MASTER_SITES=  ${HOMEPAGE}
-DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES_DIST}
-
-MAINTAINER=    schmonz%NetBSD.org@localhost
-HOMEPAGE=      https://www.skarnet.org/software/s6-portable-utils/
-COMMENT=       Tiny portable generic utilties
-LICENSE=       isc
-
-# man-pages version is usually not exactly in-sync with PKGVERSION_NOREV
+DISTNAME=              s6-portable-utils-2.3.1.0
 MANPAGES_VERSION=      2.3.0.3.1
+CATEGORIES=            misc
+MASTER_SITES=          ${HOMEPAGE}
 MANPAGES_DIST=         s6-portable-utils-man-pages-${MANPAGES_VERSION}.tar.gz
-SITES.${MANPAGES_DIST}=        -https://git.sr.ht/~flexibeast/s6-portable-utils-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://www.skarnet.org/software/s6-portable-utils/
+COMMENT=               Tiny portable generic utilties
+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+=       --with-lib=${PREFIX}/lib/skalibs
-CONFIGURE_ARGS+=       --with-include=${PREFIX}/include
-
-INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
-
-.PHONY: do-install-manpages
-post-install: do-install-manpages
-do-install-manpages:
-       cd ${WRKDIR}/${PKGBASE}-man-pages-*; for i in 1; 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"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/misc/s6-portable-utils/distinfo
diff -u pkgsrc/misc/s6-portable-utils/distinfo:1.16 pkgsrc/misc/s6-portable-utils/distinfo:1.17
--- pkgsrc/misc/s6-portable-utils/distinfo:1.16 Thu Nov 14 14:13:20 2024
+++ pkgsrc/misc/s6-portable-utils/distinfo      Tue May 13 03:49:29 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.16 2024/11/14 14:13:20 schmonz Exp $
+$NetBSD: distinfo,v 1.17 2025/05/13 03:49:29 schmonz Exp $
 
-BLAKE2s (s6-portable-utils-2.3.0.4.tar.gz) = 251c30dfb8b57609f59665dec74a5ff355e8dbf70cbab7cfcb077486b00b13ec
-SHA512 (s6-portable-utils-2.3.0.4.tar.gz) = 0da4fb637f414d870e0476a01c08448b021d2c20c9a4746ab1c6c700e8eeb055d57f6e8326228694463483cd307e308f8fe148a615232039f32dcf351d5060ec
-Size (s6-portable-utils-2.3.0.4.tar.gz) = 51121 bytes
+BLAKE2s (s6-portable-utils-2.3.1.0.tar.gz) = b667dc37046afd7a5762a0da24b165bb06fac4ba176e13ae8c9c5f0609c568ea
+SHA512 (s6-portable-utils-2.3.1.0.tar.gz) = 80ab6152d5c3f88449d77924ceb43ccef12a41918d2fd8042ded15423b8f65e612d582c6475d73c500380018a91f7adc48c71740c898015565a046a8fbef1cd5
+Size (s6-portable-utils-2.3.1.0.tar.gz) = 54818 bytes
 BLAKE2s (s6-portable-utils-man-pages-2.3.0.3.1.tar.gz) = 76fc0bcd3a7116fac08a29763dade2f14fba0d3320c4ff03950f993ca706fe99
 SHA512 (s6-portable-utils-man-pages-2.3.0.3.1.tar.gz) = ae487a5d2bf2554f87c840b5fb003de6fcdf542817fe43e7824d0318cb4ee797d1547f4d56f5d5ebe1da3d909edc6da3f498e5f21f8c028c4478a460181a2cbc
 Size (s6-portable-utils-man-pages-2.3.0.3.1.tar.gz) = 13809 bytes