summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2006-06-17 17:09:48 +0000
committerrillig <rillig@pkgsrc.org>2006-06-17 17:09:48 +0000
commit551317ca449fa94459990fd132440ba81d326d9c (patch)
tree771071cfc035f1bac6f80b303c068a94864b8ee4 /pkgtools
parent59aa9a04053ee42b56f9d45422ce8ab3ccff3f1e (diff)
downloadpkgsrc-551317ca449fa94459990fd132440ba81d326d9c.tar.gz
- 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 (limited to 'pkgtools')
-rw-r--r--pkgtools/pkglint/files/makevars.map5
-rw-r--r--pkgtools/pkglint/files/pkglint.pl8
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map
index c306753b045..0ffb3c8abfe 100644
--- a/pkgtools/pkglint/files/makevars.map
+++ b/pkgtools/pkglint/files/makevars.map
@@ -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_DIRS List of Pathname [m:a,c:a,b:a,h:a]
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 @@ PKGCONFIG_OVERRIDE List of Pathmask [m:as,c:a]
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 --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index e879fcdd454..8ddb291aa28 100644
--- a/pkgtools/pkglint/files/pkglint.pl
+++ b/pkgtools/pkglint/files/pkglint.pl
@@ -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 @@ sub checkline_cpp_macro_names($$) {
));
use constant bad_macros => {
"__sparc__" => "__sparc",
+ "__sparc_v9__" => "__sparcv9",
"__sun__" => "__sun",
"__svr4__" => "__SVR4",
};
@@ -3441,9 +3442,10 @@ sub checkline_mk_shelltext($$) {
$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 @@ sub checkline_mk_vartype_basic($$$$$$$) {
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})) {