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.

10 files changed, 39 insertions, 39 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index d258abaa05a..69771007657 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1998/04/15 22:21:17 tron Exp $
+# $NetBSD: Makefile,v 1.18 1998/04/22 14:22:41 agc Exp $
 #
 
 DISTNAME=	ImageMagick-4.0.5
@@ -7,10 +7,10 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	tron@netbsd.org
 
-LIB_DEPENDS=    jpeg.7.:${PORTSDIR}/graphics/jpeg \
-		mpeg.1.2:${PORTSDIR}/graphics/mpeg-lib \
-		png.0.:${PORTSDIR}/graphics/png \
-		tiff.3.4:${PORTSDIR}/graphics/tiff
+DEPENDS+=	tiff-3.4:../../graphics/tiff
+DEPENDS+=	jpeg-6a:../../graphics/jpeg
+DEPENDS+=	png-0.96:../../graphics/png
+DEPENDS+=	mpeg-1.2.1:../../graphics/mpeg-lib
 
 USE_IMAKE=	yes
 XMKMF=		${MAKE_ENV} xmkmf -a
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index f595f89f437..1180892a727 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1998/04/17 09:37:24 agc Exp $
+# $NetBSD: Makefile,v 1.11 1998/04/22 14:22:41 agc Exp $
 
 DISTNAME=	gimp-0.99.26
 CATEGORIES=	graphics
@@ -11,12 +11,12 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 
 MAINTAINER=	bsieker@techfak.uni-bielefeld.de
 
-LIB_DEPENDS=	jpeg.7.:${PORTSDIR}/graphics/jpeg \
-		mpeg.1.2:${PORTSDIR}/graphics/mpeg-lib \
-		png.0.96:${PORTSDIR}/graphics/png \
-		tiff.3.4:${PORTSDIR}/graphics/tiff \
-		gtk.1.0:${PORTSDIR}/x11/gtk \
-		Xpm.4.:${PORTSDIR}/graphics/xpm
+DEPENDS+=	xpm-3.4j:../../graphics/xpm
+DEPENDS+=	tiff-3.4:../../graphics/tiff
+DEPENDS+=	jpeg-6a:../../graphics/jpeg
+DEPENDS+=	png-0.96:../../graphics/png
+DEPENDS+=	mpeg-1.2.1:../../graphics/mpeg-lib
+DEPENDS+=	gtk+-1.0.0:../../x11/gtk
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index ffad607dda6..00287efe192 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1998/04/15 10:38:26 agc Exp $
+# $NetBSD: Makefile,v 1.14 1998/04/22 14:22:43 agc Exp $
 #
 
 DISTNAME=	netpbm
@@ -14,9 +14,9 @@ DISTFILES=	netpbm-1mar1994.tar.gz \
 
 MAINTAINER=	tron@netbsd.org
 
-LIB_DEPENDS=	jpeg.7.:${PORTSDIR}/graphics/jpeg \
-		png.0.96:${PORTSDIR}/graphics/png \
-		tiff.3.:${PORTSDIR}/graphics/tiff
+DEPENDS+=	tiff-3.4:../../graphics/tiff
+DEPENDS+=	jpeg-6a:../../graphics/jpeg
+DEPENDS+=	png-0.96:../../graphics/png
 
 WRKSRC=		${WRKDIR}/netpbm
 MAKE_ENV +=	PREFIX=${PREFIX} INSTALL_MAN="${INSTALL_MAN}"
diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile
index 6bd7f918a4f..1d04e944d1d 100644
--- a/graphics/pixmap/Makefile
+++ b/graphics/pixmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/20 11:56:24 frueauf Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:43 agc Exp $
 # FreeBSD: Makefile,v 1.8 1996/11/18 09:53:36 asami Exp
 #
 
@@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR=	applications/pixmap
 
 MAINTAINER=		packages@netbsd.org
 
-LIB_DEPENDS=		Xpm.4.:${PORTSDIR}/graphics/xpm
+DEPENDS+=		xpm-3.4j:../../graphics/xpm
 
 WRKSRC=			${WRKDIR}/pixmap
 USE_IMAKE=		yes
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 4445d1cc663..47f5fa6ed4d 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/04/15 10:38:27 agc Exp $
+# $NetBSD: Makefile,v 1.10 1998/04/22 14:22:43 agc Exp $
 
 DISTNAME=	tiff-v3.4beta037
 PKGNAME=	tiff-3.4
@@ -10,7 +10,7 @@ EXTRACT_SUFX=	-tar.gz
 
 MAINTAINER=	tron@netbsd.org
 
-LIB_DEPENDS=	jpeg.7.:${PORTSDIR}/graphics/jpeg
+DEPENDS+=	jpeg-6a:../../graphics/jpeg
 
 MAN1=	fax2ps.1 fax2tiff.1 gif2tiff.1 pal2rgb.1 ppm2tiff.1 ras2tiff.1 \
 	rgb2ycbcr.1 sgi2tiff.1 thumbnail.1 tiff2bw.1 tiff2ps.1 tiffcmp.1 \
