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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f2298a68ba52
branches:  trunk
changeset: 500504:f2298a68ba52
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Oct 09 18:24:11 2005 +0000

description:
Updated pkglint to 4.26.

Improved the wording of two diagnostics. Added a check for SUBST_STAGE.

diffstat:

 doc/CHANGES                       |   3 ++-
 pkgtools/pkglint/Makefile         |   4 ++--
 pkgtools/pkglint/files/pkglint.pl |  11 ++++++++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diffs (76 lines):

diff -r b79578c388f8 -r f2298a68ba52 doc/CHANGES
--- a/doc/CHANGES       Sun Oct 09 15:04:14 2005 +0000
+++ b/doc/CHANGES       Sun Oct 09 18:24:11 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.11387 2005/10/09 14:48:33 taca Exp $
+$NetBSD: CHANGES,v 1.11388 2005/10/09 18:24:49 rillig Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 
@@ -4358,3 +4358,4 @@
        Updated databases/freetds to 0.63 [jdolecek 2005-10-09]
        Added misc/openoffice2-bin 2.0.0rc2 [mrauch 2005-10-09]
        Updated www/squid to 2.5.11 [taca 2005-10-09]
+       Updated pkgtools/pkglint to 4.26 [rillig 2005-10-09]
diff -r b79578c388f8 -r f2298a68ba52 pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Sun Oct 09 15:04:14 2005 +0000
+++ b/pkgtools/pkglint/Makefile Sun Oct 09 18:24:11 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.261 2005/10/07 17:34:11 rillig Exp $
+# $NetBSD: Makefile,v 1.262 2005/10/09 18:24:11 rillig Exp $
 #
 
-DISTNAME=      pkglint-4.25
+DISTNAME=      pkglint-4.26
 CATEGORIES=    pkgtools devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r b79578c388f8 -r f2298a68ba52 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Sun Oct 09 15:04:14 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Sun Oct 09 18:24:11 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.295 2005/10/07 17:34:11 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.296 2005/10/09 18:24:11 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -407,6 +407,7 @@
 # Constants
 my $regex_mail_address = qr"^[-\w\d_.]+\@[-\w\d.]+$";
 my $regex_pkgname      = qr"^((?:[\w.+]|-[^\d])+)-(\d(?:\w|\.\d)*)$";
+my $regex_shellcmd     = qr"^\t";
 my $regex_unresolved   = qr"\$\{";
 my $regex_url          = qr"^(?:http://|ftp://|#)"; # allow empty URLs
 my $regex_url_directory        = qr"(?:http://|ftp://)\S+/";
@@ -980,7 +981,7 @@
                        $line->log_error("RCD_SCRIPTS must not be registered in the PLIST. Please use the RCD_SCRIPTS framework.");
 
                } elsif ($text =~ qr"^etc/") {
-                       $line->log_error("Configuration files must not be registered in the PLIST. Please use the PKG_SYSCONFDIR framework.");
+                       $line->log_error("Configuration files must not be registered in the PLIST. Please use the CONF_FILES framework, which is described in mk/install/bsd.pkginstall.mk.");
 
                } elsif ($text eq "info/dir") {
                        $line->log_error("\"info/dir\" must not be listed. Use install-info to add/remove an entry.");
@@ -1311,7 +1312,7 @@
        foreach my $line (@{$lines}) {
                if ($line->text =~ qr"^[^#]*[^\$]\$(\w+)") {
                        my ($varname) = ($1);
-                       $line->log_warning("please write either \${$varname} or \$\$$varname instead of \$$varname.");
+                       $line->log_warning("\$$varname is ambiguous. Use \${$varname} if you mean a Makefile variable or \$\$$varname if you mean a shell variable.");
                }
        }
 
@@ -1538,6 +1539,10 @@
                                        $line->log_error("Misspelled variable: Valid names are USE_{BIN,SRC}_ON_{FTP,CDROM}.");
                                }
                        }
+
+                       if ($varname =~ qr"^SUBST_STAGE\." && $value !~ qr"^(?:pre|do|post)-(?:patch|configure|build|install)$") {
+                               $line->log_warning("SUBST_STAGE should be one of {pre,do,post}-{patch,configure,build,install}");
+                       }
                }
        }