4 files changed, 114 insertions, 68 deletions

diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 60fa5ef42b42..411bae91e064 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	clamav
-PORTVERSION=	0.97.8
+PORTVERSION=	0.98
 CATEGORIES=	security
 MASTER_SITES=	SF
 
@@ -12,7 +12,7 @@ COMMENT=	Command line virus scanner written entirely in C
 LICENSE=	GPLv2
 
 OPTIONS_DEFINE=	ARC ARJ LHA UNZOO UNRAR LLVM TESTS MILTER LDAP ICONV STDERR \
-		EXPERIMENTAL DOCS
+		EXPERIMENTAL DOCS IPV6
 
 ARC_DESC=		Enable arch archives support
 ARJ_DESC=		Enable arj archives support
@@ -25,7 +25,7 @@ MILTER_DESC=		Compile the milter interface
 STDERR_DESC=		Print logs to stderr instead of stdout
 EXPERIMENTAL_DESC=	Build experimental code
 
-OPTIONS_DEFAULT=	ARC ARJ LHA UNZOO UNRAR LLVM DOCS
+OPTIONS_DEFAULT=	ARC ARJ LHA UNZOO UNRAR LLVM DOCS IPV6
 
 ARC_RUN_DEPENDS=	arc:${PORTSDIR}/archivers/arc
 ARJ_RUN_DEPENDS=	arj:${PORTSDIR}/archivers/arj
@@ -39,14 +39,12 @@ ICONV_CONFIGURE_ON=	--with-iconv
 ICONV_CONFIGURE_OFF=	--without-iconv
 ICONV_USES=		iconv
 EXPERIMENTAL_CONFIGURE_ENABLE=	experimental
+IPV6_CONFIGURE_ENABLE=	ipv6
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GCC=	any
 USE_RC_SUBR=	clamav-clamd clamav-freshclam
-CLAM_CONF_FILES=	clamd freshclam
-
-PORTDOCS=	*
 
 DBDIR=		/var/db/clamav
 LOGDIR=		/var/log/clamav
@@ -75,19 +73,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib \
 # force to use -lthr until it's not fixed.
 PTHREAD_LIBS=	-lthr
 
-MAN1=		clambc.1 \
-		clamconf.1 \
-		clamscan.1 \
-		freshclam.1 \
-		sigtool.1 \
-		clamdscan.1 \
-		clamdtop.1
-MAN5=		clamav-milter.conf.5 \
-		clamd.conf.5 \
-		freshclam.conf.5
-MAN8=		clamd.8 \
-		clamav-milter.8
-
 CONFLICTS?=	clamav-devel-[0-9]* clamav-milter-[0-9]*
 
 CLAMAVUSER?=	clamav
@@ -124,7 +109,6 @@ SED_CONF=	-E -e 's|^\#?(Example)$$|\#\1|' \
 PLIST_SUB+=	CLAMAVUSER=${CLAMAVUSER} \
 		CLAMAVGROUP=${CLAMAVGROUP}
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLLVM} && ( ${ARCH} == "i386" || ${ARCH} == "amd64" )
@@ -138,7 +122,6 @@ CONFIGURE_ARGS+=--disable-llvm
 
 .if ${PORT_OPTIONS:MMILTER}
 USE_RC_SUBR+=	clamav-milter
-CLAM_CONF_FILES+=	clamav-milter
 . if ${PORT_OPTIONS:MLDAP} && exists(${LOCALBASE}/lib/libldap.so)
 USE_OPENLDAP=	yes
 LDFLAGS+=	-lldap
@@ -168,9 +151,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,^\(pkgconfigdir = \).*$$,\1$$\(prefix\)/libdata/pkgconfig,g' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} ${SED_CONF} \
-		${WRKSRC}/etc/clamd.conf \
-		${WRKSRC}/etc/freshclam.conf \
-		${WRKSRC}/etc/clamav-milter.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
 
@@ -194,20 +177,12 @@ post-build:
 	fi
 .endif
 
