
# Modifications 1

Newer versions of Perl with warnings in affect requires regular
expressions using '{' and '}' as literal characters to be backslash
escaped.  The original for intltool-0.51.0 does not do this.

The following files have had the affects curly-braces escaped:

    gs-intltool-0.51.0/intltool-extract.in
    gs-intltool-0.51.0/intltool-merge.in 
    gs-intltool-0.51.0/intltool-prepare.in
    gs-intltool-0.51.0/intltool-update.in


# Modification 2

Affecting the same Perl scripts as above ...

In changing to use selfcontained-perl-with-cpan, it is now possible
for the She-bang line of the installed Perl scripts this package
provided to become too long to be run by scripts in other tools
we compile up (e.g., the ./configure script in libgsf).  The
issue manifests itself as the script not being run as 'perl' but
as 'sh', reporting syntax errors (for the form: 'my' not recognised)

To address this issue, we have changed the installation of the scripts
formed from the intltool-*.in scripts to use instead:

    #!/usr/bin/env perl

rather than:

    #!/<potentially>/<very>/<long>/<path>/<to>/bin/perl

One additional wrinkle is that some older versions of /usr/bin/env
are now able to take option arguments such as '-w' to switch on
perl warnings.

The change that addresses that is to remove the '-w' from the she-bang
line, and instead have 'use warnings;' as the first line of the code.


#
# Record of changes using 'diff'
#

----
diff -r gs-intltool-0.51.0/intltool-update.in intltool-0.51.0/intltool-update.in
1c1
< #!@INTLTOOL_PERL@
---
> #!@INTLTOOL_PERL@ -w
4,5d3
< use warning;
<
1067c1065
<     if ($str =~ /^(.*)\$\{?([A-Z_]+)\}?(.*)$/)
---
>     if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
1073c1071
<         $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\$\{?$2\}?/;
---
>         $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/;
1195,1198c1193,1196
<       $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}?/);
1224,1228c1222,1226
<       $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+}?/);
