From d2460b9fd7541b962dded99da55174aa350b543a Mon Sep 17 00:00:00 2001
From: agc <agc>
Date: Wed, 22 Apr 1998 14:22:39 +0000
Subject: 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.

---
 audio/cam/Makefile      | 4 ++--
 audio/mikmod/Makefile   | 4 ++--
 audio/rplay/Makefile    | 4 ++--
 audio/snd/Makefile      | 6 +++---
 audio/timidity/Makefile | 8 ++++----
 audio/xcd/Makefile      | 3 ++-
 6 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'audio')

diff --git a/audio/cam/Makefile b/audio/cam/Makefile
index 30bc10793d4..1007cbb6cf5 100644
--- a/audio/cam/Makefile
+++ b/audio/cam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/20 11:56:19 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:39 agc Exp $
 #
 
 DISTNAME=	cam-1.02
@@ -9,7 +9,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	packages@netbsd.org
 
-BUILD_DEPENDS=	${PREFIX}/lib/libncurses.a:${PORTSDIR}/devel/ncurses
+DEPENDS+=	ncurses-1.9.9g:../../devel/ncurses
 
 MAN1=		cam.1
 
diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile
index d6e65fbe7ef..506f73a2101 100644
--- a/audio/mikmod/Makefile
+++ b/audio/mikmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:10 agc Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/22 14:22:39 agc Exp $
 #
 
 DISTNAME=	mikmod-2.14-unix
@@ -8,7 +8,7 @@ MASTER_SITES=	http://www.chiark.greenend.org.uk/~stevem/mikmod/
 
 MAINTAINER=	mycroft@NetBSD.ORG
 
-LIB_DEPENDS=	ncurses.3.4:${PORTSDIR}/devel/ncurses
+DEPENDS+=	ncurses-1.9.9g:../../devel/ncurses
 
 RESTRICTED=	"Registration required for redistribution and commercial use."
 MIRROR_DISTFILE=	no
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index ce107eb0cf6..7f9db745c0d 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/04/22 11:05:02 agc Exp $
+# $NetBSD: Makefile,v 1.9 1998/04/22 14:22:39 agc Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/06/13 16:17:01 ache Exp
 #
 
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.sdsu.edu/pub/rplay/
 
 MAINTAINER=	rmallory@csusb.edu
 
-LIB_DEPENDS=    gsm.1.0:${PORTSDIR}/audio/gsm
+DEPENDS+=	gsm-1.0.10:../../audio/gsm
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS= "--prefix=${PREFIX}"
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 9e6eb5cf270..9d7907ec801 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:11 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/04/22 14:22:40 agc Exp $
 #
 
 DISTNAME=		snd
@@ -9,8 +9,8 @@ MASTER_SITES=		ftp://ccrma-ftp.stanford.edu/pub/Lisp/
 
 MAINTAINER=		hubertf@netbsd.org
 
-LIB_DEPENDS=		Xpm.4.:${PORTSDIR}/graphics/xpm \
-			Xm.0.:${PORTSDIR}/x11/lesstif
+DEPENDS+=		xpm-3.4j:../../graphics/xpm
+BUILD_DEPENDS+=		${X11BASE}/include/Xm:${PORTSDIR}/x11/lesstif
 
 USE_X11=		YES
 REQUIRES_MOTIF=		YES
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index 04fa1d91ee0..65a24a27928 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1998/04/15 10:38:11 agc Exp $
+# $NetBSD: Makefile,v 1.11 1998/04/22 14:22:40 agc Exp $
 #
 
 DISTNAME=       timidity-0.2i
@@ -10,10 +10,10 @@ DISTFILES=      ${TIINS} ${DISTNAME}.tar.gz
 
 MAINTAINER=     mycroft@NetBSD.ORG
 
-BUILD_DEPENDS=  unzip:${PORTSDIR}/archivers/unzip \
-		wish8.0:${PORTSDIR}/x11/tk80
+BUILD_DEPENDS=  unzip:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11/tk80
-LIB_DEPENDS=	ncurses.3.4:${PORTSDIR}/devel/ncurses
+DEPENDS+=	ncurses-1.9.9g:../../devel/ncurses
+DEPENDS+=	tk-8.0p2:../../x11/tk80
 
 NO_CDROM=       "Uses copyrighted patches"
 
diff --git a/audio/xcd/Makefile b/audio/xcd/Makefile
index 89a1a0eb7c7..f41a766b45d 100644
--- a/audio/xcd/Makefile
+++ b/audio/xcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/04/20 11:56:20 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/22 14:22:40 agc Exp $
 # FreeBSD Id: Makefile,v 1.18 1997/10/08 13:10:20 jmz Exp
 #
 
@@ -9,6 +9,7 @@ MASTER_SITES=	ftp://ftp.obs-besancon.fr/pub/outgoing/
 MAINTAINER=	packages@netbsd.org
 
 RUN_DEPENDS=    wish8.0:${PORTSDIR}/x11/tk80
+DEPENDS+=	tk-8.0p2:../../x11/tk80
 
 WRKSRC=		${WRKDIR}/xcd
 MAN1=		cdplayer.1 xcd.1
-- 
cgit v1.2.3