From 329d10ab297e2879517f6891a2c12cb71e1ad54f Mon Sep 17 00:00:00 2001
From: jmmv <jmmv@pkgsrc.org>
Date: Thu, 15 Apr 2004 09:41:22 +0000
Subject: Update to 3.71: print a fatal error if there are any direct
 dependencies to the -dirs packages.  Suggest usage of USE_DIRS instead.

---
 pkgtools/pkglint/Makefile         | 4 ++--
 pkgtools/pkglint/files/pkglint.pl | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'pkgtools')

diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index 1c5027b6a82..9846fa1c572 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.182 2004/04/12 08:52:14 jmmv Exp $
+# $NetBSD: Makefile,v 1.183 2004/04/15 09:41:22 jmmv Exp $
 #
 
-DISTNAME=	pkglint-3.70
+DISTNAME=	pkglint-3.71
 CATEGORIES=	pkgtools devel
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index ed36a04dbd5..e4dbf5f234d 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.100 2004/04/12 08:52:14 jmmv Exp $
+# $NetBSD: pkglint.pl,v 1.101 2004/04/15 09:41:22 jmmv Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by Hubert Feyrer <hubertf@netbsd.org>,
@@ -1329,6 +1329,13 @@ EOF
 						" USE_GMAKE.");
 				}
 
+				# check direct dependencies on -dirs packages
+				if ($l =~ /^([-a-zA-Z0-9]+)-dirs[-><=]+(.*)/) {
+					&perror("WARN: dependency to $1-dirs ".
+						"listed in $j. Consider using".
+						" USE_DIRS+=$1-$2.");
+				}
+
 				# check pkg dir existence
 				$k = (split(':', $k))[1];
 				$k =~ s/\${PKGSRCDIR}/$ENV{'PKGSRCDIR'}/;
-- 
cgit v1.2.3