Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/security/clamav/Makefile,v
retrieving revision 1.120
diff -u -p -r1.120 Makefile
--- Makefile	21 Aug 2008 14:25:33 -0000	1.120
+++ Makefile	12 Sep 2008 04:32:22 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	0.93.3
+PORTVERSION=	0.94
 CATEGORIES=	security
 MASTER_SITES=	SF
 
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/security/clamav/distinfo,v
retrieving revision 1.48
diff -u -p -r1.48 distinfo
--- distinfo	7 Jul 2008 20:37:37 -0000	1.48
+++ distinfo	12 Sep 2008 04:35:07 -0000
@@ -1,3 +1,3 @@
-MD5 (clamav-0.93.3.tar.gz) = 06d87fbece062e5c0661ee07703208c9
-SHA256 (clamav-0.93.3.tar.gz) = 7aa98796671dfe3db5a20e25669404c4e4461d2a6c77de352edf99f2c989e500
-SIZE (clamav-0.93.3.tar.gz) = 18242568
+MD5 (clamav-0.94.tar.gz) = d3f6d5fff2db81950491749166ab0ffa
+SHA256 (clamav-0.94.tar.gz) = ae188c18936ea9154eb6a85ea553c29f4349ee3e95457055fae5fe1b981af602
+SIZE (clamav-0.94.tar.gz) = 20509228
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/security/clamav/pkg-plist,v
retrieving revision 1.36
diff -u -p -r1.36 pkg-plist
--- pkg-plist	20 May 2008 18:06:34 -0000	1.36
+++ pkg-plist	12 Sep 2008 04:44:35 -0000
@@ -12,15 +12,15 @@ include/clamav-config.h
 lib/libclamav.a
 lib/libclamav.la
 lib/libclamav.so
-lib/libclamav.so.4
+lib/libclamav.so.5
 %%UNRAR%%lib/libclamunrar.a
 %%UNRAR%%lib/libclamunrar.la
 %%UNRAR%%lib/libclamunrar.so
-%%UNRAR%%lib/libclamunrar.so.4
+%%UNRAR%%lib/libclamunrar.so.5
 %%UNRAR%%lib/libclamunrar_iface.a
 %%UNRAR%%lib/libclamunrar_iface.la
 %%UNRAR%%lib/libclamunrar_iface.so
-%%UNRAR%%lib/libclamunrar_iface.so.4
+%%UNRAR%%lib/libclamunrar_iface.so.5
 libdata/pkgconfig/libclamav.pc
 @unexec if cmp -s %D/etc/clamd.conf %D/etc/clamd.conf.default; then rm -f %D/etc/clamd.conf; fi
 etc/clamd.conf.default
Index: files/patch-configure
===================================================================
RCS file: /home/ncvs/ports/security/clamav/files/patch-configure,v
retrieving revision 1.10
diff -u -p -r1.10 patch-configure
--- files/patch-configure	13 Mar 2007 20:11:16 -0000	1.10
+++ files/patch-configure	12 Sep 2008 04:40:54 -0000
@@ -1,6 +1,32 @@
---- configure.orig	Thu Mar  1 20:46:19 2007
-+++ configure	Tue Mar 13 10:28:27 2007
-@@ -22431,19 +22431,25 @@
+--- configure.orig	2008-09-01 11:41:18.000000000 -0700
++++ configure	2008-09-11 21:40:30.703529448 -0700
+@@ -16542,7 +16542,6 @@
+     ;;
+ freebsd[45]*)
+     if test "$have_pthreads" = "yes"; then
+-	THREAD_LIBS="-pthread -lc_r"
+ 	TH_SAFE="-thread-safe"
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -16571,7 +16570,7 @@
+     ;;
+ freebsd*)
+     if test "$have_pthreads" = "yes"; then
+-	THREAD_LIBS="-lthr"
++	THREAD_LIBS="%%PTHREAD_LIBS%%"
+ 	TH_SAFE="-thread-safe"
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -16931,7 +16930,7 @@
+ if test "$have_milter" = "yes"; then
+ 
+         save_LDFLAGS="$LDFLAGS"
+-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
++	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS %%PTHREAD_LIBS%%"
+     if test -d /usr/lib/libmilter ; then
+ 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
+     fi
+@@ -17468,19 +17467,25 @@
      sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`
  
  
@@ -25,22 +51,4 @@
 +fi
  
    fi
- fi
-@@ -23087,7 +23093,7 @@
-     ;;
- freebsd*)
-     if test "$have_pthreads" = "yes"; then
--	THREAD_LIBS="-pthread -lc_r"
-+	THREAD_LIBS="%%PTHREAD_LIBS%%"
- 	TH_SAFE="-thread-safe"
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -23427,7 +23433,7 @@
- if test "$have_milter" = "yes"; then
- 
-         save_LDFLAGS="$LDFLAGS"
--	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
-+	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS %%PTHREAD_LIBS%%"
-     if test -d /usr/lib/libmilter ; then
- 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
-     fi
+   if test "x$ac_cv_have_lresolv_r" != "xyes"; then