From 1874afd41321523d68a71db87dfbe2df8f3444f1 Mon Sep 17 00:00:00 2001
From: abs <abs@pkgsrc.org>
Date: Wed, 21 May 2008 20:16:19 +0000
Subject: update pkglint to 4.86 - necessary bu not sufficient to handle OWNER
 in Makefiles. As a first pass make MAINTAINER optional and add an optional
 OWNER directly after it in the same section. This will pass valid
 OWNER/MAINTAINER combinations but not reject some invalid ones. Full fix
 (hopefully) coming soon...

---
 pkgtools/pkglint/Makefile           | 4 ++--
 pkgtools/pkglint/files/makevars.map | 3 ++-
 pkgtools/pkglint/files/pkglint.pl   | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'pkgtools')

diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index bcddd917b38..8155827b76c 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.373 2008/03/06 08:54:12 rillig Exp $
+# $NetBSD: Makefile,v 1.374 2008/05/21 20:16:19 abs Exp $
 #
 
 # Please don't increase the version number if you are not rillig.
-DISTNAME=	pkglint-4.85
+DISTNAME=	pkglint-4.86
 CATEGORIES=	pkgtools
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map
index a3c09006867..9e3836a773a 100644
--- a/pkgtools/pkglint/files/makevars.map
+++ b/pkgtools/pkglint/files/makevars.map
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.181 2008/02/01 08:50:22 rillig Exp $
+# $NetBSD: makevars.map,v 1.182 2008/05/21 20:16:19 abs Exp $
 #
 
 # This file contains the guessed type of some variables, according to
@@ -482,6 +482,7 @@ OSVERSION_SPECIFIC	Yes [m:s,c:s]
 OS_VERSION		Version [$system]
 OVERRIDE_DIRDEPTH*	Integer [$package]
 OVERRIDE_GNU_CONFIG_SCRIPTS	Yes [$package]
+OWNER			Mail_Address [m:s,c:d]
 OWN_DIRS		List of Pathname [$package_list]
 OWN_DIRS_PERMS		List of ShellWord [$package_list]
 PAMBASE			Pathname [$system]
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index 6cf302b05f2..68ea3e06c9a 100644
--- a/pkgtools/pkglint/files/pkglint.pl
+++ b/pkgtools/pkglint/files/pkglint.pl
@@ -1,5 +1,5 @@
 #! @PERL@
-# $NetBSD: pkglint.pl,v 1.768 2008/03/06 08:51:36 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.769 2008/05/21 20:16:19 abs Exp $
 #
 
 # pkglint - static analyzer and checker for pkgsrc packages
@@ -6064,7 +6064,8 @@ sub checklines_package_Makefile_varorder($) {
 		],
 		[ "Unsorted stuff, part 2", once,
 			[
-				[ "MAINTAINER", once ],
+				[ "MAINTAINER", optional ],
+				[ "OWNER", optional ],
 				[ "HOMEPAGE", optional ],
 				[ "COMMENT", once ],
 			]
-- 
cgit v1.2.3