Update mail/clamav to 0.72 and enable pkgviews installation.

Changes:

0.72
----

Major bugfixes in this release include crashes with corrupted BinHex messages
and some Excel documents. Protection against archive bombs (not fully
functional since 0.70) was improved and a number of other improvements were
made.

0.71
----

This release fixes all bugs found in 0.70 and introduces a few new features -
the noteworthy changes include:

-) libclamav:
    + support nested OLE2 files
    + support Word6 macro code
    + ignore popular file types (media, graphics)
    + support compress.exe (SZDD) compression (test/test.msc)
    + improve virus detection in e-mails

-) clamscan:
    + automatically decide (by comparing daily.cvd version numbers) which
      database directory (hardcoded or clamav.conf's one) to use
    + support compression ratio feature (--max-ratio)
    + allow regular expressions in --[in|ex]clude
    + do not overwrite old files in a quarantine directory but add a numerical
      extension to new files
    + respect --tempdir in libclamav
    + fix access problem when calling external unpackers in a superuser mode
    + fix file permission corruption with --deb in a superuser mode

-) clamd
    + support log facility specification in syslog's style (LogFacility)
    + new directive LeaveTemporaryFiles (Debug no longer leaves temporary
      files not removed)

-) clamav-milter:
    + include the virus name in the 550 rejection
    + support user defined template for virus notifications (--template-file)
    + sort quarantine messages by date
    + improve thread management
    + add X-Virus-Scanned and X-Infected-Received-From: headers
    + improve load balancing (when using remote servers with --server)
    + send 554 after DATA received, not 550
    + save PID (--pidfile)

