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, 31 insertions, 22 deletions

diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index f076290311b..30b98380927 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/16 13:30:33 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/03/27 03:19:45 hubertf Exp $
 
 DISTNAME=	aumix-2.7
 CATEGORIES=	audio
@@ -12,7 +12,8 @@ MAINTAINER=	trevor@jpj.net
 HOMEPAGE=	http://jpj.net/~trevor/aumix.html
 COMMENT=	Set mix levels
 
-BUILD_DEPENDS+=	msgfmt:../../devel/gettext
+BUILD_USES_MSGFMT=	yes
+
 DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 
 USE_CURSES=	yes
diff --git a/audio/cdd/Makefile b/audio/cdd/Makefile
index d2bdaca521e..90697586cfc 100644
--- a/audio/cdd/Makefile
+++ b/audio/cdd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/16 13:30:33 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/03/27 03:19:45 hubertf Exp $
 
 DISTNAME=	cdd-1.0nb3
 CATEGORIES=	audio
@@ -7,7 +7,7 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 MAINTAINER=	thorpej@netbsd.org
 COMMENT=	Another program for reading CD digital audio from SCSI or ATAPI CD-ROM drives
 
-BUILD_DEPENDS+=	${PREFIX}/lib/libscsi.a:../../devel/libscsi
+BUILD_DEPENDS+=	libscsi-1.6:../../devel/libscsi
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/audio/csound/Makefile b/audio/csound/Makefile
index 22178b47512..0814678cf33 100644
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/03/13 13:18:24 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/03/27 03:19:45 hubertf Exp $
 #
 
 DISTNAME=		unofficial-csound-4.09.0.0b-linux.src
@@ -10,7 +10,7 @@ MAINTAINER=		collver@softhome.net
 HOMEPAGE=		http://www.csound.org
 COMMENT=		software synthesizer and sequencer
 
-BUILD_DEPENDS+=         ${LOCALBASE}/bin/autoreconf:../../devel/autoconf
+BUILD_DEPENDS+=         autoconf-2.13:../../devel/autoconf
 
 LICENSE=		csound-license
 NO_SRC_ON_CDROM=	"no for-fee-redistribution"
diff --git a/audio/eawpatches/Makefile b/audio/eawpatches/Makefile
index 76f13e7a938..117da6535f8 100644
--- a/audio/eawpatches/Makefile
+++ b/audio/eawpatches/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/03/16 12:52:31 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:45 hubertf Exp $
 #
 
 DISTNAME=	eawpats-full-10
@@ -11,7 +11,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.stardate.bc.ca/eawpatches/
 COMMENT=	Eric A. Welsh' patches (audio samples) for TiMidity
 
-BUILD_DEPENDS=  unrar:../../archivers/unrar
+BUILD_DEPENDS=  unrar-*:../../archivers/unrar
 
 CONFLICTS=	guspatches-*
 
diff --git a/audio/gogo/Makefile b/audio/gogo/Makefile
index 7ffb8e9455b..0e45f44e480 100644
--- a/audio/gogo/Makefile
+++ b/audio/gogo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/16 13:30:41 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:45 hubertf Exp $
 #
 
 DISTNAME=		gogo235
@@ -11,7 +11,7 @@ MAINTAINER=		uebs@gmx.at
 HOMEPAGE=		http://homepage1.nifty.com/herumi/gogo_e.html
 COMMENT=		very fast lame-based mp3 encoder, i386 only
 
-BUILD_DEPENDS+=		nasm:../../devel/nasm
+BUILD_DEPENDS+=		nasm-0.98:../../devel/nasm
 
 ONLY_FOR_PLATFORM=	*-*-i386
 
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index 1c9ae228544..b0938e508d5 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2001/03/25 16:21:51 hubertf Exp $
+# $NetBSD: Makefile,v 1.33 2001/03/27 03:19:46 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.6 1998/12/28 01:02:05 vanilla Exp
 
 DISTNAME=		gqmpeg-0.8.3
