[Midnightbsd-cvs] mports [19643] trunk/security/clamav: clamav 0.98.7

[laffer1 at midnightbsd.org]

Revision: 19643
          http://svnweb.midnightbsd.org/mports/?rev=19643
Author:   laffer1
Date:     2015-08-01 09:00:24 -0400 (Sat, 01 Aug 2015)
Log Message:
-----------
clamav 0.98.7

Modified Paths:
--------------
    trunk/security/clamav/Makefile
    trunk/security/clamav/distinfo
    trunk/security/clamav/pkg-plist

Modified: trunk/security/clamav/Makefile
===================================================================
--- trunk/security/clamav/Makefile	2015-08-01 01:56:00 UTC (rev 19642)
+++ trunk/security/clamav/Makefile	2015-08-01 13:00:24 UTC (rev 19643)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	clamav
-PORTVERSION=	0.98.6
+PORTVERSION=	0.98.7
 CATEGORIES=	security
 MASTER_SITES=	SF
 
@@ -48,7 +48,7 @@
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=		gmake libtool
+USES=		cpe gmake libtool
 INSTALL_TARGET=	install-strip
 USE_RC_SUBR=	clamav-clamd clamav-freshclam
 
@@ -75,14 +75,11 @@
 		--enable-gethostbyname_r \
 		--disable-dependency-tracking \
 		--enable-clamdtop
-CPPFLAGS+=	-I${LOCALBASE}/include \
-		${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib \
-		${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 # This port has a problem with -pthread,
 # force to use -lthr until it's not fixed.
-PTHREAD_LIBS=	-lthr
+LDFLAGS+=	-lthr -L${LOCALBASE}/lib
 
 CONFLICTS?=	clamav-milter-[0-9]*
 
@@ -149,6 +146,7 @@
 . if !exists(/usr/lib/libmilter.a) || exists(${LOCALBASE}/lib/libmilter.a)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/sendmail
 CONFIGURE_ARGS+=--with-sendmail=${LOCALBASE}/sbin/sendmail
+LDFLAGS+=	-L${LOCALBASE}/lib
 . else
 CONFIGURE_ARGS+=--with-sendmail=/usr/sbin/sendmail
 . endif
@@ -165,7 +163,7 @@
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
+	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|-lthr|g' \
 			  -e 's|LC_REVISION=22|LC_REVISION=24|' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's,^\(pkgconfigdir = \).*$$,\1$$\(prefix\)/libdata/pkgconfig,g' \

Modified: trunk/security/clamav/distinfo
===================================================================
--- trunk/security/clamav/distinfo	2015-08-01 01:56:00 UTC (rev 19642)
+++ trunk/security/clamav/distinfo	2015-08-01 13:00:24 UTC (rev 19643)
@@ -1,2 +1,2 @@
-SHA256 (clamav-0.98.6.tar.gz) = 6591245d55445a2ddcc1700964c33b8bf62fe20c75bd9c7746f4fe0735502951
-SIZE (clamav-0.98.6.tar.gz) = 15148292
+SHA256 (clamav-0.98.7.tar.gz) = 282417b707740de13cd8f18d4cbca9ddd181cf96b444db2cad98913a5153e272
+SIZE (clamav-0.98.7.tar.gz) = 15118851

Modified: trunk/security/clamav/pkg-plist
===================================================================
--- trunk/security/clamav/pkg-plist	2015-08-01 01:56:00 UTC (rev 19642)
+++ trunk/security/clamav/pkg-plist	2015-08-01 13:00:24 UTC (rev 19643)
@@ -13,13 +13,13 @@
 include/clamav-config.h
 lib/libclamav.so
 lib/libclamav.so.6
-lib/libclamav.so.6.1.25
+lib/libclamav.so.6.1.26
 %%UNRAR%%lib/libclamunrar.so
 %%UNRAR%%lib/libclamunrar.so.6
-%%UNRAR%%lib/libclamunrar.so.6.1.25
+%%UNRAR%%lib/libclamunrar.so.6.1.26
 %%UNRAR%%lib/libclamunrar_iface.so
 %%UNRAR%%lib/libclamunrar_iface.so.6
-%%UNRAR%%lib/libclamunrar_iface.so.6.1.25
+%%UNRAR%%lib/libclamunrar_iface.so.6.1.26
 libdata/pkgconfig/libclamav.pc
 man/man1/clambc.1.gz
 man/man1/clamconf.1.gz