Mon Nov 16 10:51:44 2020 UTC ()
Defer tests until TEST_TARGET.


(schmonz)
diff -r1.5 -r1.6 pkgsrc/sysutils/daemontools-encore/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/daemontools-encore/distinfo
diff -r1.1 -r1.2 pkgsrc/sysutils/daemontools-encore/patches/patch-Makefile
cvs diff -r1.5 -r1.6 pkgsrc/sysutils/daemontools-encore/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/daemontools-encore/Makefile 2020/06/25 05:42:40 1.5
+++ pkgsrc/sysutils/daemontools-encore/Makefile 2020/11/16 10:51:43 1.6
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1# $NetBSD: Makefile,v 1.5 2020/06/25 05:42:40 schmonz Exp $ 1# $NetBSD: Makefile,v 1.6 2020/11/16 10:51:43 schmonz Exp $
2 2
3DISTNAME= daemontools-encore-1.11 3DISTNAME= daemontools-encore-1.11
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6MASTER_SITES= ${HOMEPAGE} 6MASTER_SITES= ${HOMEPAGE}
7 7
8MAINTAINER= schmonz@NetBSD.org 8MAINTAINER= schmonz@NetBSD.org
9HOMEPAGE= https://untroubled.org/daemontools-encore/ 9HOMEPAGE= https://untroubled.org/daemontools-encore/
10COMMENT= Collection of tools for managing UNIX services 10COMMENT= Collection of tools for managing UNIX services
11LICENSE= mit 11LICENSE= mit
12 12
13CONFLICTS+= daemontools-[0-9]* 13CONFLICTS+= daemontools-[0-9]*
14 14
15DJB_RESTRICTED= no 15DJB_RESTRICTED= no
16 16
17MAKE_ENV+= PKGSRC_SHELL=${TOOLS_PLATFORM.sh} 17MAKE_ENV+= PKGSRC_SHELL=${TOOLS_PLATFORM.sh}
 18TEST_TARGET= rts
18INSTALL_TARGET= install 19INSTALL_TARGET= install
19 20
20INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 21INSTALLATION_DIRS= bin ${PKGMANDIR}/man8
21 22
22.include "../../mk/djbware.mk" 23.include "../../mk/djbware.mk"
23.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/daemontools-encore/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/daemontools-encore/distinfo 2020/01/25 11:17:31 1.3
+++ pkgsrc/sysutils/daemontools-encore/distinfo 2020/11/16 10:51:43 1.4
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.3 2020/01/25 11:17:31 schmonz Exp $ 1$NetBSD: distinfo,v 1.4 2020/11/16 10:51:43 schmonz Exp $
2 2
3SHA1 (daemontools-encore-1.11.tar.gz) = 23f8dc5cf2d063c481b328fce523fc8a0349b693 3SHA1 (daemontools-encore-1.11.tar.gz) = 23f8dc5cf2d063c481b328fce523fc8a0349b693
4RMD160 (daemontools-encore-1.11.tar.gz) = 518f85f1502bf969ee60d5169642089752bd2d52 4RMD160 (daemontools-encore-1.11.tar.gz) = 518f85f1502bf969ee60d5169642089752bd2d52
5SHA512 (daemontools-encore-1.11.tar.gz) = 1e1a96a948d551bfc38496740eaa85b7cae0d2469419293b133533da75ca03657fe6108129703ad7b773925c58ce84a4f242eb612133fb0c499f47ae50423a8a 5SHA512 (daemontools-encore-1.11.tar.gz) = 1e1a96a948d551bfc38496740eaa85b7cae0d2469419293b133533da75ca03657fe6108129703ad7b773925c58ce84a4f242eb612133fb0c499f47ae50423a8a
6Size (daemontools-encore-1.11.tar.gz) = 94917 bytes 6Size (daemontools-encore-1.11.tar.gz) = 94917 bytes
7SHA1 (patch-MAN) = 7c361a3365a43a992d7a0ccf938b79dc2a8691bc 7SHA1 (patch-MAN) = 7c361a3365a43a992d7a0ccf938b79dc2a8691bc
8SHA1 (patch-Makefile) = b1bc2500071491280a02f158bf4d8ed4e0aa369e 8SHA1 (patch-Makefile) = 5deabb7526190b4c1e0f7092b8822a225c317751
9SHA1 (patch-rts.tests_supervise-downtime.sh) = c6415e1c0adce32e5ad57ad5457fd1be98c53958 9SHA1 (patch-rts.tests_supervise-downtime.sh) = c6415e1c0adce32e5ad57ad5457fd1be98c53958
10SHA1 (patch-rts.tests_supervise-lock.sh) = 1f2e036adb93a0f872ae2a3f2d7fd89ea0a9809a 10SHA1 (patch-rts.tests_supervise-lock.sh) = 1f2e036adb93a0f872ae2a3f2d7fd89ea0a9809a
11SHA1 (patch-sleeper.c) = cdae9837bb8a5cc268c8e86e97e03d11f8e9d32d 11SHA1 (patch-sleeper.c) = cdae9837bb8a5cc268c8e86e97e03d11f8e9d32d
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/daemontools-encore/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/daemontools-encore/patches/patch-Makefile 2020/01/21 21:54:25 1.1
+++ pkgsrc/sysutils/daemontools-encore/patches/patch-Makefile 2020/11/16 10:51:44 1.2
@@ -1,27 +1,37 @@ @@ -1,27 +1,37 @@
1$NetBSD: patch-Makefile,v 1.1 2020/01/21 21:54:25 schmonz Exp $ 1$NetBSD: patch-Makefile,v 1.2 2020/11/16 10:51:44 schmonz Exp $
2 2
3Use a pkgsrc-capable shell on all platforms. 3Use a pkgsrc-capable shell on all platforms.
4Support DESTDIR. 4Support DESTDIR.
 5Defer tests until TEST_TARGET.
