[arch-commits] Commit in perl/trunk (PKGBUILD perl-vutil-revert.patch)
Florian Pritz
bluewind at archlinux.org
Wed Sep 17 10:00:39 UTC 2014
Date: Wednesday, September 17, 2014 @ 12:00:39
Author: bluewind
Revision: 221822
upgpkg: perl 5.20.1-1
upstream update
Modified:
perl/trunk/PKGBUILD
Deleted:
perl/trunk/perl-vutil-revert.patch
-------------------------+
PKGBUILD | 31 +++++++++++++---------------
perl-vutil-revert.patch | 50 ----------------------------------------------
2 files changed, 15 insertions(+), 66 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-09-17 09:31:56 UTC (rev 221821)
+++ PKGBUILD 2014-09-17 10:00:39 UTC (rev 221822)
@@ -6,8 +6,8 @@
# Contributor: francois <francois.archlinux.org>
pkgname=perl
-pkgver=5.20.0
-pkgrel=5
+pkgver=5.20.1
+pkgrel=1
pkgdesc="A highly capable, feature-rich programming language"
arch=(i686 x86_64)
license=('GPL' 'PerlArtistic')
@@ -28,7 +28,7 @@
'perl-cgi=3.65'
'perl-compress-raw-bzip2=2.064'
'perl-compress-raw-zlib=2.065'
- 'perl-config-perl-v=0.20'
+ 'perl-config-perl-v=0.22'
'perl-constant=1.31'
'perl-cpan-meta-requirements=2.125'
'perl-cpan-meta-yaml=0.012'
@@ -46,8 +46,8 @@
'perl-encoding-warnings=0.11'
'perl-env=1.04'
'perl-experimental=0.007'
- 'perl-exporter=5.70'
- 'perl-extutils-cbuilder=0.280216'
+ 'perl-exporter=5.71'
+ 'perl-extutils-cbuilder=0.280217'
'perl-extutils-command=1.18'
'perl-extutils-constant=0.23'
'perl-extutils-install=1.67'
@@ -83,7 +83,7 @@
'perl-memoize=1.03'
'perl-mime-base64=3.14'
'perl-module-build=0.4205'
- 'perl-module-corelist=3.11'
+ 'perl-module-corelist=5.020001'
'perl-module-load-conditional=0.62'
'perl-module-load=0.32'
'perl-module-loaded=0.08'
@@ -93,7 +93,7 @@
'perl-params-check=0.38'
'perl-parent=0.228'
'perl-parse-cpan-meta=1.4414'
- 'perl-pathtools=3.47'
+ 'perl-pathtools=3.48'
'perl-perl-ostype=1.007'
'perl-perlfaq=5.0150044'
'perl-perlio-via-quotedprint=0.07'
@@ -133,7 +133,7 @@
'perl-time-piece=1.27'
'perl-unicode-collate=1.04'
'perl-unicode-normalize=1.17'
- 'perl-version=0.9908'
+ 'perl-version=0.9909'
'perl-xsloader=0.17')
# Add your own provides here
provides=(${provides[@]})
@@ -141,18 +141,12 @@
perl-vutil-revert.patch
perlbin.sh
perlbin.csh)
-options=('makeflags' '!purge')
-md5sums=('20cbecd4e9e880ee7a50a136c8b1484e'
+options=('makeflags' '!purge' 'emptydirs')
+md5sums=('ede5166f949d9a07163bc5b086be9759'
'2a1e2849722b2b5be33bd5c50a69e77a'
'5ed2542fdb9a60682f215bd33701e61a'
'1f0cbbee783e8a6d32f01be5118e0d5e')
-prepare() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -p1 -i "$srcdir/perl-vutil-revert.patch"
- sed -i 's#version vutil.c .*#version vutil.c f1c7e4778fcf78c04141f562b80183b91cbbf6c9#' t/porting/customized.dat
-}
-
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -213,6 +207,11 @@
install -D -m755 ${srcdir}/perlbin.csh \
${pkgdir}/etc/profile.d/perlbin.csh
+ # Add the dirs so new installs will already have them in PATH once they
+ # install their first perl programm
+ install -d -m755 "$pkgdir/usr/bin/vendor_perl"
+ install -d -m755 "$pkgdir/usr/bin/site_perl"
+
(cd ${pkgdir}/usr/bin; mv perl${pkgver} perl)
(cd ${pkgdir}/usr/bin/core_perl; ln -sf c2ph pstruct; ln -sf s2p psed)
Deleted: perl-vutil-revert.patch
===================================================================
--- perl-vutil-revert.patch 2014-09-17 09:31:56 UTC (rev 221821)
+++ perl-vutil-revert.patch 2014-09-17 10:00:39 UTC (rev 221822)
@@ -1,50 +0,0 @@
---- perl-5.20.0/vutil.c 2014-05-26 09:34:21.000000000 -0400
-+++ perl-5.20.0-patched/vutil.c 2014-06-19 09:25:19.024409700 -0400
-@@ -585,11 +585,29 @@
- {
- STRLEN len;
-
-+#ifdef USE_LOCALE_NUMERIC
-+ char *loc = setlocale(LC_NUMERIC, NULL);
-+ if (loc) {
-+ /* setlocale returns NULL on error */
-+ if (loc[0] == 'C' && loc[1] == '\0') {
-+ /* LC_NUMERIC is already C, nothing to do */
-+ loc = NULL;
-+ }
-+ else {
-+ loc = savepv(loc);
-+ if (!setlocale(LC_NUMERIC, "C")) {
-+ /* error! do not restore locale later */
-+ Safefree(loc);
-+ loc = NULL;
-+ }
-+ }
-+ }
-+#endif
-+
- /* may get too much accuracy */
- char tbuf[64];
- SV *sv = SvNVX(ver) > 10e50 ? newSV(64) : 0;
- char *buf;
-- STORE_NUMERIC_LOCAL_SET_STANDARD();
- if (sv) {
- Perl_sv_catpvf(aTHX_ sv, "%.9"NVff, SvNVX(ver));
- len = SvCUR(sv);
-@@ -599,7 +617,15 @@
- len = my_snprintf(tbuf, sizeof(tbuf), "%.9"NVff, SvNVX(ver));
- buf = tbuf;
- }
-- RESTORE_NUMERIC_LOCAL();
-+
-+#ifdef USE_LOCALE_NUMERIC
-+ if (loc) {
-+ /* restore locale */
-+ setlocale(LC_NUMERIC, loc);
-+ Safefree(loc);
-+ }
-+#endif
-+
- while (buf[len-1] == '0' && len > 0) len--;
- if ( buf[len-1] == '.' ) len--; /* eat the trailing decimal */
- version = savepvn(buf, len);
More information about the arch-commits
mailing list