Update to 2.20, as per PR/16422 by Klaus Heinz.

  Updated rules, german translation, improved base64 parsing.
UNIX domain sockets for spamc/spamd, spamd/spamd.raw spamd children
close listening socket, miscellaneous new rules, MIME parsing problem
with "--" at start of line, PerMsgStatus.pm: Non infinite looping patch
for MIME block fix, and several more bugfixes.

4 files changed, 33 insertions, 18 deletions

diff --git a/mail/p5-Mail-SpamAssassin/MESSAGE b/mail/p5-Mail-SpamAssassin/MESSAGE
new file mode 100644
index 00000000000..c7197dea81b
--- /dev/null
+++ b/mail/p5-Mail-SpamAssassin/MESSAGE
@@ -0,0 +1,12 @@
+===========================================================================
+The default directory for site-wide config files for SpamAssassin on
+NetBSD has changed from
+
+	/etc/mail/spamassassin
+
+to
+
+	${PREFIX}/etc/spamassassin
+
+If you have old config files, please move them to the new location.
+===========================================================================
diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index 6ca17aab544..0f33794fc8a 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2002/03/08 12:34:20 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/05/03 11:48:35 mjl Exp $
 #
 
-DISTNAME=	Mail-SpamAssassin-2.11
+DISTNAME=	Mail-SpamAssassin-2.20
 PKGNAME=	p5-${DISTNAME}
 SVR4_PKGNAME=	p5msa
 CATEGORIES=	mail
@@ -9,7 +9,7 @@ CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Mail/}
 
 MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://spamassassin.taint.org/
+HOMEPAGE=	http://www.spamassassin.org/
 COMMENT=	mail filter to identify spam
 
 DEPENDS+=	p5-Net-DNS-[0-9]*:../../net/p5-Net-DNS
@@ -19,8 +19,9 @@ PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Mail/SpamAssassin/.packlist
 
 post-patch:
 	@(cd ${WRKSRC};							\
-	for f in lib/Mail/SpamAssassin/Conf.pm lib/Mail/SpamAssassin.pm ; do \
-		${SED} -e "s,/usr/share,${PREFIX}/share," $$f > $$f.fixed && \
+	for f in README Makefile.PL lib/Mail/SpamAssassin/Conf.pm ; do \
+		${SED} -e "s,/usr/share,${PREFIX}/share," \
+		       -e "s,/etc/mail,${PREFIX}/etc,g" $$f > $$f.fixed && \
 		${MV} $$f.fixed $$f;					\
 	done)
 
diff --git a/mail/p5-Mail-SpamAssassin/PLIST b/mail/p5-Mail-SpamAssassin/PLIST
index 3d9e75d6fbe..57221721aea 100644
--- a/mail/p5-Mail-SpamAssassin/PLIST
+++ b/mail/p5-Mail-SpamAssassin/PLIST
@@ -1,12 +1,20 @@
-@comment $NetBSD: PLIST,v 1.2 2002/03/08 12:34:20 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/05/03 11:48:35 mjl Exp $
 @comment bin/spamassassin
 @comment bin/spamc
 @comment bin/spamd
 @comment bin/spamproxyd
-share/spamassassin/user_prefs.template
+share/doc/spamassassin/README
+share/doc/spamassassin/procmailrc.example
+share/doc/spamassassin/sample-nonspam.txt
+share/doc/spamassassin/sample-spam.txt
+share/doc/spamassassin/spamd/README.spamd
+share/doc/spamassassin/sql/README
+share/doc/spamassassin/sql/spamassassin.sql
 share/spamassassin/10_misc.cf
 share/spamassassin/20_body_tests.cf
 share/spamassassin/20_head_tests.cf
+share/spamassassin/20_uri_tests.cf
+share/spamassassin/25_body_tests_es.cf
 share/spamassassin/25_body_tests_pl.cf
 share/spamassassin/25_head_tests_pl.cf
 share/spamassassin/30_text_es.cf
@@ -14,14 +22,8 @@ share/spamassassin/30_text_pl.cf
 share/spamassassin/40_spam_phrases.cf
 share/spamassassin/50_scores.cf
 share/spamassassin/60_whitelist.cf
-share/doc/spamassassin/README
-share/doc/spamassassin/procmailrc.example
-share/doc/spamassassin/sample-nonspam.txt
-share/doc/spamassassin/sample-spam.txt
-share/doc/spamassassin/sql/README
-share/doc/spamassassin/sql/spamassassin.sql
-share/doc/spamassassin/spamd/README.spamd
+share/spamassassin/user_prefs.template
 @dirrm share/doc/spamassassin/spamd
 @dirrm share/doc/spamassassin/sql
-@dirrm share/spamassassin
 @dirrm share/doc/spamassassin
+@dirrm share/spamassassin
diff --git a/mail/p5-Mail-SpamAssassin/distinfo b/mail/p5-Mail-SpamAssassin/distinfo
index 54a2266ea64..87117ace8dc 100644
--- a/mail/p5-Mail-SpamAssassin/distinfo
+++ b/mail/p5-Mail-SpamAssassin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/03/08 12:34:20 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/05/03 11:48:35 mjl Exp $
 
-SHA1 (Mail-SpamAssassin-2.11.tar.gz) = 322b8d10788c93790aecf6285dd2cb868001211b
-Size (Mail-SpamAssassin-2.11.tar.gz) = 193168 bytes
+SHA1 (Mail-SpamAssassin-2.20.tar.gz) = 03a4a4849e2d5f8851a8702df965a36b0a17aee8
+Size (Mail-SpamAssassin-2.20.tar.gz) = 249143 bytes