[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint Update to 3.88:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/80550f72362b
branches:  trunk
changeset: 478018:80550f72362b
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Jul 14 17:43:43 2004 +0000

description:
Update to 3.88:
Fix some bugs wrt MESSAGE and PLIST checking.

>From Roland Illig in private mail.

diffstat:

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

diffs (66 lines):

diff -r 3a60e90900a7 -r 80550f72362b pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Wed Jul 14 16:51:05 2004 +0000
+++ b/pkgtools/pkglint/Makefile Wed Jul 14 17:43:43 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.200 2004/07/10 05:55:50 snj Exp $
+# $NetBSD: Makefile,v 1.201 2004/07/14 17:43:43 wiz Exp $
 #
 
-DISTNAME=      pkglint-3.87
+DISTNAME=      pkglint-3.88
 CATEGORIES=    pkgtools devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 3a60e90900a7 -r 80550f72362b pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Wed Jul 14 16:51:05 2004 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Wed Jul 14 17:43:43 2004 +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.113 2004/07/10 05:55:50 snj Exp $
+# $NetBSD: pkglint.pl,v 1.114 2004/07/14 17:43:43 wiz Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by Hubert Feyrer <hubertf%netbsd.org@localhost>,
@@ -465,7 +465,7 @@
                checkline_trailing_whitespace($line);
                checkline_valid_characters($line, $regex_validchars);
        }
-       if ($message->[-1] ne "=" x 75) {
+       if ($message->[-1]->[2] ne "=" x 75) {
                log_warning($message->[-1]->[0], $message->[-1]->[1], "expected a line of exactly 75 \"=\" characters.");
        }
        return 1;
@@ -496,14 +496,16 @@
                                $curdir = $arg;
                        } elsif ($cmd eq "unexec" && $arg =~ /^rmdir/) {
                                log_warning($line->[0], $line->[1], "use \"\@dirrm\" instead of \"\@unexec rmdir\".");
-                       } elsif (($cmd eq "exec" || $cmd eq "unexec") && ($arg =~ /(?:install-info|\$\{INSTALL_INFO\})/)) {
-                               log_warning($line->[0], $line->[1], "\@exec/unexec install-info is deprecated.");
-                       } elsif (($cmd eq "exec" || $cmd eq "unexec") && $arg =~ /ldconfig/) {
-                               if ($arg !~ m:/usr/bin/true:) {
+                       } elsif ($cmd eq "exec" || $cmd eq "unexec") {
+                               if ($arg =~ /(?:install-info|\$\{INSTALL_INFO\})/) {
+                                       log_warning($line->[0], $line->[1], "\@exec/unexec install-info is deprecated.");
+                               } elsif ($arg =~ /ldconfig/ && $arg !~ qr"/usr/bin/true") {
                                        log_error($line->[0], $line->[1], "ldconfig must be used with \"||/usr/bin/true\".");
                                }
-                       } elsif ($cmd eq "comment" && $arg =~ /^$regex_rcsidstr$/) {
-                               $rcsid_seen = 1;
+                       } elsif ($cmd eq "comment") {
+                               if ($arg =~ /^$regex_rcsidstr$/) {
+                                       $rcsid_seen = 1;
+                               }
                        } elsif ($cmd eq "dirrm" || $cmd eq "option") {
                                # no check made
                        } elsif ($cmd eq "mode" || $cmd eq "owner" || $cmd eq "group") {
@@ -1829,7 +1831,7 @@
 sub print_summary_and_exit()
 {
        if ($errors != 0 || $warnings != 0) {
-               print("$errors errors and $warnings warnings found.\n");
+               print("$errors fatal errors and $warnings warnings found.\n");
        } else {
                print "looks fine.\n";
        }