CVS commit: pkgsrc/sysutils/s6

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Feb 17 19:31:00 UTC 2021

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

Log Message:
Add manual pages from flexibeast. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/s6/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/s6/PLIST
cvs rdiff -u -r1.4 -r1.5 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.5 pkgsrc/sysutils/s6/Makefile:1.6
--- pkgsrc/sysutils/s6/Makefile:1.5     Tue Feb 16 14:07:21 2021
+++ pkgsrc/sysutils/s6/Makefile Wed Feb 17 19:31:00 2021
@@ -1,14 +1,19 @@
-# $NetBSD: Makefile,v 1.5 2021/02/16 14:07:21 schmonz Exp $
+# $NetBSD: Makefile,v 1.6 2021/02/17 19:31:00 schmonz Exp $
 
 DISTNAME=      s6-2.10.0.2
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${HOMEPAGE}
+DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES}
 
 MAINTAINER=    cfkoch%edgebsd.org@localhost
 HOMEPAGE=      https://skarnet.org/software/s6/
 COMMENT=       The s6 supervision suite
 LICENSE=       isc
 
+MANPAGES=              v2.10.0.2.1.tar.gz
+SITES.${MANPAGES}=     https://github.com/flexibeast/s6-man-pages/archive/
+
 USE_TOOLS+=            gmake
 HAS_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
@@ -17,6 +22,18 @@ CONFIGURE_ARGS+=     --with-lib=${PREFIX}/li
 CONFIGURE_ARGS+=       --with-lib=${PREFIX}/lib/skalibs
 CONFIGURE_ARGS+=       --with-include=${PREFIX}/include
 
+INSTALLATION_DIRS+=    ${PKGMANDIR}/man1 ${PKGMANDIR}/man7
+
+.PHONY: do-install-manpages
+post-install: do-install-manpages
+do-install-manpages:
+       cd ${WRKDIR}/${PKGBASE}-man-pages-*; for i in 1 7; do \
+               for j in *.$$i; do \
+                       ${INSTALL_MAN} $$j \
+                       ${DESTDIR}${PREFIX}/${PKGMANDIR}/man$$i; \
+               done \
+       done
+
 BUILDLINK_API_DEPENDS.skalibs+=                skalibs>=2.10.0.2
 .include "../../devel/skalibs/buildlink3.mk"
 BUILDLINK_API_DEPENDS.execline+=       execline>=2.7.0.1

Index: pkgsrc/sysutils/s6/PLIST
diff -u pkgsrc/sysutils/s6/PLIST:1.2 pkgsrc/sysutils/s6/PLIST:1.3
--- pkgsrc/sysutils/s6/PLIST:1.2        Mon Jan 11 18:17:12 2021
+++ pkgsrc/sysutils/s6/PLIST    Wed Feb 17 19:31:00 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2021/01/11 18:17:12 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/02/17 19:31:00 schmonz Exp $
 bin/s6-accessrules-cdb-from-fs
 bin/s6-accessrules-fs-from-cdb
 bin/s6-applyuidgid
@@ -66,3 +66,73 @@ include/s6/s6.h
 include/s6/s6lock.h
 lib/s6/libs6.a
 libexec/s6lockd-helper
