CVS commit: pkgsrc/sysutils/daemontools

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun May 15 17:26:31 UTC 2022

Modified Files:
        pkgsrc/sysutils/daemontools: Makefile distinfo
        pkgsrc/sysutils/daemontools/patches: patch-src_Makefile

Log Message:
Decouple tests from build. Skip creating sysdeps, nothing uses it.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/sysutils/daemontools/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/daemontools/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    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.46 pkgsrc/sysutils/daemontools/Makefile:1.47
--- pkgsrc/sysutils/daemontools/Makefile:1.46   Thu Nov 19 09:35:43 2020
+++ pkgsrc/sysutils/daemontools/Makefile        Sun May 15 17:26:31 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2020/11/19 09:35:43 schmonz Exp $
+# $NetBSD: Makefile,v 1.47 2022/05/15 17:26:31 schmonz Exp $
 
 DISTNAME=              daemontools-0.76
 PKGREVISION=           3
@@ -18,6 +18,7 @@ CONFLICTS+=           daemontools-encore-[0-9]*
 
 WRKSRC=                        ${WRKDIR}/admin/${PKGNAME_NOREV}
 DJB_SLASHPACKAGE=      YES
+TEST_TARGET=           rts
 
 CMDDIR=                        ${WRKSRC}/command
 

Index: pkgsrc/sysutils/daemontools/distinfo
diff -u pkgsrc/sysutils/daemontools/distinfo:1.11 pkgsrc/sysutils/daemontools/distinfo:1.12
--- pkgsrc/sysutils/daemontools/distinfo:1.11   Tue Oct 26 11:19:28 2021
+++ pkgsrc/sysutils/daemontools/distinfo        Sun May 15 17:26:31 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 11:19:28 nia Exp $
+$NetBSD: distinfo,v 1.12 2022/05/15 17:26:31 schmonz Exp $
 
 BLAKE2s (daemontools-0.76-man-20020131.tar.gz) = 8ee7328243c279426cb4b6ea48ec993886eaea1e2778dc877e1c32372f692e8f
 SHA512 (daemontools-0.76-man-20020131.tar.gz) = 1767fafb2d92902f903637f08363031971bda007d1b7b53059551c740976d1c643229ccc44171796c1dcb43cbd875a17178edc634e140671817e0ef0ba3ad80b
@@ -9,4 +9,4 @@ Size (daemontools-0.76.sigq12.patch) = 1
 BLAKE2s (daemontools-0.76.tar.gz) = de1cc5249edbdbe3b8a3f0ab33b90068c965b936c952c336672e122d37bca6b0
 SHA512 (daemontools-0.76.tar.gz) = e4a7938352b745a03ccc41acdddba1e6782f0ca245e5cae060de62ab6c5a23c841a994c30140298d274405a7f26d53ba7e84e5810a3d185b2c01e4c0feffe6c7
 Size (daemontools-0.76.tar.gz) = 36975 bytes
-SHA1 (patch-src_Makefile) = 63795c7546d3248911e0d47194baccd8440547f5
+SHA1 (patch-src_Makefile) = 445729d6e8f71ac1911db4b472ffe07ccb8608bb

Index: pkgsrc/sysutils/daemontools/patches/patch-src_Makefile
diff -u pkgsrc/sysutils/daemontools/patches/patch-src_Makefile:1.1 pkgsrc/sysutils/daemontools/patches/patch-src_Makefile:1.2
--- pkgsrc/sysutils/daemontools/patches/patch-src_Makefile:1.1  Tue Oct  3 00:21:44 2017
+++ pkgsrc/sysutils/daemontools/patches/patch-src_Makefile      Sun May 15 17:26:31 2022
@@ -1,14 +1,31 @@
-$NetBSD: patch-src_Makefile,v 1.1 2017/10/03 00:21:44 schmonz Exp $
+$NetBSD: patch-src_Makefile,v 1.2 2022/05/15 17:26:31 schmonz Exp $
 
 Use a pkgsrc-capable shell on all platforms.
+Run the tests separately from the build.
+Skip creating sysdeps, nothing uses it.
 
 --- 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
+@@ -177,7 +177,9 @@ iopause.h: choose compile iopause.h1 iop
+ iopause.o: compile iopause.c iopause.h select.h tai.h taia.h uint64.h
+       ./compile iopause.c
+ 
+-it: rts sysdeps
++it: envdir envuidgid fghack matchtest multilog pgrphack \
++readproctitle rts.tests setlock setuidgid softlimit supervise svc \
++svok svscan svscanboot svstat tai64n tai64nlocal
+ 
+ load: conf-ld print-ld.sh systype warn-auto.sh
+       rm -f load
+@@ -262,10 +264,8 @@ readproctitle: byte.a load readproctitle
+ readproctitle.o: compile error.h readproctitle.c
+       ./compile readproctitle.c
+ 
+-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
++rts:
 +      env - ${PKGSRC_SHELL} rts.tests 2>&1 | cat -v > rts
  
  scan_ulong.o: compile scan.h scan_ulong.c