Index: head/sysutils/daemontools/Makefile
===================================================================
--- head/sysutils/daemontools/Makefile	(revision 114769)
+++ head/sysutils/daemontools/Makefile	(revision 114770)
@@ -1,66 +1,66 @@
 # New ports collection makefile for:	daemontools
 # Date created:		09 June 1998
 # Whom:			Dom Mitchell <dom@myrddin.demon.co.uk>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	daemontools
 PORTVERSION=	0.76
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	sysutils
 MASTER_SITES=	http://cr.yp.to/daemontools/ \
 		ftp://cr.yp.to/daemontools/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	roam@FreeBSD.org
-COMMENT=	"Service monitoring and logging utilities by djb"
+COMMENT=	Service monitoring and logging utilities by djb
 
 .if !defined(WITHOUT_MAN)
 MANDATE=	-20010714
 MASTER_SITES+=	http://smarden.org/pape/djb/manpages/:1
 DISTFILES+=	${DISTNAME}-man${MANDATE}.tar.gz:1
 
 MAN8=		envdir.8 envuidgid.8 fghack.8 multilog.8 pgrphack.8 \
 		readproctitle.8 setlock.8 setuidgid.8 softlimit.8 \
 		supervise.8 svc.8 svok.8 svscan.8 svscanboot.8 svstat.8 \
 		tai64n.8 tai64nlocal.8
 MANCOMPRESSED=	no
 .endif
 
 USE_RC_SUBR=	yes
 RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} SERVICEDIR=${SERVICEDIR}
 
 WRKSRC=		${WRKDIR}/admin/${DISTNAME}/src
 NO_PACKAGE=	"Unsure of djb\'s license"
 
 ALL_TARGET=	it
 INSTALL_TARGET=	setup check
 
 SAMPLERC=	svscan.sh.sample
 SERVICEDIR?=	/var/service
 
 post-patch:
 	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
 	@${ECHO_CMD} "${CC} ${STRIP}" > ${WRKSRC}/conf-ld
 
 post-build:
 	@${SED}  ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${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_SCRIPT} ${WRKDIR}/${SAMPLERC} ${PREFIX}/etc/rc.d/${SAMPLERC:S/.sample//}
 .if !defined(WITHOUT_MAN)
 	@${INSTALL_MAN} ${WRKDIR}/daemontools-man/*.8 ${PREFIX}/man/man8/
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/sysutils/daemontools/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.17
\ No newline at end of property
+1.18
\ No newline at end of property
Index: head/sysutils/daemontools/files/svscan.sh.sample
===================================================================
--- head/sysutils/daemontools/files/svscan.sh.sample	(revision 114769)
+++ head/sysutils/daemontools/files/svscan.sh.sample	(revision 114770)
@@ -1,74 +1,74 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: svscan
 # REQUIRE: LOGIN
 # KEYWORD: FreeBSD
 
 # Define these svscan_* variables in one of these files:
 #       /etc/rc.conf
 #       /etc/rc.conf.local
 #       /etc/rc.conf.d/svscan
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
 
 # It would really, really be a Good Thing(tm) for you to enable some
 # of the below control variables and the apropriate ulimit.
 # These are only examples.
 # Furthermore, you should think about additional limits you might need.
 # Or, check login.conf(5) for a suitable alternative.
 # If you want to use these examples, please place into /etc/rc.conf.d/svscan.
 #
 # I really do suggest you use /var/service as your service spool directory.
 # Check hier(7) for reasons.
 
 # 10 Mb
 #MINSEGMENT=10240
 # 20 Mb
 #MAXSEGMENT=20480
 # 10 Mb
 #MAXFILESIZE=10240
 # 100
 #MAXFD=100
 # 40
 #MAXCHILD=40
 
 # ulimits
 #ulimit -d ${MINSEGMENT}
 #ulimit -f ${MAXFILESIZE}
 #ulimit -m ${MAXSEGMENT}
 #ulimit -n ${MAXFD}
 #ulimit -s ${MINSEGMENT}
 #ulimit -u ${MAXCHILD}
 
 . %%RC_SUBR%%
 
 name="svscan"
 rcvar=`set_rcvar`
 command="%%PREFIX%%/bin/svscan"
-svscan_enable="NO"
-svscan_servicedir="%%SERVICEDIR%%"
+svscan_enable=${svscan_enable-"NO"}
+svscan_servicedir=${svscan_servicedir-"/var/service"}
 
 start_cmd="svscan_start"
 stop_postcmd="svscan_stop_post"
 
 load_rc_config $name
 
 required_dirs="${svscan_servicedir}"
 
 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 | %%PREFIX%%/bin/readproctitle service errors: ................................................................................................................................................................................................................................................................................................................................................................................................................ 2>&1 &"
-	echo "Starting svscan."
+	/usr/sbin/daemon -f /bin/sh -c "$command $svscan_servicedir 2>&1 | %%PREFIX%%/bin/readproctitle service errors: ................................................................................................................................................................................................................................................................................................................................................................................................................ &"
 }
 
 svscan_stop_post () {
 	echo "Stopping svscan."
-	%%PREFIX%%/bin/svc -dx `/bin/ls -d $svscan_servicedir/* $svscan_servicedir/*/log 2>/dev/null`
+	find -L "$svscan_servicedir" -maxdepth 2 -type d \( -depth 1 -or \( -depth 2 -name 'log' \) \) -print0 | xargs -0 %%PREFIX%%/bin/svc -dx
 }
 
 run_rc_command "$1"

Property changes on: head/sysutils/daemontools/files/svscan.sh.sample
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property