summaryrefslogtreecommitdiff
path: root/sysutils/daemontools
diff options
context:
space:
mode:
authorhans <hans@pkgsrc.org>2011-09-14 17:43:32 +0000
committerhans <hans@pkgsrc.org>2011-09-14 17:43:32 +0000
commitd4ee02a25510595f272d205da9bf7bc2743e51cd (patch)
tree1704b46c85461cde5dc971e5e615d995b16ad6c5 /sysutils/daemontools
parentd9e743a4e00a79e8347f9c9ff2d3a5c75a2574ec (diff)
downloadpkgsrc-d4ee02a25510595f272d205da9bf7bc2743e51cd.tar.gz
Use PKGSRC_SHELL instead of /bin/sh. Fixes build on SunOS.
Diffstat (limited to 'sysutils/daemontools')
-rw-r--r--sysutils/daemontools/Makefile4
-rw-r--r--sysutils/daemontools/distinfo3
-rw-r--r--sysutils/daemontools/patches/patch-aa13
3 files changed, 18 insertions, 2 deletions
diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile
index c4fdec6a6bc..a0318d3b267 100644
--- a/sysutils/daemontools/Makefile
+++ b/sysutils/daemontools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2009/05/19 08:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2011/09/14 17:43:32 hans Exp $
DISTNAME= daemontools-0.76
PKGREVISION= 1
@@ -28,6 +28,8 @@ INSTALLATION_DIRS= bin man ${PKGMANDIR}/man8
SUBST_FILES.djbware+= src/error.h
+MAKE_ENV+= PKGSRC_SHELL=${TOOLS_PLATFORM.sh}
+
do-install:
(while read cmd; do \
if ${FILE_CMD} ${CMDDIR}/$$cmd | ${EGREP} "(executable .* script|shell script|text)" >/dev/null 2>&1; then \
diff --git a/sysutils/daemontools/distinfo b/sysutils/daemontools/distinfo
index 05986860d9e..645bd831c01 100644
--- a/sysutils/daemontools/distinfo
+++ b/sysutils/daemontools/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/04/09 22:36:56 schmonz Exp $
+$NetBSD: distinfo,v 1.7 2011/09/14 17:43:32 hans Exp $
SHA1 (daemontools-0.76.tar.gz) = 70a1be67e7dbe0192a887905846acc99ad5ce5b7
RMD160 (daemontools-0.76.tar.gz) = 9819dae18b3f15a366e49fea81ecef76d5b4f53f
@@ -6,3 +6,4 @@ 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
Size (daemontools-0.76-man-20020131.tar.gz) = 8005 bytes
+SHA1 (patch-aa) = 52fca4d350ed3f9422c3c8727ed505f31f17ae28
diff --git a/sysutils/daemontools/patches/patch-aa b/sysutils/daemontools/patches/patch-aa
new file mode 100644
index 00000000000..01bd7f2406c
--- /dev/null
+++ b/sysutils/daemontools/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2011/09/14 17:43:32 hans Exp $
+
+--- src/Makefile.orig 2001-07-12 18:49:49.000000000 +0200
++++ src/Makefile 2011-07-28 20:57:29.930235807 +0200
+@@ -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