-pre-su-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/clamav-config.h ${PREFIX}/include
-.for c in ${CLAM_CONF_FILES}
-	@[ -f ${PREFIX}/etc/${c}.conf ] || \
-		${CP} -v ${PREFIX}/etc/${c}.conf.default ${PREFIX}/etc/${c}.conf
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/clamav-config.h ${STAGEDIR}${PREFIX}/include
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}/html
-	${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/ChangeLog ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/html/* ${DOCSDIR}/html
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/html/* ${STAGEDIR}${DOCSDIR}/html
 .endif
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.post.mk>
diff --git a/security/clamav/distinfo b/security/clamav/distinfo
index e68a9111861e..d50756ae989d 100644
--- a/security/clamav/distinfo
+++ b/security/clamav/distinfo
@@ -1,2 +1,2 @@
-SHA256 (clamav-0.97.8.tar.gz) = d872bdfd692d440bc2ade2f4e5a7befc37feb8885cd81adfb6346a8214aafc12
-SIZE (clamav-0.97.8.tar.gz) = 14609966
+SHA256 (clamav-0.98.tar.gz) = 113450537f46ed47f010a179be333a0dcd79eac13f264dce26db7aac8d52b3b6
+SIZE (clamav-0.98.tar.gz) = 37075245
diff --git a/security/clamav/files/patch-etc_Makefile.in b/security/clamav/files/patch-etc_Makefile.in
deleted file mode 100644
index 7316f142ce06..000000000000
--- a/security/clamav/files/patch-etc_Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- etc/Makefile.in.orig	2009-10-28 13:54:51.000000000 -0200
-+++ etc/Makefile.in	2009-10-28 15:24:27.000000000 -0200
-@@ -419,12 +419,9 @@
- 
- install-data-local:
- 	$(mkinstalldirs) $(DESTDIR)$(CFGINST)
--	@test -f $(DESTDIR)$(CFGINST)/clamd.conf || \
--	$(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST)
--	@test -f $(DESTDIR)$(CFGINST)/freshclam.conf || \
--	$(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST)
--@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	@test -f $(DESTDIR)$(CFGINST)/clamav-milter.conf || \
--@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	$(INSTALL_DATA) $(srcdir)/clamav-milter.conf $(DESTDIR)$(CFGINST)
-+	$(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST)/clamd.conf.default
-+	$(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST)/freshclam.conf.default
-+@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@	$(INSTALL_DATA) $(srcdir)/clamav-milter.conf $(DESTDIR)$(CFGINST)/clamav-milter.conf.default
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/security/clamav/pkg-plist b/security/clamav/pkg-plist
index 1e50017d0949..6bc8192e656c 100644
--- a/security/clamav/pkg-plist
+++ b/security/clamav/pkg-plist
@@ -21,17 +21,106 @@ lib/libclamav.so.7
 %%UNRAR%%lib/libclamunrar_iface.so
 %%UNRAR%%lib/libclamunrar_iface.so.7
 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
+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/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
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/html/clam.png
+%%PORTDOCS%%%%DOCSDIR%%/html/clamdoc.css
+%%PORTDOCS%%%%DOCSDIR%%/html/clamdoc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/contents.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/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%%@dirrmtry %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
+@unexec if cmp -s %D/etc/clamd.conf %D/etc/clamd.conf.sample; then rm -f %D/etc/clamd.conf; fi
+etc/clamd.conf.sample
 @exec [ -f %B/clamd.conf ] || cp %B/%f %B/clamd.conf
-@unexec if cmp -s %D/etc/freshclam.conf %D/etc/freshclam.conf.default; then rm -f %D/etc/freshclam.conf; fi
-etc/freshclam.conf.default
-%%MILTER%%@unexec if cmp -s %D/etc/clamav-milter.conf %D/etc/clamav-milter.conf.default; then rm -f %D/etc/clamav-milter.conf; fi
-%%MILTER%%etc/clamav-milter.conf.default
+@unexec if cmp -s %D/etc/freshclam.conf %D/etc/freshclam.conf.sample; then rm -f %D/etc/freshclam.conf; fi
+etc/freshclam.conf.sample
 @exec [ -f %B/freshclam.conf ] || cp %B/%f %B/freshclam.conf
-@unexec [ -s %%DBDIR%%/daily.cvd ] || rm -f %%DBDIR%%/daily.cvd || true
-@unexec [ -s %%DBDIR%%/main.cvd ] || rm -f %%DBDIR%%/main.cvd || true
-@cwd /
-@dirrmtry %%DBDIR%%
-@dirrmtry %%LOGDIR%%
-@dirrmtry %%RUNDIR%%
+%%MILTER%%@unexec if cmp -s %D/etc/clamav-milter.conf %D/etc/clamav-milter.conf.sample; then rm -f %D/etc/clamav-milter.conf; fi
+%%MILTER%%etc/clamav-milter.conf.sample
+%%MILTER%%@exec [ -f %B/clamav-milter.conf ] || cp %B/%f %B/clamav-milter.conf