[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files Fixed a bug introduced by the m...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6a4805bc16ec
branches:  trunk
changeset: 494310:6a4805bc16ec
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon May 23 00:10:42 2005 +0000

description:
Fixed a bug introduced by the message normalization patch (forgot a !
operator). Don't blame the user for using tool names in PKGSRC_USE_TOOLS
and USE_TOOLS definitions, as this is what they are for.

diffstat:

 pkgtools/pkglint/files/pkglint.pl |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 4fd7abcc8e72 -r 6a4805bc16ec pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Sun May 22 23:53:56 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Mon May 23 00:10:42 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.168 2005/05/22 23:53:56 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.169 2005/05/23 00:10:42 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -589,7 +589,7 @@
        # we need to handle the Makefile first to get some variables
        log_info(NO_FILE, NO_LINE_NUMBER, "Checking Makefile.");
 
-       if (checkfile_Makefile("Makefile")) {
+       if (!checkfile_Makefile("Makefile")) {
                log_error("$opt_packagedir/Makefile", NO_LINE_NUMBER, "Cannot be read.");
                return false;
        }
@@ -1393,6 +1393,7 @@
        # ...nor settings of TEST_TARGET & BUILD_TARGET
        $j =~ s/\nTEST_TARGET[\t ]*.*=[\t ]*[^\n]*\n/\nTEST_TARGET=#replaced\n/;
        $j =~ s/\nBUILD_TARGET[\t ]*.*=[\t ]*[^\n]*\n/\nBUILD_TARGET=#replaced\n/;
+       $j =~ s/\n(?:PKGSRC_)?USE_TOOLS[ \t]*\+=[ \t]*[^\n]*\n/\nUSE_TOOLS=#replaced\n/;
        if ($opt_warn_directcmd) {
                foreach my $i (keys %cmdnames) {
                        if ($j =~ /[ \t\/@]$i[ \t\n;]/) {