Update this snapshot port to install 2.60-rc3 (with a purposely broken

PORTVERSION to remind people to uninstall the rc when the release is out).

I delayed this because I was hoping 2.60 would get released sooner, and I
wanted to test rc3 before turning it loose on people. So far, so good.

4 files changed, 119 insertions, 93 deletions

diff --git a/mail/p5-Mail-SpamAssassin-snapshot/Makefile b/mail/p5-Mail-SpamAssassin-snapshot/Makefile
index e0cae764519a..2e24757fba33 100644
--- a/mail/p5-Mail-SpamAssassin-snapshot/Makefile
+++ b/mail/p5-Mail-SpamAssassin-snapshot/Makefile
@@ -6,65 +6,74 @@
 #
 
 PORTNAME=	Mail-SpamAssassin
-PORTVERSION=	2.51
-PORTREVISION=	0
+PORTVERSION=	2.60-rc3
 CATEGORIES=	mail perl5
-MASTER_SITES=	http://spamassassin.org/devel/ \
+MASTER_SITES=	http://spamassassin.org/released/ \
 		${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Mail
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	DougB@FreeBSD.org
-COMMENT=	A mail filter for identifying SPAM
+COMMENT=	A highly efficient mail filter for identifying spam
 
-BROKEN=		"mail/p5-Mail-SpamAssassin has been updated to 2.50"
-
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools
+BUILD_DEPENDS=	${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \
+		${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
+		${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools
 RUN_DEPENDS=	${BUILD_DEPENDS} \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
 		razor-client:${PORTSDIR}/mail/razor-agents
 
-PODPARSER=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser
-RUN_DEPENDS+=	${PODPARSER}
-BUILD_DEPENDS+=	${PODPARSER}
-NO_LATEST_LINK=	yes
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500600
+RUN_DEPENDS+=	${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser
+BUILD_DEPENDS+=	${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser
+.endif
+
+.if ${PERL_LEVEL} < 500800
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
+.endif
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS+=	SYSCONFDIR="${PREFIX}/etc" RUN_RAZOR1_TESTS="no" \
-			RUN_RAZOR2_TESTS="no"
+CONFIGURE_ARGS+=	SYSCONFDIR="${PREFIX}/etc" \
+			RUN_RAZOR1_TESTS="no" RUN_RAZOR2_TESTS="no"
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Mail::SpamAssassin.3 Mail::SpamAssassin::PerMsgStatus.3 \
 		Mail::SpamAssassin::Conf.3 \
 		Mail::SpamAssassin::PersistentAddrList.3 \
 		Mail::SpamAssassin::PerMsgLearner.3 \
-		Mail::SpamAssassin::Bayes.3
+		Mail::SpamAssassin::Bayes.3 \
+		Mail::SpamAssassin::AutoWhitelist.3 \
+		Mail::SpamAssassin::ConfSourceSQL.3
+
 MAN1PREFIX=	${PREFIX}
-MAN1=		spamd.1 spamassassin.1 spamc.1 sa-learn-nonspam.1 \
-		sa-learn-spam.1 sa-learn-rebuild.1 sa-forget.1
+MAN1=		spamd.1 spamassassin.1 spamc.1 sa-learn.1
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-EXAMPLESDIR=	${PREFIX}/share/examples//${PKGNAMEPREFIX}${PORTNAME}
+
+# XXX
+WRKSRC=		${WRKDIR}/Mail-SpamAssassin-2.60
 
 post-patch:
-.for file in Makefile.PL build/preprocessor.pm
-	@${CP} ${WRKSRC}/${file} ${WRKSRC}/${file}.orig
-	@${SED} -e 's#::Post545##' ${WRKSRC}/${file}.orig > ${WRKSRC}/${file}
-.endfor
 	@${FIND} ${WRKSRC} -name \*.orig -delete
 
+	@${MV} ${WRKSRC}/rules/local.cf ${WRKSRC}/rules/local.cf.sample
+	@${SED} -e 's#local.cf#local.cf.sample#g' \
+		${WRKSRC}/Makefile.PL > ${WRKSRC}/Makefile.PL.sed
+	@${MV} ${WRKSRC}/Makefile.PL.sed ${WRKSRC}/Makefile.PL
+
 post-install:
-	@strip ${PREFIX}/bin/spamc
+	@${STRIP_CMD} ${PREFIX}/bin/spamc
 	${INSTALL_SCRIPT} ${FILESDIR}/spamd.sh ${PREFIX}/etc/rc.d/spamd.sh-dist
 
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/sql/README ${DOCSDIR}/README.sql
-	cd ${WRKSRC} ; ${INSTALL_DATA} \
-	BUGS COPYRIGHT Changes README TRADEMARK procmailrc.example sample* \
-		spamd/README* sql/spamassassin.sql ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/sql/README ${DOCSDIR}/README.sql
+	cd ${WRKSRC} ; ${INSTALL_DATA} INSTALL USAGE \
+	    BUGS COPYRIGHT Changes README TRADEMARK procmailrc.example sample* \
+	    spamd/README* sql/spamassassin.sql ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+	@${SED} -e 's#PREFIX#${PREFIX}#' ${PKGMESSAGE}
+
+.include <bsd.port.post.mk>
diff --git a/mail/p5-Mail-SpamAssassin-snapshot/distinfo b/mail/p5-Mail-SpamAssassin-snapshot/distinfo
index 03415eeda946..dfe42419b110 100644
--- a/mail/p5-Mail-SpamAssassin-snapshot/distinfo
+++ b/mail/p5-Mail-SpamAssassin-snapshot/distinfo
@@ -1 +1 @@
-MD5 (Mail-SpamAssassin-2.50.tar.gz) = b20ef9f7b8a965fcd2c262917accf478
+MD5 (Mail-SpamAssassin-2.60-rc3.tar.gz) = 141a73b07d46324865ea7ead49375043
diff --git a/mail/p5-Mail-SpamAssassin-snapshot/pkg-message b/mail/p5-Mail-SpamAssassin-snapshot/pkg-message
new file mode 100644
index 000000000000..1463c4f510fe
--- /dev/null
+++ b/mail/p5-Mail-SpamAssassin-snapshot/pkg-message
@@ -0,0 +1,13 @@
+*************************************************************************
+*	    _  _____ _____ _____ _   _ _____ ___ ___  _   _ 		*
+*	   / \|_   _|_   _| ____| \ | |_   _|_ _/ _ \| \ | |		*
+*	  / _ \ | |   | | |  _| |  \| | | |  | | | | |  \| |		*
+*	 / ___ \| |   | | | |___| |\  | | |  | | |_| | |\  |		*
+*	/_/   \_\_|   |_| |_____|_| \_| |_| |___\___/|_| \_|		*
+*									*
+*	See PREFIX/share/doc/p5-Mail-SpamAssassin/INSTALL,		*
+*	or http://spamassassin.org/dist/INSTALL BEFORE enabling		*
+*	this version of SpamAssassin for important information		*
+*	regarding changes in this version.				*
+*									*
+*************************************************************************
diff --git a/mail/p5-Mail-SpamAssassin-snapshot/pkg-plist b/mail/p5-Mail-SpamAssassin-snapshot/pkg-plist
index da71a9c74301..b327638b72a3 100644
--- a/mail/p5-Mail-SpamAssassin-snapshot/pkg-plist
+++ b/mail/p5-Mail-SpamAssassin-snapshot/pkg-plist
@@ -1,67 +1,64 @@
-bin/sa-learn-nonspam
-bin/spamd
-bin/sa-learn-rebuild
-bin/sa-forget
-bin/sa-learn-spam
-bin/spamc
+bin/sa-learn
 bin/spamassassin
+bin/spamc
+bin/spamd
+etc/mail/spamassassin/local.cf.sample
 etc/rc.d/spamd.sh-dist
-etc/mail/spamassassin/local.cf
-@dirrm etc/mail/spamassassin
-@dirrm etc/mail
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Locker.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/UnixLocker.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Win32Locker.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Conf.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Replier.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Bayes.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/ConfSourceSQL.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/DBBasedAddrList.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PerMsgStatus.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Reporter.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/SHA1.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/AuditMessage.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/HTML.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/MailingList.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/ArchiveIterator.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/CmdLearn.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PerMsgLearner.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/EncappedMIME.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/BayesStore.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/NoMailAudit.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/AutoWhitelist.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PersistentAddrList.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Dns.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PhraseFreqs.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/TextCat.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/EncappedMessage.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Message.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/EvalTests.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Locales.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.sql
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/BUGS
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/COPYRIGHT
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/Changes
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/TRADEMARK
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/procmailrc.example
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/sample-nonspam.txt
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/sample-spam.txt
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.spamd
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.spamd-vpopmail
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/spamassassin.sql
-@dirrm %%PORTDOCS%%share/doc/p5-Mail-SpamAssassin
+%%SITE_PERL%%/Mail/SpamAssassin.pm
+%%SITE_PERL%%/Mail/SpamAssassin/ArchiveIterator.pm
+%%SITE_PERL%%/Mail/SpamAssassin/AuditMessage.pm
+%%SITE_PERL%%/Mail/SpamAssassin/AutoWhitelist.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Bayes.pm
+%%SITE_PERL%%/Mail/SpamAssassin/BayesStore.pm
+%%SITE_PERL%%/Mail/SpamAssassin/CmdLearn.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Conf.pm
+%%SITE_PERL%%/Mail/SpamAssassin/ConfSourceSQL.pm
+%%SITE_PERL%%/Mail/SpamAssassin/DBBasedAddrList.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Dns.pm
+%%SITE_PERL%%/Mail/SpamAssassin/EncappedMIME.pm
+%%SITE_PERL%%/Mail/SpamAssassin/EncappedMessage.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
+%%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
+%%SITE_PERL%%/Mail/SpamAssassin/TextCat.pm
+%%SITE_PERL%%/Mail/SpamAssassin/UnixLocker.pm
+%%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
@@ -77,11 +74,18 @@ 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/40_spam_phrases.cf
+share/spamassassin/30_text_sk.cf
 share/spamassassin/50_scores.cf
 share/spamassassin/60_whitelist.cf
-share/spamassassin/user_prefs.template
-share/spamassassin/triplets.txt
 share/spamassassin/languages
+share/spamassassin/triplets.txt
+share/spamassassin/user_prefs.template
+@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
+@unexec rmdir %D/%%SITE_PERL%%/Mail 2>/dev/null || true
+@unexec rmdir %D/etc/mail/spamassassin 2>/dev/null || true
+@unexec rmdir %D/etc/mail 2>/dev/null || true
 @dirrm share/spamassassin