3 files changed, 51 insertions, 94 deletions

diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index b9a4288f3a11..8846d2fcabf7 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	clamav
-PORTVERSION=	0.100.2
+PORTVERSION=	0.101.1
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.clamav.net/downloads/production/
@@ -152,8 +152,13 @@ post-patch:
 		${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 exists(/usr/lib/libstdc++.so)
+	@${REINPLACE_CMD} -e 's|-Wno-logical-op-parentheses||' \
+			  -e 's|-Wno-dangling-else||' \
+		${WRKSRC}/libclamav/Makefile.am \
+		${WRKSRC}/libclamav/Makefile.in \
+		${WRKSRC}/libclamunrar/makefile
+.endif
 
 pre-configure-TESTS-on:
 	@if ! ${PYTHON_CMD} -c "import thread" >/dev/null 2>&1; then \
@@ -177,6 +182,6 @@ post-install:
 		  ${STAGEDIR}${DBDIR} \
 		  ${STAGEDIR}${LOGDIR} \
 		  ${STAGEDIR}${RUNDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/html/* ${STAGEDIR}${DOCSDIR}/html
+	(cd ${WRKSRC}/docs/html; ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/html)
 
 .include <bsd.port.mk>
diff --git a/security/clamav/distinfo b/security/clamav/distinfo
index 043153bce860..dc69d4418ae0 100644
--- a/security/clamav/distinfo
+++ b/security/clamav/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538590041
-SHA256 (clamav-0.100.2.tar.gz) = 4a2e4f0cd41e62adb5a713b4a1857c49145cd09a69957e6d946ecad575206dd6
-SIZE (clamav-0.100.2.tar.gz) = 15926420
+TIMESTAMP = 1547104175
+SHA256 (clamav-0.101.1.tar.gz) = fa368fa9b2f57638696150c7d108b06dec284e8d8e3b8e702c784947c01fb806
+SIZE (clamav-0.101.1.tar.gz) = 21691396
diff --git a/security/clamav/pkg-plist b/security/clamav/pkg-plist
index 9e94cb77da6c..80ba2614b02e 100644
--- a/security/clamav/pkg-plist
+++ b/security/clamav/pkg-plist
@@ -7,93 +7,44 @@
 %%NO_MSPACK%%lib/libclammspack.so.0
 %%NO_MSPACK%%lib/libclammspack.so.0.1.0
 %%NO_MSPACK%%libdata/pkgconfig/libclammspack.pc
-%%PORTDOCS%%%%DOCSDIR%%/html/clam.png
-%%PORTDOCS%%%%DOCSDIR%%/html/clamdoc.css
-%%PORTDOCS%%%%DOCSDIR%%/html/clamdoc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/contents.png
-%%PORTDOCS%%%%DOCSDIR%%/html/crossref.png
-%%PORTDOCS%%%%DOCSDIR%%/html/demon.png
-%%PORTDOCS%%%%DOCSDIR%%/html/footnode.html
-%%PORTDOCS%%%%DOCSDIR%%/html/img1.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img2.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img3.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img4.png
-%%PORTDOCS%%%%DOCSDIR%%/html/img5.png
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/next.png
-%%PORTDOCS%%%%DOCSDIR%%/html/next_g.png
-%%PORTDOCS%%%%DOCSDIR%%/html/node1.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node10.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node11.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node12.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node13.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node14.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node15.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node16.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node17.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node18.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node19.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node2.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node20.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node21.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node22.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node23.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node24.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node25.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node26.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node27.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node28.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node29.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node3.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node30.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node31.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node32.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node33.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node34.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node35.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node36.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node37.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node38.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node39.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node4.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node40.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node41.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node42.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node43.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node44.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node45.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node46.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node47.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node48.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node49.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node5.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node50.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node51.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node52.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node53.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node54.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node55.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node56.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node57.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node58.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node59.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node6.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node60.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node61.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node62.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node7.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node8.html
-%%PORTDOCS%%%%DOCSDIR%%/html/node9.html
-%%PORTDOCS%%%%DOCSDIR%%/html/prev.png
-%%PORTDOCS%%%%DOCSDIR%%/html/prev_g.png
-%%PORTDOCS%%%%DOCSDIR%%/html/up.png
-%%PORTDOCS%%%%DOCSDIR%%/html/up_g.png
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Installation-Unix.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Installation-Unix/Steps-Debian-Ubuntu.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Installation-Unix/Steps-Redhat-CentOS.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Installation-Unix/Steps-macOS.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Installation-Windows.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/OnAccess.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/AuthenticodeRules.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/BodySignatureFormat.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/BytecodeSignatures.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/ContainerMetadata.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/DatabaseInfo.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/DynamicConfig.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/EncryptedArchives.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/ExtendedSignatures.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/FileTypeMagic.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/FileTypes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/FunctionalityLevels.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/HashSignatures.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/LogicalSignatures.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/PhishSigs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/Whitelists.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Signatures/YaraRules.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Usage.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Usage/Configuration.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Usage/Scanning.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/Usage/SignatureManagement.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/development.html
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/images/demon.png
+%%PORTDOCS%%%%DOCSDIR%%/html/UserManual/libclamav.html
 %%UNRAR%%lib/libclamunrar.so
-%%UNRAR%%lib/libclamunrar.so.7
-%%UNRAR%%lib/libclamunrar.so.7.1.1
+%%UNRAR%%lib/libclamunrar.so.9
+%%UNRAR%%lib/libclamunrar.so.9.0.1
 %%UNRAR%%lib/libclamunrar_iface.so
-%%UNRAR%%lib/libclamunrar_iface.so.7
-%%UNRAR%%lib/libclamunrar_iface.so.7.1.1
+%%UNRAR%%lib/libclamunrar_iface.so.9
+%%UNRAR%%lib/libclamunrar_iface.so.9.0.1
 @dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%DBDIR%%
 @dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%LOGDIR%%
 @dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%RUNDIR%%
@@ -108,10 +59,11 @@ bin/clamscan
 bin/freshclam
 bin/sigtool
 include/clamav-config.h
+include/clamav-types.h
 include/clamav.h
 lib/libclamav.so
-lib/libclamav.so.7
-lib/libclamav.so.7.1.1
+lib/libclamav.so.9
+lib/libclamav.so.9.0.1
 libdata/pkgconfig/libclamav.pc
 man/man1/clambc.1.gz
 man/man1/clamconf.1.gz