Upgrade to the 2.60 release. This version has lots of cleanups,

documentation fixes, and general improvements. Most importantly
it removes the now-bogus RBL's.

3 files changed, 24 insertions, 18 deletions

diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index ec1ade236eda..74dc92d43ca2 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Mail-SpamAssassin
-PORTVERSION=	2.55
+PORTVERSION=	2.60
 CATEGORIES=	mail perl5
 MASTER_SITES=	http://spamassassin.org/released/ \
 		${MASTER_SITE_PERL_CPAN}
@@ -35,7 +35,8 @@ RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5
 
 PERL_CONFIGURE=	yes
 CONFIGURE_ARGS+=	SYSCONFDIR="${PREFIX}/etc" \
-			RUN_RAZOR1_TESTS="no" RUN_RAZOR2_TESTS="no"
+			RUN_RAZOR_TESTS="no" RUN_RAZOR2_TESTS="no" \
+			CONTACT_ADDRESS="the administrator of that system"
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Mail::SpamAssassin.3 Mail::SpamAssassin::PerMsgStatus.3 \
diff --git a/mail/p5-Mail-SpamAssassin/distinfo b/mail/p5-Mail-SpamAssassin/distinfo
index 916ce38f755f..73d5a2910a8f 100644
--- a/mail/p5-Mail-SpamAssassin/distinfo
+++ b/mail/p5-Mail-SpamAssassin/distinfo
@@ -1 +1 @@
-MD5 (Mail-SpamAssassin-2.55.tar.gz) = f4d7898301851c83ad157c0a59b98833
+MD5 (Mail-SpamAssassin-2.60.tar.gz) = 46d1db67ed1d860ddb136e0beb5f6ac3
diff --git a/mail/p5-Mail-SpamAssassin/pkg-plist b/mail/p5-Mail-SpamAssassin/pkg-plist
index fa7f9655b6a7..b327638b72a3 100644
--- a/mail/p5-Mail-SpamAssassin/pkg-plist
+++ b/mail/p5-Mail-SpamAssassin/pkg-plist
@@ -23,11 +23,13 @@ etc/rc.d/spamd.sh-dist
 %%SITE_PERL%%/Mail/SpamAssassin/Locker.pm
 %%SITE_PERL%%/Mail/SpamAssassin/MailingList.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Message.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/Reporter.pm
 %%SITE_PERL%%/Mail/SpamAssassin/SHA1.pm
@@ -36,10 +38,27 @@ etc/rc.d/spamd.sh-dist
 %%SITE_PERL%%/Mail/SpamAssassin/Util.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Win32Locker.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
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 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
@@ -57,26 +76,12 @@ 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
-%%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
-%%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%%/Mail/SpamAssassin