3 files changed, 11 insertions, 9 deletions

diff --git a/security/clamav-devel/files/clamav-clamd.in b/security/clamav-devel/files/clamav-clamd.in
index 657c2619398a..d6302f77d397 100644
--- a/security/clamav-devel/files/clamav-clamd.in
+++ b/security/clamav-devel/files/clamav-clamd.in
@@ -22,7 +22,6 @@ name=clamav_clamd
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/sbin/clamd
-pidfile=%%RUNDIR%%/clamd.pid
 required_dirs=%%DBDIR%%
 required_files=%%PREFIX%%/etc/clamd.conf
 
diff --git a/security/clamav-devel/files/clamav-milter.in b/security/clamav-devel/files/clamav-milter.in
index cb467c53f333..53450d44903e 100644
--- a/security/clamav-devel/files/clamav-milter.in
+++ b/security/clamav-devel/files/clamav-milter.in
@@ -21,10 +21,10 @@
 name=clamav_milter
 rcvar=`set_rcvar`
 
+conf_file=%%PREFIX%%/etc/clamav-milter.conf
 command=%%PREFIX%%/sbin/clamav-milter
-pidfile=%%RUNDIR%%/clamav-milter.pid
 required_dirs=%%DBDIR%%
-required_files=%%PREFIX%%/etc/clamd.conf
+required_files=${conf_file}
 
 start_precmd=start_precmd
 start_postcmd=start_postcmd
@@ -35,7 +35,7 @@ start_precmd()
 		warn "Stale socket $clamav_milter_socket removed."
 		rm "$clamav_milter_socket"
 	fi
-	rc_flags="--pidfile ${pidfile} ${flags:-$clamav_milter_flags} $clamav_milter_socket"
+	rc_flags="${flags:-$clamav_milter_flags}"
 
 	clamav_clamd_socket_prefix=${clamav_clamd_socket%:*}
 	# We can have inet or inet6, try to remove 6
@@ -93,7 +93,7 @@ start_postcmd()
 load_rc_config $name
 : ${clamav_milter_enable="NO"}
 : ${clamav_milter_socket="%%CLAMAV_MILTER_SOCKET%%"}
-: ${clamav_milter_flags="--postmaster-only --local --outgoing --timeout=0 --max-children=50"}
+: ${clamav_milter_flags="-c ${conf_file}"}
 : ${clamav_milter_socktimeout="60"}
 : ${clamav_milter_socket_mode="755"}
 : ${clamav_milter_socket_user="%%CLAMAVUSER%%"}
diff --git a/security/clamav-devel/files/patch-etc_Makefile.in b/security/clamav-devel/files/patch-etc_Makefile.in
index e47b65443c8e..336f5667c3e3 100644
--- a/security/clamav-devel/files/patch-etc_Makefile.in
+++ b/security/clamav-devel/files/patch-etc_Makefile.in
@@ -1,15 +1,18 @@
---- etc/Makefile.in.orig	Thu Feb 19 14:17:02 2004
-+++ etc/Makefile.in	Thu Feb 19 14:17:36 2004
-@@ -333,10 +333,8 @@
+--- etc/Makefile.in.orig	2009-02-17 22:43:14.000000000 -0300
++++ etc/Makefile.in	2009-02-18 08:14:54.000000000 -0300
+@@ -393,12 +393,9 @@
  
- install:
+ install-data-local:
  	$(mkinstalldirs) $(DESTDIR)$(CFGINST)
 -	@test -f $(DESTDIR)$(CFGINST)/clamd.conf || \
 -	$(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST)
 -	@test -f $(DESTDIR)$(CFGINST)/freshclam.conf || \
 -	$(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST)
+-@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	@test -f $(DESTDIR)$(CFGINST)/clamav-milter.conf || \
+-@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	$(INSTALL_DATA) $(srcdir)/clamav-milter.conf $(DESTDIR)$(CFGINST)
 +	$(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST)/clamd.conf.default
 +	$(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST)/freshclam.conf.default
++@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	$(INSTALL_DATA) $(srcdir)/clamav-milter.conf $(DESTDIR)$(CFGINST)/clamav-milter.conf.default
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT: