Index: head/security/openvas8-scanner/Makefile
===================================================================
--- head/security/openvas8-scanner/Makefile	(revision 447291)
+++ head/security/openvas8-scanner/Makefile	(revision 447292)
@@ -1,30 +1,37 @@
 # Created by: Tomoyuki Sakurai <cherry@trombik.org>
 # $FreeBSD$
 
-PORTNAME=	openvas-scanner
-PORTVERSION=	5.0.5
+PORTNAME?=	openvas8-scanner
+PORTVERSION?=	5.0.8
 CATEGORIES=	security
-MASTER_SITES=	http://wald.intevation.org/frs/download.php/2266/
+MASTER_SITES?=	http://wald.intevation.org/frs/download.php/2436/
+DISTNAME=	${PORTNAME:S/${OPENVAS_VER}//}-${PORTVERSION}
+DIST_SUBDIR=	openvas${OPENVAS_VER}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	OpenVAS scanner
+MAINTAINER=	acm@FreeBSD.org
+COMMENT?=	OpenVAS 8 scanner
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.GPLv2
 
 LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
-		libopenvas_base.so:security/openvas-libraries
+		libopenvas_base.so:security/openvas${OPENVAS_VER}-libraries
 RUN_DEPENDS=	redis-server:databases/redis \
 		curl:ftp/curl \
 		rsync:net/rsync
 
+CONFLICTS?=	${PORTNAME:S/${OPENVAS_VER}/9/}-*
+
 USES=		cmake:outsource execinfo gettext-runtime gnome pkgconfig
 USE_GNOME=	glib20
 USE_RC_SUBR=	openvassd
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:S/${OPENVAS_VER}//}
+
+OPENVAS_VER?=	8
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/security/openvas8-scanner/distinfo
===================================================================
--- head/security/openvas8-scanner/distinfo	(revision 447291)
+++ head/security/openvas8-scanner/distinfo	(revision 447292)
@@ -1,2 +1,3 @@
-SHA256 (openvas-scanner-5.0.5.tar.gz) = 108d8aba9f53ae58b187cb2e297fc5a3e77ac5c2cd9db421fb20598fdfb2ad0a
-SIZE (openvas-scanner-5.0.5.tar.gz) = 237317
+TIMESTAMP = 1501781122
+SHA256 (openvas8/openvas-scanner-5.0.8.tar.gz) = 1e108abc8e0b3dd34ce6ec5d039adf1dab825f6dd8ce7591f5881cd5b5371bc5
+SIZE (openvas8/openvas-scanner-5.0.8.tar.gz) = 239782