fix warning and future error about unescaped left brace in perl regex

ok ajacoutot@ sthen@
This commit is contained in:
naddy 2019-04-04 02:01:29 +00:00
parent f95e2ed20b
commit 507e7247cd
10 changed files with 75 additions and 25 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.19 2016/06/29 16:14:40 espie Exp $
# $OpenBSD: Makefile,v 1.20 2019/04/04 02:01:29 naddy Exp $
VERSION= 1.10
DISTNAME= automake-${VERSION}.3
REVISION= 8
REVISION= 9
PKGSPEC= automake->=${VERSION},<1.11
# GPLv2

View File

@ -1,6 +1,16 @@
$OpenBSD: patch-automake_in,v 1.2 2012/06/26 20:31:47 matthieu Exp $
--- automake.in.orig Tue Dec 8 14:36:30 2009
+++ automake.in Mon Jun 25 00:19:06 2012
$OpenBSD: patch-automake_in,v 1.3 2019/04/04 02:01:29 naddy Exp $
Index: automake.in
--- automake.in.orig
+++ automake.in
@@ -3829,7 +3829,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;
}
@@ -4815,6 +4815,7 @@ sub scan_autoconf_traces ($)
_LT_AC_TAGCONFIG => 0,
m4_include => 1,

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.17 2016/06/29 16:14:40 espie Exp $
# $OpenBSD: Makefile,v 1.18 2019/04/04 02:01:29 naddy Exp $
VERSION= 1.11
DISTNAME= automake-${VERSION}.6
REVISION= 2
REVISION= 3
PKGSPEC= automake->=${VERSION},<1.12
MODULES= lang/python

View File

@ -1,6 +1,16 @@
$OpenBSD: patch-automake_in,v 1.3 2012/06/26 20:31:47 matthieu Exp $
--- automake.in.orig Fri Apr 13 10:46:00 2012
+++ automake.in Mon Jun 25 00:19:46 2012
$OpenBSD: patch-automake_in,v 1.4 2019/04/04 02:01:29 naddy Exp $
Index: automake.in
--- automake.in.orig
+++ automake.in
@@ -4156,7 +4156,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;
}
@@ -5337,6 +5337,7 @@ sub scan_autoconf_traces ($)
_LT_AC_TAGCONFIG => 0,
m4_include => 1,

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.13 2016/06/29 16:14:40 espie Exp $
# $OpenBSD: Makefile,v 1.14 2019/04/04 02:01:29 naddy Exp $
VERSION= 1.12
DISTNAME= automake-${VERSION}.6
REVISION= 1
REVISION= 2
PKGSPEC= automake->=${VERSION},<1.13
EXTRACT_SUFX= .tar.xz

View File

@ -1,6 +1,16 @@
$OpenBSD: patch-automake_in,v 1.5 2012/11/25 08:29:07 brad Exp $
--- automake.in.orig Sat Nov 17 10:25:47 2012
+++ automake.in Sat Nov 24 23:59:01 2012
$OpenBSD: patch-automake_in,v 1.6 2019/04/04 02:01:29 naddy Exp $
Index: automake.in
--- automake.in.orig
+++ automake.in
@@ -4030,7 +4030,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;
}
@@ -5246,6 +5246,7 @@ sub scan_autoconf_traces ($)
_LT_AC_TAGCONFIG => 0,
m4_include => 1,

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.8 2016/06/29 16:14:40 espie Exp $
# $OpenBSD: Makefile,v 1.9 2019/04/04 02:01:29 naddy Exp $
VERSION= 1.13
DISTNAME= automake-${VERSION}.4
REVISION= 1
REVISION= 2
PKGSPEC= automake->=${VERSION},<1.14
EXTRACT_SUFX= .tar.xz

View File

@ -1,6 +1,16 @@
$OpenBSD: patch-automake_in,v 1.3 2013/09/01 16:59:11 brad Exp $
--- automake.in.orig Fri Jun 14 08:31:35 2013
+++ automake.in Wed Jun 19 21:06:04 2013
$OpenBSD: patch-automake_in,v 1.4 2019/04/04 02:01:29 naddy Exp $
Index: automake.in
--- automake.in.orig
+++ automake.in
@@ -3932,7 +3932,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;
}
@@ -5162,6 +5162,7 @@ sub scan_autoconf_traces ($)
_LT_AC_TAGCONFIG => 0,
m4_include => 1,

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.5 2016/06/29 16:14:40 espie Exp $
# $OpenBSD: Makefile,v 1.6 2019/04/04 02:01:29 naddy Exp $
VERSION= 1.14
DISTNAME= automake-${VERSION}.1
REVISION = 0
REVISION = 1
PKGSPEC= automake->=${VERSION},<1.15
EXTRACT_SUFX= .tar.xz

View File

@ -1,6 +1,16 @@
$OpenBSD: patch-bin_automake_in,v 1.1.1.1 2013/09/17 20:01:33 brad Exp $
--- bin/automake.in.orig Tue Aug 6 19:56:14 2013
+++ bin/automake.in Tue Aug 6 19:57:17 2013
$OpenBSD: patch-bin_automake_in,v 1.2 2019/04/04 02:01:29 naddy Exp $
Index: bin/automake.in
--- bin/automake.in.orig
+++ bin/automake.in
@@ -3872,7 +3872,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;
}
@@ -5089,6 +5089,7 @@ sub scan_autoconf_traces
_LT_AC_TAGCONFIG => 0,
m4_include => 1,