- Update to 20090226 to align witth 0.95rc1

- Remove USE_GMAKE, it's not needed
- Remove libgmp dependency, it's using libtommath instead
- Some cosmetic changes to align with clamav port and pacify portlint
- libs version bumped .5 -> .6, it'll fail as dependency of some ports for now

3 files changed, 12 insertions, 16 deletions

diff --git a/security/clamav-devel/Makefile b/security/clamav-devel/Makefile
index d45dccf919e3..398a566ba1e0 100644
--- a/security/clamav-devel/Makefile
+++ b/security/clamav-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clamav
-PORTVERSION=	20090223
+PORTVERSION=	20090226
 CATEGORIES=	security
 MASTER_SITES=	http://www.clamav.net/snapshot/ \
 		${MASTER_SITE_LOCAL}
@@ -17,8 +17,6 @@ DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Command line virus scanner written entirely in C
 
-LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4
-
 OPTIONS=	ARC "Enable arch archives support" On \
 		ARJ "Enable arj archives support" On \
 		LHA "Enable lha archives support" On \
@@ -32,7 +30,6 @@ OPTIONS=	ARC "Enable arch archives support" On \
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	clamav-clamd clamav-freshclam
-USE_GMAKE=	yes
 CONF_FILES=	clamd freshclam
 
 PORTDOCS=	*
@@ -51,8 +48,8 @@ CONFIGURE_ARGS=	--libdir=${PREFIX}/lib \
 		--disable-clamav \
 		--enable-bigstack \
 		--enable-readdir_r \
-		--disable-dependency-tracking \
 		--enable-gethostbyname_r \
+		--disable-dependency-tracking \
 		--enable-experimental
 CPPFLAGS+=	-I${LOCALBASE}/include \
 		${PTHREAD_CFLAGS}
@@ -67,7 +64,8 @@ MAN1=		clamconf.1 \
 		clamscan.1 \
 		freshclam.1 \
 		sigtool.1 \
-		clamdscan.1
+		clamdscan.1 \
+		clamdtop.1
 MAN5=		clamd.conf.5 \
 		freshclam.conf.5
 MAN8=		clamd.8 \
@@ -164,7 +162,7 @@ EXTRA_PATCHES+=		${FILESDIR}/extra-patch-shared_output.c
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -E 's,^(pkgconfigdir = ).*$$,\1$$(prefix)/libdata/pkgconfig,g' \
+	@${REINPLACE_CMD} -e 's,^\(pkgconfigdir = \).*$$,\1$$\(prefix\)/libdata/pkgconfig,g' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} ${SED_CONF} \
 		${WRKSRC}/etc/clamd.conf \
@@ -186,9 +184,6 @@ post-install:
 	@${MKDIR} ${DOCSDIR}/html
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/ChangeLog ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/html/* ${DOCSDIR}/html
-. if defined(WITH_MILTER)
-	${INSTALL_DATA} ${WRKSRC}/clamav-milter/INSTALL ${DOCSDIR}/INSTALL.clamav-milter
-. endif
 .endif
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
diff --git a/security/clamav-devel/distinfo b/security/clamav-devel/distinfo
index 7a3692e5ca79..28836c9d2835 100644
--- a/security/clamav-devel/distinfo
+++ b/security/clamav-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (clamav-devel-20090223.tar.gz) = 97d6ea7c2b0875e2a1284346f2086fee
-SHA256 (clamav-devel-20090223.tar.gz) = 742b0bc7fdd414fc3bc72c237a9e50e4411cb716c1921069893401e806470360
-SIZE (clamav-devel-20090223.tar.gz) = 3739055
+MD5 (clamav-devel-20090226.tar.gz) = a7d413edcc54d536cdcd8bfd6850e809
+SHA256 (clamav-devel-20090226.tar.gz) = 9bc12d12d89bfedd12df6f8368678cf2495dc0b1ac903d33ca44567b1c646e3d
+SIZE (clamav-devel-20090226.tar.gz) = 3756297
diff --git a/security/clamav-devel/pkg-plist b/security/clamav-devel/pkg-plist
index 77bf2009df5a..17e2eda2b91d 100644
--- a/security/clamav-devel/pkg-plist
+++ b/security/clamav-devel/pkg-plist
@@ -1,6 +1,7 @@
 @comment $FreeBSD$
 bin/clamav-config
 bin/clamconf
+bin/clamdtop
 bin/clamscan
 bin/clamdscan
 bin/freshclam
@@ -12,15 +13,15 @@ include/clamav-config.h
 lib/libclamav.a
 lib/libclamav.la
 lib/libclamav.so
-lib/libclamav.so.5
+lib/libclamav.so.6
 %%UNRAR%%lib/libclamunrar.a
 %%UNRAR%%lib/libclamunrar.la
 %%UNRAR%%lib/libclamunrar.so
-%%UNRAR%%lib/libclamunrar.so.5
+%%UNRAR%%lib/libclamunrar.so.6
 %%UNRAR%%lib/libclamunrar_iface.a
 %%UNRAR%%lib/libclamunrar_iface.la
 %%UNRAR%%lib/libclamunrar_iface.so
-%%UNRAR%%lib/libclamunrar_iface.so.5
+%%UNRAR%%lib/libclamunrar_iface.so.6
 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