6 files changed, 11 insertions, 32 deletions

diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 9fa4a28aa494..8ab2412eccb7 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	0.88
-PORTREVISION=	1
+PORTVERSION=	0.88.1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	clamav
@@ -26,11 +25,10 @@ OPTIONS=	MILTER "Compile the milter interface" Off \
 		CURL "Support URL downloading" Off \
 		LIBUNRAR "Support for external Unrar library" Off
 
-USE_REINPLACE=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	clamav-clamd clamav-freshclam
 
 PORTDOCS=	NEWS ChangeLog html
 
@@ -66,7 +64,7 @@ CLAMAVGROUP?=	clamav
 CLAMAV_CLAMD_SOCKET?=	${RUNDIR}/clamd
 CLAMAV_MILTER_SOCKET?=	${RUNDIR}/clmilter.sock
 
-SUB_FILES=	pkg-install pkg-deinstall clamav-clamd.sh clamav-freshclam.sh
+SUB_FILES=	pkg-install pkg-deinstall
 SUB_LIST=	DBDIR=${DBDIR} \
 		LOGDIR=${LOGDIR} \
 		RUNDIR=${RUNDIR} \
@@ -90,11 +88,6 @@ SED_CONF=	-E -e 's|^\#?(Example)$$|\#\1|' \
 PLIST_SUB+=	CLAMAVUSER=${CLAMAVUSER} \
 		CLAMAVGROUP=${CLAMAVGROUP}
 
-RC_DIR=		${PREFIX}/etc/rc.d
-RC_SUFX=	.sh
-SUB_LIST+=	RC_DIR=${RC_DIR} RC_SUFX=${RC_SUFX}
-PLIST_SUB+=	RC_DIR=${RC_DIR} RC_SUFX=${RC_SUFX}
-
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} == 502010
@@ -102,7 +95,7 @@ PTHREAD_LIBS=	-pthread
 .endif
 
 .if defined(WITH_MILTER)
-SUB_FILES+=	clamav-milter.sh
+USE_RC_SUBR+=	clamav-milter
 .if !defined(WITHOUT_LDAP) && exists(${LOCALBASE}/lib/libldap.so)
 USE_OPENLDAP=	yes
 LDFLAGS+=	-lldap
@@ -156,19 +149,11 @@ pre-install:
 		${SH} ${PKGINSTALL} ${PREFIX} PRE-INSTALL
 
 post-install:
-	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-clamd.sh \
-		${DESTDIR}${RC_DIR}/clamav-clamd${RC_SUFX}
-	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-freshclam.sh \
-		${DESTDIR}${RC_DIR}/clamav-freshclam${RC_SUFX}
 	@${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${DESTDIR}${DBDIR}
 .for c in clamd freshclam
 	@[ -f ${DESTDIR}${PREFIX}/etc/${c}.conf ] || \
 		${CP} ${DESTDIR}${PREFIX}/etc/${c}.conf.default ${DESTDIR}${PREFIX}/etc/${c}.conf
 .endfor
-.if defined(WITH_MILTER)
-	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-milter.sh \
-		${DESTDIR}${RC_DIR}/clamav-milter${RC_SUFX}
-.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DESTDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${INSTALL_WRKSRC}/NEWS ${INSTALL_WRKSRC}/ChangeLog \
diff --git a/security/clamav/distinfo b/security/clamav/distinfo
index 4957961aa056..af44068f929e 100644
--- a/security/clamav/distinfo
+++ b/security/clamav/distinfo
@@ -1,3 +1,3 @@
-MD5 (clamav-0.88.tar.gz) = 5d23205673c32e2b1b6db95000e6da74
-SHA256 (clamav-0.88.tar.gz) = 7912be29d13dae676691fbad7fa5fc1518eb3b8b45f8d147097908533ca1f8db
-SIZE (clamav-0.88.tar.gz) = 4564473
+MD5 (clamav-0.88.1.tar.gz) = 9fe8c47037051e350077513dd94fb76a
+SHA256 (clamav-0.88.1.tar.gz) = 25f678d1268fa91913dd2f0b7e08338faf65a4f48618ce59d773e3c42e606cff
+SIZE (clamav-0.88.1.tar.gz) = 5348769
diff --git a/security/clamav/files/clamav-clamd.sh.in b/security/clamav/files/clamav-clamd.in
index 13ea88a2f213..6164dfaf5176 100644
--- a/security/clamav/files/clamav-clamd.sh.in
+++ b/security/clamav/files/clamav-clamd.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/security/clamav/files/Attic/clamav-clamd.sh.in,v 1.2 2006-02-20 20:47:37 dougb Exp $
+# $FreeBSD$
 #
 
 # PROVIDE: clamd
diff --git a/security/clamav/files/clamav-freshclam.sh.in b/security/clamav/files/clamav-freshclam.in
index c85cf1305d1d..77a6053c2e87 100644
--- a/security/clamav/files/clamav-freshclam.sh.in
+++ b/security/clamav/files/clamav-freshclam.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/security/clamav/files/Attic/clamav-freshclam.sh.in,v 1.2 2006-02-20 20:47:37 dougb Exp $
+# $FreeBSD$
 #
 
 # PROVIDE: freshclam
@@ -23,7 +23,7 @@ rcvar=`set_rcvar`
 
 command=%%PREFIX%%/bin/freshclam
 pidfile=%%RUNDIR%%/freshclam.pid
-command_args="--daemon"
+command_args="--daemon -p ${pidfile}"
 required_dirs=%%DBDIR%%
 required_files=%%PREFIX%%/etc/freshclam.conf
 
diff --git a/security/clamav/files/clamav-milter.sh.in b/security/clamav/files/clamav-milter.in
index fb2ec3524f1e..2176d9a35989 100644
--- a/security/clamav/files/clamav-milter.sh.in
+++ b/security/clamav/files/clamav-milter.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/security/clamav/files/Attic/clamav-milter.sh.in,v 1.3 2006-02-20 20:47:37 dougb Exp $
+# $FreeBSD$
 #
 
 # PROVIDE: clamav-milter
diff --git a/security/clamav/pkg-plist b/security/clamav/pkg-plist
index def79045e3f5..9dada5f11b57 100644
--- a/security/clamav/pkg-plist
+++ b/security/clamav/pkg-plist
@@ -1,15 +1,9 @@
 @comment $FreeBSD$
-%%CLAMAV-MILTER%%@unexec [ ! -f %%RUNDIR%%/clamav-milter.pid ] || %%RC_DIR%%/clamav-milter%%RC_SUFX%% stop || true
-@unexec [ ! -f %%RUNDIR%%/freshclam.pid ] || %%RC_DIR%%/clamav-freshclam%%RC_SUFX%% stop || true
-@unexec [ ! -f %%RUNDIR%%/clamd.pid ] || %%RC_DIR%%/clamav-clamd%%RC_SUFX%% stop || true
 bin/clamav-config
 bin/clamscan
 bin/clamdscan
 bin/freshclam
 bin/sigtool
-etc/rc.d/clamav-clamd%%RC_SUFX%%
-etc/rc.d/clamav-freshclam%%RC_SUFX%%
-%%CLAMAV-MILTER%%etc/rc.d/clamav-milter%%RC_SUFX%%
 %%CLAMAV-MILTER%%sbin/clamav-milter
 sbin/clamd
 include/clamav.h