Sun Jul 12 14:18:13 2015 UTC ()
Escape braces in intltool-update. This is evident when using the --version
option. The programme emits deprecation warnings which break package builds
which depend on that output being sane.
(rodent)
diff -r1.36 -r1.37 pkgsrc/textproc/intltool/distinfo
diff -r0 -r1.1 pkgsrc/textproc/intltool/patches/patch-intltool-update.in
--- pkgsrc/textproc/intltool/distinfo 2015/03/09 05:51:26 1.36
+++ pkgsrc/textproc/intltool/distinfo 2015/07/12 14:18:13 1.37
| @@ -1,5 +1,6 @@ | | | @@ -1,5 +1,6 @@ |
| 1 | $NetBSD: distinfo,v 1.36 2015/03/09 05:51:26 wiz Exp $ | | 1 | $NetBSD: distinfo,v 1.37 2015/07/12 14:18:13 rodent Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (intltool-0.51.0.tar.gz) = a0c3bcb99d1bcfc5db70f8d848232a47c47da090 | | 3 | SHA1 (intltool-0.51.0.tar.gz) = a0c3bcb99d1bcfc5db70f8d848232a47c47da090 |
| 4 | RMD160 (intltool-0.51.0.tar.gz) = f10a7a86bdc504db22c2e1eb4e09705c6a41fbaa | | 4 | RMD160 (intltool-0.51.0.tar.gz) = f10a7a86bdc504db22c2e1eb4e09705c6a41fbaa |
| 5 | Size (intltool-0.51.0.tar.gz) = 162286 bytes | | 5 | Size (intltool-0.51.0.tar.gz) = 162286 bytes |
| | | 6 | SHA1 (patch-intltool-update.in) = 26027df811c1735a2afad43b5f37ee677aec0caf |
$NetBSD: patch-intltool-update.in,v 1.1 2015/07/12 14:18:13 rodent Exp $
Escape braces in regex. Fixes deprecation warning which can break some packages.
--- intltool-update.in.orig 2015-03-09 01:39:54.000000000 +0000
+++ 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?