diff options
| author | abs <abs@pkgsrc.org> | 2003-08-28 14:44:55 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2003-08-28 14:44:55 +0000 |
| commit | 1f97bf7a51b1c61df6948ec97d6b470a215090d3 (patch) | |
| tree | d1cb7c5706f2f8010c62fe8b7f3204cf632096a0 /pkgtools | |
| parent | bc912549c5b5dc9046d6c0f08edcc4ddb1e5f8b1 (diff) | |
| download | pkgsrc-1f97bf7a51b1c61df6948ec97d6b470a215090d3.tar.gz | |
Update pkglint to 3.59 - handle bsd.pkg.mk's assumption that the caller is in
pkgsrc/some/dir
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkglint/files/lintpkgsrc.pl | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index dc749ea92c2..f102f73c892 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -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 --git a/pkgtools/pkglint/files/lintpkgsrc.pl b/pkgtools/pkglint/files/lintpkgsrc.pl index d0291e658ca..b81db559cf2 100755 --- a/pkgtools/pkglint/files/lintpkgsrc.pl +++ b/pkgtools/pkglint/files/lintpkgsrc.pl @@ -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>. # @@ -448,7 +448,8 @@ sub get_default_makefile_vars # 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_pkgsrc # 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 @@ sub parse_makefile_vars { %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; } |