diff options
| -rw-r--r-- | Mk/Uses/perl5.mk | 2 | ||||
| -rw-r--r-- | lang/perl5-devel/Makefile | 13 | ||||
| -rw-r--r-- | lang/perl5-devel/distinfo | 4 |
3 files changed, 14 insertions, 5 deletions
diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk index d6baa566e9d9..d206c3fe825d 100644 --- a/Mk/Uses/perl5.mk +++ b/Mk/Uses/perl5.mk @@ -57,6 +57,8 @@ PERL_VERSION= 5.18.4 PERL_VERSION= 5.20.2 .elif ${PERL5_DEFAULT} == 5.21 || ${PERL5_DEFAULT} == devel PERL_VERSION= 5.22.0 +# Force PERL_PORT here in case two identical PERL_VERSION. +PERL_PORT?= perl5-devel .else IGNORE= Invalid perl5 version ${PERL5_DEFAULT} .endif diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile index 897711555708..f1b1874f8c36 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-RC1 +GH_TAGNAME= v5.22.0-RC2-1-gdfd03a6 OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT PTHREAD \ MULTIPLICITY SITECUSTOMIZE @@ -163,11 +163,15 @@ PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \ # if this port is default due PERL5_DEFAULT # change PKGNAME to reflect this -.if ${PERL_VER} == ${PERL5_DEFAULT} -PKGNAMESUFFIX= ${PERL_VERSION:C/\.[0-9]+\.[0-9]+$//} +.if ${PERL_VER} == ${PERL5_DEFAULT} || ${PERL5_DEFAULT} == devel # XXX +PKGNAMESUFFIX= 5 .else # make PKGNAME unique among other lang/perl5.x +.if defined(GH_TAGNAME) # XXX +PKGNAMESUFFIX= 5-devel +.else PKGNAMESUFFIX= ${PERL_VER} +.endif # always add default perl5 pkgname to conflicts CONFLICTS_INSTALL+= perl5-* .endif @@ -232,6 +236,9 @@ post-install: ${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} + # XXX 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 ${MKDIR} ${STAGEDIR}${SITE_ARCH}/sys diff --git a/lang/perl5-devel/distinfo b/lang/perl5-devel/distinfo index 9e1e0af736ab..c7c3d593314d 100644 --- a/lang/perl5-devel/distinfo +++ b/lang/perl5-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (perl/perl-5.22.0-RC1_GH0.tar.gz) = 318cc6616bd740c703ebd43e17da6c6cf1cbdb3701d2efb832d37d1e908ce517 -SIZE (perl/perl-5.22.0-RC1_GH0.tar.gz) = 17441498 +SHA256 (perl/perl-5.22.0-RC2-1_GH0.tar.gz) = 0570ad3a5f5e53cc309210eceb4d9719ef2f0fd4800e958ce5166bfc63e7a028 +SIZE (perl/perl-5.22.0-RC2-1_GH0.tar.gz) = 17416825 |