From 6a13219ca89e5dae86f27159ff86006058c06859 Mon Sep 17 00:00:00 2001
From: abs <abs@pkgsrc.org>
Date: Mon, 29 Jan 2001 10:48:09 +0000
Subject: Update to pkglint-2.36 On pre NetBSD-1.4 fall back to 'sysctl -n
 hw.machine_arch' for MACHINE_ARCH

---
 pkgtools/pkglint/Makefile            | 4 ++--
 pkgtools/pkglint/files/lintpkgsrc.pl | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index b6b79dd8502..405ffb84639 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2001/01/26 13:16:52 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2001/01/29 10:48:09 abs Exp $
 #
 
-DISTNAME=		pkglint-2.35
+DISTNAME=		pkglint-2.36
 CATEGORIES=		pkgtools devel
 MASTER_SITES=		# empty
 DISTFILES=		# empty
diff --git a/pkgtools/pkglint/files/lintpkgsrc.pl b/pkgtools/pkglint/files/lintpkgsrc.pl
index 9b0197559d7..70c8d2757cc 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.41 2001/01/18 11:40:33 abs Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.42 2001/01/29 10:48:09 abs Exp $
 
 # Written by David Brownlee <abs@netbsd.org>.
 #
@@ -324,10 +324,15 @@ sub get_default_makefile_vars
     ( $default_vars->{'OPSYS'},
 	$default_vars->{'OS_VERSION'},
 	$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->{'OS_VERSION'} eq 'NetBSD')
+	{ chomp($default_vars->{'MACHINE_ARCH'} = `sysctl -n hw.machine_arch`);}
     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';
-- 
cgit v1.2.3