3 files changed, 14 insertions, 10 deletions

diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile
index 3dad386fd570..972e31917946 100644
--- a/lang/perl5-devel/Makefile
+++ b/lang/perl5-devel/Makefile
@@ -30,7 +30,7 @@ TEST_ENV=	${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} \
 USE_GITHUB=	yes
 GH_ACCOUNT=	Perl
 GH_PROJECT=	perl5
-GH_TAGNAME=	v5.24.0-RC3
+GH_TAGNAME=	v5.24.0-RC3-19-g10d36cf
 
 OPTIONS_DEFINE=	DEBUG GDBM PERL_64BITINT PTHREAD \
 		MULTIPLICITY SITECUSTOMIZE
@@ -86,10 +86,12 @@ _ARCH_LIB=	${_PRIV_LIB}/${PERL_ARCH}
 # XXX releases are .tar.xz, add: tar:xz
 USES=	cpe
 
+LIBPERL_VER=	${PORTVERSION:C/[^0-9.]//}
+
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=Configure
 CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
-	-Dlibperl=libperl.so.${PORTVERSION} \
+	-Dlibperl=libperl.so.${LIBPERL_VER} \
 	-Darchlib=${PREFIX}/${_ARCH_LIB} \
 	-Dprivlib=${PREFIX}/${_PRIV_LIB} \
 	-Dman3dir=${PREFIX}/${PERLMANPREFIX_REL}/man/man3 \
@@ -164,7 +166,7 @@ PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
 		PRIV_LIB=${_PRIV_LIB} \
 		PKGNAMESUFFIX=${PKGNAMESUFFIX} \
 		ARCH_LIB=${_ARCH_LIB}
-PLIST_SUB+=	PORTVERSION=${PORTVERSION} # XXX Remove
+PLIST_SUB+=	LIBPERL_VER=${LIBPERL_VER} # XXX Remove
 
 _PERL5_DEFAULT_FILE=	/tmp/PERL5_DEFAULT
 
@@ -247,8 +249,8 @@ pre-everything::
 # 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.${PORTVERSION} ${WRKSRC}/libperl.so
-	${LN} -s libperl.so.${PORTVERSION} ${WRKSRC}/libperl.so.${PERL_VER}
+	${LN} -s libperl.so.${LIBPERL_VER} ${WRKSRC}/libperl.so
+	${LN} -s libperl.so.${LIBPERL_VER} ${WRKSRC}/libperl.so.${PERL_VER}
 .if !defined(PACKAGE_BUILDING)
 	@${ECHO_CMD} "PERL5_DEFAULT=${PERL5_DEFAULT}" > ${_PERL5_DEFAULT_FILE}
 .endif
@@ -289,8 +291,8 @@ 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.${PORTVERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so
-	${LN} -sf libperl.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so.${PERL_VER}
+	${LN} -sf libperl.so.${LIBPERL_VER} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so
+	${LN} -sf libperl.so.${LIBPERL_VER} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so.${PERL_VER}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION}
 	# XXX Remove the ECHO_CMD
 	# Force PERL_PORT in case the devel has the same version as the latest release
diff --git a/lang/perl5-devel/distinfo b/lang/perl5-devel/distinfo
index 117ed8506547..4775e4bc7a68 100644
--- a/lang/perl5-devel/distinfo
+++ b/lang/perl5-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (perl/perl-5.24.0-RC3_GH0.tar.gz) = 52987e88eb2a98d34b759211aca40bb12601984811253bd508a9df1ee0673fa7
-SIZE (perl/perl-5.24.0-RC3_GH0.tar.gz) = 17852929
+SHA256 (perl/perl-5.24.0-RC3-19_GH0.tar.gz) = 15d5194d0a2ac79de721c464bfb0ce88df695983c19ec3b1513b548102b9c2d0
+SIZE (perl/perl-5.24.0-RC3-19_GH0.tar.gz) = 17858823
diff --git a/lang/perl5-devel/pkg-plist b/lang/perl5-devel/pkg-plist
index 289bffbe0458..0acd5c158feb 100644
--- a/lang/perl5-devel/pkg-plist
+++ b/lang/perl5-devel/pkg-plist
@@ -670,7 +670,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf
 %%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.%%PORTVERSION%%
+%%ARCH_LIB%%/CORE/libperl.so.%%LIBPERL_VER%%
 %%ARCH_LIB%%/CORE/malloc_ctl.h
 %%ARCH_LIB%%/CORE/metaconfig.h
 %%ARCH_LIB%%/CORE/mg.h
@@ -1447,6 +1447,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf
 %%PRIV_LIB%%/pod/perl5203delta.pod
 %%PRIV_LIB%%/pod/perl5220delta.pod
 %%PRIV_LIB%%/pod/perl5221delta.pod
+%%PRIV_LIB%%/pod/perl5222delta.pod
 %%PRIV_LIB%%/pod/perl5240delta.pod
 %%PRIV_LIB%%/pod/perl561delta.pod
 %%PRIV_LIB%%/pod/perl56delta.pod
@@ -2115,6 +2116,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf
 %%MAN1%%/perl5203delta.1.gz
 %%MAN1%%/perl5220delta.1.gz
 %%MAN1%%/perl5221delta.1.gz
+%%MAN1%%/perl5222delta.1.gz
 %%MAN1%%/perl5240delta.1.gz
 %%MAN1%%/perl561delta.1.gz
 %%MAN1%%/perl56delta.1.gz