From b5b3227200d20c6f647de5113ec9c7294757181c Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme@pkgsrc.org>
Date: Wed, 12 Oct 2005 20:22:55 +0000
Subject: Apply patch from Jim Bernard:

* dspam can run too early in the boot process: add REQUIRE: servers.
* dspam=YES is always assumed in rc.conf: fixed by using checkyesno $rcvar.

This closes PR pkg/31571.
---
 mail/dspam/files/dspam.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'mail')

diff --git a/mail/dspam/files/dspam.sh b/mail/dspam/files/dspam.sh
index 2bc49028f19..7f911b65e06 100644
--- a/mail/dspam/files/dspam.sh
+++ b/mail/dspam/files/dspam.sh
@@ -1,9 +1,10 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dspam.sh,v 1.2 2005/04/26 15:43:26 jwise Exp $
+# $NetBSD: dspam.sh,v 1.3 2005/10/12 20:22:55 xtraeme Exp $
 #
 
 # PROVIDE: dspam
+# REQUIRE: SERVERS
 # BEFORE:  DAEMON
 
 if [ -f /etc/rc.subr ]; then
@@ -65,6 +66,6 @@ else
 		esac
 fi
 
-if [ "$1" != "stop" -o "$1" != "status" ]; then
+if checkyesno "${rcvar}" && [ "$1" != "stop" -o "$1" != "status" ]; then
 	echo $(check_process $command) > $pidfile
 fi
-- 
cgit v1.2.3