2 files changed, 15 insertions, 13 deletions

diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index 7284e721ab8a..3b44f2f9d7d0 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	20100920
+PORTVERSION=	20100927
 CATEGORIES=	security
 MASTER_SITES=	http://www.clamav.net/snapshot/ \
 		LOCAL/garga/clamav-devel
@@ -22,16 +22,17 @@ OPTIONS=	ARC "Enable arch archives support" On \
 		UNZOO "Enable zoo archives support" On \
 		UNRAR "Enable rar archives support" On \
 		LLVM "Enable JIT Bytecode compiler" On \
+		TESTS "Run compile-time tests (req. python)" On \
 		MILTER "Compile the milter interface" Off \
 		LDAP "libmilter was built with LDAP" Off \
 		ICONV "Enable ICONV support" Off \
 		STDERR "Print logs to stderr instead of stdout" Off
 
-GNU_CONFIGURE=		yes
-MAKE_JOBS_SAFE=		yes
-USE_LDCONFIG=		yes
-USE_RC_SUBR=		clamav-clamd clamav-freshclam
-CONF_FILES=		clamd freshclam
+GNU_CONFIGURE=	yes
+MAKE_JOBS_SAFE=	yes
+USE_LDCONFIG=	yes
+USE_RC_SUBR=	clamav-clamd clamav-freshclam
+CONF_FILES=	clamd freshclam
 
 LICENSE=	GPLv2
 
@@ -145,9 +146,10 @@ CONFIGURE_ARGS+=--without-iconv
 
 .if defined(WITH_LLVM) && ${ARCH} != "sparc64"
 CONFIGURE_ARGS+=--enable-llvm
+USE_GMAKE=	yes
+. if defined(WITH_TESTS)
 USE_PYTHON_BUILD=	yes
-USE_GMAKE=		yes
-USE_GCC=		4.2+
+. endif
 .else
 CONFIGURE_ARGS+=--disable-llvm
 .endif
@@ -202,7 +204,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|0x100000000|0x100000000ULL|g' \
 		${WRKSRC}/libclamunrar/unrar.c
 
-.if defined(WITH_LLVM)
+.if defined(WITH_LLVM) && defined(WITH_TESTS)
 pre-configure:
 	@if ! ${PYTHON_CMD} -c "import thread" >/dev/null 2>&1; then \
 		${ECHO_MSG} ""; \
@@ -215,7 +217,7 @@ pre-configure:
 	fi
 .endif
 
-.if ${OSVERSION} >= 700000
+.if defined(WITH_TESTS) && ${OSVERSION} >= 700000
 post-build:
 	@if [ -f "${PY_NO_THREAD}" ]; then \
 		${MAKE} -C ${WRKSRC} check; \
diff --git a/security/clamav-devel/distinfo b/security/clamav-devel/distinfo
index d7b7b240216b..f168793ea778 100644
--- a/security/clamav-devel/distinfo
+++ b/security/clamav-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (clamav-devel-20100920.tar.gz) = ba47df0b06b88f5192aefc3ba04a566c
-SHA256 (clamav-devel-20100920.tar.gz) = a8983dd51920dd4078ed43ce92e0709acba401603809c352eff590964132e06d
-SIZE (clamav-devel-20100920.tar.gz) = 21155694
+MD5 (clamav-devel-20100927.tar.gz) = d53aab0370e696908e491a127df3c40b
+SHA256 (clamav-devel-20100927.tar.gz) = 8168b48b39ad2bb65773d2138e30fa857586b9f0011e7a84b779ba8a70829f79
+SIZE (clamav-devel-20100927.tar.gz) = 21557760