Updated pkglint to 4.29.1.

Added CONFLICT to the list of deprecated variables (actually it's a
typo). Added PLIST_SUBST to makevars.map as a List. Allow comments after
a YES/yes/NO/no value of variables.

5 files changed, 11 insertions, 11 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index 5bcc1b23935..b7773a1580f 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.11638 2005/10/23 23:06:18 rillig Exp $
+$NetBSD: CHANGES,v 1.11639 2005/10/23 23:15:23 rillig Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 
@@ -4808,3 +4808,4 @@ Changes to the packages collection and infrastructure in 2005:
 	Updated x11/xdaemon to 1.0nb1 [rillig 2005-10-23]
 	Updated x11/xdaemon2 to 2.0nb3 [rillig 2005-10-23]
 	Updated x11/xteddy2 to 2.0.1nb7 [rillig 2005-10-23]
+	Updated pkgtools/pkglint to 4.29.1 [rillig 2005-10-23]
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index a9220fa54f6..53fa655ca1d 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.267 2005/10/23 19:20:33 rillig Exp $
+# $NetBSD: Makefile,v 1.268 2005/10/23 23:14:57 rillig Exp $
 #
 
-DISTNAME=	pkglint-4.29
+DISTNAME=	pkglint-4.29.1
 CATEGORIES=	pkgtools devel
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/pkglint/files/deprecated.map b/pkgtools/pkglint/files/deprecated.map
index 159c2b9c7ae..5bfe7cf08fc 100644
--- a/pkgtools/pkglint/files/deprecated.map
+++ b/pkgtools/pkglint/files/deprecated.map
@@ -1,4 +1,4 @@
-# $NetBSD: deprecated.map,v 1.10 2005/10/07 10:24:43 rillig Exp $
+# $NetBSD: deprecated.map,v 1.11 2005/10/23 23:14:57 rillig Exp $
 #
 
 # This file contains names of Makefile variables and a short explanation
@@ -46,3 +46,4 @@ USE_PERL5		Use USE_TOOLS+=perl or USE_TOOLS+=perl:run instead.
 # The following entries can be removed after the 2006Q1 branch.
 NO_TOOLS		You can just remove it.
 NO_WRAPPER		You can just remove it.
+CONFLICT		Use CONFLICTS instead.
diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map
index 2e90439b004..ea3f0c5164b 100644
--- a/pkgtools/pkglint/files/makevars.map
+++ b/pkgtools/pkglint/files/makevars.map
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.17 2005/10/21 07:20:24 rillig Exp $
+# $NetBSD: makevars.map,v 1.18 2005/10/23 23:14:57 rillig Exp $
 #
 
 # This file tries to guess the type of some variables, according to their
@@ -68,6 +68,7 @@ MAKE_ENV		List
 CONFIGURE_ENV		List
 MAKE_FLAGS		List
 CONFIGURE_ARGS		List
+PLIST_SUBST		List
 
 PKGVERSION		Readonly
 PKGBASE			Readonly
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index 8bea7acf043..fd7edb65bd2 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.301 2005/10/23 19:20:33 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.302 2005/10/23 23:14:57 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -413,8 +413,6 @@ my $regex_url		= qr"^(?:http://|ftp://|#)"; # allow empty URLs
 my $regex_url_directory	= qr"(?:http://|ftp://)\S+/";
 my $regex_validchars	= qr"[\011\040-\176]";
 my $regex_varassign	= qr"^([-A-Z_a-z0-9.\${}]+)\s*(=|\?=|\+=|:=|!=)\s*(.*?)$";
-my $regex_yes		= qr"^(?:YES|yes)$";
-my $regex_yesno		= qr"^(?:YES|yes|NO|no)$";
 
 # Global variables
 my $pkgdir;
@@ -1228,7 +1226,6 @@ sub get_regex_plurals() {
 		.*_TMPL
 		BUILDLINK_DEPMETHOD
 		BUILDLINK_TRANSFORM
-		CONFLICT
 		EVAL_PREFIX
 		INTERACTIVE_STAGE
 		LICENSE
@@ -1287,12 +1284,12 @@ sub checkline_Makefile_vartype($$) {
 			$line->log_error("\"${varname}\" must not be modified by the package or the user.");
 
 		} elsif ($type eq "Boolean") {
-			if ($value !~ $regex_yesno) {
+			if ($value !~ qr"^(?:YES|yes|NO|no)(?:\s+#.*)?$") {
 				$line->log_warning("$varname should be set to YES, yes, NO, or no.");
 			}
 
 		} elsif ($type eq "Yes_Or_Undefined") {
-			if ($value !~ $regex_yes) {
+			if ($value !~ qr"^(?:YES|yes)(?:\s+#.*)?$") {
 				$line->log_warning("$varname should be set to YES or yes.");
 			}