Upgrade to pre7

2 files changed, 71 insertions, 58 deletions

diff --git a/mail/procmail/files/patch-aa b/mail/procmail/files/patch-aa
index f9a5770720ff..6258b85dcd37 100644
--- a/mail/procmail/files/patch-aa
+++ b/mail/procmail/files/patch-aa
@@ -1,58 +1,50 @@
---- Makefile.bak	Mon Apr 10 14:27:52 1995
-+++ Makefile	Sat Apr 22 17:11:43 1995
-@@ -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/local
-+BASENAME	= $(PREFIX)
- # For display in the man pages
- VISIBLE_BASENAME= $(BASENAME)
- 
-@@ -53,7 +53,11 @@
- 
- # Makefile.0 - mark, don't (re)move this, a sed script needs it
- 
-+.if defined(PACKAGE_BUILDING)
-+LOCKINGTEST=/tmp .
-+.else
- LOCKINGTEST=__defaults__
-+.endif
- 
- #LOCKINGTEST=/tmp .	# Uncomment and add any directories you see fit.
- #			If LOCKINGTEST is defined, autoconf will NOT
-@@ -86,7 +86,7 @@
-  -Waggregate-return #-Wuninitialized
- 
- # The place to put your favourite extra cc flag
--CFLAGS0 = -O #$(GCC_WARNINGS)
-+CFLAGS0 = #-O #$(GCC_WARNINGS)
- LDFLAGS0= -s
- # Read my libs :-)
- LIBS=
---- initmake.bak	Mon Apr 10 14:28:00 1995
-+++ initmake	Sat Apr 22 17:11:23 1995
-@@ -336,8 +336,8 @@
- test -z "$MAKE" && echo "MAKE	= make"			>>_Makefile
- test a"$cc" != a"$CC" && echo "CC	= $cc"		>>_Makefile
- 
--echo "CFLAGS	= \$(CFLAGS1)$CFLAGS"			>>_Makefile
--echo "LDFLAGS	= \$(LDFLAGS1)$LDFLAGS"			>>_Makefile
-+echo "CFLAGS	+= \$(CFLAGS1)$CFLAGS"			>>_Makefile
-+echo "LDFLAGS	+= \$(LDFLAGS1)$LDFLAGS"			>>_Makefile
- echo							>>_Makefile
- 
- MANSS=""
---- src/recommend.c.bak	Thu Aug 18 08:45:20 1994
-+++ src/recommend.c	Sat Apr 22 17:11:23 1995
-@@ -52,8 +52,10 @@
-      printf("chmod %o %s\n",sgid|PERMIS,argv[2]);
-   else if(chmdir==1)
-      goto nogchmod;
-+#ifndef __FreeBSD__
-   if(chmdir)
-      printf("chmod %c+w %s.\n",chmdir==1?'g':'a',systm_mbox);
-+#endif
- nogchmod:
-   return EXIT_SUCCESS;
- }
+*** 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(PACKAGE_BUILDING)
++ 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=
diff --git a/mail/procmail/files/patch-ac b/mail/procmail/files/patch-ac
new file mode 100644
index 000000000000..8c4b07617681
--- /dev/null
+++ b/mail/procmail/files/patch-ac
@@ -0,0 +1,21 @@
+*** initmake.bak	Thu Apr  3 05:58:37 1997
+--- initmake	Wed May 14 18:27:56 1997
+***************
+*** 380,387 ****
+  test -z "$MAKE" && echo "MAKE	= make"			>>_Makefile
+  test a"$cc" != a"$CC" && echo "CC	= $cc"		>>_Makefile
+  
+! echo "CFLAGS	= \$(CFLAGS1)$CFLAGS"			>>_Makefile
+! echo "LDFLAGS	= \$(LDFLAGS1)$LDFLAGS"			>>_Makefile
+  echo							>>_Makefile
+  
+  MANSS=""
+--- 380,387 ----
+  test -z "$MAKE" && echo "MAKE	= make"			>>_Makefile
+  test a"$cc" != a"$CC" && echo "CC	= $cc"		>>_Makefile
+  
+! echo "CFLAGS    += \$(CFLAGS1)$CFLAGS"                   >>_Makefile
+! echo "LDFLAGS   += \$(LDFLAGS1)$LDFLAGS"                 >>_Makefile
+  echo							>>_Makefile
+  
+  MANSS=""