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.

6 files changed, 14 insertions, 14 deletions

diff --git a/mbone/imm/Makefile b/mbone/imm/Makefile
index 2621ccf814e..d369764c59d 100644
--- a/mbone/imm/Makefile
+++ b/mbone/imm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:32 agc Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/22 14:22:45 agc Exp $
 #
 # NetBSD "imm" package
 # The original was based on the imm-3.5a1 FreeBSD port maintained
@@ -13,7 +13,7 @@ DISTFILES=	imm36a1.tar.Z
 
 MAINTAINER=	is@netbsd.org
 
-LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11/tk80
+DEPENDS+=	tk-8.0p2:../../x11/tk80
 
 ALL_TARGET=	netbsd
 MAKE_ENV+=	INSTALL_PROGRAM="${INSTALL_PROGRAM}"
diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile
index ba97fc8aa46..1cd7e6b2584 100644
--- a/mbone/nte/Makefile
+++ b/mbone/nte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/04/15 10:59:10 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/22 14:22:45 agc Exp $
 #
 
 DISTNAME=	nt.1.5a23
@@ -11,8 +11,8 @@ MAINTAINER=	mycroft@NetBSD.ORG
 TK_DIR=         ${PORTSDIR}/x11/tk80
 TK_SRC=		${TK_DIR}/${WRKDIR:T}/tk8.0
 
-DEPENDS=	${TK_DIR}:configure
-LIB_DEPENDS=	tk80:${TK_DIR}
+BUILD_DEPENDS=	${PORTSDIR}/x11/tk80/${WRKDIR:T}/tk8.0/generic/default.h:${TK_DIR}:configure
+DEPENDS+=	tk-8.0p2:../../x11/tk80
 
 RESTRICTED=	"Contains DES encryption"
 MIRROR_DISTFILE=no
diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile
index f14c1a6bc81..c0b94d1e3e1 100644
--- a/mbone/rat/Makefile
+++ b/mbone/rat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:32 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/22 14:22:45 agc Exp $
 #
 
 DISTNAME=	rat-3.0
@@ -8,7 +8,7 @@ DISTFILES=	rat-3.0.23.tar.gz
 
 MAINTAINER=	mycroft@NetBSD.ORG
 
-LIB_DEPENDS=	tk80:${PORTSDIR}/x11/tk80
+DEPENDS+=	tk-8.0p2:../../x11/tk80
 
 RESTRICTED=	"Contains DES encryption"
 MIRROR_DISTFILE=no
diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index 55096db040a..c91e49d04f3 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/04/15 10:38:33 agc Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/22 14:22:45 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/10/15 20:35:20 fenner Exp 
 #
 
@@ -9,7 +9,7 @@ MASTER_SITES=	ftp://cs.ucl.ac.uk/mice/sdr/
 
 MAINTAINER=	is@netbsd.org
 
-LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11/tk80
+DEPENDS+=	tk-8.0p2:../../x11/tk80
 
 RESTRICTED=	"Contains DES encryption"
 MIRROR_DISTFILE=	no
diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile
index 13891673d74..6b1faaceda7 100644
--- a/mbone/vat/Makefile
+++ b/mbone/vat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/04/15 10:38:33 agc Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:45 agc Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/09/11 03:54:43 fenner Exp 
 #
 
@@ -16,8 +16,8 @@ GSM_WORK=	${GSM_DIR}/${WRKDIR:T}/gsm-1.0-pl10
 # we can use this first BUILD_DEPENDS and save some work.
 #BUILD_DEPENDS=	${GSM_WORK}/inc/private.h:${GSM_DIR}:patch
 BUILD_DEPENDS=	${GSM_WORK}/lib/libgsm.a:${GSM_DIR}:build
-LIB_DEPENDS=	tk80:${PORTSDIR}/x11/tk80
-#LIB_DEPENDS+=	gsm:${GSM_DIR}
+DEPENDS+=	tk-8.0p2:../../x11/tk80
+#DEPENDS+=	gsm-1.0.10:${GSM_DIR}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= ${MACHINE_ARCH}--netbsd --with-gsm=${GSM_WORK}
diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile
index c0db6323cac..9f482756277 100644
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:33 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:45 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/09/11 03:54:53 fenner Exp
 #
 
@@ -9,7 +9,7 @@ DISTFILES=	vicsrc-2.8.tar.gz
 
 MAINTAINER=	is@netbsd.org
 
-LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11/tk80
+DEPENDS+=	tk-8.0p2:../../x11/tk80
 
 GNU_CONFIGURE=	yes
 USE_X11=	yes