From 565cd3e043f7628450d92b36b91a0697dfe8993b Mon Sep 17 00:00:00 2001
From: abs <abs>
Date: Thu, 31 May 2001 17:37:25 +0000
Subject: Another day, another pkglint version. lintpkgsrc:     If a binary
 package matches more than one vulnerability, only report once.     Ensure
 LINTPKGSRC is set when parsing mk.conf

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

(limited to 'pkgtools/pkglint')

diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index 6784559d09d..7676f185764 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.97 2001/05/30 16:44:46 abs Exp $
+# $NetBSD: Makefile,v 1.98 2001/05/31 17:37:25 abs Exp $
 #
 
-DISTNAME=		pkglint-2.55
+DISTNAME=		pkglint-2.56
 CATEGORIES=		pkgtools devel
 MASTER_SITES=		# empty
 DISTFILES=		# empty
diff --git a/pkgtools/pkglint/files/lintpkgsrc.pl b/pkgtools/pkglint/files/lintpkgsrc.pl
index 0ad84104793..ce70c82e59e 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.51 2001/05/30 16:44:46 abs Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.52 2001/05/31 17:37:25 abs Exp $
 
 # Written by David Brownlee <abs@netbsd.org>.
 #
@@ -247,7 +247,6 @@ if ($opt{'D'} && @ARGV)
     }
 exit;
 
-
 # Could speed up by building a cache of package names to paths, then processing
 # each package name once against the tests.
 sub check_prebuilt_packages
@@ -269,6 +268,7 @@ sub check_prebuilt_packages
 		    {
 		    print "$File::Find::dir/$_\n";
 		    push(@matched_prebuiltpackages, "$File::Find::dir/$_");
+		    last;
 		    }
 		}
 	    }
@@ -365,7 +365,6 @@ sub get_default_makefile_vars
     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';
     $default_vars->{'LOWER_OPSYS'} = lc($default_vars->{'OPSYS'});
@@ -685,8 +684,11 @@ sub parse_makefile_vars
     close(FILE);
 
     # Some Makefiles depend on these being set
-    if ($file ne '/etc/mk.conf')
+    if ($file eq '/etc/mk.conf')
+	{ $vars{'LINTPKGSRC'} = 'YES'; }
+    else
 	{ %vars = %{$default_vars}; }
+
     if ($file =~ m#(.*)/#)
 	{ $vars{'.CURDIR'} = $1; }
     if ($opt{'L'})
-- 
cgit v1.2.3