Changed the rc.d script to account for different behaviour of

load_rc_config in NetBSD 1.6. This resolves PR pkg/18928 by Frank Cusack
(fcusack at fcusack com).

The rc.d script is now called on 'shutdown'.

Included fixes from SA CVS repository (2002-10-21) to minimize
impact of Razor2 on the environment vector, especially PATH.

Bumped PKGREVISION.

5 files changed, 41 insertions, 11 deletions

diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 75715b7535a..73b681e1396 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2002/10/21 12:39:30 heinz Exp $
+# $NetBSD: Makefile,v 1.14 2002/11/06 21:51:26 heinz Exp $
 
 DISTNAME=	Mail-SpamAssassin-2.43
 PKGNAME=	spamassassin-2.43
-PKGREVISION=	# empty
+PKGREVISION=	1
 SVR4_PKGNAME=	sa
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Mail/}			\
diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
index 4039522cbe1..0d1ea602e15 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.8 2002/10/20 20:09:05 heinz Exp $
+$NetBSD: distinfo,v 1.9 2002/11/06 21:51:26 heinz Exp $
 
 SHA1 (Mail-SpamAssassin-2.43.tar.gz) = ffe0f4d80ab2367bb3df856ec777bafb6ac7616e
 Size (Mail-SpamAssassin-2.43.tar.gz) = 538505 bytes
 SHA1 (patch-ab) = df905aebb1e374a549808a5b925fbf9511dc3333
 SHA1 (patch-ac) = 229d234f56d113022f08d5b3250c4f12d6808636
-SHA1 (patch-ad) = 3aea245cbe066f34004e019ea1bee5c3f62afad3
+SHA1 (patch-ad) = 41a0130905fe000613a963acd7bb7cc8e743469c
 SHA1 (patch-ae) = 579b1705a3c56b822b5665b2c97c9989e2867e24
-SHA1 (patch-ag) = 1fab0e1a0cc6845f2928ef4983a961ae8f8186f6
-SHA1 (patch-ah) = aa91d70524284ba445e7535e808ce7c5b14d09bb
+SHA1 (patch-ag) = c712835745c8f435c5d7f19baed8bebcc657ccc6
+SHA1 (patch-ah) = e2db3d8c1c877be712f11b0eca674097821e6dcc
diff --git a/mail/spamassassin/patches/patch-ad b/mail/spamassassin/patches/patch-ad
index d6527076eed..bf597d76ecd 100644
--- a/mail/spamassassin/patches/patch-ad
+++ b/mail/spamassassin/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2002/10/20 20:09:05 heinz Exp $
+$NetBSD: patch-ad,v 1.3 2002/11/06 21:51:26 heinz Exp $
 
 --- spamd/netbsd-rc-script.sh.orig	Thu Sep 26 12:50:26 2002
 +++ spamd/netbsd-rc-script.sh
@@ -6,3 +6,17 @@ $NetBSD: patch-ad,v 1.2 2002/10/20 20:09:05 heinz Exp $
 -#! /bin/sh
 +#!@RCD_SCRIPTS_SHELL@
  #
+@@ -13,2 +13,3 @@
+ # BEFORE: mail
++# KEYWORD: shutdown
+ 
+@@ -34,6 +35,6 @@
+ # default values, may be overridden by setting them in /etc/rc.conf
+-spamd_flags="-H -c -a"
+-spamd=NO
++spamd_flags=${spamd_flags-"-H -c -a"}
++spamd=${spamd:-NO}
+ 
+-INTERPRETER_SUPPORT=@INTERPRETER_SUPPORT@
++INTERPRETER_SUPPORT=@INTERPRETER_SUPPORT@ # set during package build
+ 
diff --git a/mail/spamassassin/patches/patch-ag b/mail/spamassassin/patches/patch-ag
index 1e3bc350d12..25b9693d99c 100644
--- a/mail/spamassassin/patches/patch-ag
+++ b/mail/spamassassin/patches/patch-ag
@@ -1,8 +1,16 @@
-$NetBSD: patch-ag,v 1.1 2002/10/20 20:09:06 heinz Exp $
+$NetBSD: patch-ag,v 1.2 2002/11/06 21:51:27 heinz Exp $
 
 --- lib/Mail/SpamAssassin/Dns.pm.orig	Fri Oct  4 14:54:16 2002
 +++ lib/Mail/SpamAssassin/Dns.pm
-@@ -389,6 +389,12 @@
+@@ -365,6 +365,7 @@
+ 
+     eval {
+       local ($^W) = 0;    # argh, warnings in Razor
++      local %ENV;
+ 
+       require Razor2::Client::Agent;
+ 
+@@ -389,6 +390,12 @@
          my $objects = $rc->prepare_objects( \@msg )
            or die "error in prepare_objects";
          $rc->get_server_info() or die $rc->errprefix("checkit");
diff --git a/mail/spamassassin/patches/patch-ah b/mail/spamassassin/patches/patch-ah
index f70ecddc3a0..f2ae07cda71 100644
--- a/mail/spamassassin/patches/patch-ah
+++ b/mail/spamassassin/patches/patch-ah
@@ -1,8 +1,16 @@
-$NetBSD: patch-ah,v 1.1 2002/10/20 20:09:06 heinz Exp $
+$NetBSD: patch-ah,v 1.2 2002/11/06 21:51:27 heinz Exp $
 
 --- lib/Mail/SpamAssassin/Reporter.pm.orig	Mon Oct 14 18:44:35 2002
 +++ lib/Mail/SpamAssassin/Reporter.pm
-@@ -151,6 +151,12 @@
+@@ -126,6 +126,7 @@
+   if ( !$@ ) {
+     eval {
+       local ($^W) = 0;    # argh, warnings in Razor
++      local %ENV;
+ 
+       local $SIG{ALRM} = sub { die "alarm\n" };
+       alarm $timeout;
+@@ -151,6 +152,12 @@
          my $objects = $rc->prepare_objects( \@msg )
            or adie ("error in prepare_objects");
          $rc->get_server_info() or adie $rc->errprefix("reportit");