CVS commit: pkgsrc/pkgtools/lintpkgsrc

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Thu Jun 22 06:11:25 UTC 2017

Modified Files:
        pkgsrc/pkgtools/lintpkgsrc: Makefile
        pkgsrc/pkgtools/lintpkgsrc/files: lintpkgsrc.pl

Log Message:
Deal with perl 5.26.  Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/pkgtools/lintpkgsrc/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/lintpkgsrc/Makefile
diff -u pkgsrc/pkgtools/lintpkgsrc/Makefile:1.25 pkgsrc/pkgtools/lintpkgsrc/Makefile:1.26
--- pkgsrc/pkgtools/lintpkgsrc/Makefile:1.25    Sat Jul  9 06:38:48 2016
+++ pkgsrc/pkgtools/lintpkgsrc/Makefile Thu Jun 22 06:11:25 2017
@@ -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

Index: pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl
diff -u pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.11 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.12
--- pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.11 Sat Mar 12 09:06:29 2016
+++ pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl      Thu Jun 22 06:11:25 2017
@@ -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 @@ sub invalid_version($) {
 
     # 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 @@ sub parse_eval_make_false($$) {
             $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 . '$';