summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorseb <seb>2004-11-09 17:14:43 +0000
committerseb <seb>2004-11-09 17:14:43 +0000
commit1ce73bb70aba3c22b3aa4d516d37bce42750e9d0 (patch)
treef07109b56049043f43201624ba3854c8ae65ffe2 /pkgtools
parent86cd567a091ae9845cf1f2c9c8fca6251bc70aea (diff)
downloadpkgsrc-1ce73bb70aba3c22b3aa4d516d37bce42750e9d0.tar.gz
Report trailing slash of the package directory part of *_DEPENDS specification
as a fatal error as this greatly confuses mk/scripts/mkdatabase. Update to version 3.97.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkglint/Makefile4
-rw-r--r--pkgtools/pkglint/files/pkglint.pl5
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index 42eb275aeb2..8b903c5381e 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.210 2004/11/04 21:17:40 he Exp $
+# $NetBSD: Makefile,v 1.211 2004/11/09 17:14:43 seb Exp $
#
-DISTNAME= pkglint-3.96
+DISTNAME= pkglint-3.97
CATEGORIES= pkgtools devel
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index c87e952892e..6db3e349787 100644
--- a/pkgtools/pkglint/files/pkglint.pl
+++ b/pkgtools/pkglint/files/pkglint.pl
@@ -11,7 +11,7 @@
# Freely redistributable. Absolutely no warranty.
#
# From Id: portlint.pl,v 1.64 1998/02/28 02:34:05 itojun Exp
-# $NetBSD: pkglint.pl,v 1.123 2004/11/04 21:17:40 he Exp $
+# $NetBSD: pkglint.pl,v 1.124 2004/11/09 17:14:43 seb Exp $
#
# This version contains lots of changes necessary for NetBSD packages
# done by Hubert Feyrer <hubertf@netbsd.org>,
@@ -1778,6 +1778,9 @@ EOF
my @m = split(/:/, $k);
if ($#m >= 1) {
$m[1] =~ s/\${PKGSRCDIR}/$ENV{'PKGSRCDIR'}/;
+ if ($m[1] =~ /\/$/) {
+ log_error(NO_FILE, NO_LINE_NUMBER, "trailing '/' (slash) for directory $m[1] listed in $j.");
+ }
if (! -d "$opt_packagedir/$m[1]") {
log_warning(NO_FILE, NO_LINE_NUMBER, "no package directory $m[1] found, even though it is listed in $j.");
} else {