CVS commit: pkgsrc/sysutils/daemontools

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Oct  3 00:21:45 UTC 2017

Modified Files:
        pkgsrc/sysutils/daemontools: Makefile distinfo
Added Files:
        pkgsrc/sysutils/daemontools: options.mk
        pkgsrc/sysutils/daemontools/patches: patch-src_Makefile
Removed Files:
        pkgsrc/sysutils/daemontools/patches: patch-aa

Log Message:
Add "daemontools-moresignals" option, which adds options for sending
SIQQUIT (-q), SIGUSR1 (-1), and SIGUSR2 (-2). Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/sysutils/daemontools/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/daemontools/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/daemontools/options.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/daemontools/patches/patch-aa
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/daemontools/patches/patch-src_Makefile

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

Modified files:

Index: pkgsrc/sysutils/daemontools/Makefile
diff -u pkgsrc/sysutils/daemontools/Makefile:1.37 pkgsrc/sysutils/daemontools/Makefile:1.38
--- pkgsrc/sysutils/daemontools/Makefile:1.37   Thu Oct  9 14:06:57 2014
+++ pkgsrc/sysutils/daemontools/Makefile        Tue Oct  3 00:21:44 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2014/10/09 14:06:57 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2017/10/03 00:21:44 schmonz Exp $
 
 DISTNAME=              daemontools-0.76
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            sysutils
 MASTER_SITES=          http://cr.yp.to/daemontools/ ftp://cr.yp.to/daemontools/
 DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES}
@@ -16,7 +16,7 @@ SITES.${MANPAGES}=    http://smarden.org/pa
 
 DJB_RESTRICTED=                no
 
-WRKSRC=                        ${WRKDIR}/admin/${DISTNAME}
+WRKSRC=                        ${WRKDIR}/admin/${PKGNAME_NOREV}
 DJB_SLASHPACKAGE=      YES
 
 CMDDIR=                        ${WRKSRC}/command

Index: pkgsrc/sysutils/daemontools/distinfo
diff -u pkgsrc/sysutils/daemontools/distinfo:1.8 pkgsrc/sysutils/daemontools/distinfo:1.9
--- pkgsrc/sysutils/daemontools/distinfo:1.8    Wed Nov  4 01:32:09 2015
+++ pkgsrc/sysutils/daemontools/distinfo        Tue Oct  3 00:21:44 2017
@@ -1,11 +1,15 @@
-$NetBSD: distinfo,v 1.8 2015/11/04 01:32:09 agc Exp $
+$NetBSD: distinfo,v 1.9 2017/10/03 00:21:44 schmonz Exp $
 
-SHA1 (daemontools-0.76.tar.gz) = 70a1be67e7dbe0192a887905846acc99ad5ce5b7
-RMD160 (daemontools-0.76.tar.gz) = 9819dae18b3f15a366e49fea81ecef76d5b4f53f
-SHA512 (daemontools-0.76.tar.gz) = e4a7938352b745a03ccc41acdddba1e6782f0ca245e5cae060de62ab6c5a23c841a994c30140298d274405a7f26d53ba7e84e5810a3d185b2c01e4c0feffe6c7
-Size (daemontools-0.76.tar.gz) = 36975 bytes
 SHA1 (daemontools-0.76-man-20020131.tar.gz) = 28e167def0e457f2be10aa90504c402fa08723ab
 RMD160 (daemontools-0.76-man-20020131.tar.gz) = d82f0bad55f0751fdfadfa0f3bf2883740fa65d9
 SHA512 (daemontools-0.76-man-20020131.tar.gz) = 1767fafb2d92902f903637f08363031971bda007d1b7b53059551c740976d1c643229ccc44171796c1dcb43cbd875a17178edc634e140671817e0ef0ba3ad80b
 Size (daemontools-0.76-man-20020131.tar.gz) = 8005 bytes
-SHA1 (patch-aa) = 52fca4d350ed3f9422c3c8727ed505f31f17ae28
+SHA1 (daemontools-0.76.sigq12.patch) = e9fd99884289f9941ac0f36197a8d3c1cab5f3cb
+RMD160 (daemontools-0.76.sigq12.patch) = 22707eca8b78bbf9c11a50070ede8bfb76436983
+SHA512 (daemontools-0.76.sigq12.patch) = 7a549b2d1fc754ee8e56c4ce0e7b232e2e4365355d5903ad1b307f449e58b13346389b29ce1d259a9fbbae5de997b37eebe347261c720f2d646bf958bea7385e
+Size (daemontools-0.76.sigq12.patch) = 1975 bytes
+SHA1 (daemontools-0.76.tar.gz) = 70a1be67e7dbe0192a887905846acc99ad5ce5b7
+RMD160 (daemontools-0.76.tar.gz) = 9819dae18b3f15a366e49fea81ecef76d5b4f53f
+SHA512 (daemontools-0.76.tar.gz) = e4a7938352b745a03ccc41acdddba1e6782f0ca245e5cae060de62ab6c5a23c841a994c30140298d274405a7f26d53ba7e84e5810a3d185b2c01e4c0feffe6c7
+Size (daemontools-0.76.tar.gz) = 36975 bytes
+SHA1 (patch-src_Makefile) = 63795c7546d3248911e0d47194baccd8440547f5

Added files:

Index: pkgsrc/sysutils/daemontools/options.mk
diff -u /dev/null pkgsrc/sysutils/daemontools/options.mk:1.1
--- /dev/null   Tue Oct  3 00:21:45 2017
+++ pkgsrc/sysutils/daemontools/options.mk      Tue Oct  3 00:21:44 2017
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2017/10/03 00:21:44 schmonz Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.daemontools
+PKG_SUPPORTED_OPTIONS+=                daemontools-moresignals
+PKG_SUGGESTED_OPTIONS+=                daemontools-moresignals
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdaemontools-moresignals)
+MORESIGNALS_PATCH=             daemontools-0.76.sigq12.patch
+PATCHFILES+=                   ${MORESIGNALS_PATCH}
+SITES.${MORESIGNALS_PATCH}=    http://thedjbway.b0llix.net/patches/
+PATCH_DIST_STRIP.${MORESIGNALS_PATCH}= -p1
+.endif

Index: pkgsrc/sysutils/daemontools/patches/patch-src_Makefile
diff -u /dev/null pkgsrc/sysutils/daemontools/patches/patch-src_Makefile:1.1
--- /dev/null   Tue Oct  3 00:21:45 2017
+++ pkgsrc/sysutils/daemontools/patches/patch-src_Makefile      Tue Oct  3 00:21:44 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_Makefile,v 1.1 2017/10/03 00:21:44 schmonz Exp $
+
+Use a pkgsrc-capable shell on all platforms.
+
+--- src/Makefile.orig  2001-07-12 16:49:49.000000000 +0000
++++ src/Makefile
+@@ -265,7 +265,7 @@ readproctitle.o: compile error.h readpro
+ rts: envdir envuidgid fghack matchtest multilog pgrphack \
+ readproctitle rts.tests setlock setuidgid softlimit supervise svc \
+ svok svscan svscanboot svstat tai64n tai64nlocal
+-      env - /bin/sh rts.tests 2>&1 | cat -v > rts
++      env - ${PKGSRC_SHELL} rts.tests 2>&1 | cat -v > rts
+ 
+ scan_ulong.o: compile scan.h scan_ulong.c
+       ./compile scan_ulong.c