Fix hint on how to get help in installed local.cf (you need to delete

any old ones, otherwise the new one doesn't get installed).
Fixes pkg/17663 by Kimmo Suominen.

Additionally, fix variable name in MESSAGE so that it gets expanded
properly.

Bump to 2.31nb3.

4 files changed, 16 insertions, 5 deletions

diff --git a/mail/p5-Mail-SpamAssassin/MESSAGE b/mail/p5-Mail-SpamAssassin/MESSAGE
index 49235849fb3..5fa4c3d230b 100644
--- a/mail/p5-Mail-SpamAssassin/MESSAGE
+++ b/mail/p5-Mail-SpamAssassin/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/07/15 22:57:28 heinz Exp $
+$NetBSD: MESSAGE,v 1.4 2002/07/23 02:07:07 wiz Exp $
 
 The default directory for site-wide config files for SpamAssassin on
 NetBSD has changed from
@@ -8,7 +8,7 @@ NetBSD has changed from
 
 to
 
-	${PKG_SYSCONFBASE}/spamassassin
+	${PKG_SYSCONFDIR}/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 fd366180378..2041b0fba7f 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2002/07/05 07:03:56 tron Exp $
+# $NetBSD: Makefile,v 1.9 2002/07/23 02:07:07 wiz Exp $
 
 DISTNAME=	Mail-SpamAssassin-2.31
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 SVR4_PKGNAME=	p5msa
 CATEGORIES=	mail
 #MASTER_SITES=	http://spamassassin.taint.org/released/
diff --git a/mail/p5-Mail-SpamAssassin/distinfo b/mail/p5-Mail-SpamAssassin/distinfo
index ec4f763036b..23f193f0e54 100644
--- a/mail/p5-Mail-SpamAssassin/distinfo
+++ b/mail/p5-Mail-SpamAssassin/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.6 2002/07/03 23:21:51 lukem Exp $
+$NetBSD: distinfo,v 1.7 2002/07/23 02:07:07 wiz Exp $
 
 SHA1 (Mail-SpamAssassin-2.31.tar.gz) = d43295b0e3e49c60e8f91f7f7645a40db04965f1
 Size (Mail-SpamAssassin-2.31.tar.gz) = 370237 bytes
+SHA1 (patch-aa) = 79a9f8589d6a99979bd2ff5dc56aff7ff9654ac7
diff --git a/mail/p5-Mail-SpamAssassin/patches/patch-aa b/mail/p5-Mail-SpamAssassin/patches/patch-aa
new file mode 100644
index 00000000000..cd3d7b0e010
--- /dev/null
+++ b/mail/p5-Mail-SpamAssassin/patches/patch-aa
@@ -0,0 +1,10 @@
+$NetBSD: patch-aa,v 1.3 2002/07/23 02:07:08 wiz Exp $
+
+--- rules/local.cf.orig	Wed Dec 19 06:20:44 2001
++++ rules/local.cf
+@@ -1,3 +1,3 @@
+-# Add your own customisations to this file.  See 'man Mail::SpamAssassin::Conf'
+-# for details of what can be tweaked.
++# Add your own customisations to this file.  See
++# 'perldoc Mail::SpamAssassin::Conf' for details of what can be tweaked.
+ #