security/clamav: upgrade 0.101.4 -> 0.102.0

- Enable MILTER option by default
- Disable MSPACK option by default
- Sort OPTIONS_DEFINE, OPTIONS_DEFAULT and *_DESC
- Remove security/clamav-milter, slave port that enables MILTER option
- Add entry for security/clamav-milter to MOVED

PR:		241860
Submitted by:	Yasuhiro Kimura <yasu@utahime.org> (maintainer)

4 files changed, 38 insertions, 18 deletions

diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 51490d393c2d..b0b792677508 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	clamav
-PORTVERSION=	0.101.4
+PORTVERSION=	0.102.0
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	https://www.clamav.net/downloads/production/
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libltdl.so:devel/libltdl \
 		libcurl.so:ftp/curl
 
-USES=		compiler cpe gmake gnome libtool ncurses pathfix pkgconfig ssl
+USES=		autoreconf compiler cpe gmake gnome libtool ncurses pathfix pkgconfig ssl
 USE_RC_SUBR=	clamav-clamd clamav-freshclam
 USE_LDCONFIG=	yes
 
@@ -45,8 +45,6 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 # force to use -lthr until it's not fixed.
 LDFLAGS+=	-lthr -L${LOCALBASE}/lib
 
-CONFLICTS?=	clamav-milter-[0-9]*
-
 SUB_FILES=	pkg-deinstall
 SUB_LIST+=	DBDIR=${DBDIR} \
 		LOGDIR=${LOGDIR} \
@@ -62,23 +60,22 @@ SUB_LIST+=	DBDIR=${DBDIR} \
 PLIST_SUB+=	CLAMAVUSER=${CLAMAVUSER} \
 		CLAMAVGROUP=${CLAMAVGROUP}
 
-OPTIONS_DEFINE=	ARC ARJ LHA UNZOO UNRAR TESTS MILTER MSPACK LDAP ICONV STDERR \
-		EXPERIMENTAL DOCS IPV6 DMG_XAR JSON PCRE
+OPTIONS_DEFINE=	ARC ARJ DOCS DMG_XAR EXPERIMENTAL JSON LDAP ICONV IPV6 \
+		LHA MILTER MSPACK PCRE STDERR TESTS UNZOO UNRAR
 
-OPTIONS_DEFAULT=	ARC ARJ UNZOO UNRAR DMG_XAR \
-			JSON PCRE MSPACK
+OPTIONS_DEFAULT=	ARC ARJ DMG_XAR JSON MILTER PCRE UNZOO UNRAR
 OPTIONS_SUB=	yes
 
 ARC_DESC=		Enable arch archives support
 ARJ_DESC=		Enable arj archives support
+DMG_XAR_DESC=		Enable DMG and XAR archives support
+EXPERIMENTAL_DESC=	Build experimental code
 LHA_DESC=		Enable lha archives support
-UNZOO_DESC=		Enable zoo archives support
-TESTS_DESC=		Run compile-time tests (req. python)
 MILTER_DESC=		Compile the milter interface
 MSPACK_DESC=		Get mspack support from ports (otherwise use bundled)
 STDERR_DESC=		Print logs to stderr instead of stdout
-EXPERIMENTAL_DESC=	Build experimental code
-DMG_XAR_DESC=		Enable DMG and XAR archives support
+TESTS_DESC=		Run compile-time tests (req. python)
+UNZOO_DESC=		Enable zoo archives support
 
 ARC_RUN_DEPENDS=	arc:archivers/arc
 ARJ_RUN_DEPENDS=	arj:archivers/arj
diff --git a/security/clamav/distinfo b/security/clamav/distinfo
index b12a14449fb4..e290bdae924b 100644
--- a/security/clamav/distinfo
+++ b/security/clamav/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566501172
-SHA256 (clamav-0.101.4.tar.gz) = 0bf094f0919d158a578421d66bc2569c8c8181233ba162bb51722f98c802bccd
-SIZE (clamav-0.101.4.tar.gz) = 21408145
+TIMESTAMP = 1573089073
+SHA256 (clamav-0.102.0.tar.gz) = 48fe188c46c793c2d0cb5c81c106e4690251aff6dc8aa6575dc688343291bee1
+SIZE (clamav-0.102.0.tar.gz) = 13211357
diff --git a/security/clamav/files/patch-configure.ac b/security/clamav/files/patch-configure.ac
new file mode 100644
index 000000000000..b30540cde3e8
--- /dev/null
+++ b/security/clamav/files/patch-configure.ac
@@ -0,0 +1,18 @@
+--- configure.ac.orig	2019-11-07 02:02:07 UTC
++++ configure.ac
+@@ -108,6 +108,7 @@ m4_include([m4/reorganization/libs/bzip.m4])
+ m4_include([m4/reorganization/libs/unrar.m4])
+ 
+ m4_include([m4/reorganization/libs/systemd.m4])
++m4_include([m4/reorganization/milter/enable.m4])
+ m4_include([m4/reorganization/milter/check.m4])
+ m4_include([m4/reorganization/clamdtop.m4])
+ 
+@@ -147,7 +148,6 @@ m4_include([m4/reorganization/code_checks/ipv6.m4])
+ m4_include([m4/reorganization/code_checks/dns.m4])
+ m4_include([m4/reorganization/code_checks/fanotify.m4])
+ m4_include([m4/reorganization/code_checks/setpgrp.m4])
+-m4_include([m4/reorganization/milter/enable.m4])
+ m4_include([m4/reorganization/utility_checks/id.m4])
+ m4_include([m4/reorganization/utility_checks/yp.m4])
+ m4_include([m4/reorganization/usergroup.m4])
diff --git a/security/clamav/pkg-plist b/security/clamav/pkg-plist
index cafdc1699833..90482fa3473d 100644
--- a/security/clamav/pkg-plist
+++ b/security/clamav/pkg-plist
@@ -39,10 +39,10 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/UserManual/libclamav.html
 %%UNRAR%%lib/libclamunrar.so
 %%UNRAR%%lib/libclamunrar.so.9
-%%UNRAR%%lib/libclamunrar.so.9.0.2
+%%UNRAR%%lib/libclamunrar.so.9.0.4
 %%UNRAR%%lib/libclamunrar_iface.so
 %%UNRAR%%lib/libclamunrar_iface.so.9
-%%UNRAR%%lib/libclamunrar_iface.so.9.0.2
+%%UNRAR%%lib/libclamunrar_iface.so.9.0.4
 @dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%DBDIR%%
 @dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%LOGDIR%%
 @dir(%%CLAMAVUSER%%,%%CLAMAVGROUP%%,0755) %%RUNDIR%%
@@ -58,10 +58,15 @@ bin/freshclam
 bin/sigtool
 include/clamav-config.h
 include/clamav-types.h
+include/clamav-version.h
 include/clamav.h
+include/libfreshclam.h
 lib/libclamav.so
 lib/libclamav.so.9
-lib/libclamav.so.9.0.2
+lib/libclamav.so.9.0.4
+lib/libfreshclam.so
+lib/libfreshclam.so.2
+lib/libfreshclam.so.2.0.0
 libdata/pkgconfig/libclamav.pc
 man/man1/clambc.1.gz
 man/man1/clamconf.1.gz