diff options
| author | rillig <rillig> | 2005-05-10 00:09:18 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2005-05-10 00:09:18 +0000 |
| commit | 92c0d37d28cfd95ead6a48586630aca8259a225c (patch) | |
| tree | 3d4441316eddd1b0d4ef2d9428959d00cc4c71e6 /pkgtools | |
| parent | ff87cfc5932fe6d0230af902ad3b77cee5edcb65 (diff) | |
| download | pkgsrc-92c0d37d28cfd95ead6a48586630aca8259a225c.tar.gz | |
Don't include ../../mk/java*.mk when reading in the Makefile. This avoids
false positive warnings for the deprecated PKG_JVM variable.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index a0d433b3518..e9654a11b21 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.144 2005/05/07 22:21:23 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.145 2005/05/10 00:09:18 rillig Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by Hubert Feyrer <hubertf@netbsd.org>, @@ -1090,9 +1090,8 @@ sub readmakefile($) { if ($includefile =~ /\/mk\/texinfo\.mk/) { log_error($line->text, $line->lineno, "do not include $includefile"); } - if ($includefile =~ /\/mk\/bsd/) { - # we don't want to include the whole - # bsd.pkg.mk or bsd.prefs.mk files + if ($includefile =~ /\/mk\/(?:bsd|java)/) { + # skip these files $contents .= $line->text . "\n"; } else { $dirname = dirname($file); |