9 files changed, 23 insertions, 23 deletions

diff --git a/security/openvas-client/Makefile b/security/openvas-client/Makefile
index 75d215d0eb2c..65ab7ca611ef 100644
--- a/security/openvas-client/Makefile
+++ b/security/openvas-client/Makefile
@@ -10,15 +10,12 @@ MASTER_SITES=	http://wald.intevation.org/frs/download.php/595/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GUI client for OpenVAS
 
-MAN1=		OpenVAS-Client.1 openvasclient-mkcert.1
-
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig
 USE_GNOME=	gtk20
 
 MAKE_JOBS_UNSAFE=yes
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../security/openvas-libraries/Makefile.common"
 
 .include <bsd.port.mk>
diff --git a/security/openvas-client/pkg-plist b/security/openvas-client/pkg-plist
index 23ab59c727ca..8945f163c2c5 100644
--- a/security/openvas-client/pkg-plist
+++ b/security/openvas-client/pkg-plist
@@ -1,4 +1,6 @@
 bin/OpenVAS-Client
 bin/openvasclient-mkcert
 lib/openvas/openvas-ssh-client-rpm-creator.sh
+man/man1/OpenVAS-Client.1.gz
+man/man1/openvasclient-mkcert.1.gz
 @dirrmtry lib/openvas
diff --git a/security/openvas-libnasl/Makefile b/security/openvas-libnasl/Makefile
index 0722713ff9d5..778c75d7e058 100644
--- a/security/openvas-libnasl/Makefile
+++ b/security/openvas-libnasl/Makefile
@@ -14,17 +14,14 @@ LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
 		libgnutls.so:${PORTSDIR}/security/gnutls \
 		libgpg-error.so:${PORTSDIR}/security/libgpg-error \
 		libgpgme.so:${PORTSDIR}/security/gpgme \
-		libopenvas.so.2:${PORTSDIR}/security/openvas-libraries \
-		libopenvas_hg.so.2:${PORTSDIR}/security/openvas-libraries \
+		libopenvas.so:${PORTSDIR}/security/openvas-libraries \
+		libopenvas_hg.so:${PORTSDIR}/security/openvas-libraries \
 		libtasn1.so:${PORTSDIR}/security/libtasn1
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USES=		bison iconv pkgconfig
 
-MAN1=		openvas-libnasl-config.1 openvas-nasl.1
-
-NO_STAGE=	yes
 .include "${.CURDIR}/../../security/openvas-libraries/Makefile.common"
 
 LDFLAGS+=	-lgcrypt
diff --git a/security/openvas-libnasl/pkg-plist b/security/openvas-libnasl/pkg-plist
index 9209a9b2e7c8..ef81680c9306 100644
--- a/security/openvas-libnasl/pkg-plist
+++ b/security/openvas-libnasl/pkg-plist
@@ -5,4 +5,6 @@ lib/libopenvasnasl.a
 lib/libopenvasnasl.la
 lib/libopenvasnasl.so
 lib/libopenvasnasl.so.2
+man/man1/openvas-libnasl-config.1.gz
+man/man1/openvas-nasl.1.gz
 @dirrmtry include/openvas
diff --git a/security/openvas-libraries/Makefile b/security/openvas-libraries/Makefile
index a3e9673050bd..c1f8bbdd0c27 100644
--- a/security/openvas-libraries/Makefile
+++ b/security/openvas-libraries/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://wald.intevation.org/frs/download.php/600/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Libraries for OpenVAS
 
-LIB_DEPENDS=	gnutls.26:${PORTSDIR}/security/gnutls \
-		gcrypt:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
+		libgcrypt.so:${PORTSDIR}/security/libgcrypt
 
 USES=		pkgconfig
 GNU_CONFIGURE=	yes
@@ -19,9 +19,6 @@ USE_LDCONFIG=	yes
 USE_GNOME=	glib20
 MAKE_JOBS_UNSAFE=	yes
 
-MAN1=		libopenvas-config.1
-
-NO_STAGE=	yes
 .include "${.CURDIR}/Makefile.common"
 
 .include <bsd.port.mk>
