Index: head/sysutils/cfengine-devel/Makefile
===================================================================
--- head/sysutils/cfengine-devel/Makefile	(revision 569493)
+++ head/sysutils/cfengine-devel/Makefile	(revision 569494)
@@ -1,76 +1,76 @@
 # Created by: jrhett@netconsonance.com
 # $FreeBSD$
 
 PORTNAME=	cfengine
 PORTVERSION=	3.${CFENGINE_COMMIT_DATE}
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
-CFENGINE_HASH=		225c5e0cb
-LIBNTECH_HASH=		883eddc
-CFENGINE_COMMIT_DATE=	2021.03.19
+CFENGINE_HASH=		06665e776
+LIBNTECH_HASH=		73e7af1
+CFENGINE_COMMIT_DATE=	2021.03.29
 
 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-2* cfengine3[0-9]-* cfengine31[02-9]-* cfengine-3.*
 
 CONFLICTS=	cfengine-[12-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>
Index: head/sysutils/cfengine-devel/distinfo
===================================================================
--- head/sysutils/cfengine-devel/distinfo	(revision 569493)
+++ head/sysutils/cfengine-devel/distinfo	(revision 569494)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1616421513
-SHA256 (cfengine-core-3.2021.03.19-225c5e0cb_GH0.tar.gz) = dd0504d00ec9cb7c2e7fdd56a3caff032875986628fd36607778e1b94b31c777
-SIZE (cfengine-core-3.2021.03.19-225c5e0cb_GH0.tar.gz) = 2324207
-SHA256 (cfengine-libntech-883eddc_GH0.tar.gz) = f39b4a92dcb4f7f8f7094c82b5391fd0c532e1dc83147f7ec545f01c7d45a110
-SIZE (cfengine-libntech-883eddc_GH0.tar.gz) = 366867
+TIMESTAMP = 1617039280
+SHA256 (cfengine-core-3.2021.03.29-06665e776_GH0.tar.gz) = 0ca4cbce47fd94272de2bfdba2973326cfda862420caa832b321e7e10b26e8e9
+SIZE (cfengine-core-3.2021.03.29-06665e776_GH0.tar.gz) = 2331843
+SHA256 (cfengine-libntech-73e7af1_GH0.tar.gz) = 66ffd0ac420dbe0cbda69a32d58042d737408f07d405654d24dee8888bbf081b
+SIZE (cfengine-libntech-73e7af1_GH0.tar.gz) = 367080
Index: head/sysutils/cfengine-masterfiles-devel/Makefile
===================================================================
--- head/sysutils/cfengine-masterfiles-devel/Makefile	(revision 569493)
+++ head/sysutils/cfengine-masterfiles-devel/Makefile	(revision 569494)
@@ -1,39 +1,41 @@
 # Created by: cy@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	cfengine-masterfiles
 PORTVERSION=	3.${CFENGINE_COMMIT_DATE}
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
-HASH=		97a05348
-CFENGINE_COMMIT_DATE=	2021.03.17
+HASH=		e9b90067
+CFENGINE_COMMIT_DATE=	2021.03.29
 
 MAINTAINER=	cy@FreeBSD.org
 #		gjb@FreeBSD.org is also committer for this port
 #		skreuzer@FreeBSD.org is also committer for this port
 COMMENT=	cfengine sample policies for installations and upgrades
 
 LICENSE=	GPLv3
 
 USE_GITHUB=     yes
 GH_ACCOUNT=	cfengine
 GH_PROJECT=     masterfiles
 GH_TAGNAME=     ${HASH}
 CPE_VENDOR=	gnu
 
 CONFLICTS=	cfengine-masterfiles3[0-9]-* cfengine-masterfiles31[02-9]-* \
 		cfengine-masterfiles-3.*
 
 RUN_DEPENDS=	cf-agent:sysutils/cfengine${PKGNAMESUFFIX}
 
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
 MAKE_JOBS_UNSAFE=	yes
-USES=		autoreconf:build cpe gmake python:build
+USES=		autoreconf:build cpe gmake python:build shebangfix
 HAS_CONFIGURE=	yes
 EXAMPLESDIR=	${PREFIX}/share/examples/cfengine-masterfiles
 CONFIGURE_SCRIPT=	./autogen.sh
 CONFIGURE_ARGS=	--prefix=${EXAMPLESDIR}
 CONFIGURE_ENV=	EXPLICIT_VERSION=${PORTVERSION}-${HASH}
+
+SHEBANG_FILES=	modules/packages/snap
 
 .include <bsd.port.mk>
Index: head/sysutils/cfengine-masterfiles-devel/distinfo
===================================================================
--- head/sysutils/cfengine-masterfiles-devel/distinfo	(revision 569493)
+++ head/sysutils/cfengine-masterfiles-devel/distinfo	(revision 569494)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1616421644
-SHA256 (cfengine-masterfiles-3.2021.03.17-97a05348_GH0.tar.gz) = 7ebce2a800917c1006d9d9e50c1d3dceac5995c9d5185c0693ec7946213435de
-SIZE (cfengine-masterfiles-3.2021.03.17-97a05348_GH0.tar.gz) = 440286
+TIMESTAMP = 1617039343
+SHA256 (cfengine-masterfiles-3.2021.03.29-e9b90067_GH0.tar.gz) = 82705a56bb529816a77c7cd09ce2bd2a6603b2610633cf4c85164379dc181a17
+SIZE (cfengine-masterfiles-3.2021.03.29-e9b90067_GH0.tar.gz) = 440292