summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2006-06-06 16:00:49 +0000
committerrillig <rillig@pkgsrc.org>2006-06-06 16:00:49 +0000
commitd61288a409ca6017c07e045f58f8f4317132a30b (patch)
treec1979d253385e64594ca863d8853f21620335f46 /pkgtools
parentde51c4c4640d59506e332eb7df70742ab5bfccb9 (diff)
downloadpkgsrc-d61288a409ca6017c07e045f58f8f4317132a30b.tar.gz
The .include lines in mk/tools/bsd.tools.mk changed, hence pkglint
didn't know the tools from the TOOLS framework anymore. Fixed that and added some code that will detect such a change in the future.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkglint/files/pkglint.pl5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index bedf447f2ea..97444a705e4 100644
--- a/pkgtools/pkglint/files/pkglint.pl
+++ b/pkgtools/pkglint/files/pkglint.pl
@@ -1,5 +1,5 @@
#! @PERL@
-# $NetBSD: pkglint.pl,v 1.608 2006/06/06 11:41:40 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.609 2006/06/06 16:00:49 rillig Exp $
#
# pkglint - static analyzer and checker for pkgsrc packages
@@ -2060,12 +2060,13 @@ sub load_tool_names() {
foreach my $line (@{$lines}) {
if ($line->text =~ regex_mk_include) {
my ($includefile) = ($1);
- if ($includefile =~ qr"^\.\./\.\./mk/tools/(.*)$") {
+ if ($includefile =~ qr"^\$\{PKGSRCDIR\}/mk/tools/(.*)$") {
push(@tool_files, $1);
}
}
}
}
+ assert(scalar(@tool_files) > 1);
#
# Scan the tool files for the actual definitions of the tools.