diff options
| author | hubertf <hubertf> | 2000-07-14 16:09:26 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 2000-07-14 16:09:26 +0000 |
| commit | 8ec29b81fa80ae45f837097075da009bb21c74f7 (patch) | |
| tree | 98dcfd9429d409f7a4d129cc557a165f63abbbf5 /pkgtools | |
| parent | 953b30dcb9f29ef6b2426d0faf6c90c45fb947c8 (diff) | |
| download | pkgsrc-8ec29b81fa80ae45f837097075da009bb21c74f7.tar.gz | |
Deal with depends dirs properly, esp. if pkglinted is not started in a pkg
dir. Noted in PR 10584 by Damon Brodie <damon@brodiefamily.org>
Bump version to 2.11.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index ed47f1bd336..aa5ec0e228f 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.51 2000/06/21 23:28:27 wiz Exp $ +# $NetBSD: Makefile,v 1.52 2000/07/14 16:09:26 hubertf Exp $ # -DISTNAME= pkglint-2.10 +DISTNAME= pkglint-2.11 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 17f166ae6f0..c59ef4a5a96 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -12,7 +12,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.31 2000/06/21 23:28:28 wiz Exp $ +# $NetBSD: pkglint.pl,v 1.32 2000/07/14 16:09:26 hubertf Exp $ # # This version contains some changes necessary for NetBSD packages # done by Hubert Feyrer <hubertf@netbsd.org> and @@ -1126,10 +1126,8 @@ EOF # check port dir existence $k = (split(':', $k))[1]; - if ($osname ne "NetBSD") { - $k =~ s/\${PORTSDIR}/$ENV{'PORTSDIR'}/; - } - if (! -d $k) { + $k =~ s/\${PKGSRCDIR}/$ENV{'PKGSRCDIR'}/; + if (! -d "$portdir/$k") { &perror("WARN: no package directory $k ". "found, even though it is ". "listed in $j."); |