8 files changed, 125 insertions, 85 deletions

diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index 2826dcba486c..6da3e171a617 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -6,15 +6,12 @@
 #
 
 PORTNAME=	Mail-SpamAssassin
-PORTVERSION=	2.64
+PORTVERSION=	3.0.0
 CATEGORIES=	mail perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	Mail
+MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
+MASTER_SITE_SUBDIR=	spamassassin/:apache Mail/:cpan
 PKGNAMEPREFIX=	p5-
-
-PATCH_SITES=	http://www.habeas.com/files/
-PATCHFILES=	SA-2.63-Habeas.diff
-PATCH_DIST_STRIP=	-p0
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:apache,cpan
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	A highly efficient mail filter for identifying spam
@@ -26,57 +23,86 @@ RUN_DEPENDS=	${BUILD_DEPENDS} \
 		razor-client:${PORTSDIR}/mail/razor-agents
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS+=	SYSCONFDIR="${PREFIX}/etc" \
-			RUN_RAZOR_TESTS="no" RUN_RAZOR2_TESTS="no" \
-			CONTACT_ADDRESS="the administrator of that system"
+CONFIGURE_ARGS=	SYSCONFDIR="${PREFIX}/etc" \
+	       	CONTACT_ADDRESS="the administrator of that system" \
+		BUILD_SPAMC=yes RUN_NET_TESTS=yes
+
+.if !defined(WITHOUT_OPENSSL)
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=	ENABLE_SSL=yes
+.else
+CONFIGURE_ARGS+=	ENABLE_SSL=no
+.endif
 
-MAN3=		Mail::SpamAssassin.3 Mail::SpamAssassin::PerMsgStatus.3 \
+MAN3=		Mail::SpamAssassin.3 \
+		Mail::SpamAssassin::ArchiveIterator.3 \
+		Mail::SpamAssassin::AutoWhitelist.3 \
+		Mail::SpamAssassin::Bayes.3 \
+		Mail::SpamAssassin::BayesStore.3 \
+		Mail::SpamAssassin::BayesStore::SQL.3 \
 		Mail::SpamAssassin::Conf.3 \
-		Mail::SpamAssassin::PersistentAddrList.3 \
+		Mail::SpamAssassin::Conf::LDAP.3 \
+		Mail::SpamAssassin::Conf::Parser.3 \
+		Mail::SpamAssassin::Conf::SQL.3 \
+		Mail::SpamAssassin::Message.3 \
+		Mail::SpamAssassin::Message::Metadata.3 \
+		Mail::SpamAssassin::Message::Node.3 \
 		Mail::SpamAssassin::PerMsgLearner.3 \
-		Mail::SpamAssassin::Bayes.3 \
-		Mail::SpamAssassin::AutoWhitelist.3 \
-		Mail::SpamAssassin::ConfSourceSQL.3
+		Mail::SpamAssassin::PerMsgStatus.3 \
+		Mail::SpamAssassin::PersistentAddrList.3 \
+		Mail::SpamAssassin::Plugin.3 \
+		Mail::SpamAssassin::Plugin::Hashcash.3 \
+		Mail::SpamAssassin::Plugin::RelayCountry.3 \
+		Mail::SpamAssassin::Plugin::SPF.3 \
+		Mail::SpamAssassin::Plugin::URIDNSBL.3 \
+		Mail::SpamAssassin::PluginHandler.3 \
+		Mail::SpamAssassin::SQLBasedAddrList.3
 
 MAN1=		spamd.1 spamassassin.1 spamc.1 sa-learn.1
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 DATADIR=	${PREFIX}/share/spamassassin
+DOCS=		BUGS CREDITS Changes INSTALL LICENSE NOTICE PACKAGING README STATUS TRADEMARK UPGRADE USAGE procmailrc.example
+DOCSSQL=	README README.awl README.bayes awl_mysql.sql awl_pg.sql bayes_mysql.sql bayes_pg.sql userpref_mysql.sql userpref_pg.sql
+DOCSCONTRIB=	mbox-to-check run-corpora run-masses 
+DOCSLDAP=	README README.testing sa_test.ldif 
+PORTDOCS=	${DOCS} ${DOCSSQL:S|^|sql/|} ${DOCSCONTRIB:S|^|contrib/|} ${DOCSLDAP:S|^|ldap/|}
 
 USE_RC_SUBR=	yes
 SED_SCRIPT=	-e 's|%%PREFIX%%|${PREFIX}|g' \
 		-e 's|%%RC_SUBR%%|${RC_SUBR}|g'
 post-patch:
 	@${FIND} ${WRKSRC} -name \*.orig -delete
