Received: by mail.netbsd.org (Postfix, from userid 605) id 3D89C84DEA; Thu, 22 Jun 2017 06:11:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C2B3484DDE for ; Thu, 22 Jun 2017 06:11:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id IUs0aw71XeO1 for ; Thu, 22 Jun 2017 06:11:25 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 56A1984C86 for ; Thu, 22 Jun 2017 06:11:25 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 51970FAE8; Thu, 22 Jun 2017 06:11:25 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1498111885273000" MIME-Version: 1.0 Date: Thu, 22 Jun 2017 06:11:25 +0000 From: "Mark Davies" Subject: CVS commit: pkgsrc/pkgtools/lintpkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: markd@netbsd.org X-Mailer: log_accum Message-Id: <20170622061125.51970FAE8@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1498111885273000 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1498111885273000 Content-Disposition: inline Content-Length: 1787 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 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 . # @@ -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 . '$'; --_----------=_1498111885273000--