diff --git a/sysutils/cfengine-devel/Makefile b/sysutils/cfengine-devel/Makefile
index e812fc543b7a..0bdf8950bf86 100644
--- a/sysutils/cfengine-devel/Makefile
+++ b/sysutils/cfengine-devel/Makefile
@@ -1,74 +1,73 @@
 # Created by: jrhett@netconsonance.com
 
 PORTNAME=	cfengine
 PORTVERSION=	3.${CFENGINE_COMMIT_DATE}
-PORTREVISION=	2
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
-CFENGINE_HASH=		9bc6e3d83
-LIBNTECH_HASH=		036c173
-CFENGINE_COMMIT_DATE=	2022.03.14
+CFENGINE_HASH=		77ae2447f
+LIBNTECH_HASH=		5882865
+CFENGINE_COMMIT_DATE=	2022.04.25
 
 MAINTAINER=	cy@FreeBSD.org
 #		gjb@FreeBSD.org is also committer for this port
 #		skreuzer@FreeBSD.org is also committer for this port
 COMMENT=	Systems administration tool for networks
 
 LICENSE=	GPLv3
 
 USE_GITHUB=	yes
 # GH_PROJECT=	core libntech:libntech
 # GH_TAGNAME=	${CFENGINE_HASH} ${LIBNTECH_HASH}
 GH_TUPLE=	cfengine:core:${CFENGINE_HASH} \
 		cfengine:libntech:${LIBNTECH_HASH}:libntech/libntech
 CPE_VENDOR=	gnu
 
 CONFLICTS=	cfengine cfengine3[0-9] cfengine3[0-9][0-9]
 
 USE_RC_SUBR=	cf-execd cf-serverd cf-monitord
 
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USES=		autoreconf:build cpe gmake gnome libtool localbase shebangfix \
 		ssl
 USE_GNOME=	libxml2
 SHEBANG_FILES=	examples/remake_outputs.pl
 CFLAGS+=	-Wno-return-type -fcommon
 # EXAMPLESDIR=	${PREFIX}/share/examples/cfengine3
 DOCSDIR=	${PREFIX}/share/doc/cfengine
 MAKE_ENV=	EXPLICIT_VERSION=${PORTVERSION}-${HASH}
 EXPLICIT_VERSION=${PORTVERSION}-${HASH}
 CONFIGURE_SCRIPT=	./autogen.sh
 CONFIGURE_ENV=	EXPLICIT_VERSION=${PORTVERSION}-${HASH}
 CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 		--htmldir=${DOCSDIR}/html \
 		--libexecdir=${PREFIX}/libexec \
 		--libdir=${PREFIX}/libexec \
 		--mandir=${PREFIX}/man \
 		--with-workdir=/var/cfengine \
 		--with-pcre=${LOCALBASE} \
 		--with-lmdb=${LOCALBASE} \
 		--enable-fhs
 INSTALL_TARGET=	install-strip
 
 LIB_DEPENDS+=	libpcre.so:devel/pcre \
 		liblmdb.so:databases/lmdb \
 		libyaml.so:textproc/libyaml \
 		libcurl.so:ftp/curl
 
 OPTIONS_DEFINE=	PGSQL MYSQL LIBVIRT
 
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_WITH=	postgresql=${LOCALBASE}
 
 MYSQL_USES=		mysql
 MYSQL_BROKEN=		configure: error: MySQL client library exports symbols (EVP_CIPHER_CTX_init) clashing with OpenSSL.
 MYSQL_CONFIGURE_WITH=	mysql=${LOCALBASE}
 MYSQL_LIB_DEPENDS=	libmysqlclient.so:${_MYSQL_CLIENT}
 MYSQL_LDFLAGS=		-L${LOCALBASE}/lib/mysql
 
 LIBVIRT_CONFIGURE_WITH=	libvirt=${LOCALBASE}
 LIBVIRT_LIB_DEPENDS+=	libvirt.so:devel/libvirt
 
 .include <bsd.port.mk>
diff --git a/sysutils/cfengine-devel/distinfo b/sysutils/cfengine-devel/distinfo
index 2a5895e04f6d..609f53ec1c44 100644
--- a/sysutils/cfengine-devel/distinfo
+++ b/sysutils/cfengine-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1647275650
-SHA256 (cfengine-core-3.2022.03.14-9bc6e3d83_GH0.tar.gz) = 89e85f8af9fdb6df6b01d8bbb42d77b7e90365cbe6cfdef417658fa9314cb551
-SIZE (cfengine-core-3.2022.03.14-9bc6e3d83_GH0.tar.gz) = 2380745
-SHA256 (cfengine-libntech-036c173_GH0.tar.gz) = 6d819d8fd8ac836ab4af59d3b40f30ab086b3e359618f6e2c57e2af3947f054b
-SIZE (cfengine-libntech-036c173_GH0.tar.gz) = 374522
+TIMESTAMP = 1650897480
+SHA256 (cfengine-core-3.2022.04.25-77ae2447f_GH0.tar.gz) = f67986816abecc1245bb4a9bb346aae10ea50824c6ac92f395e19d131f5f50a8
+SIZE (cfengine-core-3.2022.04.25-77ae2447f_GH0.tar.gz) = 2358897
+SHA256 (cfengine-libntech-5882865_GH0.tar.gz) = 1108a3eac3c9d57866c24f35421c772c72e3b7f53f77836f149528fc5563c03c
+SIZE (cfengine-libntech-5882865_GH0.tar.gz) = 374569