diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index f6eff65b8ff2..5ce48317779f 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,280 +1,281 @@
 PORTNAME=	qemu
 DISTVERSION=	10.1.0
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.qemu.org/
 DIST_SUBDIR=	qemu/${PORTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	QEMU CPU Emulator ${${FLAVOR}_COMMENT}
 WWW=		https://www.qemu.org/
 
 LICENSE=	GPLv2
 
 .if ${FLAVOR:U} != tools && ${FLAVOR:U} != guestagent
 ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64 powerpc64le
 # We need to check if it build with other ARCHS
 .endif
 
 BUILD_DEPENDS=	bash:shells/bash
 .if ${FLAVOR:U} != guestagent
 LIB_DEPENDS+=	libzstd.so:archivers/zstd
 .endif
 .if ${FLAVOR:U} != tools && ${FLAVOR:U} != guestagent
 LIB_DEPENDS+=	libfdt.so:sysutils/dtc \
 		libinotify.so:devel/libinotify \
 		libslirp.so:net/libslirp
 .endif
 .if (${FLAVOR:U} != nox11 && ${FLAVOR:U} != tools && ${FLAVOR:U} != guestagent)
 LIB_DEPENDS+=	libepoxy.so:graphics/libepoxy
 .endif
 .if (${FLAVOR:U} != nox11 && ${FLAVOR:U} != tools && ${FLAVOR:U} != default)
 PKGMESSAGE=	${.CURDIR}/pkg-message.guest-agent
 .endif
 
 FLAVORS=			default nox11 tools guestagent
 FLAVOR?=			${FLAVORS:[1]}
 default_CONFLICTS_INSTALL=	qemu-devel qemu-nox11 qemu-tools qemu-utils \
 				qemu6* qemu7*
 nox11_PKGNAMESUFFIX=		-nox11
 nox11_CONFLICTS_INSTALL=	qemu qemu-devel qemu6* qemu7* qemu-guest-agent
 nox11_COMMENT=			(without X11)
 tools_PKGNAMESUFFIX=		-tools
 tools_COMMENT=			(tools only)
 tools_CONFLICTS_INSTALL=	qemu qemu-devel qemu-nox11 qemu-utils qemu6* \
 				qemu70* qemu-guest-agent
 tools_DESCR=			${.CURDIR}/pkg-descr-tools
 tools_PLIST=			${.CURDIR}/pkg-plist-tools
 guestagent_PKGNAMESUFFIX=		-guest-agent
 guestagent_COMMENT=			(guest agent)
 guestagent_DESCR=		${.CURDIR}/pkg-descr-ga
 guestagent_PLIST=		${.CURDIR}/pkg-plist-ga
 guestagent_CONFLICTS_INSTALL=	qemu qemu-devel qemu-nox11 qemu-tools qemu-utils qemu6* \
 				qemu7* qemu-guest-agent
 
 USES=		cpe gmake gnome ninja perl5 pkgconfig python:build shebangfix tar:xz
 SHEBANG_FILES=	scripts/xml-preprocess.py
 USE_GNOME=	glib20
 USE_PERL5=	build
 .if ${FLAVOR:U} != tools && ${FLAVOR:U} != guestagent
 USES+=		iconv:wchar_t
 .endif
 .if (${FLAVOR:U} != nox11 && ${FLAVOR:U} != tools && ${FLAVOR:U} != guestagent)
 USE_GNOME+=	cairo
 .endif
 
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--cc=${CC} \
 			--disable-kvm \
 			--disable-linux-aio \
 			--disable-linux-user \
 			--disable-xen \
 			--extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" \
 			--extra-ldflags=-L${LOCALBASE}/lib \
 			--extra-ldflags=-L/usr/lib \
 			--localstatedir=/var \
 			--mandir=${PREFIX}/share/man \
 			--prefix=${PREFIX} \
 			--python=${PYTHON_CMD}
 .if ${FLAVOR:U} == guestagent
 USE_RC_SUBR=		qemu-guest-agent
 CONFIGURE_ARGS+=	--enable-guest-agent --disable-tools --disable-xkbcommon
 .else
 CONFIGURE_ARGS+=	--disable-guest-agent
 .endif
 .if ${FLAVOR:U} != tools && ${FLAVOR:U} != guestagent
 CONFIGURE_ARGS+=	--enable-fdt=system \
 			--enable-netmap
 .endif
 .if ${FLAVOR:U} == tools || ${FLAVOR:U} == guestagent
 CONFIGURE_ARGS+=	--disable-attr \
 			--disable-install-blobs \
 			--disable-brlapi \
 			--disable-bzip2 \
 			--disable-cap-ng \
 			--disable-coroutine-pool \
 			--disable-curses \
 			--disable-fdt \
 			--disable-gcrypt \
 			--disable-glusterfs \
 			--disable-libnfs \
 			--disable-libusb \
 			--disable-lzo \
 			--disable-netmap \
 			--disable-nettle \
 			--disable-numa \
 			--disable-rbd \
 			--disable-rdma \
 			--disable-seccomp \
 			--disable-smartcard \
 			--disable-snappy \
 			--disable-spice \
 			--disable-system \
 			--disable-tpm \
 			--disable-user \
 			--disable-vhost-net \
 			--disable-virtfs \
 			--disable-vnc
 .endif
 .if ${FLAVOR:U} == tools
 CONFIGURE_ARGS+=	--enable-tools --enable-zstd
 .endif
 
 CFLAGS:=	${CFLAGS:C/-fno-tree-vrp//}
 WITHOUT_CPU_CFLAGS=	yes #to avoid problems with register allocation
 
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 PORTDOCS=	.buildinfo _static/* about/* dbus-dbusindex.html devel/* docs \
 		genindex.html glossary.html index.html interop/* objects.inv \
 		qapi-qga-index.html qapi-qmp-index.html qapi-qsd-index.html \
 		search.html searchindex.js specs/* system/* tools/* user/*
 
 OPTIONS_DEFINE=			CAPSTONE CDROM_DMA CURL DEBUG DOCS GNUTLS GTK3 \
 				ISCSI JPEG OPENGL PNG SAMBA SASL STATIC_LINK \
 				STRIP USBREDIR VDE X11 X86_TARGETS
 OPTIONS_DEFAULT=		CDROM_DMA CURL GNUTLS GTK3 JPEG NCURSES_DEFAULT \
 				OPENGL PNG SASL VDE X11
 OPTIONS_SINGLE=			NCURSES
 OPTIONS_SINGLE_NCURSES=		NCURSES_BASE NCURSES_DEFAULT NCURSES_PORT
 .if ${FLAVOR:U} == nox11
 OPTIONS_EXCLUDE:=		GTK3 OPENGL X11
 .endif
 .if ${FLAVOR:U} == tools || ${FLAVOR:U} == guestagent
 OPTIONS_EXCLUDE:=		CAPSTONE CDROM_DMA CURL DEBUG GNUTLS GTK3 ISCSI \
 				JPEG NCURSES NCURSES_BASE NCURSES_DEFAULT \
 				NCURSES_PORT OPENGL PNG SAMBA SASL STATIC_LINK \
 				USBREDIR VDE X11 X86_TARGETS
 .endif
 OPTIONS_SUB=			yes
 CAPSTONE_DESC=			Disassembly framework support
 CDROM_DMA_DESC=			IDE CDROM DMA
 GNUTLS_DESC=			gnutls dependency (vnc encryption)
 ISCSI_DESC=			libiscsi dependency (iSCSI client for emulated drives)
 JPEG_DESC=			jpeg dependency (vnc lossy compression)
 NCURSES_BASE_DESC=		Depend on ncurses in base
 NCURSES_DEFAULT_DESC=		Depend on ncurses (ports if installed, otherwise base)
 NCURSES_PORT_DESC=		Depend on devel/ncurses in ports
 PNG_DESC=			png dependency (vnc compression)
 SAMBA_DESC=			samba dependency (for -smb)
 SASL_DESC=			cyrus-sasl dependency (vnc encryption)
 STATIC_LINK_DESC=		Statically link the executables
 USBREDIR_DESC=			usb device network redirection (experimental!)
 VDE_DESC=			vde dependency (for vde networking)
 X86_TARGETS_DESC=		Build only x86 system targets
 CAPSTONE_LIB_DEPENDS=		libcapstone.so:devel/capstone
 CAPSTONE_CONFIGURE_ON=		--enable-capstone \
 				--extra-cflags=-I${LOCALBASE}/include/capstone
 CAPSTONE_CONFIGURE_OFF=		--disable-capstone
 CURL_LIB_DEPENDS=		libcurl.so:ftp/curl
 CURL_CONFIGURE_OFF=		--disable-curl
 DEBUG_CONFIGURE_ON=		--enable-debug
 DOCS_BUILD_DEPENDS=		${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \
 				sphinx-build:textproc/py-sphinx@${PY_FLAVOR}
 DOCS_CONFIGURE_ENABLE=		docs
 GNUTLS_LIB_DEPENDS=		libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_OFF=		--disable-gnutls
 GTK3_LIB_DEPENDS=		libxkbcommon.so:x11/libxkbcommon
 GTK3_USES=			gettext gl
 GTK3_USE=			GNOME=gdkpixbuf,gtk30,vte3 \
 				XORG=x11,xext
 GTK3_CONFIGURE_OFF=		--disable-gtk \
 				--disable-vte
 ISCSI_LIB_DEPENDS=		libiscsi.so:net/libiscsi
 ISCSI_CONFIGURE_OFF=		--disable-libiscsi
 JPEG_USES=			jpeg
 JPEG_CONFIGURE_OFF=		--disable-vnc-jpeg
 NCURSES_BASE_USES=		ncurses:base
 NCURSES_DEFAULT_USES=		ncurses
 NCURSES_PORT_USES=		ncurses:port
 OPENGL_USES=			gl
 OPENGL_USE=			GL=gbm,gl
 OPENGL_CONFIGURE_OFF=		--disable-opengl
 PNG_LIB_DEPENDS=		libpng.so:graphics/png
 PNG_CONFIGURE_OFF=		--disable-png
 SAMBA_USES=			samba:run # smbd
 SAMBA_CONFIGURE_ON=		--smbd=${LOCALBASE}/sbin/smbd
 SASL_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
 SASL_CONFIGURE_OFF=		--disable-vnc-sasl
 STATIC_LINK_PREVENTS=		GTK3 X11
 STATIC_LINK_PREVENTS_MSG=	X11 ui cannot be built static
 STATIC_LINK_CONFIGURE_ON=	--static
 STRIP_CONFIGURE_OFF=		--disable-strip
 USBREDIR_BUILD_DEPENDS=		usbredir>=0.6:net/usbredir
 USBREDIR_RUN_DEPENDS=		usbredir>=0.6:net/usbredir
 USBREDIR_CONFIGURE_OFF=		--disable-usb-redir
 VDE_LIB_DEPENDS=		libvdeplug.so:net/vde2
 VDE_CONFIGURE_OFF=		--disable-vde
 X11_USES=			sdl
 X11_USE=			GNOME=gdkpixbuf \
 				SDL=sdl2 \
 				XORG=x11,xext
 X11_CONFIGURE_ENABLE=		sdl
 .if (empty(FLAVOR) || ${FLAVOR:U} == default || ${FLAVOR:U} == nox11) && \
 	(${FLAVOR:U} != tools || ${PKGNAMESUFFIX} != "-guest-agent")
 X86_TARGETS_LIB_DEPENDS_OFF=	libdw.so:devel/elfutils \
 	liblzo2.so:archivers/lzo2
 X86_TARGETS_USES_OFF=		xorg
 X86_TARGETS_USE_OFF=		XORG=pixman,x11
 X86_TARGETS_CONFIGURE_ON=	--target-list='i386-softmmu i386-bsd-user x86_64-softmmu x86_64-bsd-user'
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${FLAVOR:U} == tools || ${FLAVOR:U} == guestagent
 .if ${ARCH} == "i386" || ${ARCH} == "powerpc" || ${ARCH:Marmv?}
 PLIST_SUB+=	NO_I386="@comment "
 .else
 PLIST_SUB+=	NO_I386=""
 .endif
 .endif
 
 .if (empty(FLAVOR) || ${FLAVOR:U} == default || ${FLAVOR:U} == nox11) && \
 	(${FLAVOR:U} != tools || ${PKGNAMESUFFIX} != "-guest-agent")
 .if ${ARCH} == "amd64"
 MAKE_ARGS+=	ARCH=x86_64
 .endif
 
 .if ${ARCH} == "powerpc"
 CFLAGS+=	-D_CALL_SYSV
 MAKE_ARGS+=	ARCH=ppc
 USE_GCC=	yes
 .endif
 
 .if ${ARCH:Mpowerpc64*} || ${ARCH:Maarch64}
 CONFIGURE_ARGS+=	--disable-bsd-user
 MAKE_ARGS+=	ARCH=${ARCH:C/powerpc64.*/ppc64/}
 PLIST_SUB+=	BSDUSER="@comment "
 .else
 PLIST_SUB+=	BSDUSER=""
 .endif
 
 PLIST_SUB+=	LINUXBOOT_DMA=""
 .endif
 
 post-patch:
 .if ${FLAVOR:U} == tools
 	@${REINPLACE_CMD} -e '/keymaps/d' ${WRKSRC}/pc-bios/meson.build
 .endif
 
 post-patch-CDROM_DMA-off:
 	@${REINPLACE_CMD} -e '/USE_DMA_CDROM/d' ${WRKSRC}/hw/ide/ide-internal.h
 
 do-build:
 	cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${GMAKE} -j${MAKE_JOBS_NUMBER}
 
 do-install:
 	cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} DESTDIR=${STAGEDIR} ${GMAKE} install
 
 .if !target(post-install)
 post-install:
 .if ${FLAVOR:U} != tools && ${FLAVOR:U} != guestagent
 	${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc
 .endif
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qemu-*
 
 post-install-DOCS-on:
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}/)
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/cloud-init/Makefile b/net/cloud-init/Makefile
index f12651575c18..eac2018b8eb4 100644
--- a/net/cloud-init/Makefile
+++ b/net/cloud-init/Makefile
@@ -1,79 +1,80 @@
 PORTNAME=	cloud-init
 DISTVERSION=	25.2
