summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pkgtools/pkglint/files/deprecated.map5
-rw-r--r--pkgtools/pkglint/files/makevars.map4
-rw-r--r--pkgtools/pkglint/files/pkglint.pl5
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgtools/pkglint/files/deprecated.map b/pkgtools/pkglint/files/deprecated.map
index 4c43c84c3d2..b6a60c058a4 100644
--- a/pkgtools/pkglint/files/deprecated.map
+++ b/pkgtools/pkglint/files/deprecated.map
@@ -1,4 +1,4 @@
-# $NetBSD: deprecated.map,v 1.31 2006/03/14 14:18:55 rillig Exp $
+# $NetBSD: deprecated.map,v 1.32 2006/04/12 09:23:36 rillig Exp $
#
# This file contains names of Makefile variables and a short explanation
@@ -73,3 +73,6 @@ DECOMPRESS_CMD Use EXTRACT_CMD instead.
# March 2006
INSTALL_EXTRA_TMPL Use INSTALL_TEMPLATE instead.
DEINSTALL_EXTRA_TMPL Use DEINSTALL_TEMPLATE instead.
+
+# April 2006
+RECOMMENDED Use ABI_DEPENDS instead.
diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map
index a41e272c292..f2d7f97da0d 100644
--- a/pkgtools/pkglint/files/makevars.map
+++ b/pkgtools/pkglint/files/makevars.map
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.80 2006/04/12 08:49:57 rillig Exp $
+# $NetBSD: makevars.map,v 1.81 2006/04/12 09:23:36 rillig Exp $
#
# This file contains the guessed type of some variables, according to
@@ -23,7 +23,6 @@ MANZ Yes
MKCRYPTO YesNo
USETBL Yes
ABI { 32 64 }
-IGNORE_RECOMMENDED YesNo
PKG_REGISTER_SHELLS YesNo
USE_XPKGWEDGE YesNo
LIBTOOLIZE_PLIST YesNo
@@ -73,7 +72,6 @@ BUILDLINK_PASSTHRU_DIRS List+ of Pathname
BUILDLINK_PASSTHRU_RPATHDIRS List+ of Pathname
BUILDLINK_PKGSRCDIR RelativePkgDir
BUILDLINK_PREFIX Pathname
-BUILDLINK_RECOMMENDED InternalList+ of Dependency
BUILDLINK_RPATHDIRS List of Pathname
BUILDLINK_TARGETS List+ of Identifier
BUILDLINK_TRANSFORM List+
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index fe69d8cfe4e..ddc77e7b422 100644
--- a/pkgtools/pkglint/files/pkglint.pl
+++ b/pkgtools/pkglint/files/pkglint.pl
@@ -1,5 +1,5 @@
#! @PERL@
-# $NetBSD: pkglint.pl,v 1.552 2006/04/12 08:49:57 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.553 2006/04/12 09:23:36 rillig Exp $
#
# pkglint - static analyzer and checker for pkgsrc packages
@@ -1452,7 +1452,6 @@ sub get_regex_plurals() {
.*_SED
.*_SKIP
BUILDLINK_LDADD
- BUILDLINK_RECOMMENDED
COMMENT
EXTRACT_ONLY
GENERATE_PLIST
@@ -3510,7 +3509,7 @@ sub checkline_mk_varassign($$$$$) {
if ($op eq "?=" && defined($seen_bsd_prefs_mk) && !$seen_bsd_prefs_mk) {
if ($varbase eq "BUILDLINK_PKGSRCDIR"
|| $varbase eq "BUILDLINK_DEPMETHOD"
- || $varbase eq "BUILDLINK_RECOMMENDED") {
+ || $varbase eq "BUILDLINK_ABI_DEPENDS") {
# FIXME: What about these ones? They occur quite often.
} else {
$opt_warn_extra and $line->log_warning("Please include \"../../mk/bsd.prefs.mk\" before using \"?=\".");