diff --git a/lang/perl5.34/Makefile b/lang/perl5.34/Makefile
index d63e8843d21b..e69e7c9fe8eb 100644
--- a/lang/perl5.34/Makefile
+++ b/lang/perl5.34/Makefile
@@ -1,291 +1,291 @@
 PORTNAME=	perl
-DISTVERSION=	${PERL_VERSION}-RC2 # TODO: set EXPIRATION_DATE when .0 is released
+DISTVERSION=	${PERL_VERSION}
 PORTREVISION=	0
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	CPAN/../../src/5.0
 DIST_SUBDIR=	perl
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Practical Extraction and Report Language
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE_ART10=	${WRKSRC}/Artistic
 LICENSE_FILE_GPLv1+ =	${WRKSRC}/Copying
 
 # Uncomment when the default Perl is switched to 5.36
 #DEPRECATED=	Support end three years after .0 release, please upgrade to a more recent version of Perl
-#EXPIRATION_DATE=<Release date of .0 + 3 years>
+#EXPIRATION_DATE=	2024-05-20
 
 USES=		cpe tar:xz
 
 # Give a hint of where libperl.so can be found.
 USE_LDCONFIG=	${PREFIX}/${_ARCH_LIB}/CORE
 
 TEST_TARGET=	test_harness
 TEST_ENV=	${MAKE_ENV} \
 		LD_LIBRARY_PATH=${WRKSRC} \
 		TEST_JOBS=${MAKE_JOBS_NUMBER}
 
 PORTSCOUT=	limit:^${PERL_VER}.
 
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=		-Darchlib=${PREFIX}/${_ARCH_LIB} \
 			-Dcc="${CC}" \
 			-Dcf_by=${MAINTAINER:C,@.*,,} \
 			-Dcf_email=${MAINTAINER} \
 			-Dcf_time="`${STAT} -t \"%a %b %d %T %Z %Y\" -f %Sm ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX}`" \
 			-Dinc_version_list=none \
 			-Dlibperl=libperl.so.${PERL_VERSION} \
 			-Dman1dir=${PREFIX}/${PERLMANPREFIX_REL}/man/man1 \
 			-Dman3dir=${PREFIX}/${PERLMANPREFIX_REL}/man/man3 \
 			-Dprefix=${PREFIX} \
 			-Dprivlib=${PREFIX}/${_PRIV_LIB} \
 			-Dscriptdir=${PREFIX}/bin \
 			-Dsitearch=${SITE_ARCH} \
 			-Dsitelib=${SITE_PERL} \
 			-Dsiteman1dir=${SITE_MAN1} \
 			-Dsiteman3dir=${SITE_MAN3} \
 			-Dusenm=n \
 			-Duseshrplib \
 			-sde \
 			-Ui_iconv \
 			-Ui_malloc \
 			-Uinstallusrbinperl
 # Keep the following two in sync.
 # lddlflags is used for all .so linking
 # shrpldflags is used for libperl.so, so remove all the extra bits inherited from lddlflags.
 CONFIGURE_ARGS+=	-Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -lperl' \
 			-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL:R)'
 
 # When built from a git repository, newvers.sh can put a = in the version.
 CONFIGURE_ENV=	UNAME_v="$$(uname -v | sed 'y/=/ /')"
 
 SUB_FILES=	perl-man.conf
 
 INSTALL_TARGET=	install-strip
 
 .if defined(PERL_VENDOR_PREFIX)
 CONFIGURE_ARGS+=	-Dvendorarch=${PERL_VENDOR_PREFIX}/${_ARCH_LIB} \
 			-Dvendorbin=${PERL_VENDOR_PREFIX}/bin \
 			-Dvendorlib=${PERL_VENDOR_PREFIX}/${_PRIV_LIB} \
 			-Dvendorman1dir=${PERL_VENDOR_PREFIX}/man/man1 \
 			-Dvendorman3dir=${PERL_VENDOR_PREFIX}/${_PRIV_LIB}/man/man3 \
 			-Dvendorprefix=${PERL_VENDOR_PREFIX}
 .endif
 
 # http://perl5.git.perl.org/perl.git/commit/b83080de5c4254
 # PERLIOBUF_DEFAULT_BUFSIZ size in bytes (default: 8192 bytes)
 .if defined(PERLIOBUF_DEFAULT_BUFSIZ)
 CONFIGURE_ARGS+=	-Accflags=-DPERLIOBUF_DEFAULT_BUFSIZ=${PERLIOBUF_DEFAULT_BUFSIZ}
 .endif
 
 PLIST_SUB=	ARCH_LIB=${_ARCH_LIB} \
 		MAN1=${PERLMANPREFIX_REL}/man/man1 \
 		MAN3=${PERLMANPREFIX_REL}/man/man3 \
 		PERL_ARCH=${PERL_ARCH} \
 		PERL_ARCH_regex=[[:<:]]${PERL_ARCH}[[:>:]] \
 		PERL_VER=${PERL_VER} \
 		PERL_VERSION=${PERL_VERSION} \
 		PERLMANPREFIX=${PERLMANPREFIX_REL} \
 		PERLMANPREFIX_regex=${PERLMANPREFIX_REL}[[:>:]] \
 		PKGNAMESUFFIX=${PKGNAMESUFFIX} \
 		PRIV_LIB=${_PRIV_LIB} \
 		SITE_ARCH=${SITE_ARCH_REL} \
 		SITE_PERL=${SITE_PERL_REL} \
 		SITEMANPREFIX=${SITE_MAN_PREFIX}
 
 SUB_LIST=	PERL_ARCH=${PERL_ARCH} \
 		PERL_VER=${PERL_VER} \
 		PERL_VERSION=${PERL_VERSION} \
 		PERLMANPREFIX=${PERLMANPREFIX_REL} \
 		PRIV_LIB=${_PRIV_LIB} \
 		SITE_PERL=${SITE_PERL_REL} \
 		SITEMANPREFIX=${SITE_MAN_PREFIX}
 
 .include "version.mk"
 PERL_VER?=		${PERL_VERSION:C/\.[0-9]+$//}
 PERL_ARCH=		mach
 SITE_PERL_REL?=		lib/perl5/site_perl
 SITE_PERL?=		${PREFIX}/${SITE_PERL_REL}
 SITE_ARCH_REL?=		${SITE_PERL_REL}/${PERL_ARCH}/${PERL_VER}
 SITE_ARCH?=		${PREFIX}/${SITE_ARCH_REL}
 SITE_MAN_PREFIX=	${SITE_PERL_REL}
 SITE_MAN3_REL?=		${SITE_MAN_PREFIX}/man/man3
 SITE_MAN3?=		${PREFIX}/${SITE_MAN3_REL}
 SITE_MAN1_REL?=		${SITE_MAN_PREFIX}/man/man1
 SITE_MAN1?=		${PREFIX}/${SITE_MAN1_REL}
 
 _PRIV_LIB=	lib/perl5/${PERL_VER}
 _ARCH_LIB=	${_PRIV_LIB}/${PERL_ARCH}
 
 PERLMANPREFIX_REL=	${_PRIV_LIB}/perl
 PERLMANPREFIX=		${PREFIX}/${PERLMANPREFIX_REL}
 MANDIRS=		${PERLMANPREFIX}/man
 
 OPTIONS_DEFINE=		DEBUG DOT_INC DTRACE GDBM MULTIPLICITY PERL_64BITINT \
 			PERL_MALLOC SITECUSTOMIZE THREADS
 OPTIONS_DEFAULT=	DTRACE MULTIPLICITY PERL_64BITINT THREADS
 
 .if !exists(/usr/sbin/dtrace)
 OPTIONS_EXCLUDE=	DTRACE
 .endif
 .for a in aarch64 arm armv6 armv7 \
 	mips mips64 mips64el mips64elhf mips64hf mipsel mipselhf mipshf mipsn32 \
 	powerpc \
 	riscv64 riscv64sf sparc64
 OPTIONS_EXCLUDE_${a}=	DTRACE
 .endfor
 OPTIONS_SUB=		yes
 
 DOT_INC_DESC=		Add '.' to @INC (unsafe)
 GDBM_DESC=		GDBM_File extension
 MULTIPLICITY_DESC=	Use multiplicity
 PERL_64BITINT_DESC=	Use 64 bit integers (on i386)
 PERL_MALLOC_DESC=	Use Perl malloc
 SITECUSTOMIZE_DESC=	Run-time customization of @INC
 THREADS_DESC=		Build threaded perl
 
 DEBUG_CONFIGURE_ON=		-DDEBUGGING \
 				-Doptimize="-g"
 DEBUG_CONFIGURE_OFF=		-Doptimize="${CFLAGS}"
 DOT_INC_CONFIGURE_ON=		-Ddefault_inc_excludes_dot=n
 DTRACE_CONFIGURE_ON=		-Dusedtrace
 DTRACE_CONFIGURE_OFF=		-Uusedtrace
 GDBM_CONFIGURE_ON=		-Di_gdbm
 GDBM_CONFIGURE_OFF=		-Ui_gdbm
 GDBM_LIB_DEPENDS=		libgdbm.so:databases/gdbm
 MULTIPLICITY_CONFIGURE_ON=	-Dusemultiplicity=y
 MULTIPLICITY_CONFIGURE_OFF=	-Dusemultiplicity=n
 PERL_64BITINT_CONFIGURE_ON=	-Duse64bitint
 PERL_MALLOC_CONFIGURE_ON=	-Dusemymalloc=y
 PERL_MALLOC_CONFIGURE_OFF=	-Dusemymalloc=n
 SITECUSTOMIZE_CONFIGURE_ON=	-Dusesitecustomize
 THREADS_CONFIGURE_ON=		-Dusethreads=y
 THREADS_CONFIGURE_OFF=		-Dusethreads=n
 
 # Why this is required is explained in:
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=227356#c5
 _PERL5_DEFAULT_FILE=	/tmp/PERL5_DEFAULT
 
 # Get the default version, and possibly, overwrite it.
 .include <bsd.port.options.mk>
 .sinclude "${_PERL5_DEFAULT_FILE}"
 
 .if ${OSVERSION} >= 1200004
 CONFIGURE_ARGS+=	-Accflags='-DUSE_THREAD_SAFE_LOCALE'
 .endif
 
 # if this port is default due PERL5_DEFAULT
 # change PKGNAME to reflect this
 .if ${PERL_VER} == ${PERL5_DEFAULT}
 PKGNAMESUFFIX=	5
 IAMDEFAULTPERL=	yes
 .else
 # make PKGNAME unique among other lang/perl5.x
 PKGNAMESUFFIX=	${PERL_VER}
 .endif
 
 # Am I building the default Perl ?
 .if defined(IAMDEFAULTPERL)
 PLIST_SUB+=		BINSUFFIX="" \
 			DEFAULT=""
 .else
 BINSUFFIX=		${PERL_VERSION}
 PLIST_SUB+=		BINSUFFIX=${PERL_VERSION} \
 			DEFAULT="@comment "
 CONFIGURE_ARGS+=	-Dversiononly
 .endif
 
 .if !defined(IAMDEFAULTPERL)
 pre-everything::
 	@${ECHO_MSG} "##################################################"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "      This is *NOT* the DEFAULT perl version"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "It will *NOT* install ${PREFIX}/bin/perl"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "It will *ONLY* install ${PREFIX}/bin/perl${PERL_VERSION}"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "The default Perl version currently is ${PERL5_DEFAULT}."
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "If you want to use this version as the default,"
 	@${ECHO_MSG} "stop the build now, add this line to your"
 	@${ECHO_MSG} "/etc/make.conf, and then restart the build."
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "DEFAULT_VERSIONS+=perl5=${PERL_VER}"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "##################################################"
 .  if !(defined(PACKAGE_BUILDING) || defined(BATCH))
 	@sleep 30
 .  endif
 .endif
 
 # Put a symlink to the future libperl.so.x.yy so that -lperl works.
 # Also, save PERL5_DEFAULT in case someone is not using the default Perl
 # version whilst not having set DEFAULT_VERSIONS=perl5=blah.  While upgrading,
 # portmaster/portupgrade will remove the installed Perl version, and it will
 # remove any way to guess what the default Perl version is needed.
 post-extract:
 	${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so
 	${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so.${PERL_VER}
 .if !defined(PACKAGE_BUILDING)
 	@${ECHO_CMD} "PERL5_DEFAULT=${PERL5_DEFAULT}" > ${_PERL5_DEFAULT_FILE}
 .endif
 
 .if !defined(PACKAGE_BUILDING)
 post-clean:
 	@${RM} ${_PERL5_DEFAULT_FILE}
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/Configure ${WRKSRC}/hints/freebsd.sh
 .if !defined(IAMDEFAULTPERL)
 	${REINPLACE_CMD} -e '/do_installprivlib = 0 if .versiononly/d; \
 		/^if.*nopods.*versiononly || /s/.*/if (1) {/' \
 		${WRKSRC}/installperl
 .endif
 
 post-install:
 	@${REINPLACE_CMD} -e '/^lddlflags/s|-L${WRKSRC} ||' \
 		${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config_heavy.pl
 	@${TOUCH} -r ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config_heavy.pl.bak ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config_heavy.pl
 	@${RM} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config_heavy.pl.bak
 .if ${CC} == /nxb-bin/usr/bin/cc
 	@${REINPLACE_CMD} -e 's=/nxb-bin==' \
 		${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config.pm ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config_heavy.pl
 # Restore Config.pm's timestamp so that Perl's build system does not think it
 # needs to rebuild everything.
 	@${TOUCH} -r ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config.pm.bak ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config.pm
 	@${TOUCH} -r ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config_heavy.pl.bak ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config_heavy.pl
 	@${RM} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config.pm.bak ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/Config_heavy.pl.bak
 .endif
 
 	${MKDIR} ${STAGEDIR}${SITE_MAN1} ${STAGEDIR}${SITE_MAN3}
 	${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto
 	${MKDIR} ${STAGEDIR}${SITE_PERL}/auto
 .if defined(IAMDEFAULTPERL)
 	${LN} -sf perl ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION}
 .endif
 	${LN} -sf libperl.so.${PERL_VERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so
 	${LN} -sf libperl.so.${PERL_VERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so.${PERL_VER}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION}
 	${MKDIR} ${STAGEDIR}${SITE_ARCH}/machine
 	${MKDIR} ${STAGEDIR}${SITE_ARCH}/sys
 # h2ph needs perl, but perl is not installed, it's only
 # staged, so, use the one in WRKDIR
 	(cd /usr/include && ${SETENV} LD_LIBRARY_PATH=${WRKSRC} \
 		${WRKSRC}/perl -I ${WRKSRC}/lib ${STAGEDIR}${PREFIX}/bin/h2ph${BINSUFFIX} \
 		-d ${STAGEDIR}${SITE_ARCH} *.h machine/*.h sys/*.h >/dev/null)
 	@${FIND} ${STAGEDIR}${SITE_ARCH} -name '*.ph' | sed -e 's|${STAGEDIR}||' >> ${TMPPLIST}
 	${FIND} ${STAGEDIR} -name '*.so*' -type f | while read f; \
 		do \
 			${CHMOD} 644 $$f; \
 			${STRIP_CMD} $$f; \
 			${CHMOD} 444 $$f; \
 		done
 	${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PKGNAMESUFFIX}.conf
 
 .include <bsd.port.mk>
diff --git a/lang/perl5.34/distinfo b/lang/perl5.34/distinfo
index 3524f5407a80..4ee731ce7623 100644
--- a/lang/perl5.34/distinfo
+++ b/lang/perl5.34/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621238120
-SHA256 (perl/perl-5.34.0-RC2.tar.xz) = 005fb790332a16ffdf6b094d7cdd73080731599178a2decd4cd76d0c09a71b01
-SIZE (perl/perl-5.34.0-RC2.tar.xz) = 12876812
+TIMESTAMP = 1621600431
+SHA256 (perl/perl-5.34.0.tar.xz) = 82c2e5e5c71b0e10487a80d79140469ab1f8056349ca8545140a224dbbed7ded
+SIZE (perl/perl-5.34.0.tar.xz) = 12881416
diff --git a/lang/perl5.34/files/patch-t_porting_customized.dat b/lang/perl5.34/files/patch-t_porting_customized.dat
index 8490fa4aac6e..521358125242 100644
--- a/lang/perl5.34/files/patch-t_porting_customized.dat
+++ b/lang/perl5.34/files/patch-t_porting_customized.dat
@@ -1,21 +1,21 @@
 Fix tests for modified files.
 
---- t/porting/customized.dat.orig	2021-02-14 13:59:23 UTC
+--- t/porting/customized.dat.orig	2021-05-20 16:38:19 UTC
 +++ t/porting/customized.dat
 @@ -2,6 +2,7 @@
  #     cd t
  #     ./perl -I../lib porting/customized.t --regen
  ExtUtils::Constant cpan/ExtUtils-Constant/t/Constant.t d5c75c41d6736a0c5897130f534af0896a7d6f4d
 +ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm ac29a8dc1c7d6f0aca4abff0730c05bde1dab3ad
  Filter::Util::Call pod/perlfilter.pod 2d98239c4f4a930ad165444c3879629bb91f4cef
  Locale::Maketext::Simple cpan/Locale-Maketext-Simple/lib/Locale/Maketext/Simple.pm 57ed38905791a17c150210cd6f42ead22a7707b6
  Math::Complex cpan/Math-Complex/lib/Math/Complex.pm 66f28a17647e2de166909ca66e4ced26f8a0a62e
-@@ -19,7 +20,7 @@ Net::Ping dist/Net-Ping/t/010_pingecho.t 218d7a9ee5b6d
+@@ -17,7 +18,7 @@ Net::Ping dist/Net-Ping/t/010_pingecho.t 218d7a9ee5b6d
  Net::Ping dist/Net-Ping/t/450_service.t f6578680f2872d7fc9f24dd75388d55654761875
  Net::Ping dist/Net-Ping/t/500_ping_icmp.t 3eeb60181c01b85f876bd6658644548fdf2e24d4
  Net::Ping dist/Net-Ping/t/501_ping_icmpv6.t 54373de5858f8fb7e078e4998a4b3b8dbca91783
 -Pod::Perldoc cpan/Pod-Perldoc/lib/Pod/Perldoc.pm 582be34c077c9ff44d99914724a0cc2140bcd48c
 +Pod::Perldoc cpan/Pod-Perldoc/lib/Pod/Perldoc.pm 8b35c5a137791b0cfedcffd2937cb3b5fb984cac
  Test::Harness cpan/Test-Harness/t/source.t aaa3939591114c0c52ecd44159218336d1f762b9
  Win32API::File cpan/Win32API-File/File.pm 8fd212857f821cb26648878b96e57f13bf21b99e
  Win32API::File cpan/Win32API-File/File.xs beb870fed4490d2faa547b4a8576b8d64d1d27c5
diff --git a/lang/perl5.34/version.mk b/lang/perl5.34/version.mk
index 79364f82c426..3afa43a3346f 100644
--- a/lang/perl5.34/version.mk
+++ b/lang/perl5.34/version.mk
@@ -1,2 +1,2 @@
 PERL_VERSION=	5.34.0
-PERL5_DEPEND=	perl5>=5.34.r0<5.35
+PERL5_DEPEND=	perl5>=5.34<5.35