No longer IS_INTERACTIVE. (Addresses pkg/9801.)

Move contents of post-patch script to Makefile.
Add DEINSTALL that mentions all the changes the install step does.

6 files changed, 63 insertions, 15 deletions

diff --git a/net/sendfile/Makefile b/net/sendfile/Makefile
index 241c945d33a..fe2333f803f 100644
--- a/net/sendfile/Makefile
+++ b/net/sendfile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/06/15 18:34:26 hwr Exp $
+# $NetBSD: Makefile,v 1.3 2000/09/09 19:51:38 wiz Exp $
 #
 
 DISTNAME=	sendfile-2.1
@@ -8,8 +8,12 @@ MASTER_SITES=	ftp://ftp.uni-stuttgart.de/pub/unix/comm/sendfile/current/
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.belwue.de/aktivitaeten/projekte/saft/
 
-IS_INTERACTIVE=	yes
-
 WRKSRC=	${WRKDIR}/${DISTNAME}
 
+post-patch:
+	cd ${WRKSRC} && \
+	${SED} -e 's,@PREFIX@,${PREFIX},' < makeconfig > makeconfig.new; \
+	${MV} makeconfig.new makeconfig; \
+	${CHMOD} +x makeconfig
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/sendfile/files/patch-sum b/net/sendfile/files/patch-sum
index babfb15876b..00e0645b450 100644
--- a/net/sendfile/files/patch-sum
+++ b/net/sendfile/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:12:28 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/09/09 19:51:38 wiz Exp $
 
 MD5 (patch-aa) = 188dd2e33651fddf5a8b34d6c553abad
-MD5 (patch-ab) = c4c049ca8c56ee38a79921d6a8ad41a7
+MD5 (patch-ab) = b53c39c98e6b8a52813070bf6ecbd148
+MD5 (patch-ac) = 13efc6f6952598e964015d50c97d3780
diff --git a/net/sendfile/patches/patch-ab b/net/sendfile/patches/patch-ab
index 36819d445c8..1202171bcf5 100644
--- a/net/sendfile/patches/patch-ab
+++ b/net/sendfile/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 1999/06/12 21:33:19 tron Exp $
+$NetBSD: patch-ab,v 1.3 2000/09/09 19:51:38 wiz Exp $
 
---- src/sendfiled.c	Sun Jun  6 18:31:25 1999
-+++ src/sendfiled.c.orig	Thu Oct 29 17:48:08 1998
+--- src/sendfiled.c.orig	Thu Oct 29 17:48:08 1998
++++ src/sendfiled.c
 @@ -2945,7 +2945,7 @@
        exit(1);
      }
diff --git a/net/sendfile/patches/patch-ac b/net/sendfile/patches/patch-ac
new file mode 100644
index 00000000000..66622a25ca2
--- /dev/null
+++ b/net/sendfile/patches/patch-ac
@@ -0,0 +1,28 @@
+$NetBSD: patch-ac,v 1.1 2000/09/09 19:51:39 wiz Exp $
+
+--- develop/install.orig	Thu Jan 28 22:45:40 1999
++++ develop/install
+@@ -165,14 +165,6 @@
+ To deinstall the sendfile-daemon, simply type: 	rm -f $SERVERDIR/sendfiled
+ 
+ EOD
+-echo 'If you are satisfied with these defaults, then type "ok" now:'
+-read answer
+-if [ "$answer" != ok ]; then
+-  echo
+-  echo "You can install sendfile manually, too. Please type: more doc/README"
+-  echo
+-  exit
+-fi
+ 
+ umask 022
+ 
+@@ -304,7 +296,7 @@
+     echo "adding check_sendfile to /etc/csh.login"
+     echo >>/etc/csh.login
+     echo "test -x $BINDIR/check_sendfile && $BINDIR/check_sendfile" \
+-         >>/etc/profile
++         >>/etc/csh.login
+   fi
+ fi
+ 				
diff --git a/net/sendfile/pkg/DEINSTALL b/net/sendfile/pkg/DEINSTALL
new file mode 100644
index 00000000000..3dafcfbac86
--- /dev/null
+++ b/net/sendfile/pkg/DEINSTALL
@@ -0,0 +1,22 @@
+#! /bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.1 2000/09/09 19:51:44 wiz Exp $
+#
+
+case "$2" in
+	DEINSTALL) cat <<EOF
+
+========================================================================
+
+If you won't be using sendfile any longer, do the following:
+
+ o remove the `saft' lines from /etc/services and /etc/inetd.conf;
+   restart inetd.
+ o remove the check_sendfile lines from /etc/profile and /etc/csh.login
+ o remove the directory /var/spool/sendfile and its contents
+
+========================================================================
+
+EOF
+	;;
+esac
diff --git a/net/sendfile/scripts/post-patch b/net/sendfile/scripts/post-patch
deleted file mode 100755
index 487e88abfc3..00000000000
--- a/net/sendfile/scripts/post-patch
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-# $NetBSD: post-patch,v 1.1.1.1 1999/06/06 17:08:37 hwr Exp $
-
-cd ${WRKSRC}
-mv makeconfig makeconfig.configured
-sed -e 's/@PREFIX@/${PREFIX}/' <  makeconfig.configured > makeconfig
-chmod +x makeconfig