Updated to version 3.2.0.

Pkgsrc changes:
  - Removed PKG_DESTDIR_SUPPORT until the issue with encoded ownership in
    +INSTALL files is resolved.
  - made pkglint shut up about some warnings (CONFIGURE_DIRS, BUILD_DIRS,
    hidden commands with @)
  - parse-rules-for-masses has moved in the source archive.
  - The directories "masses" and "tools" are no longer distributed in the
    archive so I simplified the post-install target.
  - Since "tools" is gone, the post-extract: target is obsolete.
  - MESSAGE now points at sa-compile.
  - Spamc depends on zlib now, so we needed the appropriate buildlink3 file.

Summary of changes since version 3.1.8:
=======================================
 * new behavior for trusted_networks/internal_networks: the 127.* network
 is now always considered trusted and internal, regardless of configuration.

 * bug 3109: short-circuiting of 'definite ham' or 'definite spam' messages
 based on individual short-circuit rules using the 'shortcircuit' setting,
 by Dallas Engelken <dallase /at/ uribl.com>.

 * bug 5305: implement 'msa_networks', for ISPs to specify their Mail
 Submission Agents, and extend network trust accordingly.

 * bug 4636: Add support for charset normalization, so rules can be written
 in UTF-8 to match text in other charsets.

 * sa-compile: compilation of SpamAssassin rules into a fast parallel-matching
 DFA, implemented in native code.

 * "tflags multiple": allow writing of rules that count multiple hits in a
 single message.

 * bug 4363: if a message uses CRLF for line endings, we should use it as
 well, otherwise stay with LF as usual; important for Windows users.

 * bug 4515: content preview was omitting first paragraph when no Subject:
 header was present.

 * The third-party modules used by sa-update are now required by the
 SpamAssassin package, instead of being optional.

 * Bug 5165: 'sa-update --checkonly' added to check for updates without
 applying them; thanks to <anomie /at/ users.sourceforge.net>

 * Bugs 4606, 4609: Adjust MIME parsing limits for nested multipart/* and
 message/rfc822 MIME parts.

 * bug 5295: add 'whitelist_auth', to whitelist addresses that send mail
 using sender-authorization systems like SPF, Domain Keys, and DKIM

 * Removed dependency on Text::Wrap CPAN module.

 * Received header parsing updates/fixes/additions.

Spamc / spamd:

 * bug 4603: Mail::SpamAssassin::Spamd::Apache2 -- mod_perl2 module,
 implementing spamd as a mod_perl module, contributed as a Google Summer of
 Code project by Radoslaw Zielinski.

 * bug 3991: spamd can now listen on UNIX domain, TCP, and SSL sockets
 simultaneously.  Command-line semantics extended slightly, although fully
 backwards compatibly; add the --ssl-port switch to allow TCP and SSL
 listening at the same time.

 * bug 3466: do Bayes expiration, if required, after results have been
 passed back to the client from spamd; this helps avoid client timeouts.

 * more complete IPv6 support.

 * spamc: Add '-K' switch, to ping spamd.

 * spamc: add '-z' switch, which compresses mails to be scanned using
 zlib compression; very useful for long-distance use of spamc over the
 internet.

 * bug 5296: spamc '--headers' switch, which scans messages and transmits
 back just rewritten headers.  This is more bandwidth-efficient than the
 normal mode of scanning, but only works for 'report_safe 0'.

 * Bump spamd's protocol version to 1.4, to reflect new HEADERS verb used
 for '--headers'.

Mail::SpamAssassin modules and API:

 * bug 4589: allow M::SA::Message to use IO::File objects to read in
 message (same as GLOB).

 * bug 4517: rule instrumentation plugin hooks, to measure performance,
 from John Gardiner Myers <jgmyers /at/ proofpoint.com>.

 * add two features to core rule-parsing code; 1. optional behaviour to
 recurse through subdirs looking for .cf/.pre's, to support rules compilers
 working on rulesrc dir.  2. call back into invoking code on lint failure,
 so rule compiler can detect which rules exactly fail the lint check.

 * bug 5206: detect duplicate rules, and silently merge them internally
 for greater efficiency.

 * bug 5243: add Plugin::register_method_priority() API, allowing plugins
 to control the relative ordering of plugin callbacks relative to other
 plugins' implementations.

 * Reduced memory footprint.

Plugins:

 * bug 5236: Support Mail::SPF replacement for Mail::SPF::Query.

 * bug 5127: allow mimeheader :raw rules to match newlines and folded-header
 whitespace in MIME header strings.

 * bug 4770: add ASN.pm plugin, contributed by Matthias Leisi <matthias at
 leisi.net>

 * bug 5271: move ImageInfo ruleset into 3.2.0 core rules, thanks to
 Dallas Engelken <dallase /at/ uribl.com>.

 * VBounce ruleset and plugin: detect spurious bounce messages sent by
 broken mail systems in response to spam or viruses.  (Based on Tim
 Jackson's "bogus-virus-warnings.cf" ruleset.)

 * DomainKeys/DKIM: Mail::DKIM is now preferred over Mail::DomainKeys,
 since the latter module is no longer actively maintained, and Mail::DKIM
 can handle both DomainKeys and DKIM signatures.

 * DKIM: separate signature verification from fetching a policy: can save
 a DNS lookup for each unverified message by setting score to 0 for all
 policy-related rules (DKIM_POLICY_SIGNALL, DKIM_POLICY_SIGNSOME, and
 DKIM_POLICY_TESTING). (thanks to Mark Martinec)

 * DKIM: support testing flags in the public key, as well as in the policy
 record. (thanks to Mark Martinec)

 * DKIM: skip fetching a policy (SSP) if a signature does verify, according
 to draft-allman-dkim-ssp-02 (thanks to Mark Martinec)

 * Move rule functionality and checking into separate Check plugin, allowing
 third parties to implement alternative scanner core algorithms.

 * core EvalTests code moved into various plugins.

* Plus lots of miscellaneous bug fixes.

6 files changed, 74 insertions, 91 deletions

diff --git a/mail/spamassassin/MESSAGE b/mail/spamassassin/MESSAGE
index 487a16d72ae..a2ac941a42d 100644
--- a/mail/spamassassin/MESSAGE
+++ b/mail/spamassassin/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.10 2005/11/13 22:48:32 heinz Exp $
+$NetBSD: MESSAGE,v 1.11 2007/05/02 15:20:45 heinz Exp $
 
 If you upgrade from an earlier version *PLEASE* take a look at the file
 UPGRADE in
@@ -10,6 +10,7 @@ Some configuration options were changed and some features are now provided
 by plugins (they may not be enabled after installation).
 
 For more information see 'perldoc Mail::SpamAssassin::Conf' and the man
-pages for 'spamassassin', 'spamd'/'spamc', 'sa-learn' and 'sa-update'.
+pages for 'spamassassin', 'spamd'/'spamc', 'sa-learn', 'sa-update' and
+'sa-compile'.
 Please check that your existing mail configuration still works.
 ===========================================================================
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 09b99276ea1..0b2a51b130e 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.79 2007/02/15 21:43:43 heinz Exp $
+# $NetBSD: Makefile,v 1.80 2007/05/02 15:20:45 heinz Exp $
 
-DISTNAME=	Mail-SpamAssassin-3.1.8
-PKGNAME=	spamassassin-3.1.8
+DISTNAME=	Mail-SpamAssassin-3.2.0
+PKGNAME=	spamassassin-3.2.0
 SVR4_PKGNAME=	sa
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:=spamassassin/source/}
@@ -11,7 +11,6 @@ HOMEPAGE=	http://spamassassin.apache.org/
 COMMENT=	Mail filter to identify spam
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -49,13 +48,13 @@ PERL5_PACKLIST=		auto/Mail/SpamAssassin/.packlist
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_DIRS=		${WRKSRC}/spamc
-BUILD_DIRS=		${WRKSRC}
+CONFIGURE_DIRS=		spamc
+BUILD_DIRS=		.
 PERL5_CONFIGURE=	NO # we need the default "do-configure" target
 PERL5_CONFIGURE_DIRS=	${WRKSRC}
 
 # test t/meta needs this
-REPLACE_PERL+=		masses/parse-rules-for-masses
+REPLACE_PERL+=		build/parse-rules-for-masses
 
 MAKE_PARAMS+=		CONTACT_ADDRESS=${SPAMASSASSIN_CONTACT_ADDRESS:Q}
 MAKE_PARAMS+=		DEFRULESDIR="${RULESDIR}"
@@ -74,7 +73,7 @@ DOCDIR=			${PREFIX}/${DOC_SUBDIR}
 RULE_SUBDIR=		share/spamassassin
 RULESDIR=		${PREFIX}/${RULE_SUBDIR}
 
-PRE_FILES=		init.pre v310.pre v312.pre
+PRE_FILES=		init.pre v310.pre v312.pre v320.pre
 .for p in ${PRE_FILES}
 CONF_FILES+=		${EGDIR}/${p}  ${PKG_SYSCONFDIR}/${p}
 .endfor
@@ -82,8 +81,22 @@ CONF_FILES+=		${EGDIR}/local.cf  ${PKG_SYSCONFDIR}/local.cf	\
 			${RULESDIR}/user_prefs.template		\
 		 	  ${PKG_SYSCONFDIR}/user_prefs.template
 
-INSTALLATION_DIRS+=	${EG_SUBDIR} ${DOC_SUBDIR} ${DOC_SUBDIR}/spamc\
-			${DOC_SUBDIR}/spamd ${RULE_SUBDIR}
+SA_INSTALLDIRS=		${EG_SUBDIR} ${DOC_SUBDIR} ${DOC_SUBDIR}/ldap
+SA_INSTALLDIRS+=	${DOC_SUBDIR}/rules ${DOC_SUBDIR}/spamc
+SA_INSTALLDIRS+=	${DOC_SUBDIR}/spamd ${DOC_SUBDIR}/sql ${RULE_SUBDIR}
+
+SA_DOCFILES=		INSTALL LICENSE README TRADEMARK UPGRADE USAGE NOTICE
+SA_DOCFILES+=		CREDITS PACKAGING Changes
+SA_DOCFILES+=		ldap/README ldap/README.testing ldap/sa_test.ldif
+SA_DOCFILES+=		rules/STATISTICS-set0.txt rules/STATISTICS-set1.txt
+SA_DOCFILES+=		rules/STATISTICS-set2.txt rules/STATISTICS-set3.txt
+SA_DOCFILES+=		spamc/README.qmail
+SA_DOCFILES+=		sample-nonspam.txt sample-spam.txt
+SA_DOCFILES+=		spamd/README spamd/README.vpopmail
+SA_DOCFILES+=		sql/README sql/README.awl sql/README.bayes
+SA_DOCFILES+=		sql/awl_mysql.sql sql/awl_pg.sql sql/bayes_mysql.sql
+SA_DOCFILES+=		sql/bayes_pg.sql sql/userpref_mysql.sql
+SA_DOCFILES+=		sql/userpref_pg.sql
 
 OWN_DIRS+=		${VARBASE}/spamassassin
 OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/sa-update-keys ${SHAREOWN} ${SHAREGRP} 0700
@@ -96,12 +109,12 @@ SUBST_SED.sa2+=		-e s!@PKG_SYSCONFDIR@!${PKG_SYSCONFDIR}!g
 
 SUBST_CLASSES+=		sa3
 SUBST_STAGE.sa3=	pre-configure
-SUBST_FILES.sa3=	INSTALL UPGRADE USAGE ldap/README		\
-			spamc/README.qmail				\
-			lib/Mail/SpamAssassin/Conf.pm			\
-			lib/Mail/SpamAssassin/Plugin/Test.pm		\
-			spamd/README spamd/README.vpopmail sql/README	\
-			sql/README.awl sa-update.raw
+SUBST_FILES.sa3=	INSTALL UPGRADE USAGE ldap/README
+SUBST_FILES.sa3+=	spamc/README.qmail
+SUBST_FILES.sa3+=	lib/Mail/SpamAssassin/Conf.pm
+SUBST_FILES.sa3+=	lib/Mail/SpamAssassin/Plugin/Test.pm
+SUBST_FILES.sa3+=	spamd/README spamd/README.vpopmail sql/README
+SUBST_FILES.sa3+=	sql/README.awl sa-learn.raw sa-compile.raw sa-update.raw
 SUBST_SED.sa3=		-e s!/usr/share!${PREFIX}/share!g
 SUBST_SED.sa3+=		-e s!/usr/bin!${PREFIX}/bin!g
 SUBST_SED.sa3+=		-e s!/usr/local/bin!${PREFIX}/bin!g
@@ -121,84 +134,52 @@ INTERPRETER_SUPPORT=	YES
 FILES_SUBST+=		INTERPRETER_SUPPORT=${INTERPRETER_SUPPORT:Q}
 FILES_SUBST+=		OPSYS=${OPSYS:Q}
 
-post-extract:
-	@# correct bad SA permissions
-	@${CHMOD} a+x ${WRKSRC}/tools/convert_awl_dbm_to_sql
-
 pre-configure: perl5-configure
-	@# GNU configure needs version.h -> create it
-	@cd ${WRKSRC}/spamc && ${PERL5} ./version.h.pl
-	@# values will be set via the SUBST framework in options.mk
-	@${CP} ${WRKSRC}/t/config.dist ${WRKSRC}/t/config
+	# GNU configure needs version.h -> create it
+	cd ${WRKSRC}/spamc && ${PERL5} ./version.h.pl
+	# values will be set via the SUBST framework in options.mk
+	${CP} ${WRKSRC}/t/config.dist ${WRKSRC}/t/config
 
 post-install:
-	@${TEST} -r ${PLIST_ADD} && ${RM} ${PLIST_ADD} ; :
-.for f in INSTALL LICENSE README TRADEMARK UPGRADE USAGE		\
-		CREDITS PACKAGING STATUS BUGS Changes			\
-		spamc/README.qmail					\
-		sample-nonspam.txt sample-spam.txt spamd/README		\
-		spamd/README.vpopmail
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}/${f}
-	@${ECHO} "${DOC_SUBDIR}/${f}" >> ${PLIST_ADD}
-.endfor
-.for f in STATISTICS-set0.txt STATISTICS-set1.txt STATISTICS-set2.txt	\
-	  STATISTICS-set3.txt
-	@${INSTALL_DATA} ${WRKSRC}/rules/${f} ${DESTDIR}${DOCDIR}
-	@${ECHO} "${DOC_SUBDIR}/${f}" >> ${PLIST_ADD}
+	${TEST} -r ${PLIST_ADD} && ${RM} ${PLIST_ADD} ; :
+.for dir in ${SA_INSTALLDIRS}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${dir}
 .endfor
-.for dir in masses sql ldap tools
-	@cd ${WRKSRC};							\
-	for d in `${FIND} ${dir} -type d -print`; do			\
-		${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}/$$d;			\
-	done;								\
-	for f in `${FIND} ${dir} -type f -print`; do			\
-		if ${TEST} -x $$f ; then				\
-			${SED} -e "1s,#!.*/bin/perl,#!${PERL5}," < $$f	\
-				> $${f}.fixed &&			\
-			${MV} $${f}.fixed $$f &&			\
-			${CHMOD} +x $$f &&				\
-			${INSTALL_SCRIPT} $$f ${DESTDIR}${DOCDIR}/$$f;		\
-		else							\
-			${INSTALL_DATA} $$f ${DESTDIR}${DOCDIR}/$$f;		\
-		fi;							\
-		${ECHO} "${DOC_SUBDIR}/$$f" >> ${PLIST_ADD};		\
-	done;								\
-	{ for d in `${FIND} ${dir} -type d -print`; do			\
-		${ECHO} "@dirrm ${DOC_SUBDIR}/$$d";			\
-	done; } | ${SORT} -r >> ${PLIST_ADD};
+.for f in ${SA_DOCFILES}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}/${f}
+	${ECHO} "${DOC_SUBDIR}/${f}" >> ${PLIST_ADD}
 .endfor