+man/man1/s6-accessrules-cdb-from-fs.1
+man/man1/s6-accessrules-fs-from-cdb.1
+man/man1/s6-applyuidgid.1
+man/man1/s6-cleanfifodir.1
+man/man1/s6-connlimit.1
+man/man1/s6-envdir.1
+man/man1/s6-envuidgid.1
+man/man1/s6-fdholder-daemon.1
+man/man1/s6-fdholder-delete.1
+man/man1/s6-fdholder-getdump.1
+man/man1/s6-fdholder-list.1
+man/man1/s6-fdholder-retrieve.1
+man/man1/s6-fdholder-setdump.1
+man/man1/s6-fdholder-store.1
+man/man1/s6-fdholder-transferdump.1
+man/man1/s6-fdholderd.1
+man/man1/s6-fghack.1
+man/man1/s6-ftrig-listen.1
+man/man1/s6-ftrig-listen1.1
+man/man1/s6-ftrig-notify.1
+man/man1/s6-ftrig-wait.1
+man/man1/s6-ftrigrd.1
+man/man1/s6-ioconnect.1
+man/man1/s6-ipcclient.1
+man/man1/s6-ipcserver-access.1
+man/man1/s6-ipcserver-socketbinder.1
+man/man1/s6-ipcserver.1
+man/man1/s6-ipcserverd.1
+man/man1/s6-log.1
+man/man1/s6-mkfifodir.1
+man/man1/s6-notifyoncheck.1
+man/man1/s6-permafailon.1
+man/man1/s6-s6lockd.1
+man/man1/s6-setlock.1
+man/man1/s6-setsid.1
+man/man1/s6-setuidgid.1
+man/man1/s6-softlimit.1
+man/man1/s6-sudo.1
+man/man1/s6-sudoc.1
+man/man1/s6-sudod.1
+man/man1/s6-supervise.1
+man/man1/s6-svc.1
+man/man1/s6-svdt-clear.1
+man/man1/s6-svdt.1
+man/man1/s6-svlisten.1
+man/man1/s6-svlisten1.1
+man/man1/s6-svok.1
+man/man1/s6-svperms.1
+man/man1/s6-svscan.1
+man/man1/s6-svscanctl.1
+man/man1/s6-svstat.1
+man/man1/s6-svwait.1
+man/man1/s6-tai64n.1
+man/man1/s6-tai64nlocal.1
+man/man1/s6-usertree-maker.1
+man/man1/s6lockd-helper.1
+man/man1/ucspilogd.1
+man/man7/s6-accessrules.7
+man/man7/s6-fdholder-error-codes.7
+man/man7/s6-fdholder.7
+man/man7/s6-fifodir.7
+man/man7/s6-ftrigr.7
+man/man7/s6-ftrigw.7
+man/man7/s6-libftrig.7
+man/man7/s6-libs6.7
+man/man7/s6-local-service.7
+man/man7/s6-notifywhenup.7
+man/man7/s6-s6lock.7
+man/man7/s6-scan-directory.7
+man/man7/s6-service-directory.7

Index: pkgsrc/sysutils/s6/distinfo
diff -u pkgsrc/sysutils/s6/distinfo:1.4 pkgsrc/sysutils/s6/distinfo:1.5
--- pkgsrc/sysutils/s6/distinfo:1.4     Tue Feb 16 14:07:21 2021
+++ pkgsrc/sysutils/s6/distinfo Wed Feb 17 19:31:00 2021
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.4 2021/02/16 14:07:21 schmonz Exp $
+$NetBSD: distinfo,v 1.5 2021/02/17 19:31:00 schmonz Exp $
 
 SHA1 (s6-2.10.0.2.tar.gz) = 62008ef6d75abacb7ef5183242fb2eb82488f0b6
 RMD160 (s6-2.10.0.2.tar.gz) = 3a5fad80e78c0d4f469592fde637dba38a16e654
 SHA512 (s6-2.10.0.2.tar.gz) = d3eb7e17f3eeb4250c734208a1e9a71b4da0ae3d5090e98c3b02749d42ab83c20f405f1d219293bc378223e31410f0cbfec497c64518235faad9c0ccc6a348dc
 Size (s6-2.10.0.2.tar.gz) = 218590 bytes
+SHA1 (v2.10.0.2.1.tar.gz) = 086559c23a608dba233750934ec9cc82c2aa33c8
+RMD160 (v2.10.0.2.1.tar.gz) = 303bcd7f3ee84f99d25c6fd800feaf4e409235d3
+SHA512 (v2.10.0.2.1.tar.gz) = bbdf5410b8898d4ffb2e1f69ecf8ae359cbddb06ee6cd7901416ab86a949b7c9a7404939d787ee48e719aac464944a3f2c764e54c93018411c088dc65d69390f
+Size (v2.10.0.2.1.tar.gz) = 83557 bytes