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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/df1e425a0910
branches:  trunk
changeset: 500349:df1e425a0910
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Oct 07 10:24:42 2005 +0000

description:
Updated pkglint to 4.24.

Warn if option names contain underscore characters (suggested by dillo).
NO_TOOLS and NO_WRAPPER are deprecated, as they are not used anymore.

diffstat:

 doc/CHANGES                           |  3 ++-
 pkgtools/pkglint/Makefile             |  4 ++--
 pkgtools/pkglint/files/deprecated.map |  6 +++++-
 pkgtools/pkglint/files/pkglint.pl     |  8 +++++++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diffs (69 lines):

diff -r e30a5c0e926b -r df1e425a0910 doc/CHANGES
--- a/doc/CHANGES       Fri Oct 07 10:21:53 2005 +0000
+++ b/doc/CHANGES       Fri Oct 07 10:24:42 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.11361 2005/10/07 10:21:53 rillig Exp $
+$NetBSD: CHANGES,v 1.11362 2005/10/07 10:25:08 rillig Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 
@@ -4311,3 +4311,4 @@
        Updated graphics/mayavi to 1.5 [drochner 2005-10-06]
        Updated sysutils/estd to 0.4 [adam 2005-10-07]
        Updated games/xscrabble to 1.0nb3 [rillig 2005-10-07]
+       Updated pkgtools/pkglint to 4.24 [rillig 2005-10-07]
diff -r e30a5c0e926b -r df1e425a0910 pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Fri Oct 07 10:21:53 2005 +0000
+++ b/pkgtools/pkglint/Makefile Fri Oct 07 10:24:42 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.259 2005/09/29 13:38:37 rillig Exp $
+# $NetBSD: Makefile,v 1.260 2005/10/07 10:24:42 rillig Exp $
 #
 
-DISTNAME=      pkglint-4.23.2
+DISTNAME=      pkglint-4.24
 CATEGORIES=    pkgtools devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r e30a5c0e926b -r df1e425a0910 pkgtools/pkglint/files/deprecated.map
--- a/pkgtools/pkglint/files/deprecated.map     Fri Oct 07 10:21:53 2005 +0000
+++ b/pkgtools/pkglint/files/deprecated.map     Fri Oct 07 10:24:42 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: deprecated.map,v 1.9 2005/08/01 11:40:56 wiz Exp $
+# $NetBSD: deprecated.map,v 1.10 2005/10/07 10:24:43 rillig Exp $
 #
 
 # This file contains names of Makefile variables and a short explanation
@@ -42,3 +42,7 @@
 
 # The following entries can be removed after the 2005Q4 branch.
 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.
diff -r e30a5c0e926b -r df1e425a0910 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Fri Oct 07 10:21:53 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Fri Oct 07 10:24:42 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.293 2005/09/28 21:39:05 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.294 2005/10/07 10:24:43 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -1508,6 +1508,12 @@
                                }
                        }
 
+                       if ($varname eq "PKG_SUPPORTED_OPTIONS" || $varname eq "PKG_SUGGESTED_OPTIONS") {
+                               if ($value =~ qr"_") {
+                                       $line->log_warning("Options should not contain underscores.");
+                               }
+                       }
+
                        if ($value eq "# defined" && $varname !~ qr".*(?:_MK|_COMMON)$") {
                                $line->log_warning("Please use \"# empty\", \"# none\" or \"yes\" instead of \"# defined\".");
                        }