1 files changed, 78 insertions, 102 deletions

diff --git a/mail/procmail/files/patch-aa b/mail/procmail/files/patch-aa
index a11051a464bb..ccd4af311ba8 100644
--- a/mail/procmail/files/patch-aa
+++ b/mail/procmail/files/patch-aa
@@ -1,102 +1,78 @@
-*** initmake.bak	Mon Apr 10 23:28:00 1995
---- initmake	Sun Apr 16 16:51:35 1995
-***************
-*** 336,343 ****
-  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=""
---- 336,343 ----
-  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=""
-*** Makefile.bak	Sun Apr 16 16:53:15 1995
---- Makefile	Sun Apr 16 16:53:33 1995
-***************
-*** 86,92 ****
-   -Waggregate-return #-Wuninitialized
-  
-  # The place to put your favourite extra cc flag
-! CFLAGS0 = -O #$(GCC_WARNINGS)
-  LDFLAGS0= -s
-  # Read my libs :-)
-  LIBS=
---- 86,92 ----
-   -Waggregate-return #-Wuninitialized
-  
-  # The place to put your favourite extra cc flag
-! CFLAGS0 = #-O #$(GCC_WARNINGS)
-  LDFLAGS0= -s
-  # Read my libs :-)
-  LIBS=
-*** Makefile.1.bak	Fri Mar 31 21:30:24 1995
---- Makefile.1	Sun Apr 16 17:09:42 1995
-***************
-*** 93,105 ****
-  	@for a in $(MANS1S); \
-    do $(INSTALL) new/$$a.1 $(MAN1DIR)/$$a.$(MAN1SUFFIX); \
-       if test "X$(MANCOMPRESS)" != "X"; \
-!      then $(MANCOMPRESS) <new/$$a.1 >$(MAN1DIR)/$$a.$(MAN1SUFFIX); \
-       else :; fi; \
-    done
-  	@for a in $(MANS5S); \
-    do $(INSTALL) new/$$a.5 $(MAN5DIR)/$$a.$(MAN5SUFFIX); \
-       if test "X$(MANCOMPRESS)" != "X"; \
-!      then $(MANCOMPRESS) <new/$$a.5 >$(MAN5DIR)/$$a.$(MAN5SUFFIX); \
-       else :; fi; \
-    done
-  	echo Housekeeping file >install.man
---- 93,105 ----
-  	@for a in $(MANS1S); \
-    do $(INSTALL) new/$$a.1 $(MAN1DIR)/$$a.$(MAN1SUFFIX); \
-       if test "X$(MANCOMPRESS)" != "X"; \
-!      then "$(MANCOMPRESS)" <new/$$a.1 >$(MAN1DIR)/$$a.$(MAN1SUFFIX); \
-       else :; fi; \
-    done
-  	@for a in $(MANS5S); \
-    do $(INSTALL) new/$$a.5 $(MAN5DIR)/$$a.$(MAN5SUFFIX); \
-       if test "X$(MANCOMPRESS)" != "X"; \
-!      then "$(MANCOMPRESS)" <new/$$a.5 >$(MAN5DIR)/$$a.$(MAN5SUFFIX); \
-       else :; fi; \
-    done
-  	echo Housekeeping file >install.man
-*** src/recommend.c.bak	Thu Aug 18 17:45:20 1994
---- src/recommend.c	Sun Apr 16 17:07:40 1995
-***************
-*** 52,59 ****
---- 52,61 ----
-       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;
-  }
-*** src/autoconf.bak	Mon Apr 10 23:28:22 1995
---- src/autoconf	Sun Apr 16 17:33:03 1995
-***************
-*** 959,964 ****
---- 959,969 ----
-    grepfor setregid '#define NOsetregid' &&
-     grepfor setresgid '#define NOsetresgid'
-  fi
-+ echo '#ifdef __FreeBSD___' >>$ACONF
-+ echo '#define NOsetrgid' >>$ACONF
-+ echo '#define NOsetregid' >>$ACONF
-+ echo '#define NOsetresgid' >>$ACONF
-+ echo '#endif' >>$ACONF
-  grepfor pow '#define NOpow'
-  grepfor mkdir '#define NOmkdir'
-  grepfor fstat '#define NOfstat'
+--- 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)
+ 
+@@ -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=
+--- Makefile.1.bak	Fri Mar 31 11:30:24 1995
++++ Makefile.1	Sat Apr 22 17:11:23 1995
+@@ -93,13 +93,13 @@
+ 	@for a in $(MANS1S); \
+   do $(INSTALL) new/$$a.1 $(MAN1DIR)/$$a.$(MAN1SUFFIX); \
+      if test "X$(MANCOMPRESS)" != "X"; \
+-     then $(MANCOMPRESS) <new/$$a.1 >$(MAN1DIR)/$$a.$(MAN1SUFFIX); \
++     then "$(MANCOMPRESS)" <new/$$a.1 >$(MAN1DIR)/$$a.$(MAN1SUFFIX); \
+      else :; fi; \
+   done
+ 	@for a in $(MANS5S); \
+   do $(INSTALL) new/$$a.5 $(MAN5DIR)/$$a.$(MAN5SUFFIX); \
+      if test "X$(MANCOMPRESS)" != "X"; \
+-     then $(MANCOMPRESS) <new/$$a.5 >$(MAN5DIR)/$$a.$(MAN5SUFFIX); \
++     then "$(MANCOMPRESS)" <new/$$a.5 >$(MAN5DIR)/$$a.$(MAN5SUFFIX); \
+      else :; fi; \
+   done
+ 	echo Housekeeping file >install.man
+--- 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/autoconf.bak	Mon Apr 10 14:28:22 1995
++++ src/autoconf	Sat Apr 22 17:11:23 1995
+@@ -959,6 +959,11 @@
+   grepfor setregid '#define NOsetregid' &&
+    grepfor setresgid '#define NOsetresgid'
+ fi
++echo '#ifdef __FreeBSD___' >>$ACONF
++echo '#define NOsetrgid' >>$ACONF
++echo '#define NOsetregid' >>$ACONF
++echo '#define NOsetresgid' >>$ACONF
++echo '#endif' >>$ACONF
+ grepfor pow '#define NOpow'
+ grepfor mkdir '#define NOmkdir'
+ grepfor fstat '#define NOfstat'
+--- 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;
+ }