From 87f39b0573f5201790f3bbcc7159c55335e68d51 Mon Sep 17 00:00:00 2001
From: Peter Pentchev <roam@FreeBSD.org>
Date: Tue, 27 Jul 2004 06:27:07 +0000
Subject: [PATCH] Make the startup script also work on older versions of
 FreeBSD which lack the daemon(8) utility.

---
 sysutils/daemontools/Makefile               | 12 ++++++++++--
 sysutils/daemontools/files/svscan.sh.sample |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile
index 72f54a289704..a6cb3238919f 100644
--- a/sysutils/daemontools/Makefile
+++ b/sysutils/daemontools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	daemontools
 PORTVERSION=	0.76
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cr.yp.to/daemontools/ \
 		ftp://cr.yp.to/daemontools/
@@ -40,6 +40,14 @@ INSTALL_TARGET=	setup check
 SAMPLERC=	svscan.sh.sample
 SERVICEDIR?=	/var/service
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500023 || ${OSVERSION} < 500000 && ${OSVERSION} >= 460102
+RC_SCRIPTS_SUB+=	DAEMON="/usr/sbin/daemon -f"
+.else
+RC_SCRIPTS_SUB+=	DAEMON=""
+.endif
+
 post-patch:
 	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
 	@${ECHO_CMD} "${CC} ${STRIP}" > ${WRKSRC}/conf-ld
@@ -63,4 +71,4 @@ post-install:
 	@${INSTALL_MAN} ${WRKDIR}/daemontools-man/*.8 ${PREFIX}/man/man8/
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/daemontools/files/svscan.sh.sample b/sysutils/daemontools/files/svscan.sh.sample
index 7516fe93c851..194f66f486aa 100644
--- a/sysutils/daemontools/files/svscan.sh.sample
+++ b/sysutils/daemontools/files/svscan.sh.sample
@@ -63,7 +63,7 @@ svscan_start () {
 	echo "Starting svscan."
 	/usr/bin/env \
 	PATH=%%PREFIX%%/sbin:%%PREFIX%%/bin:/usr/sbin:/usr/bin:/sbin:/bin \
-	/usr/sbin/daemon -f /bin/sh -c "$command $svscan_servicedir 2>&1 | %%PREFIX%%/bin/readproctitle service errors: ................................................................................................................................................................................................................................................................................................................................................................................................................ &"
+	%%DAEMON%% /bin/sh -c "$command $svscan_servicedir 2>&1 | %%PREFIX%%/bin/readproctitle service errors: ................................................................................................................................................................................................................................................................................................................................................................................................................ &" > /dev/null
 }
 
 svscan_stop_post () {