From ef7d3017ed6d131196edce25a18dd1a507053d44 Mon Sep 17 00:00:00 2001 From: tron Date: Wed, 1 Jul 2015 19:57:31 +0000 Subject: Update "lintpkgsrc" package to version 4.89: - Fix warnings reported by Perl 5.22. --- pkgtools/lintpkgsrc/Makefile | 5 ++--- pkgtools/lintpkgsrc/files/lintpkgsrc.pl | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'pkgtools/lintpkgsrc') diff --git a/pkgtools/lintpkgsrc/Makefile b/pkgtools/lintpkgsrc/Makefile index 75f47e18776..321625287e8 100644 --- a/pkgtools/lintpkgsrc/Makefile +++ b/pkgtools/lintpkgsrc/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.20 2015/06/12 10:50:55 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2015/07/01 19:57:31 tron Exp $ -PKGNAME= lintpkgsrc-4.88 -PKGREVISION= 1 +PKGNAME= lintpkgsrc-4.89 CATEGORIES= pkgtools MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl index fc2bfe4f8b3..2c9015e463f 100755 --- a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl +++ b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl @@ -1,6 +1,6 @@ #! @PERL@ -# $NetBSD: lintpkgsrc.pl,v 1.5 2015/01/10 20:12:24 wiz Exp $ +# $NetBSD: lintpkgsrc.pl,v 1.6 2015/07/01 19:57:31 tron Exp $ # Written by David Brownlee . # @@ -1190,7 +1190,7 @@ sub parse_makefile_vars($$) { # fully expand if ( $incfile =~ m#/mk/bsd# || $incfile =~ /$magic_undefined/ - || $incfile =~ /\${/ + || $incfile =~ /\$\{/ || ( !$opt{d} && $incfile =~ m#/(buildlink[^/]*\.mk)# ) ) { debug("$file: .include \"$incfile\" skipped\n"); @@ -1307,7 +1307,7 @@ sub parse_makefile_vars($$) { } elsif ( $vars{$key} =~ - m#\${([\w.]+):([CS]([^{}])[^{}\3]+\3[^{}\3]*\3[g1]*(|:[^{}]+)|U[^{}]+)}# ) + m#\$\{([\w.]+):([CS]([^{}])[^{}\3]+\3[^{}\3]*\3[g1]*(|:[^{}]+)|U[^{}]+)\}# ) { my ( $left, $subvar, $right ) = ( $`, $1, $' ); my (@patterns) = split( ':', $2 ); -- cgit v1.2.3