diff options
| author | Philip M. Gollucci <pgollucci@FreeBSD.org> | 2010-01-04 05:15:37 +0000 |
|---|---|---|
| committer | Philip M. Gollucci <pgollucci@FreeBSD.org> | 2010-01-04 05:15:37 +0000 |
| commit | f65bb6b637d42a9066af92ae46323b3eb14e3783 (patch) | |
| tree | 338d6331a45fbfd08c88393925732ff13af0d5b8 /sysutils/daemontools | |
| parent | 62935aa13b2b704d6a801ecb4786db934bd43629 (diff) | |
Notes
Diffstat (limited to 'sysutils/daemontools')
| -rw-r--r-- | sysutils/daemontools/Makefile | 16 | ||||
| -rw-r--r-- | sysutils/daemontools/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/daemontools/files/svscan.in (renamed from sysutils/daemontools/files/svscan.sh.sample) | 0 | ||||
| -rw-r--r-- | sysutils/daemontools/pkg-plist | 1 |
4 files changed, 2 insertions, 18 deletions
diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile index 182c6ded4ad5..fa0761467457 100644 --- a/sysutils/daemontools/Makefile +++ b/sysutils/daemontools/Makefile @@ -7,7 +7,7 @@ PORTNAME= daemontools PORTVERSION= 0.76 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= sysutils MASTER_SITES= http://cr.yp.to/daemontools/ \ ftp://cr.yp.to/daemontools/ @@ -40,20 +40,13 @@ PATCHFILES+= daemontools-0.76.sigq12.patch:sigq12 PATCH_DIST_STRIP= -p2 .endif -USE_RC_SUBR= yes -RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} SERVICEDIR=${SERVICEDIR} \ - DAEMON="/usr/sbin/daemon -f" +USE_RC_SUBR= svscan WRKSRC= ${WRKDIR}/admin/${DISTNAME}/src ALL_TARGET= it INSTALL_TARGET= setup check -SAMPLERC= svscan.sh.sample -SERVICEDIR?= /var/service -STARTUP_SCRIPT?= ${SAMPLERC:S/.sample//} -PLIST_SUB+= STARTUP_SCRIPT="${STARTUP_SCRIPT}" - .if defined(WITHOUT_TESTS) EXTRA_PATCHES+= ${FILESDIR}/rts-skip.patch .endif @@ -62,10 +55,6 @@ 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 \ @@ -76,7 +65,6 @@ do-install: done) < ${WRKSRC}/../package/commands post-install: - @${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/distinfo b/sysutils/daemontools/distinfo index 2e364398b7da..45e12769f253 100644 --- a/sysutils/daemontools/distinfo +++ b/sysutils/daemontools/distinfo @@ -4,6 +4,3 @@ SIZE (daemontools-0.76.tar.gz) = 36975 MD5 (daemontools-0.76-man-20010714.tar.gz) = 7f8105a2d6f3f7f9482dbdb6f4c78d1f SHA256 (daemontools-0.76-man-20010714.tar.gz) = d99a12be71a7bff2fc46546dce02bf102eba401dbadddc29f0fe4bb6d8826c1b SIZE (daemontools-0.76-man-20010714.tar.gz) = 7992 -MD5 (daemontools-0.76.sigq12.patch) = fe2b0ddbd1ea2e72b29c7d78d5e9b0f3 -SHA256 (daemontools-0.76.sigq12.patch) = 149569b2c1a81435d4b9be5905564b2743cdcb8e5ebd1c626d5cb401761e06ae -SIZE (daemontools-0.76.sigq12.patch) = 1975 diff --git a/sysutils/daemontools/files/svscan.sh.sample b/sysutils/daemontools/files/svscan.in index 2aa1b2432fb0..2aa1b2432fb0 100644 --- a/sysutils/daemontools/files/svscan.sh.sample +++ b/sysutils/daemontools/files/svscan.in diff --git a/sysutils/daemontools/pkg-plist b/sysutils/daemontools/pkg-plist index 17e5e1fc18dd..058755f009b3 100644 --- a/sysutils/daemontools/pkg-plist +++ b/sysutils/daemontools/pkg-plist @@ -15,4 +15,3 @@ bin/envuidgid bin/envdir bin/setlock bin/readproctitle -etc/rc.d/%%STARTUP_SCRIPT%% |