Index: head/security/clamav/Makefile
===================================================================
--- head/security/clamav/Makefile	(revision 378062)
+++ head/security/clamav/Makefile	(revision 378063)
@@ -1,211 +1,210 @@
 # Created by: markun@onohara.to
 # $FreeBSD$
 
 PORTNAME=	clamav
-PORTVERSION=	0.98.5
-PORTREVISION=	1
+PORTVERSION=	0.98.6
 CATEGORIES=	security
 MASTER_SITES=	SF
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Command line virus scanner written entirely in C
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
 		libcurl.so:${PORTSDIR}/ftp/curl
 
 OPTIONS_DEFINE=	ARC ARJ LHA UNZOO UNRAR LLVM TESTS MILTER LDAP ICONV STDERR \
 		EXPERIMENTAL DOCS IPV6 DMG_XAR
 
 ARC_DESC=		Enable arch archives support
 ARJ_DESC=		Enable arj archives support
 LHA_DESC=		Enable lha archives support
 UNZOO_DESC=		Enable zoo archives support
 UNRAR_DESC=		Enable rar archives support
 LLVM_DESC=		Enable JIT Bytecode compiler (bundled LLVM)
 TESTS_DESC=		Run compile-time tests (req. python)
 MILTER_DESC=		Compile the milter interface
 STDERR_DESC=		Print logs to stderr instead of stdout
 EXPERIMENTAL_DESC=	Build experimental code
 DMG_XAR_DESC=		Enable DMG and XAR archives support
 
 OPTIONS_DEFAULT=	ARC ARJ LHA UNZOO UNRAR LLVM DOCS IPV6 DMG_XAR
 
 ARC_RUN_DEPENDS=	arc:${PORTSDIR}/archivers/arc
 ARJ_RUN_DEPENDS=	arj:${PORTSDIR}/archivers/arj
 LHA_RUN_DEPENDS=	lha:${PORTSDIR}/archivers/lha
 UNZOO_RUN_DEPENDS=	unzoo:${PORTSDIR}/archivers/unzoo
 UNRAR_CONFIGURE_ENABLE=	unrar
 MILTER_CONFIGURE_ENABLE=milter
 TESTS_CONFIGURE_ENABLE=	check
 TESTS_BUILD_DEPENDS=	${LOCALBASE}/include/check.h:${PORTSDIR}/devel/libcheck
 ICONV_CONFIGURE_ON=	--with-iconv
 ICONV_CONFIGURE_OFF=	--without-iconv
 ICONV_USES=		iconv
 EXPERIMENTAL_CONFIGURE_ENABLE=	experimental
 IPV6_CONFIGURE_ENABLE=	ipv6
 DMG_XAR_CONFIGURE_ENABLE=	xml
 DMG_XAR_USE=		GNOME=libxml2
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USES=		gmake libtool
 INSTALL_TARGET=	install-strip
 USE_RC_SUBR=	clamav-clamd clamav-freshclam
 
 PORTDOCS=	*
 
 DBDIR=		/var/db/clamav
 LOGDIR=		/var/log/clamav
 RUNDIR=		/var/run/clamav
 PLIST_SUB+=	DBDIR=${DBDIR} \
 		LOGDIR=${LOGDIR} \
 		RUNDIR=${RUNDIR} \
 		CLAMAVUSER=${CLAMAVUSER} \
 		CLAMAVGROUP=${CLAMAVGROUP}
 PY_NO_THREAD=	${WRKDIR}/.python-has-no-threads
 OPTIONS_SUB=	yes
 
 CONFIGURE_ARGS=	--libdir=${PREFIX}/lib \
 		--with-dbdir=${DBDIR} \
 		--with-zlib=/usr \
 		--disable-clamuko \
 		--disable-clamav \
 		--enable-bigstack \
 		--enable-readdir_r \
 		--enable-gethostbyname_r \
 		--disable-dependency-tracking \
 		--enable-clamdtop
 CPPFLAGS+=	-I${LOCALBASE}/include \
 		${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib \
 		${PTHREAD_LIBS}
 
 # This port has a problem with -pthread,
 # force to use -lthr until it's not fixed.
 PTHREAD_LIBS=	-lthr
 
 CONFLICTS?=	clamav-milter-[0-9]*
 
 CLAMAVUSER?=	clamav
 CLAMAVGROUP?=	clamav
 
 CLAMAV_CLAMD_SOCKET?=	${RUNDIR}/clamd.sock
 CLAMAV_MILTER_SOCKET?=	${RUNDIR}/clmilter.sock
 
 SUB_FILES=	pkg-deinstall
 SUB_LIST+=	DBDIR=${DBDIR} \
 		LOGDIR=${LOGDIR} \
 		RUNDIR=${RUNDIR} \
 		CHMOD=${CHMOD} \
 		CHOWN=${CHOWN} \
 		CLAMAVUSER=${CLAMAVUSER} \
 		CLAMAVGROUP=${CLAMAVGROUP} \
 		CLAMAV_CLAMD_SOCKET=${CLAMAV_CLAMD_SOCKET} \
 		CLAMAV_MILTER_SOCKET=${CLAMAV_MILTER_SOCKET}
 
 SED_CONF=	-E -e 's|^\#?(Example)$$|\#\1|' \
 		-e 's|^\#?((Update)?LogFile) .*/([a-z]+\.log)$$|\1 ${LOGDIR}/\3|' \
 		-e 's|^\#?(PidFile) .*/([a-z\-]+\.pid)$$|\1 ${RUNDIR}/\2|' \
 		-e 's|^\#?(LocalSocket) .*$$|\1 ${CLAMAV_CLAMD_SOCKET}|' \
 		-e 's|^\#?(User) .*$$|\1 ${CLAMAVUSER}|' \
 		-e 's|^\#?(AllowSupplementaryGroups).*$$|\1 yes|' \
 		-e 's|^\#?(ScanMail).*$$|\1 yes|' \
 		-e 's|^\#?(DatabaseDirectory) .*$$|\1 ${DBDIR}|' \
 		-e 's|^\#?(DatabaseOwner) .*$$|\1 ${CLAMAVUSER}|' \
 		-e 's|^\#?(FixStaleSocket).*$$|\1 yes|' \
 		-e 's|^\#?(NotifyClamd) .*$$|\1 ${PREFIX}/etc/clamd.conf|' \
 		-e 's|^\#?(MilterSocket) */tmp.*$$|\1 ${CLAMAV_MILTER_SOCKET}|' \
 		-e 's|^\#?(ClamdSocket).*$$|\1 unix:${CLAMAV_CLAMD_SOCKET}|'
 
 PLIST_SUB+=	CLAMAVUSER=${CLAMAVUSER} \
 		CLAMAVGROUP=${CLAMAVGROUP}
 
 .include <bsd.port.options.mk>
 
 .if ${CLAMAVUSER} == "clamav"
 USERS=	clamav
 .endif
 
 .if ${CLAMAVGROUP} == "clamav"
 GROUPS=	clamav mail
 .endif
 
 .if ${PORT_OPTIONS:MLLVM} && ( ${ARCH} == "i386" || ${ARCH} == "amd64" )
 CONFIGURE_ARGS+=--enable-llvm
 . if ${PORT_OPTIONS:MTESTS}
 USES+=		python:build
 . endif
 .else
 CONFIGURE_ARGS+=--disable-llvm
 .endif
 
 .if ${PORT_OPTIONS:MMILTER}
 USE_RC_SUBR+=	clamav-milter
 . if ${PORT_OPTIONS:MLDAP} && exists(${LOCALBASE}/lib/libldap.so)
 USE_OPENLDAP=	yes
 LDFLAGS+=	-lldap
 . endif
 
 . 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
 . else
 CONFIGURE_ARGS+=--with-sendmail=/usr/sbin/sendmail
 . endif
 .endif
 
 .if ${PORT_OPTIONS:MSTDERR}
 EXTRA_PATCHES+=		${FILESDIR}/extra-patch-shared_output.c
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
 CFLAGS+=	-march=i486
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
 			  -e 's|LC_REVISION=22|LC_REVISION=24|' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's,^\(pkgconfigdir = \).*$$,\1$$\(prefix\)/libdata/pkgconfig,g' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} ${SED_CONF} \
 		${WRKSRC}/etc/clamd.conf.sample \
 		${WRKSRC}/etc/freshclam.conf.sample \
 		${WRKSRC}/etc/clamav-milter.conf.sample
 	@${REINPLACE_CMD} -e 's|0x100000000|0x100000000ULL|g' \
 		${WRKSRC}/libclamunrar/unrar.c
 
 .if ${PORT_OPTIONS:MLLVM} && ${PORT_OPTIONS:MTESTS}
 pre-configure:
 	@if ! ${PYTHON_CMD} -c "import thread" >/dev/null 2>&1; then \
 		${ECHO_MSG} ""; \
 		${ECHO_MSG} "==========================================================================="; \
 		${ECHO_MSG} "= Unit tests REQUIRES python built with thread support, and yours is not. ="; \
 		${ECHO_MSG} "= It will not be called during this build                                 ="; \
 		${ECHO_MSG} "==========================================================================="; \
 		${ECHO_MSG} ""; \
 		${TOUCH} ${PY_NO_THREAD}; \
 	fi
 .endif
 
 .if ${PORT_OPTIONS:MTESTS}
 post-build:
 	@if [ ! -f "${PY_NO_THREAD}" ]; then \
 		${MAKE_CMD} -C ${WRKSRC} check; \
 	fi
 .endif
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/clamav-config.h ${STAGEDIR}${PREFIX}/include
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html \
 		  ${STAGEDIR}${DBDIR} \
 		  ${STAGEDIR}${LOGDIR} \
 		  ${STAGEDIR}${RUNDIR}
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/html/* ${STAGEDIR}${DOCSDIR}/html
 
 .include <bsd.port.post.mk>
Index: head/security/clamav/distinfo
===================================================================
--- head/security/clamav/distinfo	(revision 378062)
+++ head/security/clamav/distinfo	(revision 378063)
@@ -1,2 +1,2 @@
-SHA256 (clamav-0.98.5.tar.gz) = 9c2f37d5fa9033936468237f6f4b29289f30791caa84765ef510acb56c8daa4d
-SIZE (clamav-0.98.5.tar.gz) = 15146379
+SHA256 (clamav-0.98.6.tar.gz) = 6591245d55445a2ddcc1700964c33b8bf62fe20c75bd9c7746f4fe0735502951
+SIZE (clamav-0.98.6.tar.gz) = 15148292
Index: head/security/clamav/files/patch-fix-11194
===================================================================
--- head/security/clamav/files/patch-fix-11194	(revision 378062)
+++ head/security/clamav/files/patch-fix-11194	(nonexistent)
@@ -1,84 +0,0 @@
-diff -ruN ../clamav-0.98.5.orig/clamav-milter/Makefile.in ./clamav-milter/Makefile.in
---- ../clamav-0.98.5.orig/clamav-milter/Makefile.in	2014-11-21 14:24:08.000000000 -0200
-+++ ./clamav-milter/Makefile.in	2014-11-21 14:27:37.000000000 -0200
-@@ -504,7 +504,7 @@
- 
- @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@man_MANS = $(top_builddir)/docs/man/clamav-milter.8
- @BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@AM_CFLAGS = @WERR_CFLAGS_MILTER@
--AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir) @JSON_CPPFLAGS@
-+AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir) @SSL_CPPFLAGS@ @JSON_CPPFLAGS@
- CLEANFILES = *.gcda *.gcno
- all: all-am
- 
-diff -ruN ../clamav-0.98.5.orig/clamd/Makefile.in ./clamd/Makefile.in
---- ../clamav-0.98.5.orig/clamd/Makefile.in	2014-11-21 14:24:08.000000000 -0200
-+++ ./clamd/Makefile.in	2014-11-21 14:27:58.000000000 -0200
-@@ -479,7 +479,7 @@
- @BUILD_CLAMD_TRUE@    fan.h
- 
- @BUILD_CLAMD_TRUE@AM_CFLAGS = @WERR_CFLAGS@
--AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
-+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @JSON_CPPFLAGS@
- 
- # it does support --help and --version but with the default config file
- # it outputs an error message which tells us to edit the config files
-diff -ruN ../clamav-0.98.5.orig/clamdscan/Makefile.in ./clamdscan/Makefile.in
---- ../clamav-0.98.5.orig/clamdscan/Makefile.in	2014-11-21 14:24:08.000000000 -0200
-+++ ./clamdscan/Makefile.in	2014-11-21 14:28:39.000000000 -0200
-@@ -468,7 +468,7 @@
- @BUILD_CLAMD_TRUE@    client.h
- 
- @BUILD_CLAMD_TRUE@AM_CFLAGS = @WERR_CFLAGS@
--AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMDSCAN_CPPFLAGS@
-+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @CLAMDSCAN_CPPFLAGS@
- AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamdscan$(EXEEXT)
- CLEANFILES = *.gcda *.gcno
- all: all-am
-diff -ruN ../clamav-0.98.5.orig/clamscan/Makefile.in ./clamscan/Makefile.in
---- ../clamav-0.98.5.orig/clamscan/Makefile.in	2014-11-21 14:24:08.000000000 -0200
-+++ ./clamscan/Makefile.in	2014-11-21 14:30:29.000000000 -0200
-@@ -456,7 +456,7 @@
-     manager.h
- 
- AM_CFLAGS = @WERR_CFLAGS@
--AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMSCAN_CPPFLAGS@
-+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @CLAMSCAN_CPPFLAGS@ @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @CLAMSCAN_CPPFLAGS@
- CLEANFILES = *.gcda *.gcno
- all: all-am
- 
-diff -ruN ../clamav-0.98.5.orig/clamsubmit/Makefile.in ./clamsubmit/Makefile.in
---- ../clamav-0.98.5.orig/clamsubmit/Makefile.in	2014-11-21 14:24:08.000000000 -0200
-+++ ./clamsubmit/Makefile.in	2014-11-21 14:30:45.000000000 -0200
-@@ -449,7 +449,7 @@
- 	clamsubmit.c
- 
- AM_CFLAGS = @WERR_CFLAGS@ @CLAMSUBMIT_CFLAGS@
--AM_CPPFLAGS = @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
-+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @JSON_CPPFLAGS@
- AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = clamsubmit$(EXEEXT)
- CLEANFILES = *.gcda *.gcno
- all: all-am
-diff -ruN ../clamav-0.98.5.orig/freshclam/Makefile.in ./freshclam/Makefile.in
---- ../clamav-0.98.5.orig/freshclam/Makefile.in	2014-11-21 14:24:08.000000000 -0200
-+++ ./freshclam/Makefile.in	2014-11-21 14:31:23.000000000 -0200
-@@ -472,7 +472,7 @@
-     mirman.h
- 
- AM_CFLAGS = @WERR_CFLAGS@
--AM_CPPFLAGS = @SSL_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @FRESHCLAM_CPPFLAGS@  @JSON_CPPFLAGS@
-+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @FRESHCLAM_CPPFLAGS@  @JSON_CPPFLAGS@ @SSL_CPPFLAGS@
- AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = freshclam$(EXEEXT)
- CLEANFILES = *.gcda *.gcno
- all: all-am
-diff -ruN ../clamav-0.98.5.orig/sigtool/Makefile.in ./sigtool/Makefile.in
---- ../clamav-0.98.5.orig/sigtool/Makefile.in	2014-11-21 14:24:08.000000000 -0200
-+++ ./sigtool/Makefile.in	2014-11-21 14:32:01.000000000 -0200
-@@ -456,7 +456,7 @@
-     sigtool.c
- 
- AM_CFLAGS = @WERR_CFLAGS@
--AM_CPPFLAGS = @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SIGTOOL_CPPFLAGS@
-+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @SIGTOOL_CPPFLAGS@
- CLEANFILES = *.gcda *.gcno
- all: all-am
- 

Property changes on: head/security/clamav/files/patch-fix-11194
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/security/clamav/pkg-plist
===================================================================
--- head/security/clamav/pkg-plist	(revision 378062)
+++ head/security/clamav/pkg-plist	(revision 378063)
@@ -1,42 +1,42 @@
 bin/clamav-config
 bin/clambc
 bin/clamconf
 bin/clamdtop
 bin/clamscan
 bin/clamsubmit
 bin/clamdscan
 bin/freshclam
 bin/sigtool
 %%MILTER%%sbin/clamav-milter
 sbin/clamd
 include/clamav.h
 include/clamav-config.h
 lib/libclamav.so
 lib/libclamav.so.6
-lib/libclamav.so.6.1.24
+lib/libclamav.so.6.1.25
 %%UNRAR%%lib/libclamunrar.so
 %%UNRAR%%lib/libclamunrar.so.6
-%%UNRAR%%lib/libclamunrar.so.6.1.24
+%%UNRAR%%lib/libclamunrar.so.6.1.25
 %%UNRAR%%lib/libclamunrar_iface.so
 %%UNRAR%%lib/libclamunrar_iface.so.6
-%%UNRAR%%lib/libclamunrar_iface.so.6.1.24
+%%UNRAR%%lib/libclamunrar_iface.so.6.1.25
 libdata/pkgconfig/libclamav.pc
 man/man1/clambc.1.gz
 man/man1/clamconf.1.gz
 man/man1/clamdscan.1.gz
 man/man1/clamdtop.1.gz
 man/man1/clamscan.1.gz
 man/man1/clamsubmit.1.gz
 man/man1/freshclam.1.gz
 man/man1/sigtool.1.gz
 man/man5/clamav-milter.conf.5.gz
 man/man5/clamd.conf.5.gz
 man/man5/freshclam.conf.5.gz
 man/man8/clamav-milter.8.gz
 man/man8/clamd.8.gz
 @sample etc/clamd.conf.sample
 @sample etc/freshclam.conf.sample
 %%MILTER%%@sample etc/clamav-milter.conf.sample
 @dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%DBDIR%%
 @dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%LOGDIR%%
 @dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%RUNDIR%%