33 files changed, 127 insertions, 80 deletions

diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile
index 4fc9987dc59d..b3015833a69f 100644
--- a/ftp/proftpd-devel/Makefile
+++ b/ftp/proftpd-devel/Makefile
@@ -252,7 +252,7 @@ DISTFILES+=	mod_clamav-0.5.1.tar.bz2:clam
 EXTRACT_ONLY+=	mod_clamav-0.5.1.tar.bz2
 USE_CLAMAV=	yes
 MODULES:=${MODULES}:mod_clamav
-LIB_DEPENDS+=	clamav.4:${PORTSDIR}/security/clamav
+LIB_DEPENDS+=	clamav.5:${PORTSDIR}/security/clamav
 INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
 LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
 .endif
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index dc11a9039220..c1bbc131e2bf 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -226,7 +226,7 @@ DISTFILES+=	mod_clamav-0.5.1.tar.bz2:clam
 EXTRACT_ONLY+=	mod_clamav-0.5.1.tar.bz2
 USE_CLAMAV=	yes
 MODULES:=${MODULES}:mod_clamav
-LIB_DEPENDS+=	clamav.4:${PORTSDIR}/security/clamav
+LIB_DEPENDS+=	clamav.5:${PORTSDIR}/security/clamav
 INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
 LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
 .endif
diff --git a/mail/clamfilter/Makefile b/mail/clamfilter/Makefile
index 8a6d87fc84b0..93f40e8c3829 100644
--- a/mail/clamfilter/Makefile
+++ b/mail/clamfilter/Makefile
@@ -13,7 +13,7 @@
 
 PORTNAME=	clamfilter
 PORTVERSION=	0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.wyae.de/software/ensita-clamfilter/
 
diff --git a/mail/claws-mail-clamav/Makefile b/mail/claws-mail-clamav/Makefile
index 947428b56643..a9d2354a80bf 100644
--- a/mail/claws-mail-clamav/Makefile
+++ b/mail/claws-mail-clamav/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Clamav plugin for claws-mail
 
 BUILD_DEPENDS=	claws-mail>=3.3.1:${PORTSDIR}/mail/claws-mail
 RUN_DEPENDS=	claws-mail>=3.3.1:${PORTSDIR}/mail/claws-mail
-LIB_DEPENDS=	clamav.4:${PORTSDIR}/security/clamav
+LIB_DEPENDS=	clamav.5:${PORTSDIR}/security/clamav
 
 USE_GMAKE=	yes
 USE_XORG=	x11
@@ -30,6 +30,6 @@ PLIST_FILES=	lib/claws-mail/plugins/clamav.a \
 		lib/claws-mail/plugins/clamav.la \
 		lib/claws-mail/plugins/clamav.so
 
-BROKEN=	Doesn't build with clamav-0.93
+BROKEN=	Doesn't build with clamav-0.93 or higher
 
 .include <bsd.port.mk>
diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index fe765dba1dd7..5fd41d23ff9d 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -13,7 +13,7 @@
 
 PORTNAME=	dspam-devel
 PORTVERSION=	${PORTVER_MAJ}${SNAP_DATE}
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	# set later
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index edc1bfcfd0ca..7c8a3d33f901 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -12,7 +12,7 @@
 
 PORTNAME=	dspam
 PORTVERSION=	${PORTVER_MAJ}${SNAP_DATE}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	# set later
 
diff --git a/mail/mailscanner-devel/Makefile b/mail/mailscanner-devel/Makefile
index c56abbeca7c5..7a791c0ae585 100644
--- a/mail/mailscanner-devel/Makefile
+++ b/mail/mailscanner-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	MailScanner
 PORTVERSION=	4.60.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mailscanner.info/files/4/tar/
 PKGNAMESUFFIX=	-devel
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index fbd2fcded361..baeb7a52a1cb 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	MailScanner
 PORTVERSION=	4.67.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mailscanner.info/files/4/tar/
 DISTNAME=	${PORTNAME}-install-${PORTVERSION}-${PATCHLEVEL}
