Update to 2.42.

Uses buildlink2 and module.mk. Some perl scripts for rule developers
(in PREFIX/share/doc/spamassassin/{masses,tools}/) and a small SpamAssassin
logo (PREFIX/share/doc/spamassassin/html/) are now included.
New netbsd_lists.cf file to reduce false positives on NetBSD lists (so
far, only some rules for netbsd-bugs).

Changes:
- bug fixes
- new, better scores (intensive testing was done to improve on 2.40 and
  2.41)
- netbsd rc.d script works now with NetBSD 1.5 and 1.6
- management of addresses in the automatic whitlist now easier with
  dedicated options (--add-addr-to-whitelist, --remove-addr-from-whitelist)

12 files changed, 290 insertions, 81 deletions

diff --git a/mail/spamassassin/DESCR b/mail/spamassassin/DESCR
index 3d60fec1ee9..8836f99fa58 100644
--- a/mail/spamassassin/DESCR
+++ b/mail/spamassassin/DESCR
@@ -3,20 +3,20 @@ SpamAssassin is a mail filter to identify spam.
 Using its rule base, it uses a wide range of heuristic tests on mail
 headers and body text to identify "spam", also known as unsolicited
 commercial email.
-
-The spam-identification tactics used include header analysis, text
-analysis, blacklists and Razor.
-
 Once identified, the mail can then be optionally tagged as spam for
 later filtering using the user's own mail user-agent application.
 
-SpamAssassin requires very little configuration; you do not need to
-continually update it with details of your mail accounts, mailing list
-memberships, etc. It accomplishes filtering without this knowledge, as
-much as possible.
+The spam-identification tactics used include header analysis, text
+analysis, blacklists and Razor.
 
 The distribution provides a command line tool to perform filtering,
 along with Mail::SpamAssassin, a set of perl modules which implement a
 Mail::Audit plugin, allowing SpamAssassin to be used in a Mail::Audit
-filter, or (possibly at some point) in a spam-protection proxy POP/IMAP
-server.
+filter.
+In addition, there is "spamd", a persistently running daemonized
+version of the command line tool "spamassassin". Together with the small
+client "spamc" this allows processing of large volumes of mail without the
+cost of starting a perl interpreter for each one.
+
+SpamAssassin does not deliver mail to the  users mailbox. You need a
+different program (procmail is recommended) for local mail delivery.
diff --git a/mail/spamassassin/MESSAGE b/mail/spamassassin/MESSAGE
index 544839f944c..47f3a380051 100644
--- a/mail/spamassassin/MESSAGE
+++ b/mail/spamassassin/MESSAGE
@@ -1,13 +1,16 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/08/26 16:00:52 hubertf Exp $
+$NetBSD: MESSAGE,v 1.3 2002/10/08 00:49:18 heinz Exp $
 
-The default directory for site-wide config files for SpamAssassin on
-NetBSD has changed from
+***IMPORTANT***
 
-	/etc/mail/spamassassin
-to
-	${PKG_SYSCONFDIR}/spamassassin
+  Starting with version 2.40 SpamAssassin does NOT deliver mail anymore.
+  If you relied on spamassassin to write the mail into your mail folder,
+  you'll have to change your setup to use some local mail delivery agent,
+  e.g. pkgsrc/mail/procmail.
 
-If you have old config files, please move them to the new location.
+More information can be found in 
+  ${PREFIX}/share/doc/spamassassin/
+
+and via 'man spamassassin' and 'perldoc Mail::SpamAssassin::Conf'
 
 ===========================================================================
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 031ccf3557d..5ee4de47f99 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,47 +1,111 @@
-# $NetBSD: Makefile,v 1.8 2002/09/29 23:44:28 simonb Exp $
+# $NetBSD: Makefile,v 1.9 2002/10/08 00:49:18 heinz Exp $
 
-DISTNAME=	Mail-SpamAssassin-2.41
-PKGNAME=	spamassassin-2.41
+DISTNAME=	Mail-SpamAssassin-2.42
+PKGNAME=	spamassassin-2.42
 SVR4_PKGNAME=	sa
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Mail/}
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Mail/}			\
+		http://www.spamassassin.org/released/
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	heinz-sa@netbsd.org
 HOMEPAGE=	http://www.spamassassin.org/
 COMMENT=	mail filter to identify spam
 
