4 files changed, 33 insertions, 7 deletions
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index 6db0243e701..b5401280c89 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.101 2015/08/08 20:42:45 wiz Exp $
+# $NetBSD: Makefile,v 1.102 2016/04/14 11:28:47 wiz Exp $
 #
 # for major version updates, don't forget adding new links in
 # mk/tools/automake.mk
 
 DISTNAME=	automake-1.15
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=automake/} \
 		ftp://sources.redhat.com/pub/automake/
diff --git a/devel/automake/distinfo b/devel/automake/distinfo
index de216b77476..ac825f3819f 100644
--- a/devel/automake/distinfo
+++ b/devel/automake/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.50 2015/11/03 03:27:15 agc Exp $
+$NetBSD: distinfo,v 1.51 2016/04/14 11:28:47 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-m4_python.m4) = 2f388204572f68ac180a85a873f73512e01c0fa4
+SHA1 (patch-bin_automake.in) = d228a43117d80821d8e4579d2a76cddfc301af51
+SHA1 (patch-m4_python.m4) = 9bd0b01a389d0dc8c7157285e630444c4a7fbfa0
diff --git a/devel/automake/patches/patch-bin_automake.in b/devel/automake/patches/patch-bin_automake.in
new file mode 100644
index 00000000000..4e91eb740de
--- /dev/null
+++ b/devel/automake/patches/patch-bin_automake.in
@@ -0,0 +1,25 @@
+$NetBSD: patch-bin_automake.in,v 1.1 2016/04/14 11:28:48 wiz Exp $
+
+commit 13f00eb4493c217269b76614759e452d8302955e
+Author: Paul Eggert <eggert@cs.ucla.edu>
+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 005727f1ae2..a2815054c12 100644
--- a/devel/automake/patches/patch-m4_python.m4
+++ b/devel/automake/patches/patch-m4_python.m4
@@ -1,6 +1,6 @@
-$NetBSD: patch-m4_python.m4,v 1.1 2015/08/08 20:42:45 wiz Exp $
+$NetBSD: patch-m4_python.m4,v 1.2 2016/04/14 11:28:48 wiz Exp $
 
-AM_PATH_PYTHON: look for python3.4 binary as well.
+AM_PATH_PYTHON: look for python3.4 and python3.5 binaries as well.
 http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21219
 
 --- m4/python.m4.orig	2014-12-30 13:49:41.000000000 +0000
@@ -10,7 +10,7 @@ http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21219
    dnl supported. (2.0 was released on October 16, 2000).
    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.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
   python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0])
  
    AC_ARG_VAR([PYTHON], [the Python interpreter])