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>

10 files changed, 28 insertions, 26 deletions

diff --git a/games/baduki/Makefile b/games/baduki/Makefile
index 740f99d7cc7..c490dfb2cfe 100644
--- a/games/baduki/Makefile
+++ b/games/baduki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/02/16 15:10:43 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2001/03/27 03:19:57 hubertf Exp $
 
 DISTNAME=	baduki-0.2.9
 CATEGORIES=	games
@@ -8,7 +8,8 @@ MAINTAINER=	bad@netbsd.org
 HOMEPAGE=	http://soback.kornet21.net/~artist/baduk/baduki.html
 COMMENT=	Go playing program based on xamigo
 
-BUILD_DEPENDS+=	msgfmt:../../devel/gettext
+BUILD_USES_MSGFMT=	yes
+
 DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 
 USE_X11=	yes
diff --git a/games/freeciv-client-gtk/Makefile b/games/freeciv-client-gtk/Makefile
index c6877dd9a9a..4523617a08b 100644
--- a/games/freeciv-client-gtk/Makefile
+++ b/games/freeciv-client-gtk/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 15:10:48 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:57 hubertf Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-gtk-/}
 
 COMMENT=		Freeciv client with GTK+ interface
 
+BUILD_USES_MSGFMT=	yes
+
 DEPENDS+=		freeciv-share-${FC_VERS}:../../games/freeciv-share
-BUILD_DEPENDS+=		msgfmt:../../devel/gettext
 DEPENDS+=		gtk+-1.2.*:../../x11/gtk
 DEPENDS+=		imlib-*:../../graphics/imlib
 
diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common
index 8a491aa396c..4159a3156f3 100644
--- a/games/freeciv-share/Makefile.common
+++ b/games/freeciv-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2001/02/26 17:01:59 jlam Exp $
+# $NetBSD: Makefile.common,v 1.6 2001/03/27 03:19:57 hubertf Exp $
 
 DISTNAME=		freeciv-${FC_VERS}
 FC_VERS=		1.11.4
@@ -10,8 +10,8 @@ EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.freeciv.org/
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/autoreconf:../../devel/autoconf
-BUILD_DEPENDS+=		msgfmt:../../devel/gettext
+BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
+BUILD_USES_MSGFMT=	yes
 
 FILESDIR=		${.CURDIR}/../../games/freeciv-share/files
 PATCHDIR=		${.CURDIR}/../../games/freeciv-share/patches
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 3f656f74f13..01ef0637363 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/02/26 20:19:44 tron Exp $
+# $NetBSD: Makefile,v 1.23 2001/03/27 03:19:57 hubertf Exp $
 
 DISTNAME=		gnome-games-1.2.0
 CATEGORIES=		games gnome
@@ -8,9 +8,9 @@ MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME games collection
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/autoconf:../../devel/autoconf
-BUILD_DEPENDS+=		${LOCALBASE}/bin/automake:../../devel/automake
-BUILD_DEPENDS+=		gettextize:../../devel/gettext
+BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
+BUILD_DEPENDS+=		automake-1.4:../../devel/automake
+BUILD_USES_MSGFMT=	yes
 DEPENDS+=		gnome-core-*:../../x11/gnome-core
 # Required for ports which don't build "libgtop".
 DEPENDS+=		guile-[0-9]*:../../lang/guile
diff --git a/games/quake6/Makefile b/games/quake6/Makefile
index c1c340079c8..95147638abe 100644
--- a/games/quake6/Makefile
+++ b/games/quake6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/16 15:10:58 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/03/27 03:19:57 hubertf Exp $
 
 DISTNAME=	quake-v6-bsd-kame
 PKGNAME=	quake6-0.0
@@ -14,7 +14,7 @@ HOMEPAGE=	http://www.viagenie.qc.ca/en/ipv6-quake.shtml
 COMMENT=	Quake over IPv6
 
 DEPENDS=	quakedata-*:../../games/quakedata
