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@.

5 files changed, 22 insertions, 24 deletions

diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index ead92e1a09f..30fc863ea0f 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2004/12/28 02:47:45 reed Exp $
+# $NetBSD: Makefile,v 1.52 2005/01/15 21:44:55 schmonz Exp $
 
 DISTNAME=	Mail-SpamAssassin-${SPAMASSASSIN_VERSION}
 PKGNAME=	spamassassin-${SPAMASSASSIN_VERSION}
-PKGREVISION=	# empty
 SVR4_PKGNAME=	sa
-PKGREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:=spamassassin/} \
 		http://spamassassin.apache.org/released/
@@ -28,7 +26,7 @@ CONFLICTS=	p5-Mail-SpamAssassin-[1-9]*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-SPAMASSASSIN_VERSION=	3.0.1
+SPAMASSASSIN_VERSION=	3.0.2
 
 WRKSRC=			${WRKDIR}/${DISTNAME}
 
@@ -84,16 +82,16 @@ INSTALLATION_DIRS+=	${EG_SUBDIR} ${DOC_SUBDIR} ${DOC_SUBDIR}/spamc	\
 
 SUBST_CLASSES+=		sa1 sa2 sa3
 
-SUBST_STAGE.sa1=	post-patch
+SUBST_STAGE.sa1=	pre-configure
 SUBST_FILES.sa1=	Makefile.PL
 SUBST_SED.sa1=		-e s!@SA_CONTACT_ADDRESS@!${SPAMASSASSIN_CONTACT_ADDRESS}!
 
-SUBST_STAGE.sa2=	post-patch
+SUBST_STAGE.sa2=	pre-configure
 SUBST_FILES.sa2=	README spamd/spamd.raw
 SUBST_SED.sa2=		-e s!@@PREFIX@@!${PREFIX}!g			\
 			-e s!@PKG_SYSCONFDIR@!${PKG_SYSCONFDIR}!g
 
-SUBST_STAGE.sa3=	post-patch
+SUBST_STAGE.sa3=	pre-configure
 SUBST_FILES.sa3=	INSTALL UPGRADE USAGE ldap/README		\
 			spamc/README.qmail				\
 			lib/Mail/SpamAssassin/Conf.pm spamd/README	\
diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
index 4e48c7c07b6..3d0c2eceda3 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.25 2004/11/08 17:07:23 mjl Exp $
+$NetBSD: distinfo,v 1.26 2005/01/15 21:44:55 schmonz Exp $
 
-SHA1 (Mail-SpamAssassin-3.0.1.tar.gz) = a3aebae1bf3c97830e540c42dc64791787d966c9
-Size (Mail-SpamAssassin-3.0.1.tar.gz) = 991250 bytes
-SHA1 (patch-ab) = 09c57aa31e4f82c90cbbaac637fcbed1c730f0aa
-SHA1 (patch-ae) = 26c0589002413030bbfbb31069c82007b8fd0cf5
-SHA1 (patch-aq) = 04c46e41dc008bc3bde5bebef33174305fcf7b89
+SHA1 (Mail-SpamAssassin-3.0.2.tar.gz) = be69e72c7351df46de3eeed811219adf35b2964d
+Size (Mail-SpamAssassin-3.0.2.tar.gz) = 996164 bytes
+SHA1 (patch-ab) = 0922036370c492b980a731f8b802ff0b26e0a604
+SHA1 (patch-ae) = 7d57eb154af72ea82cb8fdafd7277823e33b7dd5
+SHA1 (patch-aq) = c918a738e0c7048183f5efbb0b7265d355ded7b3
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