Change BUILD_DEPENDS semantics:

first component is now a package name+version/pattern, no more
executable/patchname/whatnot.

While there, introduce BUILD_USES_MSGFMT as shorthand to pull in
devel/gettext unless /usr/bin/msgfmt exists (i.e. on post-1.5 -current).

Patch by Alistair Crooks <agc@netbsd.org>

14 files changed, 34 insertions, 35 deletions

diff --git a/graphics/GMT/Makefile b/graphics/GMT/Makefile
index 510dc2f7947..354fd03c69b 100644
--- a/graphics/GMT/Makefile
+++ b/graphics/GMT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/16 15:22:14 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/03/27 03:19:59 hubertf Exp $
 
 DISTNAME=	GMT3.3.6
 PKGNAME=	GMT-3.3.6
@@ -18,7 +18,7 @@ HOMEPAGE=	http://imina.soest.hawaii.edu/gmt/
 COMMENT=	Generic Mapping Tools
 
 DEPENDS+=	netcdf>=3.0:../../devel/netcdf
-BUILD_DEPENDS+=	${LOCALBASE}/bin/autoreconf:../../devel/autoconf
+BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
 
 EXTRACT_SUFFIX= .tar.bz2
 WRKSRC=		${WRKDIR}/${DISTNAME}
diff --git a/graphics/Mesa-glx/Makefile b/graphics/Mesa-glx/Makefile
index 8ffcd65e8b5..256d16a7a06 100644
--- a/graphics/Mesa-glx/Makefile
+++ b/graphics/Mesa-glx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/03/14 10:20:32 tron Exp $
+# $NetBSD: Makefile,v 1.18 2001/03/27 03:19:59 hubertf Exp $
 
 DISTNAME=	glx-20000813
 PKGNAME=	Mesa-${DISTNAME}
@@ -15,9 +15,9 @@ COMMENT=	OpenGL like graphics library with GLX hardware acceleration
 
 BROKEN=		Package is outdated and has security problems.
 
-BUILD_DEPENDS+=	${PERL5}:../../lang/perl5-base
-BUILD_DEPENDS+=	${AUTOCONF}:../../devel/autoconf
-BUILD_DEPENDS+=	${TCLSH}:../../lang/tcl
+BUILD_DEPENDS+=	perl-5.*:../../lang/perl5
+BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
+BUILD_DEPENDS+=	tcl-8.3.2nb1:../../lang/tcl
 
 CONFLICTS+=		Mesa-*
 CONFLICTS+=		MesaLib-*
diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile
index 4706c08c8f9..9ef2818075d 100644
--- a/graphics/fly/Makefile
+++ b/graphics/fly/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/03/04 09:06:11 tron Exp $
+# $NetBSD: Makefile,v 1.14 2001/03/27 03:19:59 hubertf Exp $
 
 DISTNAME=	fly-1.6.5
 CATEGORIES=	graphics www
@@ -8,7 +8,7 @@ MAINTAINER=	bouyer@netbsd.org
 HOMEPAGE=	http://www.unimelb.edu.au/fly/fly.html
 COMMENT=	command-file interface for creating and modifying PNG images
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/gif2png:../../graphics/gif2png
+BUILD_DEPENDS+=	gif2png-2.4.2:../../graphics/gif2png
 DEPENDS+=	gd>=1.8.1:../../graphics/gd
 
 EVAL_PREFIX+=	XPMDIR=xpm
diff --git a/graphics/freetype-lib/Makefile.common b/graphics/freetype-lib/Makefile.common
index e084e581fae..7ad6ea13bdf 100644
--- a/graphics/freetype-lib/Makefile.common
+++ b/graphics/freetype-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2000/11/04 07:05:09 itojun Exp $
+# $NetBSD: Makefile.common,v 1.8 2001/03/27 03:19:59 hubertf Exp $
 
 DISTNAME=		freetype-${FT_VERS}
 FT_VERS=		1.3.1