-BUILD_DEPENDS=	${LOCALBASE}/bin/autoreconf:../../devel/autoconf
+BUILD_DEPENDS=	autoconf-2.13:../../devel/autoconf
 
 WRKSRC=		${WRKDIR}/quakeforge
 
diff --git a/games/quakedata/Makefile b/games/quakedata/Makefile
index e8adfe08350..c07a6772f09 100644
--- a/games/quakedata/Makefile
+++ b/games/quakedata/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/20 11:40:10 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/03/27 03:19:58 hubertf Exp $
 # Based on FreeBSD ports/games/quakeserver
 # FreeBSD: ports/games/quakeserver/Makefile,v 1.20 1999/08/31 06:44:23 mharo Exp
 #
@@ -14,7 +14,7 @@ MAINTAINER=	itojun@kame.net
 HOMEPAGE=	http://www.idsoftware.com/
 COMMENT=	Game data files for Quake
 
-BUILD_DEPENDS+=	lha:../../archivers/lha
+BUILD_DEPENDS+=	lha-114f:../../archivers/lha
 
 LICENSE+=		shareware
 RESTRICTED=		"This software is shareware"
diff --git a/games/sl/Makefile b/games/sl/Makefile
index 31b3f40e7f6..31c32b2b510 100644
--- a/games/sl/Makefile
+++ b/games/sl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 15:10:58 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:58 hubertf Exp $
 #
 
 DISTNAME=	sl
@@ -15,7 +15,7 @@ MAINTAINER=	minoura@netbsd.org
 HOMEPAGE=	http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/
 COMMENT=	Animated SL that runs across the terminal when you type `sl' instead of `ls'
 
-BUILD_DEPENDS=	nkf:../../japanese/nkf
+BUILD_DEPENDS=	nkf-1.7:../../japanese/nkf
 
 post-build:
 	nkf -e ${WRKSRC}/sl.1 > ${WRKSRC}/sl.1.euc
diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile
index 2c0e4272c5d..8072c0a7325 100644
--- a/games/xdoom/Makefile
+++ b/games/xdoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/02/25 04:17:50 hubertf Exp $
+# $NetBSD: Makefile,v 1.14 2001/03/27 03:19:58 hubertf Exp $
 
 DISTNAME=	linuxdoom-1.10
 PKGNAME=	xdoom-1.10nb1
@@ -12,7 +12,7 @@ MAINTAINER=	root@garbled.net
 HOMEPAGE=	http://www.idsoftware.com/archives/doomarc.html
 COMMENT=	3D shoot-em-up for 8-bit X11 displays
 
-BUILD_DEPENDS=	unzip:../../archivers/unzip
+BUILD_DEPENDS=	unzip-*:../../archivers/unzip
 
 LICENSE=	shareware
 
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index 90403d3e027..0e55c960a18 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/16 15:11:04 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/03/27 03:19:58 hubertf Exp $
 
 DISTNAME=		xpuyopuyo-0.9.1
 CATEGORIES=		games x11
@@ -9,8 +9,8 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://chaos2.org/xpuyopuyo/
 COMMENT=		Tetris-like puzzle game
 
-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.*:../../x11/gtk
 DEPENDS+=		libmikmod>=3.1.9:../../audio/libmikmod
 
diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index b6ff11873c6..eec24c9ea49 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/02/16 15:11:04 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/03/27 03:19:59 hubertf Exp $
 #
 
 DISTNAME=		xracer-0.96.9
@@ -9,10 +9,10 @@ MAINTAINER=		bsieker@freenet.de
 HOMEPAGE=		http://xracer.annexia.org/
 COMMENT=		XRacer is a clone of the popular Psygnosis game Wipeout
 
-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+=		jpeg-*:../../graphics/jpeg
-BUILD_DEPENDS+=		msgfmt:../../devel/gettext
+BUILD_USES_MSGFMT=	yes
 
 USE_X11=		# defined
 USE_MESA=		# defined