CVS commit: pkgsrc/sysutils/daemontools-encore

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Jan 21 21:54:25 UTC 2020

Added Files:
        pkgsrc/sysutils/daemontools-encore: DESCR Makefile PLIST
        pkgsrc/sysutils/daemontools-encore/patches: patch-MAN patch-Makefile
            patch-rts.tests_supervise-downtime.sh

Log Message:
Initial import of daemontools-encore, a collection of tools for managing
UNIX services. daemontools-encore is derived from the public-domain
release of daemontools by D. J. Bernstein, adding numerous enhancements
while maintaining backwards compatibility.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/daemontools-encore/DESCR \
    pkgsrc/sysutils/daemontools-encore/Makefile \
    pkgsrc/sysutils/daemontools-encore/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/daemontools-encore/patches/patch-MAN \
    pkgsrc/sysutils/daemontools-encore/patches/patch-Makefile \
    pkgsrc/sysutils/daemontools-encore/patches/patch-rts.tests_supervise-downtime.sh

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

Added files:

Index: pkgsrc/sysutils/daemontools-encore/DESCR
diff -u /dev/null pkgsrc/sysutils/daemontools-encore/DESCR:1.1
--- /dev/null   Tue Jan 21 21:54:25 2020
+++ pkgsrc/sysutils/daemontools-encore/DESCR    Tue Jan 21 21:54:25 2020
@@ -0,0 +1,3 @@
+daemontools-encore is derived from the public-domain release of
+daemontools by D. J. Bernstein, adding numerous enhancements while
+maintaining backwards compatibility.
Index: pkgsrc/sysutils/daemontools-encore/Makefile
diff -u /dev/null pkgsrc/sysutils/daemontools-encore/Makefile:1.1
--- /dev/null   Tue Jan 21 21:54:25 2020
+++ pkgsrc/sysutils/daemontools-encore/Makefile Tue Jan 21 21:54:25 2020
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1 2020/01/21 21:54:25 schmonz Exp $
+
+DISTNAME=              daemontools-encore-1.11
+CATEGORIES=            sysutils
+MASTER_SITES=          ${HOMEPAGE}
+
+MAINTAINER=            schmonz%NetBSD.org@localhost
+HOMEPAGE=              https://untroubled.org/daemontools-encore/
+COMMENT=               Collection of tools for managing UNIX services
+LICENSE=               mit
+
+CONFLICTS+=            daemontools-[0-9]*
+
+DJB_RESTRICTED=                no
+
+MAKE_ENV+=             PKGSRC_SHELL=${TOOLS_PLATFORM.sh}
+INSTALL_TARGET=                install
+
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man8
+
+.include "../../mk/djbware.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/daemontools-encore/PLIST
diff -u /dev/null pkgsrc/sysutils/daemontools-encore/PLIST:1.1
--- /dev/null   Tue Jan 21 21:54:25 2020
+++ pkgsrc/sysutils/daemontools-encore/PLIST    Tue Jan 21 21:54:25 2020
@@ -0,0 +1,40 @@
+@comment $NetBSD: PLIST,v 1.1 2020/01/21 21:54:25 schmonz Exp $
+bin/envdir
+bin/envini
+bin/envuidgid
+bin/fghack
+bin/multilog
+bin/pgrphack
+bin/readproctitle
+bin/setlock
+bin/setuidgid
+bin/setuser
+bin/softlimit
+bin/supervise
+bin/svc
+bin/svok
+bin/svscan
+bin/svscanboot
+bin/svstat
+bin/svup
+bin/tai64n
+bin/tai64nlocal
+man/man8/envdir.8
+man/man8/envini.8
+man/man8/envuidgid.8
+man/man8/fghack.8
+man/man8/multilog.8
+man/man8/pgrphack.8
+man/man8/readproctitle.8
+man/man8/setlock.8
+man/man8/setuidgid.8
+man/man8/softlimit.8
+man/man8/supervise.8
+man/man8/svc.8
+man/man8/svok.8
+man/man8/svscan.8
+man/man8/svscanboot.8
+man/man8/svstat.8
+man/man8/svup.8
+man/man8/tai64n.8
+man/man8/tai64nlocal.8

