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>

18 files changed, 44 insertions, 38 deletions

diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index b4428aac30c..ffb7f1a8e57 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/02/16 14:38:16 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2001/03/27 03:19:50 hubertf Exp $
 #
 
 DISTNAME=	GConf-0.11
@@ -12,7 +12,8 @@ COMMENT=	configuration database system used by GNOME
 DEPENDS+=	gnome-core>=1.2.0:../../x11/gnome-core
 DEPENDS+=	oaf-*:../../devel/oaf
 DEPENDS+=	guile>=1.3.4:../../lang/guile
-BUILD_DEPENDS+=	msgfmt:../../devel/gettext
+
+BUILD_USES_MSGFMT=	yes
 
 GNU_CONFIGURE=	YES
 USE_X11BASE=	YES
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index f6463b93602..47ddc7456ed 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/02/16 14:38:17 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/03/27 03:19:50 hubertf Exp $
 #
 
 DISTNAME=	SDL-1.1.6
@@ -9,8 +9,8 @@ MAINTAINER=	wiz@netbsd.org
 HOMEPAGE=	http://www.libsdl.org/
 COMMENT=	Simple DirectMedia Layer, a cross-platform multimedia library
 
-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+=	pth>=1.3.5:../../devel/pth
 #DEPENDS+=	unproven-pthreads>=0.16
 DEPENDS+=	esound>=0.2.18:../../audio/esound
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index 7aa34c038c6..0aa62da77eb 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/02/28 23:31:06 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2001/03/27 03:19:50 hubertf Exp $
 
 DISTNAME=		bison-1.28
 CATEGORIES=		devel
@@ -8,7 +8,7 @@ MAINTAINER=		thorpej@netbsd.org
 HOMEPAGE=		http://www.gnu.org/software/bison/bison.html
 COMMENT=		GNU yacc(1) replacement
 
-BUILD_DEPENDS+=		msgfmt:../../devel/gettext
+BUILD_USES_MSGFMT=	yes
 
 USE_LIBINTL=		# defined
 GNU_CONFIGURE=		# defined
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index fb810536634..7a3587a47ed 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/02/16 14:38:19 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/03/27 03:19:50 hubertf Exp $
 #
 
 DISTNAME=		bonobo-0.30
@@ -9,7 +9,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Architecture for creating reusable software components
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/bison:../../devel/bison
+BUILD_DEPENDS+=		bison-*:../../devel/bison
 DEPENDS+=		ORBit>=0.5.6:../../net/ORBit
 DEPENDS+=		gdk-pixbuf>=0.6.0:../../graphics/gdk-pixbuf
 DEPENDS+=		oaf>=0.6.1:../../devel/oaf
diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index 079e78e9814..34620026cc1 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/16 14:38:19 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/03/27 03:19:51 hubertf Exp $
 #
 
 DISTNAME=		latestCDK
@@ -12,7 +12,7 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.vexus.ca/CDK.html
 COMMENT=		the Curses Development Kit
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/autoconf:../../devel/autoconf
+BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
 
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile
index 01bf077abb9..62f905fd656 100644
--- a/devel/gmp/Makefile
+++ b/devel/gmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/23 14:15:28 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/03/27 03:19:51 hubertf Exp $
 #
 
 DISTNAME=		gmp-3.1.1
@@ -9,7 +9,7 @@ MAINTAINER=		hubertf@netbsd.org
 HOMEPAGE=		http://www.gnu.org/software/gmp/gmp.html
 COMMENT=		Library for arbitrary precision arithmetic
 
-BUILD_DEPENDS+=		${PREFIX}/bin/gm4:../../devel/m4
+BUILD_DEPENDS+=		m4-1.4:../../devel/m4
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
diff --git a/devel/gobo-eiffel/Makefile b/devel/gobo-eiffel/Makefile
index c153bdd11fd..949a8f4a77d 100644
--- a/devel/gobo-eiffel/Makefile
+++ b/devel/gobo-eiffel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/20 11:40:09 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:51 hubertf Exp $
 #
 
 DISTNAME=	gobo15
@@ -13,7 +13,7 @@ MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://www.gobosoft.com/
 COMMENT=	portable Eiffel structure libraries and tools
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/smalleiffel:../../lang/smalleiffel
+BUILD_DEPENDS+=	smalleiffel-0.77:../../lang/smalleiffel
 
 NO_WRKSUBDIR=	yes
 EXTRACT_CMD=	${LOCALBASE}/bin/unzip -uLa \
diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile
index c900d38ab5d..14dddad11ca 100644
--- a/devel/id-utils/Makefile
+++ b/devel/id-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/02/16 14:38:31 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2001/03/27 03:19:51 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.4 1996/11/18 10:22:47 asami Exp
 #
 
@@ -10,7 +10,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/idutils/idutils.html
 COMMENT=	The classic Berkeley gid/lid tools for looking up variables in code
 
-BUILD_DEPENDS+=	msgfmt:../../devel/gettext
+BUILD_USES_MSGFMT=	yes
 
 INFO_FILES=	id-utils.info
 GNU_CONFIGURE=	yes
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index 86dc57f0131..745929dd531 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/03/04 16:38:46 tron Exp $
+# $NetBSD: Makefile,v 1.22 2001/03/27 03:19:52 hubertf Exp $
 
 DISTNAME=	kdbg-1.2.0
 CATEGORIES=	devel kde
@@ -9,7 +9,8 @@ MAINTAINER=	tron@netbsd.org
 HOMEPAGE=       http://members.telecom.at/~johsixt/kdbg.html
 COMMENT=	Graphical User Interface around gdb using KDE
 
-BUILD_DEPENDS+= msgfmt:../../devel/gettext
+BUILD_USES_MSGFMT=	yes
+
 DEPENDS+=	autoconf-2.13:../autoconf
 DEPENDS+=	automake-1.4:../automake
 DEPENDS+=	kdevelop-base-1.*:../kdevelop-base
diff --git a/devel/kdevelop-base/Makefile b/devel/kdevelop-base/Makefile
index 65fd2f95646..72708f7e52d 100644
--- a/devel/kdevelop-base/Makefile
+++ b/devel/kdevelop-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/03/10 03:16:41 wulf Exp $
+# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:52 hubertf Exp $
 
 DISTNAME=	kdevelop-1.3
 PKGNAME=	${DISTNAME:S/-/-base-/}
@@ -10,7 +10,8 @@ MAINTAINER=	wulf@netbsd.org
 HOMEPAGE=       http://www.kdevelop.org/
 COMMENT=	Base modules for IDE for Unix/X11/KDE
 
-BUILD_DEPENDS+= msgfmt:../../devel/gettext
+BUILD_USES_MSGFMT=	yes
+
 DEPENDS+=       autoconf-*:../../devel/autoconf
 DEPENDS+=       automake-*:../../devel/automake
 DEPENDS+=       kdebase-1.*:../../x11/kdebase
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index 959b630f248..f1cc2c6fabb 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2001/03/18 00:40:50 mjl Exp $
+# $NetBSD: Makefile,v 1.29 2001/03/27 03:19:52 hubertf Exp $
 #
 
 DISTNAME=	libglade-0.16
@@ -9,7 +9,8 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.daa.com.au/~james/gnome/
 COMMENT=	Runtime interpreter for GLADE gui files
 
-BUILD_DEPENDS+=	msgfmt:../../devel/gettext
+BUILD_USES_MSGFMT=	yes
+
 # do not remove esound pre-requisite
 DEPENDS+=	esound>=0.2.18:../../audio/esound
 DEPENDS+=	gnome-libs>=1.2.1:../../x11/gnome-libs
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index ca045fd969c..dbdb5121435 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2001/02/16 14:38:36 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2001/03/27 03:19:52 hubertf Exp $
 
 DISTNAME=		libgtop-1.0.9
 CATEGORIES=		devel gnome
@@ -8,8 +8,9 @@ MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.home-of-linux.org/gnome/libgtop/
 COMMENT=		library to retrieve system information, used in GNOME
 
-BUILD_DEPENDS=		${PERL5}:../../lang/perl5-base
-BUILD_DEPENDS+=		msgfmt:../../devel/gettext
+BUILD_DEPENDS=		perl-5.*:../../lang/perl5
+BUILD_USES_MSGFMT=	yes
+
 DEPENDS+=		gnome-libs-*:../../x11/gnome-libs
 DEPENDS+=		guile-[0-9]*:../../lang/guile
 
diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile
index 69b8b31131c..0ba4ff8b2f9 100644
--- a/devel/maketool/Makefile
+++ b/devel/maketool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/02/16 14:38:41 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2001/03/27 03:19:52 hubertf Exp $
 #
 
 DISTNAME=	maketool-0.6.1
