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 the lines in makevars.m...
details: https://anonhg.NetBSD.org/pkgsrc/rev/1c4995041d62
branches: trunk
changeset: 512537:1c4995041d62
user: rillig <rillig%pkgsrc.org@localhost>
date: Thu May 11 09:16:53 2006 +0000
description:
- Allow the lines in makevars.map to be folded like in Makefiles.
- Removed some legacy definitions for ACL subjects.
diffstat:
pkgtools/pkglint/files/makevars.map | 18 +++++++++++++-----
pkgtools/pkglint/files/pkglint.pl | 6 ++----
2 files changed, 15 insertions(+), 9 deletions(-)
diffs (83 lines):
diff -r 757abe8ad607 -r 1c4995041d62 pkgtools/pkglint/files/makevars.map
--- a/pkgtools/pkglint/files/makevars.map Thu May 11 09:05:33 2006 +0000
+++ b/pkgtools/pkglint/files/makevars.map Thu May 11 09:16:53 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.88 2006/05/10 17:14:08 rillig Exp $
+# $NetBSD: makevars.map,v 1.89 2006/05/11 09:16:53 rillig Exp $
#
# This file contains the guessed type of some variables, according to
@@ -227,7 +227,7 @@
EXTRACT_OPTS_TAR List of ShellWord [m:as,c:as]
EXTRACT_OPTS_ZIP List of ShellWord [m:as,c:as]
EXTRACT_OPTS_ZOO List of ShellWord [m:as,c:as]
-EXTRACT_SUFX DistSuffix [c:s,m:s]
+EXTRACT_SUFX DistSuffix [c:s,m:s,Makefile.*:s]
FAMBASE Unchecked []
FAM_ACCEPTED List of { fam gamin }
FAM_DEFAULT Unchecked []
@@ -253,7 +253,7 @@
# ^^ relative to PREFIX
INFO_FILES List of Pathmask [m:s]
INSTALL ShellCommand []
-INSTALLATION_DIRS List of Pathname [m:as,c:a]
+INSTALLATION_DIRS List of Pathname [m:as,c:as]
INSTALL_DATA ShellCommand []
INSTALL_DATA_DIR ShellCommand []
INSTALL_DIRS List of WrksrcSubdirectory [m:as,c:as]
@@ -324,7 +324,7 @@
MASTER_SITE_TEX_CTAN List of URL
MASTER_SITE_XCONTRIB List of URL
MASTER_SITE_XEMACS List of URL
-MESSAGE_SRC List of Pathname [m:as,o:ads]
+MESSAGE_SRC List of Pathname [m:as,c:a,o:ads]
MESSAGE_SUBST List of ShellWord [c:a,m:a,o:a]
MYSQL_VERSIONS_ACCEPTED List of { 40 41 50 } [m:s]
MYSQL_VERSION_DEFAULT Unchecked []
@@ -462,7 +462,15 @@
UNWRAP_FILES List of Pathmask [m:a,c:a]
USE_BUILTIN YesNoFromCommand [builtin.mk:s]
USE_CROSSBASE Yes [m:s]
-USE_DIRS List of { xdg-1.1 gnome2-1.5 gnome1-1.5 xdg-1.2 gnome1-1.0 texmf-1.0 texmf-1.1 xdg-1.3 XFree86-1.0 xorg-1.0 texmf-dirs-1.0 gnome2-1.6 gnome2-1.3 theme-1.0 XFree86-1.1 }
[m:a,c:a]
+USE_DIRS List of { \
+ XFree86-1.0 XFree86-1.1 \
+ gnome1-1.0 gnome1-1.5 \
+ gnome2-1.3 gnome2-1.5 gnome2-1.6 \
+ texmf-1.0 texmf-1.1 texmf-1.2 \
+ theme-1.0 theme-1.1 \
+ xdg-1.1 xdg-1.2 xdg-1.3 \
+ xorg-1.0 \
+ } [m:a,c:a]
USE_GNU_CONFIGURE_HOST YesNo
USE_GNU_ICONV Yes [m:s,c:s]
USE_GNU_READLINE Yes [m:s]
diff -r 757abe8ad607 -r 1c4995041d62 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Thu May 11 09:05:33 2006 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Thu May 11 09:16:53 2006 +0000
@@ -1,5 +1,5 @@
#! @PERL@
-# $NetBSD: pkglint.pl,v 1.577 2006/05/10 17:14:08 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.578 2006/05/11 09:16:53 rillig Exp $
#
# pkglint - static analyzer and checker for pkgsrc packages
@@ -1610,7 +1610,7 @@
$fname = conf_datadir."/makevars.map";
$vartypes = {};
- if ((my $lines = load_file($fname))) {
+ if ((my $lines = load_lines($fname, true))) {
foreach my $line (@{$lines}) {
if ($line->text =~ qr"^(?:#.*|\s*)$") {
# ignore empty and comment lines
@@ -1635,10 +1635,8 @@
"b" => qr"(?:^|/)buildlink3\.mk$",
"c" => qr"(?:^|/)Makefile\.common$",
"h" => qr"(?:^|/)hacks\.mk$",
- "k" => qr"\.mk$",
"m" => qr"(?:^|/)Makefile$",
"o" => qr"(?:^|/)options\.mk$",
- "_" => qr".*",
};
# Transform $subject to a regular expression.
Home |
Main Index |
Thread Index |
Old Index