diff options
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rw-r--r-- | doc/TODO | 3 | ||||
| -rw-r--r-- | sysutils/daemontools/DEINSTALL | 9 | ||||
| -rw-r--r-- | sysutils/daemontools/Makefile | 33 | ||||
| -rw-r--r-- | sysutils/daemontools/PLIST | 9 | ||||
| -rw-r--r-- | sysutils/daemontools/distinfo | 10 |
6 files changed, 40 insertions, 27 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index deea581a01a..c4b6aabe3d0 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.5791 2004/05/02 17:25:15 xtraeme Exp $ +$NetBSD: CHANGES,v 1.5792 2004/05/02 17:50:05 xtraeme Exp $ Changes to the packages collection and infrastructure in 2004: @@ -2316,3 +2316,4 @@ Changes to the packages collection and infrastructure in 2004: Updated xmlcatmgr to 2.1 [jmmv 2004-05-02] Updated gpass to 0.4.1 [jmmv 2004-05-02] Updated cue to 20040329 [xtraeme 2004-05-02] + Updated daemontools to 0.76 [xtraeme 2004-05-02] @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.1690 2004/05/01 10:37:57 jmmv Exp $ +$NetBSD: TODO,v 1.1691 2004/05/02 17:50:05 xtraeme Exp $ Suggested new packages ====================== @@ -168,7 +168,6 @@ Suggested package updates o curl-7.11.2 o cxref-1.5e o cyrus-imapd21-2.1.16 - o daemontools-0.76 [pkg/25153] o dctc-0.85.9 o ddd-3.3.8 o delegate-8.9.1 diff --git a/sysutils/daemontools/DEINSTALL b/sysutils/daemontools/DEINSTALL index d77d41a71a7..a09d50a4f97 100644 --- a/sysutils/daemontools/DEINSTALL +++ b/sysutils/daemontools/DEINSTALL @@ -1,14 +1,11 @@ -#! /bin/sh -# -# $NetBSD: DEINSTALL,v 1.1 2001/10/31 22:53:02 zuntum Exp $ -# +# $NetBSD: DEINSTALL,v 1.2 2004/05/02 17:50:05 xtraeme Exp $ case "$2" in DEINSTALL) rmdir 2>/dev/null @@SERVICEDIR@@ || cat <<EOF ============================================================= -Note that /service directory was not removed. If you -no longer need it, remove it by hand. +Your service directory @@SERVICEDIR@@ was not removed. +If you no longer need it, remove it by hand. ============================================================= EOF diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile index 411c3c3bca1..7d9551dc644 100644 --- a/sysutils/daemontools/Makefile +++ b/sysutils/daemontools/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.11 2003/07/17 22:53:30 grant Exp $ +# $NetBSD: Makefile,v 1.12 2004/05/02 17:50:05 xtraeme Exp $ # FreeBSD Id: ports/sysutils/daemontools/Makefile,v 1.8 2000/12/03 05:16:41 steve Exp -DISTNAME= daemontools-0.70 +DISTNAME= daemontools-0.76 CATEGORIES= sysutils MASTER_SITES= http://cr.yp.to/daemontools/ \ ftp://cr.yp.to/daemontools/ \ - ftp://ftp.innominate.org/pub/pape/djb/ + http://smarden.org/pape/djb/manpages/ DISTFILES= ${DISTNAME}.tar.gz \ - ${DISTNAME}-man-20001116.tar.gz + ${DISTNAME}-man.tar.gz MAINTAINER= zuntum@NetBSD.org HOMEPAGE= http://cr.yp.to/daemontools.html @@ -18,17 +18,21 @@ NO_BIN_ON_CDROM=${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} ALL_TARGET= it -INSTALL_TARGET= setup check SAMPLERC= svscan.sh.sample SERVICEDIR?= /var/spool/service +WRKSRC= ${WRKDIR}/admin/${DISTNAME} +CMDDIR= ${WRKSRC}/command PLIST_SUBST+= SERVICEDIR=${SERVICEDIR} DEINSTALL_FILE= ${WRKDIR}/.DEINSTALL post-patch: - @${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc - @${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld - @${ECHO} ${PREFIX} > ${WRKSRC}/conf-home + @${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/src/conf-cc + @${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/src/conf-ld + @${ECHO} ${PREFIX} > ${WRKSRC}/src/conf-home + +do-build: + cd ${WRKSRC} && package/compile post-build: ${SED} -e "s,@@PREFIX@@,${PREFIX}," \ @@ -37,13 +41,20 @@ post-build: ${SED} "s,@@SERVICEDIR@@,${SERVICEDIR},g" \ ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} +do-install: + (while read cmd; do \ + if ${FILE_CMD} ${CMDDIR}/$$cmd | ${GREP} -q "shell script"; then \ + ${INSTALL_SCRIPT} ${CMDDIR}/$$cmd ${PREFIX}/bin; \ + else \ + ${INSTALL_PROGRAM} ${CMDDIR}/$$cmd ${PREFIX}/bin; \ + fi \ + done) < ${WRKSRC}/package/commands + post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/daemontools ${INSTALL_DATA} ${WRKDIR}/${SAMPLERC} \ ${PREFIX}/share/examples/daemontools ${INSTALL_DATA_DIR} ${SERVICEDIR} - - cd ${WRKDIR}/${DISTNAME}-man && \ - ${INSTALL_MAN} *.8 ${PREFIX}/man/man8 + cd ${WRKDIR}/${PKGBASE}-man && ${INSTALL_MAN} *.8 ${PREFIX}/man/man8 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/daemontools/PLIST b/sysutils/daemontools/PLIST index 31b6abe6349..526143f4b22 100644 --- a/sysutils/daemontools/PLIST +++ b/sysutils/daemontools/PLIST @@ -1,8 +1,10 @@ -@comment $NetBSD: PLIST,v 1.3 2002/12/09 16:01:43 tron Exp $ +@comment $NetBSD: PLIST,v 1.4 2004/05/02 17:50:05 xtraeme Exp $ bin/envdir bin/envuidgid bin/fghack bin/multilog +bin/pgrphack +bin/readproctitle bin/setlock bin/setuidgid bin/softlimit @@ -10,6 +12,7 @@ bin/supervise bin/svc bin/svok bin/svscan +bin/svscanboot bin/svstat bin/tai64n bin/tai64nlocal @@ -17,6 +20,8 @@ man/man8/envdir.8 man/man8/envuidgid.8 man/man8/fghack.8 man/man8/multilog.8 +man/man8/pgrphack.8 +man/man8/readproctitle.8 man/man8/setlock.8 man/man8/setuidgid.8 man/man8/softlimit.8 @@ -24,9 +29,9 @@ man/man8/supervise.8 man/man8/svc.8 man/man8/svok.8 man/man8/svscan.8 +man/man8/svscanboot.8 man/man8/svstat.8 man/man8/tai64n.8 man/man8/tai64nlocal.8 share/examples/daemontools/svscan.sh.sample @dirrm share/examples/daemontools -@exec ${MKDIR} ${SERVICEDIR} || ${TRUE} diff --git a/sysutils/daemontools/distinfo b/sysutils/daemontools/distinfo index fdb46667d3b..8d4d43537c6 100644 --- a/sysutils/daemontools/distinfo +++ b/sysutils/daemontools/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2001/10/22 13:42:28 zuntum Exp $ +$NetBSD: distinfo,v 1.4 2004/05/02 17:50:05 xtraeme Exp $ -SHA1 (daemontools-0.70.tar.gz) = e4af3b5e6fa5a85fb86fe8d80248421f0f8765ff -Size (daemontools-0.70.tar.gz) = 36144 bytes -SHA1 (daemontools-0.70-man-20001116.tar.gz) = 08fd1d5c1af4b620cc80116470468b2f92130d6c -Size (daemontools-0.70-man-20001116.tar.gz) = 8279 bytes +SHA1 (daemontools-0.76.tar.gz) = 70a1be67e7dbe0192a887905846acc99ad5ce5b7 +Size (daemontools-0.76.tar.gz) = 36975 bytes +SHA1 (daemontools-0.76-man.tar.gz) = 28e167def0e457f2be10aa90504c402fa08723ab +Size (daemontools-0.76-man.tar.gz) = 8005 bytes |