pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files - Allow an opening bracket in v...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/31e6f0e06f77
branches:  trunk
changeset: 503095:31e6f0e06f77
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Nov 14 04:38:27 2005 +0000

description:
- Allow an opening bracket in variable names and tool names.

diffstat:

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

diffs (39 lines):

diff -r 3f46b9875efd -r 31e6f0e06f77 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Mon Nov 14 04:30:31 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Mon Nov 14 04:38:27 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.350 2005/11/14 04:30:31 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.351 2005/11/14 04:38:27 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -599,7 +599,7 @@
 use constant regex_shellcmd    => qr"^\t(.*)$";
 use constant regex_unresolved  => qr"\$\{";
 use constant regex_validchars  => qr"[\011\040-\176]";
-use constant regex_varassign   => qr"^([-A-Z_a-z0-9.\${}]+)\s*(=|\?=|\+=|:=|!=)\s*((?:\\#|[^#])*?)(?:\s*(#.*))?$";
+use constant regex_varassign   => qr"^([-A-Z_a-z0-9.\${}\[]+)\s*(=|\?=|\+=|:=|!=)\s*((?:\\#|[^#])*?)(?:\s*(#.*))?$";
 
 # Global variables
 
@@ -1462,7 +1462,7 @@
                                if ($varname eq "TOOLS_CREATE" && $value =~ qr"^([-\w.]+)$") {
                                        $tools->{$value} = true;
 
-                               } elsif ($varname =~ qr"^(?:TOOLS_PATH|_TOOLS_DEPMETHOD|_TOOLS_VARNAME)\.([-\w.]+)$") {
+                               } elsif ($varname =~ qr"^(?:TOOLS_PATH|_TOOLS_DEPMETHOD|_TOOLS_VARNAME)\.([-\w.]+|\[)$") {
                                        $tools->{$1} = true;
 
                                } elsif ($varname eq "_TOOLS.x11-clients") {
@@ -1622,7 +1622,7 @@
                }
 
        } elsif ($type eq "Tool") {
-               if ($value =~ qr"^([-\w]+)(?::(\w+))?$") {
+               if ($value =~ qr"^([-\w]+|\[)(?::(\w+))?$") {
                        my ($toolname, $tooldep) = ($1, $2);
                        if (!exists(get_tool_names()->{$toolname})) {
                                $line->log_error("Unknown tool \"${toolname}\".");



Home | Main Index | Thread Index | Old Index