diff options
| author | rillig <rillig@pkgsrc.org> | 2006-07-10 04:17:56 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-07-10 04:17:56 +0000 |
| commit | 5f885d652971a63a0b8c48059b1902d8b361f2c6 (patch) | |
| tree | 16b2b970d2ac42061f8b0973678246522ca2ffa7 /pkgtools | |
| parent | 449f3d261015d945316dd415d70f79ebb34bafa9 (diff) | |
| download | pkgsrc-5f885d652971a63a0b8c48059b1902d8b361f2c6.tar.gz | |
- A comma is allowed in enumeration types.
- Shell commands in Makefiles may have leading white-space before the
[@-]*.
- Replaced the obsolete MASTER_SITES_SUBDIR with DIST_SUBDIR in the
variable order check. The variables aren't the same, but the position
is fine.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 55e5c6eafed..f1985739c7a 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: pkglint.pl,v 1.641 2006/07/10 03:25:12 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.642 2006/07/10 04:17:56 rillig Exp $ # # pkglint - static analyzer and checker for pkgsrc packages @@ -2079,7 +2079,7 @@ sub get_vartypes_map() { ([\w\d_.]+?) # variable name (\*|\.\*|) \s+ # parameterized? (?:(InternalList|List) \s+ of \s+)? # kind of list - (?:([\w\d_]+) | \{\s*([\w\d_.+\-\s]+?)\s*\}) # basic type + (?:([\w\d_]+) | \{\s*([\w\d_+,\-.\s]+?)\s*\}) # basic type (?:\s+ \[ ([^\]]*) \])? # optional ACL (?:\s*\#.*)? # optional comment $"x; @@ -3943,7 +3943,7 @@ sub checkline_mk_shelltext($$) { ${WARNING_CAT} ${WARNING_MSG} )); - if ($rest =~ s/^([-@]*)(?:\$\{_PKG_SILENT\}\$\{_PKG_DEBUG\})?//) { + if ($rest =~ s/^\s*([-@]*)(?:\$\{_PKG_SILENT\}\$\{_PKG_DEBUG\})?//) { my ($hidden) = ($1); if ($hidden !~ qr"\@") { @@ -5181,7 +5181,7 @@ sub checklines_package_Makefile_varorder($) { [ "CATEGORIES", once ], [ "MASTER_SITES", once ], [ "DYNAMIC_MASTER_SITES", optional ], - [ "MASTER_SITE_SUBDIR", optional ], + [ "DIST_SUBDIR", optional ], [ "EXTRACT_SUFX", optional ], [ "DISTFILES", many ], # The following are questionable. |