5 6
6--- Makefile.orig 2018-10-14 00:48:50.000000000 +0000 7--- Makefile.orig 2018-10-14 00:48:50.000000000 +0000
7+++ Makefile 8+++ Makefile
8@@ -227,8 +227,8 @@ choose compile haswaitp.h1 haswaitp.h2 l 9@@ -227,8 +227,8 @@ choose compile haswaitp.h1 haswaitp.h2 l
9  10
10 install: \ 11 install: \
11 installer BIN conf-bin MAN conf-man 12 installer BIN conf-bin MAN conf-man
12- ./installer `head -n 1 conf-bin` <BIN 13- ./installer `head -n 1 conf-bin` <BIN
13- ./installer `head -n 1 conf-man` <MAN 14- ./installer `head -n 1 conf-man` <MAN
14+ ./installer ${DESTDIR}`head -n 1 conf-bin` <BIN 15+ ./installer ${DESTDIR}`head -n 1 conf-bin` <BIN
15+ ./installer ${DESTDIR}`head -n 1 conf-man` <MAN 16+ ./installer ${DESTDIR}`head -n 1 conf-man` <MAN
16  17
17 installer: \ 18 installer: \
18 load installer.o getln.a unix.a byte.a 19 load installer.o getln.a unix.a byte.a
 20@@ -247,7 +247,7 @@ compile iopause.c taia.h tai.h uint64.h
 21 ./compile iopause.c
 22
 23 it: \
 24-rts sysdeps man
 25+programs sysdeps man
 26
 27 load: \
 28 conf-ld print-ld.sh systype warn-auto.sh
19@@ -357,7 +357,7 @@ compile readproctitle.c error.h 29@@ -357,7 +357,7 @@ compile readproctitle.c error.h
20  30
21 rts: \ 31 rts: \
22 programs rts.sh rts.exp 32 programs rts.sh rts.exp
23- env - /bin/sh rts.sh 2>&1 | cat -v > rts 33- env - /bin/sh rts.sh 2>&1 | cat -v > rts
24+ env - ${PKGSRC_SHELL} rts.sh 2>&1 | cat -v > rts 34+ env - ${PKGSRC_SHELL} rts.sh 2>&1 | cat -v > rts
25 diff -u rts.exp rts 35 diff -u rts.exp rts
26  36
27 rts.exp: \ 37 rts.exp: \