Subject: patch for pkglint for ABI_DEPENDS
To: None <rillig@NetBSD.org, tech-pkg@netbsd.org>
From: Jeremy C. Reed <reed@reedmedia.net>
List: tech-pkg
Date: 04/06/2006 17:37:21
I didn't commit the following yet.

Is there a way to mark BUILDLINK_RECOMMENDED.${foo} as deprecated?

Also BUILDLINK_DEPENDS.${foo} is deprecated but not BUILDLINK_DEPENDS.


Index: pkgtools/pkglint/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkglint/Makefile,v
retrieving revision 1.335
diff -u -r1.335 Makefile
--- pkgtools/pkglint/Makefile	14 Mar 2006 14:24:14 -0000	1.335
+++ pkgtools/pkglint/Makefile	7 Apr 2006 00:30:52 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.335 2006/03/14 14:24:14 rillig Exp $
 #
 
-DISTNAME=	pkglint-4.59
+DISTNAME=	pkglint-4.60
 CATEGORIES=	pkgtools
 MASTER_SITES=	# empty
 DISTFILES=	# empty
Index: pkgtools/pkglint/files/deprecated.map
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkglint/files/deprecated.map,v
retrieving revision 1.31
diff -u -r1.31 deprecated.map
--- pkgtools/pkglint/files/deprecated.map	14 Mar 2006 14:18:55 -0000	1.31
+++ pkgtools/pkglint/files/deprecated.map	7 Apr 2006 00:30:52 -0000
@@ -73,3 +73,6 @@
 # March 2006
 INSTALL_EXTRA_TMPL	Use INSTALL_TEMPLATE instead.
 DEINSTALL_EXTRA_TMPL	Use DEINSTALL_TEMPLATE instead.
+
+# April 2006
+RECOMMENDED		Use ABI_DEPENDS instead.
Index: pkgtools/pkglint/files/makevars.map
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkglint/files/makevars.map,v
retrieving revision 1.79
diff -u -r1.79 makevars.map
--- pkgtools/pkglint/files/makevars.map	14 Mar 2006 14:20:13 -0000	1.79
+++ pkgtools/pkglint/files/makevars.map	7 Apr 2006 00:30:52 -0000
@@ -23,7 +23,7 @@
 MKCRYPTO		YesNo
 USETBL			Yes
 ABI			{ 32 64 }
-IGNORE_RECOMMENDED	YesNo
+USE_ABI_DEPENDS		YesNo
 PKG_REGISTER_SHELLS	YesNo
 USE_XPKGWEDGE		YesNo
 LIBTOOLIZE_PLIST	YesNo
@@ -71,7 +71,7 @@
 BUILDLINK_PASSTHRU_RPATHDIRS	List+ of Pathname
 BUILDLINK_PKGSRCDIR	RelativePkgDir
 BUILDLINK_PREFIX	Pathname
-BUILDLINK_RECOMMENDED	InternalList+ of Dependency
+BUILDLINK_ABI_DEPENDS	InternalList+ of Dependency
 BUILDLINK_RPATHDIRS	List of Pathname
 BUILDLINK_TARGETS	List+ of Identifier
 BUILDLINK_TRANSFORM	List+
Index: pkgtools/pkglint/files/pkglint.pl
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkglint/files/pkglint.pl,v
retrieving revision 1.549
diff -u -r1.549 pkglint.pl
--- pkgtools/pkglint/files/pkglint.pl	12 Mar 2006 16:55:51 -0000	1.549
+++ pkgtools/pkglint/files/pkglint.pl	7 Apr 2006 00:30:53 -0000
@@ -1452,7 +1452,7 @@
 		.*_SED
 		.*_SKIP
 		BUILDLINK_LDADD
-		BUILDLINK_RECOMMENDED
+		BUILDLINK_ABI_DEPENDS
 		COMMENT
 		EXTRACT_ONLY
 		GENERATE_PLIST
@@ -3499,7 +3499,7 @@
 	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 \"?=\".");