3 files changed, 20 insertions, 11 deletions

diff --git a/mail/p5-Mail-SpamAssassin-snapshot/Makefile b/mail/p5-Mail-SpamAssassin-snapshot/Makefile
index bf349f210c7b..adf43e8d5dfe 100644
--- a/mail/p5-Mail-SpamAssassin-snapshot/Makefile
+++ b/mail/p5-Mail-SpamAssassin-snapshot/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	Mail-SpamAssassin
 PORTVERSION=	2.50
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	http://spamassassin.org/devel/ \
 		${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Mail
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	dougb@FreeBSD.org
+MAINTAINER=	DougB@FreeBSD.org
 
 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 \
@@ -36,8 +37,7 @@ 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::BayesStore.3
+		Mail::SpamAssassin::Bayes.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
@@ -46,6 +46,10 @@ DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples//${PKGNAMEPREFIX}${PORTNAME}
 
 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
 
 post-install:
@@ -53,12 +57,11 @@ post-install:
 	${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
+	@${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}
+	BUGS COPYRIGHT Changes README TRADEMARK procmailrc.example sample* \
+		spamd/README* sql/spamassassin.sql ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-SpamAssassin-snapshot/distinfo b/mail/p5-Mail-SpamAssassin-snapshot/distinfo
index 10667db38d7a..03415eeda946 100644
--- a/mail/p5-Mail-SpamAssassin-snapshot/distinfo
+++ b/mail/p5-Mail-SpamAssassin-snapshot/distinfo
@@ -1 +1 @@
-MD5 (Mail-SpamAssassin-2.50.tar.gz) = 0b693ea51431fd099caf9054bbf43214
+MD5 (Mail-SpamAssassin-2.50.tar.gz) = b20ef9f7b8a965fcd2c262917accf478
diff --git a/mail/p5-Mail-SpamAssassin-snapshot/pkg-plist b/mail/p5-Mail-SpamAssassin-snapshot/pkg-plist
index 24deb2114ddf..da71a9c74301 100644
--- a/mail/p5-Mail-SpamAssassin-snapshot/pkg-plist
+++ b/mail/p5-Mail-SpamAssassin-snapshot/pkg-plist
@@ -13,6 +13,10 @@ 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
@@ -26,7 +30,6 @@ 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/ExposedMessage.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
@@ -41,7 +44,7 @@ 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
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail
+@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
@@ -60,7 +63,10 @@ share/spamassassin/20_anti_ratware.cf
 share/spamassassin/20_body_tests.cf
 share/spamassassin/20_compensate.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