- Update to 20100406

- Reduce differences between it and security/clamav
- Make JIT bytecode compiler as an OPTION, On by default

3 files changed, 30 insertions, 30 deletions

diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index 4486c6fadfae..2b3c34c2de4f 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	20100312
+PORTVERSION=	20100406
 CATEGORIES=	security
 MASTER_SITES=	http://www.clamav.net/snapshot/ \
 		LOCAL/garga/clamav-devel
@@ -21,17 +21,20 @@ 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 \
 		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
 
-USE_GCC=	4.2+
-GNU_CONFIGURE=	yes
-MAKE_JOBS_SAFE=	yes
-USE_LDCONFIG=	yes
-USE_RC_SUBR=	clamav-clamd clamav-freshclam
-CONF_FILES=	clamd freshclam
+USE_GCC=		4.2+
+USE_PYTHON_BUILD=	yes
+USE_GMAKE=		yes
+GNU_CONFIGURE=		yes
+MAKE_JOBS_SAFE=		yes
+USE_LDCONFIG=		yes
+USE_RC_SUBR=		clamav-clamd clamav-freshclam
+CONF_FILES=		clamd freshclam
 
 PORTDOCS=	*
 
@@ -50,8 +53,9 @@ CONFIGURE_ARGS=	--libdir=${PREFIX}/lib \
 		--enable-bigstack \
 		--enable-readdir_r \
 		--enable-gethostbyname_r \
-		--enable-experimental \
-		--disable-dependency-tracking
+		--disable-dependency-tracking \
+		--enable-clamdtop \
+		--enable-experimental
 CPPFLAGS+=	-I${LOCALBASE}/include \
 		${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib \
@@ -117,8 +121,10 @@ CFLAGS+=	-march=i486
 .endif
 
 .if ${OSVERSION} >= 700000
-BUILD_DEPENDS+=		${LOCALBASE}/include/check.h:${PORTSDIR}/devel/libcheck
-CONFIGURE_ARGS+=	--enable-check
+BUILD_DEPENDS+=	${LOCALBASE}/include/check.h:${PORTSDIR}/devel/libcheck
+CONFIGURE_ARGS+=--enable-check
+.else
+CONFIGURE_ARGS+=--disable-check
 .endif
 
 .if defined(WITH_ARC)
@@ -137,7 +143,7 @@ RUN_DEPENDS+=	unzoo:${PORTSDIR}/archivers/unzoo
 PLIST_SUB+=	UNRAR=""
 .else
 PLIST_SUB+=	UNRAR="@comment "
-CONFIGURE_ARGS+=	--disable-unrar
+CONFIGURE_ARGS+=--disable-unrar
 .endif
 .if defined(WITH_ICONV)
 CONFIGURE_ARGS+=--with-iconv
@@ -146,6 +152,12 @@ USE_ICONV=	yes
 CONFIGURE_ARGS+=--without-iconv
 .endif
 
+.if defined(WITH_LLVM)
+CONFIGURE_ARGS+=--enable-llvm
+.else
+CONFIGURE_ARGS+=--disable-llvm
+.endif
+
 .if defined(WITH_MILTER)
 USE_RC_SUBR+=	clamav-milter
 CONF_FILES+=	clamav-milter
@@ -156,12 +168,12 @@ LDFLAGS+=	-lldap
 
 . if !exists(/usr/lib/libmilter.a) || exists(${LOCALBASE}/lib/libmilter.a)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/sendmail
-CONFIGURE_ARGS+=	--with-sendmail=${LOCALBASE}/sbin/sendmail
+CONFIGURE_ARGS+=--with-sendmail=${LOCALBASE}/sbin/sendmail
 . else
-CONFIGURE_ARGS+=	--with-sendmail=/usr/sbin/sendmail
+CONFIGURE_ARGS+=--with-sendmail=/usr/sbin/sendmail
 . endif
 
-CONFIGURE_ARGS+=	--enable-milter
+CONFIGURE_ARGS+=--enable-milter
 PLIST_SUB+=	CLAMAV-MILTER=""
 .else
 PLIST_SUB+=	CLAMAV-MILTER="@comment "
diff --git a/security/clamav-devel/distinfo b/security/clamav-devel/distinfo
index 0a33c5d9a62d..3c7a4f7cd6b9 100644
--- a/security/clamav-devel/distinfo
+++ b/security/clamav-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (clamav-devel-20100312.tar.gz) = 7c60908f05f16cefd82fdcd0c14cafe9
-SHA256 (clamav-devel-20100312.tar.gz) = 0fab972ede5e40e15ab6056ab2224c0a448db6f2710561c8af63c57e23d463d8
-SIZE (clamav-devel-20100312.tar.gz) = 20938701
+MD5 (clamav-devel-20100406.tar.gz) = 88673e549077c048f342f56f46f96c51
+SHA256 (clamav-devel-20100406.tar.gz) = 9f085c8c8850f8cd8022df8267709330b742b1f9a7e3ee0e95138c9d846acb7c
+SIZE (clamav-devel-20100406.tar.gz) = 20915582
diff --git a/security/clamav-devel/files/patch-libclamav__c++__llvm__lib__Target__X86__X86ISelLowering.cpp b/security/clamav-devel/files/patch-libclamav__c++__llvm__lib__Target__X86__X86ISelLowering.cpp
deleted file mode 100644
index a0f5b61d1277..000000000000
--- a/security/clamav-devel/files/patch-libclamav__c++__llvm__lib__Target__X86__X86ISelLowering.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./libclamav/c++/llvm/lib/Target/X86/X86ISelLowering.cpp.orig	2010-03-12 11:04:55.000000000 -0300
-+++ ./libclamav/c++/llvm/lib/Target/X86/X86ISelLowering.cpp	2010-03-12 11:06:58.000000000 -0300
-@@ -9795,7 +9795,8 @@
-         AsmPieces[2] == "${0:w}" &&
-         IA->getConstraintString().compare(0, 5, "=r,0,") == 0) {
-       AsmPieces.clear();
--      SplitString(IA->getConstraintString().substr(5), AsmPieces, ",");
-+      const std::string &Constraints = IA->getConstraintString();
-+      SplitString(StringRef(Constraints).substr(5), AsmPieces, ",");
-       std::sort(AsmPieces.begin(), AsmPieces.end());
-       if (AsmPieces.size() == 4 &&
-           AsmPieces[0] == "~{cc}" &&