No functional changes:

    * grab manpage from .tar.gz instead of patch file
    * minor fixes in the Makefile

Patch sent by Tomasz Luchowski <zuntum@eik.pl> in private mail.

5 files changed, 29 insertions, 26 deletions

diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile
index 309d348c619..6fd861333da 100644
--- a/sysutils/daemontools/Makefile
+++ b/sysutils/daemontools/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:42:12 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/26 03:41:29 hubertf Exp $
 # FreeBSD Id: ports/sysutils/daemontools/Makefile,v 1.8 2000/12/03 05:16:41 steve Exp
 
 DISTNAME=	daemontools-0.70
 CATEGORIES=	sysutils
-MASTER_SITES=	http://cr.yp.to/daemontools/ \
-		ftp://cr.yp.to/daemontools/ \
+MASTER_SITES=	http://cr.yp.to/daemontools/				\
+		ftp://cr.yp.to/daemontools/				\
+		ftp://ftp.innominate.org/gpa/djb/			\
 		http://zuntum.eik.pl/pkgsrc/distfiles/
-
-PATCH_SITES=  	http://www.fefe.de/daemontools/
-PATCHFILES=	daemontools-0.70-man.diff.bz2
-PATCH_DIST_STRIP=       -p1
+DISTFILES=	${DISTNAME}.tar.gz					\
+		${DISTNAME}-man.tar.gz
 
 MAINTAINER=	zuntum@eik.pl
 HOMEPAGE=	http://cr.yp.to/daemontools.html
@@ -31,10 +30,10 @@ post-patch:
 post-build:
 	@${SED} \
 		-e "s!/usr/local/!${PREFIX}/!" \
-		-e "s!/var/service!${SERVICEDIR}!g" \
+		-e "s!/service!${SERVICEDIR}!g" \
 		${FILESDIR}/${SAMPLERC} > ${WRKDIR}/${SAMPLERC}
 	@${SED} \
-		-e "s!/var/service!${SERVICEDIR}!g" \
+		-e "s!/service!${SERVICEDIR}!g" \
 		${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
 
 post-install:
@@ -42,4 +41,9 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/${SAMPLERC} ${PREFIX}/share/examples/daemontools
 	${INSTALL_DATA_DIR} ${SERVICEDIR}
 
+	cd ${WRKDIR}/${DISTNAME}-man && ${INSTALL_MAN} envdir.8 envuidgid.8	\
+		fghack.8 multilog.8 setlock.8 setuidgid.8 softlimit.8		\
+		supervise.8 svc.8 svok.8 svscan.8 svstat.8 tai64n.8		\
+		tai64nlocal.8 ${PREFIX}/man/man8
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/daemontools/files/md5 b/sysutils/daemontools/files/md5
index bf282bd9a02..99fc1ae0b16 100644
--- a/sysutils/daemontools/files/md5
+++ b/sysutils/daemontools/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.1.1.1 2000/12/27 15:44:55 hubertf Exp $
+$NetBSD: md5,v 1.2 2001/02/26 03:41:29 hubertf Exp $
 
 MD5 (daemontools-0.70.tar.gz) = c88e8c5e4453b4df41571f60eaa0baf3
-MD5 (daemontools-0.70-man.diff.bz2) = bb7cbd7f2e06fd0e192ad09b6a7733b8
+MD5 (daemontools-0.70-man.tar.gz) = fe0a7926131cd3ecb9d1b1266ace8f9f
diff --git a/sysutils/daemontools/files/svscan.sh.sample b/sysutils/daemontools/files/svscan.sh.sample
index ab67f451307..1baa156e60e 100644
--- a/sysutils/daemontools/files/svscan.sh.sample
+++ b/sysutils/daemontools/files/svscan.sh.sample
@@ -8,7 +8,7 @@
 # Or, check login.conf(5) for a suitable
 # alternative
 #
-# I really do suggest you use /var/service as your
+# I really do suggest you use /service as your
 # service spool directory. Check hier(7) for
 # reasons.
 
@@ -31,4 +31,4 @@
 #ulimit -s ${MINSEGMENT}
 #ulimit -u ${MAXCHILD}
 
-exec /bin/csh -cf '/usr/local/bin/svscan /var/service &'
+exec /bin/csh -cf '/usr/local/bin/svscan /service &'
diff --git a/sysutils/daemontools/pkg/DEINSTALL b/sysutils/daemontools/pkg/DEINSTALL
index 559e4a282e5..31909757eaf 100644
--- a/sysutils/daemontools/pkg/DEINSTALL
+++ b/sysutils/daemontools/pkg/DEINSTALL
@@ -1,16 +1,15 @@
 #! /bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.1.1.1 2000/12/27 15:44:55 hubertf Exp $
+# $NetBSD: DEINSTALL,v 1.2 2001/02/26 03:41:29 hubertf Exp $
 #
 
 case "$2" in
-	DEINSTALL) rmdir 2>/dev/null /var/service || cat <<EOF
+	DEINSTALL) rmdir 2>/dev/null /service || cat <<EOF
 
 =============================================================
 Note that the config files for this package under
-/var/service are not removed in the deinstallation
-process.  You should remove those by hand, if you no longer
-need them.
+/service are not removed in the deinstallation process.
+You should remove those by hand, if you no longer need them.
 =============================================================
 
 EOF
diff --git a/sysutils/daemontools/pkg/PLIST b/sysutils/daemontools/pkg/PLIST
index 479fa881068..21f3f0f4125 100644
--- a/sysutils/daemontools/pkg/PLIST
+++ b/sysutils/daemontools/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/12/27 15:44:55 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/02/26 03:41:30 hubertf Exp $
 bin/envdir
 bin/envuidgid
 bin/fghack
@@ -13,20 +13,20 @@ bin/svscan
 bin/svstat
 bin/tai64n
 bin/tai64nlocal
-man/man1/envdir.1
-man/man1/envuidgid.1
-man/man1/setlock.1
-man/man1/setuidgid.1
-man/man1/softlimit.1
-man/man1/tai64n.1
-man/man1/tai64nlocal.1
+man/man8/envdir.8
+man/man8/envuidgid.8
 man/man8/fghack.8
 man/man8/multilog.8
+man/man8/setlock.8
+man/man8/setuidgid.8
+man/man8/softlimit.8
 man/man8/supervise.8
 man/man8/svc.8
 man/man8/svok.8
 man/man8/svscan.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