From 233161dd7c02d3c09a165ae7b87a46ab6b0a4534 Mon Sep 17 00:00:00 2001
From: garga <garga@FreeBSD.org>
Date: Wed, 23 Feb 2011 15:32:46 +0000
Subject: - Update to 20110223 - Align with clamav port new option to use llvm
 from ports

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

(limited to 'security/clamav-devel')

diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index 78e89fa88c28..b4c79f70b383 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	20110204
+PORTVERSION=	20110223
 CATEGORIES=	security
 MASTER_SITES=	http://www.clamav.net/snapshot/ \
 		LOCAL/garga/clamav-devel
@@ -21,7 +21,8 @@ OPTIONS=	ARC "Enable arch archives support" On \
 		LHA "Enable lha archives support" On \
 		UNZOO "Enable zoo archives support" On \
 		UNRAR "Enable rar archives support" On \
-		LLVM "Enable JIT Bytecode compiler" 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 \
@@ -144,9 +145,16 @@ USE_ICONV=	yes
 CONFIGURE_ARGS+=--without-iconv
 .endif
 
-.if defined(WITH_LLVM) && ${ARCH} != "sparc64"
+.if (defined(WITH_LLVM) || defined(WITH_LLVM_PORTS)) && ( ${ARCH} == "i386" || ${ARCH} == "amd64" )
 CONFIGURE_ARGS+=--enable-llvm
 USE_GMAKE=	yes
+. 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
@@ -204,7 +212,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|0x100000000|0x100000000ULL|g' \
 		${WRKSRC}/libclamunrar/unrar.c
 
-.if defined(WITH_LLVM) && defined(WITH_TESTS)
+.if (defined(WITH_LLVM) || defined(WITH_LLVM_PORTS)) && 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 0989f6661026..112cfbafd6c1 100644
--- a/security/clamav-devel/distinfo
+++ b/security/clamav-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (clamav-devel-20110204.tar.gz) = 78a59dcf5f28ed03d33271999da918ab582826254cb40204bbf1c7e9ff1ed3f1
-SIZE (clamav-devel-20110204.tar.gz) = 36687727
+SHA256 (clamav-devel-20110223.tar.gz) = 01b8f78e530b30d864568897412c3f1671bc94e82f537a6fbb0694360cdeab79
+SIZE (clamav-devel-20110223.tar.gz) = 36780971
-- 
cgit