-	@${MV} ${WRKSRC}/rules/local.cf ${WRKSRC}/rules/local.cf.sample
-	@${SED} -e 's#local.cf#local.cf.sample#g' \
+	@${SED} -e 's#B_CONFDIR)/local.cf#B_CONFDIR)/local.cf.sample#g' \
+		-e 's#B_CONFDIR)/init.pre#B_CONFDIR)/init.pre.sample#g' \
 		${WRKSRC}/Makefile.PL > ${WRKSRC}/Makefile.PL.sed
 	@${MV} ${WRKSRC}/Makefile.PL.sed ${WRKSRC}/Makefile.PL
 
 post-build:
-	@${SED} ${SED_SCRIPT} ${FILESDIR}/spamd.sh > ${WRKDIR}/spamd.sh
+	@${SED} ${SED_SCRIPT} ${FILESDIR}/spamd.sh > ${WRKDIR}/sa-spamd.sh
 
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/spamc
-	${INSTALL_SCRIPT} ${WRKDIR}/spamd.sh ${PREFIX}/etc/rc.d/spamd.sh
+	@${INSTALL_SCRIPT} ${WRKDIR}/sa-spamd.sh ${PREFIX}/etc/rc.d/sa-spamd.sh
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/sql/README ${DOCSDIR}/README.sql
-	cd ${WRKSRC} ; ${INSTALL_DATA} INSTALL USAGE \
-	    BUGS COPYRIGHT Changes README TRADEMARK procmailrc.example sample* \
-	    spamd/README* sql/spamassassin.sql ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR} ${DOCSDIR}/sql ${DOCSDIR}/contrib ${DOCSDIR}/ldap
+	@${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+	@${INSTALL_DATA} ${DOCSSQL:S|^|${WRKSRC}/sql/|} ${DOCSDIR}/sql
+	@${INSTALL_DATA} ${DOCSCONTRIB:S|^|${WRKSRC}/contrib/|} ${DOCSDIR}/contrib
+	@${INSTALL_DATA} ${DOCSLDAP:S|^|${WRKSRC}/ldap/|} ${DOCSDIR}/ldap
+
 .endif
 	@${SED} -e 's#PREFIX#${PREFIX}#' ${PKGMESSAGE}
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
-RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-BUILD_DEPENDS+=	${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser
+IGNORE=	Needs perl 5.6.1 or higher, install lang/perl5.8 and try again
 .endif
 
 .if ${PERL_LEVEL} < 500800
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
+		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/mail/p5-Mail-SpamAssassin/distinfo b/mail/p5-Mail-SpamAssassin/distinfo
index 3351d10db0bf..8aef15edfe66 100644
--- a/mail/p5-Mail-SpamAssassin/distinfo
+++ b/mail/p5-Mail-SpamAssassin/distinfo
@@ -1,4 +1,2 @@
-MD5 (Mail-SpamAssassin-2.64.tar.gz) = a82a9dab95462d102e253edb99091fdd
-SIZE (Mail-SpamAssassin-2.64.tar.gz) = 826989
-MD5 (SA-2.63-Habeas.diff) = dd9f6c6edaec123b0bb236ab638554bb
-SIZE (SA-2.63-Habeas.diff) = 2933
+MD5 (Mail-SpamAssassin-3.0.0.tar.gz) = e38035c260310e18158d95a41cadae93
+SIZE (Mail-SpamAssassin-3.0.0.tar.gz) = 1072046
diff --git a/mail/p5-Mail-SpamAssassin/files/patch-CmdLearn.pm b/mail/p5-Mail-SpamAssassin/files/patch-CmdLearn.pm
deleted file mode 100644
index fe7c534c831c..000000000000
--- a/mail/p5-Mail-SpamAssassin/files/patch-CmdLearn.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Mail/SpamAssassin/CmdLearn.pm.orig	Thu Sep 18 21:02:40 2003
-+++ lib/Mail/SpamAssassin/CmdLearn.pm	Fri Jan  2 20:18:28 2004
-@@ -43,2 +43,3 @@
-              'showdots'                         => \$opt{'showdots'},
-+	     'quiet'				=> \$opt{'quiet'},
- 	     'no-rebuild|norebuild'		=> \$opt{'norebuild'},
-@@ -233,3 +234,3 @@
-     print STDERR "\n" if ($opt{showdots});
--    print "Learned from $learnedcount message(s) ($messagecount message(s) examined).\n";
-+    print "Learned from $learnedcount message(s) ($messagecount message(s) examined).\n" if (!$opt{quiet});
-   };
diff --git a/mail/p5-Mail-SpamAssassin/files/patch-sa-learn.raw b/mail/p5-Mail-SpamAssassin/files/patch-sa-learn.raw
index 8ecc8de3ac51..212605a90ac9 100644
--- a/mail/p5-Mail-SpamAssassin/files/patch-sa-learn.raw
+++ b/mail/p5-Mail-SpamAssassin/files/patch-sa-learn.raw
@@ -1,6 +1,19 @@
---- sa-learn.raw.orig	Mon Sep 15 15:59:24 2003
-+++ sa-learn.raw	Fri Jan  2 18:59:25 2004
-@@ -75,2 +75,3 @@
-  --showdots                        Show progress using dots
-+ --quiet                           Do not output status from command run
-  --no-rebuild                      Skip building databases after scan
+--- sa-learn.raw~	Fri Aug 27 18:37:32 2004
++++ sa-learn.raw	Wed Sep 22 18:02:48 2004
+@@ -106,6 +106,7 @@
+   'local|L'              => \$opt{'local'},
+   'no-sync|nosync'       => \$opt{'nosync'},
+   'showdots'             => \$opt{'showdots'},
++  'quiet'		 => \$opt{'quiet'},
+   'use-ignores'          => \$opt{'use-ignores'},
+   'no-rebuild|norebuild' => sub { $opt{'nosync'} = 1; warn "The --no-rebuild option has been deprecated.  Please use --no-sync instead.\n" },
+ 
+@@ -384,7 +385,7 @@
+ 
+   print STDERR "\n" if ( $opt{showdots} );
+   print
+-"Learned from $learnedcount message(s) ($messagecount message(s) examined).\n";
++"Learned from $learnedcount message(s) ($messagecount message(s) examined).\n" unless $opt{quiet};
+ 
+   # If we needed to make a tempfile, go delete it.
+   if ( defined $tempfile ) {
diff --git a/mail/p5-Mail-SpamAssassin/files/patch-spamassassin.raw b/mail/p5-Mail-SpamAssassin/files/patch-spamassassin.raw
new file mode 100644
index 000000000000..ddcc3445e94f
--- /dev/null
+++ b/mail/p5-Mail-SpamAssassin/files/patch-spamassassin.raw
@@ -0,0 +1,11 @@
+--- spamassassin.raw~	Tue Sep 14 01:34:05 2004
++++ spamassassin.raw	Wed Sep 22 18:03:37 2004
+@@ -329,7 +329,7 @@
+ # Let folks know how many messages were handled, as long as the handling
+ # didn't produce output (ala: check, test, or remove_markup ...)
+ if ( $opt{'report'} || $opt{'revoke'} || $doing_whitelist_operation ) {
+-  print "$count message(s) examined.\n";
++  print "$count message(s) examined.\n" unless $opt{'quiet'};
+ }
+ 
+ # if the eval died from something, report it here and return an error.
diff --git a/mail/p5-Mail-SpamAssassin/files/spamd.sh b/mail/p5-Mail-SpamAssassin/files/spamd.sh
index aa286bfa7d96..4cc0fd5dc7ac 100644
--- a/mail/p5-Mail-SpamAssassin/files/spamd.sh
+++ b/mail/p5-Mail-SpamAssassin/files/spamd.sh
@@ -35,7 +35,7 @@ stop_postcmd()
 
 spamd_enable=${spamd_enable:-"NO"}
 spamd_pidfile=${spamd_pidfile:-"/var/run/spamd.pid"}
-spamd_flags=${spamd_flags:-"-a -c -d -r ${spamd_pidfile}"}
+spamd_flags=${spamd_flags:-"-c -d -r ${spamd_pidfile}"}
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/mail/p5-Mail-SpamAssassin/pkg-message b/mail/p5-Mail-SpamAssassin/pkg-message
index 1463c4f510fe..02bfd540306d 100644
--- a/mail/p5-Mail-SpamAssassin/pkg-message
+++ b/mail/p5-Mail-SpamAssassin/pkg-message
@@ -6,7 +6,9 @@
 *	/_/   \_\_|   |_| |_____|_| \_| |_| |___\___/|_| \_|		*
 *									*
 *	See PREFIX/share/doc/p5-Mail-SpamAssassin/INSTALL,		*
-*	or http://spamassassin.org/dist/INSTALL BEFORE enabling		*
+*	and PREFIX/share/doc/p5-Mail-SpamAssassin/UPGRADE,		*
+*	or http://spamassassin.org/dist/INSTALL and			*
+*	http://spamassassin.org/dist/UPGRADE BEFORE enabling		*
 *	this version of SpamAssassin for important information		*
 *	regarding changes in this version.				*
 *									*
diff --git a/mail/p5-Mail-SpamAssassin/pkg-plist b/mail/p5-Mail-SpamAssassin/pkg-plist
index ccbfdb662523..cf63b5279bcc 100644
--- a/mail/p5-Mail-SpamAssassin/pkg-plist
+++ b/mail/p5-Mail-SpamAssassin/pkg-plist
@@ -2,61 +2,58 @@ bin/sa-learn
 bin/spamassassin
 bin/spamc
 bin/spamd
+etc/mail/spamassassin/init.pre.sample
 etc/mail/spamassassin/local.cf.sample
-etc/rc.d/spamd.sh
+etc/rc.d/sa-spamd.sh
 %%SITE_PERL%%/Mail/SpamAssassin.pm
 %%SITE_PERL%%/Mail/SpamAssassin/ArchiveIterator.pm
-%%SITE_PERL%%/Mail/SpamAssassin/AuditMessage.pm
 %%SITE_PERL%%/Mail/SpamAssassin/AutoWhitelist.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Bayes.pm
 %%SITE_PERL%%/Mail/SpamAssassin/BayesStore.pm
-%%SITE_PERL%%/Mail/SpamAssassin/CmdLearn.pm
+%%SITE_PERL%%/Mail/SpamAssassin/BayesStore/DBM.pm
+%%SITE_PERL%%/Mail/SpamAssassin/BayesStore/SQL.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Conf.pm
-%%SITE_PERL%%/Mail/SpamAssassin/ConfSourceSQL.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Conf/LDAP.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Conf/Parser.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Conf/SQL.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Constants.pm
 %%SITE_PERL%%/Mail/SpamAssassin/DBBasedAddrList.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Dns.pm
-%%SITE_PERL%%/Mail/SpamAssassin/EncappedMIME.pm
-%%SITE_PERL%%/Mail/SpamAssassin/EncappedMessage.pm
 %%SITE_PERL%%/Mail/SpamAssassin/EvalTests.pm
 %%SITE_PERL%%/Mail/SpamAssassin/HTML.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Locales.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Locker.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Locker/Flock.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Locker/UnixNFSSafe.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Locker/Win32.pm
 %%SITE_PERL%%/Mail/SpamAssassin/MailingList.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Message.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Message/Metadata.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Message/Metadata/Received.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Message/Node.pm
 %%SITE_PERL%%/Mail/SpamAssassin/NetSet.pm
-%%SITE_PERL%%/Mail/SpamAssassin/NoMailAudit.pm
 %%SITE_PERL%%/Mail/SpamAssassin/PerMsgLearner.pm
 %%SITE_PERL%%/Mail/SpamAssassin/PerMsgStatus.pm
 %%SITE_PERL%%/Mail/SpamAssassin/PersistentAddrList.pm
-%%SITE_PERL%%/Mail/SpamAssassin/PhraseFreqs.pm
-%%SITE_PERL%%/Mail/SpamAssassin/Received.pm
-%%SITE_PERL%%/Mail/SpamAssassin/Replier.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/Hashcash.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/RelayCountry.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/SPF.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/Test.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/URIDNSBL.pm
+%%SITE_PERL%%/Mail/SpamAssassin/PluginHandler.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Reporter.pm
-%%SITE_PERL%%/Mail/SpamAssassin/SHA1.pm
+%%SITE_PERL%%/Mail/SpamAssassin/SQLBasedAddrList.pm
 %%SITE_PERL%%/Mail/SpamAssassin/TextCat.pm
-%%SITE_PERL%%/Mail/SpamAssassin/UnixLocker.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Util.pm
-%%SITE_PERL%%/Mail/SpamAssassin/Win32Locker.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Util/RegistrarBoundaries.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin/.packlist
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/Changes
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.spamd
-%%PORTDOCS%%%%DOCSDIR%%/README.spamd-vpopmail
-%%PORTDOCS%%%%DOCSDIR%%/README.sql
-%%PORTDOCS%%%%DOCSDIR%%/TRADEMARK
-%%PORTDOCS%%%%DOCSDIR%%/USAGE
-%%PORTDOCS%%%%DOCSDIR%%/procmailrc.example
-%%PORTDOCS%%%%DOCSDIR%%/sample-nonspam.txt
-%%PORTDOCS%%%%DOCSDIR%%/sample-spam.txt
-%%PORTDOCS%%%%DOCSDIR%%/spamassassin.sql
 %%DATADIR%%/10_misc.cf
 %%DATADIR%%/20_anti_ratware.cf
 %%DATADIR%%/20_body_tests.cf
 %%DATADIR%%/20_compensate.cf
 %%DATADIR%%/20_dnsbl_tests.cf
+%%DATADIR%%/20_drugs.cf
 %%DATADIR%%/20_fake_helo_tests.cf
 %%DATADIR%%/20_head_tests.cf
 %%DATADIR%%/20_html_tests.cf
@@ -67,24 +64,28 @@ etc/rc.d/spamd.sh
 %%DATADIR%%/20_uri_tests.cf
 %%DATADIR%%/23_bayes.cf
 %%DATADIR%%/25_body_tests_es.cf
-%%DATADIR%%/25_body_tests_pl.cf
-%%DATADIR%%/25_head_tests_es.cf
-%%DATADIR%%/25_head_tests_pl.cf
+%%DATADIR%%/25_hashcash.cf
+%%DATADIR%%/25_spf.cf
+%%DATADIR%%/25_uribl.cf
 %%DATADIR%%/30_text_de.cf
-%%DATADIR%%/30_text_es.cf
 %%DATADIR%%/30_text_fr.cf
-%%DATADIR%%/30_text_it.cf
+%%DATADIR%%/30_text_nl.cf
 %%DATADIR%%/30_text_pl.cf
-%%DATADIR%%/30_text_sk.cf
 %%DATADIR%%/50_scores.cf
 %%DATADIR%%/60_whitelist.cf
 %%DATADIR%%/languages
 %%DATADIR%%/triplets.txt
 %%DATADIR%%/user_prefs.template
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
+@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Util
+@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Plugin
+@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Message/Metadata
+@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Message
+@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Locker
+@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Conf
+@dirrm %%SITE_PERL%%/Mail/SpamAssassin/BayesStore
 @dirrm %%SITE_PERL%%/Mail/SpamAssassin
 @unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
 @unexec rmdir %D/etc/mail/spamassassin 2>/dev/null || true