5 files changed, 49 insertions, 8 deletions

diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index 233e3e374333..28ca8d3f13f4 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	20040103
+PORTVERSION=	20040113
 CATEGORIES=	security
 MASTER_SITES=	http://clamav.sourceforge.net/snapshot/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-${PORTVERSION}-fixed
+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
 MAINTAINER=	rob@debank.tv
 COMMENT=	Command line virus scanner written entirely in C
@@ -23,8 +23,6 @@ RUN_DEPENDS=	lha:${PORTSDIR}/archivers/lha \
 		arc:${PORTSDIR}/archivers/arc \
 		unzip:${PORTSDIR}/archivers/unzip
 
-WRKSRC=		${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
-
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -47,7 +45,7 @@ CONFLICTS=	clamav-0.*
 CLAMAVUSER?=	clamav
 CLAMAVGROUP?=	clamav
 CLAMAV_CLAMD_SOCKET?=	/var/run/clamav/clamd
-CLAMAV_MILTER_SOCKET?=	/var/run/clmilter.sock
+CLAMAV_MILTER_SOCKET?=	/var/run/clamav/clmilter.sock
 
 PLIST_SUB+=	CLAMAVUSER="${CLAMAVUSER}"
 PLIST_SUB+=	CLAMAVGROUP="${CLAMAVGROUP}"
@@ -64,7 +62,12 @@ SED_CONF=	-E -e 's|^\#?(Example)$$|\#\1|' \
 		-e 's|^\#?(PidFile) .*$$|\1 /var/run/clamav/clamd.pid|' \
 		-e 's|^\#?(LocalSocket) .*$$|\1 /var/run/clamav/clamd|' \
 		-e 's|^\#?(User) .*$$|\1 ${CLAMAVUSER}|' \
-		-e 's|^\#?(ScanMail)$$|\1|'
+		-e 's|^\#?(ScanMail)$$|\1|' \
+		-e 's|^\#?(Checks)$$|\#\1|' \
+		-e 's|^\#?(DatabaseDirectory) .*$$|\1 ${DATADIR}|' \
+		-e 's|^\#?(DatabaseOwner) .*$$|\1 ${CLAMAVUSER}|' \
+		-e 's|^\#?(UpdateLogFile) .*$$|\1 /var/log/clamav/freshclam.log|'
+
 
 .include <bsd.port.pre.mk>
 
@@ -111,6 +114,7 @@ post-build:
 		> ${WRKDIR}/clamav-clamd.sh
 	@${SED} ${SED_SCRIPT} ${FILESDIR}/clamav-milter.sh \
 		> ${WRKDIR}/clamav-milter.sh
+	@${SED} ${SED_SCRIPT} ${FILESDIR}/freshclam.sh > ${WRKDIR}/freshclam.sh
 
 pre-install:
 	 ${SETENV} PKG_PREFIX=${PREFIX} \
@@ -126,6 +130,7 @@ post-install:
 	@${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${DATADIR}
 	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-clamd.sh \
 		${RC_DIR}/clamav-clamd${RC_SUFX}
+	@${INSTALL_SCRIPT} ${WRKDIR}/freshclam.sh ${RC_DIR}/freshclam${RC_SUFX}
 .if defined(WITH_MILTER)
 	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-milter.sh \
 		${RC_DIR}/clamav-milter${RC_SUFX}
diff --git a/security/clamav-devel/distinfo b/security/clamav-devel/distinfo
index 0010a038a025..90d41ed6d280 100644
--- a/security/clamav-devel/distinfo
+++ b/security/clamav-devel/distinfo
@@ -1 +1 @@
-MD5 (clamav-20040103-fixed.tar.gz) = dff88aaa21e56f2f30efbfb1509ba8e4
+MD5 (clamav-devel-20040113.tar.gz) = d50b496eb4bf4f3e2f7e173588257294
diff --git a/security/clamav-devel/files/clamav-milter.sh b/security/clamav-devel/files/clamav-milter.sh
index fa7cbfd693f7..a92cf94dc813 100644
--- a/security/clamav-devel/files/clamav-milter.sh
+++ b/security/clamav-devel/files/clamav-milter.sh
@@ -37,7 +37,7 @@ start_precmd()
 
 # set defaults
 
-clamav_milter_enable=${clamav_milter_enable:-"NO"}
+clamav_milter=${clamav_milter:-"NO"}
 clamav_milter_socket=${clamav_milter_socket:-"%%CLAMAV_MILTER_SOCKET%%"}
 clamav_milter_flags=${clamav_milter_flags:-"--postmaster-only --local --outgoing --max-children=50"}
 
diff --git a/security/clamav-devel/files/freshclam.sh b/security/clamav-devel/files/freshclam.sh
new file mode 100644
index 000000000000..3f9da58a7be3
--- /dev/null
+++ b/security/clamav-devel/files/freshclam.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/security/clamav-devel/files/freshclam.sh
+#
+
+# PROVIDE: freshclam
+# REQUIRE: LOGIN
+# BEFORE: mail
+# KEYWORD: FreeBSD shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable freshclam daemon:
+#
+#freshclam_enable"YES"
+#
+# See freshclam(1) for flags
+#
+
+. %%RC_SUBR%%
+
+name=freshclam
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/bin/freshclam
+required_dirs=%%DATADIR%%
+required_files=%%PREFIX%%/etc/freshclam.conf
+
+
+# set defaults
+
+freshclam_enable=${freshclam_enable:-"NO"}
+freshclam_flags=${freshclam_flags:-"--daemon"}
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/security/clamav-devel/pkg-plist b/security/clamav-devel/pkg-plist
index cb37c365da9c..a88852a6f7e5 100644
--- a/security/clamav-devel/pkg-plist
+++ b/security/clamav-devel/pkg-plist
@@ -3,6 +3,7 @@ bin/clamdscan
 bin/freshclam
 bin/sigtool
 etc/rc.d/clamav-clamd%%RC_SUFX%%
+etc/rc.d/freshclam%%RC_SUFX%%
 %%CLAMAV-MILTER:%%etc/rc.d/clamav-milter%%RC_SUFX%%
 %%CLAMAV-MILTER:%%sbin/clamav-milter
 sbin/clamd