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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/291969a46648
branches:  trunk
changeset: 502885:291969a46648
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Nov 10 11:03:57 2005 +0000

description:
Updated pkglint to 4.39.

Changes since 4.38:
- Disabled the check on Makefile variable order, as the discussion on
  tech-pkg has not finished yet.
- Improved detection of valid tool names.
- Improved detection of direct use of tool names. (Less false positives.)
- Improved the diagnostics for direct use of tool names.

diffstat:

 doc/CHANGES                       |   3 ++-
 pkgtools/pkglint/Makefile         |   4 ++--
 pkgtools/pkglint/files/pkglint.pl |  14 ++++++++------
 3 files changed, 12 insertions(+), 9 deletions(-)

diffs (74 lines):

diff -r 0d5dfd702dcc -r 291969a46648 doc/CHANGES
--- a/doc/CHANGES       Thu Nov 10 10:37:47 2005 +0000
+++ b/doc/CHANGES       Thu Nov 10 11:03:57 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.11883 2005/11/10 09:06:02 tonio Exp $
+$NetBSD: CHANGES,v 1.11884 2005/11/10 11:04:30 rillig Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 
@@ -5159,3 +5159,4 @@
        Updated print/teTeX3-bin to 3.0nb3 [minskim 2005-11-09]
        Updated devel/bmake to 20051105 [reed 2005-11-10]
        Updated audio/cplay to 1.49nb1 [tonio 2005-11-10]
+       Updated pkgtools/pkglint to 4.39 [rillig 2005-11-10]
diff -r 0d5dfd702dcc -r 291969a46648 pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Thu Nov 10 10:37:47 2005 +0000
+++ b/pkgtools/pkglint/Makefile Thu Nov 10 11:03:57 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.290 2005/11/10 10:26:46 rillig Exp $
+# $NetBSD: Makefile,v 1.291 2005/11/10 11:03:57 rillig Exp $
 #
 
-DISTNAME=      pkglint-4.38.4
+DISTNAME=      pkglint-4.39
 CATEGORIES=    pkgtools devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 0d5dfd702dcc -r 291969a46648 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Thu Nov 10 10:37:47 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Thu Nov 10 11:03:57 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.343 2005/11/10 10:26:46 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.344 2005/11/10 11:03:57 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -1856,7 +1856,9 @@
                USE_TOOLS);
        my @valid_shellcmds = (
                qr"for file in",
-               qr"(?:\./Build|\$\{JAM_COMMAND\})\s+(?:install|test)",
+               qr"\./${regex_tools}\b",
+               qr"(?:\./Build|\$\{(?:BJAM_CMD|JAM_COMMAND)\})\s+(?:install|test)",
+               qr"\$\{(?:GMAKE|MAKE_PROGRAM)\}\s+(?:install)",
                qr"\"[^\"]*${regex_tools}[^\"]*\"",
                qr"\'[^\']*${regex_tools}[^\']*\'",
                qr"#.*",
@@ -1893,9 +1895,9 @@
                        my ($varname, undef, $varvalue) = ($1, $2, $3);
 
                        if ($varname =~ $regex_ok_vars) {
-                               $line->log_info("Legitimate direct use of \"${tool}\" in variable ${varname}.");
+                               $line->log_info("Legitimate direct use of tool \"${tool}\" in variable ${varname}.");
                        } elsif ($varvalue =~ $regex_tools_with_context) {
-                               $line->log_warning("Possible direct use of \"${tool}\" in variable ${varname}. Please use \$\{$toolvar{$tool}\} instead.");
+                               $line->log_warning("Possible direct use of tool \"${tool}\" in variable ${varname}. Please use \$\{$toolvar{$tool}\} instead.");
                        } else {
                                # the tool name has appeared in the comment
                        }
@@ -1923,9 +1925,9 @@
                        }
 
                        if ($remaining_shellcmd =~ $regex_tools_with_context) {
-                               $line->log_warning("Possible direct use of \"${tool}\" in shell command \"${short_shellcmd}\". Please use \$\{$toolvar{$tool}\} instead.");
+                               $line->log_warning("Possible direct use of tool \"${tool}\" in shell command \"${short_shellcmd}\". Please use \$\{$toolvar{$tool}\} instead.");
                        } else {
-                               $line->log_info("Legitimate direct use of \"${tool}\" in shell command \"${short_shellcmd}\".");
+                               $line->log_info("Legitimate direct use of tool \"${tool}\" in shell command \"${short_shellcmd}\".");
                        }
 
                # skip processing directives