5 files changed, 99 insertions, 10 deletions
diff --git a/mail/spamassassin/patches/patch-aa b/mail/spamassassin/patches/patch-aa
deleted file mode 100644
index 5e616c5479f..00000000000
--- a/mail/spamassassin/patches/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2002/08/26 16:01:33 hubertf Exp $
-
---- rules/local.cf.orig	Wed Dec 19 06:20:44 2001
-+++ rules/local.cf
-@@ -1,3 +1,3 @@
--# Add your own customisations to this file.  See 'man Mail::SpamAssassin::Conf'
--# for details of what can be tweaked.
-+# Add your own customisations to this file.  See
-+# 'perldoc Mail::SpamAssassin::Conf' for details of what can be tweaked.
- # 
diff --git a/mail/spamassassin/patches/patch-ab b/mail/spamassassin/patches/patch-ab
new file mode 100644
index 00000000000..1886f5f76a2
--- /dev/null
+++ b/mail/spamassassin/patches/patch-ab
@@ -0,0 +1,49 @@
+$NetBSD: patch-ab,v 1.1 2002/10/08 00:49:22 heinz Exp $
+
+--- Makefile.PL.orig	Fri Oct  4 14:54:10 2002
++++ Makefile.PL
+@@ -110,7 +110,7 @@
+ #. q#
+ 
+ DEF_RULES_DIR	= $(PREFIX)/share/spamassassin
+-LOCAL_RULES_DIR	= $(SYSCONFDIR)/mail/spamassassin
++LOCAL_RULES_DIR	= $(SYSCONFDIR)
+ 
+ FIXVARS		= -Mvars \
+ 		  -DVERSION="$(VERSION)" \
+@@ -119,7 +119,7 @@
+ 		  -DLOCAL_RULES_DIR="$(LOCAL_RULES_DIR)" \
+ 		  -DINSTALLSITELIB="$(INSTALLSITELIB)"
+ 
+-pm_to_blib: spamassassin doc/.made
++pm_to_blib: spamassassin
+ 
+ spamassassin: spamassassin.raw
+ 	$(PERL) build/preprocessor $(FIXVARS) -Msharpbang <$? >$@
+@@ -138,7 +138,7 @@
+ binaries.mk: configure
+ 	./configure
+ 
+-inst_cfs: $(DEF_RULES_DIR) $(LOCAL_RULES_DIR) $(LOCAL_RULES_DIR)/local.cf
++inst_cfs: $(DEF_RULES_DIR) $(LOCAL_RULES_DIR)
+ 	$(RM_F) $(DEF_RULES_DIR)/*; \
+ 	for file in $(RULES) ; do \
+ 	  $(PERL) build/preprocessor $(FIXVARS) <rules/$$file >$(DEF_RULES_DIR)/$$file; \
+@@ -146,13 +146,14 @@
+ 	$(CHMOD) $(PERM_RW) $(DEF_RULES_DIR)/*
+ 
+ $(DEF_RULES_DIR):
+-	$(MKPATH) $@
++	$(BSD_INSTALL_DATA_DIR) $@
+ 
+ $(LOCAL_RULES_DIR):
+-	$(MKPATH) $@
++	$(BSD_INSTALL_DATA_DIR) $@
+ 
+ $(LOCAL_RULES_DIR)/local.cf: rules/local.cf
+-	test -f $@ || \
++	\# manage local.cf through pkgsrc .mk files
++	\# test -f $@ || \
+ 	  $(CP) rules/local.cf $@
+ 
+ text_html_doc: doc/.made
diff --git a/mail/spamassassin/patches/patch-ac b/mail/spamassassin/patches/patch-ac
new file mode 100644
index 00000000000..9cb39e8d583
--- /dev/null
+++ b/mail/spamassassin/patches/patch-ac
@@ -0,0 +1,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
+ 
diff --git a/mail/spamassassin/patches/patch-ad b/mail/spamassassin/patches/patch-ad
new file mode 100644
index 00000000000..61645ca3f91
--- /dev/null
+++ b/mail/spamassassin/patches/patch-ad
@@ -0,0 +1,8 @@
+$NetBSD: patch-ad,v 1.1 2002/10/08 00:49:22 heinz Exp $
+
+--- spamd/netbsd-rc-script.sh.orig	Thu Sep 26 12:50:26 2002
++++ spamd/netbsd-rc-script.sh
+@@ -1,2 +1,2 @@
+-#! /bin/sh
++#!@RCD_SCRIPTS_SHELL@
+ #
diff --git a/mail/spamassassin/patches/patch-ae b/mail/spamassassin/patches/patch-ae
new file mode 100644
index 00000000000..3186a99a709
--- /dev/null
+++ b/mail/spamassassin/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 2002/10/08 00:49:23 heinz Exp $
+
+--- spamd/spamd.raw.orig	Fri Oct  4 14:54:27 2002
++++ spamd/spamd.raw
+@@ -834,7 +834,8 @@
+ use POSIX 'setsid';
+ sub daemonize
+ {
+-    $0 = join(' ', $0, @ARGV) unless($opt{'debug'}); # pretty command line in ps
++    # no pretty 'ps' command line (easier for NetBSD rc script)
++    # $0 = join(' ', $0, @ARGV) unless($opt{'debug'}); # pretty command line in ps
+     chdir '/' or die "Can't chdir to '/': $!";
+     $SIG{__WARN__} = sub { logmsg($_[0]); };
+     open STDIN,'/dev/null' or die "Can't read '/dev/null': $!";