Updated pkglint to 4.42.2.

- Added a check that PERL5_PACKLIST does not contain references to other
  variables. Some packages have ${PERL5_SITEARCH} in it, which results in
  a double slash, and the CHECK_FILES framework cannot handle this.

3 files changed, 10 insertions, 4 deletions

diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index fac0ffbd6d2..d51332bda28 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.298 2005/11/15 03:10:20 rillig Exp $
+# $NetBSD: Makefile,v 1.299 2005/11/19 13:34:41 rillig Exp $
 #
 
-DISTNAME=	pkglint-4.42.1
+DISTNAME=	pkglint-4.42.2
 CATEGORIES=	pkgtools devel
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map
index 1b8649112cc..ff6ed640970 100644
--- a/pkgtools/pkglint/files/makevars.map
+++ b/pkgtools/pkglint/files/makevars.map
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.33 2005/11/15 13:42:50 rillig Exp $
+# $NetBSD: makevars.map,v 1.34 2005/11/19 13:34:41 rillig Exp $
 #
 
 # This file contains the guessed type of some variables, according to
@@ -116,6 +116,7 @@ PAMBASE			Readonly
 PAM_ACCEPTED		List* of { linux-pam openpam solaris-pam }
 PAM_DEFAULT		Userdefined
 PAM_TYPE		Readonly
+PERL5_PACKLIST		Perl5Packlist
 PGSQL_VERSIONS_ACCEPTED	List* of { 73 74 80 }
 PGSQL_VERSION_DEFAULT	Userdefined
 PKGBASE			Readonly
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index 78e5f84b0ec..83bb9a41a21 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.361 2005/11/15 13:48:42 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.362 2005/11/19 13:34:41 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -1618,6 +1618,11 @@ sub checktext_basic_vartype($$$$$) {
 			$line->log_warning("\"${value}\" is not a valid pathname mask.");
 		}
 
+	} elsif ($type eq "Perl5Packlist") {
+		if ($value ne $value_novar) {
+			$line->log_warning("${varname} should not depend on other variables.");
+		}
+
 	} elsif ($type eq "PkgName") {
 		if ($value eq $value_novar && $value !~ regex_pkgname) {
 			$line->log_warning("\"${value}\" is not a valid package name.");