summaryrefslogtreecommitdiff
path: root/mail/spamassassin/patches/patch-ac
blob: 9cb39e8d583f306d8e83b42161a2941e4cdfac2a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
$NetBSD: patch-ac,v 1.1 2002/10/08 00:49:22 heinz Exp $

--- spamassassin.raw.orig	Fri Oct  4 14:54:12 2002
+++ spamassassin.raw
@@ -493,11 +493,11 @@
 configuration files.
 
 By default, configuration data is loaded from the first existing directory in:
-F</usr/local/share/spamassassin>;F</usr/share/spamassassin>;F<./rules>;F<../rules>
+F<./rules>;F<../rules>;F<@@DEF_RULES_DIR@@>;F<@@PREFIX@@/share/spamassassin>;F</usr/local/share/spamassassin>;F</usr/share/spamassassin>.
 
 The configuration data in the first existing directory in:
-F</usr/local/etc/spamassassin>;F</usr/pkg/etc/spamassassin>;F</usr/etc/spamassassin>;F</etc/mail/spamassassin>;F</etc/spamassassin>
-are used to override any values which had already been set
+F<@@LOCAL_RULES_DIR@@>;F<@@PREFIX@@/etc/mail/spamassassin>;F</@@PREFIX@@/etc/spamassassin>;F</usr/local/etc/spamassassin>;F</usr/pkg/etc/spamassassin>;F</usr/etc/spamassassin>;F</etc/mail/spamassassin>;F</etc/spamassassin>
+are used to override any values which had already been set.
 
 Spamassassin will read *.cf in these directories, in alphanumeric order within each directory
 (similar to SysV-style startup scripts).  In other words, it will read F<10_misc.cf> before F<50_scores.cf> and F<20_body_tests.cf> before F<20_head_test.cf>.  Options in later files will override earlier files.
@@ -506,7 +506,7 @@
 the file specified in the B<-p> argument.  If this is not specified,
 F<~/.spamassassin/user_prefs> is used if it exists.  C<spamassassin> will create this
 file if it does not exist, using F<user_prefs.template> as a template.  This file will be looked for in 
-F</etc/spamassassin/user_prefs.template>;F</usr/local/share/spamassassin/user_prefs.template>;F</usr/share/spamassassin/user_prefs.template>
+F<@@LOCAL_RULES_DIR@@>;F<@@PREFIX@@/etc/mail/spamassassin>;F<@@PREFIX@@/share/spamassassin>;F</etc/spamassassin>;F</etc/mail/spamassassin>;F</usr/local/share/spamassassin>;F</usr/share/spamassassin>
 
 =head1 TAGGING