1 files changed, 8 insertions, 7 deletions

diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index 8b545c6ef5c5..4f064bb0cae7 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	20040521
+PORTVERSION=	20040524
 CATEGORIES=	security
 MASTER_SITES=	http://clamav.sourceforge.net/snapshot/
 PKGNAMESUFFIX=	-devel
@@ -55,9 +55,6 @@ CLAMAV_CLAMD_SOCKET?=	/var/run/clamav/clamd
 CLAMAV_MILTER_SOCKET?=	/var/run/clamav/clmilter.sock
 DOCSDIR?=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 
-PLIST_SUB+=	CLAMAVUSER="${CLAMAVUSER}"
-PLIST_SUB+=	CLAMAVGROUP="${CLAMAVGROUP}"
-
 SED_SCRIPT=	-e 's|%%PREFIX%%|${PREFIX}|g' \
 		-e 's|%%DATADIR%%|${DATADIR}|g' \
 		-e 's|%%CLAMAVUSER%%|${CLAMAVUSER}|g' \
@@ -78,6 +75,9 @@ SED_CONF=	-E -e 's|^\#?(Example)$$|\#\1|' \
 		-e 's|^\#?(UpdateLogFile) .*$$|\1 /var/log/clamav/freshclam.log|' \
 		-e 's|^\#?(FixStaleSocket)$$|\1|'
 
+PLIST_SUB+=	CLAMAVUSER=${CLAMAVUSER} \
+		CLAMAVGROUP=${CLAMAVGROUP}
+
 RC_DIR=		${PREFIX}/etc/rc.d
 RC_SUFX=	.sh
 SED_SCRIPT+=	-e 's|%%RC_SUBR%%|${RC_SUBR}|g' \
@@ -105,7 +105,6 @@ PLIST_SUB+=	CLAMAV-MILTER="@comment "
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/lib/sendmail|/usr/sbin/sendmail|g' \
-		-e 's|<malloc.h>|<stdlib.h>|' \
 		${WRKSRC}/clamav-milter/clamav-milter.c
 
 post-build:
@@ -121,7 +120,8 @@ 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
+	@${SED} ${SED_SCRIPT} ${FILESDIR}/clamav-freshclam.sh \
+		> ${WRKDIR}/clamav-freshclam.sh
 
 pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
@@ -147,7 +147,8 @@ 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}
+	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-freshclam.sh \
+		${RC_DIR}/clamav-freshclam${RC_SUFX}
 .if defined(WITH_MILTER)
 	@${INSTALL_SCRIPT} ${WRKDIR}/clamav-milter.sh \
 		${RC_DIR}/clamav-milter${RC_SUFX}