Update to 3.0.2. From the changelog:

This release detects legitimate SMTP AUTH submission, to avoid
false positives on Dynablock-style rules. The URIDNSBL plugin has
been fixed to honor the uridnsbl_max_domains config option. Various
documentation and rule fixes. The ability to deal with 'rewrite_header
Subject' markup when no Subject header exists. 'make test' failure
on Solaris has been fixed.

pkgsrc changes:
* Use subst.mk in pre-configure, rather than post-patch, for easier
    regeneration of patches.

OK'd by heinz@.

3 files changed, 11 insertions, 11 deletions

diff --git a/mail/spamassassin/patches/patch-ab b/mail/spamassassin/patches/patch-ab
index 2396914d51d..b085b4a68e2 100644
--- a/mail/spamassassin/patches/patch-ab
+++ b/mail/spamassassin/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.8 2004/10/12 00:11:10 heinz Exp $
+$NetBSD: patch-ab,v 1.9 2005/01/15 21:44:55 schmonz Exp $
 
---- Makefile.PL.orig	Fri Aug 27 18:37:35 2004
+--- Makefile.PL.orig	2004-10-22 11:21:08.000000000 -0400
 +++ Makefile.PL
 @@ -64,6 +64,8 @@ my @ATT_KEYS = (
    'ENABLE_SSL',       # Set to 'yes' to build spamc with SSL support.
@@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.8 2004/10/12 00:11:10 heinz Exp $
          'spamc/spamc$(EXE_EXT)', # must next to last one
          'spamd/spamd',	# must be the last one
      ],
-@@ -357,14 +362,16 @@ else {
+@@ -365,14 +370,16 @@ else {
  $makefile{'macro'}{'RUN_NET_TESTS'} = yesno($opt{'run_net_tests'});
  
  if (HAS_DBI) {
@@ -54,7 +54,7 @@ $NetBSD: patch-ab,v 1.8 2004/10/12 00:11:10 heinz Exp $
  if ($opt{'run_awl_sql_tests'}) {
    my $user_awl_dsn = prompt("SQL AWL DSN (user_awl_dsn): ", "dbi:mysql:spamassassin:localhost");
    my $user_awl_sql_username = prompt("SQL AWL DB username (user_awl_sql_username): ", "");
-@@ -387,14 +394,16 @@ else {
+@@ -395,14 +402,16 @@ else {
  }
  
  if (HAS_DBI) {
@@ -77,7 +77,7 @@ $NetBSD: patch-ab,v 1.8 2004/10/12 00:11:10 heinz Exp $
  if ($opt{'run_bayes_sql_tests'}) {
    my $bayes_sql_dsn = prompt("Bayes SQL DSN (bayes_sql_dsn): ", "dbi:mysql:spamassassin:localhost");
    my $bayes_sql_username = prompt("Bayes SQL DB username (bayes_sql_username): ", "");
-@@ -1121,17 +1130,18 @@ qmail/qmail-spamc$(EXE_EXT): spamc/qmail
+@@ -1144,17 +1153,18 @@ qmail/qmail-spamc$(EXE_EXT): spamc/qmail
  
  
  conf__install:
diff --git a/mail/spamassassin/patches/patch-ae b/mail/spamassassin/patches/patch-ae
index 8613bcdc61f..9e5980b20d9 100644
--- a/mail/spamassassin/patches/patch-ae
+++ b/mail/spamassassin/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.9 2004/10/12 00:11:10 heinz Exp $
+$NetBSD: patch-ae,v 1.10 2005/01/15 21:44:55 schmonz Exp $
 
---- spamd/spamd.raw.orig	Tue Sep 14 01:34:05 2004
+--- spamd/spamd.raw.orig	2004-10-22 11:21:26.000000000 -0400
 +++ spamd/spamd.raw
-@@ -1810,8 +1810,9 @@ sub restart_handler {
+@@ -1811,8 +1811,9 @@ sub restart_handler {
  
  sub daemonize {
  
@@ -14,7 +14,7 @@ $NetBSD: patch-ae,v 1.9 2004/10/12 00:11:10 heinz Exp $
  
    # Be a nice daemon and chdir() to the root so we don't block any unmount attempts
    chdir '/' or die "Can't chdir to /: $!\n";
-@@ -1987,12 +1988,12 @@ Create user preferences files if they do
+@@ -1988,12 +1989,12 @@ Create user preferences files if they do
  =item B<-C> I<path>, B<--configpath>=I<path>
  
  Use the specified path for locating the distributed configuration files.
diff --git a/mail/spamassassin/patches/patch-aq b/mail/spamassassin/patches/patch-aq
index 3ab7a8dd9cd..ba9debe2872 100644
--- a/mail/spamassassin/patches/patch-aq
+++ b/mail/spamassassin/patches/patch-aq
@@ -1,6 +1,6 @@
-$NetBSD: patch-aq,v 1.4 2004/10/12 00:11:10 heinz Exp $
+$NetBSD: patch-aq,v 1.5 2005/01/15 21:44:55 schmonz Exp $
 
---- README.orig	Thu Aug  5 22:04:10 2004
+--- README.orig	2004-10-22 11:21:14.000000000 -0400
 +++ README
 @@ -76,30 +76,30 @@ Mail::SpamAssassin::Conf class (run the 
  the standard defaults that people use.  There is an explanation of all the