[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files Fixed three warnings, which hav...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f1cab67d775d
branches:  trunk
changeset: 549532:f1cab67d775d
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Nov 04 23:13:05 2008 +0000

description:
Fixed three warnings, which have been reported by Mark Davies.

diffstat:

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

diffs (45 lines):

diff -r 6d0f99370bbc -r f1cab67d775d pkgtools/pkglint/files/makevars.map
--- a/pkgtools/pkglint/files/makevars.map       Tue Nov 04 22:27:00 2008 +0000
+++ b/pkgtools/pkglint/files/makevars.map       Tue Nov 04 23:13:05 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.185 2008/10/09 16:19:24 rillig Exp $
+# $NetBSD: makevars.map,v 1.186 2008/11/04 23:13:05 rillig Exp $
 #
 
 # This file contains the guessed type of some variables, according to
@@ -223,6 +223,7 @@
 CHECK_SHLIBS           YesNo [m:s]
 CHECK_SHLIBS_SUPPORTED YesNo [m:s]
 CHECK_WRKREF_SKIP      List of Pathmask [$package_list]
+CMAKE_ARG_PATH         Pathname [$package]
 COMMENT                        Comment [m:as,c:as]
 COMPILER_RPATH_FLAG    { -Wl,-rpath } [$system]
 CONFIGURE_ARGS         List of ShellWord [$package_list]
@@ -685,7 +686,7 @@
 USE_DIRS               List of {                                       \
                                gnome1-1.0 gnome1-1.5                   \
                                gnome2-1.3 gnome2-1.5 gnome2-1.6        \
-                               kde3-1.0                                \
+                               kde3-1.0 kde4-1.0                       \
                                texmf-1.0 texmf-1.1 texmf-1.2           \
                                texmf-1.3 texmf-1.4                     \
                                theme-1.0 theme-1.1                     \
diff -r 6d0f99370bbc -r f1cab67d775d pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Tue Nov 04 22:27:00 2008 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Tue Nov 04 23:13:05 2008 +0000
@@ -1,5 +1,5 @@
 #! @PERL@
-# $NetBSD: pkglint.pl,v 1.781 2008/11/04 22:27:00 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.782 2008/11/04 23:13:05 rillig Exp $
 #
 
 # pkglint - static analyzer and checker for pkgsrc packages
@@ -5446,7 +5446,7 @@
                } elsif ($value ne "" && $value_novar eq "") {
                        # The value of another variable
 
-               } elsif ($value_novar !~ m"^(?:\.|[0-9A-Za-z][-0-9A-Za-z._/+]*)$") {
+               } elsif ($value_novar !~ m"^(?:\.|[0-9A-Za-z_][-0-9A-Za-z._/+]*)$") {
                        $line->log_warning("\"${value}\" is not a valid subdirectory of \${WRKSRC}.");
                }