Upgrade to 3.15

5 files changed, 28 insertions, 45 deletions

diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index fbf25c74607a..de6ce62660d3 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -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 --git a/mail/procmail/distinfo b/mail/procmail/distinfo
index ce65bb63fc1b..b28ab6508047 100644
--- a/mail/procmail/distinfo
+++ b/mail/procmail/distinfo
@@ -1 +1 @@
-MD5 (procmail-3.14.tar.gz) = c10ae1301aa78352348b340ab8df4f77
+MD5 (procmail-3.15.tar.gz) = 2567273648f41ae23c51cf876e0019fc
diff --git a/mail/procmail/files/patch-ac b/mail/procmail/files/patch-ac
index 8c4b07617681..e363e3ac83e7 100644
--- a/mail/procmail/files/patch-ac
+++ b/mail/procmail/files/patch-ac
@@ -1,21 +1,13 @@
-*** 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=""
+--- initmake.orig	Sat Jan 29 09:52:13 2000
++++ initmake	Sun Aug 27 13:06:14 2000
+@@ -433,8 +433,8 @@
+ test -z "$MAKE" && echo "MAKE	= make"			>>_Makefile
+ test a"$cc" != a"$CC" && echo "CC	= $cc"		>>_Makefile
+ 
+-echo "CFLAGS	= \$(CFLAGS1)$CFLAGS"			>>_Makefile
+-echo "LDFLAGS	= $LDFLAGS"				>>_Makefile
++echo "CFLAGS    += \$(CFLAGS1)$CFLAGS"                   >>_Makefile
++echo "LDFLAGS   += $LDFLAGS"                             >>_Makefile
+ echo							>>_Makefile
+ 
+ MANSS=""
diff --git a/mail/procmail/files/patch-ag b/mail/procmail/files/patch-ag
index 81a3012d1ed9..1ec12acc25bd 100644
--- a/mail/procmail/files/patch-ag
+++ b/mail/procmail/files/patch-ag
@@ -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.orig	Fri Aug 25 11:04:33 2000
++++ src/manconf.c	Sun Aug 27 13:12:55 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 --git a/mail/procmail/files/patch-ah b/mail/procmail/files/patch-ah
index 576cc6efd696..c3a84f47d61f 100644
--- a/mail/procmail/files/patch-ah
+++ b/mail/procmail/files/patch-ah
@@ -1,23 +1,14 @@
---- 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.orig	Fri Aug 25 11:04:32 2000
++++ man/procmail.man	Sun Aug 27 13:21:23 2000
+@@ -690,9 +690,8 @@
  .RE
  .PP
  @CF_procmail@
 -In this case your $HOME/@DOT_FORWARD@ (beware, it
 -.B has
+-to be world readable) file should contain the line below.  Be sure to include
 +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
++file should contain the line below.  Be sure to include
+ the single and 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