+PORTREVISION=	1
 CATEGORIES=	net python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	andrey@bsdnir.info
 COMMENT=	Init scripts for use on cloud images
 WWW=		https://cloud-init.io/
 
 LICENSE=	APACHE20 GPLv3
 LICENSE_COMB=	dual
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-Apache2.0
 LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSE-GPLv3
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		sudo>0:security/sudo
 
 USES=		python shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	canonical
 USE_PYTHON=	autoplist distutils
 
 SHEBANG_FILES=	tools/hook-hotplug tools/read-dependencies tools/read-version \
 		tools/validate-yaml.py
 
 NO_ARCH=	yes
 
 # Conflicts
 CONFLICTS_INSTALL=	cloud-init-devel
 
 # Standard bsd.port.mk variables
 ETCDIR=		${PREFIX}/etc/cloud
 
 MAN1FILES=	cloud-id.1 cloud-init-per.1 cloud-init.1
 
 PLIST_FILES+=	${MAN1FILES:S|^|share/man/man1/|:S|.1$|.1.gz|}
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400000
 EXTRA_PATCHES+=	${PATCHDIR}/extra-cloudinit_distros_freebsd.py
 .endif
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1500000
 EXTRA_PATCHES+=	${PATCHDIR}/extra-cloudinit_netinfo.py
 .endif
 
 .include <bsd.port.pre.mk>
 
 PYDISTUTILS_INSTALLARGS+=	"--init-system=sysvinit_freebsd"
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${STAGEDIR}${PREFIX}|g' ${WRKSRC}/setup.py
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/cloudinit/settings.py
 	${REINPLACE_CMD} -e 's|@@PACKAGED_VERSION@@|${DISTVERSION}${DISTVERSIONSUFFIX}|g' ${WRKSRC}/cloudinit/version.py
 	${RM} ${WRKSRC}/config/cloud.cfg.d/99_freebsd.cfg.orig
 
 post-install:
 	${MV} ${STAGEDIR}${ETCDIR}/cloud.cfg ${STAGEDIR}${ETCDIR}/cloud.cfg.sample
 	${MV} ${STAGEDIR}${ETCDIR}/cloud.cfg.d/05_logging.cfg ${STAGEDIR}${ETCDIR}/cloud.cfg.d/05_logging.cfg.sample
 	${MV} ${STAGEDIR}${ETCDIR}/cloud.cfg.d/99_freebsd.cfg ${STAGEDIR}${ETCDIR}/cloud.cfg.d/99_freebsd.cfg.sample
 	${REINPLACE_CMD} -e 's|^.*\.cfg$$|@sample &.sample|'  \
 		-e 's|${ETCDIR}/clean.d|@dir ${ETCDIR}/clean.d|' \
 		-e 's|${DOCSDIR}/module-docs|@dir ${DOCSDIR}/module-docs|' \
 		${_PYTHONPKGLIST}
 .for man in ${MAN1FILES}
 		${INSTALL_MAN} ${WRKSRC}/doc/man/${man} ${STAGEDIR}${PREFIX}/share/man/man1
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/net/isc-dhcp44-server/Makefile b/net/isc-dhcp44-server/Makefile
index 208d09a1191f..5728b3a390ae 100644
--- a/net/isc-dhcp44-server/Makefile
+++ b/net/isc-dhcp44-server/Makefile
@@ -1,170 +1,170 @@
 PORTNAME=	dhcp
 ISCVERSION=	4.4.3-P1
 PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
 PORTREVISION=	${DHCP_PORTREVISION}
 CATEGORIES=	net
 MASTER_SITES=	ISC/${PORTNAME}/${PORTVERSION:S/P/-P/g} \
 		ZI
 PKGNAMEPREFIX=	isc-
 PKGNAMESUFFIX=	44-${SUBSYS}
 DISTNAME=	${PORTNAME}-${ISCVERSION}
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT?=	ISC Dynamic Host Configuration Protocol server
 WWW=		https://www.isc.org/dhcp/
 
 LICENSE=	MPL20
 
 USES=		cpe gmake
 
 CPE_VENDOR=	isc
 
 PORTREVISION_SERVER=	2
