From 39e5c6736760a81a930daefc01688caf75c8fddf Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 29 Sep 2017 18:46:23 +0200 Subject: [PATCH] perl: bump version. * now uses the short version for vendor and site paths: they are supposed to be compatible for even version numbers. needs to rebuild perl modules though. --- ...l-5.26.0.patchset => perl-5.26.1.patchset} | 0 ...{perl-5.26.0.recipe => perl-5.26.1.recipe} | 19 ++++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) rename dev-lang/perl/patches/{perl-5.26.0.patchset => perl-5.26.1.patchset} (100%) rename dev-lang/perl/{perl-5.26.0.recipe => perl-5.26.1.recipe} (87%) diff --git a/dev-lang/perl/patches/perl-5.26.0.patchset b/dev-lang/perl/patches/perl-5.26.1.patchset similarity index 100% rename from dev-lang/perl/patches/perl-5.26.0.patchset rename to dev-lang/perl/patches/perl-5.26.1.patchset diff --git a/dev-lang/perl/perl-5.26.0.recipe b/dev-lang/perl/perl-5.26.1.recipe similarity index 87% rename from dev-lang/perl/perl-5.26.0.recipe rename to dev-lang/perl/perl-5.26.1.recipe index bfea788d5..e69e4b0d1 100644 --- a/dev-lang/perl/perl-5.26.0.recipe +++ b/dev-lang/perl/perl-5.26.1.recipe @@ -16,9 +16,10 @@ HOMEPAGE="http://www.perl.org/" COPYRIGHT="1993-2017 Larry Wall and others" LICENSE="GNU GPL v1 Artistic" -REVISION="2" +REVISION="1" +perlShortVersion="${portVersion%.*}" SOURCE_URI="http://www.cpan.org/src/perl-$portVersion.tar.gz" -CHECKSUM_SHA256="ebe7c66906d4fb55449380ab1b7e004eeef52c38d3443fa301f8e17a1a4cb67f" +CHECKSUM_SHA256="e763aa485e8dc1a70483dbe6d615986bbf32b977f38016480d68c99237e701dd" PATCHES="perl-$portVersion.patchset" ARCHITECTURES="?x86_gcc2 x86 x86_64 ?arm" @@ -58,8 +59,8 @@ PROVIDES=" cmd:xsubpp = $portVersion compat >= 5 cmd:zipdetails = $portVersion compat >= 5 # vendor_perl refers to the path to packaged perl modules, which includes - # the full perl version, so it isn't backwards compatible to anything else. - vendor_perl = $portVersion compat >= $portVersion + # the short perl version, so it is backwards compatible up this one. + vendor_perl = $perlShortVersion compat >= $perlShortVersion # It is unclear which kind of backwards compatibility libperl.so # implements, so we assume none. lib:libperl = $portVersion compat >= $portVersion @@ -83,8 +84,8 @@ BUILD_PREREQUIRES=" perlArchName="$(uname -m)-haiku" GLOBAL_WRITABLE_FILES=" - non-packaged/lib/perl5/site_perl/$portVersion/sitecustomize.pl keep-old - non-packaged/lib/perl5/site_perl/$portVersion/$perlArchName directory keep-old + non-packaged/lib/perl5/site_perl/$perlShortVersion/sitecustomize.pl keep-old + non-packaged/lib/perl5/site_perl/$perlShortVersion/$perlArchName directory keep-old " BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL @@ -95,9 +96,9 @@ BUILD() -Dprefix=$prefix \ -Dprivlib=$prefix/lib/perl5/$portVersion \ -Dsiteprefix=$prefix/non-packaged \ - -Dsitelib=$prefix/non-packaged/lib/perl5/site_perl/$portVersion \ + -Dsitelib=$prefix/non-packaged/lib/perl5/site_perl/$perlShortVersion \ -Dvendorprefix=$prefix \ - -Dvendorlib=$prefix/lib/perl5/vendor_perl/$portVersion \ + -Dvendorlib=$prefix/lib/perl5/vendor_perl/$perlShortVersion \ -Dcf_email=zooey@hirschkaefer.de \ -Uusenm -Duseshrplib -Uusemymalloc \ -Dlibpth="$(finddir B_USER_DEVELOP_DIRECTORY)/lib $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/lib" \ @@ -123,7 +124,7 @@ INSTALL() chmod a+x $binDir/{perl,perlthanks} # copy script into site_perl that takes care of massaging @INC into what we need. - cp sitecustomize.pl $prefix/non-packaged/lib/perl5/site_perl/$portVersion/ + cp sitecustomize.pl $prefix/non-packaged/lib/perl5/site_perl/$perlShortVersion/ } TEST()