[pkgsrc/trunk]: pkgsrc Updated pkglint to 4.28.1.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/51ba589f84c1
branches:  trunk
changeset: 500909:51ba589f84c1
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Oct 14 09:23:46 2005 +0000

description:
Updated pkglint to 4.28.1.

Declared some more variables as List types. Added a check that
PERL5_PACKLIST matches the PKGNAME.

diffstat:

 doc/CHANGES                         |   3 ++-
 pkgtools/pkglint/Makefile           |   4 ++--
 pkgtools/pkglint/TODO               |   1 +
 pkgtools/pkglint/files/makevars.map |   6 +++++-
 pkgtools/pkglint/files/pkglint.pl   |  15 +++++++++++++--
 5 files changed, 23 insertions(+), 6 deletions(-)

diffs (98 lines):

diff -r fcf65e8bd327 -r 51ba589f84c1 doc/CHANGES
--- a/doc/CHANGES       Fri Oct 14 08:59:50 2005 +0000
+++ b/doc/CHANGES       Fri Oct 14 09:23:46 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.11474 2005/10/14 08:37:16 adrianp Exp $
+$NetBSD: CHANGES,v 1.11475 2005/10/14 09:24:29 rillig Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 
@@ -4576,3 +4576,4 @@
        Added security/dirb version 1.8 [minskim 2005-10-14]
        Added security/secpanel version 0.5.1 [minskim 2005-10-14]
        Updated mail/sendmail to 8.13.5 [adrianp 2005-10-14]
+       Updated pkgtools/pkglint to 4.28.1 [rillig 2005-10-14]
diff -r fcf65e8bd327 -r 51ba589f84c1 pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Fri Oct 14 08:59:50 2005 +0000
+++ b/pkgtools/pkglint/Makefile Fri Oct 14 09:23:46 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.264 2005/10/14 00:05:23 rillig Exp $
+# $NetBSD: Makefile,v 1.265 2005/10/14 09:23:46 rillig Exp $
 #
 
-DISTNAME=      pkglint-4.28
+DISTNAME=      pkglint-4.28.1
 CATEGORIES=    pkgtools devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r fcf65e8bd327 -r 51ba589f84c1 pkgtools/pkglint/TODO
--- a/pkgtools/pkglint/TODO     Fri Oct 14 08:59:50 2005 +0000
+++ b/pkgtools/pkglint/TODO     Fri Oct 14 09:23:46 2005 +0000
@@ -8,3 +8,4 @@
 * in dependency lines check for ../../category/package, not ../package
 * ONLY_FOR_PLATFORM => NOT_FOR_PLATFORM
 * -Wl,-rpath
+* check that PERL5_PACKLIST is a path relative to ${FOO}
diff -r fcf65e8bd327 -r 51ba589f84c1 pkgtools/pkglint/files/makevars.map
--- a/pkgtools/pkglint/files/makevars.map       Fri Oct 14 08:59:50 2005 +0000
+++ b/pkgtools/pkglint/files/makevars.map       Fri Oct 14 09:23:46 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.15 2005/10/14 00:05:23 rillig Exp $
+# $NetBSD: makevars.map,v 1.16 2005/10/14 09:23:46 rillig Exp $
 #
 
 # This file tries to guess the type of some variables, according to their
@@ -64,3 +64,7 @@
 CPPFLAGS               List
 LDFLAGS                        List
 LIBS                   List
+MAKE_ENV               List
+CONFIGURE_ENV          List
+MAKE_FLAGS             List
+CONFIGURE_ARGS         List
diff -r fcf65e8bd327 -r 51ba589f84c1 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Fri Oct 14 08:59:50 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Fri Oct 14 09:23:46 2005 +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.298 2005/10/14 00:05:23 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.299 2005/10/14 09:23:46 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -1540,6 +1540,17 @@
                                }
                        }
 
+                       if ($varname eq "PERL5_PACKLIST" && defined($pkgname) && $pkgname =~ qr"^p5-(.*)-[0-9].*") {
+                               my ($guess) = ($1);
+                               $guess =~ s/-/\//g;
+                               $guess = "auto/${guess}/.packlist";
+
+                               my ($ucvalue, $ucguess) = (uc($value), uc($guess));
+                               if ($ucvalue ne $ucguess && $ucvalue ne "\${PERL5_SITEARCH\}/${ucguess}") {
+                                       $line->log_warning("Unusual value for PERL5_PACKLIST -- \"${guess}\" expected.");
+                               }
+                       }
+
                        if ($varname eq "PKG_SUPPORTED_OPTIONS" || $varname eq "PKG_SUGGESTED_OPTIONS") {
                                if ($value =~ qr"_") {
                                        $line->log_warning("Options should not contain underscores.");
@@ -1685,7 +1696,6 @@
        log_subinfo("checkfile_package_Makefile", $fname, NO_LINE_NUMBER, undef);
 
        checkperms($fname);
-       checklines_package_Makefile($lines);
 
        $abspkgdir = Cwd::abs_path($dir);
        $category = basename(dirname($abspkgdir));
@@ -2152,6 +2162,7 @@
                        "discouraged. Redefine \"do-$1\" instead.");
        }
 
+       checklines_package_Makefile($lines);
        checklines_Makefile_varuse($lines);
 }