From ac9d1735661521cfc927bc0f870018e35263b772 Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 23 Jun 2017 08:40:40 +0000 Subject: Updated automake to 1.15.1. New in 1.15.1: * Bugs fixed: - The code has been adapted to remove a warning present since Perl 5.22 stating that "Unescaped left brace in regex is deprecated". This warning has become an hard error in Perl 5.26 (bug#22372). - The generated Makefiles do not rely on the obsolescent GZIP environment variable which was used for passing arguments to 'gzip'. Compatibility with old versions has been preserved. (bug#20132) * Miscellaneous changes: - Support the Windows version of the Intel C Compiler (icl) in the 'compile' script in the same way the (compatible) Microsoft C Compiler is supported. --- devel/automake/Makefile | 5 ++--- devel/automake/distinfo | 13 ++++++------- devel/automake/patches/patch-bin_automake.in | 25 ------------------------- devel/automake/patches/patch-m4_python.m4 | 15 +++++++-------- 4 files changed, 15 insertions(+), 43 deletions(-) delete mode 100644 devel/automake/patches/patch-bin_automake.in (limited to 'devel') diff --git a/devel/automake/Makefile b/devel/automake/Makefile index 009ee5a30f9..5e0206454b7 100644 --- a/devel/automake/Makefile +++ b/devel/automake/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.104 2017/01/19 18:52:05 agc Exp $ +# $NetBSD: Makefile,v 1.105 2017/06/23 08:40:40 wiz Exp $ # # for major version updates, don't forget adding new links in # mk/tools/automake.mk -DISTNAME= automake-1.15 -PKGREVISION= 4 +DISTNAME= automake-1.15.1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=automake/} MASTER_SITES+= ftp://sources.redhat.com/pub/automake/ diff --git a/devel/automake/distinfo b/devel/automake/distinfo index ac825f3819f..22db6ce76f0 100644 --- a/devel/automake/distinfo +++ b/devel/automake/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.51 2016/04/14 11:28:47 wiz Exp $ +$NetBSD: distinfo,v 1.52 2017/06/23 08:40:40 wiz Exp $ -SHA1 (automake-1.15.tar.xz) = c279b35ca6c410809dac8ade143b805fb48b7655 -RMD160 (automake-1.15.tar.xz) = 2581eff5fe04f416e0de9fed4c80dcde2ab677d1 -SHA512 (automake-1.15.tar.xz) = 200a13f49a3f492ed27bc2eb615aa2f47e775e470a781f6821cd43e0f7b927d091e690b4a23fe5cc8fa79c48daaa9436be4b968784696c3bdbf1634b456cda47 -Size (automake-1.15.tar.xz) = 1496708 bytes -SHA1 (patch-bin_automake.in) = d228a43117d80821d8e4579d2a76cddfc301af51 -SHA1 (patch-m4_python.m4) = 9bd0b01a389d0dc8c7157285e630444c4a7fbfa0 +SHA1 (automake-1.15.1.tar.xz) = 45632d466c16ecf18d9c18dc4be883cde59acb59 +RMD160 (automake-1.15.1.tar.xz) = 023dcfded47763358972c16d48a7f2d7ff384569 +SHA512 (automake-1.15.1.tar.xz) = 02f661b2676f1d44334ce1c7188f9913a6874bf46ba487708ad8090ad57905f14aead80fefed815e21effacfbb925e23b944ea7dd32563dca39c1a4174eda688 +Size (automake-1.15.1.tar.xz) = 1509496 bytes +SHA1 (patch-m4_python.m4) = 8eb189709c3904fbd43115e7f7eda568dbdc20e4 diff --git a/devel/automake/patches/patch-bin_automake.in b/devel/automake/patches/patch-bin_automake.in deleted file mode 100644 index 4e91eb740de..00000000000 --- a/devel/automake/patches/patch-bin_automake.in +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-bin_automake.in,v 1.1 2016/04/14 11:28:48 wiz Exp $ - -commit 13f00eb4493c217269b76614759e452d8302955e -Author: Paul Eggert -Date: Thu Mar 31 16:35:29 2016 -0700 - - 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. - ---- bin/automake.in.orig 2015-01-05 19:25:55.000000000 +0000 -+++ 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; - } - diff --git a/devel/automake/patches/patch-m4_python.m4 b/devel/automake/patches/patch-m4_python.m4 index a2815054c12..9fb4acd3a9b 100644 --- a/devel/automake/patches/patch-m4_python.m4 +++ b/devel/automake/patches/patch-m4_python.m4 @@ -1,16 +1,15 @@ -$NetBSD: patch-m4_python.m4,v 1.2 2016/04/14 11:28:48 wiz Exp $ +$NetBSD: patch-m4_python.m4,v 1.3 2017/06/23 08:40:40 wiz Exp $ -AM_PATH_PYTHON: look for python3.4 and python3.5 binaries as well. -http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21219 +AM_PATH_PYTHON: look for python3.6 binary as well. ---- m4/python.m4.orig 2014-12-30 13:49:41.000000000 +0000 +--- m4/python.m4.orig 2017-06-16 21:01:05.000000000 +0000 +++ m4/python.m4 -@@ -37,7 +37,7 @@ AC_DEFUN([AM_PATH_PYTHON], - dnl Find a Python interpreter. Python versions prior to 2.0 are not +@@ -38,7 +38,7 @@ AC_DEFUN([AM_PATH_PYTHON], dnl supported. (2.0 was released on October 16, 2000). + dnl FIXME: Remove the need to hard-code Python versions here. m4_define_default([_AM_PYTHON_INTERPRETER_LIST], --[python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 dnl -+[python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 dnl +-[python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 dnl ++[python python2 python3 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 dnl python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0]) AC_ARG_VAR([PYTHON], [the Python interpreter]) -- cgit v1.2.3