diff options
| author | markd <markd@pkgsrc.org> | 2017-06-22 06:11:25 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2017-06-22 06:11:25 +0000 |
| commit | 1a4cd1f6e094c59be2b27b45a986a12f7fd967ea (patch) | |
| tree | a811174fd69cdceb7a8c62873e04ca90555aa32e /pkgtools | |
| parent | d31dfb845bfe22a1e4a4c8e58603fb4159798fdf (diff) | |
| download | pkgsrc-1a4cd1f6e094c59be2b27b45a986a12f7fd967ea.tar.gz | |
Deal with perl 5.26. Bump PKGREVISION
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/lintpkgsrc/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/lintpkgsrc/files/lintpkgsrc.pl | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/lintpkgsrc/Makefile b/pkgtools/lintpkgsrc/Makefile index 30704e8e31d..76fdc40f912 100644 --- a/pkgtools/lintpkgsrc/Makefile +++ b/pkgtools/lintpkgsrc/Makefile @@ -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 diff --git a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl index 94d538939a7..47aa5093c55 100755 --- a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl +++ b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl @@ -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>. # @@ -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 . '$'; |