Wed Sep 14 17:43:32 2011 UTC ()
Use PKGSRC_SHELL instead of /bin/sh. Fixes build on SunOS.


(hans)
diff -r1.33 -r1.34 pkgsrc/sysutils/daemontools/Makefile
diff -r1.6 -r1.7 pkgsrc/sysutils/daemontools/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/daemontools/patches/patch-aa
cvs diff -r1.33 -r1.34 pkgsrc/sysutils/daemontools/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/daemontools/Makefile 2009/05/19 08:59:33 1.33
+++ pkgsrc/sysutils/daemontools/Makefile 2011/09/14 17:43:32 1.34
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.33 2009/05/19 08:59:33 wiz Exp $ 1# $NetBSD: Makefile,v 1.34 2011/09/14 17:43:32 hans Exp $
2 2
3DISTNAME= daemontools-0.76 3DISTNAME= daemontools-0.76
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6MASTER_SITES= http://cr.yp.to/daemontools/ ftp://cr.yp.to/daemontools/ 6MASTER_SITES= http://cr.yp.to/daemontools/ ftp://cr.yp.to/daemontools/
7DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES} 7DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${MANPAGES}
8 8
9MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
10HOMEPAGE= http://cr.yp.to/daemontools.html 10HOMEPAGE= http://cr.yp.to/daemontools.html
11COMMENT= Service monitoring and logging utilities by djb 11COMMENT= Service monitoring and logging utilities by djb
12LICENSE= public-domain 12LICENSE= public-domain
13 13
14MANPAGES= ${DISTNAME}-man-20020131.tar.gz 14MANPAGES= ${DISTNAME}-man-20020131.tar.gz
@@ -18,26 +18,28 @@ DJB_RESTRICTED= no @@ -18,26 +18,28 @@ DJB_RESTRICTED= no
18 18
19PKG_INSTALLATION_TYPES= overwrite pkgviews 19PKG_INSTALLATION_TYPES= overwrite pkgviews
20PKG_DESTDIR_SUPPORT= user-destdir 20PKG_DESTDIR_SUPPORT= user-destdir
21 21
22WRKSRC= ${WRKDIR}/admin/${DISTNAME} 22WRKSRC= ${WRKDIR}/admin/${DISTNAME}
23DJB_SLASHPACKAGE= YES 23DJB_SLASHPACKAGE= YES
24 24
25CMDDIR= ${WRKSRC}/command 25CMDDIR= ${WRKSRC}/command
26 26
27INSTALLATION_DIRS= bin man ${PKGMANDIR}/man8 27INSTALLATION_DIRS= bin man ${PKGMANDIR}/man8
28 28
29SUBST_FILES.djbware+= src/error.h 29SUBST_FILES.djbware+= src/error.h
30 30
 31MAKE_ENV+= PKGSRC_SHELL=${TOOLS_PLATFORM.sh}
 32
31do-install: 33do-install:
32 (while read cmd; do \ 34 (while read cmd; do \
33 if ${FILE_CMD} ${CMDDIR}/$$cmd | ${EGREP} "(executable .* script|shell script|text)" >/dev/null 2>&1; then \ 35 if ${FILE_CMD} ${CMDDIR}/$$cmd | ${EGREP} "(executable .* script|shell script|text)" >/dev/null 2>&1; then \
34 ${INSTALL_SCRIPT} ${CMDDIR}/$$cmd ${DESTDIR}${PREFIX}/bin; \ 36 ${INSTALL_SCRIPT} ${CMDDIR}/$$cmd ${DESTDIR}${PREFIX}/bin; \
35 else \ 37 else \
36 ${INSTALL_PROGRAM} ${CMDDIR}/$$cmd ${DESTDIR}${PREFIX}/bin; \ 38 ${INSTALL_PROGRAM} ${CMDDIR}/$$cmd ${DESTDIR}${PREFIX}/bin; \
37 fi \ 39 fi \
38 done) < ${WRKSRC}/package/commands 40 done) < ${WRKSRC}/package/commands
39 cd ${WRKDIR}/*-man; for i in 8; do \ 41 cd ${WRKDIR}/*-man; for i in 8; do \
40 for j in *.$$i; do ${INSTALL_MAN} $$j ${DESTDIR}${PREFIX}/${PKGMANDIR}/man$$i; done \ 42 for j in *.$$i; do ${INSTALL_MAN} $$j ${DESTDIR}${PREFIX}/${PKGMANDIR}/man$$i; done \
41 done 43 done
42 44
43.include "../../mk/djbware.mk" 45.include "../../mk/djbware.mk"
cvs diff -r1.6 -r1.7 pkgsrc/sysutils/daemontools/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/daemontools/distinfo 2005/04/09 22:36:56 1.6
+++ pkgsrc/sysutils/daemontools/distinfo 2011/09/14 17:43:32 1.7
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.6 2005/04/09 22:36:56 schmonz Exp $ 1$NetBSD: distinfo,v 1.7 2011/09/14 17:43:32 hans Exp $
2 2
3SHA1 (daemontools-0.76.tar.gz) = 70a1be67e7dbe0192a887905846acc99ad5ce5b7 3SHA1 (daemontools-0.76.tar.gz) = 70a1be67e7dbe0192a887905846acc99ad5ce5b7
4RMD160 (daemontools-0.76.tar.gz) = 9819dae18b3f15a366e49fea81ecef76d5b4f53f 4RMD160 (daemontools-0.76.tar.gz) = 9819dae18b3f15a366e49fea81ecef76d5b4f53f
5Size (daemontools-0.76.tar.gz) = 36975 bytes 5Size (daemontools-0.76.tar.gz) = 36975 bytes
6SHA1 (daemontools-0.76-man-20020131.tar.gz) = 28e167def0e457f2be10aa90504c402fa08723ab 6SHA1 (daemontools-0.76-man-20020131.tar.gz) = 28e167def0e457f2be10aa90504c402fa08723ab
7RMD160 (daemontools-0.76-man-20020131.tar.gz) = d82f0bad55f0751fdfadfa0f3bf2883740fa65d9 7RMD160 (daemontools-0.76-man-20020131.tar.gz) = d82f0bad55f0751fdfadfa0f3bf2883740fa65d9
8Size (daemontools-0.76-man-20020131.tar.gz) = 8005 bytes 8Size (daemontools-0.76-man-20020131.tar.gz) = 8005 bytes
 9SHA1 (patch-aa) = 52fca4d350ed3f9422c3c8727ed505f31f17ae28
File Added: pkgsrc/sysutils/daemontools/patches/Attic/patch-aa
$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