6 files changed, 17 insertions, 11 deletions

diff --git a/security/amavisd-new/files/amavis-milter.sh.tmpl b/security/amavisd-new/files/amavis-milter.sh.in
index 73bd248ce0ea..180d515b2d9a 100644
--- a/security/amavisd-new/files/amavis-milter.sh.tmpl
+++ b/security/amavisd-new/files/amavis-milter.sh.in
@@ -5,7 +5,7 @@
 
 # PROVIDE: amavis_milter
 # REQUIRE: amavisd
-# BEFORE: amavisd
+# BEFORE: mail
 # KEYWORD: FreeBSD shutdown
 
 #
@@ -20,15 +20,13 @@ name=amavis_milter
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/sbin/amavis-milter
-
-amavis_milter_user=%%AMAVISUSER%%
-
 required_files=%%PREFIX%%/etc/amavisd.conf
 
 # set defaults
 
 amavis_milter_enable=${amavis_milter_enable:-"NO"}
 amavis_milter_flags=${amavis_milter_flags:-"-D -p %%AMAVISDIR%%/amavis-milter.sock"}
+amavis_milter_user=${amavis_milter_user:-"%%AMAVISUSER%%"}
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/security/amavisd-new/files/amavisd.sh.tmpl b/security/amavisd-new/files/amavisd.sh.in
index 58b1a49c5709..3f0da9c2472e 100644
--- a/security/amavisd-new/files/amavisd.sh.tmpl
+++ b/security/amavisd-new/files/amavisd.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/security/amavisd-new/files/Attic/amavisd.sh.tmpl,v 1.7 2004-07-18 10:05:50 vanilla Exp $
+# $FreeBSD$
 #
 
 # PROVIDE: amavisd
@@ -20,9 +20,6 @@ name=amavisd
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/sbin/amavisd > /dev/null 2>&1
-
-amavisd_flags="-u %%AMAVISUSER%%"
-
 pidfile=%%AMAVISDIR%%/amavisd.pid
 required_files=%%PREFIX%%/etc/amavisd.conf
 
@@ -36,7 +33,7 @@ stop_postcmd()
 # set defaults
 
 amavisd_enable=${amavisd_enable:-"NO"}
-amavisd_flags=${amavisd_flags:-""}
+amavisd_flags=${amavisd_flags:-"-u %%AMAVISUSER%%"}
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/security/amavisd-new/files/patch-amavisd-agent b/security/amavisd-new/files/patch-amavisd-agent
new file mode 100644
index 000000000000..c73160b1af3d
--- /dev/null
+++ b/security/amavisd-new/files/patch-amavisd-agent
@@ -0,0 +1,11 @@
+--- amavisd-agent.orig	Sun Jun 19 18:26:43 2005
++++ amavisd-agent	Sun Jun 19 18:28:04 2005
+@@ -107,7 +107,7 @@
+ # main program starts here
+   $SIG{INT} = sub { die "\n" };  # do the END code block
+   my($env) = BerkeleyDB::Env->new(
+-    '-Home'=>'/var/amavis/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL);
++    '-Home'=>'%%AMAVISDIR%%/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL);
+   defined $env or die "BDB no env: $BerkeleyDB::Error $!";
+   my($db) = BerkeleyDB::Hash->new(
+     '-Filename'=>'snmp.db', '-Flags'=>DB_RDONLY, '-Env'=>$env );
diff --git a/security/amavisd-new/files/DEINSTALL.tmpl b/security/amavisd-new/files/pkg-deinstall.in
index 7f0bf9ea0cc2..8c3c4d8fde4b 100644
--- a/security/amavisd-new/files/DEINSTALL.tmpl
+++ b/security/amavisd-new/files/pkg-deinstall.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$FreeBSD: /tmp/pcvs/ports/security/amavisd-new/files/Attic/DEINSTALL.tmpl,v 1.3 2003-04-20 10:02:44 leeym Exp $
+# $FreeBSD$
 #
 
 USER=%%AMAVISUSER%%
diff --git a/security/amavisd-new/files/INSTALL.tmpl b/security/amavisd-new/files/pkg-install.in
index 276fc401077f..fedfae9bd4a4 100644
--- a/security/amavisd-new/files/INSTALL.tmpl
+++ b/security/amavisd-new/files/pkg-install.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$FreeBSD: /tmp/pcvs/ports/security/amavisd-new/files/Attic/INSTALL.tmpl,v 1.6 2005-02-14 03:51:45 leeym Exp $
+# $FreeBSD$
 #
 
 USER=%%AMAVISUSER%%
diff --git a/security/amavisd-new/files/MESSAGE.tmpl b/security/amavisd-new/files/pkg-message.in
index 8900f7083713..8900f7083713 100644
--- a/security/amavisd-new/files/MESSAGE.tmpl
+++ b/security/amavisd-new/files/pkg-message.in