4 files changed, 19 insertions, 20 deletions

diff --git a/japanese/p5-Mail-SpamAssassin/Makefile b/japanese/p5-Mail-SpamAssassin/Makefile
index ae77900d25ff..af914d42168d 100644
--- a/japanese/p5-Mail-SpamAssassin/Makefile
+++ b/japanese/p5-Mail-SpamAssassin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	Mail-SpamAssassin
-PORTVERSION=	3.2.4
-PORTREVISION=	5
+PORTVERSION=	3.2.5
 CATEGORIES=	japanese mail perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \
 		${PATCH_SITES}
@@ -37,8 +36,7 @@ BUILD_DEPENDS=	p5-Net-DNS>=0.63:${PORTSDIR}/dns/p5-Net-DNS \
 RUN_DEPENDS=	${BUILD_DEPENDS} \
 		${SITE_PERL}/Bundle/LWP.pm:${PORTSDIR}/www/p5-libwww \
 		p5-Archive-Tar>=1.23:${PORTSDIR}/archivers/p5-Archive-Tar \
-		${SITE_PERL}/mach/Encode/Detect.pm:${PORTSDIR}/converters/p5-Encode-Detect \
-		${SITE_PERL}/mach/Text/MeCab.pm:${PORTSDIR}/japanese/p5-Text-MeCab
+		${SITE_PERL}/mach/Encode/Detect.pm:${PORTSDIR}/converters/p5-Encode-Detect
 
 CONFLICTS=	p5-Mail-SpamAssassin-[0-9]*
 
diff --git a/japanese/p5-Mail-SpamAssassin/distinfo b/japanese/p5-Mail-SpamAssassin/distinfo
index b99b37c6ed4d..07cf603da85b 100644
--- a/japanese/p5-Mail-SpamAssassin/distinfo
+++ b/japanese/p5-Mail-SpamAssassin/distinfo
@@ -1,12 +1,12 @@
-MD5 (ja-spamassassin/Mail-SpamAssassin-3.2.4.tar.gz) = 81ec227d4d63aba08563ee868af9fbeb
-SHA256 (ja-spamassassin/Mail-SpamAssassin-3.2.4.tar.gz) = 20f9c64d75210da5018d21585f6474868966cf1c09cb68d9fb0a3635aa17dccb
-SIZE (ja-spamassassin/Mail-SpamAssassin-3.2.4.tar.gz) = 1219161
+MD5 (ja-spamassassin/Mail-SpamAssassin-3.2.5.tar.gz) = 7fdc1651d0371c4a7f95ac9ae6f828a6
+SHA256 (ja-spamassassin/Mail-SpamAssassin-3.2.5.tar.gz) = 105e18448d7ee2e576ceaca23b129da5e4a3c7dfccec73b6a3babb75d9c0b4f7
+SIZE (ja-spamassassin/Mail-SpamAssassin-3.2.5.tar.gz) = 1223706
 MD5 (ja-spamassassin/tokenizer.pre) = e8e787b76ab94805c7472a90f860cc0a
 SHA256 (ja-spamassassin/tokenizer.pre) = 9f8e30a8449fd13d571427ea30a252b4b275f153bde5345c50427a7aee3c90e0
 SIZE (ja-spamassassin/tokenizer.pre) = 163
-MD5 (ja-spamassassin/spamassassin-3.2.4-ja-test1.txt) = 06c8b7919f2f9c8288dcad5d2aea73fa
-SHA256 (ja-spamassassin/spamassassin-3.2.4-ja-test1.txt) = 5e082ce16d3a827b207a15c10738b34eba9ca00b66e008776767a4c0d5a5c08c
-SIZE (ja-spamassassin/spamassassin-3.2.4-ja-test1.txt) = 9086
-MD5 (ja-spamassassin/spamassassin-3.2.4-ja-test1.patch) = e80cafaec258fb3dd73f4e369a716944
-SHA256 (ja-spamassassin/spamassassin-3.2.4-ja-test1.patch) = 4afeac19c1e409f41322f10153aba5bddddfb27f210f922d8ce3cded7f5a236a
-SIZE (ja-spamassassin/spamassassin-3.2.4-ja-test1.patch) = 33377
+MD5 (ja-spamassassin/spamassassin-3.2.5-ja-test1.txt) = 06fa85a3b3a43119093dd9654d1b9029
+SHA256 (ja-spamassassin/spamassassin-3.2.5-ja-test1.txt) = b205d0be4a417c3dc1f51008a3ba1b2af6fe319d5cd351bc6a44b9b8fe12b1d2
+SIZE (ja-spamassassin/spamassassin-3.2.5-ja-test1.txt) = 9233
+MD5 (ja-spamassassin/spamassassin-3.2.5-ja-test1.patch) = 7821101be1c8aeab76e99cd042579741
+SHA256 (ja-spamassassin/spamassassin-3.2.5-ja-test1.patch) = d1a603474294cb4f6e06cae9a8ef6f00d1141feaf974e11e8f7ec2975d793c65
+SIZE (ja-spamassassin/spamassassin-3.2.5-ja-test1.patch) = 33451
diff --git a/japanese/p5-Mail-SpamAssassin/files/patch-sa-compile.raw b/japanese/p5-Mail-SpamAssassin/files/patch-sa-compile.raw
index 0d9c125767a4..5ed046abc2e1 100644
--- a/japanese/p5-Mail-SpamAssassin/files/patch-sa-compile.raw
+++ b/japanese/p5-Mail-SpamAssassin/files/patch-sa-compile.raw
@@ -1,18 +1,18 @@
---- 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 @@
+--- sa-compile.raw.orig        Tue Jun 10 05:21:07 2008
++++ sa-compile.raw     Thu Jun 12 17:28:56 2008
+@@ -682,9 +682,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>)
+-                      (default: /var/lib/spamassassin/compiled/<perlversion>/<version>)
++                      (default: @@LOCAL_STATE_DIR@@/compiled/<perlversion>/<version>)
    --cf='config line'            Additional line of configuration
    -D, --debug [area=n,...]	Print debugging messages
    -V, --version			Print version
-@@ -708,12 +708,12 @@
+@ -735,12 +735,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.
diff --git a/japanese/p5-Mail-SpamAssassin/pkg-plist b/japanese/p5-Mail-SpamAssassin/pkg-plist
index cb3cab7719c3..f8b1e26bd16b 100644
--- a/japanese/p5-Mail-SpamAssassin/pkg-plist
+++ b/japanese/p5-Mail-SpamAssassin/pkg-plist
@@ -173,6 +173,7 @@ lib/libspamc.so.0
 %%DATADIR%%/60_whitelist_spf.cf
 %%DATADIR%%/60_whitelist_subject.cf
 %%DATADIR%%/72_active.cf
+%%DATADIR%%/72_removed.cf
 %%DATADIR%%/languages
 %%DATADIR%%/sa-update-pubkey.txt
 %%DATADIR%%/user_prefs.template
@@ -193,7 +194,7 @@ lib/libspamc.so.0
 @dirrm %%SITE_PERL%%/Mail/SpamAssassin/Conf
 @dirrm %%SITE_PERL%%/Mail/SpamAssassin/BayesStore
 @dirrm %%SITE_PERL%%/Mail/SpamAssassin/Bayes
-@dirrm %%SITE_PERL%%/Mail/SpamAssassin
+@dirrmtry %%SITE_PERL%%/Mail/SpamAssassin
 @dirrmtry %%SITE_PERL%%/Mail
 @dirrmtry etc/mail/spamassassin
 @dirrmtry etc/mail