16b7e808fd
This patch eliminates warnings like this by escaping left brace:
"""
Unescaped left brace in regex is deprecated, passed through in regex;
marked by <-- HERE in m/^(.*)\${ <-- HERE ?([A-Z_]+)}?(.*)$/ at
/usr/local/bin/intltool-update line 1065.
Unescaped left brace in regex is deprecated, passed through in regex;
marked by <-- HERE in m/\${ <-- HERE ?AC_PACKAGE_NAME}?/ at
/usr/local/bin/intltool-update line 1193.
"""
+ 7 more warnings like this when building ports involving intltool (gitg,
gnome-builder etc)
While here replace brackets with braces in download url (porlint warning) and
bump PORTREVISION because of package change.
PR: 207270
With hat: gnome
MFH: 2016Q1
51 lines
2.4 KiB
Text
51 lines
2.4 KiB
Text
This patch eliminates warnings like this by escaping left brace:
|
|
Unescaped left brace in regex is deprecated, passed through in regex;
|
|
marked by <-- HERE in m/^(.*)\${ <-- HERE ?([A-Z_]+)}?(.*)$/ at /usr/local/bin/intltool-update line 1065.
|
|
Unescaped left brace in regex is deprecated, passed through in regex;
|
|
marked by <-- HERE in m/\${ <-- HERE ?AC_PACKAGE_NAME}?/ at /usr/local/bin/intltool-update line 1193.
|
|
|
|
when building ports involving intltool (gitg, gnome-builder etc)
|
|
|
|
--- intltool-update.in.orig 2015-03-09 01:39:54 UTC
|
|
+++ intltool-update.in
|
|
@@ -1062,7 +1062,7 @@ sub SubstituteVariable
|
|
}
|
|
}
|
|
|
|
- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
|
|
+ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
|
|
{
|
|
my $rest = $3;
|
|
my $untouched = $1;
|
|
@@ -1190,10 +1190,10 @@ sub FindPackageName
|
|
$name =~ s/\(+$//g;
|
|
$version =~ s/\(+$//g;
|
|
|
|
- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
|
|
- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
|
|
- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
|
|
- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
|
|
+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
|
|
+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
|
|
+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
|
|
+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
|
|
}
|
|
|
|
if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
|
|
@@ -1219,11 +1219,11 @@ sub FindPackageName
|
|
$version =~ s/\(+$//g;
|
|
$bugurl =~ s/\(+$//g if (defined $bugurl);
|
|
|
|
- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
|
|
- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
|
|
- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
|
|
- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
|
|
- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
|
|
+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
|
|
+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
|
|
+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
|
|
+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
|
|
+ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
|
|
}
|
|
|
|
# \s makes this not work, why?
|