Pullup ticket 2104 - requested by martti

security update for clamav

Revisions pulled up:
- pkgsrc/mail/clamav/Makefile					1.73
- pkgsrc/mail/clamav/buildlink3.mk				1.13
- pkgsrc/mail/clamav/distinfo					1.44
- pkgsrc/mail/clamav/options.mk					1.2

   Module Name:		pkgsrc
   Committed By:	martti
   Date:		Thu May 31 05:26:46 UTC 2007

   Modified Files:
   	pkgsrc/mail/clamav: Makefile distinfo options.mk

   Log Message:
   Updated mail/clamav to 0.90.3

   Lots of bug fixes since 0.90.2. For details, see ChangeLog.
---
   Module Name:		pkgsrc
   Committed By:	martti
   Date:		Thu May 31 05:28:09 UTC 2007

   Modified Files:
   	pkgsrc/mail/clamav: buildlink3.mk

   Log Message:
   Regenerated.

4 files changed, 13 insertions, 13 deletions

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index b586d8eca15..1b1284c1634 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71.2.1 2007/05/16 21:21:03 salo Exp $
+# $NetBSD: Makefile,v 1.71.2.2 2007/05/31 13:57:56 salo Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
@@ -12,7 +12,7 @@ COMMENT=	Anti-virus toolkit
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-CLAMAV_VERSION=		0.90.2
+CLAMAV_VERSION=		0.90.3
 
 USE_LIBTOOL=		yes
 
diff --git a/mail/clamav/buildlink3.mk b/mail/clamav/buildlink3.mk
index 954569a0635..abe795df9b3 100644
--- a/mail/clamav/buildlink3.mk
+++ b/mail/clamav/buildlink3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:57 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12.6.1 2007/05/31 13:57:56 salo Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CLAMAV_BUILDLINK3_MK:=	${CLAMAV_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	clamav
 .endif
 
@@ -11,14 +11,14 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nclamav}
 BUILDLINK_PACKAGES+=	clamav
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}clamav
 
-.if !empty(CLAMAV_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.clamav+=	clamav>=0.60nb1
-BUILDLINK_ABI_DEPENDS.clamav+=	clamav>=0.88nb1
+.if ${CLAMAV_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.clamav+=	clamav>=0.90.3
 BUILDLINK_PKGSRCDIR.clamav?=	../../mail/clamav
 .endif	# CLAMAV_BUILDLINK3_MK
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/clamav/distinfo b/mail/clamav/distinfo
index 2bca84eeb58..fb2316af1c6 100644
--- a/mail/clamav/distinfo
+++ b/mail/clamav/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.42.2.1 2007/05/16 21:21:04 salo Exp $
+$NetBSD: distinfo,v 1.42.2.2 2007/05/31 13:57:56 salo Exp $
 
-SHA1 (clamav-0.90.2.tar.gz) = ecc72d212a27eef1aa40e61a0b2705e4e42996ce
-RMD160 (clamav-0.90.2.tar.gz) = 22daaecb634ca9914f18e85cf3456b544d6bf399
-Size (clamav-0.90.2.tar.gz) = 12062886 bytes
+SHA1 (clamav-0.90.3.tar.gz) = ec322b5ada9cf5b6faebd2d800985545ee2d28fa
+RMD160 (clamav-0.90.3.tar.gz) = 7dda3541afee8403c7fb98aa827f14b5a7a1d6ce
+Size (clamav-0.90.3.tar.gz) = 12496857 bytes
 SHA1 (patch-ad) = 554c183224c04357609111c90d0145c08e13c1d0
 SHA1 (patch-af) = fe93995448f968c479ff91d52c1fa2a1e67ef137
 SHA1 (patch-ah) = 0b0865cca6bb8534740b510b7052dbe3390b996c
diff --git a/mail/clamav/options.mk b/mail/clamav/options.mk
index e8726d41db7..4f0c907b9b2 100644
--- a/mail/clamav/options.mk
+++ b/mail/clamav/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2007/02/28 20:42:05 xtraeme Exp $
+# $NetBSD: options.mk,v 1.1.4.1 2007/05/31 13:57:56 salo Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.clamav
 PKG_SUPPORTED_OPTIONS=	curl milter clamav-experimental
@@ -10,7 +10,7 @@ PKG_SUGGESTED_OPTIONS=	curl
 # force use of pkgsrc version of libmilter -- clamav uses the sendmail binary
 # to check API compatibility(!), so it must build with as new a version of
 # libmilter as pkgsrc is capable of providing
-USE_BUILTIN.libmilter=  no
+USE_BUILTIN.libmilter=	no
 .  include "../../mail/libmilter/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-milter
 PLIST_SUBST+=		MILTER=