aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/p5-Mail-SpamAssassin/Makefile5
-rw-r--r--mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::Locales.pm11
-rw-r--r--mail/p5-Mail-SpamAssassin/files/patch-rules-20_head_tests.cf11
3 files changed, 26 insertions, 1 deletions
diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index a04060d8f9ba..ffa684b965f0 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Mail-SpamAssassin
PORTVERSION= 2.01
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Mail
@@ -27,6 +27,9 @@ MAN3= Mail::SpamAssassin.3 Mail::SpamAssassin::PerMsgStatus.3 \
MAN1PREFIX= ${PREFIX}
MAN1= spamd.1 spamassassin.1 spamc.1
+post-patch:
+ @find ${WRKSRC} -type f -name "*.orig" -exec rm -f "{}" ";"
+
.if !defined(NOPORTDOCS)
post-install:
${MKDIR} ${DOCSDIR}
diff --git a/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::Locales.pm b/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::Locales.pm
new file mode 100644
index 000000000000..34ed60bf65f3
--- /dev/null
+++ b/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::Locales.pm
@@ -0,0 +1,11 @@
+--- lib/Mail/SpamAssassin/Locales.pm.bak Tue Jan 22 04:27:46 2002
++++ lib/Mail/SpamAssassin/Locales.pm Tue Feb 26 12:58:16 2002
+@@ -62,7 +62,7 @@
+ $locale =~ s/^([a-z][a-z]).*$/$1/; # zh_TW... => zh
+
+ my $ok_for_loc = $charsets_for_locale{$locale};
+- return 0 if (!defined $ok_for_loc);
++ next if (!defined $ok_for_loc);
+
+ if ($ok_for_loc =~ /(?:^| )\Q${cs}\E(?:$| )/) {
+ return 1;
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
new file mode 100644
index 000000000000..211360ea7abe
--- /dev/null
+++ b/mail/p5-Mail-SpamAssassin/files/patch-rules-20_head_tests.cf
@@ -0,0 +1,11 @@
+--- rules/20_head_tests.cf.bak Fri Jan 25 07:36:02 2002
++++ rules/20_head_tests.cf Tue Feb 26 13:01:16 2002
+@@ -44,7 +44,7 @@
+ header TO_INVESTORS To =~ /\bInvestors\@/
+ describe TO_INVESTORS To: non-existent 'Investors' address
+
+-header SUBJ_ALL_CAPS Subject =~ /^[A-Z0-9\W]{6,}[^a-z]+$/
++header SUBJ_ALL_CAPS Subject =~ /^[A-Z0-9]{6,}[^a-z]+$/
+ describe SUBJ_ALL_CAPS Subject is all capitals
+
+ # (allow this test to pass if there's no Message-Id header)