- Update to 3.2.3

- Add CONFLICTS with p5-Mail-SpamAssassin

PR:		ports/119369
Submitted by:	TAOKA Fumiyoshi <fmysh at iijmio-mail.jp> (maintainer)

7 files changed, 155 insertions, 49 deletions

diff --git a/japanese/p5-Mail-SpamAssassin/Makefile b/japanese/p5-Mail-SpamAssassin/Makefile
index cb6f83388125..2d0c038ddba0 100644
--- a/japanese/p5-Mail-SpamAssassin/Makefile
+++ b/japanese/p5-Mail-SpamAssassin/Makefile
@@ -3,29 +3,27 @@
 # Whom:					TAOKA Fumiyoshi
 #
 # $FreeBSD$
+#
 
 PORTNAME=	Mail-SpamAssassin
-PORTVERSION=	3.1.8
-PORTREVISION=	1
+PORTVERSION=	3.2.3
 CATEGORIES=	japanese mail perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \
 		${PATCH_SITES}
 MASTER_SITE_SUBDIR=	spamassassin/source/:apache Mail/:cpan
 PKGNAMEPREFIX=	ja-p5-
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:apache,cpan \
-		tokenizer.pre:JA ${DOCJA}:JA
+		${TOKENIZER_PRE}:JA ${DOCJA}:JA
 DIST_SUBDIR=	ja-spamassassin
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-PATCH_SITES=	http://www.emaillab.org/spamassassin/patch/:JA
-PATCHFILES=	spamassassin-3.1.8-normalize-test8.patch:JA
+PATCH_SITES=	http://spamassassin.jp/download/sa${PORTVERSION:R}/:JA
+PATCHFILES=	spamassassin-3.2.3-ja-test1.patch:JA
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	fmysh@iijmio-mail.jp
 COMMENT=	SpamAssassin with Japanese tokenizer
 
-CONFLICTS=	p5-Mail-SpamAssassin-[0-9]*
-
 BUILD_DEPENDS=	p5-Net-DNS>=0.60:${PORTSDIR}/dns/p5-Net-DNS \
 		p5-IO-Zlib>=1.04:${PORTSDIR}/archivers/p5-IO-Zlib \
 		p5-HTML-Parser>=3.43:${PORTSDIR}/www/p5-HTML-Parser \
@@ -38,6 +36,8 @@ RUN_DEPENDS=	${BUILD_DEPENDS} \
 		p5-Archive-Tar>=1.23:${PORTSDIR}/archivers/p5-Archive-Tar \
 		${SITE_PERL}/mach/Encode/Detect.pm:${PORTSDIR}/converters/p5-Encode-Detect
 
+CONFLICTS=	p5-Mail-SpamAssassin-[0-9]*
+
 PERL_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	SYSCONFDIR="${PREFIX}/etc" \
@@ -49,6 +49,7 @@ CONTACT_ADDRESS?=	The administrator of that system
 
 OPTIONS=	AS_ROOT "Run spamd as root (recommended)" on \
 		SPAMC "Build spamd/spamc (not for amavisd)" on \
+		SACOMPILE "sa-compile" off \
 		DKIM "DKIM/DomainKeys Identified Mail" off \
 		SSL "Build with SSL support for spamd/spamc" on \
 		GNUPG "Install GnuPG (for sa-update)" on \
