diff options
| author | wiz <wiz@pkgsrc.org> | 2012-07-10 09:39:26 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2012-07-10 09:39:26 +0000 |
| commit | b1b5433a04fdae1463e93b4364078308ea064e7b (patch) | |
| tree | a7c9e297ac155085068496a6cfac94900e8033bc /pkgtools | |
| parent | 906ceba8a2939bfe8468b42940c3fe4918d222b1 (diff) | |
| download | pkgsrc-b1b5433a04fdae1463e93b4364078308ea064e7b.tar.gz | |
Do not parse Makefiles in files/ or patches/
Addresses another part of PR 46570 by David Holland.
Bump version.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 8221f94bac5..34e75edebf1 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.405 2012/07/09 21:58:33 wiz Exp $ +# $NetBSD: Makefile,v 1.406 2012/07/10 09:39:26 wiz Exp $ # # Note: if you update the version number, please have a look at the # changes between the CVS tag "pkglint_current" and HEAD. # After updating, please re-set the CVS tag to HEAD. -DISTNAME= pkglint-4.113 +DISTNAME= pkglint-4.114 CATEGORIES= pkgtools MASTER_SITES= # none DISTFILES= # none diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index cae3642af66..2a3b6ab5632 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: pkglint.pl,v 1.837 2012/07/09 22:11:00 wiz Exp $ +# $NetBSD: pkglint.pl,v 1.838 2012/07/10 09:39:27 wiz Exp $ # # pkglint - static analyzer and checker for pkgsrc packages @@ -8014,7 +8014,7 @@ sub checkfile($) { } elsif ($fname =~ m"(?:^|/)patches/[^/]*$") { log_warning($fname, NO_LINE_NUMBER, "Patch files should be named \"patch-\", followed by letters, '-', '_', '.', and digits only."); - } elsif ($basename =~ m"^(?:.*\.mk|Makefile.*)$") { + } elsif ($basename =~ m"^(?:.*\.mk|Makefile.*)$" and not $fname =~ m,files/, and not $fname =~ m,patches/,) { $opt_check_mk and checkfile_mk($fname); } elsif ($basename =~ m"^PLIST") { @@ -8345,6 +8345,8 @@ sub checkdir_package() { foreach my $fname (@files) { if (($fname =~ m"^((?:.*/)?Makefile\..*|.*\.mk)$") && (not $fname =~ m"patch-") + && (not $fname =~ m"${pkgdir}/") + && (not $fname =~ m"${filesdir}/") && (defined(my $lines = load_lines($fname, true)))) { parselines_mk($lines); determine_used_variables($lines); |