Bug 20860

How-To-Repeat: 
diff -ruN /usr/ports/mail/procmail/Makefile procmail/Makefile
--- /usr/ports/mail/procmail/Makefile	Fri Apr 14 15:34:46 2000
+++ procmail/Makefile	Sat Aug 26 19:59:32 2000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	procmail
-PORTVERSION= 	3.14
+PORTVERSION= 	3.15
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.procmail.org/pub/procmail/ \
 		ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/
diff -ruN /usr/ports/mail/procmail/files/md5 procmail/files/md5
--- /usr/ports/mail/procmail/files/md5	Fri Dec 31 17:57:33 1999
+++ procmail/files/md5	Sat Aug 26 20:02:40 2000
@@ -1 +1 @@
-MD5 (procmail-3.14.tar.gz) = c10ae1301aa78352348b340ab8df4f77
+MD5 (procmail-3.15.tar.gz) = 2567273648f41ae23c51cf876e0019fc
diff -ruN /usr/ports/mail/procmail/patches/patch-ac procmail/patches/patch-ac
--- /usr/ports/mail/procmail/patches/patch-ac	Wed May 14 22:40:42 1997
+++ procmail/patches/patch-ac	Sat Aug 26 20:19:35 2000
@@ -1,21 +1,21 @@
 *** initmake.bak	Thu Apr  3 05:58:37 1997
 --- initmake	Wed May 14 18:27:56 1997
 ***************
-*** 380,387 ****
+*** 433,440 ****
   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 "LDFLAGS	= $LDFLAGS"				>>_Makefile
   echo							>>_Makefile
   
   MANSS=""
---- 380,387 ----
+--- 433,440 ----
   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   += $LDFLAGS"			>>_Makefile
   echo							>>_Makefile
   
   MANSS=""
diff -ruN /usr/ports/mail/procmail/patches/patch-ag procmail/patches/patch-ag
--- /usr/ports/mail/procmail/patches/patch-ag	Wed Aug 16 12:05:34 2000
+++ procmail/patches/patch-ag	Sat Aug 26 20:23:56 2000
@@ -1,11 +1,11 @@
---- src/manconf.c.bak	Thu Apr 22 09:07:10 1999
-+++ src/manconf.c	Wed Aug 16 05:05:37 2000
-@@ -136,7 +136,7 @@
-   ps("FW_content","\"|IFS=' '&&p=@BINDIR@/procmail&&test -f $p&&exec $p -Yf-||\
- exit 75 \2fB#\2fP\2fIYOUR_USERNAME\2fP\"");
+--- src/manconf.c.org	Sat Aug 26 20:22:06 2000
++++ src/manconf.c	Sat Aug 26 20:22:48 2000
+@@ -140,7 +140,7 @@
+ sh before procmail ever sees it; it is however a necessary kludge against\1\
+ overoptimising sendmail programs:\1");
  #else
 -  ps("FW_content","\"|exec @BINDIR@/procmail\"");
 +  ps("FW_content","\"|exec @BINDIR@/procmail || exit 75\"");
+   ps("FW_comment","");
  #endif
  #else
-   ps("DOT_FORWARD",".maildelivery");
diff -ruN /usr/ports/mail/procmail/patches/patch-ah procmail/patches/patch-ah
--- /usr/ports/mail/procmail/patches/patch-ah	Wed Aug 16 12:05:34 2000
+++ procmail/patches/patch-ah	Sat Aug 26 20:28:30 2000
@@ -1,6 +1,6 @@
---- man/procmail.man.orig	Fri Nov  5 02:26:14 1999
-+++ man/procmail.man	Wed Aug 16 07:57:55 2000
-@@ -690,17 +690,13 @@
+--- man/procmail.man.org	Sat Aug 26 20:26:18 2000
++++ man/procmail.man	Sat Aug 26 20:27:06 2000
+@@ -690,10 +690,9 @@
  .RE
  .PP
  @CF_procmail@
@@ -8,16 +8,8 @@
 -.B has
 +In this case your $HOME/@DOT_FORWARD@
  to be world readable) file should contain the line below.  Be sure to include
--the single and double quotes, and it
-+the double quotes, and it
- .I must
- be an
+-the single and double quotes, and unless you know your site to be running
++the double quotes, and unless you know your site to be running
+ smrsh (the SendMail Restricted SHell), it must be an
  .I absolute
--path.  The \fB#\fP\fIYOUR_USERNAME\fP is not actually a parameter that is
--required by procmail, in fact, it will be discarded by sh before procmail ever
--sees it; it is however a necessary kludge against overoptimising sendmail
--programs:
-+path:
- .PP
- .na
- .nf
+ path.@FW_comment@