[138686] users/devans/GNOME-3/stable/dports/textproc/intltool

[devans at macports.org]

Revision: 138686
          https://trac.macports.org/changeset/138686
Author:   devans at macports.org
Date:     2015-07-15 22:04:33 -0700 (Wed, 15 Jul 2015)
Log Message:
-----------
GNOME-3/stable: intltool, patch to quiet perl 5.22 deprecation warnings, comments.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/textproc/intltool/Portfile

Added Paths:
-----------
    users/devans/GNOME-3/stable/dports/textproc/intltool/files/patch-silence-perl-5.22-deprecation-warnings.diff

Modified: users/devans/GNOME-3/stable/dports/textproc/intltool/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/textproc/intltool/Portfile	2015-07-16 04:31:16 UTC (rev 138685)
+++ users/devans/GNOME-3/stable/dports/textproc/intltool/Portfile	2015-07-16 05:04:33 UTC (rev 138686)
@@ -32,7 +32,7 @@
 
 # intltool only uses perl internally and publishes no public modules
 # so there is no need for multiple perl variants
-# now using perl5.22 (#48365)
+# now using perl 5.22 (#48365)
 
 set branch          5.22
 
@@ -46,6 +46,12 @@
 
 patchfiles          patch-remove-intltool-perl-hack.diff
 
+# in perl 5.22 left braces in regex patterns must be escaped to avoid deprecation warnings
+# introduced in perl 5.21.3
+# https://metacpan.org/pod/release/PCM/perl-5.21.3/pod/perl5211delta.pod#A-literal-should-now-be-escaped-in-a-pattern
+
+patchfiles-append   patch-silence-perl-5.22-deprecation-warnings.diff
+
 configure.perl      ${prefix}/bin/perl${branch}
 
 test.run            yes

Added: users/devans/GNOME-3/stable/dports/textproc/intltool/files/patch-silence-perl-5.22-deprecation-warnings.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/textproc/intltool/files/patch-silence-perl-5.22-deprecation-warnings.diff	                        (rev 0)
+++ users/devans/GNOME-3/stable/dports/textproc/intltool/files/patch-silence-perl-5.22-deprecation-warnings.diff	2015-07-16 05:04:33 UTC (rev 138686)
@@ -0,0 +1,43 @@
+--- intltool-update.in.orig	2015-07-15 21:16:44.000000000 -0700
++++ intltool-update.in	2015-07-15 21:19:24.000000000 -0700
+@@ -1062,7 +1062,7 @@
+ 	}
+     }
+ 
+-    if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
++    if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
+     {
+ 	my $rest = $3;
+ 	my $untouched = $1;
+@@ -1190,10 +1190,10 @@
+ 	$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 @@
+ 	$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?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150715/771c0178/attachment.html>