Update to 0.76.

Assume maintainership.

Reviewed by:	nbm
Approved by:	nbm

6 files changed, 45 insertions, 31 deletions

diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile
index 465aeb9bf851..7bc4107b6f5b 100644
--- a/sysutils/daemontools/Makefile
+++ b/sysutils/daemontools/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	daemontools
-PORTVERSION=	0.70
-PORTREVISION=	1
+PORTVERSION=	0.76
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cr.yp.to/daemontools/ \
 		ftp://cr.yp.to/daemontools/
 
-MAINTAINER=	nbm@FreeBSD.org
+MAINTAINER=	roam@FreeBSD.org
 
+WRKSRC=		${WRKDIR}/admin/${DISTNAME}/src
 NO_PACKAGE=	"Unsure of djb\'s license"
 
 ALL_TARGET=	it
@@ -24,13 +24,21 @@ SERVICEDIR?=	/var/service/
 
 post-patch:
 	@echo "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
-	@echo "${CC} -s" > ${WRKSRC}/conf-ld
-	@echo "${PREFIX}" > ${WRKSRC}/conf-home
+	@echo "${CC} ${STRIP}" > ${WRKSRC}/conf-ld
 
 post-build:
 	@${SED} "s!/usr/local/!${PREFIX}/!;s!/var/service!${SERVICEDIR}!g" \
 		${FILESDIR}/${SAMPLERC} > ${WRKDIR}/${SAMPLERC}
 
+do-install:
+	(while read cmd; do \
+		if file ${WRKSRC}/$$cmd | ${GREP} -q "shell script"; then \
+			${INSTALL_SCRIPT} ${WRKSRC}/$$cmd ${PREFIX}/bin; \
+		else \
+			${INSTALL_PROGRAM} ${WRKSRC}/$$cmd ${PREFIX}/bin; \
+		fi \
+	done) < ${WRKSRC}/../package/commands
+
 post-install:
 	@${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 755 \
 		${PREFIX}/share/examples/${PORTNAME}
diff --git a/sysutils/daemontools/distinfo b/sysutils/daemontools/distinfo
index 211f9bd56492..6aa538115d84 100644
--- a/sysutils/daemontools/distinfo
+++ b/sysutils/daemontools/distinfo
@@ -1 +1 @@
-MD5 (daemontools-0.70.tar.gz) = c88e8c5e4453b4df41571f60eaa0baf3
+MD5 (daemontools-0.76.tar.gz) = 1871af2453d6e464034968a0fbcb2bfc
diff --git a/sysutils/daemontools/files/patch-Makefile b/sysutils/daemontools/files/patch-Makefile
new file mode 100644
index 000000000000..4b4939a1f7b3
--- /dev/null
+++ b/sysutils/daemontools/files/patch-Makefile
@@ -0,0 +1,26 @@
+--- Makefile.old	Fri Aug 31 15:16:47 2001
++++ Makefile	Fri Aug 31 15:17:04 2001
+@@ -82,10 +82,9 @@
+ chkshsgr.o: chkshsgr.c compile
+ 	./compile chkshsgr.c
+ 
+-choose: choose.sh home warn-auto.sh
++choose: choose.sh warn-auto.sh
+ 	rm -f choose
+ 	cat warn-auto.sh choose.sh \
+-	| sed s}HOME}"`head -1 home`"}g \
+ 	> choose
+ 	chmod 555 choose
+ 
+@@ -387,10 +386,9 @@
+ pathexec.h str.h strerr.h svscan.c wait.h
+ 	./compile svscan.c
+ 
+-svscanboot: home svscanboot.sh warn-auto.sh
++svscanboot: svscanboot.sh warn-auto.sh
+ 	rm -f svscanboot
+ 	cat warn-auto.sh svscanboot.sh \
+-	| sed s}HOME}"`head -1 home`"}g \
+ 	> svscanboot
+ 	chmod 555 svscanboot
+ 
diff --git a/sysutils/daemontools/files/patch-supervise.c b/sysutils/daemontools/files/patch-supervise.c
deleted file mode 100644
index bb9416d059f2..000000000000
--- a/sysutils/daemontools/files/patch-supervise.c
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN supervise.c supervise.c
---- supervise.c	Mon Mar  6 07:21:09 2000
-+++ supervise.c	Mon Apr 23 11:15:10 2001
-@@ -90,7 +90,12 @@
- void trystart(void)
- {
-   int f;
-+  static int firstpassed = 0;
- 
-+  if (firstpassed)
-+    sleep(1);
-+  else
-+    firstpassed = 1;
-   switch(f = fork()) {
-     case -1:
-       strerr_warn4(WARNING,"unable to fork for ",dir,", sleeping 60 seconds: ",&strerr_sys);
-@@ -105,7 +110,6 @@
-   pid = f;
-   pidchange();
-   announce();
--  sleep(1);
- }
- 
- void doit(void)
diff --git a/sysutils/daemontools/files/svscan.sh.sample b/sysutils/daemontools/files/svscan.sh.sample
index ab67f451307c..8f2311317402 100644
--- a/sysutils/daemontools/files/svscan.sh.sample
+++ b/sysutils/daemontools/files/svscan.sh.sample
@@ -31,4 +31,5 @@
 #ulimit -s ${MINSEGMENT}
 #ulimit -u ${MAXCHILD}
 
-exec /bin/csh -cf '/usr/local/bin/svscan /var/service &'
+exec /bin/csh -cf '/usr/local/bin/svscan /var/service |& '\
+'/usr/local/bin/readproctitle service errors: ................................................................................................................................................................................................................................................................................................................................................................................................................ &'
diff --git a/sysutils/daemontools/pkg-plist b/sysutils/daemontools/pkg-plist
index bedaad45ad93..058755f009b3 100644
--- a/sysutils/daemontools/pkg-plist
+++ b/sysutils/daemontools/pkg-plist
@@ -1,9 +1,11 @@
 bin/svscan
+bin/svscanboot
 bin/supervise
 bin/svc
 bin/svok
 bin/svstat
 bin/fghack
+bin/pgrphack
 bin/multilog
 bin/tai64n
 bin/tai64nlocal
@@ -12,3 +14,4 @@ bin/setuidgid
 bin/envuidgid
 bin/envdir
 bin/setlock
+bin/readproctitle