[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint Update to 3.92:

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/20b461e53161
branches:  trunk
changeset: 481944:20b461e53161
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Oct 15 12:14:14 2004 +0000

description:
Update to 3.92:
Include each .include'd file only once. Solves the 'Out of memory!'
problem for big packages, and avoids repeated warnings about problems
coming from bl3 or Makefile.common files.
>From Roland Illig in private mail.

diffstat:

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

diffs (45 lines):

diff -r f412fa6d60f2 -r 20b461e53161 pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Fri Oct 15 12:14:07 2004 +0000
+++ b/pkgtools/pkglint/Makefile Fri Oct 15 12:14:14 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.205 2004/10/07 02:01:38 jlam Exp $
+# $NetBSD: Makefile,v 1.206 2004/10/15 12:14:14 wiz Exp $
 #
 
-DISTNAME=      pkglint-3.91
+DISTNAME=      pkglint-3.92
 CATEGORIES=    pkgtools devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r f412fa6d60f2 -r 20b461e53161 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Fri Oct 15 12:14:07 2004 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Fri Oct 15 12:14:14 2004 +0000
@@ -11,7 +11,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.119 2004/09/24 15:33:26 wiz Exp $
+# $NetBSD: pkglint.pl,v 1.120 2004/10/15 12:14:14 wiz Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by Hubert Feyrer <hubertf%netbsd.org@localhost>,
@@ -295,6 +295,7 @@
 my $seen_NO_CHECKSUM   = false;
 my $seen_USE_PKGLOCALEDIR = false;
 my $seen_USE_BUILDLINK3 = false;
+my %seen_Makefile_include = ();
 my %predefined;
 my $pkgname            = "";
 
@@ -1062,6 +1063,11 @@
                        if ($includefile =~ /\"([^\"]+)\"/) {
                                $includefile = $1;
                        }
+                       if (exists($seen_Makefile_include{$includefile})) {
+                               $contents .= "### pkglint ### skipped $includefile\n";
+                               next;
+                       }
+                       $seen_Makefile_include{$includefile} = true;
                        if ($includefile =~ /\/mk\/texinfo\.mk/) {
                                log_error(NO_FILE, NO_LINE_NUMBER, "do not include $includefile");
                        }