diff options
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 157e4dd6075..45e40c445a1 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.205 2004/10/07 02:01:38 jlam Exp $ +# $NetBSD: Makefile,v 1.206 2004/10/15 12:14:14 wiz Exp $ # -DISTNAME= pkglint-3.91 +DISTNAME= pkglint-3.92 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 16f73d67a13..7f6cf8284e5 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -11,7 +11,7 @@ # Freely redistributable. Absolutely no warranty. # # From Id: portlint.pl,v 1.64 1998/02/28 02:34:05 itojun Exp -# $NetBSD: pkglint.pl,v 1.119 2004/09/24 15:33:26 wiz Exp $ +# $NetBSD: pkglint.pl,v 1.120 2004/10/15 12:14:14 wiz Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by Hubert Feyrer <hubertf@netbsd.org>, @@ -295,6 +295,7 @@ my $seen_NO_PKG_REGISTER= false; my $seen_NO_CHECKSUM = false; my $seen_USE_PKGLOCALEDIR = false; my $seen_USE_BUILDLINK3 = false; +my %seen_Makefile_include = (); my %predefined; my $pkgname = ""; @@ -1062,6 +1063,11 @@ sub readmakefile($) { if ($includefile =~ /\"([^\"]+)\"/) { $includefile = $1; } + if (exists($seen_Makefile_include{$includefile})) { + $contents .= "### pkglint ### skipped $includefile\n"; + next; + } + $seen_Makefile_include{$includefile} = true; if ($includefile =~ /\/mk\/texinfo\.mk/) { log_error(NO_FILE, NO_LINE_NUMBER, "do not include $includefile"); } |