[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files Added the dirname($file) to the...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5073ca22c325
branches:  trunk
changeset: 494571:5073ca22c325
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed May 25 17:41:18 2005 +0000

description:
Added the dirname($file) to the search path for include files when
scanning package Makefiles. Changed the output format to include a
newline where necessary. Added the search path to the error message.
This might fix PR 30322.

diffstat:

 pkgtools/pkglint/files/lintpkgsrc.pl |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (40 lines):

diff -r 393d2b78a9ea -r 5073ca22c325 pkgtools/pkglint/files/lintpkgsrc.pl
--- a/pkgtools/pkglint/files/lintpkgsrc.pl      Wed May 25 17:12:20 2005 +0000
+++ b/pkgtools/pkglint/files/lintpkgsrc.pl      Wed May 25 17:41:18 2005 +0000
@@ -1,6 +1,6 @@
 #!@PERL@
 
-# $NetBSD: lintpkgsrc.pl,v 1.102 2005/05/24 15:37:17 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.103 2005/05/25 17:41:18 rillig Exp $
 
 # Written by David Brownlee <abs%netbsd.org@localhost>.
 #
@@ -18,6 +18,7 @@
 use strict;
 use Getopt::Std;
 use File::Find;
+use File::Basename;
 use Cwd 'realpath', 'getcwd';
 my(    $pkglist,               # list of Pkg packages
        $pkg_installver,        # installed version of pkg_install pseudo-pkg
@@ -828,6 +829,7 @@
     close(FILE);
 
     $incdirs{"."} = 1;
+    $incdirs{dirname($file)} = 1;
     # Some Makefiles depend on these being set
     if ($file eq '/etc/mk.conf')
        { $vars{LINTPKGSRC} = 'YES'; }
@@ -934,7 +936,11 @@
 
                if (! -f $incfile)
                    {
-                   verbose("Cannot locate '$incfile' (from $file): $_\n");
+                   if (!$opt{L}) {
+                       verbose("\n");
+                   }
+                   verbose("$file: Cannot locate $incfile in "
+                       . join(" ", sort keys %incdirs) . "\n");
                    }
                else
                    {