From 6a8f0966c2403ed46a2341fac60d95a64086ef7c Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Sun, 23 May 2010 21:24:09 +0000
Subject: [PATCH] update to 0.96.1

---
 security/clamav/Makefile                             |  9 +++++++--
 security/clamav/distinfo                             | 10 +++++-----
 .../clamav/patches/patch-unit_tests_check_common_sh  | 12 ------------
 security/clamav/pkg/PLIST                            |  3 ++-
 4 files changed, 14 insertions(+), 20 deletions(-)
 delete mode 100644 security/clamav/patches/patch-unit_tests_check_common_sh

diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 99d9344601f..d2d151bf7e2 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.48 2010/04/01 13:18:54 sthen Exp $
+# $OpenBSD: Makefile,v 1.49 2010/05/23 21:24:09 sthen Exp $
 
 COMMENT=		virus scanner
-DISTNAME=		clamav-0.96
+DISTNAME=		clamav-0.96.1
 CATEGORIES=		security
 SHARED_LIBS=		clamav 13.0 \
 			clamunrar 2.0 \
@@ -50,6 +50,8 @@ CONFIGURE_ARGS+=        --disable-clamav \
 			--with-ltdl-lib=${LOCALBASE}/lib
 
 REGRESS_TARGET=		check
+MODULES=		lang/python
+MODPY_RUNDEP=		no
 
 CONFIGURE_ENV+=		LDFLAGS="-pthread -L/usr/lib -L${WRKSRC}/libclamav/.libs -L${LOCALBASE}/lib" \
 			CPPFLAGS="-I/usr/include -I${LOCALBASE}/include"
@@ -65,4 +67,7 @@ post-install:
 	cd ${WRKSRC}/examples; ${INSTALL_DATA} ex1.c \
 		${PREFIX}/share/examples/clamav
 
+pre-regress:
+	ln -s ${MODPY_BIN} ${WRKDIR}/bin/python
+
 .include <bsd.port.mk>
diff --git a/security/clamav/distinfo b/security/clamav/distinfo
index b2d8685290b..3d5277796fc 100644
--- a/security/clamav/distinfo
+++ b/security/clamav/distinfo
@@ -1,5 +1,5 @@
-MD5 (clamav-0.96.tar.gz) = KKx77EzANieo4tboZH7mYQ==
-RMD160 (clamav-0.96.tar.gz) = 2RR9HaT8f6Po1CslxYqT9ruqWIs=
-SHA1 (clamav-0.96.tar.gz) = vnyzfyphIcrMPNOWnu4hK5bva1c=
-SHA256 (clamav-0.96.tar.gz) = ewtuZ8h9Q7BM477Ors3frzREmfDuRelWjfa+FoCIedI=
-SIZE (clamav-0.96.tar.gz) = 39792593
+MD5 (clamav-0.96.1.tar.gz) = OOeHDbbprQ5WlRhJmm82UQ==
+RMD160 (clamav-0.96.1.tar.gz) = 8HCLkhyLAaQwn+dB7BQauMvfI1E=
+SHA1 (clamav-0.96.1.tar.gz) = zbJEkPQCdIy/tXzIdZL+d7Rw4KU=
+SHA256 (clamav-0.96.1.tar.gz) = QT3SWQcFkGjaKjZ9KzMPvDfV0nZOs7BHIUznVKnKdOo=
+SIZE (clamav-0.96.1.tar.gz) = 40568982
diff --git a/security/clamav/patches/patch-unit_tests_check_common_sh b/security/clamav/patches/patch-unit_tests_check_common_sh
deleted file mode 100644
index 81a92f8b891..00000000000
--- a/security/clamav/patches/patch-unit_tests_check_common_sh
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-unit_tests_check_common_sh,v 1.1 2009/10/30 01:09:34 sthen Exp $
---- unit_tests/check_common.sh.orig	Thu Oct 29 16:34:54 2009
-+++ unit_tests/check_common.sh	Thu Oct 29 16:35:05 2009
-@@ -47,7 +47,7 @@ die()
- 
- # Setup test directory to avoid temporary and output file clashes
- test_start() {
--    ulimit -t 120; ulimit -d 512000; ulimit -v 512000;
-+    ulimit -t 120; ulimit -d 512000;
-     (cd test-$1 2>/dev/null && killclamd || true)
-     rm -rf test-$1
-     mkdir test-$1
diff --git a/security/clamav/pkg/PLIST b/security/clamav/pkg/PLIST
index 225c171555d..096ea5f9e9d 100644
--- a/security/clamav/pkg/PLIST
+++ b/security/clamav/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.13 2010/04/01 13:18:54 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.14 2010/05/23 21:24:09 sthen Exp $
 @newgroup _clamav:539
 @newuser _clamav:539:539:daemon:Clam AntiVirus:/nonexistent:/sbin/nologin
 bin/clamav-config
@@ -24,6 +24,7 @@ lib/pkgconfig/libclamav.pc
 @man man/man1/clamscan.1
 @man man/man1/freshclam.1
 @man man/man1/sigtool.1
+@man man/man5/clamav-milter.conf.5
 @man man/man5/clamd.conf.5
 @man man/man5/freshclam.conf.5
 @man man/man8/clamav-milter.8