[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files - The type SubstMessage was red...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2f6e4abe4aa3
branches:  trunk
changeset: 508802:2f6e4abe4aa3
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Feb 26 04:26:52 2006 +0000

description:
- The type SubstMessage was redundant and has been replaced with Message.
- Improved a diagnostic.

diffstat:

 pkgtools/pkglint/files/makevars.map |  4 ++--
 pkgtools/pkglint/files/pkglint.pl   |  9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diffs (49 lines):

diff -r fd273f2eefdf -r 2f6e4abe4aa3 pkgtools/pkglint/files/makevars.map
--- a/pkgtools/pkglint/files/makevars.map       Sun Feb 26 02:35:08 2006 +0000
+++ b/pkgtools/pkglint/files/makevars.map       Sun Feb 26 04:26:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.65 2006/02/18 16:07:16 rillig Exp $
+# $NetBSD: makevars.map,v 1.66 2006/02/26 04:26:52 rillig Exp $
 #
 
 # This file contains the guessed type of some variables, according to
@@ -325,7 +325,7 @@
 SUBST_FILES            List of Pathmask
 SUBST_FILTER_CMD       List of ShellWord
 # ^^ more appropriately, a Shellcommand
-SUBST_MESSAGE          SubstMessage
+SUBST_MESSAGE          Message
 SUBST_SED              List of ShellWord
 # ^^ This may be changed to a List+ later.
 SUBST_STAGE            Stage
diff -r fd273f2eefdf -r 2f6e4abe4aa3 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Sun Feb 26 02:35:08 2006 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Sun Feb 26 04:26:52 2006 +0000
@@ -1,5 +1,5 @@
 #! @PERL@
-# $NetBSD: pkglint.pl,v 1.532 2006/02/24 15:05:10 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.533 2006/02/26 04:26:52 rillig Exp $
 #
 
 # pkglint - static analyzer and checker for pkgsrc packages
@@ -3105,11 +3105,6 @@
                        $line->log_warning("Invalid stage name. Use one of {pre,do,post}-{extract,patch,configure,build,install}.");
                }
 
-       } elsif ($type eq "SubstMessage") {
-               if ($value =~ qr"^\".*\"$") {
-                       $line->log_warning("${varname} should not be quoted.");
-               }
-
        } elsif ($type eq "Tool") {
                if ($value =~ qr"^([-\w]+|\[)(?::(\w+))?$") {
                        my ($toolname, $tooldep) = ($1, $2);
@@ -3117,7 +3112,7 @@
                                $line->log_error("Unknown tool \"${toolname}\".");
                        }
                        if (defined($tooldep) && $tooldep !~ qr"^(?:build|pkgsrc|run)$") {
-                               $line->log_error("Unknown tool dependency \"${tooldep}\".");
+                               $line->log_error("Unknown tool dependency \"${tooldep}\". Use one of \"build\", \"pkgsrc\" or \"run\".");
                        }
                } else {
                        $line->log_error("Invalid tool syntax: \"${value}\".");