5 files changed, 16 insertions, 11 deletions

diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index 2f599a5372d9..cd73be0ce989 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	Mail-SpamAssassin
-PORTVERSION=	3.2.4
-PORTREVISION=	5
+PORTVERSION=	3.2.5
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
 MASTER_SITE_SUBDIR=	spamassassin/source/:apache Mail/:cpan
diff --git a/mail/p5-Mail-SpamAssassin/distinfo b/mail/p5-Mail-SpamAssassin/distinfo
index 3140e8c6fbec..dc86c2eec13b 100644
--- a/mail/p5-Mail-SpamAssassin/distinfo
+++ b/mail/p5-Mail-SpamAssassin/distinfo
@@ -1,3 +1,3 @@
-MD5 (Mail-SpamAssassin-3.2.4.tar.gz) = 81ec227d4d63aba08563ee868af9fbeb
-SHA256 (Mail-SpamAssassin-3.2.4.tar.gz) = 20f9c64d75210da5018d21585f6474868966cf1c09cb68d9fb0a3635aa17dccb
-SIZE (Mail-SpamAssassin-3.2.4.tar.gz) = 1219161
+MD5 (Mail-SpamAssassin-3.2.5.tar.gz) = 7fdc1651d0371c4a7f95ac9ae6f828a6
+SHA256 (Mail-SpamAssassin-3.2.5.tar.gz) = 105e18448d7ee2e576ceaca23b129da5e4a3c7dfccec73b6a3babb75d9c0b4f7
+SIZE (Mail-SpamAssassin-3.2.5.tar.gz) = 1223706
diff --git a/mail/p5-Mail-SpamAssassin/files/patch-sa-compile.raw b/mail/p5-Mail-SpamAssassin/files/patch-sa-compile.raw
index 0d9c125767a4..5ed046abc2e1 100644
--- a/mail/p5-Mail-SpamAssassin/files/patch-sa-compile.raw
+++ b/mail/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/mail/p5-Mail-SpamAssassin/pkg-message b/mail/p5-Mail-SpamAssassin/pkg-message
index 9946219b7e27..24d76aab8d3a 100644
--- a/mail/p5-Mail-SpamAssassin/pkg-message
+++ b/mail/p5-Mail-SpamAssassin/pkg-message
@@ -26,6 +26,11 @@ that sa-update now places state files in /var/db/spamassassin
 and not the default /var/lib/spamassassin.  This is to be consistant
 with Freebsd file directory conventions
 
+If you run sa-compile, you will notice that files are in 
+/var/db/spamassassin/compiled/<perlversion>/<version> instead of
+/var/db/spamassassin/compiled/<version>.
+No attempts have been made to move old versions over. You must recompile.
+
 If you are running with spamd, you must add the following to rc.conf:
 spamd_enable="YES"
 
diff --git a/mail/p5-Mail-SpamAssassin/pkg-plist b/mail/p5-Mail-SpamAssassin/pkg-plist
index 4eb6ac1e8d2d..5523fb934018 100644
--- a/mail/p5-Mail-SpamAssassin/pkg-plist
+++ b/mail/p5-Mail-SpamAssassin/pkg-plist
@@ -166,6 +166,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