-) documentation:
    + German clamdoc.pdf translation (Rupert Roesler-Schmidt and Karina
      Schwarz, uplink coherent solutions, http://www.uplink.at)
    + new Japanese documentation (Masaki Ogawa)

6 files changed, 27 insertions, 23 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index 6c7dd3a0314..f1beea12dbe 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.6126 2004/06/04 15:34:51 taca Exp $
+$NetBSD: CHANGES,v 1.6127 2004/06/04 15:43:25 xtraeme Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -2777,3 +2777,4 @@ Changes to the packages collection and infrastructure in 2004:
 	Updated squirrelmail to 1.4.3a [xtraeme 2004-06-04]
 	Updated tcl-scotty to 2.1.11nb2 [minskim 2004-06-04]
 	Updated squid to 2.5.5nb3 [taca 2004-06-04]
+	Updated clamav to 0.72 [xtraeme 2004-06-04]
diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index 236e6f1bc73..92d9d5dc964 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/04/25 21:37:59 recht Exp $
+# $NetBSD: Makefile,v 1.17 2004/06/04 15:43:25 xtraeme Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
@@ -9,7 +9,9 @@ MAINTAINER=	david@netbsd-fr.org
 HOMEPAGE=	http://www.clamav.net/
 COMMENT=	Anti-virus toolkit
 
-CLAMAV_VERSION=	0.70
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+CLAMAV_VERSION=	0.72
 
 USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
diff --git a/mail/clamav/PLIST b/mail/clamav/PLIST
index 8c919ede9d6..bad53c07c15 100644
--- a/mail/clamav/PLIST
+++ b/mail/clamav/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/04/25 21:37:59 recht Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/06/04 15:43:25 xtraeme Exp $
 bin/clamdscan
 bin/clamscan
 bin/freshclam
@@ -14,6 +14,7 @@ man/man1/clamscan.1
 man/man1/freshclam.1
 man/man1/sigtool.1
 man/man5/clamav.conf.5
+man/man5/freshclam.conf.5
 man/man8/clamd.8
 sbin/clamd
 share/clamav/daily.cvd
diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo
index c23bbca7916..77d2fb187b3 100644
--- a/mail/clamav/distinfo
+++ b/mail/clamav/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2004/04/25 21:37:59 recht Exp $
+$NetBSD: distinfo,v 1.12 2004/06/04 15:43:25 xtraeme Exp $
 
-SHA1 (clamav-0.70.tar.gz) = 81687ad9afd4bd4753cb390dec1d3f98b00abf6f
-Size (clamav-0.70.tar.gz) = 2347104 bytes
+SHA1 (clamav-0.72.tar.gz) = 8e50bd2197489e53e342578af96618cbdee15b63
+Size (clamav-0.72.tar.gz) = 2623397 bytes
 SHA1 (patch-aa) = fad0dd5c5ce55b497159157401fa5da8c9025bd6
-SHA1 (patch-ab) = 88fe29d2ac3414bb44a78e3a29347aabd15350c8
-SHA1 (patch-ad) = 207480a81125d5879ea8527f1991161c32550930
+SHA1 (patch-ab) = 898206d4d39a65a8ba353d7707d1d873b4e173e2
+SHA1 (patch-ad) = 252733f9391935489daa46f7d2b2c55c6c1896ea
diff --git a/mail/clamav/patches/patch-ab b/mail/clamav/patches/patch-ab
index a4eadced4c4..931177d7758 100644
--- a/mail/clamav/patches/patch-ab
+++ b/mail/clamav/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2004/04/25 21:37:59 recht Exp $
+$NetBSD: patch-ab,v 1.5 2004/06/04 15:43:25 xtraeme Exp $
 
---- etc/Makefile.in.orig	2004-04-17 00:50:44.000000000 +0200
-+++ etc/Makefile.in	2004-04-25 21:29:51.000000000 +0200
-@@ -119,7 +119,7 @@
+--- etc/Makefile.in.orig	2004-06-04 15:34:54.000000000 +0000
++++ etc/Makefile.in	2004-06-04 15:35:42.000000000 +0000
+@@ -120,7 +120,7 @@
  install_sh = @install_sh@
  
  EXTRA_DIST = clamav.conf freshclam.conf
@@ -11,12 +11,12 @@ $NetBSD: patch-ab,v 1.4 2004/04/25 21:37:59 recht Exp $
  subdir = etc
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = $(top_builddir)/clamav-config.h
-@@ -249,8 +249,8 @@
+@@ -250,8 +250,8 @@
  
  install:
  	$(mkinstalldirs) $(DESTDIR)$(CFGINST)
--@INSTALL_CLAMAV_CONF_TRUE@	@$(INSTALL_DATA) clamav.conf $(DESTDIR)$(CFGINST)
--@INSTALL_FRESHCLAM_CONF_TRUE@	@$(INSTALL_DATA) freshclam.conf $(DESTDIR)$(CFGINST)
+-@INSTALL_CLAMAV_CONF_TRUE@	@$(INSTALL_DATA) $(srcdir)/clamav.conf $(DESTDIR)$(CFGINST)
+-@INSTALL_FRESHCLAM_CONF_TRUE@	@$(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST)
 +	@$(INSTALL_DATA) clamav.conf $(DESTDIR)$(CFGINST)
 +	@$(INSTALL_DATA) freshclam.conf $(DESTDIR)$(CFGINST)
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/mail/clamav/patches/patch-ad b/mail/clamav/patches/patch-ad
index 6ddb0c3c4d4..91c0e07ca99 100644
--- a/mail/clamav/patches/patch-ad
+++ b/mail/clamav/patches/patch-ad
@@ -1,16 +1,16 @@
-$NetBSD: patch-ad,v 1.3 2004/04/25 21:37:59 recht Exp $
+$NetBSD: patch-ad,v 1.4 2004/06/04 15:43:25 xtraeme Exp $
 
---- docs/Makefile.in.orig	2004-04-17 00:50:41.000000000 +0200
-+++ docs/Makefile.in	2004-04-25 21:30:17.000000000 +0200
-@@ -116,8 +116,10 @@
+--- docs/Makefile.in.orig	2004-06-04 15:33:21.000000000 +0000
++++ docs/Makefile.in	2004-06-04 15:33:54.000000000 +0000
+@@ -117,8 +117,10 @@
  am__quote = @am__quote@
  install_sh = @install_sh@
  
 +@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@MILTER_MANS = man/clamav-milter.8
 +
- EXTRA_DIST = clamdoc.pdf DMS Spanish Japanese html man FreeBSD-HowTo Portugese Turkish clamd_supervised clamav-mirror-howto.pdf signatures.pdf French Polish
--man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamav.conf.5 man/clamdscan.1 man/clamav-milter.8
-+man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamav.conf.5 man/clamdscan.1  $(MILTER_MANS)
+ EXTRA_DIST = clamdoc.pdf DMS German Spanish Japanese html man FreeBSD-HowTo Portugese Turkish clamd_supervised clamav-mirror-howto.pdf signatures.pdf French Polish
+-man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamav.conf.5 man/clamdscan.1 man/clamav-milter.8 man/freshclam.conf.5
++man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamav.conf.5 man/clamdscan.1 man/freshclam.conf.5
  subdir = docs
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = $(top_builddir)/clamav-config.h