Remove the old deprecated DEPENDS definition from bsd.pkg.mk.

Implement a new DEPENDS definition, which looks for an installed
package, building it if not present, and use it in preference to
LIB_DEPENDS.  This should make the package collection more useful on
NetBSD ELF ports.

15 files changed, 38 insertions, 43 deletions

diff --git a/x11/asclock/Makefile b/x11/asclock/Makefile
index 4e5feb0faf6..cca6cf8208e 100644
--- a/x11/asclock/Makefile
+++ b/x11/asclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:52 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:48 agc Exp $
 #
 
 DISTNAME=		asclock
@@ -10,7 +10,7 @@ EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		hubertf@netbsd.org
 
-LIB_DEPENDS=		Xpm.4:${PORTSDIR}/graphics/xpm
+DEPENDS+=		xpm-3.4j:../../graphics/xpm
 
 # Choose language from:
 # 1) english [DEFAULT]
diff --git a/x11/ctwm/Makefile b/x11/ctwm/Makefile
index 4008f6afdce..a8378a6c09d 100644
--- a/x11/ctwm/Makefile
+++ b/x11/ctwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:52 agc Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:48 agc Exp $
 #
 
 DISTNAME=	ctwm-3.5
@@ -7,7 +7,7 @@ MASTER_SITES=	ftp://slhp1.epfl.ch/pub/
 
 MAINTAINER=	tron@netbsd.org
 
-LIB_DEPENDS=	Xpm.4.:${PORTSDIR}/graphics/xpm
+DEPENDS+=	xpm-3.4j:../../graphics/xpm
 
 USE_IMAKE=	yes
 
diff --git a/x11/filerunner/Makefile b/x11/filerunner/Makefile
index 73c732fc4ba..8809f2cfaaf 100644
--- a/x11/filerunner/Makefile
+++ b/x11/filerunner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:53 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:48 agc Exp $
 # $FreeBSD Id: Makefile,v 1.12 1998/02/24 21:43:11 jseger Exp
 #
 
@@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR=	X11/desktop
 
 MAINTAINER=	packages@netbsd.org
 
-LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11/tk80
+DEPENDS+=	tk-8.0p2:../../x11/tk80
 
 USE_X11=	yes
 
diff --git a/x11/fvwm1/Makefile b/x11/fvwm1/Makefile
index 68a23fd1a2f..43c095f93ad 100644
--- a/x11/fvwm1/Makefile
+++ b/x11/fvwm1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:53 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:49 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/
 
 MAINTAINER=	cjs@netbsd.org
 
-LIB_DEPENDS=	Xpm.4.:${PORTSDIR}/graphics/xpm
+DEPENDS+=	xpm-3.4j:../../graphics/xpm
 RUN_DEPENDS=	xpmroot:${PORTSDIR}/x11/xpmroot
 
 USE_IMAKE=	yes
diff --git a/x11/fvwm2/Makefile b/x11/fvwm2/Makefile
index deb456eea25..e5705950461 100644
--- a/x11/fvwm2/Makefile
+++ b/x11/fvwm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/04/20 11:56:34 frueauf Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:49 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -13,7 +13,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} fvwm-users-jp-kits.97Oct04.tar.gz
 
 MAINTAINER=	packages@netbsd.org
 
-LIB_DEPENDS=	Xpm.4.:${PORTSDIR}/graphics/xpm
+DEPENDS+=	xpm-3.4j:../../graphics/xpm
 RUN_DEPENDS=	xpmroot:${PORTSDIR}/x11/xpmroot
 
 USE_IMAKE=	yes
diff --git a/x11/fvwm95/Makefile b/x11/fvwm95/Makefile
index b25059f3804..14da66fa3b2 100644
--- a/x11/fvwm95/Makefile
+++ b/x11/fvwm95/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/04/20 11:56:35 frueauf Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:49 agc Exp $
 # FreeBSD: Makefile,v 1.17 1997/12/24 01:21:18 alex Exp
 #
 
@@ -10,7 +10,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	packages@netbsd.org
 
-LIB_DEPENDS=	Xpm.4.:${PORTSDIR}/graphics/xpm
+DEPENDS+=	xpm-3.4j:../../graphics/xpm
 BUILD_DEPENDS=	${LOCALBASE}/lib/librplay.a:${PORTSDIR}/audio/rplay
 RUN_DEPENDS=	xpmroot:${PORTSDIR}/x11/xpmroot
 
