From 64ae9a798348b87e37c23034211fab826acb8dc9 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Thu, 14 Nov 2002 04:01:55 +0000
Subject: Only avoid checking mk/bsd*, not all files from mk/. Bump to 3.37.

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

(limited to 'pkgtools')

diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index eef31bc61e1..15e70b157a2 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.140 2002/09/30 16:08:17 atatat Exp $
+# $NetBSD: Makefile,v 1.141 2002/11/14 04:01:55 wiz Exp $
 #
 
-DISTNAME=	pkglint-3.36
+DISTNAME=	pkglint-3.37
 CATEGORIES=	pkgtools devel
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/pkglint/files/lintpkgsrc.pl b/pkgtools/pkglint/files/lintpkgsrc.pl
index 292ec1514b5..b68748c425d 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.71 2002/09/30 16:08:18 atatat Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.72 2002/11/14 04:01:56 wiz Exp $
 
 # Written by David Brownlee <abs@netbsd.org>.
 #
@@ -838,7 +838,7 @@ sub parse_makefile_vars
 	if (m#^\.include\s+"([^"]+)"#)
 	    {
 	    $_ = $1;
-	    if (! m#/mk/#)
+	    if (! m#/mk/bsd#)
 		{
 		my($incfile) = ($_);
 
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index f2623750859..e499cbc1456 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.72 2002/09/25 09:34:22 wiz Exp $
+# $NetBSD: pkglint.pl,v 1.73 2002/11/14 04:01:56 wiz Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by Hubert Feyrer <hubertf@netbsd.org>,
@@ -607,7 +607,7 @@ sub readmakefile {
 			if ($includefile =~ /\"([^\"]+)\"/) {
 				$includefile = $1;
 			}
-			if ($includefile =~ /\/mk\//) {
+			if ($includefile =~ /\/mk\/bsd/) {
 				# we don't want to include the whole
 				# bsd.pkg.mk or bsd.prefs.mk files
 				$contents .= $_;
-- 
cgit v1.2.3