Update lang/perl5.22 to 5.22.0, and lang/perl5-devel to 5.23.0-ish.

Sponsored by:	Absolight

6 files changed, 14 insertions, 11 deletions

diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk
index 13e780688fad..0f4bdda6a3a2 100644
--- a/Mk/Uses/perl5.mk
+++ b/Mk/Uses/perl5.mk
@@ -57,8 +57,8 @@ PERL_VERSION=	5.18.4
 PERL_VERSION=	5.20.2
 .elif ${PERL5_DEFAULT} == 5.22
 PERL_VERSION=	5.22.0
-.elif ${PERL5_DEFAULT} == 5.21 || ${PERL5_DEFAULT} == devel
-PERL_VERSION=	5.22.0
+.elif ${PERL5_DEFAULT} == devel
+PERL_VERSION=	5.23.0
 # Force PERL_PORT here in case two identical PERL_VERSION.
 PERL_PORT?=	perl5-devel
 .else
@@ -87,7 +87,8 @@ PERL_LEVEL=0
 PERL_ARCH?=	mach
 
 # there must always be a default to prevent dependency failures such
-# as "ports/lang: not found"
+# as "ports/lang: not found".  Also, perl5-devel is taken care in the
+# perl5_default file, or up there in the default versions selection.
 .if   ${PERL_LEVEL} >= 502200
 PERL_PORT?=	perl5.22
 .elif   ${PERL_LEVEL} >= 502000
diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile
index f1b1874f8c36..e8581ba30c0e 100644
--- a/lang/perl5-devel/Makefile
+++ b/lang/perl5-devel/Makefile
@@ -27,7 +27,7 @@ CONFLICTS_INSTALL=	perl5.*-*
 USE_GITHUB=	yes
 GH_ACCOUNT=	Perl
 GH_PROJECT=	perl5
-GH_TAGNAME=	v5.22.0-RC2-1-gdfd03a6
+GH_TAGNAME=	v5.22.0-6-g1ca987e
 
 OPTIONS_DEFINE=	DEBUG GDBM PERL_64BITINT PTHREAD \
 		MULTIPLICITY SITECUSTOMIZE
@@ -65,7 +65,7 @@ PERL_MALLOC_CONFIGURE_OFF=	-Dusemymalloc=n
 #PORTSCOUT=	limit:^${PERL_VER}.
 
 # Remember to update Mk/Uses/perl5.mk too.
-PERL_VERSION=	5.22.0
+PERL_VERSION=	5.23.0
 PERL_VER=	${PERL_VERSION:C/\.[0-9]+$//}
 PERL_ARCH=	mach
 SITE_PERL_REL?=	lib/perl5/site_perl
diff --git a/lang/perl5-devel/distinfo b/lang/perl5-devel/distinfo
index c7c3d593314d..85029d4e1821 100644
--- a/lang/perl5-devel/distinfo
+++ b/lang/perl5-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (perl/perl-5.22.0-RC2-1_GH0.tar.gz) = 0570ad3a5f5e53cc309210eceb4d9719ef2f0fd4800e958ce5166bfc63e7a028
-SIZE (perl/perl-5.22.0-RC2-1_GH0.tar.gz) = 17416825
+SHA256 (perl/perl-5.22.0-6_GH0.tar.gz) = bbd113f8db5d212f42f344f28a0be2f0b45bcdfb16fbd3672fdfd6b2d158e137
+SIZE (perl/perl-5.22.0-6_GH0.tar.gz) = 17426100
diff --git a/lang/perl5-devel/pkg-plist b/lang/perl5-devel/pkg-plist
index 0d2d1aea33ac..3ec2968841a2 100644
--- a/lang/perl5-devel/pkg-plist
+++ b/lang/perl5-devel/pkg-plist
@@ -1459,6 +1459,7 @@ etc/perl5_version
 %%PRIV_LIB%%/pod/perl5218delta.pod
 %%PRIV_LIB%%/pod/perl5219delta.pod
 %%PRIV_LIB%%/pod/perl5220delta.pod
+%%PRIV_LIB%%/pod/perl5230delta.pod
 %%PRIV_LIB%%/pod/perl561delta.pod
 %%PRIV_LIB%%/pod/perl56delta.pod
 %%PRIV_LIB%%/pod/perl581delta.pod
@@ -2087,6 +2088,7 @@ man/man1/perl5217delta.1.gz
 man/man1/perl5218delta.1.gz
 man/man1/perl5219delta.1.gz
 man/man1/perl5220delta.1.gz
+man/man1/perl5230delta.1.gz
 man/man1/perl561delta.1.gz
 man/man1/perl56delta.1.gz
 man/man1/perl581delta.1.gz
diff --git a/lang/perl5.22/Makefile b/lang/perl5.22/Makefile
index ab02e16c2ba8..3bd0b60c03cd 100644
--- a/lang/perl5.22/Makefile
+++ b/lang/perl5.22/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	perl
-DISTVERSION=	${PERL_VERSION}-RC2
+DISTVERSION=	${PERL_VERSION}
 CATEGORIES=	lang devel perl5
-MASTER_SITES=	CPAN/../../src/5.0
+MASTER_SITES=	CPAN/../../src/5.0 CPAN/../by-authors/id/R/RJ/RJBS
 DIST_SUBDIR=	perl
 
 MAINTAINER=	perl@FreeBSD.org
diff --git a/lang/perl5.22/distinfo b/lang/perl5.22/distinfo
index 6a8a23c91ef4..79a149db5d84 100644
--- a/lang/perl5.22/distinfo
+++ b/lang/perl5.22/distinfo
@@ -1,2 +1,2 @@
-SHA256 (perl/perl-5.22.0-RC2.tar.xz) = aa198a9a8a92eb02dc43c81d5080e12c26b97349703ec9f5619d9e34389d6b0e
-SIZE (perl/perl-5.22.0-RC2.tar.xz) = 11152036
+SHA256 (perl/perl-5.22.0.tar.xz) = be83ead0c5c26cbbe626fa4bac1a4beabe23a9eebc15d35ba49ccde11878e196
+SIZE (perl/perl-5.22.0.tar.xz) = 11155252