Store malformed received patch on netbsd.org.

Regenerate patch for malformed received lines from upstream CVS via:
  cvs diff -r RELEASE_0_3_1

Store the patch on ftp.netbsd.org, rather than wrongly trying to put
it in files.

PKGREVISION++.

3 files changed, 7 insertions, 72 deletions

diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile
index 24a5107790d..ce23ab5b69c 100644
--- a/mail/spamass-milter/Makefile
+++ b/mail/spamass-milter/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.28 2010/06/03 23:46:54 gdt Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/05 13:45:12 gdt Exp $
 #
 
 DISTNAME=	spamass-milter-0.3.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://savannah.nongnu.org/download/spamass-milt/
 
-PATCHFILES=	spamass-milter.20100504.patch
+PATCHFILES=	spamass-milter-001.patch
 
 
 MAINTAINER=	gdt@NetBSD.org
diff --git a/mail/spamass-milter/distinfo b/mail/spamass-milter/distinfo
index 4b2ff8fc240..e6edeaa7622 100644
--- a/mail/spamass-milter/distinfo
+++ b/mail/spamass-milter/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.8 2010/06/03 23:46:55 gdt Exp $
+$NetBSD: distinfo,v 1.9 2010/06/05 13:45:12 gdt Exp $
 
 SHA1 (spamass-milter-0.3.1.tar.gz) = dd488eb9ab1f230440fba8a729bee80550f2fbff
 RMD160 (spamass-milter-0.3.1.tar.gz) = 5db6af6b31de1bf83eafbd9713d81cdc957b5033
 Size (spamass-milter-0.3.1.tar.gz) = 141144 bytes
-SHA1 (spamass-milter.20100504.patch) = 26beb851a17f059757a66f36fe48639c73cfcf4c
-RMD160 (spamass-milter.20100504.patch) = f98923345c1412329c9b3ab8430f0ed5aec22665
-Size (spamass-milter.20100504.patch) = 2625 bytes
+SHA1 (spamass-milter-001.patch) = d37227f95808479dc4d6ba5c76ddd2413b4530d3
+RMD160 (spamass-milter-001.patch) = eef17cb4506e6f5c0908b6872b7fb5dcd8bc2e16
+Size (spamass-milter-001.patch) = 2435 bytes
 SHA1 (patch-aa) = c69afbafaba72ec59f77f024e2421b2df077a2ee
 SHA1 (patch-ab) = 5e7188cc212cc0b06671853fb13921e2e0f38c8c
diff --git a/mail/spamass-milter/files/spamass-milter.20100504.patch b/mail/spamass-milter/files/spamass-milter.20100504.patch
deleted file mode 100644
index 124df3c4fa9..00000000000
--- a/mail/spamass-milter/files/spamass-milter.20100504.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Patch from upstream CVS, generated on 20100504 via
-
-  cvs -d:pserver:anonymous@cvs.savannah.nongnu.org:/sources/spamass-milt co spamass-milt
-  cd spamass-milt && cvs diff -r RELEASE_0_3_1
-
-
-Index: README
-===================================================================
-RCS file: /sources/spamass-milt/spamass-milt/README,v
-retrieving revision 1.6
-retrieving revision 1.7
-diff -u -p -r1.6 -r1.7
---- README	15 Aug 2005 15:10:47 -0000	1.6
-+++ README	19 Apr 2006 15:40:36 -0000	1.7
-@@ -1,4 +1,4 @@
--$Id: spamass-milter.20100504.patch,v 1.1 2010/06/04 21:23:02 gdt Exp $
-+$Id: spamass-milter.20100504.patch,v 1.1 2010/06/04 21:23:02 gdt Exp $
- 
- Spamass-Milter, a small
-  - SpamAssassin Sendmail Mail Filter (Milter) Plugin 
-@@ -57,6 +57,7 @@ adding the lines
- INPUT_MAIL_FILTER(`spamassassin', `S=local:/var/run/sendmail/spamass.sock, F=, T=C:15m;S:4m;R:4m;E:10m')dnl
- define(`confMILTER_MACROS_CONNECT',`t, b, j, _, {daemon_name}, {if_name}, {if_addr}')dnl
- define(`confMILTER_MACROS_HELO',`s, {tls_version}, {cipher}, {cipher_bits}, {cert_subject}, {cert_issuer}')dnl
-+define(`confMILTER_MACROS_ENVRCPT',`r, v, Z')dnl
- 
- should do the trick. Of course you need to modify the path of the
- socket if you put another one into the startup script. The timeouts
-Index: spamass-milter.cpp
-===================================================================
-RCS file: /sources/spamass-milt/spamass-milt/spamass-milter.cpp,v
-retrieving revision 1.90
-retrieving revision 1.91
-diff -u -p -r1.90 -r1.91
---- spamass-milter.cpp	23 Mar 2006 21:41:36 -0000	1.90
-+++ spamass-milter.cpp	24 Jul 2006 19:59:17 -0000	1.91
-@@ -1,6 +1,6 @@
- // 
- //
--//  $Id: spamass-milter.20100504.patch,v 1.1 2010/06/04 21:23:02 gdt Exp $
-+//  $Id: spamass-milter.20100504.patch,v 1.1 2010/06/04 21:23:02 gdt Exp $
- //
- //  SpamAss-Milter 
- //    - a rather trivial SpamAssassin Sendmail Milter plugin
-@@ -127,7 +127,7 @@ int daemon(int nochdir, int noclose);
- 
- // }}} 
- 
--static const char Id[] = "$Id: spamass-milter.20100504.patch,v 1.1 2010/06/04 21:23:02 gdt Exp $";
-+static const char Id[] = "$Id: spamass-milter.20100504.patch,v 1.1 2010/06/04 21:23:02 gdt Exp $";
- 
- struct smfiDesc smfilter =
-   {
-@@ -1002,9 +1002,9 @@ mlfi_envrcpt(SMFICTX* ctx, char** envrcp
- 
- 		assassin->output((string)
- 			"Received: from "+macro_s+" ("+macro__+")\r\n\t"+
--			"by "+macro_j+"("+macro_v+"/"+macro_Z+") with "+macro_r+" id "+macro_i+"\r\n\t"+
-+			"by "+macro_j+"("+macro_v+"/"+macro_Z+") with "+macro_r+" id "+macro_i+";\r\n\t"+
- 			macro_b+"\r\n\t"+
--			"(envelope-from "+assassin->from()+"\r\n");
-+			"(envelope-from "+assassin->from()+")\r\n");
- 
- 	} else
- 		assassin->output((string)"X-Envelope-To: "+envrcpt[0]+"\r\n");