diff options
| -rw-r--r-- | mail/spamassassin/Makefile | 8 | ||||
| -rw-r--r-- | mail/spamassassin/PLIST | 7 | ||||
| -rw-r--r-- | mail/spamassassin/distinfo | 3 | ||||
| -rw-r--r-- | mail/spamassassin/patches/patch-af | 14 |
4 files changed, 26 insertions, 6 deletions
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index 5ee4de47f99..90cd5bd2ff2 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2002/10/08 00:49:18 heinz Exp $ +# $NetBSD: Makefile,v 1.10 2002/10/08 16:41:32 heinz Exp $ DISTNAME= Mail-SpamAssassin-2.42 PKGNAME= spamassassin-2.42 +PKGREVISION= 1 SVR4_PKGNAME= sa CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/} \ @@ -39,6 +40,9 @@ RULESDIR= ${PREFIX}/share/spamassassin CONF_FILES+= ${EGDIR}/local.cf ${PKG_SYSCONFDIR}/local.cf CONF_FILES+= ${PREFIX}/share/spamassassin/user_prefs.template\ ${PKG_SYSCONFDIR}/user_prefs.template +SUPPORT_FILES_PERMS+= ${EGDIR}/netbsd_lists.cf \ + ${PKG_SYSCONFDIR}/netbsd_lists.cf ${SHAREOWN} \ + ${SHAREGRP} ${SHAREMODE} .include "../../mk/bsd.prefs.mk" # the 'spamd' RCD_SCRIPT behaves differently if we run NetBSD 1.6 or later @@ -91,6 +95,7 @@ pre-install: done) ${INSTALL_DATA} ${WRKSRC}/procmailrc.example ${EGDIR}/procmailrc.example ${INSTALL_DATA} ${WRKSRC}/rules/local.cf ${EGDIR}/local.cf + ${INSTALL_DATA} ${FILESDIR}/netbsd_lists.cf ${EGDIR}/ .for f in check_whitelist speedtest translation_prep.pl @(cd ${WRKSRC}/tools/; \ ${SED} -e "1s,/usr/bin/perl,${PERL5}," \ @@ -104,7 +109,6 @@ pre-install: post-install: ${CHOWN} ${SHAREOWN} ${RULESDIR}/* ${CHGRP} ${SHAREGRP} ${RULESDIR}/* - ${INSTALL_DATA} ${FILESDIR}/netbsd_lists.cf ${PKG_SYSCONFDIR}/ .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.install.mk" diff --git a/mail/spamassassin/PLIST b/mail/spamassassin/PLIST index 1ba018d7991..e13fab0d046 100644 --- a/mail/spamassassin/PLIST +++ b/mail/spamassassin/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.7 2002/10/08 00:49:19 heinz Exp $ +@comment $NetBSD: PLIST,v 1.8 2002/10/08 16:41:32 heinz Exp $ @comment bin/spamassassin @comment bin/spamc @comment bin/spamd etc/rc.d/spamd @comment etc/spamassassin/local.cf -etc/spamassassin/netbsd_lists.cf +@comment etc/spamassassin/netbsd_lists.cf @comment etc/spamassassin/user_prefs.template share/doc/spamassassin/INSTALL share/doc/spamassassin/License @@ -41,6 +41,7 @@ share/doc/spamassassin/tools/check_whitelist share/doc/spamassassin/tools/speedtest share/doc/spamassassin/tools/translation_prep.pl share/examples/spamassassin/local.cf +share/examples/spamassassin/netbsd_lists.cf share/examples/spamassassin/procmailrc.example share/spamassassin/10_misc.cf share/spamassassin/20_anti_ratware.cf @@ -74,4 +75,4 @@ share/spamassassin/user_prefs.template @dirrm share/doc/spamassassin/masses @dirrm share/doc/spamassassin/html @dirrm share/doc/spamassassin -@dirrm etc/spamassassin +@comment @dirrm etc/spamassassin diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo index 64d28ecda6a..759a27bcb48 100644 --- a/mail/spamassassin/distinfo +++ b/mail/spamassassin/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2002/10/08 00:49:19 heinz Exp $ +$NetBSD: distinfo,v 1.7 2002/10/08 16:41:32 heinz Exp $ SHA1 (Mail-SpamAssassin-2.42.tar.gz) = 2a08e271c3496eaacf15a06369972d3395b9b70e Size (Mail-SpamAssassin-2.42.tar.gz) = 532504 bytes @@ -6,3 +6,4 @@ SHA1 (patch-ab) = 696c68944717aeac1046e2eddf6d3cff426ce58b SHA1 (patch-ac) = 229d234f56d113022f08d5b3250c4f12d6808636 SHA1 (patch-ad) = 3aea245cbe066f34004e019ea1bee5c3f62afad3 SHA1 (patch-ae) = 55f46734f460abb1611e0df07ca8a6091ab2eb43 +SHA1 (patch-af) = f6159bf019ae7af56c132e224c9dfd205f222145 diff --git a/mail/spamassassin/patches/patch-af b/mail/spamassassin/patches/patch-af new file mode 100644 index 00000000000..0ffe41ad85b --- /dev/null +++ b/mail/spamassassin/patches/patch-af @@ -0,0 +1,14 @@ +$NetBSD: patch-af,v 1.1 2002/10/08 16:41:33 heinz Exp $ + +--- lib/Mail/SpamAssassin/AutoWhitelist.pm.orig Thu Sep 26 13:13:25 2002 ++++ lib/Mail/SpamAssassin/AutoWhitelist.pm +@@ -100,7 +100,8 @@ + # 5 seems to allow folks who get (3,4,3,2,4,5,...) to dig + # themselves out, after 6 messages. + $self->{entry}->{count} ||= 0; +- $score = $score - ($self->{entry}->{count} * 5); ++ # pkgsrc: go back to 2.31 AWL behaviour (2.50 (maybe 2.43) will do that, too) ++ # $score = $score - ($self->{entry}->{count} * 5); + + $self->{checker}->add_score($self->{entry},$score); + } |