pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files - Make variables are allowed in...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3d59b23c6d66
branches:  trunk
changeset: 515879:3d59b23c6d66
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Jul 10 11:19:23 2006 +0000

description:
- Make variables are allowed in BUILDLINK_PACKAGES.

diffstat:

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

diffs (21 lines):

diff -r a811397fceb5 -r 3d59b23c6d66 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Mon Jul 10 11:19:21 2006 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Mon Jul 10 11:19:23 2006 +0000
@@ -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 @@
                }
 
        } 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}$") ||



Home | Main Index | Thread Index | Old Index