From 3ef274f0f9f0dd5b56b4c9fd10e730b19b85ab27 Mon Sep 17 00:00:00 2001 From: he Date: Thu, 4 Nov 2004 21:17:40 +0000 Subject: Ignore use of words which when used in make shell commands should be used in variable-expansion version, e.g. `test' vs `${TEST}' in settings of TEST_TARGET and ALL_TARGET. Gets rid of warning about "test" in TEST_TARGET setting from lang/perl5/module.mk. Bump package version. Reviewed by wiz. --- pkgtools/pkglint/Makefile | 4 ++-- pkgtools/pkglint/files/pkglint.pl | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'pkgtools') diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 7d4a8ae913b..42eb275aeb2 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.209 2004/11/04 12:37:02 wiz Exp $ +# $NetBSD: Makefile,v 1.210 2004/11/04 21:17:40 he Exp $ # -DISTNAME= pkglint-3.95 +DISTNAME= pkglint-3.96 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index fdc1e7853e5..c87e952892e 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -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.122 2004/10/28 13:03:10 wiz Exp $ +# $NetBSD: pkglint.pl,v 1.123 2004/11/04 21:17:40 he Exp $ # # This version contains lots of changes necessary for NetBSD packages # done by Hubert Feyrer , @@ -1334,6 +1334,9 @@ EOF $j =~ s/\n#[\n]*/\n#/; # ...nor COMMENTs $j =~ s/\nCOMMENT[\t ]*=[\t ]*[^\n]*\n/\nCOMMENT=#replaced\n/; + # ...nor settings of TEST_TARGET & ALL_TARGET + $j =~ s/\nTEST_TARGET[\t ]*.*=[\t ]*[^\n]*\n/\nTEST_TARGET=#replaced\n/; + $j =~ s/\nALL_TARGET[\t ]*.*=[\t ]*[^\n]*\n/\nALL_TARGET=#replaced\n/; if ($opt_warn_directcmd) { foreach my $i (keys %cmdnames) { if ($j =~ /[ \t\/@]$i[ \t\n;]/) { -- cgit v1.2.3