@@ -10,7 +10,7 @@ MASTER_SITES=		http://download.sourceforge.net/freetype/ \
 MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.freetype.org/
 
-BUILD_DEPENDS+=		msgfmt:../../devel/gettext
+BUILD_USES_MSGFMT=	yes
 
 USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common
index 754fa4aafde..f0065e7e567 100644
--- a/graphics/gdk-pixbuf/Makefile.common
+++ b/graphics/gdk-pixbuf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2001/03/18 04:33:53 mjl Exp $
+# $NetBSD: Makefile.common,v 1.6 2001/03/27 03:20:00 hubertf Exp $
 #
 
 DISTNAME=		gdk-pixbuf-0.10.1
@@ -8,8 +8,8 @@ MASTER_SITES=		${MASTER_SITE_GNOME:=unstable/sources/gdk-pixbuf/}
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/autoreconf:../../devel/autoconf
-BUILD_DEPENDS+=		${LOCALBASE}/bin/automake:../../devel/automake
+BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
+BUILD_DEPENDS+=		automake-1.4:../../devel/automake
 DEPENDS+=		gtk+>=1.2.8:../../x11/gtk
 DEPENDS+=		png>=1.0.8:../../graphics/png
 DEPENDS+=		tiff>=3.5.5:../../graphics/tiff
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index d3a1c1ae368..28a1880a33e 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2001/02/16 15:22:21 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2001/03/27 03:20:00 hubertf Exp $
 #
 
 DISTNAME=		giflib-4.1.0
@@ -11,7 +11,7 @@ COMMENT=		Tools and library routines for working with GIF images
 
 CONFLICTS=		libungif-*
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/autoreconf:../../devel/autoconf
+BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
 
 USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
diff --git a/graphics/gnome-iconedit/Makefile b/graphics/gnome-iconedit/Makefile
index 07bd2f08ff4..2745218ccae 100644
--- a/graphics/gnome-iconedit/Makefile
+++ b/graphics/gnome-iconedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 15:22:23 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/03/27 03:20:00 hubertf Exp $
 #
 
 DISTNAME=		gnome-iconedit-1.2.0
@@ -11,7 +11,7 @@ COMMENT=		icon editor based on GNOME libraries
 DEPENDS+=		gdk-pixbuf>=0.7.0:../../graphics/gdk-pixbuf
 DEPENDS+=		gnome-libs>=1.2.0:../../x11/gnome-libs
 DEPENDS+=		oaf>=0.6.0:../../devel/oaf
-BUILD_DEPENDS+=		msgfmt:../../devel/gettext
+BUILD_USES_MSGFMT=	yes
 
 GNU_CONFIGURE=		YES
 USE_GMAKE=		YES
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 3ba809bd91e..e1bc6db7d33 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/03/15 14:55:23 zuntum Exp $
+# $NetBSD: Makefile,v 1.16 2001/03/27 03:20:00 hubertf Exp $
 #
 
 DISTNAME=	gqview-0.10.1
@@ -11,7 +11,7 @@ COMMENT=	another gtk-based graphic file viewer
 
 DEPENDS+=	gdk-pixbuf>=0.9.0:../../graphics/gdk-pixbuf
 DEPENDS+=	gtk+-1.2.*:../../x11/gtk
-BUILD_DEPENDS+=	msgfmt:../../devel/gettext
+BUILD_USES_MSGFMT=	yes
 
 USE_LIBINTL=	yes
 USE_X11BASE=	yes
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index f3577a1f98e..d516a2623be 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2001/03/10 13:04:07 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2001/03/27 03:20:01 hubertf Exp $
 #
 
 DISTNAME=		imlib-1.9.8.1
