diff --git a/security/gvm/Makefile b/security/gvm/Makefile
index 08dd06cf1d99..0e4708a25266 100644
--- a/security/gvm/Makefile
+++ b/security/gvm/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	gvm
 PORTVERSION=	22.4.0
+PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Greenbone vulnerability management (metaport)
 
 USES=		metaport python:3.7+
 
 # Install GVM libraries
 RUN_DEPENDS+=	${LOCALBASE}/lib/libgvm_base.so:security/gvm-libs
 
 # Install GVM Manager
 RUN_DEPENDS+=	${LOCALBASE}/sbin/gvmd:security/gvmd
 
 # Install Scanner wrapper for OSP
 RUN_DEPENDS+=	${LOCALBASE}/bin/ospd-openvas:security/py-ospd-openvas@${PY_FLAVOR}
 
 # Install OpenVAS Scanner
 RUN_DEPENDS+=   ${LOCALBASE}/sbin/openvas:security/openvas
 
 # Install Notus Scanner
 RUN_DEPENDS+=	${LOCALBASE}/bin/notus-scanner:security/py-notus-scanner
 
 # Install GVM Web Interface
 RUN_DEPENDS+=	${LOCALBASE}/sbin/gsad:security/gsad
 RUN_DEPENDS+=	${LOCALBASE}/share/gvm/gsad/web/index.html:security/gsa
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		PYTHON-GVM GVM-TOOLS
 OPTIONS_DEFAULT=	PYTHON-GVM GVM-TOOLS
 
 PYTHON-GVM_DESC=	Install GVM python API library
 GVM-TOOLS_DESC=		Install GVM tools
 
 PYTHON-GVM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-gvm>=0:security/py-python-gvm@${PY_FLAVOR}
 GVM-TOOLS_RUN_DEPENDS=	gvm-cli:security/py-gvm-tools@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/security/openvas/Makefile b/security/openvas/Makefile
index 33e380328be1..96aa7f2dec3d 100644
--- a/security/openvas/Makefile
+++ b/security/openvas/Makefile
@@ -1,45 +1,50 @@
 PORTNAME=	openvas
 DISTVERSION=	22.4.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Open vulnerability assessment scanner
 
 LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	flex:textproc/flex
 LIB_DEPENDS=	libgvm_base.so:security/gvm-libs \
 		libgcrypt.so:security/libgcrypt \
 		libpcap.so.1:net/libpcap \
 		libksba.so:security/libksba \
 		libgpgme.so:security/gpgme \
 		libssh.so:security/libssh \
 		libgnutls.so:security/gnutls \
 		libnetsnmp.so:net-mgmt/net-snmp \
 		libjson-glib-1.0.so:devel/json-glib
 RUN_DEPENDS=	redis-server:databases/redis \
 		snmpget:net-mgmt/net-snmp \
 		rsync:net/rsync \
 		nmap:security/nmap \
 		${PYTHON_PKGNAMEPREFIX}impacket>=0:net/py-impacket@${PY_FLAVOR}
 USE_GITHUB=	yes
 GH_ACCOUNT=	greenbone
 GH_PROJECT=	${PORTNAME}-scanner
 
 USES=		bison cmake gnome pkgconfig python:3.5+
 USE_GNOME=	glib20
 
 USERS=		gvm
 GROUPS=		${USERS}
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|g_pattern_match_string|g_pattern_spec_match_string|g' ${WRKSRC}/misc/strutils.c
+.if ${OSVERSION} < 1301000
 	@${REINPLACE_CMD} -e 's|-Wunused-but-set-variable|-Wunused-variable|g' ${WRKSRC}/nasl/nasl_grammar.y
+.endif
 	@${REINPLACE_CMD} -e 's|#include <bsd/unistd.h>||g' ${WRKSRC}/src/attack.c ${WRKSRC}/src/nasl_plugins.c
 	@${REINPLACE_CMD} -e 's|#include <bsd/unistd.h>|#include <unistd.h>|g' ${WRKSRC}//src/pluginload.c
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/run/ospd
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/py-ospd-openvas/Makefile b/security/py-ospd-openvas/Makefile
index 02557ea63f21..c8f2f1eefdcc 100644
--- a/security/py-ospd-openvas/Makefile
+++ b/security/py-ospd-openvas/Makefile
@@ -1,55 +1,56 @@
 PORTNAME=	ospd-openvas
 DISTVERSION=	22.4.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security python
 #MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Scanner wrapper for OSP (Open Scanner Protocol)
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry2setup>0:devel/py-poetry2setup@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>=0:databases/py-redis@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}deprecated>0:devel/py-deprecated@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-gnupg>0:security/py-python-gnupg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paho-mqtt>0:net/py-paho-mqtt@${PY_FLAVOR} \
 		openvas:security/openvas
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	greenbone
 GH_PROJECT=	${PORTNAME}
 
 USES=		python:3.8+
 USE_PYTHON=	distutils
 
 NO_ARCH=	yes
 
 USERS=		gvm
 GROUPS=		${USERS}
 
 USE_RC_SUBR=	${PORTNAME:S/-/_/}
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
 
 post-patch:
 	${REINPLACE_CMD} -i "" '38d' ${WRKSRC}/pyproject.toml
 	${REINPLACE_CMD} -i "" -e 's|/etc/openvas/gnupg|/var/lib/openvas/gnupg|g' \
 		${WRKSRC}/ospd_openvas/gpg_sha_verifier.py
 	${REINPLACE_CMD} -i "" -e 's|/run/ospd|/var/run/ospd|g' \
 		${WRKSRC}/ospd/parser.py ${WRKSRC}/config/ospd-openvas.conf
 pre-configure:
 	@cd ${WRKSRC} && poetry2setup > ${WRKSRC}/setup.py
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/gvm
 	@${INSTALL_DATA} ${WRKSRC}/config/ospd-openvas.conf ${STAGEDIR}${PREFIX}/etc/gvm/ospd-openvas.conf.sample
 	@${MKDIR} ${STAGEDIR}/var/run/ospd
 
 .include <bsd.port.mk>