diff --git a/mail/ngmp/Makefile b/mail/ngmp/Makefile
index 5fa05c2f512a..6e9ddc832a12 100644
--- a/mail/ngmp/Makefile
+++ b/mail/ngmp/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	ngmp
 PORTVERSION=	0.1.3
+PORTREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.prevantage.com/releases/ \
 		ftp://ftp2.prevantage.com/releases/
diff --git a/mail/p5-Mail-ClamAV/Makefile b/mail/p5-Mail-ClamAV/Makefile
index 5e7faaca6980..8f9bb8794d77 100644
--- a/mail/p5-Mail-ClamAV/Makefile
+++ b/mail/p5-Mail-ClamAV/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Mail-ClamAV
 PORTVERSION=	0.20
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/mail/p5-Mail-ClamAV/files/patch-ClamAV.pm b/mail/p5-Mail-ClamAV/files/patch-ClamAV.pm
index 575326b8f63e..f699fa1f9f43 100644
--- a/mail/p5-Mail-ClamAV/files/patch-ClamAV.pm
+++ b/mail/p5-Mail-ClamAV/files/patch-ClamAV.pm
@@ -1,17 +1,26 @@
---- ./ClamAV.pm.orig	2007-02-20 05:42:16.000000000 -0800
-+++ ./ClamAV.pm	2008-05-02 17:22:26.382239887 -0700
-@@ -73,10 +73,6 @@
+--- ClamAV.pm.orig	2007-02-20 11:42:16.000000000 -0200
++++ ClamAV.pm	2008-09-13 12:02:25.000000000 -0300
+@@ -58,7 +58,6 @@
+     CL_EACCES
+     CL_ENULLARG
+     CL_ETMPFILE
+-    CL_EFSYNC
+     CL_EMEM
+     CL_EOPEN
+     CL_EMALFDB
+@@ -71,11 +70,6 @@
+     CL_EIO
+     CL_EFORMAT
      CL_ESUPPORT
-     CL_ELOCKDB
- 
+-    CL_ELOCKDB
+-
 -    CL_ENCINIT
 -    CL_ENCLOAD
 -    CL_ENCIO
--
+ 
      CL_SCAN_RAW
      CL_SCAN_ARCHIVE
-     CL_SCAN_MAIL
-@@ -88,7 +84,6 @@
+@@ -88,7 +82,6 @@
      CL_SCAN_MAILURL
      CL_SCAN_BLOCKMAX
      CL_SCAN_ALGORITHMIC
@@ -19,7 +28,7 @@
      CL_SCAN_PHISHING_BLOCKSSL
  
      CL_SCAN_PHISHING_BLOCKCLOAK
-@@ -169,12 +164,9 @@
+@@ -169,12 +162,9 @@
      VERSION  => $VERSION,
      PREFIX   => 'clamav_perl_',
      NAME     => "Mail::ClamAV",
@@ -35,7 +44,7 @@
  use Inline C => <<'END_OF_C';
  #include <stdio.h>
  #include <string.h>
-@@ -210,12 +202,10 @@
+@@ -210,12 +200,10 @@
  
      /* set defaults for limits */
      c->limits.maxreclevel = 5;
@@ -48,7 +57,7 @@
      c->limits.archivememlim = 1;
  
      if (S_ISDIR(st.st_mode)) {
-@@ -290,19 +280,6 @@
+@@ -290,19 +278,6 @@
      return SvClam(self)->limits.maxreclevel;
  }
  
@@ -68,7 +77,7 @@
  int clamav_perl_maxfiles(SV *self, ...)
  {
      Inline_Stack_Vars;
-@@ -329,19 +306,6 @@
+@@ -329,19 +304,6 @@
      return SvClam(self)->limits.maxfilesize;
  }
  
