summaryrefslogtreecommitdiff
path: root/mail/spamassassin
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2014-10-12 15:18:21 +0000
committertron <tron@pkgsrc.org>2014-10-12 15:18:21 +0000
commita63eb48c9c2b870b183963e36be5585219abec07 (patch)
tree374b2e5f986e0b2f6cb01edebb2e226d710e645e /mail/spamassassin
parent01ab2c746b79672e5c5ee0733c9af55040679db9 (diff)
downloadpkgsrc-a63eb48c9c2b870b183963e36be5585219abec07.tar.gz
Re-enable SPF support. The reason for disabling are no longer valid since
several years. Bump package revision because of this change. Suggested by Petar Bogdanovic in PR pkg/49271.
Diffstat (limited to 'mail/spamassassin')
-rw-r--r--mail/spamassassin/Makefile7
-rw-r--r--mail/spamassassin/patches/patch-ay18
2 files changed, 4 insertions, 21 deletions
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index dda3d0c7759..5b739929659 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.117 2014/10/09 14:06:40 wiz Exp $
+# $NetBSD: Makefile,v 1.118 2014/10/12 15:18:21 tron Exp $
DISTNAME= Mail-SpamAssassin-3.4.0
PKGNAME= spamassassin-3.4.0
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= mail perl5
MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@@ -32,9 +32,10 @@ DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
DEPENDS+= p5-HTML-Parser>=3.43:../../www/p5-HTML-Parser
DEPENDS+= {perl>=5.9.3,p5-IO-Compress-[0-9]*}:../../devel/p5-IO-Compress # Compress::Zlib>=0
DEPENDS+= {perl>=5.9.3,p5-IO-Zlib>=1.04}:../../devel/p5-IO-Zlib
+DEPENDS+= p5-Mail-SPF-[0-9]*:../../mail/p5-Mail-SPF
+DEPENDS+= {p5-MIME-Base64>=2.11,perl>=5.8.0}:../../converters/p5-MIME-Base64
DEPENDS+= p5-NetAddr-IP>=4.007:../../net/p5-NetAddr-IP
DEPENDS+= p5-Net-DNS>=0.58:../../net/p5-Net-DNS
-DEPENDS+= {p5-MIME-Base64>=2.11,perl>=5.8.0}:../../converters/p5-MIME-Base64
DEPENDS+= {perl>=5.7.3,p5-Time-HiRes-[0-9]*}:../../time/p5-Time-HiRes
DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww
DEPENDS+= re2c>=0.13.6:../../devel/re2c
diff --git a/mail/spamassassin/patches/patch-ay b/mail/spamassassin/patches/patch-ay
deleted file mode 100644
index af32c72d122..00000000000
--- a/mail/spamassassin/patches/patch-ay
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ay,v 1.2 2008/06/22 22:41:01 heinz Exp $
-
- Change default behaviour of SpamAssassin for pkgsrc in order to shut up
- unwanted warnings in the log files.
- If the users want to use SPF, they can enable the plugin.
-
---- rules/init.pre.orig 2006-03-10 20:30:02.000000000 +0100
-+++ rules/init.pre
-@@ -25,5 +25,8 @@ loadplugin Mail::SpamAssassin::Plugin::H
-
- # SPF - perform SPF verification.
- #
--loadplugin Mail::SpamAssassin::Plugin::SPF
-+# By default SPF is _not_ a prerequisite for SpamAssassin so we disable it
-+# in pkgsrc to avoid confusing warnings in the log file.
-+# If you use SPF, just reenable it.
-+#loadplugin Mail::SpamAssassin::Plugin::SPF
-