mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-09-09 20:40:13 -04:00
48 lines
2.2 KiB
Plaintext
48 lines
2.2 KiB
Plaintext
$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?
|