@@ -10,8 +10,9 @@ MAINTAINER=		rxg@ms25.url.com.tw
 HOMEPAGE=		http://gqmpeg.sourceforge.net/
 COMMENT=		GTK+ front end to mpg123
 
+BUILD_USES_MSGFMT=	yes
+
 DEPENDS+=		gdk-pixbuf>=0.8.0nb1:../../graphics/gdk-pixbuf
-BUILD_DEPENDS+=		msgfmt:../../devel/gettext
 DEPENDS+=		gtk+-1.2.*:../../x11/gtk
 DEPENDS+=		mpg123-0.59r:../../audio/mpg123
 
diff --git a/audio/krio/Makefile b/audio/krio/Makefile
index bde3e16e43c..f5c4756fac9 100644
--- a/audio/krio/Makefile
+++ b/audio/krio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/03/04 09:06:09 tron Exp $
+# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:46 hubertf Exp $
 
 DISTNAME=	Krio-19990721
 PKGNAME=	krio-19990721
@@ -15,8 +15,6 @@ USE_X11BASE=	yes
 
 RIODIR=		${PKGSRCDIR}/audio/rio/${WRKDIR:T}/rio107
 
-BUILD_DEPENDS+=	${RIODIR}/rio.cpp:../../audio/rio:configure
-
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
 DEPENDS+=	kdelibs-1.1.2:../../x11/kdelibs
 DEPENDS+=	png>1.0.9:../../graphics/png
@@ -29,4 +27,12 @@ EVAL_PREFIX=	QT1DIR=qt1 KDEDIR=kdelibs
 MAKE_ENV+=	QT1DIR=${QT1DIR} KDEDIR=${KDEDIR}
 MAKE_ENV+=	RIODIR=${RIODIR} X11PREFIX=${X11PREFIX}
 
+pre-configure:
+	if [ ! -e ${RIODIR} ]; then					\
+		cd ../../audio/rio && ${MAKE} configure;		\
+	fi
+
+pre-clean:
+	cd ../../audio/rio && ${MAKE} clean
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index bb5ffc8527e..4e2ca5d5c39 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/03/20 09:57:36 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/03/27 03:19:46 hubertf Exp $
 
 DISTNAME=	libao-0.6.0
 PKGNAME=	${DISTNAME}nb1
@@ -8,8 +8,8 @@ MASTER_SITES=	http://www.vorbis.com/files/beta4/unix/
 MAINTAINER=	reed@reedmedia.net
 COMMENT=	cross-platform audio library
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/automake:../../devel/automake
-BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf:../../devel/autoconf
+BUILD_DEPENDS+=	automake-1.4:../../devel/automake
+BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
 
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
diff --git a/audio/madplay/Makefile b/audio/madplay/Makefile
index fcb68d13d4e..c15a0562486 100644
--- a/audio/madplay/Makefile
+++ b/audio/madplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/03/25 11:34:57 simonb Exp $
+# $NetBSD: Makefile,v 1.14 2001/03/27 03:19:46 hubertf Exp $
 #
 
 DISTNAME=	mad-0.12.5b
@@ -11,7 +11,7 @@ MAINTAINER=	simonb@netbsd.org
 HOMEPAGE=	http://sourceforge.net/projects/mad/
 COMMENT=	High-quality MPEG audio decoder
 
-BUILD_DEPENDS+= msgfmt:../../devel/gettext
+BUILD_USES_MSGFMT=	yes
 
 GNU_CONFIGURE=	YES
 USE_LIBINTL=	YES
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 110a9be78b3..cda49109d56 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2001/02/16 13:30:49 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2001/03/27 03:19:46 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/06/13 16:17:01 ache Exp
 #
 
@@ -11,7 +11,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://rplay.doit.org/
 COMMENT=	Network audio player
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/autoreconf:../../devel/autoconf
+BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
+
 DEPENDS+=	gsm-1.0.10:../../audio/gsm
 DEPENDS+=	rx-1.5:../../devel/rx