@@ -108,6 +109,10 @@ RUN_DEPENDS+=	${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SS
 RUN_DEPENDS+=	p5-Crypt-OpenSSL-RSA>=0.24:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA
 .endif
 
+.if defined(WITH_SACOMPILE)
+RUN_DEPENDS+=	re2c>=.12.0:${PORTSDIR}/devel/re2c
+.endif
+
 .if defined(WITH_RELAY_COUNTRY)
 RUN_DEPENDS+=	${SITE_PERL}/IP/Country/Fast.pm:${PORTSDIR}/net/p5-IP-Country
 .endif
@@ -115,6 +120,7 @@ RUN_DEPENDS+=	${SITE_PERL}/IP/Country/Fast.pm:${PORTSDIR}/net/p5-IP-Country
 MAN3=		Mail::SpamAssassin.3 \
 		Mail::SpamAssassin::AICache.3 \
 		Mail::SpamAssassin::ArchiveIterator.3 \
+		Mail::SpamAssassin::AsyncLoop.3 \
 		Mail::SpamAssassin::AutoWhitelist.3 \
 		Mail::SpamAssassin::Bayes.3 \
 		Mail::SpamAssassin::BayesStore.3 \
@@ -138,20 +144,26 @@ MAN3=		Mail::SpamAssassin.3 \
 		Mail::SpamAssassin::PerMsgStatus.3 \
 		Mail::SpamAssassin::PersistentAddrList.3 \
 		Mail::SpamAssassin::Plugin.3 \
+		Mail::SpamAssassin::Plugin::ASN.3 \
 		Mail::SpamAssassin::Plugin::AWL.3 \
 		Mail::SpamAssassin::Plugin::AccessDB.3 \
 		Mail::SpamAssassin::Plugin::AntiVirus.3 \
 		Mail::SpamAssassin::Plugin::AutoLearnThreshold.3 \
+		Mail::SpamAssassin::Plugin::BodyRuleBaseExtractor.3 \
+		Mail::SpamAssassin::Plugin::Check.3 \
 		Mail::SpamAssassin::Plugin::DCC.3 \
 		Mail::SpamAssassin::Plugin::DKIM.3 \
 		Mail::SpamAssassin::Plugin::DomainKeys.3 \
 		Mail::SpamAssassin::Plugin::Hashcash.3 \
 		Mail::SpamAssassin::Plugin::MIMEHeader.3 \
+		Mail::SpamAssassin::Plugin::OneLineBodyRuleType.3 \
 		Mail::SpamAssassin::Plugin::Pyzor.3 \
 		Mail::SpamAssassin::Plugin::Razor2.3 \
 		Mail::SpamAssassin::Plugin::RelayCountry.3 \
 		Mail::SpamAssassin::Plugin::ReplaceTags.3 \
+		Mail::SpamAssassin::Plugin::Rule2XSBody.3 \
 		Mail::SpamAssassin::Plugin::SPF.3 \
+		Mail::SpamAssassin::Plugin::Shortcircuit.3 \
 		Mail::SpamAssassin::Plugin::SpamCop.3 \
 		Mail::SpamAssassin::Plugin::Test.3 \
 		Mail::SpamAssassin::Plugin::TextCat.3 \
@@ -159,6 +171,8 @@ MAN3=		Mail::SpamAssassin.3 \
 		Mail::SpamAssassin::Plugin::Tokenizer::MeCab.3 \
 		Mail::SpamAssassin::Plugin::Tokenizer::SimpleJA.3 \
 		Mail::SpamAssassin::Plugin::URIDNSBL.3 \
+		Mail::SpamAssassin::Plugin::URIDetail.3 \
+		Mail::SpamAssassin::Plugin::VBounce.3 \
 		Mail::SpamAssassin::Plugin::WhiteListSubject.3 \
 		Mail::SpamAssassin::PluginHandler.3 \
 		Mail::SpamAssassin::SQLBasedAddrList.3 \
@@ -170,15 +184,16 @@ MAN3=		Mail::SpamAssassin.3 \
 		spamassassin-run.3
 
 MAN1=		spamd.1 spamassassin.1 spamc.1 sa-learn.1 sa-update.1 \
-		spamassassin-run.1
+		spamassassin-run.1 sa-compile.1
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 DATADIR=	${PREFIX}/share/spamassassin
-DOCS=		CREDITS Changes INSTALL LICENSE NOTICE PACKAGING README STATUS TRADEMARK UPGRADE USAGE procmailrc.example
+DOCS=		CREDITS Changes INSTALL LICENSE NOTICE PACKAGING README 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
 DOCSLDAP=	README README.testing sa_test.ldif
-DOCJA=		spamassassin-3.1.8-normalize-test8.txt
 PORTDOCS=	${DOCS} sql ldap ${DOCJA}
+DOCJA=		${PATCHFILES:S/.patch:JA/.txt/}
+TOKENIZER_PRE=	tokenizer.pre
 
 USE_RC_SUBR=	sa-spamd.sh
 
@@ -199,11 +214,10 @@ post-patch:
 		-e 's#B_CONFDIR)/init.pre#B_CONFDIR)/init.pre.sample#g' \
 		-e 's#B_CONFDIR)/v310.pre#B_CONFDIR)/v310.pre.sample#g' \
 		-e 's#B_CONFDIR)/v312.pre#B_CONFDIR)/v312.pre.sample#g' \
+		-e 's#B_CONFDIR)/v320.pre#B_CONFDIR)/v320.pre.sample#g' \
 		-e 's/require DBI/0/' \
 		${WRKSRC}/Makefile.PL
 	@${REINPLACE_CMD} -e '/^CC =/d' ${WRKSRC}/spamc/Makefile.in
-	@${REINPLACE_CMD} -e 's/CCDLFLAGS/CCCDLFLAGS/g;s/ccdlflags/cccdlflags/g' \
-		${WRKSRC}/spamc/configure ${WRKSRC}/spamc/*.in
 
 .if defined(WITH_RAZOR)
 	${REINPLACE_CMD} -e '/Razor2/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v312.pre
@@ -220,6 +234,9 @@ post-patch:
 .if defined(WITH_DCC)
 	${REINPLACE_CMD} -e '/DCC/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v310.pre
 .endif
+.if defined(WITH_SACOMPILE)
+	${REINPLACE_CMD} -e '/Rule2XSBody/s/^# loadplugin/loadplugin/' ${WRKSRC}/rules/v320.pre
+.endif
 
 post-build:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} spamc/libspamc.so)
@@ -250,12 +267,15 @@ post-install:
 	@[ -f ${PREFIX}/etc/mail/spamassassin/v312.pre ] || \
 		${CP} ${PREFIX}/etc/mail/spamassassin/v312.pre.sample \
 			${PREFIX}/etc/mail/spamassassin/v312.pre
+	@[ -f ${PREFIX}/etc/mail/spamassassin/v320.pre ] || \
+		${CP} ${PREFIX}/etc/mail/spamassassin/v320.pre.sample \
+			${PREFIX}/etc/mail/spamassassin/v320.pre
 	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL
 
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/tokenizer.pre ${PREFIX}/etc/mail/spamassassin/tokenizer.pre.sample
-	@[ -f ${PREFIX}/etc/mail/spamassassin/tokenizer.pre ] || \
-		${CP} ${PREFIX}/etc/mail/spamassassin/tokenizer.pre.sample \
-			${PREFIX}/etc/mail/spamassassin/tokenizer.pre
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${TOKENIZER_PRE} ${PREFIX}/etc/mail/spamassassin/${TOKENIZER_PRE}.sample
+	@[ -f ${PREFIX}/etc/mail/spamassassin/${TOKENIZER_PRE} ] || \
+		${CP} ${PREFIX}/etc/mail/spamassassin/${TOKENIZER_PRE}.sample \
+			${PREFIX}/etc/mail/spamassassin/${TOKENIZER_PRE}
 
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR} ${DOCSDIR}/sql ${DOCSDIR}/ldap
diff --git a/japanese/p5-Mail-SpamAssassin/distinfo b/japanese/p5-Mail-SpamAssassin/distinfo
index 293bb3a9f825..4da8e7e78463 100644
--- a/japanese/p5-Mail-SpamAssassin/distinfo
+++ b/japanese/p5-Mail-SpamAssassin/distinfo
@@ -1,12 +1,12 @@
-MD5 (ja-spamassassin/Mail-SpamAssassin-3.1.8.tar.gz) = 20a3a6b651a89dcc70634715ca833996
-SHA256 (ja-spamassassin/Mail-SpamAssassin-3.1.8.tar.gz) = 01e5b0d78969cfb0580efb14a7a7212ed3af9f382829afcd61b97a91938831dd
-SIZE (ja-spamassassin/Mail-SpamAssassin-3.1.8.tar.gz) = 1173847
-MD5 (ja-spamassassin/tokenizer.pre) = 72b905b3e7ae7bcfef639bbffbeadb3a
-SHA256 (ja-spamassassin/tokenizer.pre) = 565c6aa234fd33c724e119ae10935d61a7d85c2b85520243b4a7d5cc9a06f04c
-SIZE (ja-spamassassin/tokenizer.pre) = 164
-MD5 (ja-spamassassin/spamassassin-3.1.8-normalize-test8.txt) = a45eeafbed2d316e4b4d184258df2788
-SHA256 (ja-spamassassin/spamassassin-3.1.8-normalize-test8.txt) = a94ddf5d3fe2f7cbdde44af04eada690ca0bb1643e2597b7d612479fe086c39d
-SIZE (ja-spamassassin/spamassassin-3.1.8-normalize-test8.txt) = 12808
-MD5 (ja-spamassassin/spamassassin-3.1.8-normalize-test8.patch) = 5d07043233324d4c3f136a2987a94759
-SHA256 (ja-spamassassin/spamassassin-3.1.8-normalize-test8.patch) = a4d470e7c687833d124c9eab2960bfa6ffff8b6f6205d7420ba4162008d296e7
-SIZE (ja-spamassassin/spamassassin-3.1.8-normalize-test8.patch) = 54747
+MD5 (ja-spamassassin/Mail-SpamAssassin-3.2.3.tar.gz) = 2e356b70b9458b44a828c19f6e816521
+SHA256 (ja-spamassassin/Mail-SpamAssassin-3.2.3.tar.gz) = 2bf7635555dea4912512a32c7c567094ef264770b86029c49f653e97352efad8
+SIZE (ja-spamassassin/Mail-SpamAssassin-3.2.3.tar.gz) = 1202082
+MD5 (ja-spamassassin/tokenizer.pre) = e8e787b76ab94805c7472a90f860cc0a
+SHA256 (ja-spamassassin/tokenizer.pre) = 9f8e30a8449fd13d571427ea30a252b4b275f153bde5345c50427a7aee3c90e0
+SIZE (ja-spamassassin/tokenizer.pre) = 163
+MD5 (ja-spamassassin/spamassassin-3.2.3-ja-test1.txt) = ec19409451e9c850c8d7ccfd3d83a873
+SHA256 (ja-spamassassin/spamassassin-3.2.3-ja-test1.txt) = cc08cde62b1d86c2a2b80666c95f80668bf250f634694eaaa8f14515fecfbeb2
+SIZE (ja-spamassassin/spamassassin-3.2.3-ja-test1.txt) = 8476
+MD5 (ja-spamassassin/spamassassin-3.2.3-ja-test1.patch) = 7a18557a8becd468da9a5ea6e39dc439
+SHA256 (ja-spamassassin/spamassassin-3.2.3-ja-test1.patch) = 857cd382fa542841d1b290c2826a4bdf2912efd66e91f04752926e4bbcebce83
+SIZE (ja-spamassassin/spamassassin-3.2.3-ja-test1.patch) = 33377
diff --git a/japanese/p5-Mail-SpamAssassin/files/patch-sa-compile.raw b/japanese/p5-Mail-SpamAssassin/files/patch-sa-compile.raw
new file mode 100644
index 000000000000..0d9c125767a4
--- /dev/null
+++ b/japanese/p5-Mail-SpamAssassin/files/patch-sa-compile.raw
@@ -0,0 +1,29 @@
+--- sa-compile.raw.orig	2007-08-08 05:19:47.000000000 -0800
++++ sa-compile.raw	2007-08-11 12:31:07.000000000 -0800
+@@ -659,9 +659,9 @@
+   -p prefs, --prefspath=file, --prefs-file=file
+                                 Set user preferences file
+   --siteconfigpath=path         Path for site configs
+-                                (default: /etc/mail/spamassassin)
++                               (default: @@LOCAL_RULES_DIR@@)
+   --updatedir=path              Directory to place updates
+-                      (default: /var/lib/spamassassin/compiled/<version>)
++                      (default: @@LOCAL_STATE_DIR@@/compiled/<version>)
+   --cf='config line'            Additional line of configuration
+   -D, --debug [area=n,...]	Print debugging messages
+   -V, --version			Print version
+@@ -708,12 +708,12 @@
+ =item B<-C> I<path>, B<--configpath>=I<path>, B<--config-file>=I<path>
+ 
+ Use the specified path for locating the distributed configuration files.
+-Ignore the default directories (usually C</usr/share/spamassassin> or similar).
++Ignore the default directories (usually C<@@DEF_RULES_DIR@@> or similar).
+ 
+ =item B<--siteconfigpath>=I<path>
+ 
+ Use the specified path for locating site-specific configuration files.  Ignore
+-the default directories (usually C</etc/mail/spamassassin> or similar).
++the default directories (usually C<@@LOCAL_RULES_DIR@@> or similar).
+ 
+ =item B<--updatedir>
+ 
diff --git a/japanese/p5-Mail-SpamAssassin/files/patch-sa-learn-raw b/japanese/p5-Mail-SpamAssassin/files/patch-sa-learn-raw
index e8c2bb9aa1ac..e69de29bb2d1 100644
--- a/japanese/p5-Mail-SpamAssassin/files/patch-sa-learn-raw
+++ b/japanese/p5-Mail-SpamAssassin/files/patch-sa-learn-raw
@@ -1,14 +0,0 @@
---- sa-learn.raw	(revision 507745)
-+++ sa-learn.raw	(working copy)
-@@ -402,7 +402,10 @@
- 
-     # make sure the target list is in the normal AI format
-     if ($targets[$elem] !~ /^[^:]*:[a-z]+:/) {
--      $targets[$elem] = target($targets[$elem]);
-+      my $item = splice @targets, $elem, 1;
-+      $elem--; # go back to this element again
-+      target($item); # add back to the list
-+      next;
-     }
-   }
-
diff --git a/japanese/p5-Mail-SpamAssassin/files/patch-sa-learn.raw b/japanese/p5-Mail-SpamAssassin/files/patch-sa-learn.raw
new file mode 100644
index 000000000000..635cc317adc9
--- /dev/null
+++ b/japanese/p5-Mail-SpamAssassin/files/patch-sa-learn.raw
@@ -0,0 +1,27 @@
+--- sa-learn.raw.orig	Wed Aug  8 06:19:47 2007
++++ sa-learn.raw	Mon Aug 20 19:05:06 2007
+@@ -101,6 +101,7 @@ GetOptions(
+   'local|L'              => \$opt{'local'},
+   'no-sync|nosync'       => \$opt{'nosync'},
+   'showdots'             => \$opt{'showdots'},
++  'quiet|q'              => \$opt{'quiet'},
+   'progress'             => \$opt{'progress'},
+   '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" },
+@@ -433,7 +434,7 @@ eval {
+   $progress->final() if ($opt{progress} && $progress);
+ 
+   my $phrase = defined $forget ? "Forgot" : "Learned";
+-  print "$phrase tokens from $learnedcount message(s) ($messagecount message(s) examined)\n";
++  print "$phrase tokens from $learnedcount message(s) ($messagecount message(s) examined)\n" if (!$opt{quiet});
+ 
+   # If we needed to make a tempfile, go delete it.
+   if ( defined $tempfile ) {
+@@ -601,6 +602,7 @@ Options:
+                        (default: /etc/mail/spamassassin)
+  --cf='config line'    Additional line of configuration
+  -D, --debug [area=n,...]  Print debugging messages
++ -q, --quiet           Reduce amount of information printed out
+  -V, --version         Print version
+  -h, --help            Print usage message
+ 
diff --git a/japanese/p5-Mail-SpamAssassin/pkg-deinstall b/japanese/p5-Mail-SpamAssassin/pkg-deinstall
index 494e9402eb30..a1a75d77cbf6 100644
--- a/japanese/p5-Mail-SpamAssassin/pkg-deinstall
+++ b/japanese/p5-Mail-SpamAssassin/pkg-deinstall
@@ -3,11 +3,27 @@
 if [ "$2" != "POST-DEINSTALL" ]; then
     exit 0
 fi
+if [ -d /var/db/spamassassin ]; then
+	echo "To delete /var/db/spamassassin, use 'rm -rf /var/db/spamassassin'"
+fi
 
 USER=spamd
+GROUP=${USER}
 
 if pw usershow "${USER}" 2>/dev/null 1>&2; then
-	echo "To delete ${USER} user permanently, use 'rmuser ${USER}'"
+	if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
+		echo "To delete ${USER} user permanently, use 'rmuser ${USER}'"
+	else
+		pw userdel ${USER}
+	fi
+fi
+
+if pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
+	if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
+		echo "To delete the ${GROUP} group permanently, use 'pw groupdel ${GROUP}'."
+	else
+		pw groupdel ${GROUP}
+	fi
 fi
 
 exit 0
diff --git a/japanese/p5-Mail-SpamAssassin/pkg-plist b/japanese/p5-Mail-SpamAssassin/pkg-plist
index 196490c9705d..8ecc8289f938 100644
--- a/japanese/p5-Mail-SpamAssassin/pkg-plist
+++ b/japanese/p5-Mail-SpamAssassin/pkg-plist
@@ -1,5 +1,6 @@
 @unexec %D/etc/rc.d/sa-spamd.sh stop > /dev/null 2>&1 || true
 @unexec %D/etc/rc.d/sa-spamd stop > /dev/null 2>&1 || true
+bin/sa-compile
 bin/sa-learn
 bin/sa-update
 bin/spamassassin
@@ -24,9 +25,13 @@ etc/mail/spamassassin/v310.pre.sample
 @unexec if cmp -s %B/v312.pre.sample %B/v312.pre; then rm -f %B/v312.pre; fi
 etc/mail/spamassassin/v312.pre.sample
 @exec [ -f %B/v312.pre ] || cp %B/%f %B/v312.pre
+@unexec if cmp -s %B/v320.pre.sample %B/v320.pre; then rm -f %B/v320.pre; fi
+etc/mail/spamassassin/v320.pre.sample
+@exec [ -f %B/v320.pre ] || cp %B/%f %B/v320.pre
 %%SITE_PERL%%/Mail/SpamAssassin.pm
 %%SITE_PERL%%/Mail/SpamAssassin/AICache.pm
 %%SITE_PERL%%/Mail/SpamAssassin/ArchiveIterator.pm
+%%SITE_PERL%%/Mail/SpamAssassin/AsyncLoop.pm
 %%SITE_PERL%%/Mail/SpamAssassin/AutoWhitelist.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Bayes.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Bayes/CombineChi.pm
@@ -46,7 +51,6 @@ etc/mail/spamassassin/v312.pre.sample
 %%SITE_PERL%%/Mail/SpamAssassin/DBBasedAddrList.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Dns.pm
 %%SITE_PERL%%/Mail/SpamAssassin/DnsResolver.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
@@ -68,19 +72,34 @@ etc/mail/spamassassin/v312.pre.sample
 %%SITE_PERL%%/Mail/SpamAssassin/PersistentAddrList.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/AWL.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/ASN.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/AccessDB.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/AntiVirus.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/Bayes.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/BodyEval.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/BodyRuleBaseExtractor.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/Check.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/DCC.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/DKIM.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/DNSEval.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/DomainKeys.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/HTMLEval.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/HTTPSMismatch.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Hashcash.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/HeaderEval.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/ImageInfo.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/MIMEEval.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/MIMEHeader.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Pyzor.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Razor2.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/RelayEval.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/RelayCountry.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/ReplaceTags.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/Rule2XSBody.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/SPF.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/Shortcircuit.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/SpamCop.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Test.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/TextCat.pm
@@ -88,6 +107,10 @@ etc/mail/spamassassin/v312.pre.sample
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Tokenizer/MeCab.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Tokenizer/SimpleJA.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/URIDNSBL.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/URIDetail.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/URIEval.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/VBounce.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/WLBLEval.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/WhiteListSubject.pm
 %%SITE_PERL%%/Mail/SpamAssassin/PluginHandler.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Reporter.pm
@@ -100,29 +123,31 @@ etc/mail/spamassassin/v312.pre.sample
 %%SITE_PERL%%/Mail/SpamAssassin/Util/DependencyInfo.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Util/Progress.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Util/RegistrarBoundaries.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Util/TieOneStringHash.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin/.packlist
 %%SITE_PERL%%/spamassassin-run.pod
-%%DATADIR%%/10_misc.cf
+%%DATADIR%%/10_default_prefs.cf
 %%DATADIR%%/20_advance_fee.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_dynrdns.cf
 %%DATADIR%%/20_fake_helo_tests.cf
 %%DATADIR%%/20_head_tests.cf
 %%DATADIR%%/20_html_tests.cf
+%%DATADIR%%/20_imageinfo.cf
 %%DATADIR%%/20_meta_tests.cf
 %%DATADIR%%/20_net_tests.cf
 %%DATADIR%%/20_phrases.cf
 %%DATADIR%%/20_porn.cf
 %%DATADIR%%/20_ratware.cf
 %%DATADIR%%/20_uri_tests.cf
+%%DATADIR%%/20_vbounce.cf
 %%DATADIR%%/23_bayes.cf
 %%DATADIR%%/25_accessdb.cf
 %%DATADIR%%/25_antivirus.cf
-%%DATADIR%%/25_body_tests_es.cf
-%%DATADIR%%/25_body_tests_pl.cf
+%%DATADIR%%/25_asn.cf
 %%DATADIR%%/25_dcc.cf
 %%DATADIR%%/25_dkim.cf
 %%DATADIR%%/25_domainkeys.cf
@@ -141,18 +166,21 @@ etc/mail/spamassassin/v312.pre.sample
 %%DATADIR%%/30_text_pt_br.cf
 %%DATADIR%%/50_scores.cf
 %%DATADIR%%/60_awl.cf
+%%DATADIR%%/60_shortcircuit.cf
 %%DATADIR%%/60_whitelist.cf
 %%DATADIR%%/60_whitelist_dk.cf
 %%DATADIR%%/60_whitelist_dkim.cf
 %%DATADIR%%/60_whitelist_spf.cf
 %%DATADIR%%/60_whitelist_subject.cf
+%%DATADIR%%/72_active.cf
 %%DATADIR%%/languages
-%%DATADIR%%/triplets.txt
 %%DATADIR%%/sa-update-pubkey.txt
 %%DATADIR%%/user_prefs.template
 @unexec rm -rf /var/lib/spamassassin/2* || true
 @unexec rmdir /var/lib/spamassassin 2>/dev/null  || true
 @unexec rmdir /var/lib 2>/dev/null || true
+@unexec rmdir /var/db/spamassassin || true
+@unexec rmdir /var/db || true
 @dirrm %%DATADIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail