Finish incorporating the changes proposed in

ports/75607 into clamav-devel.

In particular, the last change to this port makes
use of the clamav-milter pidfile, which wouldn't be
recorded without the present change.

PR:		ports/75607
Approved by:	maintainer

5 files changed, 14 insertions, 12 deletions

diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index 465606c2463b..f879fa165bb0 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	clamav
 PORTVERSION=	20050110
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.clamav.net/snapshot/
 PKGNAMESUFFIX=	-devel
diff --git a/security/clamav-devel/files/clamav-clamd.sh b/security/clamav-devel/files/clamav-clamd.sh
index ae1abb416814..c9019a8e3ac9 100644
--- a/security/clamav-devel/files/clamav-clamd.sh
+++ b/security/clamav-devel/files/clamav-clamd.sh
@@ -22,7 +22,7 @@ name=clamav_clamd
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/sbin/clamd
-pidfile=/var/run/clamav/clamd.pid
+pidfile=%%RUNDIR%%/clamd.pid
 required_dirs=%%DBDIR%%
 required_files=%%PREFIX%%/etc/clamd.conf
 
diff --git a/security/clamav-devel/files/clamav-freshclam.sh b/security/clamav-devel/files/clamav-freshclam.sh
index a17b236f5e5b..519f93a5a1c3 100644
--- a/security/clamav-devel/files/clamav-freshclam.sh
+++ b/security/clamav-devel/files/clamav-freshclam.sh
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: freshclam
-# REQUIRE: LOGIN
+# REQUIRE: LOGIN clamd
 # BEFORE: mail
 # KEYWORD: FreeBSD shutdown
 
@@ -22,7 +22,7 @@ name=clamav_freshclam
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/bin/freshclam
-pidfile=/var/run/clamav/freshclam.pid
+pidfile=%%RUNDIR%%/freshclam.pid
 command_args="--daemon"
 required_dirs=%%DBDIR%%
 required_files=%%PREFIX%%/etc/freshclam.conf
diff --git a/security/clamav-devel/files/clamav-milter.sh b/security/clamav-devel/files/clamav-milter.sh
index 572a7556c714..7a2e874d5d97 100644
--- a/security/clamav-devel/files/clamav-milter.sh
+++ b/security/clamav-devel/files/clamav-milter.sh
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: clamav-milter
-# REQUIRE: LOGIN
+# REQUIRE: LOGIN clamd
 # BEFORE: mail
 # KEYWORD: FreeBSD shutdown
 
@@ -22,6 +22,7 @@ name=clamav_milter
 rcvar=`set_rcvar`
 
 command=%%PREFIX%%/sbin/clamav-milter
+pidfile=%%RUNDIR%%/clamav-milter.pid
 required_dirs=%%DBDIR%%
 required_files=%%PREFIX%%/etc/clamd.conf
 
@@ -33,7 +34,7 @@ start_precmd()
 		warn "Stale socket $clamav_milter_socket removed."
 		rm "$clamav_milter_socket"
 	fi
-	rc_flags="${flags:-$clamav_milter_flags} $clamav_milter_socket"
+	rc_flags="--pidfile ${pidfile} ${flags:-$clamav_milter_flags} $clamav_milter_socket"
 }
 
 # read settings, set default values
diff --git a/security/clamav-devel/pkg-install b/security/clamav-devel/pkg-install
index 47c32f4de95a..efa21d86a171 100644
--- a/security/clamav-devel/pkg-install
+++ b/security/clamav-devel/pkg-install
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/security/clamav-devel/Attic/pkg-install,v 1.18 2004-12-22 02:10:12 edwin Exp $
+# $FreeBSD: /tmp/pcvs/ports/security/clamav-devel/Attic/pkg-install,v 1.19 2005-01-12 18:22:56 yar Exp $
 
 PREFIX=${PKG_PREFIX:-%%PREFIX%%}
 DESTDIR=${PKG_DESTDIR:-}
@@ -9,9 +9,9 @@ CLAMAVGROUP=%%CLAMAVGROUP%%
 UID=106
 GID=$UID
 
-CLAMRUN=$DESTDIR/var/run/clamav
 CLAMLOG=$DESTDIR/var/log/clamav
 DBDIR=$DESTDIR%%DBDIR%%
+RUNDIR=$DESTDIR%%RUNDIR%%
 
 if [ "$2" = "PRE-INSTALL" ]; then
 
@@ -39,11 +39,6 @@ if [ "$2" = "PRE-INSTALL" ]; then
 
 elif [ "$2" = "POST-INSTALL" ]; then
 
-	if [ ! -d "$CLAMRUN" ]; then
-		mkdir -p "$CLAMRUN" || exit 1
-		chown "$CLAMAVUSER:$CLAMAVGROUP" "$CLAMRUN" || exit 1
-	fi
-
 	if [ ! -d "$CLAMLOG" ]; then
 		mkdir -p "$CLAMLOG" || exit 1
 		chown "$CLAMAVUSER:$CLAMAVGROUP" "$CLAMLOG" || exit 1
@@ -54,6 +49,11 @@ elif [ "$2" = "POST-INSTALL" ]; then
 		chown "$CLAMAVUSER:$CLAMAVGROUP" "$DBDIR" || exit 1
 	fi
 
+	if [ ! -d "$RUNDIR" ]; then
+		mkdir -p "$RUNDIR" || exit 1
+		chown "$CLAMAVUSER:$CLAMAVGROUP" "$RUNDIR" || exit 1
+	fi
+
 	if [ -f "$DESTDIR$PREFIX/etc/clamav.conf" ]; then
 		echo
 		echo "**************** WARNING ****************"