From owner-svn-ports-head@freebsd.org Sat Mar 5 19:00:06 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0AFBAA92602; Sat, 5 Mar 2016 19:00:06 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DB3C765C; Sat, 5 Mar 2016 19:00:05 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u25J04hF025225; Sat, 5 Mar 2016 19:00:04 GMT (envelope-from rm@FreeBSD.org) Received: (from rm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u25J045J025223; Sat, 5 Mar 2016 19:00:04 GMT (envelope-from rm@FreeBSD.org) Message-Id: <201603051900.u25J045J025223@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rm set sender to rm@FreeBSD.org using -f From: Ruslan Makhmatkhanov Date: Sat, 5 Mar 2016 19:00:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410197 - in head/textproc/intltool: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Mar 2016 19:00:06 -0000 Author: rm Date: Sat Mar 5 19:00:04 2016 New Revision: 410197 URL: https://svnweb.freebsd.org/changeset/ports/410197 Log: textproc/intltool: fix warnings with perl 5.22 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. """ + 7 more warnings like this when building ports involving intltool (gitg, gnome-builder etc) While here replace brackets with braces in download url (porlint warning) and bump PORTREVISION because of package change. PR: 207270 With hat: gnome MFH: 2016Q1 Added: head/textproc/intltool/files/patch-intltool-update.in (contents, props changed) Modified: head/textproc/intltool/Makefile Modified: head/textproc/intltool/Makefile ============================================================================== --- head/textproc/intltool/Makefile Sat Mar 5 18:55:52 2016 (r410196) +++ head/textproc/intltool/Makefile Sat Mar 5 19:00:04 2016 (r410197) @@ -3,8 +3,9 @@ PORTNAME= intltool PORTVERSION= 0.51.0 +PORTREVISION= 1 CATEGORIES= textproc gnome -MASTER_SITES= https://launchpad.net/intltool/trunk/$(PORTVERSION)/+download/ +MASTER_SITES= https://launchpad.net/intltool/trunk/${PORTVERSION}/+download/ DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org Added: head/textproc/intltool/files/patch-intltool-update.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/intltool/files/patch-intltool-update.in Sat Mar 5 19:00:04 2016 (r410197) @@ -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?