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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8182d25e98e5
branches:  trunk
changeset: 499423:8182d25e98e5
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Sep 22 11:56:37 2005 +0000

description:
Updated pkglint to 4.21.2.

Changed the file name pattern for patch files to avoid false positives
for DISTFILES that start with "patch-" (requested by salo). Added a
warning for invalid patch file names.

diffstat:

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

diffs (73 lines):

diff -r ac6039bcc92c -r 8182d25e98e5 doc/CHANGES
--- a/doc/CHANGES       Thu Sep 22 11:55:54 2005 +0000
+++ b/doc/CHANGES       Thu Sep 22 11:56:37 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.11167 2005/09/22 11:55:54 adrianp Exp $
+$NetBSD: CHANGES,v 1.11168 2005/09/22 11:57:38 rillig Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 
@@ -4074,3 +4074,4 @@
        Updated audio/ifp-line to 0.2.4.4nb1 [minskim 2005-09-22]
        Updated audio/xhippo to 3.3nb5 [minskim 2005-09-22]
        Updated devel/mantis to 1.0.0rc2nb1 [adrianp 2005-09-22]
+       Updated pkgtools/pkglint to 4.21.2 [rillig 2005-09-22]
diff -r ac6039bcc92c -r 8182d25e98e5 pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Thu Sep 22 11:55:54 2005 +0000
+++ b/pkgtools/pkglint/Makefile Thu Sep 22 11:56:37 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.250 2005/09/22 01:46:46 rillig Exp $
+# $NetBSD: Makefile,v 1.251 2005/09/22 11:56:37 rillig Exp $
 #
 
-DISTNAME=      pkglint-4.21.1
+DISTNAME=      pkglint-4.21.2
 CATEGORIES=    pkgtools devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r ac6039bcc92c -r 8182d25e98e5 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Thu Sep 22 11:55:54 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Thu Sep 22 11:56:37 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.284 2005/09/22 01:46:46 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.285 2005/09/22 11:56:37 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -832,7 +832,7 @@
                next unless $line->text =~ /^(MD5|SHA1|RMD160) \(([^)]+)\) = (.*)$/;
                my ($alg, $patch, $sum) = ($1, $2, $3);
 
-               if ($patch =~ /^patch-[-A-Za-z0-9_.]+$/) {
+               if ($patch =~ /^patch-[A-Za-z0-9]+$/) {
                        if (-f "${dir}/$patchdir/$patch") {
                                my $chksum = `sed -e '/\$NetBSD.*/d' $dir/$patchdir/$patch | digest $alg`;
                                $chksum =~ s/\r*\n*\z//;
@@ -842,8 +842,8 @@
                        } else {
                                $line->log_error("$patch does not exist.");
                        }
-                       $in_distinfo{$patch} = true;
                }
+               $in_distinfo{$patch} = true;
        }
        checklines_trailing_empty_lines($distinfo);
 
@@ -2491,10 +2491,13 @@
                } elsif ($f =~ qr"/PLIST[^/]*$") {
                        $opt_check_PLIST and checkfile_PLIST($dir, $f);
 
-               } elsif ($f =~ qr"/patches/patch-[-A-Za-z0-9]*$") {
+               } elsif ($f =~ qr"/patches/patch-[A-Za-z0-9]*$") {
                        $have_patches = true;
                        $opt_check_patches and checkfile_patches_patch($dir, $f);
 
+               } elsif ($f =~ qr"/patches/[^/]*$") {
+                       log_warning($f, NO_LINE_NUMBER, "Patch files should be named \"patch-\", followed by letters and digits only.");
+
                } elsif (-T $f) {
                        $opt_check_extra and checkfile_extra($dir, $f);