diff --git a/x11/kde/Makefile b/x11/kde/Makefile
index d43afc82781..1eff7b073b0 100644
--- a/x11/kde/Makefile
+++ b/x11/kde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/04/20 11:56:35 frueauf Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/22 14:22:49 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/11/27 00:47:46 se Exp
 #
 
@@ -9,7 +9,7 @@ DISTFILES=	# empty
 
 MAINTAINER=	packages@netbsd.org
 
-LIB_DEPENDS=	kdecore.0.90:${PORTSDIR}/x11/kdelibs
+DEPENDS+=	kdelibs-3.1b:../../x11/kdelibs
 RUN_DEPENDS=	kwm:${PORTSDIR}/x11/kdebase \
 		kcalc:${PORTSDIR}/misc/kdeutils \
 		kmahjongg:${PORTSDIR}/games/kdegames \
diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile
index d57a1f29bb4..a6f96e99ff3 100644
--- a/x11/kdebase/Makefile
+++ b/x11/kdebase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/04/20 11:56:35 frueauf Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:49 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp
 #
 
@@ -13,15 +13,10 @@ EXTRACT_SUFX=	.src.tar.gz
 MAINTAINER=	packages@netbsd.org
 
 BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
-LIB_DEPENDS=	qt.1.3[0-9]:${PORTSDIR}/x11/qt \
-		gif.[23].:${PORTSDIR}/graphics/giflib \
-		jpeg.[67].:${PORTSDIR}/graphics/jpeg \
-		kdecore.0.9[0-9]:${PORTSDIR}/x11/kdelibs \
-		kdeui.0.9[0-9]:${PORTSDIR}/x11/kdelibs \
-		jscript.0.9[0-9]:${PORTSDIR}/x11/kdelibs \
-		khtmlw.0.9[0-9]:${PORTSDIR}/x11/kdelibs \
-		kfm.0.9[0-9]:${PORTSDIR}/x11/kdelibs \
-		mediatool.0.9[0-9]:${PORTSDIR}/x11/kdelibs
+DEPENDS+=	jpeg-6a:../../graphics/jpeg
+DEPENDS+=	qt-1.33:../../x11/qt
+DEPENDS+=	kdelibs-3.1b:../../x11/kdelibs
+DEPENDS+=	giflib-3.0:../../graphics/giflib
 
 USE_X11=	yes
 HAS_CONFIGURE=	yes
diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile
index 4dcc83d1bbc..aa59933c27c 100644
--- a/x11/kdelibs/Makefile
+++ b/x11/kdelibs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/04/20 11:56:35 frueauf Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:49 agc Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp
 #
 
@@ -13,9 +13,9 @@ EXTRACT_SUFX=	.src.tar.gz
 MAINTAINER=	packages@netbsd.org
 
 BUILD_DEPENDS=	moc:${PORTSDIR}/x11/qt
-LIB_DEPENDS=	qt.1.3[0-9]:${PORTSDIR}/x11/qt \
-		gif.[23].:${PORTSDIR}/graphics/giflib \
-		jpeg.[67].:${PORTSDIR}/graphics/jpeg
+DEPENDS+=	jpeg-6a:../../graphics/jpeg
+DEPENDS+=	qt-1.33:../../x11/qt
+DEPENDS+=	giflib-3.0:../../graphics/giflib
 
 USE_X11=	yes
 HAS_CONFIGURE=	yes
diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile
index a3b7eaff232..1191eb05f68 100644
--- a/x11/p5-Tk/Makefile
+++ b/x11/p5-Tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/04/20 11:56:35 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/22 14:22:49 agc Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/09/14 04:00:00 jfitz Exp
 #
 
@@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR=	Tk
 MAINTAINER=		packages@netbsd.org
 
 BUILD_DEPENDS= 		${PREFIX}/lib/perl5/site_perl/HTML/Parse.pm:${PORTSDIR}/www/p5-libwww
-LIB_DEPENDS=		tk80.1.:${PORTSDIR}/x11/tk80
+DEPENDS+=		tk-8.0p2:../../x11/tk80
 
 USE_PERL5=		YES
 
