diff options
| author | André Klitzing <aklitzing@gmail.com> | 2017-06-24 17:12:59 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-06-27 06:57:17 +0000 |
| commit | c43bfe9a1948ccd0d8e04a03858b6092f50ec0cc (patch) | |
| tree | 3f4b10cd4778d26b2575ad790457a1ee7dc04e88 /main/automake | |
| parent | 67ad91c6832cd29db526e0e0a6f6ecda59af2504 (diff) | |
| download | aports-c43bfe9a1948ccd0d8e04a03858b6092f50ec0cc.tar.bz2 aports-c43bfe9a1948ccd0d8e04a03858b6092f50ec0cc.tar.xz | |
main/automake: upgrade to 1.15.1
Diffstat (limited to 'main/automake')
| -rw-r--r-- | main/automake/APKBUILD | 10 | ||||
| -rw-r--r-- | main/automake/perl-escape-curly-bracket.patch | 24 |
2 files changed, 4 insertions, 30 deletions
diff --git a/main/automake/APKBUILD b/main/automake/APKBUILD index d19bc6a432..3debe683cd 100644 --- a/main/automake/APKBUILD +++ b/main/automake/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=automake -pkgver=1.15 -pkgrel=1 +pkgver=1.15.1 +pkgrel=0 pkgdesc="A GNU tool for automatically creating Makefiles" url="http://www.gnu.org/software/automake" arch="noarch" @@ -9,8 +9,7 @@ license="GPL2+ MIT Public Domain" depends="perl" makedepends="autoconf" subpackages="$pkgname-doc" -source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz - perl-escape-curly-bracket.patch" +source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" builddir="$srcdir/$pkgname-$pkgver" build() { @@ -27,5 +26,4 @@ package() { make DESTDIR=$pkgdir install } -sha512sums="6f201f96431f5e3d3081c4d71c884ae1f4f45b9c5c7a1306c9f3f3d4bd5ee5f6fae47b55d35241b3cae84be555cc0ab84c034acdcd5d9a071f6f0ecdee2dec73 automake-1.15.tar.gz -2ca23492459ff9124036618e7c64df7fcb86f575fb6d7718f74364883ebbf48faa88f6fbc591ba1202a0bd3704e6dc55707073f6eb8b9201b39ad9a55d3dd081 perl-escape-curly-bracket.patch" +sha512sums="f0d4717ebe2c76cec5d487de090f6e1c0f784b0d382fd964ffa846287e2a364a52531a26ab98b7033ac04ed302a247b3b114299def54819a03439bfc962ff61b automake-1.15.1.tar.gz" diff --git a/main/automake/perl-escape-curly-bracket.patch b/main/automake/perl-escape-curly-bracket.patch deleted file mode 100644 index 4940eff9ad..0000000000 --- a/main/automake/perl-escape-curly-bracket.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 13f00eb4493c217269b76614759e452d8302955e Mon Sep 17 00:00:00 2001 -From: Paul Eggert <eggert@cs.ucla.edu> -Date: Thu, 31 Mar 2016 23:35:29 +0000 -Subject: automake: port to Perl 5.22 and later - -Without this change, Perl 5.22 complains "Unescaped left brace in -regex is deprecated" and this is planned to become a hard error in -Perl 5.26. See: -http://search.cpan.org/dist/perl-5.22.0/pod/perldelta.pod#A_literal_%22{%22_should_now_be_escaped_in_a_pattern -* bin/automake.in (substitute_ac_subst_variables): Escape left brace. ---- -diff --git a/bin/automake.in b/bin/automake.in -index a3a0aa3..2c8f31e 100644 ---- a/bin/automake.in -+++ b/bin/automake.in -@@ -3878,7 +3878,7 @@ sub substitute_ac_subst_variables_worker - sub substitute_ac_subst_variables - { - my ($text) = @_; -- $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; -+ $text =~ s/\$[{]([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; - return $text; - } - |