7 files changed, 55 insertions, 20 deletions

diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index 9b77007183b5..6df2088ab996 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	20040129
-PORTREVISION=	1
+PORTVERSION=	20040210
 CATEGORIES=	security
 MASTER_SITES=	http://clamav.sourceforge.net/snapshot/
 PKGNAMESUFFIX=	-devel
@@ -24,7 +23,7 @@ RUN_DEPENDS=	lha:${PORTSDIR}/archivers/lha \
 		arc:${PORTSDIR}/archivers/arc \
 		unzip:${PORTSDIR}/archivers/unzip
 
-#OPTIONS=	MILTER "Compile the milter interface" off
+OPTIONS=	MILTER "Compile the milter interface" off
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -100,12 +99,6 @@ post-patch:
 		-e 's|<malloc.h>|<stdlib.h>|' \
 		${WRKSRC}/clamav-milter/clamav-milter.c
 
-pre-configure:
-	@${REINPLACE_CMD} -e 's|clamav.conf|&.default|' \
-		-e 's|freshclam.conf|&.default|' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} \
-		${CONFIGURE_WRKSRC}/etc/Makefile.in
-
 post-build:
 	@${SED} ${SED_CONF} ${BUILD_WRKSRC}/etc/clamav.conf \
 		> ${BUILD_WRKSRC}/etc/clamav.conf.default
@@ -129,14 +122,19 @@ post-install:
 	@[ -f ${PREFIX}/etc/clamav.conf ] || \
 		${CP} ${BUILD_WRKSRC}/etc/clamav.conf.default \
 			${PREFIX}/etc/clamav.conf
+	@[ -f ${PREFIX}/etc/clamav.conf.default ] || \
+		${CP} ${BUILD_WRKSRC}/etc/clamav.conf.default \
+			${PREFIX}/etc/clamav.conf.default
 	@[ -f ${PREFIX}/etc/freshclam.conf ] || \
 		${CP} ${BUILD_WRKSRC}/etc/freshclam.conf.default \
 			${PREFIX}/etc/freshclam.conf
+	@[ -f ${PREFIX}/etc/freshclam.conf.default ] || \
+		${CP} ${BUILD_WRKSRC}/etc/freshclam.conf.default \
+			${PREFIX}/etc/freshclam.conf.default
 	@${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}
-	@${SH} ${PKGINSTALL} ${PREFIX} POST-INSTALL
 .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 fa613b1b309f..447b79b3969f 100644
