[pkgsrc/trunk]: pkgsrc Update pkglint to 3.59 - handle bsd.pkg.mk's assumptio...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f9b1db4d307f
branches:  trunk
changeset: 460323:f9b1db4d307f
user:      abs <abs%pkgsrc.org@localhost>
date:      Thu Aug 28 14:44:55 2003 +0000

description:
Update pkglint to 3.59 - handle bsd.pkg.mk's assumption that the caller is in
pkgsrc/some/dir

diffstat:

 doc/CHANGES                          |   4 +++-
 pkgtools/pkglint/Makefile            |   4 ++--
 pkgtools/pkglint/files/lintpkgsrc.pl |  11 +++++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diffs (69 lines):

diff -r f3fb23d72087 -r f9b1db4d307f doc/CHANGES
--- a/doc/CHANGES       Thu Aug 28 12:56:56 2003 +0000
+++ b/doc/CHANGES       Thu Aug 28 14:44:55 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.3119 2003/08/27 16:07:39 adam Exp $
+$NetBSD: CHANGES,v 1.3120 2003/08/28 14:45:41 abs Exp $
 
 Changes to the packages collection and infrastructure in 2003:
 
@@ -3358,3 +3358,5 @@
        Updated gtk2 to 2.2.3 [wiz 2003-08-27]
        Updated librsync to 0.9.6nb1 [abs 2003-08-27]
        Updated gtkmm to 2.2.7 [adam 2003-08-27]
+       Updated pkglint to 3.59 [abs 2003-08-27]
+
diff -r f3fb23d72087 -r f9b1db4d307f pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Thu Aug 28 12:56:56 2003 +0000
+++ b/pkgtools/pkglint/Makefile Thu Aug 28 14:44:55 2003 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.165 2003/07/31 15:13:21 seb Exp $
+# $NetBSD: Makefile,v 1.166 2003/08/28 14:44:55 abs Exp $
 #
 
-DISTNAME=      pkglint-3.58
+DISTNAME=      pkglint-3.59
 WRKSRC=                ${WRKDIR}
 CATEGORIES=    pkgtools devel
 MASTER_SITES=  # empty
diff -r f3fb23d72087 -r f9b1db4d307f pkgtools/pkglint/files/lintpkgsrc.pl
--- a/pkgtools/pkglint/files/lintpkgsrc.pl      Thu Aug 28 12:56:56 2003 +0000
+++ b/pkgtools/pkglint/files/lintpkgsrc.pl      Thu Aug 28 14:44:55 2003 +0000
@@ -1,6 +1,6 @@
 #!@PREFIX@/bin/perl
 
-# $NetBSD: lintpkgsrc.pl,v 1.78 2003/06/15 22:19:46 abs Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.79 2003/08/28 14:44:56 abs Exp $
 
 # Written by David Brownlee <abs%netbsd.org@localhost>.
 #
@@ -448,7 +448,8 @@
 
     # Extract some variables from bsd.pkg.mk
     my($mkvars);
-    $mkvars = parse_makefile_vars("$default_vars->{PKGSRCDIR}/mk/bsd.pkg.mk");
+    $mkvars = parse_makefile_vars("$default_vars->{PKGSRCDIR}/mk/bsd.pkg.mk",
+                                   "$default_vars->{PKGSRCDIR}/mk/scripts");
     foreach my $varname (keys %{$mkvars})
        {
        if ($varname =~ /_REQD$/ || $varname eq 'EXTRACT_SUFX')
@@ -776,7 +777,7 @@
 #
 sub parse_makefile_vars
     {
-    my($file) = @_;
+    my($file, $cwd) = @_;
     my($pkgname, %vars, $plus, $value, @data,
        %incfiles,
        @if_false); # 0:true 1:false 2:nested-false&nomore-elsif
@@ -794,7 +795,9 @@
        { %vars = %{$default_vars}; }
     $vars{BSD_PKG_MK} = 'YES';
 
-    if ($file =~ m#(.*)/#)
+    if ($cwd)
+       { $vars{'.CURDIR'} = $cwd; }
+    elsif ($file =~ m#(.*)/#)
        { $vars{'.CURDIR'} = $1; }
     else
        { $vars{'.CURDIR'} = getcwd; }