3 files changed, 25 insertions, 33 deletions

diff --git a/mail/dspam/files/UPDATING b/mail/dspam/files/UPDATING
index 5439f7d47259..8f3367787853 100644
--- a/mail/dspam/files/UPDATING
+++ b/mail/dspam/files/UPDATING
@@ -1,4 +1,5 @@
 # $FreeBSD$
+# $Tecnik: ports/mail/dspam/files/UPDATING,v 1.3 2006/02/01 02:15:42 itetcu Exp $
 #
 # for each PKGNAME or user option change an entry should be added in this file
 # each entry 
@@ -15,11 +16,24 @@ also the UPGRADING enclosed in the dspam distribution. You can see it by doing
 in the port directory:
 make extract;  more `find . -type f -maxdepth 2 -name UPGRADING`
 
+
+###########################################################################
+# dspam-3.6.3
+#
+
+To manny things to note here, please see mail-dspam-devel/UPDATING and read
+UPGRADING and CHANGELOG and adjust your dspam.conf accordingly
+- you can now have the database drivers dynamically loaded at run time so
+you can select multiple drivers in the OPTIONS screen; see dspam.conf.
+- also algorithm selection is done exclusively via dspam.conf
+- !!! WARNING !!! MaxMessageSize is also applied to ClamAV virus scanning
+
+
 ###########################################################################
-# dspam-3.4.8 (2005/11/17)
+# dspam-3.4.8 (2005-11-17)
 #
 
-fix RUN_DEPENDS for WITH_CGI=on by USE_APACHE=1.3+, nno need to upgrade if
+fix RUN_DEPENDS for WITH_CGI=on by USE_APACHE=1.3+, no need to upgrade if
 already installed
 
 
diff --git a/mail/dspam/files/dspam.sh.in b/mail/dspam/files/dspam.sh.in
index d8df243c0ac2..8ae583f12a41 100644
--- a/mail/dspam/files/dspam.sh.in
+++ b/mail/dspam/files/dspam.sh.in
@@ -1,10 +1,11 @@
 #!/bin/sh
 # $FreeBSD$
 # formerly $ FreeBSD: ports/mail/dspam/files/dspam,v 1.1 2005/05/05 21:03:37 pav Exp $
+# $Tecnik: ports/mail/dspam/files/dspam.sh.in,v 1.3 2006/02/01 02:15:42 itetcu Exp $
 #
 
 # PROVIDE: dspam
-# REQUIRE: LOGIN NETWORKING SERVERS %%MYSQL%%
+# REQUIRE: DAEMON %%MYSQL%% %%PGSQL%% %%CLAMD%%
 # BEFORE: mail
 # KEYWORD: shutdown
 
@@ -12,6 +13,7 @@
 # Add the following lines to /etc/rc.conf[.local] to enable dspam:
 #
 # dspam_enable="YES"
+# you can also set the pid file via dspam_pidfile
 #
 
 . %%RC_SUBR%%
@@ -19,9 +21,14 @@
 name=dspam
 rcvar=`set_rcvar`
 
+load_rc_config $name
+
+
+: ${dspam_enable="NO"}
+: ${dspam_pidfile:-/var/run/dspam.pid}
+
 command=%%PREFIX%%/bin/${name}
 command_args="--daemon  > /dev/null 2>&1 &"
-pidfile=/var/run/${name}.pid
 required_dirs=%%DSPAM_HOME%%
 required_files=%%PREFIX%%/etc/${name}.conf
 
@@ -32,10 +39,4 @@ reload()
  kill -HUP `cat $pidfile`
 }
 
-# set defaults
-
-dspam_enable=${dspam_enable:-"NO"}
-#dspam_flags=${dspam_flags:-"--daemon &"}
-
-load_rc_config $name
 run_rc_command "$1"
diff --git a/mail/dspam/files/patch-dspam.c b/mail/dspam/files/patch-dspam.c
deleted file mode 100644
index ca4842d5b20c..000000000000
--- a/mail/dspam/files/patch-dspam.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/dspam.c.dist	Sun Apr 10 15:49:29 2005
-+++ src/dspam.c	Sun Apr 10 15:52:48 2005
-@@ -2733,8 +2733,9 @@
-             LOG (LOG_CRIT, ERROR_MEM_ALLOC);
-         }
- 
--        if (CTX->result == DSR_ISSPAM && ATX->managed_group[0])
--        {
-+// FreeBSD port patch: put the user in all emails, extremely usefull for scripts
-+//        if (CTX->result == DSR_ISSPAM)
-+//        {
-           snprintf(data, sizeof(data), "X-DSPAM-User: %s", CTX->username);
-           head = _ds_create_header_field(data);
-           if (head != NULL)
-@@ -2746,7 +2747,7 @@
-           }
-           else
-             LOG (LOG_CRIT, ERROR_MEM_ALLOC);
--        }
-+//        } // end of FreeBSD port patch
- 
-         if (!strcmp(_ds_pref_val(PTX, "showFactors"), "on")) {
-