@@ -10,7 +10,8 @@ MAINTAINER=	fb@enteract.com
 HOMEPAGE=	http://www.alphalink.com.au/~gnb/maketool/
 COMMENT=	Graphical front end to GNU make
 
-BUILD_DEPENDS+=	msgfmt:../../devel/gettext
+BUILD_USES_MSGFMT=	yes
+
 DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 
 USE_GMAKE=	yes
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index 250a3297402..f4602d32ec5 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 14:38:57 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:53 hubertf Exp $
 #
 
 DISTNAME=	popt-1.2
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.redhat.com/redhat/code/popt/
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Command line option parsing library
 
-BUILD_DEPENDS+=	xgettext:../../devel/gettext
+BUILD_USES_MSGFMT=	yes
 
 CONFLICTS=	ORBit<=0.5.3
 
diff --git a/devel/ptl2/Makefile b/devel/ptl2/Makefile
index d4d5f6c664e..0ffe823a058 100644
--- a/devel/ptl2/Makefile
+++ b/devel/ptl2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2001/02/16 14:38:58 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2001/03/27 03:19:53 hubertf Exp $
 
 DISTNAME=		PTL-2.1.7
 PKGNAME=		ptl-2.1.7
@@ -11,7 +11,7 @@ MAINTAINER=		msaitoh@netbsd.org
 HOMEPAGE=		http://www.media.osaka-cu.ac.jp/~k-abe/PTL/
 COMMENT=		Portable user-level Thread Library 2 written by Kota Abe
 
-BUILD_DEPENDS=		${PERL5}:../../lang/perl5-base
+BUILD_DEPENDS=		perl-5.*:../../lang/perl5
 
 MAKE_ENV=		INSTALL_PROGRAM="${INSTALL_SCRIPT}"
 PLIST_SRC=		${WRKDIR}/PLIST
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index bccecd9e1ce..0a578f79092 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/03/05 12:40:25 skrll Exp $
+# $NetBSD: Makefile,v 1.9 2001/03/27 03:19:53 hubertf Exp $
 #
 
 DISTNAME=	pwlib_min_1.1pl17
@@ -19,7 +19,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.openh323.org/
 COMMENT=	Portable Windows Libary
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/bison:../../devel/bison
+BUILD_DEPENDS=	bison-*:../../devel/bison
 DEPENDS+=	unproven-pthreads>=0.17:../../devel/unproven-pthreads
 
 WRKSRC=		${WRKDIR}/pwlib
diff --git a/devel/tavrasm/Makefile b/devel/tavrasm/Makefile
index 262ff988878..ae36aabd84c 100644
--- a/devel/tavrasm/Makefile
+++ b/devel/tavrasm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/25 04:17:43 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2001/03/27 03:19:53 hubertf Exp $
 #
 
 DISTNAME=	tavrasm
@@ -10,7 +10,7 @@ MAINTAINER=	dillo@giga.or.at
 HOMEPAGE=	http://www.tavrasm.org/
 COMMENT=	assembler for the Atmel AVR series of microcontrollers
 
-BUILD_DEPENDS+=	bison:../../devel/bison
+BUILD_DEPENDS+=	bison-*:../../devel/bison
 
 WRKSRCTOP=	${WRKDIR}/tavrasm.115
 WRKSRC=		${WRKSRCTOP}/src
diff --git a/devel/w32api/Makefile b/devel/w32api/Makefile
index 97d9f6f5296..8f0e70a639c 100644
--- a/devel/w32api/Makefile
+++ b/devel/w32api/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/28 10:45:30 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:53 hubertf Exp $
 
 DISTNAME=		w32api-0.4-20001122-bjy
 PKGNAME=		w32api-0.4nb2
@@ -10,7 +10,7 @@ MAINTAINER=		oki@yha.att.ne.jp
 HOMEPAGE=		http://www.acc.umu.se/~anorland/gnu-win32/
 COMMENT=		Free headers and libraries for the Win32 API
 
-BUILD_DEPENDS+=		${PREFIX}/cross/i386-netbsdpe/bin/gcc:../../cross/i386-netbsdpe
+BUILD_DEPENDS+=		cross-i386-netbsdpe-1.1.4:../../cross/i386-netbsdpe
 
 #HAS_CONFIGURE=		yes
 #CONFIGURE_ARGS+=	"--prefix=${PREFIX}/cross/i386-netbsdpe"