-PORTREVISION_CLIENT=	1
+PORTREVISION_CLIENT=	2
 PORTREVISION_RELAY=	1
 
 SUBSYS?=	server
 
 OPTIONS_DEFINE=	IPV6 DOCS
 OPTIONS_SUB=	yes
 
 .if ${SUBSYS} == server
 OPTIONS_DEFINE+=	PARANOIA LDAP LDAP_SSL BIND_SYMBOLS DHCP4O6 \
 			BINLEASES
 OPTIONS_DEFAULT+=	PARANOIA LDAP_SSL
 DHCP4O6_DESC=		Enable DHCPv4-over-DHCPv6 (TSV)
 PARANOIA_DESC=		Enable support for chroot
 LDAP_SSL_DESC=		Support LDAP over SSL/TLS
 BIND_SYMBOLS_DESC=	Enable BIND internal symbol table
 BINLEASES_DESC=		Enable support for binary insertion of leases
 .endif
 
 # PORTREVISION and CONFLICTS handling
 .if ${SUBSYS} == client
 CONFLICTS=	isc-dhcp3?-client-[0-9]* isc-dhcp4[123]-client-[0-9]*
 DHCP_PORTREVISION=	${PORTREVISION_CLIENT}
 .elif ${SUBSYS} == relay
 CONFLICTS=	isc-dhcp3?-relay isc-dhcp4[123]-relay
 DHCP_PORTREVISION=	${PORTREVISION_RELAY}
 .else
 CONFLICTS=	isc-dhcp3?-server isc-dhcp4[123]-server
 DHCP_PORTREVISION=	${PORTREVISION_SERVER}
 .endif
 MAKE_JOBS_UNSAFE=	yes
 
 .if ${SUBSYS} == server
 USERS=		dhcpd
 GROUPS=		dhcpd
 .endif
 
 MAN_COMPRESSED=	no
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-D_PATH_DHCLIENT_SCRIPT='\"${PREFIX}/sbin/dhclient-script\"' -D_PATH_DHCLIENT_CONF='\"${PREFIX}/etc/dhclient.conf\"' -D_PATH_DHCPD_CONF='\"${PREFIX}/etc/dhcpd.conf\"'
 SCRIPTS_ENV+=	PKG_PREFIX=${PREFIX}
 
 .if ${SUBSYS} == server
 CONFIGURE_ARGS+=--localstatedir=/var
 CFLAGS+=	-fPIC
 .endif
 
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
 .if ${SUBSYS} == server
 USE_RC_SUBR=	isc-dhcpd
 .elif ${SUBSYS} == relay
 USE_RC_SUBR=	isc-dhcrelay
 .endif
 
 SCHEMA_DIR=	${PREFIX}/share/${PKGBASE}
 DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 DATADIR=	/var/db
 
 MSG_FILE=	${.CURDIR}/pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 REINPLACE_SUB=	PREFIX="${PREFIX}"
 PKGMESSAGE_SUB=	PREFIX="${PREFIX}" \
 		DOCSDIR="${DOCSDIR}"
 
 BINLEASES_CONFIGURE_ENABLE=	binary-leases
 PARANOIA_CONFIGURE_ENABLE=	paranoia early-chroot
 LDAP_CONFIGURE_WITH=		ldap ldapcrypto
 LDAP_USES=			ldap shebangfix
 LDAP_SSL_USES=			ssl
 LDAP_SSL_VARS=			LIBS+=-lssl
 LDAP_IMPLIES=			IPV6
 IPV6_CONFIGURE_ENABLE=		dhcpv6
 DHCP4O6_CONFIGURE_ENABLE=	dhcpv4o6
 BIND_SYMBOLS_USES=		perl5
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLDAP}
 LDAP_SCRIPT=	${WRKSRC}/contrib/ldap/dhcpd-conf-to-ldap
 LDAP_SCHEMA=	${WRKSRC}/contrib/ldap/dhcp.schema
 LDAP_README=	${WRKSRC}/contrib/ldap/README.ldap
 CPPFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 LIBS+=		-L${LOCALBASE}/lib
 PORTDOCS+=	README.ldap
 PLIST_SUB+=	SCHEMA_DIR="${SCHEMA_DIR:S,^${PREFIX}/,,}" LDAP=""
 SHEBANG_FILES=	contrib/ldap/dhcpd-conf-to-ldap
 .endif
 
 .if empty(PORT_OPTIONS:MBIND_SYMBOLS)
 EXTRA_PATCHES+=${PATCHDIR}/extra-patch-bind_Makefile.in
 .endif
 
 .if ${PORT_OPTIONS:MPARANOIA}
 SUB_LIST+=	PARANOIAOPT="yes"
 .else
 SUB_LIST+=	PARANOIAOPT="no"
 .endif
 
 post-patch:
 	@${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${MSG_FILE} > ${PKGMESSAGE}
 	@${REINPLACE_CMD} -e 's|/usr/local||g' \
 		${WRKSRC}/doc/examples/dhcpd-dhcpv6.conf
 	@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${WRKSRC}/client/dhclient.conf.example
 
 do-install:
 	${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/${SUBSYS} install
 .if ${SUBSYS} == server
 	${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/dhcpctl install
 #${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/dst install
 	${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/omapip install
 	${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/includes install
 	${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/common install
 	${INSTALL_DATA} ${WRKSRC}/dhcpctl/dhcpctl.h ${STAGEDIR}${PREFIX}/include
 	${MV} ${STAGEDIR}${PREFIX}/etc/dhcpd.conf.example ${STAGEDIR}${PREFIX}/etc/dhcpd.conf.sample
 .if ${PORT_OPTIONS:MIPV6}
 	${INSTALL_DATA} ${WRKSRC}/doc/examples/dhcpd-dhcpv6.conf \
 		${STAGEDIR}${PREFIX}/etc/dhcpd6.conf.sample
 .endif
 .if ${PORT_OPTIONS:MLDAP}
 	@${MKDIR} ${STAGEDIR}${SCHEMA_DIR}
 	${INSTALL_DATA} ${LDAP_SCHEMA} ${STAGEDIR}${SCHEMA_DIR}
 	${INSTALL_SCRIPT} ${LDAP_SCRIPT} ${STAGEDIR}${PREFIX}/bin
 .endif
 .if ${PORT_OPTIONS:MLDAP}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${LDAP_README} ${STAGEDIR}${DOCSDIR}
 .endif
 .endif
 .if ${SUBSYS} == client
 	${INSTALL_SCRIPT} ${WRKSRC}/client/scripts/freebsd ${STAGEDIR}${PREFIX}/sbin/dhclient-script
 .elif ${SUBSYS} == server
 .if ${PORT_OPTIONS:MIPV6}
 	@${LN} -sf isc-dhcpd ${STAGEDIR}${PREFIX}/etc/rc.d/isc-dhcpd6
 .endif
 .elif ${SUBSYS} == relay
 .if ${PORT_OPTIONS:MIPV6}
 	@${LN} -sf isc-dhcrelay ${STAGEDIR}${PREFIX}/etc/rc.d/isc-dhcrelay6
 .endif
 .endif
 	@${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${MSG_FILE} > ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index e495116560b8..71f9075fbba8 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -1,115 +1,115 @@
 PORTNAME=	rsync
 DISTVERSION=	3.4.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	https://www.mirrorservice.org/sites/rsync.samba.org/src/ \
 		http://rsync.mirror.garr.it/src/ \
 		http://www.mirrorservice.org/sites/rsync.samba.org/src/ \
 		https://download.samba.org/pub/rsync/src/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Network file distribution/synchronization utility
 WWW=		https://rsync.samba.org/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
 		libxxhash.so:devel/xxhash \
 		libzstd.so:archivers/zstd
 
 USES=		autoreconf:build cpe python shebangfix ssl
 PYTHON_NO_DEPENDS=	yes
 CPE_VENDOR=	samba
 CPE_PRODUCT=	rsync
 USE_RC_SUBR=	rsyncd
 
 SHEBANG_FILES=	support/rrsync
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--disable-debug \
 		--enable-ipv6 \
 		--with-rsyncd-conf=${ETCDIR}/rsyncd.conf
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 PATCH_STRIP=	-p1
 SUB_LIST=	NAME=rsyncd
 
 PORTDOCS=	NEWS.md README.md csprotocol.txt tech_report.tex
 
 # define options
 OPTIONS_DEFINE=		DOCS ICONV POPT_PORT SSH ZLIB_BASE
 OPTIONS_DEFAULT=	FLAGS ICONV SSH ZLIB_BASE
 OPTIONS_RADIO=		PTS
 OPTIONS_RADIO_PTS=	FLAGS RENAMED
 
 # options provided upstream
 FLAGS_DESC=	File system flags support patch, adds --fileflags
 POPT_PORT_DESC=	Use popt from devel/popt instead of bundled one
 SSH_DESC=	Use SSH instead of RSH
 ZLIB_BASE_DESC=	Use zlib from base instead of bundled one
 
 # options provided by patch (mutually exclusive)
 PTS_DESC=	Functionality provided by third party patches
 RENAMED_DESC=	Add support for renamed file detection
 
 FLAGS_EXTRA_PATCHES=	${WRKSRC}/patches/fileflags.diff \
 			${FILESDIR}/extrapatch-main.c
 
 ICONV_USES=		iconv:translit
 ICONV_CONFIGURE_ENABLE=	iconv iconv-open
 
 POPT_PORT_LIB_DEPENDS=		libpopt.so:devel/popt
 POPT_PORT_CONFIGURE_OFF=	--with-included-popt
 
 RENAMED_EXTRA_PATCHES=	${WRKSRC}/patches/detect-renamed.diff
 
 SSH_CONFIGURE_ON=	--with-rsh=ssh
 SSH_CONFIGURE_OFF=	--with-rsh=rsh
 
 ZLIB_BASE_CONFIGURE_ON=	--with-included-zlib=no
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MRENAMED} || ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MFLAGS}
 DISTFILES+=	${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if empty(ICONV_LIB) || !${PORT_OPTIONS:MICONV}
 CONFIGURE_ARGS+=	ac_cv_search_libiconv_open=no
 .endif
 
 .if make(makesum) || ${PORT_OPTIONS:MRENAMED} || ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MFLAGS}
 pre-patch:
 	@${REINPLACE_CMD} 's:+int module_dirlen = 0;:+:' ${WRKSRC}/patches/fileflags.diff
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's:/etc/r{1,2}sync:${ETCDIR}/:g' \
 					  -e 's:/etc/letsencrypt:${PREFIX}/etc/letsencrypt:g' \
 					  ${WRKSRC}/rsync.1 ${WRKSRC}/rsyncd.conf.5
 	@${REINPLACE_CMD} -e 's|/usr/bin/rsync|${PREFIX}/bin/rsync|g' ${WRKSRC}/support/rrsync
 
 pre-configure:
 	@(cd ${WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_CMD} -f prepare-source.mak)
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${FILESDIR}/rsyncd.conf.sample ${STAGEDIR}${ETCDIR}/
 	${INSTALL_SCRIPT} ${WRKSRC}/support/rrsync ${STAGEDIR}${PREFIX}/sbin
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/support/rrsync.1.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/security/ca_root_nss/Makefile b/security/ca_root_nss/Makefile
index 1214762865cf..3f0f8ef0644b 100644
--- a/security/ca_root_nss/Makefile
+++ b/security/ca_root_nss/Makefile
@@ -1,58 +1,58 @@
 PORTNAME=	ca_root_nss
 PORTVERSION=	${VERSION_NSS}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	MOZILLA/security/nss/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
 DISTNAME=	nss-${VERSION_NSS}${NSS_SUFFIX}
 
 MAINTAINER=	ports-secteam@FreeBSD.org
 COMMENT=	Root certificate bundle from the Mozilla Project
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		perl5 ssl:build
 USE_PERL5=	build
 
 NO_ARCH=	yes
 WRKSRC_SUBDIR=	nss
 
 OPTIONS_DEFINE=		ETCSYMLINK
 OPTIONS_DEFAULT=	ETCSYMLINK
 OPTIONS_EXCLUDE_FreeBSD_15=	ETCSYMLINK
 OPTIONS_EXCLUDE_FreeBSD_16=	ETCSYMLINK
 
 OPTIONS_SUB=		yes
 
 ETCSYMLINK_DESC=	Add symlinks to default bundle locations
 ETCSYMLINK_CONFLICTS_INSTALL=	ca-roots-[0-9]*
 
 CERTDIR?=	share/certs
 PLIST_SUB+=	CERTDIR=${CERTDIR}
 
 VERSION_NSS=	3.115
 CERTDATA_TXT_PATH=	lib/ckfw/builtins/certdata.txt
 BUNDLE_PROCESSOR=	MAca-bundle.pl
 
 SUB_FILES=	MAca-bundle.pl pkg-deinstall pkg-install pkg-message
 SUB_LIST=	VERSION_NSS=${VERSION_NSS}
 
 do-build:
 	@${SETENV} PATH=${LOCALBASE}/bin:$${PATH} \
 		${PERL} ${WRKDIR}/${BUNDLE_PROCESSOR} \
 	    < ${WRKSRC}/${CERTDATA_TXT_PATH} > \
 	    ${WRKDIR}/ca-root-nss.crt
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${CERTDIR}
 	${INSTALL_DATA} ${WRKDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/${CERTDIR}
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/ssl
 	${LN} -sf ../../${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/etc/ssl/cert.pem.sample
 
 do-install-ETCSYMLINK-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/openssl
 	${LN} -sf ../etc/ssl/cert.pem ${STAGEDIR}${PREFIX}/openssl/cert.pem
 	${MKDIR} ${STAGEDIR}/etc/ssl
 	${LN} -sf ../..${PREFIX}/etc/ssl/cert.pem ${STAGEDIR}/etc/ssl/cert.pem
 
 .include <bsd.port.mk>
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index cfbabb3824dc..9c06b8958b88 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,150 +1,151 @@
 PORTNAME=	sudo
 PORTVERSION=	1.9.17p2
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	SUDO
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Allow others to run commands as root
 WWW=		https://www.sudo.ws/
 
 LICENSE=	sudo
 LICENSE_NAME=	Sudo license
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 FLAVORS=	default sssd
 FLAVOR?=	${FLAVORS:[1]}
 sssd_PKGNAMESUFFIX=	-sssd
 
 USES=		cpe libtool pkgconfig
 CPE_VENDOR=	todd_miller
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--mandir=${PREFIX}/share/man \
 		--sysconfdir=${PREFIX}/etc \
 		--with-env-editor \
 		--with-ignore-dot \
 		--with-logfac=${LOGFAC} \
 		--with-logincap \
 		--with-long-otp-prompt \
 		--with-rundir=/var/run/sudo \
 		--with-tty-tickets
 LDFLAGS+=	-lgcc
 
 PORTSCOUT=	ignore:1
 
 OPTIONS_DEFINE=		AUDIT DISABLE_AUTH DISABLE_ROOT_SUDO DOCS EXAMPLES \
 			INSULTS LDAP NLS NOARGS_SHELL OPIE PAM PYTHON SSL
 OPTIONS_DEFAULT=	AUDIT PAM SSL
 OPTIONS_RADIO=		KERBEROS
 OPTIONS_RADIO_KERBEROS=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
 OPTIONS_SUB=		yes
 
 AUDIT_DESC=		Enable BSM audit support
 DISABLE_AUTH_DESC=	Do not require authentication by default
 DISABLE_ROOT_SUDO_DESC=	Do not allow root to run sudo
 INSULTS_DESC=		Enable insults on failures
 KERBEROS_DESC=		Enable Kerberos 5 authentication (no PAM support)
 NOARGS_SHELL_DESC=	Run a shell if no arguments are given
 OPIE_DESC=		Enable one-time passwords (no PAM support)
 PYTHON_DESC=		Enable python plugin support
 SSL_DESC=		Use OpenSSL TLS and SHA2 functions
 
 AUDIT_CONFIGURE_WITH=	bsm-audit
 
 DISABLE_AUTH_CONFIGURE_ON=	--disable-authentication
 DISABLE_ROOT_SUDO_CONFIGURE_ON=	--disable-root-sudo
 
 GSSAPI_BASE_USES=		gssapi
 GSSAPI_BASE_CONFIGURE_ON=	--with-kerb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal
 GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-kerb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
 GSSAPI_MIT_USES=		gssapi:mit
 GSSAPI_MIT_CONFIGURE_ON=	--with-kerb5=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS}
 
 INSULTS_CONFIGURE_ON=	--with-insults --with-all-insults
 
 LDAP_USES=		ldap
 LDAP_CONFIGURE_ON=	--with-ldap=${PREFIX} \
 			--with-ldap-conf-file=${PREFIX}/etc/${SUDO_LDAP_CONF}
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 NLS_CFLAGS=		-I${LOCALBASE}/include
 NLS_LDFLAGS=		-L${LOCALBASE}/lib -lintl
 
 NOARGS_SHELL_CONFIGURE_ENABLE=	noargs-shell
 
 OPIE_CONFIGURE_ON=	--with-opie
 
 PAM_PREVENTS=		OPIE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
 PAM_PREVENTS_MSG=	PAM cannot be combined with any other authentication plugin
 PAM_CONFIGURE_ON=	--with-pam
 
 PYTHON_USES=		python
 PYTHON_CONFIGURE_ENABLE=python
 
 SSL_USES=		ssl
 SSL_CONFIGURE_ON=	--enable-openssl=${OPENSSLBASE}
 
 .if ${FLAVOR:U} == sssd
 RUN_DEPENDS+=		sssd:security/sssd2
 CONFIGURE_ARGS+=	--with-sssd
 .endif
 
 LOGFAC?=		authpriv
 SUDO_LDAP_CONF?=	ldap.conf
 
 # This is intentionally not an option.
 # SUDO_SECURE_PATH is a PATH string that will override the user's PATH.
 # ex: make SUDO_SECURE_PATH="/sbin:/bin:/usr/sbin:/usr/bin"
 .if defined(SUDO_SECURE_PATH)
 CONFIGURE_ARGS+=	--with-secure-path="${SUDO_SECURE_PATH}"
 .endif
 
 # This is intentionally not an option.
 # SUDO_KERB5_INSTANCE is an optional instance string that will be appended
 # to kerberos principals when to perform authentication. Common choices
 # are "admin" and "sudo".
 .if defined(SUDO_KERB5_INSTANCE)
 CONFIGURE_ARGS+=	--enable-kerb5-instance="${SUDO_KERB5_INSTANCE}"
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400072
 . if ${PORT_OPTIONS:MOPIE}
 BUILD_DEPENDS+=	opie>0:security/opie
 RUN_DEPENDS+=	opie>0:security/opie
 . endif
 .endif
 
 .if ${ARCH} == "arm"
 CONFIGURE_ARGS+=	--disable-pie
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -E '/install-(binaries|noexec):/,/^$$/ \
 		s/\$$\(INSTALL\)/& ${STRIP}/;s/-b\~/-b ~/' \
 		${WRKSRC}/src/Makefile.in
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/pam.conf ${STAGEDIR}${PREFIX}/etc/pam.d/sudo.default
 	${MV} ${STAGEDIR}${PREFIX}/etc/sudo.conf ${STAGEDIR}${PREFIX}/etc/sudo.conf.sample
 	${MV} ${STAGEDIR}${PREFIX}/etc/sudo_logsrvd.conf ${STAGEDIR}${PREFIX}/etc/sudo_logsrvd.conf.sample
 	${RM} ${STAGEDIR}${PREFIX}/etc/sudoers
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cvtsudoers
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sudoreplay
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/sudo/sudo_intercept.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/sudo_logsrvd
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/sudo_sendlog
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/visudo
 .for f in audit_json.so group_file.so libsudo_util.so sudoers.so system_group.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/sudo/${f}
 .endfor
 
 post-install-PYTHON-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/sudo/python_plugin.so
 
 .include <bsd.port.mk>
diff --git a/sysutils/azure-agent/Makefile b/sysutils/azure-agent/Makefile
index 6c8d6c3a699b..07b2380fd8d5 100644
--- a/sysutils/azure-agent/Makefile
+++ b/sysutils/azure-agent/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	azure-agent
 PORTVERSION=	2.12.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
 MAINTAINER=	weh@microsoft.com
 COMMENT=	Microsoft Azure Linux Agent
 WWW=		https://github.com/Azure/WALinuxAgent/
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	sudo:security/sudo \
 		bash:shells/bash \
 		dmidecode:sysutils/dmidecode \
 		${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${PY_FLAVOR} \
 		ca_root_nss>0:security/ca_root_nss
 
 NO_BUILD=	yes
 USES=		python shebangfix
 
 SHEBANG_FILES=	bin/waagent bin/waagent2.0
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Azure
 GH_PROJECT=	WALinuxAgent
 USE_PYTHON=	autoplist distutils noflavors
 
 post-patch:
 	${REINPLACE_CMD} -e "s,/etc/waagent,${PREFIX}/etc/waagent,g" \
 		${WRKSRC}/azurelinuxagent/common/osutil/default.py
 	${REINPLACE_CMD} -e "s,/etc/rc.d/waagent,${PREFIX}/etc/rc.d/waagent,g" \
 			 -e "s,/etc/waagent,${PREFIX}/etc/waagent,g" \
 			 -e "s,#!/usr/bin/env python,#!${PYTHON_CMD},g" \
 			 -e "/command_interpreter/ s,/usr/local/bin/python,${PYTHON_CMD}," \
 			 -e "s,/usr/sbin/waagent,${PREFIX}/sbin/waagent,g" \
 		${WRKSRC}/bin/waagent2.0
 	${REINPLACE_CMD} -e "s,:/usr/local/bin,:/usr/local/bin:/usr/local/sbin,g" \
 			 -e "s,python,${PYTHON_CMD},g" \
 		${WRKSRC}/init/freebsd/waagent
 	${REINPLACE_CMD} -e "s,/usr/sbin,${PREFIX}/sbin,g" \
 		${WRKSRC}/init/waagent
 	${REINPLACE_CMD} -e "s,/etc/waagent,${PREFIX}/etc/waagent,g" \
 			 -e "s,/usr/bin/python,${PYTHON_CMD},g" \
 			 -e "s,/usr/sbin,${PREFIX}/sbin,g" \
 		${WRKSRC}/init/waagent.service
 	${REINPLACE_CMD} -e "s,/etc,${PREFIX}/etc,g" \
 			 -e "/set_conf_files.*freebsd\/waagent.conf/ s/^/#/" \
 			 -e "s,/usr/sbin,${PREFIX}/sbin,g" \
 		${WRKSRC}/setup.py
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_DATA} ${WRKSRC}/config/freebsd/waagent.conf \
 		${STAGEDIR}${PREFIX}/etc/waagent.conf.sample
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-google-compute-engine/Makefile b/sysutils/py-google-compute-engine/Makefile
index 1cb1d34ef1e8..a5c0e94dbec8 100644
--- a/sysutils/py-google-compute-engine/Makefile
+++ b/sysutils/py-google-compute-engine/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	google-compute-engine
 DISTVERSION=	2.8.17
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	releng-gce@FreeBSD.org
 COMMENT=	Guest Environment for Google Compute Engine
 WWW=		https://github.com/GoogleCloudPlatform/compute-image-packages
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}distro>0:sysutils/py-distro@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
 		google_oslogin_control:sysutils/google-compute-engine-oslogin \
 		sudo:security/sudo
 
 USES=		python shebangfix
 USE_PYTHON=	autoplist concurrent distutils
 
 WRKSRC_SUBDIR=	packages/python-google-compute-engine
 
 NO_ARCH=	yes
 SHEBANG_FILES=	../google-compute-engine/src/usr/bin/google_optimize_local_ssd \
 		../google-compute-engine/src/usr/bin/google_set_multiqueue
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	GoogleCloudPlatform
 GH_PROJECT=	compute-image-packages
 GH_TAGNAME=	20190522
 
 USE_RC_SUBR=	google_accounts_daemon google_clock_skew_daemon \
 		google_instance_setup google_network_daemon google_startup
 
 SUB_LIST=	PYTHON_CMD="${PYTHON_CMD}" \
 		PYTHON_VER="${PYTHON_VER}"
 REINPLACE_ARGS=	-i ''
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/syslog.d ${STAGEDIR}/etc
 	${INSTALL_DATA} ${FILESDIR}/instance_configs.cfg.distro.sample \
 		${STAGEDIR}${PREFIX}/etc/instance_configs.cfg.distro.sample
 	${INSTALL_DATA} ${FILESDIR}/90-google.conf.sample \
 		${STAGEDIR}${PREFIX}/etc/syslog.d/90-google.conf.sample
 	${INSTALL_DATA} ${FILESDIR}/google_set_hostname \
 		${STAGEDIR}/etc/dhclient-exit-hooks
 
 .include <bsd.port.mk>