- The type SubstMessage was redundant and has been replaced with Message.

- Improved a diagnostic.

2 files changed, 4 insertions, 9 deletions

diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map
index ef83b8fae0f..d93f333ea65 100644
--- a/pkgtools/pkglint/files/makevars.map
+++ b/pkgtools/pkglint/files/makevars.map
@@ -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_CLASSES		List+
 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 --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index 2edfb5327b1..aede655c4e1 100644
--- a/pkgtools/pkglint/files/pkglint.pl
+++ b/pkgtools/pkglint/files/pkglint.pl
@@ -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 @@ sub checkline_mk_vartype_basic($$$$$$$) {
 			$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 @@ sub checkline_mk_vartype_basic($$$$$$$) {
 				$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}\".");