-	@cd ${WRKSRC}/rules;						\
+
+	cd ${WRKSRC}/rules;						\
 	for f in [0-9]*.cf; do						\
 		${ECHO} "${RULE_SUBDIR}/$$f" >> ${PLIST_ADD};		\
 	done;								\
 	for f in ${PRE_FILES}; do					\
-		${INSTALL_DATA} $$f ${DESTDIR}${EGDIR} &&				\
+		${INSTALL_DATA} $$f ${DESTDIR}${EGDIR} &&		\
 		${ECHO} ${EG_SUBDIR}/$$f >> ${PLIST_ADD};		\
 	done
-	@# examples are in the static PLIST
-	@${INSTALL_DATA} ${WRKSRC}/procmailrc.example ${DESTDIR}${EGDIR}
-	@${INSTALL_DATA} ${WRKSRC}/rules/local.cf ${DESTDIR}${EGDIR}
-	@${INSTALL_DATA} ${FILESDIR}/netbsd_lists.cf ${DESTDIR}${EGDIR}
-	@${CHOWN} ${SHAREOWN} ${DESTDIR}${RULESDIR}/*
-	@${CHGRP} ${SHAREGRP} ${DESTDIR}${RULESDIR}/*
-	@${CHMOD} a=r ${DESTDIR}${RULESDIR}/*
-	@{ for d in ${INSTALLATION_DIRS}; do				\
+	# examples are in the static PLIST
+	${INSTALL_DATA} ${WRKSRC}/procmailrc.example ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/rules/local.cf ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${FILESDIR}/netbsd_lists.cf ${DESTDIR}${EGDIR}
+	{ for d in ${SA_INSTALLDIRS}; do				\
 		${ECHO} "@dirrm $$d";					\
 	done; } | ${SORT} -r >> ${PLIST_ADD};
 
 # make sure we install the patched version of init.pre but can run the
 # tests with the original file
 pre-patch:
-	@${CP} ${WRKSRC}/rules/init.pre ${WRKDIR}/init.pre.notpatched
+	${CP} ${WRKSRC}/rules/init.pre ${WRKDIR}/init.pre.notpatched
 
 post-patch:
-	@${CP} ${WRKSRC}/rules/init.pre ${WRKDIR}/init.pre.patched
+	${CP} ${WRKSRC}/rules/init.pre ${WRKDIR}/init.pre.patched
 
 pre-test:
-	@${CP} ${WRKDIR}/init.pre.notpatched ${WRKSRC}/rules/init.pre
+	${CP} ${WRKDIR}/init.pre.notpatched ${WRKSRC}/rules/init.pre
 
 post-test:
-	@${CP} ${WRKDIR}/init.pre.patched ${WRKSRC}/rules/init.pre
+	${CP} ${WRKDIR}/init.pre.patched ${WRKSRC}/rules/init.pre
 
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/spamassassin/PLIST b/mail/spamassassin/PLIST
index 80848de4fec..09bfdf31a99 100644
--- a/mail/spamassassin/PLIST
+++ b/mail/spamassassin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2006/05/26 20:53:00 heinz Exp $
+@comment $NetBSD: PLIST,v 1.20 2007/05/02 15:20:45 heinz Exp $
 @comment Most of this PLIST is auto-generated; see Makefile.
 share/examples/rc.d/spamd
 share/examples/spamassassin/local.cf
@@ -6,5 +6,4 @@ share/examples/spamassassin/netbsd_lists.cf
 share/examples/spamassassin/procmailrc.example
 share/spamassassin/languages
 share/spamassassin/sa-update-pubkey.txt
-share/spamassassin/triplets.txt
 share/spamassassin/user_prefs.template
diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
index ca2a45bad97..82be2e9b2bc 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.43 2007/02/15 21:43:43 heinz Exp $
+$NetBSD: distinfo,v 1.44 2007/05/02 15:20:45 heinz Exp $
 
-SHA1 (Mail-SpamAssassin-3.1.8.tar.gz) = 08f81f72d8a783887cf815dfc55ea38e3582b966
-RMD160 (Mail-SpamAssassin-3.1.8.tar.gz) = 9e1af7219e3d6c1297181748b85853b812d2cdc4
-Size (Mail-SpamAssassin-3.1.8.tar.gz) = 1173847 bytes
-SHA1 (patch-ab) = df95d87a2f2e7af238c27c3d5468d9aad7eb000d
-SHA1 (patch-ae) = 1461b24978c75c394c607ae1d49cb49dd086b563
+SHA1 (Mail-SpamAssassin-3.2.0.tar.gz) = af3941ab4f9548107d06966780ba71f751ab0216
+RMD160 (Mail-SpamAssassin-3.2.0.tar.gz) = b696fb16cf736c239328e009c686d9684a1d76f0
+Size (Mail-SpamAssassin-3.2.0.tar.gz) = 1290995 bytes
+SHA1 (patch-ab) = 07bfa923f603a0cbc38f9a5d1538ce6126e788c9
+SHA1 (patch-ae) = a75a2fa44a314bb01bf2accbab119c399767bbf6
 SHA1 (patch-aq) = 495a3ac94a05129520e5d7018fdd56b6dad3c951
 SHA1 (patch-ay) = 7d805e7ef86e279a19e7d3d2f03e2227624317f8
diff --git a/mail/spamassassin/patches/patch-ab b/mail/spamassassin/patches/patch-ab
index 676d8127052..a35a109fc15 100644
--- a/mail/spamassassin/patches/patch-ab
+++ b/mail/spamassassin/patches/patch-ab
@@ -1,16 +1,16 @@
-$NetBSD: patch-ab,v 1.12 2006/05/26 20:53:00 heinz Exp $
+$NetBSD: patch-ab,v 1.13 2007/05/02 15:20:45 heinz Exp $
 
---- Makefile.PL.orig	2006-05-24 22:07:30.000000000 +0200
+--- Makefile.PL.orig	2007-04-23 14:15:49.000000000 +0200
 +++ Makefile.PL
-@@ -163,6 +163,7 @@ my %makefile = (
+@@ -167,6 +167,7 @@ my %makefile = (
        'spamassassin.raw' => 'spamassassin',
        'sa-learn.raw'     => 'sa-learn',
        'sa-update.raw'    => 'sa-update',
 +      'spamc/qmail-spamc.c' => 'spamc/qmail-spamc$(EXE_EXT)',
+       'sa-compile.raw'    => 'sa-compile',
        'spamc/spamc.c'    => 'spamc/spamc$(EXE_EXT)',
        'spamd/spamd.raw'  => 'spamd/spamd',
-     },
-@@ -1146,16 +1147,18 @@ qmail/qmail-spamc$(EXE_EXT): spamc/qmail
+@@ -1194,17 +1195,19 @@ qmail/qmail-spamc$(EXE_EXT): spamc/qmail
  
  conf__install:
  	-$(MKPATH) $(B_CONFDIR)
@@ -18,11 +18,13 @@ $NetBSD: patch-ab,v 1.12 2006/05/26 20:53:00 heinz Exp $
 -	$(PERL) -MFile::Copy -e "copy(q{rules/init.pre}, q{$(B_CONFDIR)/init.pre}) unless -f q{$(B_CONFDIR)/init.pre}"
 -	$(PERL) -MFile::Copy -e "copy(q{rules/v310.pre}, q{$(B_CONFDIR)/v310.pre}) unless -f q{$(B_CONFDIR)/v310.pre}"
 -	$(PERL) -MFile::Copy -e "copy(q{rules/v312.pre}, q{$(B_CONFDIR)/v312.pre}) unless -f q{$(B_CONFDIR)/v312.pre}"
+-	$(PERL) -MFile::Copy -e "copy(q{rules/v320.pre}, q{$(B_CONFDIR)/v320.pre}) unless -f q{$(B_CONFDIR)/v320.pre}"
 +	@ # manage local.cf and *.pre through pkgsrc .mk files
 +	@ # $(PERL) -MFile::Copy -e "copy(q{rules/local.cf}, q{$(B_CONFDIR)/local.cf}) unless -f q{$(B_CONFDIR)/local.cf}"
 +	@ # $(PERL) -MFile::Copy -e "copy(q{rules/init.pre}, q{$(B_CONFDIR)/init.pre}) unless -f q{$(B_CONFDIR)/init.pre}"
 +	@ # $(PERL) -MFile::Copy -e "copy(q{rules/v310.pre}, q{$(B_CONFDIR)/v310.pre}) unless -f q{$(B_CONFDIR)/v310.pre}"
 +	@ # $(PERL) -MFile::Copy -e "copy(q{rules/v312.pre}, q{$(B_CONFDIR)/v312.pre}) unless -f q{$(B_CONFDIR)/v312.pre}"
++	@ # $(PERL) -MFile::Copy -e "copy(q{rules/v320.pre}, q{$(B_CONFDIR)/v320.pre}) unless -f q{$(B_CONFDIR)/v320.pre}"
  
  data__install:
  	-$(MKPATH) $(B_DATADIR)
diff --git a/mail/spamassassin/patches/patch-ae b/mail/spamassassin/patches/patch-ae
index 0be53ad864a..47f1b2c3f44 100644
--- a/mail/spamassassin/patches/patch-ae
+++ b/mail/spamassassin/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.11 2005/11/13 22:48:32 heinz Exp $
+$NetBSD: patch-ae,v 1.12 2007/05/02 15:20:45 heinz Exp $
 
---- spamd/spamd.raw.orig	Wed Sep 14 04:07:32 2005
+--- spamd/spamd.raw.orig	2007-04-23 14:15:48.000000000 +0200
 +++ spamd/spamd.raw
-@@ -2073,8 +2073,9 @@ sub backtrace_handler {
+@@ -2404,8 +2404,9 @@ sub backtrace_handler {
  }
  
  sub daemonize {
@@ -14,7 +14,7 @@ $NetBSD: patch-ae,v 1.11 2005/11/13 22:48:32 heinz Exp $
  
    # be a nice daemon and chdir to the root so we don't block any
    # unmount attempts
-@@ -2273,12 +2274,12 @@ Create user preferences files if they do
+@@ -2664,12 +2665,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.
@@ -27,5 +27,5 @@ $NetBSD: patch-ae,v 1.11 2005/11/13 22:48:32 heinz Exp $
 -the default directories (usually C</etc/mail/spamassassin> or similar).
 +the default directories (usually C<@@LOCAL_RULES_DIR@@> or similar).
  
- =item B<-d>, B<--daemonize>
+ =item B<--cf='config line'>