-DEPENDS+=	procmail-[0-9]*:../../mail/procmail
+DEPENDS+=	procmail>=3.22:../../mail/procmail
 DEPENDS+=	p5-Net-DNS-[0-9]*:../../net/p5-Net-DNS
-DEPENDS+=	p5-Time-HiRes-[0-9]*:../../time/p5-Time-HiRes
-DEPENDS+=	p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
+DEPENDS+=	p5-HTML-Parser>=3.0:../../www/p5-HTML-Parser
+DEPENDS+=	p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
+DEPENDS+=	p5-MIME-Base64>=2.11:../../converters/p5-MIME-Base64
 
-CONFLICTS=	p5-Mail-SpamAssassin-[1-9]*
+BUILDLINK_DEPENDS.perl=	perl>=5.6.0
+USE_BUILDLINK2=		YES
 
-RCD_SCRIPTS=	spamd
+CONFLICTS=		p5-Mail-SpamAssassin-[1-9]*
 
-USE_BUILDLINK_ONLY=	YES
+GNU_CONFIGURE=		YES
+PKG_SYSCONFSUBDIR=	spamassassin
+
+PERL5_CONFIGURE=	NO
+MAKE_PARAMS=		SYSCONFDIR="${PKG_SYSCONFDIR}"
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Mail/SpamAssassin/.packlist
 
-post-patch:
-	@(cd ${WRKSRC};							\
-	for f in README Makefile.PL lib/Mail/SpamAssassin/Conf.pm ; do \
-		${SED} -e "s,/usr/share,${PREFIX}/share," \
-		       -e "s,/etc/mail,${PKG_SYSCONFBASE},g" $$f > $$f.fixed && \
-		${MV} $$f.fixed $$f;					\
-	done)
+RCD_SCRIPTS=		spamd
+RCD_SCRIPT_SRC.spamd=	${WRKSRC}/spamd/netbsd-rc-script.sh
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
+EGDIR=			${PREFIX}/share/examples/spamassassin
+DOCDIR=			${PREFIX}/share/doc/spamassassin
+RULESDIR=		${PREFIX}/share/spamassassin
 
-post-install:
-.for d in spamassassin spamassassin/sql spamassassin/spamd
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/$d
+CONF_FILES+=		${EGDIR}/local.cf  ${PKG_SYSCONFDIR}/local.cf
+CONF_FILES+=		${PREFIX}/share/spamassassin/user_prefs.template\
+			  ${PKG_SYSCONFDIR}/user_prefs.template
+
+.include "../../mk/bsd.prefs.mk"
+# the 'spamd' RCD_SCRIPT behaves differently if we run NetBSD 1.6 or later
+.if ${OS_VERSION:M1.[0-5]*}
+INTERPRETER_SUPPORT=NO
+.else
+INTERPRETER_SUPPORT=YES
+.endif
+FILES_SUBST+=		INTERPRETER_SUPPORT=${INTERPRETER_SUPPORT}
+
+test:	build
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKEFLAGS} test
+
+pre-configure: perl5-configure
+
+post-configure:
+.for f in README lib/Mail/SpamAssassin/Conf.pm spamd/README.spamd-vpopmail
+	@${SED} -e "s,/usr/share,${PREFIX}/share,"			\
+		-e "s,/etc/mail,${PKG_SYSCONFBASE},g"			\
+		${WRKSRC}/${f} > ${WRKSRC}/${f}.fixed &&		\
+	  ${MV} ${WRKSRC}/${f}.fixed ${WRKSRC}/${f}
 .endfor
