From a69df40abcf6c0679144d4bfbc59ecd188480438 Mon Sep 17 00:00:00 2001
From: garga <garga@FreeBSD.org>
Date: Fri, 29 Jun 2012 16:24:54 +0000
Subject: - Update to 20120629 - Remove LLVM_PORTS option, clamav requires llvm
 2.9 and we have 3.1 on ports

---
 security/clamav-devel/Makefile | 14 +++-----------
 security/clamav-devel/distinfo |  4 ++--
 2 files changed, 5 insertions(+), 13 deletions(-)

(limited to 'security/clamav-devel')

diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index 46e4284cf7fe..5aebd8181499 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	20120407
+PORTVERSION=	20120629
 CATEGORIES=	security
 MASTER_SITES=	http://www.clamav.net/snapshot/ \
 		LOCAL/garga/clamav-devel
@@ -22,7 +22,6 @@ OPTIONS=	ARC "Enable arch archives support" On \
 		UNZOO "Enable zoo archives support" On \
 		UNRAR "Enable rar archives support" On \
 		LLVM "Enable JIT Bytecode compiler (bundled LLVM)" On \
-		LLVM_PORTS "Enable JIT Bytecode compiler (from Ports)" Off \
 		TESTS "Run compile-time tests (req. python)" On \
 		MILTER "Compile the milter interface" Off \
 		LDAP "libmilter was built with LDAP" Off \
@@ -145,15 +144,8 @@ USE_ICONV=	yes
 CONFIGURE_ARGS+=--without-iconv
 .endif
 
-.if (defined(WITH_LLVM) || defined(WITH_LLVM_PORTS)) && ( ${ARCH} == "i386" || ${ARCH} == "amd64" )
+.if defined(WITH_LLVM) && ( ${ARCH} == "i386" || ${ARCH} == "amd64" )
 CONFIGURE_ARGS+=--enable-llvm
-. if defined(WITH_LLVM_PORTS)
-BUILD_DEPENDS+=	llvm-config:${PORTSDIR}/devel/llvm
-CONFIGURE_ARGS+=--with-system-llvm=${LOCALBASE}/bin/llvm-config
-. endif
-. if defined(WITH_LLVM) && defined(WITH_LLVM_PORTS)
-IGNORE=Select only one LLVM
-. endif
 . if defined(WITH_TESTS)
 USE_PYTHON_BUILD=	yes
 . endif
@@ -211,7 +203,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|0x100000000|0x100000000ULL|g' \
 		${WRKSRC}/libclamunrar/unrar.c
 
-.if (defined(WITH_LLVM) || defined(WITH_LLVM_PORTS)) && defined(WITH_TESTS)
+.if defined(WITH_LLVM) && defined(WITH_TESTS)
 pre-configure:
 	@if ! ${PYTHON_CMD} -c "import thread" >/dev/null 2>&1; then \
 		${ECHO_MSG} ""; \
diff --git a/security/clamav-devel/distinfo b/security/clamav-devel/distinfo
index 66325389b1a7..e350ad0ac979 100644
--- a/security/clamav-devel/distinfo
+++ b/security/clamav-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (clamav-devel-20120407.tar.gz) = 900457500433ff7560d0bf817678089ee48126eb5688f3974e27c1dcd21ac49f
-SIZE (clamav-devel-20120407.tar.gz) = 36980105
+SHA256 (clamav-devel-20120629.tar.gz) = 88bfd271a3b5381135fdcc6457f8243db6b35880ba7beff44074e5adf7a71848
+SIZE (clamav-devel-20120629.tar.gz) = 36997474
-- 
cgit