diff --git a/graphics/xart/Makefile b/graphics/xart/Makefile
index 271947a0ffb..d4f5c8930de 100644
--- a/graphics/xart/Makefile
+++ b/graphics/xart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 1998/04/21 00:46:57 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 1998/04/22 14:22:43 agc Exp $
 #
 
 DISTNAME=       xart19980415
@@ -9,10 +9,10 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	packages@netbsd.org
 
-LIB_DEPENDS=    jpeg.7.:${PORTSDIR}/graphics/jpeg \
-                tiff.3.:${PORTSDIR}/graphics/tiff \
-                Xpm.4.:${PORTSDIR}/graphics/xpm   \
-                png.0.:${PORTSDIR}/graphics/png
+DEPENDS+=	jpeg-6a:../../graphics/jpeg
+DEPENDS+=	tiff-3.4:../../graphics/tiff
+DEPENDS+=	xpm-3.4j:../../graphics/xpm
+DEPENDS+=	png-0.96:../../graphics/png
 
 WRKSRC=		${WRKDIR}/19980415
 USE_IMAKE=      yes
diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile
index c52371f21f8..be23c9a54c7 100644
--- a/graphics/xbmbrowser/Makefile
+++ b/graphics/xbmbrowser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/04/20 11:56:24 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1998/04/22 14:22:44 agc Exp $
 # FreeBSD: Makefile,v 1.3 1997/08/26 07:12:20 tg Exp
 #
 
@@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR=	utilities
 
 MAINTAINER=		packages@netbsd.org
 
-LIB_DEPENDS=		Xpm.4.:${PORTSDIR}/graphics/xpm
+DEPENDS+=		xpm-3.4j:../../graphics/xpm
 
 USE_IMAKE=		yes
 USE_GMAKE=		yes
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index ec5f6017efd..90abdf103e8 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/04/15 10:38:27 agc Exp $
+# $NetBSD: Makefile,v 1.6 1998/04/22 14:22:44 agc Exp $
 #
 
 DISTNAME=		xfig.3.2
@@ -11,9 +11,9 @@ MASTER_SITE_SUBDIR=	applications/drawing_tools/xfig
 MAINTAINER=		root@garbled.futureone.com
 
 RUN_DEPENDS=		fig2dev:${PORTSDIR}/print/transfig
-LIB_DEPENDS=		jpeg.7.:${PORTSDIR}/graphics/jpeg \
-			Xpm.4.:${PORTSDIR}/graphics/xpm \
-			Xaw3d.6.:${PORTSDIR}/x11/Xaw3d
+DEPENDS+=		xpm-3.4j:../../graphics/xpm
+DEPENDS+=		jpeg-6a:../../graphics/jpeg
+DEPENDS+=		Xaw3d-1.3:../../x11/Xaw3d
 
 USE_IMAKE=		yes
 
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 436e0cb9ceb..7e77c484707 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/04/20 11:56:24 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/04/22 14:22:44 agc Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/08/29 12:17:50 tg Exp
 #
 
@@ -8,10 +8,10 @@ MASTER_SITES=	http://www.danbbs.dk/~torsten/xpaint/
 
 MAINTAINER=	packages@netbsd.org
 
-LIB_DEPENDS=    jpeg.7.:${PORTSDIR}/graphics/jpeg \
-		tiff.3.:${PORTSDIR}/graphics/tiff \
-		Xpm.4.:${PORTSDIR}/graphics/xpm   \
-		png.0.:${PORTSDIR}/graphics/png
+DEPENDS+=	xpm-3.4j:../../graphics/xpm
+DEPENDS+=	tiff-3.4:../../graphics/tiff
+DEPENDS+=	jpeg-6a:../../graphics/jpeg
+DEPENDS+=	png-0.96:../../graphics/png
 
 WRKSRC=		${WRKDIR}/xpaint
 USE_IMAKE=      yes
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index 52772e0ba65..d0eac2f71a3 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:28 agc Exp $
+# $NetBSD: Makefile,v 1.8 1998/04/22 14:22:44 agc Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/07/03 07:37:08 asami Exp
 #
 
@@ -15,8 +15,8 @@ PATCHFILES=     xv-3.10a.JPEG-patch xv-3.10a.TIFF-patch # (for tiff3.4)
 
 MAINTAINER=	packages@netbsd.org
 
-LIB_DEPENDS=    jpeg.7.:${PORTSDIR}/graphics/jpeg \
-		tiff.3.4:${PORTSDIR}/graphics/tiff
+DEPENDS+=	tiff-3.4:../../graphics/tiff
+DEPENDS+=	jpeg-6a:../../graphics/jpeg
 
 USE_IMAKE=	yes