@@ -88,21 +97,31 @@
  int clamav_perl_archivememlim(SV *self, ...)
  {
      Inline_Stack_Vars;
-@@ -496,13 +460,7 @@
+@@ -481,7 +443,6 @@
+     if (strEQ("CL_EACCES", name)) return CL_EACCES;
+     if (strEQ("CL_ENULLARG", name)) return CL_ENULLARG;
+     if (strEQ("CL_ETMPFILE", name)) return CL_ETMPFILE;
+-    if (strEQ("CL_EFSYNC", name)) return CL_EFSYNC;
+     if (strEQ("CL_EMEM", name)) return CL_EMEM;
+     if (strEQ("CL_EOPEN", name)) return CL_EOPEN;
+     if (strEQ("CL_EMALFDB", name)) return CL_EMALFDB;
+@@ -494,15 +455,8 @@
+     if (strEQ("CL_EIO", name)) return CL_EIO;
+     if (strEQ("CL_EFORMAT", name)) return CL_EFORMAT;
      if (strEQ("CL_ESUPPORT", name)) return CL_ESUPPORT;
-     if (strEQ("CL_ELOCKDB", name)) return CL_ELOCKDB;
- 
+-    if (strEQ("CL_ELOCKDB", name)) return CL_ELOCKDB;
+-
 -    /* NodalCore */
 -    if (strEQ("CL_ENCINIT", name)) return CL_ENCINIT;
 -    if (strEQ("CL_ENCLOAD", name)) return CL_ENCLOAD;
 -    if (strEQ("CL_ENCIO", name)) return CL_ENCIO;
--
+ 
      /* db options */
 -    if (strEQ("CL_DB_NCORE", name)) return CL_DB_NCORE;
      if (strEQ("CL_DB_PHISHING", name)) return CL_DB_PHISHING;
      if (strEQ("CL_DB_ACONLY", name)) return CL_DB_ACONLY;
      if (strEQ("CL_DB_PHISHING_URLS", name)) return CL_DB_PHISHING_URLS;
-@@ -522,7 +480,6 @@
+@@ -522,7 +476,6 @@
      if (strEQ("CL_SCAN_MAILURL", name)) return CL_SCAN_MAILURL;
      if (strEQ("CL_SCAN_BLOCKMAX", name)) return CL_SCAN_BLOCKMAX;
      if (strEQ("CL_SCAN_ALGORITHMIC", name)) return CL_SCAN_ALGORITHMIC;
@@ -110,7 +129,7 @@
      if (strEQ("CL_SCAN_PHISHING_BLOCKSSL", name)) return CL_SCAN_PHISHING_BLOCKSSL;
      if (strEQ("CL_SCAN_PHISHING_BLOCKCLOAK", name)) return CL_SCAN_PHISHING_BLOCKCLOAK;
      if (strEQ("CL_SCAN_ELF", name)) return CL_SCAN_ELF;
-@@ -602,11 +559,9 @@
+@@ -602,11 +555,9 @@
  
      # Set some limits (only applies to scan())
      $c->maxreclevel(4);
@@ -122,7 +141,7 @@
  
      # Scan a filehandle (scandesc in clamav)
      # scan(FileHandle or path, Bitfield of options)
-@@ -701,10 +656,6 @@
+@@ -701,10 +652,6 @@
  
  Enable algorithmic detection of viruses. 
  
@@ -133,7 +152,29 @@
  =item CL_SCAN_PHISHING_BLOCKSSL
  
  Phishing module: always block SSL mismatches in URLs. 
-@@ -890,10 +841,6 @@
+@@ -793,10 +740,6 @@
+ 
+ tmpfile() failed 
+ 
+-=item CL_EFSYNC
+-
+-fsync() failed 
+-
+ =item CL_EMEM
+ 
+ memory allocation error 
+@@ -845,10 +788,6 @@
+ 
+ not supported data format 
+ 
+-=item CL_ELOCKDB
+-
+-can't lock DB directory 
+-
+ =item CL_ENCINIT
+ 
+ NodalCore initialization failed 
+@@ -890,10 +829,6 @@
  
  Sets the maximum recursion level into archives [default 5].
  
@@ -144,7 +185,7 @@
  =item maxfiles
  
  Maximum number of files that will be scanned [default 1000]. A value of zero
-@@ -904,12 +851,6 @@
+@@ -904,12 +839,6 @@
  Maximum file size that will be scanned in bytes [default 10M]. A value of zero
  disables the check.
  
diff --git a/mail/p5-qpsmtpd/Makefile b/mail/p5-qpsmtpd/Makefile
index f3e74547cd18..00322b1a52ad 100644
--- a/mail/p5-qpsmtpd/Makefile
+++ b/mail/p5-qpsmtpd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qpsmtpd
 PORTVERSION=	0.40
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail perl5
 MASTER_SITES=	http://smtpd.develooper.com/files/
 PKGNAMEPREFIX=	p5-
diff --git a/mail/qscan/Makefile b/mail/qscan/Makefile
index 959d434bf41d..382b493f0a0d 100644
--- a/mail/qscan/Makefile
+++ b/mail/qscan/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qscan
 PORTVERSION=	1.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail security
 MASTER_SITES=	http://download.pureftpd.org/pub/qscan/ \
 		ftp://ftp.pureftpd.org/pub/pure-ftpd/misc/qscan/
diff --git a/mail/qsheff/Makefile b/mail/qsheff/Makefile
index 5d66dc7a0579..83bf2344aa82 100644
--- a/mail/qsheff/Makefile
+++ b/mail/qsheff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qsheff-II
 PORTVERSION=	2.1.r3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.enderunix.org/qsheff/ \
 		SF/qsheff
diff --git a/mail/simscan/Makefile b/mail/simscan/Makefile
index c7ee5706ba02..e5ec52783187 100644
--- a/mail/simscan/Makefile
+++ b/mail/simscan/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	simscan
 PORTVERSION=	1.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail security
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
diff --git a/security/clamassassin/Makefile b/security/clamassassin/Makefile
index a4924a2df56f..2a5b303b92fd 100644
--- a/security/clamassassin/Makefile
+++ b/security/clamassassin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clamassassin
 PORTVERSION=	1.2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://jameslick.com/clamassassin/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 5c2d6d7d596b..712c754650f4 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	0.93.3
+PORTVERSION=	0.94
 CATEGORIES=	security
 MASTER_SITES=	SF
 
diff --git a/security/clamav/distinfo b/security/clamav/distinfo
index 1ea5d5ba45b7..3824e25cfdb6 100644
--- a/security/clamav/distinfo
+++ b/security/clamav/distinfo
@@ -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
diff --git a/security/clamav/files/patch-configure b/security/clamav/files/patch-configure
index 42fbdcbea021..45424480bb1f 100644
--- a/security/clamav/files/patch-configure
+++ b/security/clamav/files/patch-configure
@@ -1,6 +1,24 @@
---- 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 15:41:18.000000000 -0300
++++ configure	2008-09-05 08:57:53.000000000 -0300
+@@ -16571,7 +16571,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 +16931,7 @@
+ if test "$have_milter" = "yes"; then
+ 
+         save_LDFLAGS="$LDFLAGS"
+-	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
++	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS $THREAD_LIBS"
+     if test -d /usr/lib/libmilter ; then
+ 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
+     fi
+@@ -17468,19 +17468,25 @@
      sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`
  
  
@@ -25,22 +43,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
diff --git a/security/clamcour/Makefile b/security/clamcour/Makefile
index 2e39d6e8dd97..6b0ef35743f8 100644
--- a/security/clamcour/Makefile
+++ b/security/clamcour/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clamcour
 PORTVERSION=	0.3.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security mail
 MASTER_SITES=	http://www.becrux.com/pages/projects/clamcour/
 
@@ -15,7 +15,7 @@ MAINTAINER=	bsd@dino.sk
 COMMENT=	ClamAV courier filter
 
 BUILD_DEPENDS=	courier-config:${PORTSDIR}/mail/courier
-LIB_DEPENDS=	clamav.4:${PORTSDIR}/security/clamav
+LIB_DEPENDS=	clamav.5:${PORTSDIR}/security/clamav
 
 GNU_CONFIGURE=	yes
 
diff --git a/security/clamsmtp/Makefile b/security/clamsmtp/Makefile
index b273a56df402..4d72e89e67ef 100644
--- a/security/clamsmtp/Makefile
+++ b/security/clamsmtp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	clamsmtp
 PORTVERSION=	1.9
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://memberwebs.com/stef/software/clamsmtp/
 
diff --git a/security/clamtk/Makefile b/security/clamtk/Makefile
index 765340c45f63..67bb15878f43 100644
--- a/security/clamtk/Makefile
+++ b/security/clamtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clamtk
 PORTVERSION=	3.08
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	SF
 
diff --git a/security/klamav/Makefile b/security/klamav/Makefile
index 15bc772fdc80..755ff025ad78 100644
--- a/security/klamav/Makefile
+++ b/security/klamav/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 MAINTAINER=	anderson@cnpm.embrapa.br
 COMMENT=	A KDE 3 front-end to Clam Anti-Virus
 
-LIB_DEPENDS=	clamav:${PORTSDIR}/security/clamav
+LIB_DEPENDS=	clamav.5:${PORTSDIR}/security/clamav
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -36,6 +36,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${QT_PREFIX} \
 
 USE_KDELIBS_VER=	3
 
+BROKEN=	Doesn't build with clamav-0.94
+
 .include <bsd.port.pre.mk>
 
 pre-configure:
diff --git a/security/p5-File-Scan-ClamAV/Makefile b/security/p5-File-Scan-ClamAV/Makefile
index 0fb04e76d7d1..28ce26791281 100644
--- a/security/p5-File-Scan-ClamAV/Makefile
+++ b/security/p5-File-Scan-ClamAV/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	File-Scan-ClamAV
 PORTVERSION=	1.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/security/py-clamav/Makefile b/security/py-clamav/Makefile
index 8cc7cb17e0f3..8af1fd27f40c 100644
--- a/security/py-clamav/Makefile
+++ b/security/py-clamav/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	clamav
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	http://xael.org/norman/python/pyclamav/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +16,7 @@ DISTNAME=	py${PORTNAME}-${PORTVERSION}
 MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	A python binding to libclamav written in C
 
-LIB_DEPENDS=	clamav.4:${PORTSDIR}/security/clamav
+LIB_DEPENDS=	clamav.5:${PORTSDIR}/security/clamav
 
 DIST_SUBDIR=	python
 USE_PYTHON=	yes
diff --git a/security/spybye/Makefile b/security/spybye/Makefile
index a2fc70cb8907..7da0ed9064d1 100644
--- a/security/spybye/Makefile
+++ b/security/spybye/Makefile
@@ -27,7 +27,7 @@ MAN1=		spybye.1
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_CLAMAV)
-LIB_DEPENDS+=	clamav:${PORTSDIR}/security/clamav
+LIB_DEPENDS+=	clamav.5:${PORTSDIR}/security/clamav
 CONFIGURE_ARGS+=	--with-libclamav=${PREFIX}/bin
 .endif
 
diff --git a/security/squidclam/Makefile b/security/squidclam/Makefile
index 35e6ca5abf8d..0fd568d1e511 100644
--- a/security/squidclam/Makefile
+++ b/security/squidclam/Makefile
@@ -31,7 +31,7 @@ SUB_FILES=	pkg-message
 PLIST_FILES=	bin/squidclam %%EXAMPLESDIR%%/squidclam.conf
 PLIST_DIRS=	%%EXAMPLESDIR%%
 
-BROKEN=	Doesn't build with clamav-0.93
+BROKEN=	Doesn't build with clamav-0.93 or higher
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile
index d94cce93dd67..d3d8c0dfe728 100644
--- a/www/c-icap/Makefile
+++ b/www/c-icap/Makefile
@@ -31,7 +31,7 @@ OPTIONS=	CLAMAV "Build with srv_clamav service" on \
 			IPV6 "Enable IPv6 support" off
 #		PERL "With Perl support" off
 
-BROKEN=	Doesn't build with clamav-0.93
+BROKEN=	Doesn't build with clamav-0.93 or higher
 
 .include <bsd.port.pre.mk>
 
@@ -56,7 +56,7 @@ CONFIGURE_ARGS+=	--without-perl
 .endif
 
 .if !defined(WITHOUT_CLAMAV)
-LIB_DEPENDS+=	clamav.4:${PORTSDIR}/security/clamav
+LIB_DEPENDS+=	clamav.5:${PORTSDIR}/security/clamav
 PLIST_SUB+=	CLAMAV=""
 CONFIGURE_ARGS+=	--with-clamav
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
diff --git a/www/dansguardian-devel/Makefile b/www/dansguardian-devel/Makefile
index 1af6d3ab29e2..e9070599a7c7 100644
--- a/www/dansguardian-devel/Makefile
+++ b/www/dansguardian-devel/Makefile
@@ -74,7 +74,7 @@ PLIST_SUB+=		CLISCANCONF="@comment "
 
 .if defined(WITH_DG_CLAMAV)
 CONFIGURE_ARGS+=	--enable-clamav
-LIB_DEPENDS+=		clamav.4:${PORTSDIR}/security/clamav
+LIB_DEPENDS+=		clamav.5:${PORTSDIR}/security/clamav
 PLIST_SUB+=		CLAMAVCONF=""
 .else
 PLIST_SUB+=		CLAMAVCONF="@comment "
diff --git a/www/gurlchecker/Makefile b/www/gurlchecker/Makefile
index ee5a3fad6cce..654aa9c0bea2 100644
--- a/www/gurlchecker/Makefile
+++ b/www/gurlchecker/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gurlchecker
 PORTVERSION=	0.10.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	www gnome
 MASTER_SITES=	http://labs.libre-entreprise.org/frs/download.php/%SUBDIR%/
 MASTER_SITE_SUBDIR=	547
@@ -51,7 +51,7 @@ CONFIGURE_ARGS+=	--disable-tidy
 .endif
 
 .if defined(WITH_CLAMAV)
-LIB_DEPENDS+=	clamav.4:${PORTSDIR}/security/clamav
+LIB_DEPENDS+=	clamav.5:${PORTSDIR}/security/clamav
 .else
 CONFIGURE_ARGS+=	--disable-clamav
 .endif
diff --git a/www/havp/Makefile b/www/havp/Makefile
index c52c3fbccdc0..46469231fd8e 100644
--- a/www/havp/Makefile
+++ b/www/havp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	havp
 PORTVERSION=	0.88
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.server-side.de/download/ \
 				http://bio3k.softboard.ru/uploads/arch/
@@ -14,7 +15,7 @@ MASTER_SITES=	http://www.server-side.de/download/ \
 MAINTAINER=	b3k@mail.ru
 COMMENT=	HTTP Antivirus Proxy
 
-LIB_DEPENDS=	clamav.4:${PORTSDIR}/security/clamav
+LIB_DEPENDS=	clamav.5:${PORTSDIR}/security/clamav
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/www/mod_clamav/Makefile b/www/mod_clamav/Makefile
index 743fe0e3aca1..1d1b03c48da8 100644
--- a/www/mod_clamav/Makefile
+++ b/www/mod_clamav/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_clamav
 PORTVERSION=	0.22
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www security
 MASTER_SITES=	http://software.othello.ch/mod_clamav/ \
 		http://www.kommunity.net/download/mod_clamav/
@@ -27,10 +27,10 @@ IGNORE=	mod_clamav only compile and run with apache-2.0.x
 .endif
 
 .if defined(WITH_CLAMAVDEVEL)
-LIB_DEPENDS+=	clamav:${PORTSDIR}/security/clamav-devel
+LIB_DEPENDS+=	clamav.5:${PORTSDIR}/security/clamav-devel
 .else
 CLAMAV_PORT=	security/clamav
-LIB_DEPENDS+=	clamav:${PORTSDIR}/security/clamav
+LIB_DEPENDS+=	clamav.5:${PORTSDIR}/security/clamav
 .endif
 
 CONFIGURE_ARGS=	--with-apxs=${PREFIX}/sbin/apxs \
diff --git a/www/raqdevil/Makefile b/www/raqdevil/Makefile
index a79c90e45036..7038d72ba50d 100644
--- a/www/raqdevil/Makefile
+++ b/www/raqdevil/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	raqdevil
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www sysutils
 MASTER_SITES=	http://www.raqdevil.com/