Update to 2.64 (maintainance release while waiting for 3)

Use DATADIR
Update WWW
Remove the primary MASTER_SITE as they only carry the distfiles for SA3

4 files changed, 36 insertions, 37 deletions

diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index 9ba4fa07e6a1..2826dcba486c 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	Mail-SpamAssassin
-PORTVERSION=	2.63
-PORTREVISION=	2
+PORTVERSION=	2.64
 CATEGORIES=	mail perl5
-MASTER_SITES=	http://spamassassin.org/released/ \
-		${MASTER_SITE_PERL_CPAN}
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Mail
 PKGNAMEPREFIX=	p5-
 
@@ -43,6 +41,7 @@ MAN3=		Mail::SpamAssassin.3 Mail::SpamAssassin::PerMsgStatus.3 \
 MAN1=		spamd.1 spamassassin.1 spamc.1 sa-learn.1
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+DATADIR=	${PREFIX}/share/spamassassin
 
 USE_RC_SUBR=	yes
 SED_SCRIPT=	-e 's|%%PREFIX%%|${PREFIX}|g' \
diff --git a/mail/p5-Mail-SpamAssassin/distinfo b/mail/p5-Mail-SpamAssassin/distinfo
index 37c293c5b86e..3351d10db0bf 100644
--- a/mail/p5-Mail-SpamAssassin/distinfo
+++ b/mail/p5-Mail-SpamAssassin/distinfo
@@ -1,4 +1,4 @@
-MD5 (Mail-SpamAssassin-2.63.tar.gz) = fc5a8e69ef2355c30c7b71877ac58d57
-SIZE (Mail-SpamAssassin-2.63.tar.gz) = 828596
+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
diff --git a/mail/p5-Mail-SpamAssassin/pkg-descr b/mail/p5-Mail-SpamAssassin/pkg-descr
index ca7a784f1b9c..8b073bf653ec 100644
--- a/mail/p5-Mail-SpamAssassin/pkg-descr
+++ b/mail/p5-Mail-SpamAssassin/pkg-descr
@@ -11,7 +11,7 @@ filtering using the user's own mail user-agent application.
 Additional drop-in rule sets are available at
 http://wiki.apache.org/spamassassin/CustomRulesets
 
-WWW:	http://spamassassin.org/
+WWW:	http://spamassassin.apache.org/
 
 - Doug Barton
 DougB@FreeBSD.org
diff --git a/mail/p5-Mail-SpamAssassin/pkg-plist b/mail/p5-Mail-SpamAssassin/pkg-plist
index f52f5ba92fcb..ccbfdb662523 100644
--- a/mail/p5-Mail-SpamAssassin/pkg-plist
+++ b/mail/p5-Mail-SpamAssassin/pkg-plist
@@ -52,36 +52,36 @@ etc/rc.d/spamd.sh
 %%PORTDOCS%%%%DOCSDIR%%/sample-nonspam.txt
 %%PORTDOCS%%%%DOCSDIR%%/sample-spam.txt
 %%PORTDOCS%%%%DOCSDIR%%/spamassassin.sql
-share/spamassassin/10_misc.cf
-share/spamassassin/20_anti_ratware.cf
-share/spamassassin/20_body_tests.cf
-share/spamassassin/20_compensate.cf
-share/spamassassin/20_dnsbl_tests.cf
-share/spamassassin/20_fake_helo_tests.cf
-share/spamassassin/20_head_tests.cf
-share/spamassassin/20_html_tests.cf
-share/spamassassin/20_meta_tests.cf
-share/spamassassin/20_phrases.cf
-share/spamassassin/20_porn.cf
-share/spamassassin/20_ratware.cf
-share/spamassassin/20_uri_tests.cf
-share/spamassassin/23_bayes.cf
-share/spamassassin/25_body_tests_es.cf
-share/spamassassin/25_body_tests_pl.cf
-share/spamassassin/25_head_tests_es.cf
-share/spamassassin/25_head_tests_pl.cf
-share/spamassassin/30_text_de.cf
-share/spamassassin/30_text_es.cf
-share/spamassassin/30_text_fr.cf
-share/spamassassin/30_text_it.cf
-share/spamassassin/30_text_pl.cf
-share/spamassassin/30_text_sk.cf
-share/spamassassin/50_scores.cf
-share/spamassassin/60_whitelist.cf
-share/spamassassin/languages
-share/spamassassin/triplets.txt
-share/spamassassin/user_prefs.template
-@dirrm share/spamassassin
+%%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_fake_helo_tests.cf
+%%DATADIR%%/20_head_tests.cf
+%%DATADIR%%/20_html_tests.cf
+%%DATADIR%%/20_meta_tests.cf
+%%DATADIR%%/20_phrases.cf
+%%DATADIR%%/20_porn.cf
+%%DATADIR%%/20_ratware.cf
+%%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%%/30_text_de.cf
+%%DATADIR%%/30_text_es.cf
+%%DATADIR%%/30_text_fr.cf
+%%DATADIR%%/30_text_it.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