3 files changed, 45 insertions, 28 deletions

diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index c604998e3eba..bdd6e911353d 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	Mail-SpamAssassin
-PORTVERSION=	2.44
+PORTVERSION=	2.50
 CATEGORIES=	mail perl5
 MASTER_SITES=	http://spamassassin.org/released/ \
 		${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Mail
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	dougb@FreeBSD.org
+MAINTAINER=	DougB@FreeBSD.org
+COMMENT=	A highly efficient mail filter for identifying spam
 
 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 \
@@ -27,22 +28,22 @@ RUN_DEPENDS+=	${PODPARSER}
 BUILD_DEPENDS+=	${PODPARSER}
 
 PERL_CONFIGURE=	yes
-CONFIGURE_ARGS+=	SYSCONFDIR="${PREFIX}/etc"
+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::PersistentAddrList.3 \
+		Mail::SpamAssassin::PerMsgLearner.3 \
+		Mail::SpamAssassin::Bayes.3
 MAN1PREFIX=	${PREFIX}
-MAN1=		spamd.1 spamassassin.1 spamc.1
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-EXAMPLESDIR=	${PREFIX}/share/examples//${PKGNAMEPREFIX}${PORTNAME}
+MAN1=		spamd.1 spamassassin.1 spamc.1 sa-learn.1
 
-post-patch:
-	@${FIND} ${WRKSRC} -name \*.orig -delete
+DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
 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)
@@ -50,8 +51,9 @@ post-install:
 	${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}
+	    spamd/README* sql/spamassassin.sql ${DOCSDIR}
 .endif
 
+	@${SED} -e 's#PREFIX#/usr/local#' pkg-message
+
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-SpamAssassin/distinfo b/mail/p5-Mail-SpamAssassin/distinfo
index ea8bd4eeac74..30bb880b877a 100644
--- a/mail/p5-Mail-SpamAssassin/distinfo
+++ b/mail/p5-Mail-SpamAssassin/distinfo
@@ -1 +1 @@
-MD5 (Mail-SpamAssassin-2.44.tar.gz) = d4ecf16765c338cebf7554c6d0028a2f
+MD5 (Mail-SpamAssassin-2.50.tar.gz) = 23278812be23ad8e210275a5b95fa9f0
diff --git a/mail/p5-Mail-SpamAssassin/pkg-plist b/mail/p5-Mail-SpamAssassin/pkg-plist
index 238929419b27..e93d04a0b1d1 100644
--- a/mail/p5-Mail-SpamAssassin/pkg-plist
+++ b/mail/p5-Mail-SpamAssassin/pkg-plist
@@ -1,37 +1,52 @@
-bin/spamc
+bin/sa-learn
 bin/spamd
+bin/spamc
 bin/spamassassin
 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/MailingList.pm
 lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/HTML.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/ExposedMessage.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/PhraseFreqs.pm
 lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PersistentAddrList.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/TextCat.pm
 lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Dns.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Message.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/Changes
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README
 %%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
@@ -39,14 +54,19 @@ lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Locales.pm
 %%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
 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_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
@@ -54,16 +74,11 @@ 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/50_scores.cf
-share/spamassassin/languages
 share/spamassassin/60_whitelist.cf
 share/spamassassin/user_prefs.template
 share/spamassassin/triplets.txt
-@dirrm etc/mail/spamassassin
-@dirrm etc/mail
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin
-@dirrm %%PORTDOCS%%share/doc/p5-Mail-SpamAssassin
+share/spamassassin/languages
 @dirrm share/spamassassin