Add manual pages. Bump PKGREVISION.

4 files changed, 64 insertions, 7 deletions

diff --git a/net/s6-networking/Makefile b/net/s6-networking/Makefile
index 8b0f8cec0eb..17d9e6162ee 100644
--- a/net/s6-networking/Makefile
+++ b/net/s6-networking/Makefile
@@ -1,23 +1,47 @@
-# $NetBSD: Makefile,v 1.6 2021/01/22 16:09:32 schmonz Exp $
+# $NetBSD: Makefile,v 1.7 2021/02/04 09:16:45 schmonz Exp $
 
 DISTNAME=	s6-networking-2.4.0.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	${HOMEPAGE}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${MANPAGES}
 
 MAINTAINER=	schmonz@NetBSD.org
 HOMEPAGE=	https://skarnet.org/software/s6-networking/
 COMMENT=	Suite of small networking utilities
 LICENSE=	isc
 
+MANPAGES=		v2.4.0.0.1.tar.gz
+SITES.${MANPAGES}=	https://github.com/flexibeast/s6-networking-man-pages/archive/
+
 USE_TOOLS+=		gmake
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--with-sysdeps=${PREFIX}/lib/skalibs/sysdeps
 CONFIGURE_ARGS+=	--enable-absolute-paths
 
+INSTALLATION_DIRS+=	${PKGMANDIR}/man1 ${PKGMANDIR}/man7
+
 .include "options.mk"
 
+.PHONY: do-extract-manpages do-install-manpages
+post-extract: do-extract-manpages
+do-extract-manpages:
+	cd ${WRKDIR}/${PKGBASE}-man-pages-*; \
+	for i in *.in; do \
+		j=$$(echo $$i | sed -e 's|\.in$$||'); \
+		mv $$i $$j; \
+	done
+
+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
+
 .include "../../devel/skalibs/buildlink3.mk"
 .include "../../net/s6-dns/buildlink3.mk"
 .include "../../sysutils/s6/buildlink3.mk"
diff --git a/net/s6-networking/PLIST b/net/s6-networking/PLIST
index 5ef95cac55b..5d26be51d1f 100644
--- a/net/s6-networking/PLIST
+++ b/net/s6-networking/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2021/01/22 16:20:38 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.6 2021/02/04 09:16:45 schmonz Exp $
 bin/minidentd
 bin/s6-clockadd
 bin/s6-clockview
@@ -32,3 +32,29 @@ include/s6-networking/sbearssl.h
 include/s6-networking/stls.h
 lib/s6-networking/libs6net.a
 ${PLIST.tls}lib/s6-networking/libsbearssl.a
+man/man1/minidentd.1
+man/man1/s6-clockadd.1
+man/man1/s6-clockview.1
+man/man1/s6-getservbyname.1
+man/man1/s6-ident-client.1
+man/man1/s6-sntpclock.1
+man/man1/s6-taiclock.1
+man/man1/s6-taiclockd.1
+man/man1/s6-tcpclient.1
+man/man1/s6-tcpserver-access.1
+man/man1/s6-tcpserver.1
+man/man1/s6-tcpserver4-socketbinder.1
+man/man1/s6-tcpserver4.1
+man/man1/s6-tcpserver4d.1
+man/man1/s6-tcpserver6-socketbinder.1
+man/man1/s6-tcpserver6.1
+man/man1/s6-tcpserver6d.1
+man/man1/s6-tlsc-io.1
+man/man1/s6-tlsc.1
+man/man1/s6-tlsclient.1
+man/man1/s6-tlsd-io.1
+man/man1/s6-tlsd.1
+man/man1/s6-tlsserver.1
+man/man1/s6-ucspitlsc.1
+man/man1/s6-ucspitlsd.1
+man/man7/s6-tls.7
diff --git a/net/s6-networking/distinfo b/net/s6-networking/distinfo
index 9332f5c8e89..08d77d6ebe7 100644
--- a/net/s6-networking/distinfo
+++ b/net/s6-networking/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.3 2021/01/13 09:21:22 schmonz Exp $
+$NetBSD: distinfo,v 1.4 2021/02/04 09:16:45 schmonz Exp $
 
 SHA1 (s6-networking-2.4.0.0.tar.gz) = 7b013b0181d5873555bbaead902533429db207ae
 RMD160 (s6-networking-2.4.0.0.tar.gz) = 21fd26cff9868096d297b415f74e799da3db10ab
 SHA512 (s6-networking-2.4.0.0.tar.gz) = e8646bbfe965db0a736b1624e3533151182fd0d0337c08ab6af52f6872af1e8c82e3afa85fd146fec3f0640360173aa57182065982e1f3d60ec16862f449115b
 Size (s6-networking-2.4.0.0.tar.gz) = 102302 bytes
+SHA1 (v2.4.0.0.1.tar.gz) = 7049c4cde484ae97f167c07f0bb0de3cfb20e6c8
+RMD160 (v2.4.0.0.1.tar.gz) = 19d8f4f5d7e1b6d55860222e416b66fa46b09534
+SHA512 (v2.4.0.0.1.tar.gz) = 96ffb8e5c593c3e47b7663a5c0bd6a793286f60b169f069bf0d688466cea699320687dbc99fb12b265deafc1b213251b1fdb8ab178013b6b4b75e89e4a5eff8e
+Size (v2.4.0.0.1.tar.gz) = 23878 bytes
 SHA1 (patch-src_stls_stls__client__init__and__handshake.c) = 5ba7652cca7fc864cfff31939fa196086d4336f6
diff --git a/net/s6-networking/options.mk b/net/s6-networking/options.mk
index d444ae0589a..5fae0f5a7f4 100644
--- a/net/s6-networking/options.mk
+++ b/net/s6-networking/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2021/01/22 17:16:45 schmonz Exp $
+# $NetBSD: options.mk,v 1.5 2021/02/04 09:16:45 schmonz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.s6-networking
 PKG_SUPPORTED_OPTIONS+=	execline tls
@@ -28,11 +28,14 @@ SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	s6-pkgsrc-cadir
 SUBST_VARS.paths=	SH SETENV SSLCERTS
 
-post-extract:
+.PHONY: do-extract-cadir do-install-cadir
+post-extract: do-extract-cadir
+do-extract-cadir:
 	for f in s6-pkgsrc-cadir; do \
 		${CP} ${FILESDIR}/$$f.sh ${WRKSRC}/$$f; \
 	done
-post-install:
+post-install: do-install-cadir
+do-install-cadir:
 	for f in s6-pkgsrc-cadir; do \
 		${INSTALL_SCRIPT} ${WRKSRC}/$$f ${DESTDIR}${PREFIX}/bin/$$f; \
 	done