diff --git a/security/openvas-libraries/pkg-plist b/security/openvas-libraries/pkg-plist
index 9993ae60c0bf..402d09b23c28 100644
--- a/security/openvas-libraries/pkg-plist
+++ b/security/openvas-libraries/pkg-plist
@@ -37,4 +37,5 @@ lib/libopenvas_hg.a
 lib/libopenvas_hg.la
 lib/libopenvas_hg.so
 lib/libopenvas_hg.so.2
+man/man1/libopenvas-config.1.gz
 @dirrm include/openvas
diff --git a/security/openvas-plugins/Makefile b/security/openvas-plugins/Makefile
index cdabe498b05f..494cde72612d 100644
--- a/security/openvas-plugins/Makefile
+++ b/security/openvas-plugins/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Plugins for OpenVAS
 
 BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet \
 		openvasd:${PORTSDIR}/security/openvas-server
-LIB_DEPENDS=	openvas.2:${PORTSDIR}/security/openvas-libraries \
-		openvasnasl.2:${PORTSDIR}/security/openvas-libnasl \
-		gnutls.26:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	libopenvas.so:${PORTSDIR}/security/openvas-libraries \
+		libopenvasnasl.so:${PORTSDIR}/security/openvas-libnasl \
+		libgnutls.so:${PORTSDIR}/security/gnutls
 RUN_DEPENDS=	openvasd:${PORTSDIR}/security/openvas-server \
 		${LOCALBASE}/bin/gmd5sum:${PORTSDIR}/sysutils/coreutils \
 		${LOCALBASE}/bin/rsync:${PORTSDIR}/net/rsync
@@ -24,7 +24,6 @@ GNU_CONFIGURE=	yes
 LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
 CPPFLAGS+=	"`${LIBNET_CONFIG} --cflags`"
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../openvas-libraries/Makefile.common"
 
diff --git a/security/openvas-server/Makefile b/security/openvas-server/Makefile
index 3461b9d87cb6..2d10b5ce4c9a 100644
--- a/security/openvas-server/Makefile
+++ b/security/openvas-server/Makefile
@@ -10,17 +10,15 @@ MASTER_SITES=	http://wald.intevation.org/frs/download.php/593/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Security scanner: a fork of Nessus
 
-LIB_DEPENDS=	openvas.2:${PORTSDIR}/security/openvas-libraries \
-		openvasnasl.2:${PORTSDIR}/security/openvas-libnasl
+LIB_DEPENDS=	libopenvas.so:${PORTSDIR}/security/openvas-libraries \
+		libopenvasnasl.so:${PORTSDIR}/security/openvas-libnasl
 
 GNU_CONFIGURE=	yes
 USES=		gettext pkgconfig
 USE_RC_SUBR=	openvasd
 
-MAN1=		openvas-mkrand.1 openvas-mkcert-client.1 openvasd-config.1
-MAN8=		openvasd.8 openvas-adduser.8 openvas-rmuser.8 openvas-mkcert.8
-
-NO_STAGE=	yes
 .include "${.CURDIR}/../../security/openvas-libraries/Makefile.common"
 
+LDFLAGS+=	-lgcrypt
+
 .include <bsd.port.mk>
diff --git a/security/openvas-server/pkg-plist b/security/openvas-server/pkg-plist
index 9ab6d4ffd887..288d832bfc67 100644
--- a/security/openvas-server/pkg-plist
+++ b/security/openvas-server/pkg-plist
@@ -9,6 +9,13 @@ include/openvas/nessusraw.h
 include/openvas/nessustcp.h
 include/openvas/nessusudp.h
 include/openvas/threadcompat.h
+man/man1/openvas-mkcert-client.1.gz
+man/man1/openvas-mkrand.1.gz
+man/man1/openvasd-config.1.gz
+man/man8/openvas-adduser.8.gz
+man/man8/openvas-mkcert.8.gz
+man/man8/openvas-rmuser.8.gz
+man/man8/openvasd.8.gz
 openvas/lib/openvas/openvas-services
 sbin/openvas-adduser
 sbin/openvas-mkcert