summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorrillig <rillig>2005-05-24 12:38:41 +0000
committerrillig <rillig>2005-05-24 12:38:41 +0000
commit438ce3e8e08e8b312a729e0523b13273b7ef3e3e (patch)
tree67603f5a2a9cccdc25b33e021a096b548b429dad /pkgtools
parent3cad03fab4a215db80944263a31d825aeffcfb1e (diff)
downloadpkgsrc-438ce3e8e08e8b312a729e0523b13273b7ef3e3e.tar.gz
Allow multiple USE_TOOLS+= lines.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkglint/files/pkglint.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index 4bd0629caac..11c1d40a241 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.172 2005/05/23 09:31:20 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.173 2005/05/24 12:38:41 rillig Exp $
#
# This version contains lots of changes necessary for NetBSD packages
# done by:
@@ -1391,7 +1391,7 @@ sub checkfile_Makefile($) {
# ...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/;
+ $j =~ s/\n(?:PKGSRC_)?USE_TOOLS[ \t]*\+?=[ \t]*[^\n]*\n/\nUSE_TOOLS=#replaced\n/g;
if ($opt_warn_directcmd) {
foreach my $i (keys %cmdnames) {
if ($j =~ /[ \t\/@]$i[ \t\n;]/) {