[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files - Fixed variable definitions of...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e389a1bd4ce0
branches:  trunk
changeset: 514729:e389a1bd4ce0
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Jun 17 17:09:48 2006 +0000

description:
- Fixed variable definitions of BUILDLINK_RPATHDIRS.* and PKGPATH.
- The macro __sparc_v9__ is neither defined by gcc nor by SunPro. But
  __sparcv9 is.
- Added some more commands that may be hidden using the "@" character.
- Don't let pkglint get confused by additional magic in the use of
  MASTER_SITES. For example, devel/nspr uses ${MASTER_SITE:S/../../:=foo/}.

diffstat:

 pkgtools/pkglint/files/makevars.map |  5 +++--
 pkgtools/pkglint/files/pkglint.pl   |  8 +++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diffs (65 lines):

diff -r 9ce0b192b7de -r e389a1bd4ce0 pkgtools/pkglint/files/makevars.map
--- a/pkgtools/pkglint/files/makevars.map       Sat Jun 17 16:53:30 2006 +0000
+++ b/pkgtools/pkglint/files/makevars.map       Sat Jun 17 17:09:48 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.117 2006/06/17 16:16:26 rillig Exp $
+# $NetBSD: makevars.map,v 1.118 2006/06/17 17:09:48 rillig Exp $
 #
 
 # This file contains the guessed type of some variables, according to
@@ -165,7 +165,7 @@
 BUILDLINK_PASSTHRU_RPATHDIRS   List of Pathname [m:a,c:a,b:a,h:a]
 BUILDLINK_PKGSRCDIR.*  RelativePkgDir [b:dp]
 BUILDLINK_PREFIX.*     Pathname [builtin.mk:s]
-BUILDLINK_RPATHDIRS    List of Pathname []
+BUILDLINK_RPATHDIRS.*  List of Pathname [b:a]
 BUILDLINK_TARGETS      List of Identifier []
 BUILDLINK_TRANSFORM.*  SedCommands [m:a,builtin.mk:a,h:a,b:a]
 BUILDLINK_TRANSFORM    List of WrapperTransform [*:a]
@@ -442,6 +442,7 @@
 PKGDIR                 RelativePkgDir
 PKGNAME                        PkgName [m:s,c:s,Makefile.*:ds,*:ds]
 PKGNAME_NOREV          PkgName []
+PKGPATH                        Pathname [$system]
 PKGREPOSITORY          Unchecked []
 PKGREVISION            PkgRevision [m:s]
 PKGTOOLS_ENV           List of ShellWord
diff -r 9ce0b192b7de -r e389a1bd4ce0 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Sat Jun 17 16:53:30 2006 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Sat Jun 17 17:09:48 2006 +0000
@@ -1,5 +1,5 @@
 #! @PERL@
-# $NetBSD: pkglint.pl,v 1.625 2006/06/17 16:17:12 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.626 2006/06/17 17:09:48 rillig Exp $
 #
 
 # pkglint - static analyzer and checker for pkgsrc packages
@@ -3003,6 +3003,7 @@
        ));
        use constant bad_macros  => {
                "__sparc__" => "__sparc",
+               "__sparc_v9__" => "__sparcv9",
                "__sun__" => "__sun",
                "__svr4__" => "__SVR4",
        };
@@ -3441,9 +3442,10 @@
        $rest = $text;
 
        use constant hidden_shell_commands => array_to_hash(qw(
+               ${DELAYED_ERROR_MSG} ${DELAYED_WARNING_MSG}
                ${DO_NADA}
                ${ECHO} ${ECHO_MSG} ${ECHO_N} ${ERROR_CAT} ${ERROR_MSG}
-               ${PHASE_MSG}
+               ${PHASE_MSG} ${PRINTF}
                ${SHCOMMENT} ${STEP_MSG}
                ${WARNING_CAT} ${WARNING_MSG}
        ));
@@ -4202,7 +4204,7 @@
                if ($value eq "" && defined($comment) && $comment =~ qr"^#") {
                        # Ok
 
-               } elsif ($value =~ qr"\$\{(MASTER_SITE_.*):=(.*)\}$") {
+               } elsif ($value =~ qr"\$\{(MASTER_SITE_[^:]*).*:=(.*)\}$") {
                        my ($name, $subdir) = ($1, $2);
 
                        if (!exists(get_dist_sites_names()->{$name})) {