[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint Updated pkglint to 4.38.1.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/83b8ec36941f
branches:  trunk
changeset: 502774:83b8ec36941f
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Nov 08 21:09:48 2005 +0000

description:
Updated pkglint to 4.38.1.

- It is an error if packages define a variable whose name starts with an
  underscore.
- Removed the (vague) "wip" check, as it has been replaced by special checks for
  DEPENDS and .include directives.
- Disabled the check for variable ordering until the discussion on tech-pkg
  has led to any results.

diffstat:

 pkgtools/pkglint/Makefile         |   4 ++--
 pkgtools/pkglint/files/pkglint.pl |  16 +++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diffs (60 lines):

diff -r f791dffd4903 -r 83b8ec36941f pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Tue Nov 08 21:00:33 2005 +0000
+++ b/pkgtools/pkglint/Makefile Tue Nov 08 21:09:48 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.286 2005/11/07 00:45:01 rillig Exp $
+# $NetBSD: Makefile,v 1.287 2005/11/08 21:09:48 rillig Exp $
 #
 
-DISTNAME=      pkglint-4.38
+DISTNAME=      pkglint-4.38.1
 CATEGORIES=    pkgtools devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r f791dffd4903 -r 83b8ec36941f pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Tue Nov 08 21:00:33 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Tue Nov 08 21:09:48 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.337 2005/11/07 00:45:01 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.338 2005/11/08 21:09:48 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -2083,6 +2083,10 @@
                if ($text =~ regex_varassign) {
                        my ($varname, $op, $value, $comment) = ($1, $2, $3, $4);
 
+                       if ($varname =~ qr"^_") {
+                               $line->error("Variable names starting with an underscore are reserved for internal pkgsrc use.");
+                       }
+
                        if ($varname eq "COMMENT") {
                                if ($value =~ qr"^(a|an)\s+"i) {
                                        $line->log_warning("COMMENT should not begin with '$1'.");
@@ -2307,13 +2311,6 @@
 
        checklines_direct_tools($lines);
 
-       # whole file: check for pkgsrc-wip remnants
-       #
-       if ($whole =~ /\/wip\//
-        && $category ne "wip") {
-               $opt_warn_vague && log_error(NO_FILE, NO_LINE_NUMBER, "Possible pkgsrc-wip pathname detected.");
-       }
-
        if ($whole =~ /etc\/rc\.d/) {
                $opt_warn_vague && log_warning(NO_FILE, NO_LINE_NUMBER, "Use RCD_SCRIPTS mechanism to install rc.d ".
                        "scripts automatically to \${RCD_SCRIPTS_EXAMPLEDIR}.");
@@ -2514,7 +2511,8 @@
        }
 
        checklines_package_Makefile($lines);
-       checklines_package_Makefile_varorder($lines);
+       # Disabled, as I don't like the current ordering scheme.
+       #checklines_package_Makefile_varorder($lines);
        checklines_Makefile_varuse($lines);
 }