From c85d0eb7442bbe55ce5baa483c5001fba62627ae Mon Sep 17 00:00:00 2001
From: tv <tv@pkgsrc.org>
Date: Mon, 11 Apr 2005 19:01:31 +0000
Subject: Remove USE_BUILDLINK3 support, and deprecate the name instead.  4.12.

---
 pkgtools/pkglint/Makefile         |  4 ++--
 pkgtools/pkglint/files/pkglint.pl | 17 ++++++-----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index e3a75f6a999..350c4e7bfe7 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.227 2005/04/07 18:31:09 riz Exp $
+# $NetBSD: Makefile,v 1.228 2005/04/11 19:01:31 tv Exp $
 #
 
-DISTNAME=	pkglint-4.11
+DISTNAME=	pkglint-4.12
 CATEGORIES=	pkgtools devel
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index 503ec10c652..5e04319fb30 100644
--- a/pkgtools/pkglint/files/pkglint.pl
+++ b/pkgtools/pkglint/files/pkglint.pl
@@ -11,7 +11,7 @@
 # Freely redistributable.  Absolutely no warranty.
 #
 # From Id: portlint.pl,v 1.64 1998/02/28 02:34:05 itojun Exp
-# $NetBSD: pkglint.pl,v 1.137 2005/04/07 18:31:09 riz Exp $
+# $NetBSD: pkglint.pl,v 1.138 2005/04/11 19:01:31 tv Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by Hubert Feyrer <hubertf@netbsd.org>,
@@ -302,7 +302,6 @@ my $seen_PLIST_SRC	= false;
 my $seen_NO_PKG_REGISTER= false;
 my $seen_NO_CHECKSUM	= false;
 my $seen_USE_PKGLOCALEDIR = false;
-my $seen_USE_BUILDLINK3 = false;
 my %seen_Makefile_include = ();
 my %predefined;
 my $pkgname		= "";
@@ -892,7 +891,7 @@ sub checkfile_PLIST($) {
 				"deprecated.  Use \${PKGLOCALEDIR}/locale and set USE_PKGLOCALEDIR instead.");
 		}
 
-		if ($line->text =~ /\${PKGLOCALEDIR}/ && $seen_USE_BUILDLINK3 && !$seen_USE_PKGLOCALEDIR) {
+		if ($line->text =~ /\${PKGLOCALEDIR}/ && !$seen_USE_PKGLOCALEDIR) {
 			log_warning($line->file, $line->lineno, "PLIST contains \${PKGLOCALEDIR}, ".
 				"but USE_PKGLOCALEDIR was not found.");
 		}
@@ -1270,10 +1269,10 @@ sub checkfile_Makefile($) {
 				"FOR_CDROM.");
 		}
 	}
-	log_info(NO_FILE, NO_LINE_NUMBER, "checking USE_BUILDLINK2.");
-	if ($whole =~ /\nUSE_BUILDLINK2/) {
-		log_error(NO_FILE, NO_LINE_NUMBER, "USE_BUILDLINK2 is deprecated, ".
-			"use USE_BUILDLINK3 instead.");
+	log_info(NO_FILE, NO_LINE_NUMBER, "checking USE_BUILDLINK[23].");
+	if ($whole =~ /\n(USE_BUILDLINK[23])/) {
+		log_error(NO_FILE, NO_LINE_NUMBER, "$1 is deprecated, ".
+			"and no longer used.");
 	}
 	if ($whole =~ /\nALL_TARGET/) {
 		log_error(NO_FILE, NO_LINE_NUMBER, "ALL_TARGET is deprecated, ".
@@ -1304,10 +1303,6 @@ sub checkfile_Makefile($) {
 		log_error(NO_FILE, NO_LINE_NUMBER, "USE_PKGLIBTOOL is deprecated, ".
 			"use USE_LIBTOOL instead.");
 	}
-	log_info(NO_FILE, NO_LINE_NUMBER, "checking for USE_BUILDLINK3.");
-	if ($whole =~ /\nUSE_BUILDLINK3/) {
-		$seen_USE_BUILDLINK3 = true;
-	}
 	log_info(NO_FILE, NO_LINE_NUMBER, "checking for USE_PKGLOCALEDIR.");
 	if ($whole =~ /\nUSE_PKGLOCALEDIR/) {
 		$seen_USE_PKGLOCALEDIR = true;
-- 
cgit v1.2.3