[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files Improved the variable specifica...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/eba0dcfbd68f
branches:  trunk
changeset: 513783:eba0dcfbd68f
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Jun 03 06:04:37 2006 +0000

description:
Improved the variable specification in makevars.map. Code cleanup.

diffstat:

 pkgtools/pkglint/files/makevars.map |  15 ++++++++-------
 pkgtools/pkglint/files/pkglint.pl   |  17 ++++++++++++++---
 2 files changed, 22 insertions(+), 10 deletions(-)

diffs (97 lines):

diff -r bad26e9eb62e -r eba0dcfbd68f pkgtools/pkglint/files/makevars.map
--- a/pkgtools/pkglint/files/makevars.map       Sat Jun 03 03:26:42 2006 +0000
+++ b/pkgtools/pkglint/files/makevars.map       Sat Jun 03 06:04:37 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.100 2006/06/02 21:54:00 rillig Exp $
+# $NetBSD: makevars.map,v 1.101 2006/06/03 06:04:37 rillig Exp $
 #
 
 # This file contains the guessed type of some variables, according to
@@ -128,7 +128,7 @@
 BUILDLINK_FILES_CMD.*  List of ShellWord []
 # ^^ ShellCommand
 BUILDLINK_INCDIRS.*    List of Pathname [b:ad]                 # b:d?
-BUILDLINK_JAVA_PREFIX  Pathname []
+BUILDLINK_JAVA_PREFIX  Pathname [b:s]
 BUILDLINK_LDADD.*      List of LdFlag [builtin.mk:ads]
 BUILDLINK_LDFLAGS.*    List of LdFlag []
 BUILDLINK_LIBDIRS.*    List of Pathname [b:a]
@@ -260,7 +260,7 @@
 GNU_ARCH               { mips }
 GNU_CONFIGURE          Yes [c:s,m:s]
 GNU_CONFIGURE_MANDIR   Pathname [m:s,c:s]
-GNU_CONFIGURE_PREFIX   Pathname
+GNU_CONFIGURE_PREFIX   Pathname [m:s]
 HAS_CONFIGURE          Yes [m:s,c:s]
 HEADER_TEMPLATE                List of Pathname
 HOMEPAGE               URL [m:s,c:ds]
@@ -293,10 +293,11 @@
 INSTALL_UNSTRIPPED     YesNo [m:s,c:s]
 INTERACTIVE_STAGE      List of { fetch extract configure build install } [m:s]
 IS_BUILTIN.*           YesNo_Indirectly [builtin.mk:s]
-JAVA_CLASSPATH         ShellWord
-JAVA_NAME              Filename
+JAVA_CLASSPATH         ShellWord [m:s]
+JAVA_HOME              Pathname [m:s]
+JAVA_NAME              Filename [m:s]
 JAVA_UNLIMIT           List of { cmdsize datasize stacksize }
-JAVA_WRAPPERS          InternalList of Filename
+JAVA_WRAPPERS          InternalList of Filename [m:as]
 JAVA_WRAPPER_BIN.*     Pathname [m:s,c:ds]
 KRB5BASE               Unchecked []
 KRB5_ACCEPTED          List of { heimdal mit-krb5 }
@@ -420,7 +421,7 @@
 PKG_HACKS              List of Identifier [h:a]
 PKG_INSTALLATION_TYPES List of { overwrite pkgviews } [m:s,c:s]
 PKG_JAVA_HOME          Pathname [*:u]
-PKG_JVM                        Unchecked []
+PKG_JVM                        Unchecked [*:u]
 PKG_JVMS_ACCEPTED      List of {                                       \
                                blackdown-jdk13                         \
                                jdk jdk14                               \
diff -r bad26e9eb62e -r eba0dcfbd68f pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Sat Jun 03 03:26:42 2006 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Sat Jun 03 06:04:37 2006 +0000
@@ -1,5 +1,5 @@
 #! @PERL@
-# $NetBSD: pkglint.pl,v 1.598 2006/06/03 00:12:38 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.599 2006/06/03 06:04:37 rillig Exp $
 #
 
 # pkglint - static analyzer and checker for pkgsrc packages
@@ -2579,6 +2579,17 @@
        my $type = get_variable_type($line, $varname);
        my ($want_list, $have_list);
 
+       use constant safe_types => array_to_hash(qw(
+               DistSuffix
+               FileMode Filename
+               Identifier
+               Pathname
+               PkgName
+               RelativePkgDir RelativePkgPath
+               URL UserGroupName
+               WrkdirSubdirectory
+       ));
+
        if (!defined($type) || !defined($context->type)) {
                return dont_know;
        }
@@ -2588,7 +2599,7 @@
        $want_list = $context->type->is_practically_a_list() && ($context->shellword == VUC_SHELLWORD_BACKT || $context->extent != VUC_EXTENT_WORD_PART);
        $have_list = $type->is_practically_a_list();
 
-       if ($type->kind_of_list == LK_NONE && $type->basic_type =~ qr"^(?:Filename|Pathname|FileMode|UserGroupName|DistSuffix|PkgName|WrkdirSubdirectory|RelativePkgDir|RelativePkgPath)$") {
+       if ($type->kind_of_list == LK_NONE && exists(safe_types->{$type->basic_type})) {
                return doesnt_matter;
        }
 
@@ -4181,7 +4192,7 @@
                } elsif (exists($deprecated->{$varname}) || exists($deprecated->{$varcanon})) {
                        # Ok
                } else {
-                       $line->log_warning("${varname} is defined, but not used. Spelling mistake?");
+                       $line->log_warning("${varname} is defined but not used. Spelling mistake?");
                }
        }