[pkgsrc/trunk]: pkgsrc Updated pkglint to 4.29.1.

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/64c753c30b8f
branches:  trunk
changeset: 501576:64c753c30b8f
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Oct 23 23:14:57 2005 +0000

description:
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.

diffstat:

 doc/CHANGES                           |  3 ++-
 pkgtools/pkglint/Makefile             |  4 ++--
 pkgtools/pkglint/files/deprecated.map |  3 ++-
 pkgtools/pkglint/files/makevars.map   |  3 ++-
 pkgtools/pkglint/files/pkglint.pl     |  9 +++------
 5 files changed, 11 insertions(+), 11 deletions(-)

diffs (102 lines):

diff -r 7dc83c78cbfa -r 64c753c30b8f doc/CHANGES
--- a/doc/CHANGES       Sun Oct 23 23:11:09 2005 +0000
+++ b/doc/CHANGES       Sun Oct 23 23:14:57 2005 +0000
@@ -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 @@
        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 -r 7dc83c78cbfa -r 64c753c30b8f pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Sun Oct 23 23:11:09 2005 +0000
+++ b/pkgtools/pkglint/Makefile Sun Oct 23 23:14:57 2005 +0000
@@ -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 -r 7dc83c78cbfa -r 64c753c30b8f pkgtools/pkglint/files/deprecated.map
--- a/pkgtools/pkglint/files/deprecated.map     Sun Oct 23 23:11:09 2005 +0000
+++ b/pkgtools/pkglint/files/deprecated.map     Sun Oct 23 23:14:57 2005 +0000
@@ -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 @@
 # 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 -r 7dc83c78cbfa -r 64c753c30b8f pkgtools/pkglint/files/makevars.map
--- a/pkgtools/pkglint/files/makevars.map       Sun Oct 23 23:11:09 2005 +0000
+++ b/pkgtools/pkglint/files/makevars.map       Sun Oct 23 23:14:57 2005 +0000
@@ -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 @@
 CONFIGURE_ENV          List
 MAKE_FLAGS             List
 CONFIGURE_ARGS         List
+PLIST_SUBST            List
 
 PKGVERSION             Readonly
 PKGBASE                        Readonly
diff -r 7dc83c78cbfa -r 64c753c30b8f pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Sun Oct 23 23:11:09 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Sun Oct 23 23:14:57 2005 +0000
@@ -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_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 @@
                .*_TMPL
                BUILDLINK_DEPMETHOD
                BUILDLINK_TRANSFORM
-               CONFLICT
                EVAL_PREFIX
                INTERACTIVE_STAGE
                LICENSE
@@ -1287,12 +1284,12 @@
                        $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.");
                        }