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>

8 files changed, 16 insertions, 16 deletions

diff --git a/lang/cim/Makefile b/lang/cim/Makefile
index 5b8029f00dc..79639976009 100644
--- a/lang/cim/Makefile
+++ b/lang/cim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 09:07:01 agc Exp $
+# $NetBSD: Makefile,v 1.7 2001/03/27 03:20:03 hubertf Exp $
 
 DISTNAME=		cim-3.30
 CATEGORIES=		lang
@@ -8,7 +8,7 @@ MAINTAINER=		jtb@netbsd.org
 HOMEPAGE=		http://www.gnu.org/software/cim/cim.html
 COMMENT=		Simula compiler based on the C programming language
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/autoreconf:../../devel/autoconf
+BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 048daf329a5..3ae2579a69f 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/03/01 02:10:22 hubertf Exp $
+# $NetBSD: Makefile,v 1.20 2001/03/27 03:20:03 hubertf Exp $
 
 DISTNAME=		gcc-2.95.2
 CATEGORIES=		lang
@@ -8,7 +8,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnu.org/software/gcc/gcc.html
 COMMENT=		GNU Compiler Collection
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/bison:../../devel/bison
+BUILD_DEPENDS+=		bison-*:../../devel/bison
 
 # The platforms listed below are the only tested platforms so far.
 # If you get gcc working on other platforms, then please add them.
diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile
index 86a33bc71e5..327690e27bf 100644
--- a/lang/moscow_ml/Makefile
+++ b/lang/moscow_ml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/02/25 04:17:56 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 2001/03/27 03:20:03 hubertf Exp $
 
 DISTNAME=       mos20src
 PKGNAME=        moscow_ml-2.00
@@ -11,7 +11,7 @@ MAINTAINER=	lamj@stat.cmu.edu
 HOMEPAGE=	http://www.dina.kvl.dk/~sestoft/mosml.html
 COMMENT=	Moscow ML, a version of Standard ML
 
-BUILD_DEPENDS+=	${PERL5}:../../lang/perl5-base
+BUILD_DEPENDS+=	perl-5.*:../../lang/perl5
 
 ALL_TARGET=	clean world
 
diff --git a/lang/pgcc/Makefile b/lang/pgcc/Makefile
index 6220997b08a..1a5b963c0f5 100644
--- a/lang/pgcc/Makefile
+++ b/lang/pgcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/03/07 15:52:02 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/03/27 03:20:03 hubertf Exp $
 
 DISTNAME=		gcc-2.95.2
 PKGNAME=		pgcc-2.95.2.1
@@ -13,7 +13,7 @@ MAINTAINER=		jmcneill@invisible.yi.org
 HOMEPAGE=		http://goof.com/pcg/
 COMMENT=		Pentium GNU Compiler Collection
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/bison:../../devel/bison
+BUILD_DEPENDS+=		bison-*:../../devel/bison
 
 # 'Pentium GCC' is optimized for the Intel Pentium processor, but should
 # work on all platforms on which GCC works.
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index c5865eca4de..a05e6d225ac 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/02/25 04:17:56 hubertf Exp $
+# $NetBSD: Makefile,v 1.20 2001/03/27 03:20:03 hubertf Exp $
 #
 
 DISTNAME=	ruby-1.4.6
@@ -15,7 +15,7 @@ MAINTAINER=	sakamoto@netbsd.org
 HOMEPAGE=	http://www.ruby-lang.org/
 COMMENT=	the Object-Oriented Script Language
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/bison:../../devel/bison
+BUILD_DEPENDS=	bison-*:../../devel/bison
 DEPENDS+=	gdbm>=1.7.3:../../databases/gdbm
 DEPENDS+=	readline>=4.0:../../devel/readline
 
diff --git a/lang/snobol/Makefile b/lang/snobol/Makefile
index 19a151e71c1..cffe4a46681 100644
--- a/lang/snobol/Makefile
+++ b/lang/snobol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 09:07:30 agc Exp $
+# $NetBSD: Makefile,v 1.5 2001/03/27 03:20:03 hubertf Exp $
 #
 
 DISTNAME=	snobol-0.99.4
@@ -12,7 +12,7 @@ MAINTAINER=	refling@comet.lbl.gov
 HOMEPAGE=	http://people.ne.mediaone.net/philbudne/snobol.html
 COMMENT=	Macro implementation of SNOBOL4 in C
 
-BUILD_DEPENDS=	unzip:../../archivers/unzip
+BUILD_DEPENDS=	unzip-*:../../archivers/unzip
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index cc9e88f4314..7c2777034e2 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/25 04:17:56 hubertf Exp $
+# $NetBSD: Makefile,v 1.12 2001/03/27 03:20:04 hubertf Exp $
 #
 
 DISTNAME=	Squeak2.7-src
@@ -11,7 +11,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.squeak.org/
 COMMENT=	Full Smalltalk 80 with portability to UN*X, Mac, and Windows
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf:../../devel/autoconf
+BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
 
 DIST_SUBDIR=	squeak
 EXTRACT_ONLY=	Squeak2.7-src.tar.gz
diff --git a/lang/swi-prolog/Makefile b/lang/swi-prolog/Makefile
index eeef0d9071f..f3918561e68 100644
--- a/lang/swi-prolog/Makefile
+++ b/lang/swi-prolog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/03/20 13:43:26 jtb Exp $
+# $NetBSD: Makefile,v 1.4 2001/03/27 03:20:04 hubertf Exp $
 
 DISTNAME=		pl-lite-4.0.0
 PKGNAME=		swi-prolog-4.0.0
@@ -10,7 +10,7 @@ HOMEPAGE=		http://www.swi.psy.uva.nl/projects/SWI-Prolog/
 COMMENT=		ISO/Edinburgh-style Prolog compiler
 
 DEPENDS+=		readline-[0-9]*:../../devel/readline
-BUILD_DEPENDS+=		${LOCALBASE}/bin/autoconf:../../devel/autoconf
+BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
 
 WRKSRC=			${WRKDIR}/${DISTNAME:S,-lite,,}
 DIST_SUBDIR=		swi-prolog