From 3a2e07f195a486a2fffbd735a1c730f40c0669e3 Mon Sep 17 00:00:00 2001
From: tnn <tnn>
Date: Fri, 11 Feb 2011 19:10:53 +0000
Subject: Add a small tweak to the rc script: Make an effort to pick up
 spamd_flags from the rc configuration when not running on
 NetBSD/DragonFlyBSD.

---
 mail/spamassassin/distinfo         |  3 ++-
 mail/spamassassin/patches/patch-aa | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 mail/spamassassin/patches/patch-aa

(limited to 'mail/spamassassin')

diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
index 2e1fa88e1cb..f2404434cf8 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.55 2010/10/06 21:27:30 pettai Exp $
+$NetBSD: distinfo,v 1.56 2011/02/11 19:10:53 tnn Exp $
 
 SHA1 (Mail-SpamAssassin-3.3.1.tar.gz) = 8b32a857cc89c8d057442400bc00f33fd703ce06
 RMD160 (Mail-SpamAssassin-3.3.1.tar.gz) = 154fb16de88b3cc9fac41f721af21b181a2368f3
@@ -12,6 +12,7 @@ Size (Mail-SpamAssassin-rules-3.3.1.r923114.tgz.asc) = 823 bytes
 SHA1 (Mail-SpamAssassin-rules-3.3.1.r923114.tgz.sha1) = 949b64216a6bb6833bd4f2ccab18b53719dda311
 RMD160 (Mail-SpamAssassin-rules-3.3.1.r923114.tgz.sha1) = 8b6c82596c158e5e010643a4d16a987dcc65244c
 Size (Mail-SpamAssassin-rules-3.3.1.r923114.tgz.sha1) = 84 bytes
+SHA1 (patch-aa) = 2715638de88d0a299a65919cbf0d573699307100
 SHA1 (patch-ab) = 84ebc0f611365c00205a85cb84970772a0931ef8
 SHA1 (patch-ae) = d46b1d8f56c8c61936c307f74b39a49da1b1f353
 SHA1 (patch-aq) = 3a273c7742275647c2334382fed29c0ea33dfbd8
diff --git a/mail/spamassassin/patches/patch-aa b/mail/spamassassin/patches/patch-aa
new file mode 100644
index 00000000000..ab1b45d4d1b
--- /dev/null
+++ b/mail/spamassassin/patches/patch-aa
@@ -0,0 +1,20 @@
+$NetBSD: patch-aa,v 1.8 2011/02/11 19:10:54 tnn Exp $
+
+Make an effort to pick up spamd_flags from the rc configuration when
+not running on NetBSD/DragonFlyBSD.
+
+--- spamd/netbsd-rc-script.sh.orig	2010-03-16 14:49:25.000000000 +0000
++++ spamd/netbsd-rc-script.sh
+@@ -118,6 +118,12 @@ if [ "${OPSYS}" = "NetBSD" -o "${OPSYS}"
+ 
+ else # not NetBSD or DragonFlyBSD
+ 
++	if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
++		load_rc_config $name
++	elif [ -f /etc/rc.conf ]; then
++		. /etc/rc.conf
++	fi
++
+ 	if [ -f ${pidfile} ];  then
+ 		the_spamd_pid=`head -1 ${pidfile}`
+ 	else
-- 
cgit v1.2.3