summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorrillig <rillig>2008-11-04 23:13:05 +0000
committerrillig <rillig>2008-11-04 23:13:05 +0000
commitb12ac05108ea2b9070a94fc63e53d1e8cc157aae (patch)
tree55880a649be607d7b135c91289b8fc65efcf85bd /pkgtools
parent77cf91347740c78899e3156da7d719b86f9465e0 (diff)
downloadpkgsrc-b12ac05108ea2b9070a94fc63e53d1e8cc157aae.tar.gz
Fixed three warnings, which have been reported by Mark Davies.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkglint/files/makevars.map5
-rw-r--r--pkgtools/pkglint/files/pkglint.pl4
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map
index 8e6087d9109..eefdfc0f435 100644
--- a/pkgtools/pkglint/files/makevars.map
+++ b/pkgtools/pkglint/files/makevars.map
@@ -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_PORTABILITY_SKIP List of Pathmask [$package_list]
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_CROSSBASE Yes [m:s]
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 --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index 1ba57ce470f..7c0145ea21d 100644
--- a/pkgtools/pkglint/files/pkglint.pl
+++ b/pkgtools/pkglint/files/pkglint.pl
@@ -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 @@ sub checkline_mk_vartype_basic($$$$$$$$) {
} 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}.");
}