Index: head/sysutils/cfengine-devel/Makefile
===================================================================
--- head/sysutils/cfengine-devel/Makefile	(revision 549869)
+++ head/sysutils/cfengine-devel/Makefile	(revision 549870)
@@ -1,76 +1,76 @@
 # Created by: jrhett@netconsonance.com
 # $FreeBSD$
 
 PORTNAME=	cfengine
 PORTVERSION=	3.${CFENGINE_COMMIT_DATE}
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
-CFENGINE_HASH=		82c3b3656
-LIBNTECH_HASH=		10f1112
-CFENGINE_COMMIT_DATE=	2020.06.05
+CFENGINE_HASH=		c9a7717f5
+LIBNTECH_HASH=		a38de45
+CFENGINE_COMMIT_DATE=	2020.09.27
 
 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
+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 549869)
+++ head/sysutils/cfengine-devel/distinfo	(revision 549870)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1596657228
-SHA256 (cfengine-core-3.2020.06.05-82c3b3656_GH0.tar.gz) = db5ac094949ca2b4e0181f1591131a9e8c4eb67756c1880fa023a292ed676be6
-SIZE (cfengine-core-3.2020.06.05-82c3b3656_GH0.tar.gz) = 2232700
-SHA256 (cfengine-libntech-10f1112_GH0.tar.gz) = 2ec45eca0bf48ca516677958d3f3a995b77f58ce17f4ed70a96a7439cc53ad35
-SIZE (cfengine-libntech-10f1112_GH0.tar.gz) = 363070
+TIMESTAMP = 1600906605
+SHA256 (cfengine-core-3.2020.09.27-c9a7717f5_GH0.tar.gz) = 061c9513a4eda631809bf1804ea68f32c43211132aa64949e38e127854c6cbb4
+SIZE (cfengine-core-3.2020.09.27-c9a7717f5_GH0.tar.gz) = 2266977
+SHA256 (cfengine-libntech-a38de45_GH0.tar.gz) = f4f71e21e796601a667fb4e758439e08a360fe45ab1eb343861fc8537d116982
+SIZE (cfengine-libntech-a38de45_GH0.tar.gz) = 363629
Index: head/sysutils/cfengine-masterfiles-devel/Makefile
===================================================================
--- head/sysutils/cfengine-masterfiles-devel/Makefile	(revision 549869)
+++ head/sysutils/cfengine-masterfiles-devel/Makefile	(revision 549870)
@@ -1,39 +1,39 @@
 # Created by: cy@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	cfengine-masterfiles
 PORTVERSION=	3.${CFENGINE_COMMIT_DATE}
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
-HASH=		83c4e0cf
-CFENGINE_COMMIT_DATE=	2020.08.03
+HASH=		81ffabdd
+CFENGINE_COMMIT_DATE=	2020.09.21
 
 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
 HAS_CONFIGURE=	yes
 EXAMPLESDIR=	${PREFIX}/share/examples/cfengine-masterfiles
 CONFIGURE_SCRIPT=	./autogen.sh
 CONFIGURE_ARGS=	--prefix=${EXAMPLESDIR}
 CONFIGURE_ENV=	EXPLICIT_VERSION=${PORTVERSION}-${HASH}
 
 .include <bsd.port.mk>
Index: head/sysutils/cfengine-masterfiles-devel/distinfo
===================================================================
--- head/sysutils/cfengine-masterfiles-devel/distinfo	(revision 549869)
+++ head/sysutils/cfengine-masterfiles-devel/distinfo	(revision 549870)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1596657444
-SHA256 (cfengine-masterfiles-3.2020.08.03-83c4e0cf_GH0.tar.gz) = 303c73d6cf315fca3787a86119ccff74c479e7933f6c77e7545455c9a6213aab
-SIZE (cfengine-masterfiles-3.2020.08.03-83c4e0cf_GH0.tar.gz) = 428812
+TIMESTAMP = 1600906699
+SHA256 (cfengine-masterfiles-3.2020.09.21-81ffabdd_GH0.tar.gz) = 5bcbdec02ae435f7dcd931fecc70b7e5228e87efacec2b828f15baaebb0a6df8
+SIZE (cfengine-masterfiles-3.2020.09.21-81ffabdd_GH0.tar.gz) = 433822