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>

7 files changed, 14 insertions, 14 deletions

diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index fd1828563f4..c31f0f20811 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/17 18:38:11 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/03/27 03:19:54 hubertf Exp $
 
 DISTNAME=	Atari800-0.9.9a
 PKGNAME=	atari800-0.9.9a
@@ -11,7 +11,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://cas3.zlin.vutbr.cz/~stehlik/a800.htm
 COMMENT=	Atari 8-bit computer, 5200 console emulator
 
-BUILD_DEPENDS=	unzip:../../archivers/unzip
+BUILD_DEPENDS=	unzip-*:../../archivers/unzip
 
 RESTRICTED=		"copyrighted ROM images"
 NO_SRC_ON_FTP=		${RESTRICTED}
diff --git a/emulators/linux-locale/Makefile b/emulators/linux-locale/Makefile
index 78d1a2a40e2..67666378205 100644
--- a/emulators/linux-locale/Makefile
+++ b/emulators/linux-locale/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/02/17 18:38:18 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2001/03/27 03:19:54 hubertf Exp $
 #
 
 DISTNAME=	locales-2.1-1mdk
@@ -12,7 +12,7 @@ MAINTAINER=	sakamoto@netbsd.org
 HOMEPAGE=	http://www.linuxi18n.org/locales/
 COMMENT=	Locales for Linux
 
-BUILD_DEPENDS+=	rpm2cpio:../../misc/rpm
+BUILD_DEPENDS+=	rpm-*:../../misc/rpm
 
 .include "../../mk/bsd.prefs.mk"
 .if !defined(LINUX_LOCALES)
diff --git a/emulators/linuxppc_lib/Makefile b/emulators/linuxppc_lib/Makefile
index a9aeacd806d..cff22aece8b 100644
--- a/emulators/linuxppc_lib/Makefile
+++ b/emulators/linuxppc_lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/03/16 15:52:57 kei Exp $
+# $NetBSD: Makefile,v 1.8 2001/03/27 03:19:55 hubertf Exp $
 
 DISTNAME=		linuxppc_lib-2000.q4.2
 CATEGORIES=		emulators
@@ -15,7 +15,7 @@ MAINTAINER=		p99dreyf@criens.u-psud.fr
 HOMEPAGE=		http://www.linuxppc.org/
 COMMENT=		libraries to run Linux binaries on NetBSD/powerpc (includes X11)
 
-BUILD_DEPENDS+=		rpm2pkg:../../pkgtools/rpm2pkg
+BUILD_DEPENDS+=		rpm2pkg-1.2:../../pkgtools/rpm2pkg
 
 ONLY_FOR_PLATFORM=	NetBSD-*-macppc NetBSD-*-powerpc NetBSD-*-prep \
 			NetBSD-*-bebox NetBSD-*-ofppc NetBSD-*-amigappc
diff --git a/emulators/osf1_lib/Makefile b/emulators/osf1_lib/Makefile
index 2e5dcd4123e..d1a1b029516 100644
--- a/emulators/osf1_lib/Makefile
+++ b/emulators/osf1_lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/03/11 23:22:50 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.2 2001/03/27 03:19:55 hubertf Exp $
 
 DISTNAME=	netscape-4.7-3.alpha
 PKGNAME=	osf1_lib-1.0
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.support.compaq.com/alpha-tools/software/index.html
 COMMENT=	DEC/Compaq OSF-1/Tru64 compatibility package for netscape
 
 RPM2PKG=	${LOCALBASE}/sbin/rpm2pkg
-BUILD_DEPENDS+=	${RPM2PKG}:../../pkgtools/rpm2pkg
+BUILD_DEPENDS+=	rpm2pkg-1.2:../../pkgtools/rpm2pkg
 
 ONLY_FOR_PLATFORM=	NetBSD-*-alpha
 
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 1a8934db30a..6e55925684c 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/17 18:38:22 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/03/27 03:19:55 hubertf Exp $
 
 DISTNAME=		s9xs132
 PKGNAME=		snes9x-1.32
@@ -11,7 +11,7 @@ MAINTAINER=		jmcneill@invisible.yi.org
 HOMEPAGE=		http://www.snes9x.com/
 COMMENT=		Super Nintendo Entertainment System (SNES) emulator
 
-BUILD_DEPENDS+=		nasm:../../devel/nasm
+BUILD_DEPENDS+=		nasm-0.98:../../devel/nasm
 
 USE_X11=		yes
 USE_GMAKE=		yes
diff --git a/emulators/suse_linux/Makefile.common b/emulators/suse_linux/Makefile.common
index 0e3b1101496..001bb5993b4 100644
--- a/emulators/suse_linux/Makefile.common
+++ b/emulators/suse_linux/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2001/01/25 09:09:54 tron Exp $
+# $NetBSD: Makefile.common,v 1.5 2001/03/27 03:19:56 hubertf Exp $
 
 SUSE_VERSION?=		6.4
 
@@ -13,7 +13,7 @@ EMULSUBDIR=		emul/linux
 EMULDIR=		${PREFIX}/${EMULSUBDIR}
 
 RPM2PKG=		${PREFIX}/sbin/rpm2pkg
-BUILD_DEPENDS+=		${RPM2PKG}:../../pkgtools/rpm2pkg
+BUILD_DEPENDS+=		rpm2pkg-1.2:../../pkgtools/rpm2pkg
 
 # The SuSE Linux packages have circular dependencies.
 LDD?=			${TRUE}
diff --git a/emulators/xm7/Makefile b/emulators/xm7/Makefile
index 0c23923b201..f83b0bcd990 100644
--- a/emulators/xm7/Makefile
+++ b/emulators/xm7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/28 10:47:23 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/03/27 03:19:56 hubertf Exp $
 #
 
 DISTNAME=		xm71010s
@@ -11,7 +11,7 @@ MAINTAINER=		tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=		http://www.ipc-tokai.or.jp/~ytanaka/fm7/xm7.shtml
 COMMENT=		X11-based FM-7 emulator
 
-BUILD_DEPENDS+=		nkf:../../japanese/nkf
+BUILD_DEPENDS+=		nkf-1.7:../../japanese/nkf
 
 WRKSRC=			${WRKDIR}/vm
 RESTRICTED=		source archive is not redistributable