Update to v5.23.1-168-gd570e6e.

- Enhance the XXX comments so that someone else than me can take over.
- For the -devel version of Perl, as the abi is not stable, have
  libperl.so's soname be the same as the PORTVERSION.

Changes:	https://github.com/Perl/perl5/compare/v5.23.1-44-g6f00a56...v5.23.1-168-gd570e6e
Sponsored by:	Absolight

3 files changed, 28 insertions, 25 deletions

diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile
index 8463284c4c3e..f0ac88322d9d 100644
--- a/lang/perl5-devel/Makefile
+++ b/lang/perl5-devel/Makefile
@@ -2,16 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	perl
-#PORTVERSION=	${PERL_VERSION} # XXX
+# XXX Remove second line, uncomment first
+#DISTVERSION=	${PERL_VERSION}
 DISTVERSION=	${GH_TAGNAME:C/^v//:C/-g[0-9a-f]*$//}
 CATEGORIES=	lang devel perl5
-# XXX
+# XXX Leave only CPAN.
 MASTER_SITES=	LOCAL/mat/perl GH CPAN/../../src/5.0
-# XXX Use this naming so that portscout works a bit
+# XXX Remove DISTNAME
 DISTNAME=	${PORTNAME}-${DISTVERSION}
 DIST_SUBDIR=	perl
 
-# XXX
+# XXX -> perl@
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Practical Extraction and Report Language
 
@@ -22,11 +23,11 @@ LICENSE_FILE_GPLv1=	${WRKSRC}/Copying
 
 CONFLICTS_INSTALL=	perl5.*-*
 
-# XXX
+# XXX Remove github things.
 USE_GITHUB=	yes
 GH_ACCOUNT=	Perl
 GH_PROJECT=	perl5
-GH_TAGNAME=	v5.23.1-44-g6f00a56
+GH_TAGNAME=	v5.23.1-168-gd570e6e
 
 OPTIONS_DEFINE=	DEBUG GDBM PERL_64BITINT PTHREAD \
 		MULTIPLICITY SITECUSTOMIZE
@@ -59,7 +60,7 @@ THREADS_CONFIGURE_OFF=	-Dusethreads=n
 PERL_MALLOC_CONFIGURE_ON=	-Dusemymalloc=y
 PERL_MALLOC_CONFIGURE_OFF=	-Dusemymalloc=n
 
-# XXX
+# XXX uncomment PORTSCOUT line
 # For the "release" Perl ports, this should be:
 #PORTSCOUT=	limit:^${PERL_VER}.
 
@@ -78,13 +79,13 @@ SITE_MAN3?=	${PREFIX}/${SITE_MAN3_REL}
 _PRIV_LIB=	lib/perl5/${PERL_VER}
 _ARCH_LIB=	${_PRIV_LIB}/${PERL_ARCH}
 
-# XXX releases use tar:bzip2 tar:xz
+# XXX releases are .tar.xz, add: tar:xz
 USES=	cpe
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=Configure
 CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
-	-Dlibperl=libperl.so.${PERL_VERSION} \
+	-Dlibperl=libperl.so.${PORTVERSION} \
 	-Darchlib=${PREFIX}/${_ARCH_LIB} \
 	-Dprivlib=${PREFIX}/${_PRIV_LIB} \
 	-Dman3dir=${PREFIX}/${MAN3PREFIX_REL}/man/man3 \
@@ -100,11 +101,12 @@ CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
 # 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.
+# XXX change the soname to $$(LIBPERL:R)
 CONFIGURE_ARGS+= \
 	-Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -Wl,-rpath=${PREFIX}/${_ARCH_LIB}/CORE -lperl' \
-	-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-Wl,-rpath=${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL:R)'
+	-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-Wl,-rpath=${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL)'
 
-# XXX
+# XXX Remove
 CONFIGURE_ARGS+=	-Dusedevel -Uversiononly
 
 LOCALE_CLEANUP=	LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \
@@ -156,17 +158,18 @@ PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
 		SITE_ARCH=${SITE_ARCH_REL} \
 		PRIV_LIB=${_PRIV_LIB} \
 		ARCH_LIB=${_ARCH_LIB}
+PLIST_SUB+=	PORTVERSION=${PORTVERSION} # XXX Remove
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/Mk/bsd.default-versions.mk"
 
 # if this port is default due PERL5_DEFAULT
 # change PKGNAME to reflect this
-.if ${PERL_VER} == ${PERL5_DEFAULT} || ${PERL5_DEFAULT} == devel # XXX
+.if ${PERL_VER} == ${PERL5_DEFAULT} || ${PERL5_DEFAULT} == devel # XXX Remove devel case
 PKGNAMESUFFIX=	5
 .else
 # make PKGNAME unique among other lang/perl5.x
-.if defined(GH_TAGNAME) # XXX
+.if defined(GH_TAGNAME) # XXX remove if, leave only the else.
 PKGNAMESUFFIX=	5-devel
 .else
 PKGNAMESUFFIX=	${PERL_VER}
@@ -186,7 +189,7 @@ PKGINSTALL=	${WRKDIR}/use.perl
 PKGDEINSTALL=	${WRKDIR}/use.perl
 .endif
 
-# XXX
+# XXX Remove this
 # No need to spam logs, or make me wait
 .if !defined(PACKAGE_BUILDING) && !defined(PERL_DEV_SHUT_UP)
 pre-everything::
@@ -208,8 +211,8 @@ pre-everything::
 
 # Put a symlink to the future libperl.so.x.yy so that -lperl works.
 post-extract:
-	${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so
-	${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so.${PERL_VER}
+	${LN} -s libperl.so.${PORTVERSION} ${WRKSRC}/libperl.so
+	${LN} -s libperl.so.${PORTVERSION} ${WRKSRC}/libperl.so.${PERL_VER}
 
 .if !defined(MAKING_PATCHES)
 # make clean patch makepatch MAKING_PATCHES=
@@ -229,11 +232,11 @@ post-install:
 	${MKDIR} ${STAGEDIR}${SITE_ARCH}/auto
 	${MKDIR} ${STAGEDIR}${SITE_PERL}/auto
 	${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5
-	${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}
+	${LN} -sf libperl.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so
+	${LN} -sf libperl.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so.${PERL_VER}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION}
-	# XXX Force PERL_PORT in case the devel has the same version as the
-	# latest release
+	# XXX Remove the ECHO_CMD
+	# Force PERL_PORT in case the devel has the same version as the latest release
 	${ECHO_CMD} "PERL_PORT=	perl5-devel" >> ${WRKDIR}/perl5_version
 	${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc
 	${MKDIR} ${STAGEDIR}${SITE_ARCH}/machine
diff --git a/lang/perl5-devel/distinfo b/lang/perl5-devel/distinfo
index f48d314d1f2c..8eb80fa00bcb 100644
--- a/lang/perl5-devel/distinfo
+++ b/lang/perl5-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (perl/perl-5.23.1-44_GH0.tar.gz) = ec2f5c2c2bf02eadbd078c4a4131ccf218525582bc57fe16e177331e56f8949e
-SIZE (perl/perl-5.23.1-44_GH0.tar.gz) = 17496509
+SHA256 (perl/perl-5.23.1-168_GH0.tar.gz) = eec3ee3e529bac579fe0258e571d623f59f2ef9f1819a1f7921060da61771a36
+SIZE (perl/perl-5.23.1-168_GH0.tar.gz) = 17507663
diff --git a/lang/perl5-devel/pkg-plist b/lang/perl5-devel/pkg-plist
index 5d6ca4c1e977..da9e1a0cf8ee 100644
--- a/lang/perl5-devel/pkg-plist
+++ b/lang/perl5-devel/pkg-plist
@@ -674,7 +674,7 @@ etc/perl5_version
 %%ARCH_LIB%%/CORE/l1_char_class_tab.h
 %%ARCH_LIB%%/CORE/libperl.so
 %%ARCH_LIB%%/CORE/libperl.so.%%PERL_VER%%
-%%ARCH_LIB%%/CORE/libperl.so.%%PERL_VERSION%%
+%%ARCH_LIB%%/CORE/libperl.so.%%PORTVERSION%%
 %%ARCH_LIB%%/CORE/malloc_ctl.h
 %%ARCH_LIB%%/CORE/metaconfig.h
 %%ARCH_LIB%%/CORE/mg.h
@@ -1868,7 +1868,6 @@ etc/perl5_version
 %%PRIV_LIB%%/unicore/lib/Lb/XX.pl
 %%PRIV_LIB%%/unicore/lib/Lower/Y.pl
 %%PRIV_LIB%%/unicore/lib/Math/Y.pl
-%%PRIV_LIB%%/unicore/lib/NChar/Y.pl
 %%PRIV_LIB%%/unicore/lib/NFCQC/M.pl
 %%PRIV_LIB%%/unicore/lib/NFCQC/Y.pl
 %%PRIV_LIB%%/unicore/lib/NFDQC/N.pl
@@ -1928,7 +1927,6 @@ etc/perl5_version
 %%PRIV_LIB%%/unicore/lib/Nv/90.pl
 %%PRIV_LIB%%/unicore/lib/Nv/900.pl
 %%PRIV_LIB%%/unicore/lib/PatSyn/Y.pl
-%%PRIV_LIB%%/unicore/lib/PatWS/Y.pl
 %%PRIV_LIB%%/unicore/lib/Perl/Alnum.pl
 %%PRIV_LIB%%/unicore/lib/Perl/Assigned.pl
 %%PRIV_LIB%%/unicore/lib/Perl/Blank.pl
@@ -1946,6 +1944,8 @@ etc/perl5_version
 %%PRIV_LIB%%/unicore/lib/Perl/_PerlFol.pl
 %%PRIV_LIB%%/unicore/lib/Perl/_PerlIDC.pl
 %%PRIV_LIB%%/unicore/lib/Perl/_PerlIDS.pl
+%%PRIV_LIB%%/unicore/lib/Perl/_PerlNch.pl
+%%PRIV_LIB%%/unicore/lib/Perl/_PerlPat.pl
 %%PRIV_LIB%%/unicore/lib/Perl/_PerlPr2.pl
 %%PRIV_LIB%%/unicore/lib/Perl/_PerlPro.pl
 %%PRIV_LIB%%/unicore/lib/Perl/_PerlQuo.pl