diff options
| author | abs <abs@pkgsrc.org> | 2001-03-15 15:10:22 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2001-03-15 15:10:22 +0000 |
| commit | 3a7d41cbba0d6ecbf1847ca06297194d25b9ed2e (patch) | |
| tree | def1a20bd2c08e6e01f8e002a9824a7df490b14e | |
| parent | 3a5b25b7c05f3c5c9a28b97982bdf0604c225fec (diff) | |
| download | pkgsrc-3a7d41cbba0d6ecbf1847ca06297194d25b9ed2e.tar.gz | |
Update to 2.41:
lintpkgsrc - when parsing ${VAR:S/x/y/} type constructs in Makefiles,
handle separators other than '/'.
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkglint/files/lintpkgsrc.pl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 3cfc333b9ed..1841b2e93b9 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.82 2001/03/08 10:14:49 wiz Exp $ +# $NetBSD: Makefile,v 1.83 2001/03/15 15:10:22 abs Exp $ # -DISTNAME= pkglint-2.40 +DISTNAME= pkglint-2.41 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/lintpkgsrc.pl b/pkgtools/pkglint/files/lintpkgsrc.pl index 70c8d2757cc..a88972aeb3d 100755 --- a/pkgtools/pkglint/files/lintpkgsrc.pl +++ b/pkgtools/pkglint/files/lintpkgsrc.pl @@ -1,6 +1,6 @@ #!/usr/bin/env perl -# $NetBSD: lintpkgsrc.pl,v 1.42 2001/01/29 10:48:09 abs Exp $ +# $NetBSD: lintpkgsrc.pl,v 1.43 2001/03/15 15:10:23 abs Exp $ # Written by David Brownlee <abs@netbsd.org>. # @@ -765,7 +765,7 @@ sub parse_makefile_vars $vars{$key} = $_; $loop = 1; } - elsif ($vars{$key} =~ m#\${(\w+):([CS]/[^{}/]+/[^{}/]*/g?(|:[^{}]+))}#) + elsif ($vars{$key} =~ m#\${(\w+):([CS]([^{}])[^{}\3]+\3[^{}\3]*\3g?(|:[^{}]+))}#) { my($left, $subvar, $right) = ($`, $1, $'); my(@patterns) = split(':', $2); |