diff options
Diffstat (limited to 'mail')
8 files changed, 16 insertions, 75 deletions
diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile index f39c34b9986..09691df8738 100644 --- a/mail/p5-Mail-SpamAssassin/Makefile +++ b/mail/p5-Mail-SpamAssassin/Makefile @@ -6,8 +6,7 @@ # PORTNAME= Mail-SpamAssassin -PORTVERSION= 2.11 -PORTREVISION= 2 +PORTVERSION= 2.20 CATEGORIES= mail perl5 MASTER_SITES= http://spamassassin.org/released/ \ ${MASTER_SITE_PERL_CPAN} diff --git a/mail/p5-Mail-SpamAssassin/distinfo b/mail/p5-Mail-SpamAssassin/distinfo index 89c446dfb6c..dfd9e1b9840 100644 --- a/mail/p5-Mail-SpamAssassin/distinfo +++ b/mail/p5-Mail-SpamAssassin/distinfo @@ -1 +1 @@ -MD5 (Mail-SpamAssassin-2.11.tar.gz) = 1d8d5413d3bd8655a1d9ef70d7b6e332 +MD5 (Mail-SpamAssassin-2.20.tar.gz) = 6d1ce17ca848c3528e14f588873d1164 diff --git a/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::Dns.pm b/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::Dns.pm deleted file mode 100644 index 8e4349dc10f..00000000000 --- a/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::Dns.pm +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/Mail/SpamAssassin/Dns.pm.bak Wed Jan 9 00:18:48 2002 -+++ lib/Mail/SpamAssassin/Dns.pm Mon Mar 4 19:49:15 2002 -@@ -176,7 +176,6 @@ - require Razor::Client; - require Razor::Agent; - local ($^W) = 0; # argh, warnings in Razor -- local ($/); # argh, bugs in Razor - - local $SIG{ALRM} = sub { die "alarm\n" }; - alarm 10; diff --git a/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::EvalTests.pm b/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::EvalTests.pm deleted file mode 100644 index 137fa896710..00000000000 --- a/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::EvalTests.pm +++ /dev/null @@ -1,21 +0,0 @@ ---- lib/Mail/SpamAssassin/EvalTests.pm.orig Fri Jan 25 07:36:02 2002 -+++ lib/Mail/SpamAssassin/EvalTests.pm Sun Mar 3 13:02:37 2002 -@@ -688,10 +688,17 @@ - - sub check_for_faraway_charset_in_headers { - my ($self) = @_; -+ my $hdr; - - my @locales = $self->get_my_locales(); - for my $h (qw(From Subject)) { -- my $hdr = $self->get($h); -+# Can't use just get() because it un-mime header and strip charset part -+ my @hdrs = $self->{msg}->get_header ($h); -+ if ($#hdrs >= 0) { -+ $hdr = join (" ", @hdrs); -+ } else { -+ $hdr = ''; -+ } - while ($hdr =~ /=\?(.+?)\?.\?.*?\?=/g) { - Mail::SpamAssassin::Locales::is_charset_ok_for_locales($1, @locales) - or return 1; diff --git a/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::PerMsgStatus.pm b/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::PerMsgStatus.pm deleted file mode 100644 index 362d23a9175..00000000000 --- a/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::PerMsgStatus.pm +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/Mail/SpamAssassin/PerMsgStatus.pm.bak Thu Jan 24 05:39:15 2002 -+++ lib/Mail/SpamAssassin/PerMsgStatus.pm Tue Feb 26 19:08:32 2002 -@@ -788,6 +788,8 @@ - if ($encoding =~ /^US-ASCII$/i - || $encoding =~ /^ISO-8859-\d+$/i - || $encoding =~ /^UTF-8$/i -+ || $encoding =~ /^KOI8-\w$/i -+ || $encoding =~ /^WINDOWS-125\d$/i - ) - { - # keep 8-bit stuff. forget mapping charsets though diff --git a/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::Reporter.pm b/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::Reporter.pm deleted file mode 100644 index c81d3a1bed0..00000000000 --- a/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::Reporter.pm +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/Mail/SpamAssassin/Reporter.pm.bak Wed Jan 9 00:18:48 2002 -+++ lib/Mail/SpamAssassin/Reporter.pm Mon Mar 4 19:52:11 2002 -@@ -93,7 +93,6 @@ - require Razor::Client; - require Razor::Agent; - local ($^W) = 0; # argh, warnings in Razor -- local ($/); # argh, bugs in Razor - - local $SIG{ALRM} = sub { die "alarm\n" }; - alarm 10; diff --git a/mail/p5-Mail-SpamAssassin/files/patch-rules-20_head_tests.cf b/mail/p5-Mail-SpamAssassin/files/patch-rules-20_head_tests.cf deleted file mode 100644 index 334cc498189..00000000000 --- a/mail/p5-Mail-SpamAssassin/files/patch-rules-20_head_tests.cf +++ /dev/null @@ -1,11 +0,0 @@ ---- rules/20_head_tests.cf.orig Fri Mar 1 22:23:04 2002 -+++ rules/20_head_tests.cf Mon Mar 4 12:29:57 2002 -@@ -47,7 +47,7 @@ - header TO_INVESTORS To =~ /\bInvestors\@/ - describe TO_INVESTORS To: non-existent 'Investors' address - --header SUBJ_ALL_CAPS Subject =~ /^[^a-z]*$/ -+header SUBJ_ALL_CAPS Subject =~ /^[^a-z]*([A-Z][^a-z]*){3,}[^a-z]*$/ - describe SUBJ_ALL_CAPS Subject is all capitals - - # (allow this test to pass if there's no Message-Id header) diff --git a/mail/p5-Mail-SpamAssassin/pkg-plist b/mail/p5-Mail-SpamAssassin/pkg-plist index 2b188a36892..a8e24fee1c2 100644 --- a/mail/p5-Mail-SpamAssassin/pkg-plist +++ b/mail/p5-Mail-SpamAssassin/pkg-plist @@ -29,15 +29,20 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin/.packlist %%PORTDOCS%%share/doc/Mail-SpamAssassin/README.spamd %%PORTDOCS%%share/doc/Mail-SpamAssassin/README.spamproxy %%PORTDOCS%%share/doc/Mail-SpamAssassin/README.sql -%%PORTDOCS%%share/spamassassin/10_misc.cf -%%PORTDOCS%%share/spamassassin/20_body_tests.cf -%%PORTDOCS%%share/spamassassin/20_head_tests.cf -%%PORTDOCS%%share/spamassassin/30_text_es.cf -%%PORTDOCS%%share/spamassassin/40_spam_phrases.cf -%%PORTDOCS%%share/spamassassin/50_scores.cf -%%PORTDOCS%%share/spamassassin/60_whitelist.cf -%%PORTDOCS%%share/spamassassin/user_prefs.template -%%PORTDOCS%%@dirrm share/spamassassin +share/spamassassin/10_misc.cf +share/spamassassin/20_body_tests.cf +share/spamassassin/20_head_tests.cf +share/spamassassin/20_uri_tests.cf +share/spamassassin/25_body_tests_es.cf +share/spamassassin/25_body_tests_pl.cf +share/spamassassin/25_head_tests_pl.cf +share/spamassassin/30_text_es.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/user_prefs.template +@dirrm share/spamassassin %%PORTDOCS%%@dirrm share/doc/Mail-SpamAssassin @dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/SMTP @dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin |