Index: head/security/openvas8-libraries/Makefile
===================================================================
--- head/security/openvas8-libraries/Makefile	(revision 447288)
+++ head/security/openvas8-libraries/Makefile	(revision 447289)
@@ -1,38 +1,43 @@
 # Created by: Tomoyuki Sakurai <cherry@trombik.org>
 # $FreeBSD$
 
-PORTNAME=	openvas-libraries
-PORTVERSION=	8.0.7
-PORTREVISION=	2
+PORTNAME?=	openvas8-libraries
+PORTVERSION?=	8.0.9
 CATEGORIES=	security
-MASTER_SITES=	http://wald.intevation.org/frs/download.php/2291/
+MASTER_SITES?=	http://wald.intevation.org/frs/download.php/2433/
+DISTNAME?=	${PORTNAME:S/${OPENVAS_VER}//}-${PORTVERSION}
+DIST_SUBDIR=	openvas${OPENVAS_VER}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	OpenVAS libraries
+MAINTAINER=	acm@FreeBSD.org
+COMMENT?=	OpenVAS 8 libraries
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.GPLv2
 
 LIB_DEPENDS=	libhiredis.so:databases/hiredis \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libnetsnmp.so:net-mgmt/net-snmp \
 		libgnutls.so:security/gnutls \
 		libgpgme.so:security/gpgme \
 		libgcrypt.so:security/libgcrypt \
 		libksba.so:security/libksba \
 		libssh.so:security/libssh
 
+CONFLICTS?=	${PORTNAME:S/${OPENVAS_VER}/9/}-*
+
 USES=		bison cmake:outsource gnome pkgconfig
 USE_LDCONFIG=	yes
 USE_GNOME=	glib20
+
+OPENVAS_VER?=	8
 
 OPTIONS_DEFINE=	LDAP RADIUS
 OPTIONS_DEFAULT=LDAP
 
 LDAP_CMAKE_OFF=	-DBUILD_WITHOUT_LDAP=1
 LDAP_USE=	OPENLDAP=yes
 
 RADIUS_CMAKE_ON=-DBUILD_WITH_RADIUS=1
 RADIUS_LIB_DEPENDS=	libfreeradius-client.so:net/freeradius-client
 
 .include <bsd.port.mk>
Index: head/security/openvas8-libraries/distinfo
===================================================================
--- head/security/openvas8-libraries/distinfo	(revision 447288)
+++ head/security/openvas8-libraries/distinfo	(revision 447289)
@@ -1,2 +1,3 @@
-SHA256 (openvas-libraries-8.0.7.tar.gz) = 144b77dc54d501d88e6c3456dade71e20938fd52f9bb9fadc032564131366187
-SIZE (openvas-libraries-8.0.7.tar.gz) = 609210
+TIMESTAMP = 1501780542
+SHA256 (openvas8/openvas-libraries-8.0.9.tar.gz) = 4ca2295c3247c63bfcfeea7bc69e2762cbb8cd418b416f7a7332bca329363c39
+SIZE (openvas8/openvas-libraries-8.0.9.tar.gz) = 613547
Index: head/security/openvas8-libraries/pkg-plist
===================================================================
--- head/security/openvas8-libraries/pkg-plist	(revision 447288)
+++ head/security/openvas8-libraries/pkg-plist	(revision 447289)
@@ -1,64 +1,64 @@
 bin/openvas-nasl
 bin/openvas-nasl-lint
 include/openvas/base/array.h
 include/openvas/base/credentials.h
 include/openvas/base/cvss.h
 include/openvas/base/drop_privileges.h
 include/openvas/base/gpgme_util.h
 include/openvas/base/nvti.h
 include/openvas/base/nvticache.h
 include/openvas/base/openvas_compress.h
 include/openvas/base/openvas_file.h
 include/openvas/base/openvas_hosts.h
 include/openvas/base/openvas_networking.h
 include/openvas/base/openvas_string.h
 include/openvas/base/osp.h
 include/openvas/base/pidfile.h
 include/openvas/base/pwpolicy.h
 include/openvas/base/settings.h
 include/openvas/misc/arglists.h
 include/openvas/misc/bpf_share.h
 include/openvas/misc/ftp_funcs.h
 include/openvas/misc/internal_com.h
 include/openvas/misc/kb.h
 include/openvas/misc/network.h
 include/openvas/misc/nvt_categories.h
 include/openvas/misc/openvas_auth.h
 include/openvas/misc/openvas_logging.h
 include/openvas/misc/openvas_proctitle.h
 include/openvas/misc/openvas_server.h
 include/openvas/misc/openvas_uuid.h
 include/openvas/misc/pcap_openvas.h
 include/openvas/misc/plugutils.h
 include/openvas/misc/popen.h
 include/openvas/misc/prefs.h
 include/openvas/misc/radius.h
 include/openvas/misc/www_funcs.h
 include/openvas/nasl/nasl.h
 include/openvas/omp/omp.h
 include/openvas/omp/xml.h
 lib/libopenvas_base.so
 lib/libopenvas_base.so.8
-lib/libopenvas_base.so.8.0.7
+lib/libopenvas_base.so.8.0.9
 lib/libopenvas_misc.so
 lib/libopenvas_misc.so.8
-lib/libopenvas_misc.so.8.0.7
+lib/libopenvas_misc.so.8.0.9
 lib/libopenvas_nasl.so
 lib/libopenvas_nasl.so.8
-lib/libopenvas_nasl.so.8.0.7
+lib/libopenvas_nasl.so.8.0.9
 lib/libopenvas_omp.so
 lib/libopenvas_omp.so.8
-lib/libopenvas_omp.so.8.0.7
+lib/libopenvas_omp.so.8.0.9
 libdata/pkgconfig/libopenvas_base.pc
 libdata/pkgconfig/libopenvas_misc.pc
 libdata/pkgconfig/libopenvas_nasl.pc
 libdata/pkgconfig/libopenvas_omp.pc
 man/man1/openvas-nasl.1.gz
 @dir(,,700) etc/openvas/gnupg
 @dir share/openvas
 @dir /var/cache/openvas
 @dir(,,700) /var/lib/openvas/gnupg
 @dir /var/lib/openvas/plugins
 @dir /var/lib/openvas
 @dir /var/lib
 @dir /var/log/openvas