[pkgsrc/trunk]: pkgsrc/pkgtools/lintpkgsrc Deal with perl 5.26. Bump PKGREVI...

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6df962cbd09e
branches:  trunk
changeset: 364228:6df962cbd09e
user:      markd <markd%pkgsrc.org@localhost>
date:      Thu Jun 22 06:11:25 2017 +0000

description:
Deal with perl 5.26.  Bump PKGREVISION

diffstat:

 pkgtools/lintpkgsrc/Makefile            |  4 ++--
 pkgtools/lintpkgsrc/files/lintpkgsrc.pl |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (42 lines):

diff -r 836ca433db70 -r 6df962cbd09e pkgtools/lintpkgsrc/Makefile
--- a/pkgtools/lintpkgsrc/Makefile      Thu Jun 22 03:06:26 2017 +0000
+++ b/pkgtools/lintpkgsrc/Makefile      Thu Jun 22 06:11:25 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2016/07/09 06:38:48 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2017/06/22 06:11:25 markd Exp $
 
 PKGNAME=       lintpkgsrc-4.92
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    pkgtools
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
diff -r 836ca433db70 -r 6df962cbd09e pkgtools/lintpkgsrc/files/lintpkgsrc.pl
--- a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl   Thu Jun 22 03:06:26 2017 +0000
+++ b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl   Thu Jun 22 06:11:25 2017 +0000
@@ -1,6 +1,6 @@
 #! @PERL@
 
-# $NetBSD: lintpkgsrc.pl,v 1.11 2016/03/12 09:06:29 wiz Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.12 2017/06/22 06:11:25 markd Exp $
 
 # Written by David Brownlee <abs%netbsd.org@localhost>.
 #
@@ -656,7 +656,7 @@
 
     # We handle {} here, everything else in package_globmatch
     while ( $pkgmatch = shift @todo ) {
-        if ( $pkgmatch =~ /(.*){([^{}]+)}(.*)/ ) {
+        if ( $pkgmatch =~ /(.*)\{([^{}]+)}(.*)/ ) {
             foreach ( split( ',', $2 ) ) {
                 push( @todo, "$1$_$3" );
             }
@@ -1399,7 +1399,7 @@
             $var = $${vars}{$varname};
             $var = parse_expand_vars( $var, $vars ) if defined $var;
 
-            $match =~ s/([.+])/\\$1/g;
+            $match =~ s/([{.+])/\\$1/g;
             $match =~ s/\*/.*/g;
             $match =~ s/\?/./g;
             $match = '^' . $match . '$';