diff options
| author | Peter Pentchev <roam@FreeBSD.org> | 2005-06-07 11:05:09 +0000 |
|---|---|---|
| committer | Peter Pentchev <roam@FreeBSD.org> | 2005-06-07 11:05:09 +0000 |
| commit | 0f300e2a91b53999e1e6851236d18dd1093ecf73 (patch) | |
| tree | 81b93ba9a2d831df4681898d676e46614b64325a /sysutils/daemontools | |
| parent | 2a4b804c71e8d8817fc4e42a234791bf4615a926 (diff) | |
| download | ports-0f300e2a91b53999e1e6851236d18dd1093ecf73.tar.gz ports-0f300e2a91b53999e1e6851236d18dd1093ecf73.zip | |
Notes
Diffstat (limited to 'sysutils/daemontools')
| -rw-r--r-- | sysutils/daemontools/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/daemontools/files/svscan.sh.sample | 2 | ||||
| -rw-r--r-- | sysutils/daemontools/pkg-plist | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile index feb11f485708..cd826a43d43a 100644 --- a/sysutils/daemontools/Makefile +++ b/sysutils/daemontools/Makefile @@ -7,7 +7,7 @@ PORTNAME= daemontools PORTVERSION= 0.76 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= sysutils MASTER_SITES= http://cr.yp.to/daemontools/ \ ftp://cr.yp.to/daemontools/ @@ -39,6 +39,8 @@ INSTALL_TARGET= setup check SAMPLERC= svscan.sh.sample SERVICEDIR?= /var/service +STARTUP_SCRIPT?= ${SAMPLERC:S/.sample//} +PLIST_SUB+= STARTUP_SCRIPT="${STARTUP_SCRIPT}" .include <bsd.port.pre.mk> @@ -66,7 +68,7 @@ do-install: done) < ${WRKSRC}/../package/commands post-install: - @${INSTALL_SCRIPT} ${WRKDIR}/${SAMPLERC} ${PREFIX}/etc/rc.d/${SAMPLERC:S/.sample//} + @${INSTALL_SCRIPT} ${WRKDIR}/${SAMPLERC} ${PREFIX}/etc/rc.d/${STARTUP_SCRIPT} .if !defined(WITHOUT_MAN) @${INSTALL_MAN} ${WRKDIR}/daemontools-man/*.8 ${PREFIX}/man/man8/ .endif diff --git a/sysutils/daemontools/files/svscan.sh.sample b/sysutils/daemontools/files/svscan.sh.sample index 097a6264d47b..aafe643d7546 100644 --- a/sysutils/daemontools/files/svscan.sh.sample +++ b/sysutils/daemontools/files/svscan.sh.sample @@ -67,7 +67,7 @@ svscan_start () { } svscan_stop_post () { - find -L "$svscan_servicedir" -mindepth 1 -maxdepth 2 -type d \( \! -path "$svscan_servicedir/*/*" -or -name 'log' \) -print0 | xargs -0 %%PREFIX%%/bin/svc -dx + find -L "$svscan_servicedir" -mindepth 1 -maxdepth 2 -type d -name '[^.]*' \( \! -path "$svscan_servicedir/*/*" -or -name 'log' \) -print0 | xargs -0 %%PREFIX%%/bin/svc -dx } run_rc_command "$1" diff --git a/sysutils/daemontools/pkg-plist b/sysutils/daemontools/pkg-plist index e32ff19da141..17e5e1fc18dd 100644 --- a/sysutils/daemontools/pkg-plist +++ b/sysutils/daemontools/pkg-plist @@ -15,4 +15,4 @@ bin/envuidgid bin/envdir bin/setlock bin/readproctitle -etc/rc.d/svscan.sh +etc/rc.d/%%STARTUP_SCRIPT%% |