diff --git a/sysutils/puppet7/Makefile b/sysutils/puppet7/Makefile
index c3ef511088d5..64f4958b8779 100644
--- a/sysutils/puppet7/Makefile
+++ b/sysutils/puppet7/Makefile
@@ -1,140 +1,140 @@
 PORTNAME=	puppet
-PORTVERSION=	7.20.0
+PORTVERSION=	7.21.0
 CATEGORIES=	sysutils
 MASTER_SITES=   https://forge.puppet.com/v3/files/:forge
 PKGNAMESUFFIX=	7
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	Configuration management framework written in Ruby
 WWW=		https://puppet.com/docs/puppet/latest/puppet_index.html
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-concurrent-ruby>1.0:devel/rubygem-concurrent-ruby \
 		rubygem-deep_merge>1.0:devel/rubygem-deep_merge \
 		rubygem-fast_gettext1>=1.1:devel/rubygem-fast_gettext1 \
 		rubygem-hiera>=3.2.1:sysutils/rubygem-hiera \
 		rubygem-locale>=2.1:devel/rubygem-locale \
 		rubygem-multi_json>=1.10:devel/rubygem-multi_json \
 		rubygem-puppet-resource_api>=1.5:devel/rubygem-puppet-resource_api \
 		rubygem-ruby-augeas>=0:textproc/rubygem-ruby-augeas \
 		rubygem-scanf>=1:devel/rubygem-scanf \
 		rubygem-semantic_puppet>=1:devel/rubygem-semantic_puppet
 
 USES=		cpe
 USE_GITHUB=	yes
 GH_ACCOUNT=	puppetlabs
 
 CONFLICTS_INSTALL=	puppet6
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 NO_ARCH=	yes
 NO_BUILD=	yes
 USE_RUBY=	yes
 USE_RC_SUBR=	puppet
 PORTDOCS=	LICENSE README.md
 PORTEXAMPLES=	*
 USERS=		puppet
 GROUPS=		puppet
 SUB_FILES+=	pkg-message
 SUB_LIST=	RUBY=${RUBY}
 
 OPTIONS_DEFINE=		DOCS EXAMPLES
 OPTIONS_DEFAULT=	RFACTER
 OPTIONS_RADIO=		FACTER
 OPTIONS_RADIO_FACTER=	CFACTER RFACTER
 
 RFACTER_DESC=	Use facter 4.x (future facter, written in Ruby)
 CFACTER_DESC=	Use facter 3.x (written in C++)
 
 RFACTER_BUILD_DEPENDS=	rubygem-facter>=4.0:sysutils/rubygem-facter
 RFACTER_RUN_DEPENDS=	rubygem-facter>=4.0:sysutils/rubygem-facter
 
 CFACTER_BUILD_DEPENDS=	facter>=3.0:sysutils/facter
 CFACTER_RUN_DEPENDS=	facter>=3.0:sysutils/facter
 
 # Get versions from
 # https://github.com/puppetlabs/puppet-agent/tree/main/configs/components
 FORGE_MODULES=	augeas_core=1.2.0 \
 		cron_core=1.0.5 \
 		host_core=1.0.3 \
 		mount_core=1.0.4 \
 		scheduled_task=1.0.0 \
 		selinux_core=1.1.0 \
 		sshkeys_core=2.2.0 \
 		yumrepo_core=1.0.7 \
 		zfs_core=1.2.0 \
 		zone_core=1.0.3
 
 .for module in ${FORGE_MODULES}
 DISTFILES+=	puppetlabs-${module:C/=.*//}-${module:C/.*=//}.tar.gz:forge
 .endfor
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/puppetlabs/puppet|${ETCDIR}|" \
 		${WRKSRC}/install.rb \
 		${WRKSRC}/lib/puppet/reference/configuration.rb \
 		${WRKSRC}/lib/puppet/util/run_mode.rb
 	@${REINPLACE_CMD} -e "s|/etc/puppetlabs/code|${ETCDIR}|" \
 		${WRKSRC}/install.rb \
 		${WRKSRC}/lib/puppet/reference/configuration.rb \
 		${WRKSRC}/lib/puppet/util/run_mode.rb
 	@${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/cache|/var/puppet|" \
 		${WRKSRC}/install.rb \
 		${WRKSRC}/lib/puppet/reference/configuration.rb \
 		${WRKSRC}/lib/puppet/util/run_mode.rb
 	@${REINPLACE_CMD} -e "s|/var/run/puppetlabs|/var/run/puppet|" \
 		${WRKSRC}/install.rb \
 		${WRKSRC}/lib/puppet/util/run_mode.rb
 	@${REINPLACE_CMD} -e "s|/var/log/puppetlabs/puppet|/var/log/puppet|" \
 		${WRKSRC}/install.rb \
 		${WRKSRC}/lib/puppet/util/run_mode.rb
 	@${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/public|/var/puppet/state|" \
 		${WRKSRC}/install.rb \
 		${WRKSRC}/lib/puppet/util/run_mode.rb
 	@${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/modules|${ETCDIR}/modules|" \
 		-e "s|/etc/puppetlabs/puppetserver/ca|/var/puppetserver/ca|" \
 		-e "s|/opt/puppetlabs/puppet/vendor_modules|${ETCDIR}/vendor_modules|" \
 		${WRKSRC}/lib/puppet/defaults.rb
 	@${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/bin/gem|${LOCALBASE}/bin/gem|" \
 		${WRKSRC}/lib/puppet/provider/package/puppet_gem.rb
 	@${REINPLACE_CMD} -e "s|\$$confdir/ssl|/var/puppet/ssl|" \
 		${WRKSRC}/lib/puppet/defaults.rb
 	@${REINPLACE_CMD} -e "s|\.\./\.\./\.\./locales|../locales|" \
 		${WRKSRC}/lib/puppet/gettext/config.rb
 
 do-install:
 	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} LC_ALL=C.UTF-8 ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} \
 		--localedir=${RUBY_SITELIBDIR}/puppet/locales --publicdir=/var/puppet/state/
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}/manifests
 	${MKDIR} ${STAGEDIR}${ETCDIR}/modules
 	${MKDIR} ${STAGEDIR}${ETCDIR}/vendor_modules
 .for module in ${FORGE_MODULES}
 	(cd ${WRKDIR}/puppetlabs-${module:C/=.*//}-${module:C/.*=//} && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/vendor_modules/${module:C/=.*//})
 .endfor
 	${MKDIR} ${STAGEDIR}/var/puppet
 	${SETENV} LC_ALL=C.UTF-8 ${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet agent --genconfig \
 		--confdir=${ETCDIR} \
 		--rundir=/var/run/puppet \
 		--vardir=/var/puppet \
 		--logdir=/var/log/puppet \
 		--codedir=${ETCDIR} \
 		> ${STAGEDIR}${ETCDIR}/puppet.conf-dist
 	@${ECHO} ${STAGEDIR}${RUBY_SITELIBDIR}/puppet.rb | \
 		${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
 	@${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type f | \
 		${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/specifications
 	${INSTALL_DATA} ${WRKSRC}/.gemspec ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/specifications/${PORTNAME}-${PORTVERSION}.gemspec
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/puppet7/distinfo b/sysutils/puppet7/distinfo
index 004057f6e3df..5d21e1b3dc7d 100644
--- a/sysutils/puppet7/distinfo
+++ b/sysutils/puppet7/distinfo
@@ -1,23 +1,23 @@
-TIMESTAMP = 1665179151
+TIMESTAMP = 1670614126
 SHA256 (puppetlabs-augeas_core-1.2.0.tar.gz) = 69c66097b8d6e8c8afc575df04064a8fcce1017d23918db9f0824c4a3638b68a
 SIZE (puppetlabs-augeas_core-1.2.0.tar.gz) = 24788
 SHA256 (puppetlabs-cron_core-1.0.5.tar.gz) = 3b792d2c5e87115573812cac405ab6f365b90f9a0c87601a12957f604f5bbb8b
 SIZE (puppetlabs-cron_core-1.0.5.tar.gz) = 23287
 SHA256 (puppetlabs-host_core-1.0.3.tar.gz) = 25d970e1dbb0fd6da9206ac48eb8b7caf4b9c0f909b0876633d8500fbd461e07
 SIZE (puppetlabs-host_core-1.0.3.tar.gz) = 24672
 SHA256 (puppetlabs-mount_core-1.0.4.tar.gz) = 0dba04cf6aa85735d5e7ecc643000f36b987e281363ea77594cf41c904d43a05
 SIZE (puppetlabs-mount_core-1.0.4.tar.gz) = 40641
 SHA256 (puppetlabs-scheduled_task-1.0.0.tar.gz) = 4cd2a99a9aecb39a19a27bb1f18e26e587a94d93643ab1f52f652c4aa5daa6c6
 SIZE (puppetlabs-scheduled_task-1.0.0.tar.gz) = 34552
 SHA256 (puppetlabs-selinux_core-1.1.0.tar.gz) = b87410571c6b04e368c90b8d8fb42ccd3169e2d6ced53a04446e25fd0b2054d7
 SIZE (puppetlabs-selinux_core-1.1.0.tar.gz) = 14951
 SHA256 (puppetlabs-sshkeys_core-2.2.0.tar.gz) = c0cc9f82d20e5b4208d42e0ca78aee864fc0a3786d1fe2e5319ad45ed87e75fb
 SIZE (puppetlabs-sshkeys_core-2.2.0.tar.gz) = 17850
 SHA256 (puppetlabs-yumrepo_core-1.0.7.tar.gz) = 551fbc913c9b85293e0e0215b537af188b527beb04b3a824775529fd0e6c7c49
 SIZE (puppetlabs-yumrepo_core-1.0.7.tar.gz) = 29409
 SHA256 (puppetlabs-zfs_core-1.2.0.tar.gz) = b587e183c086bba1e9e48045a07a185880e272c16fec1455c8b485579956e273
 SIZE (puppetlabs-zfs_core-1.2.0.tar.gz) = 17676
 SHA256 (puppetlabs-zone_core-1.0.3.tar.gz) = 02a0dad968b5cc410487a8e648806bac17ff05984c96361b1ed5dfed5acbcd94
 SIZE (puppetlabs-zone_core-1.0.3.tar.gz) = 29746
-SHA256 (puppetlabs-puppet-7.20.0_GH0.tar.gz) = 39e77654ebc62d03aee52becbfbd700c79ad3ffa1debdfc38d355a16c83363b3
-SIZE (puppetlabs-puppet-7.20.0_GH0.tar.gz) = 3256708
+SHA256 (puppetlabs-puppet-7.21.0_GH0.tar.gz) = 97bcc9124cac7dcb1371726a82fffd9d6ff33d058e7d82b6df39ca86ad95792a
+SIZE (puppetlabs-puppet-7.21.0_GH0.tar.gz) = 3259370