Index: head/security/openvas8-cli/Makefile
===================================================================
--- head/security/openvas8-cli/Makefile	(revision 447289)
+++ head/security/openvas8-cli/Makefile	(revision 447290)
@@ -1,28 +1,33 @@
 # $FreeBSD$
 
-PORTNAME=	openvas-cli
-PORTVERSION=	1.4.3
-PORTREVISION=	2
+PORTNAME?=	openvas8-cli
+PORTVERSION?=	1.4.5
 CATEGORIES=	security
-MASTER_SITES=	http://wald.intevation.org/frs/download.php/2209/
+MASTER_SITES?=	http://wald.intevation.org/frs/download.php/2397/
+DISTNAME=	${PORTNAME:S/${OPENVAS_VER}//}-${PORTVERSION}
+DIST_SUBDIR=	openvas${OPENVAS_VER}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	OpenVAS command-line interface and Nagios plugin
+MAINTAINER=	acm@FreeBSD.org
+COMMENT?=	OpenVAS 8 command-line interface and Nagios plugin
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgnutls.so:security/gnutls \
-		libopenvas_base.so:security/openvas-libraries
+		libopenvas_base.so:security/openvas${OPENVAS_VER}-libraries
 
+CONFLICTS?=	${PORTNAME:S/${OPENVAS_VER}/9/}-*
+
 CFLAGS+=	-Wno-missing-field-initializers
 USES=		cmake:outsource gnome pkgconfig shebangfix
 SHEBANG_FILES=	dialog/omp-dialog
 USE_GNOME=	glib20 libxslt:run
+
+OPENVAS_VER?=	8
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios
 	${MV} ${STAGEDIR}${PREFIX}/bin/check_omp \
 		${STAGEDIR}${PREFIX}/libexec/nagios
 
 .include <bsd.port.mk>
Index: head/security/openvas8-cli/distinfo
===================================================================
--- head/security/openvas8-cli/distinfo	(revision 447289)
+++ head/security/openvas8-cli/distinfo	(revision 447290)
@@ -1,2 +1,3 @@
-SHA256 (openvas-cli-1.4.3.tar.gz) = 69b9b31c0391f6a7e2d1e6fe7f18616c8cfaac570a665192ccbdeae6da0f5978
-SIZE (openvas-cli-1.4.3.tar.gz) = 108228
+TIMESTAMP = 1501783452
+SHA256 (openvas8/openvas-cli-1.4.5.tar.gz) = 55d9beaee0161686c452805428af50c1d6e07835621297afbca789f45a1e86a4
+SIZE (openvas8/openvas-cli-1.4.5.tar.gz) = 113958
Index: head/security/openvas8-cli/files/patch-CMakeLists.txt
===================================================================
--- head/security/openvas8-cli/files/patch-CMakeLists.txt	(revision 447289)
+++ head/security/openvas8-cli/files/patch-CMakeLists.txt	(revision 447290)
@@ -1,20 +1,11 @@
 --- CMakeLists.txt.orig	2015-10-12 12:46:59 UTC
 +++ CMakeLists.txt
 @@ -134,7 +134,7 @@ if (NOT LIBDIR)
  endif (NOT LIBDIR)
  
  if (NOT LOCALSTATEDIR)
 -  set (LOCALSTATEDIR "${CMAKE_INSTALL_PREFIX}/var")
 +  set (LOCALSTATEDIR "/var")
  endif (NOT LOCALSTATEDIR)
  
  if (NOT DATADIR)
-@@ -202,7 +202,7 @@ configure_file (VERSION.in VERSION)
- if (MINGW)
-   set (HARDENING_FLAGS            "-Wformat -Wformat-security -O2 -D_FORTIFY_SOURCE=2")
- else (MINGW)
--  set (HARDENING_FLAGS            "-Wformat -Wformat-security -O2 -D_FORTIFY_SOURCE=2 -fstack-protector -Wl,-z,relro -Wl,-z,now")
-+  set (HARDENING_FLAGS            "-Wformat -Wformat-security -Wl,-z,relro -Wl,-z,now")
- endif (MINGW)
- 
- set (CMAKE_C_FLAGS_DEBUG        "${CMAKE_C_FLAGS_DEBUG} -Werror")
Index: head/security/openvas8-cli/files/patch-doc-CMakeLists.txt
===================================================================
--- head/security/openvas8-cli/files/patch-doc-CMakeLists.txt	(revision 447289)
+++ head/security/openvas8-cli/files/patch-doc-CMakeLists.txt	(revision 447290)
@@ -1,8 +1,8 @@
---- doc/CMakeLists.txt.orig	2015-10-12 12:46:59 UTC
-+++ doc/CMakeLists.txt
-@@ -97,4 +97,4 @@ else (XMLMANTOHTML_EXECUTABLE)
+--- doc/CMakeLists.txt	2016-07-21 01:33:19.000000000 -0500
++++ doc/CMakeLists.txt	2017-08-03 11:48:48.150617000 -0500
+@@ -131,4 +131,4 @@
  endif (XMLMANTOHTML_EXECUTABLE)
  
- install (FILES omp.8
+ install (FILES omp.8 check_omp.8 omp-dialog.8
 -  DESTINATION ${DATADIR}/man/man8 )
-+  DESTINATION man/man8 )
++  DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man8 )
Index: head/security/openvas8-cli/pkg-plist
===================================================================
--- head/security/openvas8-cli/pkg-plist	(revision 447289)
+++ head/security/openvas8-cli/pkg-plist	(revision 447290)
@@ -1,4 +1,6 @@
 bin/omp
 bin/omp-dialog
 libexec/nagios/check_omp
+man/man8/check_omp.8.gz
+man/man8/omp-dialog.8.gz
 man/man8/omp.8.gz