[Midnightbsd-cvs] mports [22914] trunk/textproc/intltool: add patch for newer perl versions.

[laffer1 at midnightbsd.org]

Revision: 22914
          http://svnweb.midnightbsd.org/mports/?rev=22914
Author:   laffer1
Date:     2017-10-07 13:52:18 -0400 (Sat, 07 Oct 2017)
Log Message:
-----------
add patch for newer perl versions.

Modified Paths:
--------------
    trunk/textproc/intltool/Makefile

Added Paths:
-----------
    trunk/textproc/intltool/files/patch-intltool-update.in

Modified: trunk/textproc/intltool/Makefile
===================================================================
--- trunk/textproc/intltool/Makefile	2017-10-07 17:48:09 UTC (rev 22913)
+++ trunk/textproc/intltool/Makefile	2017-10-07 17:52:18 UTC (rev 22914)
@@ -2,6 +2,7 @@
 
 PORTNAME=	intltool
 PORTVERSION=	0.51.0
+PORTREVISION=	1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	https://launchpad.net/intltool/trunk/$(PORTVERSION)/+download/
 DIST_SUBDIR=	gnome

Added: trunk/textproc/intltool/files/patch-intltool-update.in
===================================================================
--- trunk/textproc/intltool/files/patch-intltool-update.in	                        (rev 0)
+++ trunk/textproc/intltool/files/patch-intltool-update.in	2017-10-07 17:52:18 UTC (rev 22914)
@@ -0,0 +1,51 @@
+This patch eliminates warnings like this by escaping left brace:
+Unescaped left brace in regex is deprecated, passed through in regex;
+marked by <-- HERE in m/^(.*)\${ <-- HERE ?([A-Z_]+)}?(.*)$/ at /usr/local/bin/intltool-update line 1065.
+Unescaped left brace in regex is deprecated, passed through in regex;
+marked by <-- HERE in m/\${ <-- HERE ?AC_PACKAGE_NAME}?/ at /usr/local/bin/intltool-update line 1193.
+
+when building ports involving intltool (gitg, gnome-builder etc)
+
+--- intltool-update.in.orig	2015-03-09 01:39:54 UTC
++++ 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?


Property changes on: trunk/textproc/intltool/files/patch-intltool-update.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property