3 files changed, 40 insertions, 41 deletions

diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index 7c89b06bb330..852afee7a184 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	Mail-SpamAssassin
-PORTVERSION=	2.31
-PORTREVISION=	2
+PORTVERSION=	2.41
+PORTREVISION=	0
 CATEGORIES=	mail perl5
 MASTER_SITES=	http://spamassassin.org/released/ \
 		${MASTER_SITE_PERL_CPAN}
@@ -30,15 +30,14 @@ PERL_CONFIGURE=	yes
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Mail::SpamAssassin.3 Mail::SpamAssassin::PerMsgStatus.3 \
 		Mail::SpamAssassin::Conf.3 \
-		Mail::SpamAssassin::PersistentAddrList.3 \
-		Mail::SpamAssassin::SMTP::SmartHost.3
+		Mail::SpamAssassin::PersistentAddrList.3
 MAN1PREFIX=	${PREFIX}
-MAN1=		spamd.1 spamassassin.1 spamc.1 spamproxyd.1
+MAN1=		spamd.1 spamassassin.1 spamc.1
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples//${PKGNAMEPREFIX}${PORTNAME}
 
 post-patch:
-	@${FIND} ${WRKSRC} -name \*.orig -exec ${RM} {} \;
+	@${FIND} ${WRKSRC} -name \*.orig -delete
 
 post-install:
 	@strip ${PREFIX}/bin/spamc
@@ -47,10 +46,9 @@ post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/sql/README ${DOCSDIR}/README.sql
-	${INSTALL_DATA} ${WRKSRC}/spamproxy/README ${DOCSDIR}/README.spamproxy
 	cd ${WRKSRC} ; ${INSTALL_DATA} \
-	    Changes README TODO TRADEMARK procmailrc.example sample* \
-	    spamd/README* spamproxy/README.SmartHost sql/spamassassin.sql \
+	    BUGS COPYRIGHT Changes README TRADEMARK procmailrc.example sample* \
+	    spamd/README* sql/spamassassin.sql \
 	    ${DOCSDIR}
 .endif
 
diff --git a/mail/p5-Mail-SpamAssassin/distinfo b/mail/p5-Mail-SpamAssassin/distinfo
index 5987254e2793..0f95c99ef167 100644
--- a/mail/p5-Mail-SpamAssassin/distinfo
+++ b/mail/p5-Mail-SpamAssassin/distinfo
@@ -1 +1 @@
-MD5 (Mail-SpamAssassin-2.31.tar.gz) = a9878b4ea035964c04c4899ee154e222
+MD5 (Mail-SpamAssassin-2.41.tar.gz) = e96b278beecb4b549a79b1497bd354e3
diff --git a/mail/p5-Mail-SpamAssassin/pkg-plist b/mail/p5-Mail-SpamAssassin/pkg-plist
index a6a54b44c355..52326b63f90c 100644
--- a/mail/p5-Mail-SpamAssassin/pkg-plist
+++ b/mail/p5-Mail-SpamAssassin/pkg-plist
@@ -1,46 +1,54 @@
-bin/spamassassin
 bin/spamc
 bin/spamd
-bin/spamproxyd
+bin/spamassassin
 etc/rc.d/spamd.sh-dist
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/AuditMessage.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/AutoWhitelist.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/ConfSourceSQL.pm
 lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/DBBasedAddrList.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Dns.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/EncappedMessage.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/EvalTests.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/Locales.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Message.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/EncappedMIME.pm
 lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/NoMailAudit.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PerMsgStatus.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PersistentAddrList.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/Replier.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Reporter.pm
-lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/SMTP/SmartHost.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%%/auto/Mail/SpamAssassin/SMTP/SmartHost/autosplit.ix
+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/EncappedMessage.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/EvalTests.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Locales.pm
+lib/perl5/%%PERL_VER%%/man/man3/Mail::SpamAssassin::Conf.3.gz
+lib/perl5/%%PERL_VER%%/man/man3/Mail::SpamAssassin.3.gz
+lib/perl5/%%PERL_VER%%/man/man3/Mail::SpamAssassin::PerMsgStatus.3.gz
+lib/perl5/%%PERL_VER%%/man/man3/Mail::SpamAssassin::PersistentAddrList.3.gz
+%%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/README.SmartHost
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.spamd
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.spamd-vpopmail
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.spamproxy
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.sql
-%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/TODO
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/BUGS
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/COPYRIGHT
 %%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
 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_meta_tests.cf
+share/spamassassin/20_ratware.cf
 share/spamassassin/20_uri_tests.cf
 share/spamassassin/25_body_tests_es.cf
 share/spamassassin/25_body_tests_pl.cf
@@ -52,18 +60,11 @@ share/spamassassin/30_text_fr.cf
 share/spamassassin/30_text_pl.cf
 share/spamassassin/40_spam_phrases.cf
 share/spamassassin/50_scores.cf
-share/spamassassin/60_whitelist.cf
 share/spamassassin/languages
-share/spamassassin/triplets.txt
+share/spamassassin/60_whitelist.cf
 share/spamassassin/user_prefs.template
-%%PORTDOCS%%@dirrm share/doc/p5-Mail-SpamAssassin
+share/spamassassin/triplets.txt
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/SMTP
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/SpamAssassin/SMTP/SmartHost
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/SpamAssassin/SMTP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/Mail/SpamAssassin
+@dirrm %%PORTDOCS%%share/doc/p5-Mail-SpamAssassin
 @dirrm share/spamassassin
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Mail 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/auto/Mail 2>/dev/null || true