[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files Don't include ../../mk/java*.mk...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b061aadf4bd2
branches:  trunk
changeset: 493584:b061aadf4bd2
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue May 10 00:09:18 2005 +0000

description:
Don't include ../../mk/java*.mk when reading in the Makefile. This avoids
false positive warnings for the deprecated PKG_JVM variable.

diffstat:

 pkgtools/pkglint/files/pkglint.pl |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (24 lines):

diff -r f650a58d3b39 -r b061aadf4bd2 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Tue May 10 00:07:53 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Tue May 10 00:09:18 2005 +0000
@@ -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@localhost>,
@@ -1090,9 +1090,8 @@
                        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);