--- a/security/clamav-devel/distinfo
+++ b/security/clamav-devel/distinfo
@@ -1 +1,2 @@
-MD5 (clamav-devel-20040129.tar.gz) = 8c0a73c2b832195b83edc163079285a4
+MD5 (clamav-devel-20040210.tar.gz) = 07d8e5f2c57ab6a0e2e35deb81b5f357
+SIZE (clamav-devel-20040210.tar.gz) = 1182377
diff --git a/security/clamav-devel/files/patch-configure b/security/clamav-devel/files/patch-configure
new file mode 100644
index 000000000000..c2d83239eecd
--- /dev/null
+++ b/security/clamav-devel/files/patch-configure
@@ -0,0 +1,26 @@
+--- configure.bak	Fri Feb  6 14:46:08 2004
++++ configure	Tue Feb 10 17:44:13 2004
+@@ -9316,23 +9316,12 @@
+ 
+ 
+ 
+-if test ! -r "$cfg_dir/clamav.conf"; then
+-  INSTALL_CLAMAV_CONF_TRUE=
+-  INSTALL_CLAMAV_CONF_FALSE='#'
+-else
+   INSTALL_CLAMAV_CONF_TRUE='#'
+   INSTALL_CLAMAV_CONF_FALSE=
+-fi
+ 
+ 
+-
+-if test ! -r "$cfg_dir/freshclam.conf"; then
+-  INSTALL_FRESHCLAM_CONF_TRUE=
+-  INSTALL_FRESHCLAM_CONF_FALSE='#'
+-else
+   INSTALL_FRESHCLAM_CONF_TRUE='#'
+   INSTALL_FRESHCLAM_CONF_FALSE=
+-fi
+ 
+ 
+ if test "$test_urandom" = "yes"
diff --git a/security/clamav-devel/files/patch-database_Makefile.in b/security/clamav-devel/files/patch-database_Makefile.in
new file mode 100644
index 000000000000..ff745761e284
--- /dev/null
+++ b/security/clamav-devel/files/patch-database_Makefile.in
@@ -0,0 +1,15 @@
+--- database/Makefile.in.orig	Tue Feb 10 17:19:06 2004
++++ database/Makefile.in	Tue Feb 10 17:19:38 2004
+@@ -248,9 +248,9 @@
+ 
+ install:
+ 	$(mkinstalldirs) $(DESTDIR)$(DBINST)
+-	test -f $(DESTDIR)$(DBINST)/main.cvd || @$(INSTALL_DATA) main.cvd $(DESTDIR)$(DBINST)
+-	test -f $(DESTDIR)$(DBINST)/daily.cvd || @$(INSTALL_DATA) daily.cvd $(DESTDIR)$(DBINST)
+-	test -f $(DESTDIR)$(DBINST)/mirrors.txt || @$(INSTALL_DATA) mirrors.txt $(DESTDIR)$(DBINST)
++	test -f $(DESTDIR)$(DBINST)/main.cvd || $(INSTALL_DATA) main.cvd $(DESTDIR)$(DBINST)
++	test -f $(DESTDIR)$(DBINST)/daily.cvd || $(INSTALL_DATA) daily.cvd $(DESTDIR)$(DBINST)
++	test -f $(DESTDIR)$(DBINST)/mirrors.txt || $(INSTALL_DATA) mirrors.txt $(DESTDIR)$(DBINST)
+ 	test -f $(DESTDIR)$(DBINST)/viruses.db && rm -f $(DESTDIR)$(DBINST)/viruses.db || true
+ 	test -f $(DESTDIR)$(DBINST)/viruses.db2 && rm -f $(DESTDIR)$(DBINST)/viruses.db2 || true
+ 	@if test `id -u` -eq 0 && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \
diff --git a/security/clamav-devel/pkg-deinstall b/security/clamav-devel/pkg-deinstall
index f437ec16cb90..09b9c27962aa 100644
--- a/security/clamav-devel/pkg-deinstall
+++ b/security/clamav-devel/pkg-deinstall
@@ -3,5 +3,5 @@ if [ ! "$2" = "POST-DEINSTALL" ]; then
 fi
 echo "----------------------------------------------------------"
 echo "  If you really want to remove this package, please remove"
-echo " the clamav-user and clean out log files "
+echo " the clamav-user and clean out log files and database"
 echo "----------------------------------------------------------"
diff --git a/security/clamav-devel/pkg-install b/security/clamav-devel/pkg-install
index 70a46257d425..bb13314c848a 100644
--- a/security/clamav-devel/pkg-install
+++ b/security/clamav-devel/pkg-install
@@ -43,9 +43,4 @@ mkdir -p "${CLAMLOG}"
 chown "${CLAMAVUSER}:${CLAMAVGROUP}" "${CLAMLOG}"
 fi
 
-if [ "$2" = "POST-INSTALL" ]; then
-	echo "===> Updating virus definitions..."
-	freshclam
-fi
-
 exit 0
diff --git a/security/clamav-devel/pkg-plist b/security/clamav-devel/pkg-plist
index 3040afda1f05..aed505240645 100644
--- a/security/clamav-devel/pkg-plist
+++ b/security/clamav-devel/pkg-plist
@@ -23,10 +23,10 @@ etc/freshclam.conf.default
 @owner %%CLAMAVUSER%%
 @group %%CLAMAVGROUP%%
 %%DATADIR%%/mirrors.txt
-%%DATADIR%%/main.cvd
-%%DATADIR%%/daily.cvd
 @exec chown %%CLAMAVUSER%%:%%CLAMAVGROUP%% %B
-@dirrm %%DATADIR%%
+@unexec [ -s %D/%%DATADIR%%/main.cvd ] || rm -f %D/%%DATADIR%%/main.cvd
+@unexec [ -s %D/%%DATADIR%%/daily.cvd ] || rm -f %D/%%DATADIR%%/daily.cvd
+@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
 @unexec rmdir /var/run/clamav 2>/dev/null || true
 @unexec rmdir /var/log/clamav 2>/dev/null || true
 %%PORTDOCS%%@dirrm %%DOCSDIR%%-devel