[pkgsrc/trunk]: pkgsrc/mail/clamav Improvements for freshclamd script from Se...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a2a3a9757b7c
branches:  trunk
changeset: 530102:a2a3a9757b7c
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Jun 15 22:31:39 2007 +0000

description:
Improvements for freshclamd script from Sergey Svishchev:
For some reason, the script creates the pid file itself, instead
of using '-p' option to freshclamd.  sig_stop=KILL seems unnecessary,
too.

Bump PKGREVISION.

diffstat:

 mail/clamav/Makefile            |   4 ++--
 mail/clamav/files/freshclamd.sh |  12 +++---------
 2 files changed, 5 insertions(+), 11 deletions(-)

diffs (47 lines):

diff -r 479f631bf5f0 -r a2a3a9757b7c mail/clamav/Makefile
--- a/mail/clamav/Makefile      Fri Jun 15 22:28:53 2007 +0000
+++ b/mail/clamav/Makefile      Fri Jun 15 22:31:39 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.73 2007/05/31 05:26:46 martti Exp $
+# $NetBSD: Makefile,v 1.74 2007/06/15 22:31:39 wiz Exp $
 
 DISTNAME=      clamav-${CLAMAV_VERSION}
 PKGNAME=       clamav-${CLAMAV_VERSION:S/-/./}
-#PKGREVISION=  1
+PKGREVISION=   1
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=clamav/}
 
diff -r 479f631bf5f0 -r a2a3a9757b7c mail/clamav/files/freshclamd.sh
--- a/mail/clamav/files/freshclamd.sh   Fri Jun 15 22:28:53 2007 +0000
+++ b/mail/clamav/files/freshclamd.sh   Fri Jun 15 22:31:39 2007 +0000
@@ -1,26 +1,20 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: freshclamd.sh,v 1.3 2006/06/20 20:24:45 jnemeth Exp $
+# $NetBSD: freshclamd.sh,v 1.4 2007/06/15 22:31:39 wiz Exp $
 #
 # PROVIDE: freshclamd
 # REQUIRE: DAEMON LOGIN clamd
 
-
 name="freshclamd"
 rcvar=$name
 command="@PREFIX@/bin/freshclam"
 required_files="@PKG_SYSCONFDIR@/freshclam.conf"
-pidfile="@VARBASE@/run/${name}.pid"
-sig_stop="KILL"
+pidfile="@VIRUSDBDIR@/${name}.pid"
 freshclamd_user="@CLAMAV_USER@"
 freshclamd_flags=${freshclamd_flags:=-c 2}
-command_args="-d"
+command_args="-d -p $pidfile"
 
 . /etc/rc.subr
 
 load_rc_config $name
 run_rc_command "$1"
-
-if [ "$1" != "stop" ]; then
-       echo $(check_process $command) > $pidfile
-fi