summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorrodent <rodent@pkgsrc.org>2015-07-12 14:18:13 +0000
committerrodent <rodent@pkgsrc.org>2015-07-12 14:18:13 +0000
commitf0456c57a5c431d8a8e72bae509ef038aaf26e42 (patch)
tree0894753a2eb5ac07512a8c115521955050510b22 /textproc
parentea2e503cfbebe038ba2eb8a9e1735c70c607a568 (diff)
downloadpkgsrc-f0456c57a5c431d8a8e72bae509ef038aaf26e42.tar.gz
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.
Diffstat (limited to 'textproc')
-rw-r--r--textproc/intltool/distinfo3
-rw-r--r--textproc/intltool/patches/patch-intltool-update.in47
2 files changed, 49 insertions, 1 deletions
diff --git a/textproc/intltool/distinfo b/textproc/intltool/distinfo
index 8531c8d4adf..741d5309841 100644
--- a/textproc/intltool/distinfo
+++ b/textproc/intltool/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.36 2015/03/09 05:51:26 wiz Exp $
+$NetBSD: distinfo,v 1.37 2015/07/12 14:18:13 rodent Exp $
SHA1 (intltool-0.51.0.tar.gz) = a0c3bcb99d1bcfc5db70f8d848232a47c47da090
RMD160 (intltool-0.51.0.tar.gz) = f10a7a86bdc504db22c2e1eb4e09705c6a41fbaa
Size (intltool-0.51.0.tar.gz) = 162286 bytes
+SHA1 (patch-intltool-update.in) = 26027df811c1735a2afad43b5f37ee677aec0caf
diff --git a/textproc/intltool/patches/patch-intltool-update.in b/textproc/intltool/patches/patch-intltool-update.in
new file mode 100644
index 00000000000..00245f98d4d
--- /dev/null
+++ b/textproc/intltool/patches/patch-intltool-update.in
@@ -0,0 +1,47 @@
+$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?