From 3c0e99bec0866c7bcbc026d280fe2f6b6e37b720 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Tue, 24 Sep 2002 12:34:21 +0000
Subject: Since MESSAGE files come by many names, hardwire the line length,
 independent of the actual filename. Update to 3.33.

---
 pkgtools/pkglint/Makefile         | 4 ++--
 pkgtools/pkglint/files/pkglint.pl | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index cdb56d67de0..dba88dc9d63 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.136 2002/09/22 16:00:37 atatat Exp $
+# $NetBSD: Makefile,v 1.137 2002/09/24 12:34:21 wiz Exp $
 #
 
-DISTNAME=	pkglint-3.32
+DISTNAME=	pkglint-3.33
 CATEGORIES=	pkgtools devel
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index ac84d9e12ed..5c468269915 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.69 2002/09/12 17:03:04 wiz Exp $
+# $NetBSD: pkglint.pl,v 1.70 2002/09/24 12:34:22 wiz Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by Hubert Feyrer <hubertf@netbsd.org>,
@@ -335,7 +335,6 @@ sub checkdistinfo {
 #
 sub checkmessage {
 	local($file) = @_;
-	local(%maxchars) = ('MESSAGE', 80);
 	local($longlines, $lastline, $tmp) = (0, "", "");
 
 	$shortname = basename($file);
@@ -351,7 +350,7 @@ sub checkmessage {
 		&perror("FATAL: missing RCS Id in MESSAGE file: $file");
 	}
 	while (<IN>) {
-		$longlines++ if ($maxchars{$shortname} < length($_));
+		$longlines++ if (80 < length($_));
 		$lastline = $_;
 		$tmp .= $_;
 	}
@@ -361,7 +360,7 @@ sub checkmessage {
 	}
 	if ($longlines > 0) {
 		&perror("WARN: $file includes lines that exceed ".
-			"$maxchars{$shortname} characters.");
+			"80 characters.");
 	}
 	if ($tmp =~ /[\033\200-\377]/) {
 		&perror("WARN: $file includes iso-8859-1, or ".
-- 
cgit v1.2.3