4 files changed, 11 insertions, 63 deletions

diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index 97d0e9d75608..d8975b7dff6f 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	20100127
-PORTREVISION=	1
+PORTVERSION=	20100308
 CATEGORIES=	security
 MASTER_SITES=	http://www.clamav.net/snapshot/ \
 		LOCAL/garga/clamav-devel
@@ -117,6 +116,11 @@ PORTSCOUT=	ignore:1
 CFLAGS+=	-march=i486
 .endif
 
+.if ${OSVERSION} >= 700000
+BUILD_DEPENDS+=		${LOCALBASE}/include/check.h:${PORTSDIR}/devel/libcheck
+CONFIGURE_ARGS+=	--enable-check
+.endif
+
 .if defined(WITH_ARC)
 RUN_DEPENDS+=	arc:${PORTSDIR}/archivers/arc
 .endif
@@ -179,8 +183,10 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|0x100000000|0x100000000ULL|g' \
 		${WRKSRC}/libclamunrar/unrar.c
 
+.if ${OSVERSION} >= 700000
 post-build:
 	@${MAKE} -C ${WRKSRC} check
+.endif
 
 pre-su-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
diff --git a/security/clamav-devel/distinfo b/security/clamav-devel/distinfo
index 772098a0c345..c6252fcb8988 100644
--- a/security/clamav-devel/distinfo
+++ b/security/clamav-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (clamav-devel-20100127.tar.gz) = 08b25a7ea7fe0ca524aa2f88d713fb56
-SHA256 (clamav-devel-20100127.tar.gz) = c1a8556fbc1024be5df42954fa8ba764c8c1f150c72ea00e6acffdcba387950f
-SIZE (clamav-devel-20100127.tar.gz) = 21583577
+MD5 (clamav-devel-20100308.tar.gz) = f28152f96e0ad5825b9a1744a5ca1a1f
+SHA256 (clamav-devel-20100308.tar.gz) = b1aaf0b99d6202640926c29316b8e2b4676d8884a891270852d7e3ed3042eb0e
+SIZE (clamav-devel-20100308.tar.gz) = 20760962
diff --git a/security/clamav-devel/files/patch-libclamav__c++__Makefile.am b/security/clamav-devel/files/patch-libclamav__c++__Makefile.am
deleted file mode 100644
index b87251cc99c1..000000000000
--- a/security/clamav-devel/files/patch-libclamav__c++__Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
---- libclamav/c++/Makefile.am
-+++ libclamav/c++/Makefile.am
-@@ -19,7 +19,7 @@ LLVM_INCLUDES=-I$(top_srcdir)/llvm/include -I$(top_builddir)/llvm/include
- # TODO: HP-UX should have -D_REENTRANT -D_HPUX_SOURCE
- LLVM_DEFS=-D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D_DEBUG -D_GNU_SOURCE
- AM_CPPFLAGS = -I$(top_srcdir)/../.. -I$(top_srcdir)/.. -I$(top_builddir)/../../ $(LLVM_INCLUDES) $(LLVM_DEFS)
--AM_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-exceptions -fno-rtti
-+AM_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-exceptions
- ACLOCAL_AMFLAGS=-I m4
- if DEBUG_BUILD
- LLVM_CONFIG=llvm/Debug/bin/llvm-config
-@@ -43,7 +43,7 @@ lli_LDADD=libllvmbitreader.la libllvmfullcodegen.la libllvmjit.la
- libclamavcxx_la_LIBADD=libllvmjit.la
- libclamavcxx_la_DEPENDENCIES=libllvmjit.la libllvmcodegen.la libllvmsystem.la
- libclamavcxx_la_LDFLAGS=-no-undefined
--libclamavcxx_la_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-rtti
-+libclamavcxx_la_CXXFLAGS = $(LLVM_CXXFLAGS)
- libclamavcxx_la_SOURCES = bytecode2llvm.cpp
- if BUILD_X86
- libclamavcxx_la_LIBADD+=libllvmx86codegen.la
-@@ -818,7 +818,7 @@ lli_SOURCES=\
-     llvm/tools/lli/lli.cpp
- 
- llc_CPPFLAGS=$(LLVM_INCLUDES) $(LLVM_DEFS)
--llc_CXXFLAGS=$(LLVM_CXXFLAGS) -fno-rtti
-+llc_CXXFLAGS=$(LLVM_CXXFLAGS)
- llc_LDADD=libllvmbitreader.la libllvmasmprinter.la libllvmasmparser.la $(lli_LDADD)
- llc_SOURCES=\
-     llvm/lib/MC/MCInstPrinter.cpp\
diff --git a/security/clamav-devel/files/patch-libclamav__c++__Makefile.in b/security/clamav-devel/files/patch-libclamav__c++__Makefile.in
deleted file mode 100644
index 7db8171447ca..000000000000
--- a/security/clamav-devel/files/patch-libclamav__c++__Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- libclamav/c++/Makefile.in
-+++ libclamav/c++/Makefile.in
-@@ -901,7 +901,7 @@ LLVM_INCLUDES = -I$(top_srcdir)/llvm/include -I$(top_builddir)/llvm/include
- # TODO: HP-UX should have -D_REENTRANT -D_HPUX_SOURCE
- LLVM_DEFS = -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D_DEBUG -D_GNU_SOURCE
- AM_CPPFLAGS = -I$(top_srcdir)/../.. -I$(top_srcdir)/.. -I$(top_builddir)/../../ $(LLVM_INCLUDES) $(LLVM_DEFS)
--AM_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-exceptions -fno-rtti
-+AM_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-exceptions
- ACLOCAL_AMFLAGS = -I m4
- @DEBUG_BUILD_FALSE@LLVM_CONFIG = llvm/Release/bin/llvm-config
- @DEBUG_BUILD_TRUE@LLVM_CONFIG = llvm/Debug/bin/llvm-config
-@@ -928,7 +928,7 @@ libclamavcxx_la_DEPENDENCIES = libllvmjit.la libllvmcodegen.la \
- 	libllvmsystem.la $(am__append_2) $(am__append_6) \
- 	$(am__append_10)
- libclamavcxx_la_LDFLAGS = -no-undefined
--libclamavcxx_la_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-rtti
-+libclamavcxx_la_CXXFLAGS = $(LLVM_CXXFLAGS)
- libclamavcxx_la_SOURCES = bytecode2llvm.cpp
- LLVM_CXXFLAGS = -Woverloaded-virtual -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings -Wno-missing-field-initializers -Wno-variadic-macros
- TBLGENFILES = llvm/include/llvm/Intrinsics.gen X86GenRegisterInfo.h.inc X86GenRegisterNames.inc X86GenRegisterInfo.inc X86GenInstrNames.inc X86GenInstrInfo.inc\
-@@ -1539,7 +1539,7 @@ lli_SOURCES = \
-     llvm/tools/lli/lli.cpp
- 
- llc_CPPFLAGS = $(LLVM_INCLUDES) $(LLVM_DEFS)
--llc_CXXFLAGS = $(LLVM_CXXFLAGS) -fno-rtti
-+llc_CXXFLAGS = $(LLVM_CXXFLAGS)
- llc_LDADD = libllvmbitreader.la libllvmasmprinter.la libllvmasmparser.la $(lli_LDADD)
- llc_SOURCES = \
-     llvm/lib/MC/MCInstPrinter.cpp\