- Update to 20091221

- Remove patches that were applied upstream
- Fix build on FreeBSD < 8.0 [1]

Reported by:	many people by email [1]

8 files changed, 22 insertions, 67 deletions

diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index eebb85c87910..96361e62154b 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	20091216
+PORTVERSION=	20091221
 CATEGORIES=	security
 MASTER_SITES=	http://www.clamav.net/snapshot/ \
 		LOCAL/garga/clamav-devel
diff --git a/security/clamav-devel/distinfo b/security/clamav-devel/distinfo
index f0468390462b..96b71f8f861f 100644
--- a/security/clamav-devel/distinfo
+++ b/security/clamav-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (clamav-devel-20091216.tar.gz) = 2dc3926cd6d5686d52af2c844c80936a
-SHA256 (clamav-devel-20091216.tar.gz) = 2811fbdd744af4a1817fef30a0c57baa88bd43442878aa3e6eb91908a5edfb28
-SIZE (clamav-devel-20091216.tar.gz) = 20996092
+MD5 (clamav-devel-20091221.tar.gz) = 69616358f2e905b93742c8518e2291c4
+SHA256 (clamav-devel-20091221.tar.gz) = 34569c63cc6cd3c1911392ddf3e4cf2ec94d881dc5b2d58ffd12af3389c39472
+SIZE (clamav-devel-20091221.tar.gz) = 21573913
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 d0a3a6c6ae55..000000000000
--- a/security/clamav-devel/files/patch-libclamav__c++__Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- libclamav/c++/Makefile.am
-+++ libclamav/c++/Makefile.am
-@@ -71,7 +71,7 @@ LLVM_CXXFLAGS=-Woverloaded-virtual -pedantic -Wno-long-long -Wall -W -Wno-unused
- EXTRA_DIST=$(top_srcdir)/llvm llvmdejagnu.sh
- 
- libllvmsystem_la_LDFLAGS=-pthread
--libllvmsystem_la_LIBADD=-ldl
-+libllvmsystem_la_LIBADD=
- libllvmsystem_la_SOURCES=\
- 	llvm/lib/System/Alarm.cpp\
- 	llvm/lib/System/Atomic.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 a24c0fffe958..000000000000
--- a/security/clamav-devel/files/patch-libclamav__c++__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libclamav/c++/Makefile.in.orig	2009-12-16 00:16:57.000000000 -0200
-+++ libclamav/c++/Makefile.in	2009-12-16 10:42:05.000000000 -0200
-@@ -805,7 +805,7 @@
- LLVM_CXXFLAGS = -Woverloaded-virtual -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings -Wno-missing-field-initializers -Wno-variadic-macros
- EXTRA_DIST = $(top_srcdir)/llvm llvmdejagnu.sh
- libllvmsystem_la_LDFLAGS = -pthread
--libllvmsystem_la_LIBADD = -ldl
-+libllvmsystem_la_LIBADD =
- libllvmsystem_la_SOURCES = \
- 	llvm/lib/System/Alarm.cpp\
- 	llvm/lib/System/Atomic.cpp\
diff --git a/security/clamav-devel/files/patch-libclamav__c++__llvm__lib__System__Unix__Signals.inc b/security/clamav-devel/files/patch-libclamav__c++__llvm__lib__System__Unix__Signals.inc
deleted file mode 100644
index 78e5f98898f4..000000000000
--- a/security/clamav-devel/files/patch-libclamav__c++__llvm__lib__System__Unix__Signals.inc
+++ /dev/null
@@ -1,12 +0,0 @@
---- libclamav/c++/llvm/lib/System/Unix/Signals.inc
-+++ libclamav/c++/llvm/lib/System/Unix/Signals.inc
-@@ -191,7 +191,8 @@ static void PrintStackTrace(void *) {
-   // Use backtrace() to output a backtrace on Linux systems with glibc.
-   int depth = backtrace(StackTrace,
-                         static_cast<int>(array_lengthof(StackTrace)));
--#if HAVE_DLFCN_H && __GNUG__
-+#if HAVE_DLFCN_H && __GNUG__ && 0
-+/* CLAMAV LOCAL: turn off dladdr() because we don't link -ldl */
-   int width = 0;
-   for (int i = 0; i < depth; ++i) {
-     Dl_info dlinfo;
diff --git a/security/clamav-devel/files/patch-libclamav__disasm.c b/security/clamav-devel/files/patch-libclamav__disasm.c
deleted file mode 100644
index 17291f1b79bf..000000000000
--- a/security/clamav-devel/files/patch-libclamav__disasm.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- libclamav/disasm.c
-+++ libclamav/disasm.c
-@@ -1545,8 +1545,12 @@ static uint8_t *disasm_x86(uint8_t *command, unsigned int len, struct DISASMED *
- 	    GETBYTE(b);
- 	    shiftme+=b<<(i*8);
- 	  }
--	  shiftme<<=((8-mod)*8);
--	  s->args[reversed].arg.marg.disp=shiftme>>((8-mod)*8);
-+	  if (mod) {
-+	      shiftme<<=((8-mod)*8);
-+	      s->args[reversed].arg.marg.disp=shiftme>>((8-mod)*8);
-+	  } else {
-+	      s->args[reversed].arg.marg.disp=0;
-+	  }
- 	} else {
- 	  if (mod==0 && rm==6) {
- 	    s->args[reversed].arg.marg.r1=REG_INVALID;
diff --git a/security/clamav-devel/files/patch-libclamav__fmap.h b/security/clamav-devel/files/patch-libclamav__fmap.h
new file mode 100644
index 000000000000..3b562d610f44
--- /dev/null
+++ b/security/clamav-devel/files/patch-libclamav__fmap.h
@@ -0,0 +1,18 @@
+--- ./libclamav/fmap.h.orig	2009-12-21 11:10:50.000000000 -0200
++++ ./libclamav/fmap.h	2009-12-21 11:11:00.000000000 -0200
+@@ -21,6 +21,15 @@
+ #ifndef __FMAP_H
+ #define __FMAP_H
+ 
++#if defined(__FreeBSD__)
++/* Needed to check FreeBSD version */
++#include <osreldate.h>
++
++#if (__FreeBSD_version < 800000)
++#include <unistd.h>
++#endif
++#endif
++
+ #include <time.h>
+ #include "cltypes.h"
+ 
diff --git a/security/clamav-devel/files/patch-libclamav__spin.c b/security/clamav-devel/files/patch-libclamav__spin.c
deleted file mode 100644
index d0aa156f2400..000000000000
--- a/security/clamav-devel/files/patch-libclamav__spin.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libclamav/spin.c
-+++ libclamav/spin.c
-@@ -146,7 +146,7 @@ static uint32_t summit (char *src, int size)
-       eax ^= ebx>>8 & 0xff;
-       eax += 0x7801a108;
-       eax ^= ebx;
--      CLI_ROR(eax, ebx&0xff);
-+      CLI_ROR(eax, ebx&0x1f);
-       swap = eax;
-       eax = ebx;
-       ebx = swap;
-