. Add USES=libtool on security/clamav

. Drop .la files
. Since lib version was downgraded, bump portrevision on ports that depends of clamav
. Fix REQUIRE names on rc.d scripts

7 files changed, 13 insertions, 13 deletions

diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 547d22a00236..a4fac51df1a8 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	clamav
 PORTVERSION=	0.98.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	SF
 
@@ -49,7 +49,7 @@ DMG_XAR_USE=		GNOME=libxml2
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=		gmake
+USES=		gmake libtool
 INSTALL_TARGET=	install-strip
 USE_RC_SUBR=	clamav-clamd clamav-freshclam
 
diff --git a/security/clamav/files/clamav-freshclam.in b/security/clamav/files/clamav-freshclam.in
index 84b65539709e..6f3165117817 100644
--- a/security/clamav/files/clamav-freshclam.in
+++ b/security/clamav/files/clamav-freshclam.in
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: clamav_freshclam
-# REQUIRE: LOGIN clamd
+# REQUIRE: LOGIN clamav_clamd
 # BEFORE: mail
 # KEYWORD: shutdown
 
diff --git a/security/clamav/files/clamav-milter.in b/security/clamav/files/clamav-milter.in
index 1c3d87815989..02ba20a37aaa 100644
--- a/security/clamav/files/clamav-milter.in
+++ b/security/clamav/files/clamav-milter.in
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: clamav_milter
-# REQUIRE: LOGIN clamd
+# REQUIRE: LOGIN clamav_clamd
 # BEFORE: mail
 # KEYWORD: shutdown
 
diff --git a/security/clamav/pkg-plist b/security/clamav/pkg-plist
index bed6b66ed12e..7f6918cc1e44 100644
--- a/security/clamav/pkg-plist
+++ b/security/clamav/pkg-plist
@@ -11,15 +11,15 @@ bin/sigtool
 sbin/clamd
 include/clamav.h
 include/clamav-config.h
-lib/libclamav.la
 lib/libclamav.so
-lib/libclamav.so.7
-%%UNRAR%%lib/libclamunrar.la
+lib/libclamav.so.6
+lib/libclamav.so.6.1.22
 %%UNRAR%%lib/libclamunrar.so
-%%UNRAR%%lib/libclamunrar.so.7
-%%UNRAR%%lib/libclamunrar_iface.la
+%%UNRAR%%lib/libclamunrar.so.6
+%%UNRAR%%lib/libclamunrar.so.6.1.22
 %%UNRAR%%lib/libclamunrar_iface.so
-%%UNRAR%%lib/libclamunrar_iface.so.7
+%%UNRAR%%lib/libclamunrar_iface.so.6
+%%UNRAR%%lib/libclamunrar_iface.so.6.1.22
 libdata/pkgconfig/libclamav.pc
 man/man1/clambc.1.gz
 man/man1/clamconf.1.gz
diff --git a/security/clamcour/Makefile b/security/clamcour/Makefile
index 752732441705..978603d9b877 100644
--- a/security/clamcour/Makefile
+++ b/security/clamcour/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	clamcour
 PORTVERSION=	0.3.8
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	security mail
 MASTER_SITES=	http://www.becrux.com/pages/projects/clamcour/
 
diff --git a/security/py-clamav/Makefile b/security/py-clamav/Makefile
index ff715a3abafe..c8699fdeb5bc 100644
--- a/security/py-clamav/Makefile
+++ b/security/py-clamav/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	clamav
 PORTVERSION=	0.4.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security python
 MASTER_SITES=	http://xael.org/norman/python/pyclamav/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/security/spybye/Makefile b/security/spybye/Makefile
index 87ba14176b3b..6bda6e03addb 100644
--- a/security/spybye/Makefile
+++ b/security/spybye/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	spybye
 PORTVERSION=	0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security www
 MASTER_SITES=	http://www.monkey.org/~provos/