diff options
| author | rillig <rillig@pkgsrc.org> | 2006-07-10 11:19:23 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-07-10 11:19:23 +0000 |
| commit | 4af291bc02c4e9160f777bbab8abd1a71bd05011 (patch) | |
| tree | 5eefa706455925bf9122624511f7c7c609a2a03b /pkgtools | |
| parent | a118bbbc0b2f4e065907712a2cd28691fc2eecc4 (diff) | |
| download | pkgsrc-4af291bc02c4e9160f777bbab8abd1a71bd05011.tar.gz | |
- Make variables are allowed in BUILDLINK_PACKAGES.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index f1985739c7a..9c4f260e5ad 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: pkglint.pl,v 1.642 2006/07/10 04:17:56 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.643 2006/07/10 11:19:23 rillig Exp $ # # pkglint - static analyzer and checker for pkgsrc packages @@ -4310,8 +4310,8 @@ sub checkline_mk_vartype_basic($$$$$$$$) { } } elsif ($type eq "BuildlinkPackages") { - my $re_del = qr"\$\{BUILDLINK_PACKAGES:N[+\-.0-9A-Z_a-z]+\}"; - my $re_add = qr"[+\-.0-9A-Z_a-z]+"; + my $re_del = qr"\$\{BUILDLINK_PACKAGES:N(?:[+\-.0-9A-Z_a-z]|\$\{[^\}]+\})+\}"; + my $re_add = qr"(?:[+\-.0-9A-Z_a-z]|\$\{[^\}]+\})+"; if (($op eq ":=" && $value =~ qr"^${re_del}$") || ($op eq ":=" && $value =~ qr"^${re_del}\s+${re_add}$") || |