diff options
| author | abs <abs> | 2001-01-18 11:40:33 +0000 |
|---|---|---|
| committer | abs <abs> | 2001-01-18 11:40:33 +0000 |
| commit | 93fef41dc4bb1e7677a29955b228f998333ef51e (patch) | |
| tree | 12f652afd578616e038f0e511b2b1da2ec51ccbe /pkgtools | |
| parent | c66b13edb4561fa227efdd11eb874a573353b7c0 (diff) | |
| download | pkgsrc-93fef41dc4bb1e7677a29955b228f998333ef51e.tar.gz | |
Update pkglint to 2.34.
Changes to lintpkgsrc:
Fix DEPENDS error (was only checking first DEPENDS). Fix from Dan.
Fix uname to work on pre NetBSD 1.4 systems.
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 a945334c89f..78533c202fc 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.72 2001/01/12 12:47:51 dent Exp $ +# $NetBSD: Makefile,v 1.73 2001/01/18 11:40:33 abs Exp $ # -DISTNAME= pkglint-2.33 +DISTNAME= pkglint-2.34 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/lintpkgsrc.pl b/pkgtools/pkglint/files/lintpkgsrc.pl index ed64bb4b812..9b0197559d7 100755 --- a/pkgtools/pkglint/files/lintpkgsrc.pl +++ b/pkgtools/pkglint/files/lintpkgsrc.pl @@ -1,6 +1,6 @@ #!/usr/bin/env perl -# $NetBSD: lintpkgsrc.pl,v 1.40 2000/11/17 12:45:31 abs Exp $ +# $NetBSD: lintpkgsrc.pl,v 1.41 2001/01/18 11:40:33 abs Exp $ # Written by David Brownlee <abs@netbsd.org>. # @@ -320,11 +320,14 @@ sub fail sub get_default_makefile_vars { - chomp($_ = `uname -srmp`); + chomp($_ = `uname -srm`); ( $default_vars->{'OPSYS'}, $default_vars->{'OS_VERSION'}, - $default_vars->{'MACHINE_ARCH'}, $default_vars->{'MACHINE'} ) = (split); + # Handle systems without uname -p (NetBSD pre 1.4) + chomp($default_vars->{'MACHINE_ARCH'} = `uname -p 2>/dev/null`); + if (! $default_vars->{'MACHINE_ARCH'}) + { $default_vars->{'MACHINE_ARCH'} = $default_vars->{'MACHINE'}; } $default_vars->{'LINTPKGSRC'} = 'YES'; $default_vars->{'EXTRACT_SUFX'} = 'tar.gz'; $default_vars->{'OBJECT_FMT'} = 'x'; @@ -929,7 +932,7 @@ sub pkgsrc_check_depends { my($err, $msg); defined $pkg{$pkgname}{$ver}{'depends'} || next; - foreach (split("\n", $pkg{$pkgname}{$ver}{'depends'})) + foreach (split(" ", $pkg{$pkgname}{$ver}{'depends'})) { s/:.*// || next; if (($msg = &invalid_version($_)) ) |