diff --git a/x11/tk80/Makefile b/x11/tk80/Makefile
index f8697cbe9ba..72179a54312 100644
--- a/x11/tk80/Makefile
+++ b/x11/tk80/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1998/04/20 11:56:36 frueauf Exp $
+# $NetBSD: Makefile,v 1.14 1998/04/22 14:22:50 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/10/01 09:20:31 tg Exp
 #
 
@@ -9,7 +9,7 @@ MASTER_SITES=	ftp://ftp.sunlabs.com/pub/tcl/
 
 MAINTAINER=	packages@netbsd.org
 
-LIB_DEPENDS=	tcl80.1.:${PORTSDIR}/lang/tcl80
+DEPENDS+=	tcl-8.0p2:../../lang/tcl80
 
 WRKSRC=		${WRKDIR}/tk8.0/unix
 GNU_CONFIGURE=	yes
diff --git a/x11/tkman/Makefile b/x11/tkman/Makefile
index 26c807177b2..64c5084b9a5 100644
--- a/x11/tkman/Makefile
+++ b/x11/tkman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1998/04/20 11:56:36 frueauf Exp $
+# $NetBSD: Makefile,v 1.11 1998/04/22 14:22:50 agc Exp $
 # FreeBSD Id: Makefile,v 1.28 1997/12/08 15:51:20 tg Exp
 #
 
@@ -9,7 +9,7 @@ EXTRACT_SUFX=		.tar.Z
 
 MAINTAINER=		packages@netbsd.org
 
-LIB_DEPENDS=		tk80.1.:${PORTSDIR}/x11/tk80
+DEPENDS+=		tk-8.0p2:../../x11/tk80
 RUN_DEPENDS=		rman:${PORTSDIR}/textproc/rman \
 			glimpse:${PORTSDIR}/textproc/glimpse
 
diff --git a/x11/windowmaker/Makefile b/x11/windowmaker/Makefile
index 00c5ec15418..3d96f3ef6e6 100644
--- a/x11/windowmaker/Makefile
+++ b/x11/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:56 agc Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/22 14:22:50 agc Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/11/04 10:33:43 tg Exp
 #
 
@@ -10,9 +10,9 @@ MASTER_SITES=		http://isolation.ml.org/oxygen/wm/bin/ \
 
 MAINTAINER=		handy@physics.montana.edu
 
-LIB_DEPENDS=		Xpm.4.:${PORTSDIR}/graphics/xpm \
-			png.0.:${PORTSDIR}/graphics/png \
-			jpeg.7.:${PORTSDIR}/graphics/jpeg
+DEPENDS+=		xpm-3.4j:../../graphics/xpm
+DEPENDS+=		jpeg-6a:../../graphics/jpeg
+DEPENDS+=		png-0.96:../../graphics/png
 
 USE_X11=		yes
 GNU_CONFIGURE=		yes
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index a8eec336244..ff8d244942e 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1998/04/15 10:38:58 agc Exp $
+# $NetBSD: Makefile,v 1.13 1998/04/22 14:22:50 agc Exp $
 # FreeBSD Id: Makefile,v 1.23 1997/10/10 09:24:38 tg Exp
 #
 
@@ -8,8 +8,8 @@ MASTER_SITES=	ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/
 
 MAINTAINER=	hubertf@netbsd.org
 
-LIB_DEPENDS=	Xpm.4.:${PORTSDIR}/graphics/xpm \
-		MesaGL.2.:${PORTSDIR}/graphics/Mesa
+DEPENDS+=	xpm-3.4j:../../graphics/xpm
+DEPENDS+=	Mesa-2.6:../../graphics/Mesa
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= --with-mesagl --without-motif --without-sx \
diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile
index b3311c3d1ec..4275a34ebf1 100644
--- a/x11/xpmroot/Makefile
+++ b/x11/xpmroot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/04/15 10:38:58 agc Exp $
+# $NetBSD: Makefile,v 1.3 1998/04/22 14:22:50 agc Exp $
 #
 
 DISTNAME=	fvwm-2.0.46
@@ -10,7 +10,7 @@ MASTER_SITES=	ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/2.0.x/ \
 
 MAINTAINER=	tron@netbsd.org
 
-LIB_DEPENDS=	Xpm.4.:${PORTSDIR}/graphics/xpm
+DEPENDS+=	xpm-3.4j:../../graphics/xpm
 
 USE_IMAKE=	yes
 CAT1= 		xpmroot.0