2 files changed, 30 insertions, 52 deletions
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index c950ba859ec..0627c98628e 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/05/07 09:42:43 tron Exp $
+# $NetBSD: Makefile,v 1.6 1998/05/07 13:23:14 tron Exp $
 # FreeBSD Id: Makefile,v 1.24 1997/05/14 14:40:34 ache Exp
 #
 
@@ -10,7 +10,6 @@ MASTER_SITES=	ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/
 MAINTAINER=     packages@netbsd.org
 
 INSTALL_TARGET= install-suid install.man
-IS_INTERACTIVE=	yes
 
 MAN1=		procmail.1 formail.1 lockfile.1
 MAN5=		procmailex.5 procmailrc.5 procmailsc.5
diff --git a/mail/procmail/patches/patch-aa b/mail/procmail/patches/patch-aa
index b2bc9a25551..08789356371 100644
--- a/mail/procmail/patches/patch-aa
+++ b/mail/procmail/patches/patch-aa
@@ -1,50 +1,29 @@
-*** Makefile.orig	Mon Apr 28 04:27:40 1997
---- Makefile	Wed May 14 18:16:50 1997
-***************
-*** 2,8 ****
-  
-  # BASENAME should point to where the whole lot will be installed
-  # change BASENAME to your home directory if need be
-! BASENAME	= /usr
-  # For display in the man pages
-  VISIBLE_BASENAME= $(BASENAME)
-  
---- 2,8 ----
-  
-  # BASENAME should point to where the whole lot will be installed
-  # change BASENAME to your home directory if need be
-! BASENAME      = $(PREFIX)
-  # For display in the man pages
-  VISIBLE_BASENAME= $(BASENAME)
-  
-***************
-*** 53,59 ****
---- 53,63 ----
-  
-  # Makefile.0 - mark, don't (re)move this, a sed script needs it
-  
-+ .if defined(BATCH)
-+ LOCKINGTEST=/tmp .
-+ .else
-  LOCKINGTEST=__defaults__
-+ .endif
-  
-  #LOCKINGTEST=/tmp .	# Uncomment and add any directories you see fit.
-  #			If LOCKINGTEST is defined, autoconf will NOT
-***************
-*** 86,92 ****
-   #-Wimplicit -Wshadow -Wid-clash-6 #-Wuninitialized
-  
-  # The place to put your favourite extra cc flag
-! CFLAGS0 = -O #$(GCC_WARNINGS)
-  LDFLAGS0= -s
-  # Read my libs :-)
-  LIBS=
---- 90,96 ----
-   #-Wimplicit -Wshadow -Wid-clash-6 #-Wuninitialized
-  
-  # The place to put your favourite extra cc flag
-! CFLAGS0 = #-O #$(GCC_WARNINGS)
-  LDFLAGS0= -s
-  # Read my libs :-)
-  LIBS=
+--- Makefile.orig	Mon Apr 28 02:27:40 1997
++++ Makefile	Thu May  7 15:03:08 1998
+@@ -2,7 +2,7 @@
+ 
+ # BASENAME should point to where the whole lot will be installed
+ # change BASENAME to your home directory if need be
+-BASENAME	= /usr
++BASENAME      = $(PREFIX)
+ # For display in the man pages
+ VISIBLE_BASENAME= $(BASENAME)
+ 
+@@ -53,7 +53,7 @@
+ 
+ # Makefile.0 - mark, don't (re)move this, a sed script needs it
+ 
+-LOCKINGTEST=__defaults__
++LOCKINGTEST=/tmp .
+ 
+ #LOCKINGTEST=/tmp .	# Uncomment and add any directories you see fit.
+ #			If LOCKINGTEST is defined, autoconf will NOT
+@@ -86,7 +86,7 @@
+  #-Wimplicit -Wshadow -Wid-clash-6 #-Wuninitialized
+ 
+ # The place to put your favourite extra cc flag
+-CFLAGS0 = -O #$(GCC_WARNINGS)
++CFLAGS0 = #-O #$(GCC_WARNINGS)
+ LDFLAGS0= -s
+ # Read my libs :-)
+ LIBS=