-.for f in README procmailrc.example sample-nonspam.txt sample-spam.txt \
-    sql/README sql/spamassassin.sql spamd/README.spamd
-	${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/doc/spamassassin/$f
+
+pre-install:
+	${INSTALL_DATA_DIR} ${EGDIR}
+.for d in html masses/lib/Mail spamd sql tools
+	${INSTALL_DATA_DIR}  ${DOCDIR}/$d
+.endfor
+.for f in INSTALL License README TRADEMARK sample-nonspam.txt		\
+	  sample-spam.txt sql/README sql/spamassassin.sql		\
+	  spamd/README.spamd spamd/README.spamd-vpopmail
+	${INSTALL_DATA} ${WRKSRC}/$f ${DOCDIR}/$f
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/rules/STATISTICS.txt ${DOCDIR}/
+	${INSTALL_DATA} ${WRKSRC}/ninjabutton.png ${DOCDIR}/html/
+	${INSTALL_DATA} ${WRKSRC}/masses/lib/Mail/ArchiveIterator.pm	\
+	  ${DOCDIR}/masses/lib/Mail/ArchiveIterator.pm
+	@(cd ${WRKSRC}/masses/;						\
+	  for f in *; do						\
+	    if ${TEST} -f $$f; then					\
+	      if ${TEST} -x $$f ; then					\
+		${SED} -e "1s,/usr/bin/perl,${PERL5}," < $$f		\
+		  > $${f}.fixed && ${MV} $${f}.fixed $$f &&		\
+		  ${CHMOD} +x $$f &&					\
+		  ${INSTALL_SCRIPT} $$f ${DOCDIR}/masses/$$f;		\
+	      else							\
+		${INSTALL_DATA} $$f ${DOCDIR}/masses/$$f;		\
+	      fi;							\
+	    fi;								\
+	  done)
+	${INSTALL_DATA} ${WRKSRC}/procmailrc.example ${EGDIR}/procmailrc.example
+	${INSTALL_DATA} ${WRKSRC}/rules/local.cf ${EGDIR}/local.cf
+.for f in check_whitelist speedtest translation_prep.pl
+	@(cd ${WRKSRC}/tools/;						\
+	  ${SED} -e "1s,/usr/bin/perl,${PERL5},"			\
+		 -e "1s,/usr/local/bin/perl,${PERL5}," < $f		\
+	    > ${f}.fixed && ${MV} ${f}.fixed $f;			\
+	  ${INSTALL_SCRIPT} $f ${DOCDIR}/tools/$f )
 .endfor
+	${INSTALL_DATA} ${WRKSRC}/tools/README.speedtest		\
+	  ${DOCDIR}/tools/README.speedtest
+
+post-install:
+	${CHOWN} ${SHAREOWN} ${RULESDIR}/*
+	${CHGRP} ${SHAREGRP} ${RULESDIR}/*
+	${INSTALL_DATA} ${FILESDIR}/netbsd_lists.cf ${PKG_SYSCONFDIR}/
 
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/spamassassin/PLIST b/mail/spamassassin/PLIST
index d50bc0242dd..1ba018d7991 100644
--- a/mail/spamassassin/PLIST
+++ b/mail/spamassassin/PLIST
@@ -1,16 +1,47 @@
-@comment $NetBSD: PLIST,v 1.6 2002/09/29 23:44:28 simonb Exp $
+@comment $NetBSD: PLIST,v 1.7 2002/10/08 00:49:19 heinz Exp $
 @comment bin/spamassassin
 @comment bin/spamc
 @comment bin/spamd
-@comment bin/spamproxyd
 etc/rc.d/spamd
+@comment etc/spamassassin/local.cf
+etc/spamassassin/netbsd_lists.cf
+@comment etc/spamassassin/user_prefs.template
+share/doc/spamassassin/INSTALL
+share/doc/spamassassin/License
 share/doc/spamassassin/README
-share/doc/spamassassin/procmailrc.example
+share/doc/spamassassin/STATISTICS.txt
+share/doc/spamassassin/TRADEMARK
+share/doc/spamassassin/html/ninjabutton.png
+share/doc/spamassassin/masses/CORPUS_POLICY
+share/doc/spamassassin/masses/CORPUS_SUBMIT
+share/doc/spamassassin/masses/README
+share/doc/spamassassin/masses/craig-evolve.c
+share/doc/spamassassin/masses/fp-fn-statistics
+share/doc/spamassassin/masses/freqdiff
+share/doc/spamassassin/masses/hit-frequencies
+share/doc/spamassassin/masses/lib/Mail/ArchiveIterator.pm
+share/doc/spamassassin/masses/lint-rules-from-freqs
+share/doc/spamassassin/masses/logs-to-c
+share/doc/spamassassin/masses/mass-check
+share/doc/spamassassin/masses/mass-check.cf
+share/doc/spamassassin/masses/mk-baseline-results
+share/doc/spamassassin/masses/parse-rules-for-masses
+share/doc/spamassassin/masses/post-ga-analysis.pl
+share/doc/spamassassin/masses/rewrite-cf-with-new-scores
+share/doc/spamassassin/masses/score-ranges-from-freqs
+share/doc/spamassassin/masses/true-false-pos-neg-filter.pl
 share/doc/spamassassin/sample-nonspam.txt
 share/doc/spamassassin/sample-spam.txt
 share/doc/spamassassin/spamd/README.spamd
+share/doc/spamassassin/spamd/README.spamd-vpopmail
 share/doc/spamassassin/sql/README
 share/doc/spamassassin/sql/spamassassin.sql
+share/doc/spamassassin/tools/README.speedtest
+share/doc/spamassassin/tools/check_whitelist
+share/doc/spamassassin/tools/speedtest
+share/doc/spamassassin/tools/translation_prep.pl
+share/examples/spamassassin/local.cf
+share/examples/spamassassin/procmailrc.example
 share/spamassassin/10_misc.cf
 share/spamassassin/20_anti_ratware.cf
 share/spamassassin/20_body_tests.cf
@@ -33,7 +64,14 @@ share/spamassassin/60_whitelist.cf
 share/spamassassin/languages
 share/spamassassin/triplets.txt
 share/spamassassin/user_prefs.template
-@dirrm share/doc/spamassassin/spamd
+@dirrm share/spamassassin
+@dirrm share/examples/spamassassin
+@dirrm share/doc/spamassassin/tools
 @dirrm share/doc/spamassassin/sql
+@dirrm share/doc/spamassassin/spamd
+@dirrm share/doc/spamassassin/masses/lib/Mail
+@dirrm share/doc/spamassassin/masses/lib
+@dirrm share/doc/spamassassin/masses
+@dirrm share/doc/spamassassin/html
 @dirrm share/doc/spamassassin
-@dirrm share/spamassassin
+@dirrm etc/spamassassin
diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
index 66ccc1481b0..64d28ecda6a 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.5 2002/09/29 23:44:28 simonb Exp $
+$NetBSD: distinfo,v 1.6 2002/10/08 00:49:19 heinz Exp $
 
-SHA1 (Mail-SpamAssassin-2.41.tar.gz) = 197a9625c66bda0e18dac95f2e72a7e8c847c162
-Size (Mail-SpamAssassin-2.41.tar.gz) = 518310 bytes
-SHA1 (patch-aa) = 79a9f8589d6a99979bd2ff5dc56aff7ff9654ac7
+SHA1 (Mail-SpamAssassin-2.42.tar.gz) = 2a08e271c3496eaacf15a06369972d3395b9b70e
+Size (Mail-SpamAssassin-2.42.tar.gz) = 532504 bytes
+SHA1 (patch-ab) = 696c68944717aeac1046e2eddf6d3cff426ce58b
+SHA1 (patch-ac) = 229d234f56d113022f08d5b3250c4f12d6808636
+SHA1 (patch-ad) = 3aea245cbe066f34004e019ea1bee5c3f62afad3
+SHA1 (patch-ae) = 55f46734f460abb1611e0df07ca8a6091ab2eb43
diff --git a/mail/spamassassin/files/netbsd_lists.cf b/mail/spamassassin/files/netbsd_lists.cf
new file mode 100644
index 00000000000..15e9d3befc0
--- /dev/null
+++ b/mail/spamassassin/files/netbsd_lists.cf
@@ -0,0 +1,30 @@
+# $NetBSD: netbsd_lists.cf,v 1.1 2002/10/08 00:49:20 heinz Exp $
+
+#
+# Rules to minimize false positives of NetBSD related emails
+#
+# This file is not meant to be modified by the user/admin. 
+# If you want to add rules for a site, please use local.cf.
+#
+# Any rules which might be appropriate for this file can be contributed
+# with send-pr(1), category 'pkg'.
+#
+
+#
+# netbsd-bugs@netbsd.org
+# compensate for problem reports with confusing content for SpamAssassin
+
+header	__NETBSD_PR_SUBJECT	Subject =~ /\b(?:admin|bin|install|kern|lib|misc|pkg|port-[a-z][a-z0-9]{1,15}|security|standards|toolchain|xsrc|y2k)\/\d{4,6}\b/i
+header	__NETBSD_BUGS_SENDER	Sender =~ /\bnetbsd-bugs-owner\@netbsd\.org\b/i
+header	__NETBSD_RCVD		Received =~ /\bby\s+(?:mail|narn)\.netbsd\.org\b/i
+header	__NETBSD_BUGS_DELIVERED	Delivered-To =~ /\bnetbsd-bugs\@netbsd\.org\b/i
+header	__NETBSD_SEND_PR	exists:X-Send-Pr-Version
+
+meta NETBSD_PR		(__NETBSD_SEND_PR && __NETBSD_PR_SUBJECT && __NETBSD_BUGS_SENDER && __NETBSD_RCVD && __NETBSD_BUGS_DELIVERED)
+describe NETBSD_PR	Message is a problem report from netbsd-bugs
+score NETBSD_PR		-5
+
+meta NETBSD_PR_COMMENT	(! __NETBSD_SEND_PR && __NETBSD_PR_SUBJECT && __NETBSD_BUGS_SENDER && __NETBSD_RCVD && __NETBSD_BUGS_DELIVERED)
+describe NETBSD_PR_COMMENT   Message concerns a problem report from netbsd-bugs
+score NETBSD_PR_COMMENT	-2.5
+
diff --git a/mail/spamassassin/files/spamd.sh b/mail/spamassassin/files/spamd.sh
deleted file mode 100755
index 47f9fe698f7..00000000000
--- a/mail/spamassassin/files/spamd.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-#	$NetBSD: spamd.sh,v 1.5 2002/09/20 02:01:57 grant Exp $
-#
-# PROVIDE: spamd
-# REQUIRE: DAEMON
-
-. /etc/rc.subr
-
-name="spamd"                      
-rcvar=$name         
-command="@PREFIX@/bin/${name}"
-command_args="-d -r /var/run/${name}.pid"
-command_interpreter="@PREFIX@/bin/perl"
-pidfile="/var/run/${name}.pid"
-              
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/spamassassin/patches/patch-aa b/mail/spamassassin/patches/patch-aa
deleted file mode 100644
index 5e616c5479f..00000000000
--- a/mail/spamassassin/patches/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2002/08/26 16:01:33 hubertf 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.
- # 
diff --git a/mail/spamassassin/patches/patch-ab b/mail/spamassassin/patches/patch-ab
new file mode 100644
index 00000000000..1886f5f76a2
--- /dev/null
+++ b/mail/spamassassin/patches/patch-ab
@@ -0,0 +1,49 @@
+$NetBSD: patch-ab,v 1.1 2002/10/08 00:49:22 heinz Exp $
+
+--- Makefile.PL.orig	Fri Oct  4 14:54:10 2002
++++ Makefile.PL
+@@ -110,7 +110,7 @@
+ #. q#
+ 
+ DEF_RULES_DIR	= $(PREFIX)/share/spamassassin
+-LOCAL_RULES_DIR	= $(SYSCONFDIR)/mail/spamassassin
++LOCAL_RULES_DIR	= $(SYSCONFDIR)
+ 
+ FIXVARS		= -Mvars \
+ 		  -DVERSION="$(VERSION)" \
+@@ -119,7 +119,7 @@
+ 		  -DLOCAL_RULES_DIR="$(LOCAL_RULES_DIR)" \
+ 		  -DINSTALLSITELIB="$(INSTALLSITELIB)"
+ 
+-pm_to_blib: spamassassin doc/.made
++pm_to_blib: spamassassin
+ 
+ spamassassin: spamassassin.raw
+ 	$(PERL) build/preprocessor $(FIXVARS) -Msharpbang <$? >$@
+@@ -138,7 +138,7 @@
+ binaries.mk: configure
+ 	./configure
+ 
+-inst_cfs: $(DEF_RULES_DIR) $(LOCAL_RULES_DIR) $(LOCAL_RULES_DIR)/local.cf
++inst_cfs: $(DEF_RULES_DIR) $(LOCAL_RULES_DIR)
+ 	$(RM_F) $(DEF_RULES_DIR)/*; \
+ 	for file in $(RULES) ; do \
+ 	  $(PERL) build/preprocessor $(FIXVARS) <rules/$$file >$(DEF_RULES_DIR)/$$file; \
+@@ -146,13 +146,14 @@
+ 	$(CHMOD) $(PERM_RW) $(DEF_RULES_DIR)/*
+ 
+ $(DEF_RULES_DIR):
+-	$(MKPATH) $@
++	$(BSD_INSTALL_DATA_DIR) $@
+ 
+ $(LOCAL_RULES_DIR):
+-	$(MKPATH) $@
++	$(BSD_INSTALL_DATA_DIR) $@
+ 
+ $(LOCAL_RULES_DIR)/local.cf: rules/local.cf
+-	test -f $@ || \
++	\# manage local.cf through pkgsrc .mk files
++	\# test -f $@ || \
+ 	  $(CP) rules/local.cf $@
+ 
+ text_html_doc: doc/.made
diff --git a/mail/spamassassin/patches/patch-ac b/mail/spamassassin/patches/patch-ac
new file mode 100644
index 00000000000..9cb39e8d583
--- /dev/null
+++ b/mail/spamassassin/patches/patch-ac
@@ -0,0 +1,28 @@
+$NetBSD: patch-ac,v 1.1 2002/10/08 00:49:22 heinz Exp $
+
+--- spamassassin.raw.orig	Fri Oct  4 14:54:12 2002
++++ spamassassin.raw
+@@ -493,11 +493,11 @@
+ configuration files.
+ 
+ By default, configuration data is loaded from the first existing directory in:
+-F</usr/local/share/spamassassin>;F</usr/share/spamassassin>;F<./rules>;F<../rules>
++F<./rules>;F<../rules>;F<@@DEF_RULES_DIR@@>;F<@@PREFIX@@/share/spamassassin>;F</usr/local/share/spamassassin>;F</usr/share/spamassassin>.
+ 
+ The configuration data in the first existing directory in:
+-F</usr/local/etc/spamassassin>;F</usr/pkg/etc/spamassassin>;F</usr/etc/spamassassin>;F</etc/mail/spamassassin>;F</etc/spamassassin>
+-are used to override any values which had already been set
++F<@@LOCAL_RULES_DIR@@>;F<@@PREFIX@@/etc/mail/spamassassin>;F</@@PREFIX@@/etc/spamassassin>;F</usr/local/etc/spamassassin>;F</usr/pkg/etc/spamassassin>;F</usr/etc/spamassassin>;F</etc/mail/spamassassin>;F</etc/spamassassin>
++are used to override any values which had already been set.
+ 
+ Spamassassin will read *.cf in these directories, in alphanumeric order within each directory
+ (similar to SysV-style startup scripts).  In other words, it will read F<10_misc.cf> before F<50_scores.cf> and F<20_body_tests.cf> before F<20_head_test.cf>.  Options in later files will override earlier files.
+@@ -506,7 +506,7 @@
+ the file specified in the B<-p> argument.  If this is not specified,
+ F<~/.spamassassin/user_prefs> is used if it exists.  C<spamassassin> will create this
+ file if it does not exist, using F<user_prefs.template> as a template.  This file will be looked for in 
+-F</etc/spamassassin/user_prefs.template>;F</usr/local/share/spamassassin/user_prefs.template>;F</usr/share/spamassassin/user_prefs.template>
++F<@@LOCAL_RULES_DIR@@>;F<@@PREFIX@@/etc/mail/spamassassin>;F<@@PREFIX@@/share/spamassassin>;F</etc/spamassassin>;F</etc/mail/spamassassin>;F</usr/local/share/spamassassin>;F</usr/share/spamassassin>
+ 
+ =head1 TAGGING
+ 
diff --git a/mail/spamassassin/patches/patch-ad b/mail/spamassassin/patches/patch-ad
new file mode 100644
index 00000000000..61645ca3f91
--- /dev/null
+++ b/mail/spamassassin/patches/patch-ad
@@ -0,0 +1,8 @@
+$NetBSD: patch-ad,v 1.1 2002/10/08 00:49:22 heinz Exp $
+
+--- spamd/netbsd-rc-script.sh.orig	Thu Sep 26 12:50:26 2002
++++ spamd/netbsd-rc-script.sh
+@@ -1,2 +1,2 @@
+-#! /bin/sh
++#!@RCD_SCRIPTS_SHELL@
+ #
diff --git a/mail/spamassassin/patches/patch-ae b/mail/spamassassin/patches/patch-ae
new file mode 100644
index 00000000000..3186a99a709
--- /dev/null
+++ b/mail/spamassassin/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 2002/10/08 00:49:23 heinz Exp $
+
+--- spamd/spamd.raw.orig	Fri Oct  4 14:54:27 2002
++++ spamd/spamd.raw
+@@ -834,7 +834,8 @@
+ use POSIX 'setsid';
+ sub daemonize
+ {
+-    $0 = join(' ', $0, @ARGV) unless($opt{'debug'}); # pretty command line in ps
++    # no pretty 'ps' command line (easier for NetBSD rc script)
++    # $0 = join(' ', $0, @ARGV) unless($opt{'debug'}); # pretty command line in ps
+     chdir '/' or die "Can't chdir to '/': $!";
+     $SIG{__WARN__} = sub { logmsg($_[0]); };
+     open STDIN,'/dev/null' or die "Can't read '/dev/null': $!";