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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9304c86bd914
branches:  trunk
changeset: 503157:9304c86bd914
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Nov 15 03:10:20 2005 +0000

description:
Updated pkglint to 4.42.1.

Added a work-around for the warnings from PHP modules when including
lang/php/ext.mk.

diffstat:

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

diffs (62 lines):

diff -r 3e37836a0019 -r 9304c86bd914 pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Tue Nov 15 03:02:52 2005 +0000
+++ b/pkgtools/pkglint/Makefile Tue Nov 15 03:10:20 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.297 2005/11/15 01:55:53 rillig Exp $
+# $NetBSD: Makefile,v 1.298 2005/11/15 03:10:20 rillig Exp $
 #
 
-DISTNAME=      pkglint-4.42
+DISTNAME=      pkglint-4.42.1
 CATEGORIES=    pkgtools devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 3e37836a0019 -r 9304c86bd914 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Tue Nov 15 03:02:52 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Tue Nov 15 03:10:20 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.358 2005/11/14 16:49:20 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.359 2005/11/15 03:10:21 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -618,6 +618,7 @@
 my $patchdir;                  # PATCHDIR from the package Makefile
 my $distinfo_file;             # DISTINFO_FILE from the package Makefile
 my $pkgname;                   # PKGNAME from the package Makefile
+my $hack_php_patches;          # Ignore non-existing patches in distinfo
 
 my $seen_USE_PKGLOCALEDIR;     # Does the package use PKGLOCALEDIR?
 my $seen_Makefile_common;      # Does the package have any .includes?
@@ -1044,7 +1045,7 @@
                                if ($sum ne $chksum) {
                                        $line->log_error("${alg} checksum of $file differs (expected ${sum}, got ${chksum}). Rerun '".conf_make." makepatchsum'.");
                                }
-                       } else {
+                       } elsif (!$hack_php_patches) {
                                $line->log_warning("$file does not exist.");
                        }
                } else {
@@ -2241,9 +2242,10 @@
        }
 
        # HACK
-       if ($whole !~ qr"\nUSE_PHP_EXT_PATCHES") {
+       if ($whole =~ qr"\nPHPEXT_MK" && $whole !~ qr"\nUSE_PHP_EXT_PATCHES") {
                log_info($fname, NO_LINE_NUMBER, "[hack] USE_PHP_EXT_PATCHES");
                $whole =~ s,\nPATCHDIR=.*PHPPKGSRCDIR.*,,;
+               $hack_php_patches = true;
        }
        # HACK
        if ($whole =~ qr"\nPECL_VERSION") {
@@ -2972,6 +2974,7 @@
        $seen_USE_PKGLOCALEDIR  = undef;
        $seen_Makefile_common   = undef;
        $pkgname                = undef;
+       $hack_php_patches       = false;
 
        $current_dir = $is_dir ? $item : dirname($item);
        $is_wip = !$opt_import && (Cwd::abs_path($current_dir) =~ qr"/wip(?:/|$)");