@@ -9,8 +9,8 @@ MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.nl.rasterman.com/imlib.html
 COMMENT=		image manipulation library for X11
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/autoconf:../../devel/autoconf
-BUILD_DEPENDS+=		${LOCALBASE}/bin/automake:../../devel/automake
+BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
+BUILD_DEPENDS+=		automake-1.4:../../devel/automake
 DEPENDS+=		gtk+-1.2.*:../../x11/gtk
 DEPENDS+=		libungif-*:../../graphics/libungif
 DEPENDS+=		jpeg-6b:../../graphics/jpeg
diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index df4b8099336..43eb4a93be5 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/16 15:22:26 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/03/27 03:20:01 hubertf Exp $
 #
 
 DISTNAME=	libggi-2.0b2.1
@@ -9,7 +9,7 @@ MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.ggi-project.org/
 COMMENT=	General Graphics Interface library is a flexible drawing library
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf:../../devel/autoconf
+BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
 DEPENDS+=	ncurses>=4.2:../../devel/ncurses
 DEPENDS+=	libgii-0.6:../libgii
 
diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile
index f59d52803a1..3b543782881 100644
--- a/graphics/libungif/Makefile
+++ b/graphics/libungif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/02/16 15:22:26 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2001/03/27 03:20:01 hubertf Exp $
 #
 
 DISTNAME=		libungif-4.1.0
@@ -11,7 +11,7 @@ COMMENT=		Tools and library routines for working with GIF images
 
 CONFLICTS=		giflib-*
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/autoreconf:../../devel/autoconf
+BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
 
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=      ${WRKSRC}/ltconfig
diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile
index 66e12361e00..6b4ecf75f96 100644
--- a/graphics/pixmap/Makefile
+++ b/graphics/pixmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/02/16 15:22:30 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2001/03/27 03:20:01 hubertf Exp $
 # FreeBSD: Makefile,v 1.8 1996/11/18 09:53:36 asami Exp
 #
 
@@ -15,8 +15,7 @@ PATCHFILES=		pixmap_2.6.patch1.gz \
 MAINTAINER=		packages@netbsd.org
 COMMENT=		Pixmap editor based on XPM library
 
-BUILD_DEPENDS+=		rman:../../textproc/rman
-
+USE_RMAN=		YES
 USE_IMAKE=		YES
 USE_XPM=		YES
 
diff --git a/graphics/plplot/Makefile b/graphics/plplot/Makefile
index 0441319c23f..33c85b0bee3 100644
--- a/graphics/plplot/Makefile
+++ b/graphics/plplot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/26 22:22:49 jtb Exp $
+# $NetBSD: Makefile,v 1.12 2001/03/27 03:20:02 hubertf Exp $
 
 DISTNAME=	plplot-5.0.2
 CATEGORIES=	graphics
@@ -10,9 +10,9 @@ COMMENT=	Scientific plotting package
 
 DEPENDS+=	tcl>=8.3.0:../../lang/tcl
 DEPENDS+= 	tk>=8.3.0:../../x11/tk
-BUILD_DEPENDS+=	m4-[0-9]*:../../devel/m4
-BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf:../../devel/autoconf
-BUILD_DEPENDS+=	${LOCALBASE}/bin/perl:../../lang/perl5
+BUILD_DEPENDS+=	m4-1.4:../../devel/m4
+BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
+BUILD_DEPENDS+=	perl-5.*:../../lang/perl5
 
 GNU_CONFIGURE=	#defined
 USE_GMAKE=	#defined
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index 89f39fa5039..e3905f6a3fa 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2001/03/04 09:06:15 tron Exp $
+# $NetBSD: Makefile,v 1.25 2001/03/27 03:20:02 hubertf Exp $
 #
 
 DISTNAME=	xsane-0.72
@@ -17,7 +17,7 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.xsane.org/
 COMMENT=	New improved frontend for SANE
 
-BUILD_DEPENDS+=	msgfmt:../../devel/gettext
+BUILD_USES_MSGFMT=	yes
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
 DEPENDS+=	gtk+>=1.2.5:../../x11/gtk
 DEPENDS+=	png>1.0.9:../../graphics/png