diff options
| author | abs <abs@pkgsrc.org> | 2001-05-21 13:27:14 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2001-05-21 13:27:14 +0000 |
| commit | 789f79b8fd7a31046907de9c43837b6d46eb28b7 (patch) | |
| tree | 74110a763e1edef5873e94fee0ce1e706039a102 /pkgtools | |
| parent | 5153fbb784d392ce0d3a827d18467ad2f2ee08d4 (diff) | |
| download | pkgsrc-789f79b8fd7a31046907de9c43837b6d46eb28b7.tar.gz | |
Updated pkglint to 2.54 - for lintpkgsrc fix case of PKGSRCDIR not set
in environment, mk.conf, or command line.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkglint/files/lintpkgsrc.pl | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 5c8190bda05..dc693320e33 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.95 2001/05/18 10:38:47 abs Exp $ +# $NetBSD: Makefile,v 1.96 2001/05/21 13:27:14 abs Exp $ # -DISTNAME= pkglint-2.53 +DISTNAME= pkglint-2.54 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/lintpkgsrc.pl b/pkgtools/pkglint/files/lintpkgsrc.pl index 45e0b029597..0aa49894fdd 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.49 2001/05/18 10:38:47 abs Exp $ +# $NetBSD: lintpkgsrc.pl,v 1.50 2001/05/21 13:27:14 abs Exp $ # Written by David Brownlee <abs@netbsd.org>. # @@ -377,7 +377,10 @@ sub get_default_makefile_vars my($vars); if (-f '/etc/mk.conf' && ($vars = &parse_makefile_vars('/etc/mk.conf'))) - { $default_vars = $vars; } + { + foreach (keys %{$vars}) + { $default_vars->{$_} = $vars->{$_}; } + } if ($opt{'P'}) { $default_vars->{'PKGSRCDIR'} = $opt{'P'}; } |