Index: pkgsrc/sysutils/daemontools-encore/patches/patch-MAN
diff -u /dev/null pkgsrc/sysutils/daemontools-encore/patches/patch-MAN:1.1
--- /dev/null   Tue Jan 21 21:54:25 2020
+++ pkgsrc/sysutils/daemontools-encore/patches/patch-MAN        Tue Jan 21 21:54:25 2020
@@ -0,0 +1,14 @@
+$NetBSD: patch-MAN,v 1.1 2020/01/21 21:54:25 schmonz Exp $
+
+Don't try to install missing file.
+
+--- MAN.orig   2018-10-14 00:48:50.000000000 +0000
++++ MAN
+@@ -8,7 +8,6 @@ c:::644:/man8/:pgrphack.8:
+ c:::644:/man8/:readproctitle.8:
+ c:::644:/man8/:setlock.8:
+ c:::644:/man8/:setuidgid.8:
+-c:::644:/man8/:setuser.8:
+ c:::644:/man8/:softlimit.8:
+ c:::644:/man8/:supervise.8:
+ c:::644:/man8/:svc.8:
Index: pkgsrc/sysutils/daemontools-encore/patches/patch-Makefile
diff -u /dev/null pkgsrc/sysutils/daemontools-encore/patches/patch-Makefile:1.1
--- /dev/null   Tue Jan 21 21:54:25 2020
+++ pkgsrc/sysutils/daemontools-encore/patches/patch-Makefile   Tue Jan 21 21:54:25 2020
@@ -0,0 +1,27 @@
+$NetBSD: patch-Makefile,v 1.1 2020/01/21 21:54:25 schmonz Exp $
+
+Use a pkgsrc-capable shell on all platforms.
+Support DESTDIR.
+
+--- Makefile.orig      2018-10-14 00:48:50.000000000 +0000
++++ Makefile
+@@ -227,8 +227,8 @@ choose compile haswaitp.h1 haswaitp.h2 l
+ 
+ install: \
+ installer BIN conf-bin MAN conf-man
+-      ./installer `head -n 1 conf-bin` <BIN
+-      ./installer `head -n 1 conf-man` <MAN
++      ./installer ${DESTDIR}`head -n 1 conf-bin` <BIN
++      ./installer ${DESTDIR}`head -n 1 conf-man` <MAN
+ 
+ installer: \
+ load installer.o getln.a unix.a byte.a
+@@ -357,7 +357,7 @@ compile readproctitle.c error.h
+ 
+ rts: \
+ programs rts.sh rts.exp
+-      env - /bin/sh rts.sh 2>&1 | cat -v > rts
++      env - ${PKGSRC_SHELL} rts.sh 2>&1 | cat -v > rts
+       diff -u rts.exp rts
+ 
+ rts.exp: \
Index: pkgsrc/sysutils/daemontools-encore/patches/patch-rts.tests_supervise-downtime.sh
diff -u /dev/null pkgsrc/sysutils/daemontools-encore/patches/patch-rts.tests_supervise-downtime.sh:1.1
--- /dev/null   Tue Jan 21 21:54:25 2020
+++ pkgsrc/sysutils/daemontools-encore/patches/patch-rts.tests_supervise-downtime.sh    Tue Jan 21 21:54:25 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-rts.tests_supervise-downtime.sh,v 1.1 2020/01/21 21:54:25 schmonz Exp $
+
+Avoid GNUism.
+
+--- rts.tests/supervise-downtime.sh.orig       2018-10-14 00:48:50.000000000 +0000
++++ rts.tests/supervise-downtime.sh
+@@ -20,8 +20,8 @@ svpid=$!
+ waitok test.sv
+ 
+ svstat test.sv \
+-| sed -r 's, \(.+\),,' \
+-| sed -r 's, ([0-9]|1[0-9]) second.+$, ok,'
++| sed -E 's, \(.+\),,' \
++| sed -E 's, ([0-9]|1[0-9]) second.+$, ok,'
+ 
+ kill $svpid
+ wait