pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files - A comma is allowed in enumera...
details: https://anonhg.NetBSD.org/pkgsrc/rev/6e39c7d1caa7
branches: trunk
changeset: 515862:6e39c7d1caa7
user: rillig <rillig%pkgsrc.org@localhost>
date: Mon Jul 10 04:17:56 2006 +0000
description:
- 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:
pkgtools/pkglint/files/pkglint.pl | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diffs (37 lines):
diff -r 2ea4e5825fa5 -r 6e39c7d1caa7 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Mon Jul 10 04:16:02 2006 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Mon Jul 10 04:17:56 2006 +0000
@@ -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 @@
([\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 @@
${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 @@
[ "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.
Home |
Main Index |
Thread Index |
Old Index