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>

5 files changed, 15 insertions, 15 deletions

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 64c04bbee6a..580f0046971 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2001/03/23 10:01:01 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2001/03/27 03:20:04 hubertf Exp $
 #
 
 DISTNAME=       fetchmail-5.7.2
@@ -11,8 +11,8 @@ MAINTAINER=	mycroft@netbsd.org
 HOMEPAGE=	http://www.tuxedo.org/~esr/fetchmail/
 COMMENT=	batch mail retrieval/forwarding utility for pop2, pop3, apop, imap
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/autoreconf:../../devel/autoconf
-BUILD_DEPENDS+=	msgfmt:../../devel/gettext
+BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
+BUILD_USES_MSGFMT=	yes
 
 USE_LIBINTL=	yes
 GNU_CONFIGURE=	yes
diff --git a/mail/mutt-unstable/Makefile b/mail/mutt-unstable/Makefile
index 2ec23d1b08b..1c43d37328d 100644
--- a/mail/mutt-unstable/Makefile
+++ b/mail/mutt-unstable/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/26 20:19:46 tron Exp $
+# $NetBSD: Makefile,v 1.5 2001/03/27 03:20:05 hubertf Exp $
 
 DISTNAME=	mutt-unstable-20010212
 PKGNAME=	mutt-1.3.14.20010212i
@@ -9,9 +9,9 @@ MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.mutt.org/
 COMMENT=	text-based MIME mail client with PGP support
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf:../../devel/autoconf
-BUILD_DEPENDS+=	${LOCALBASE}/bin/automake:../../devel/automake
-BUILD_DEPENDS+=	msgfmt:../../devel/gettext
+BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
+BUILD_DEPENDS+=	automake-1.4:../../devel/automake
+BUILD_USES_MSGFMT=	yes
 DEPENDS+=	libiconv>=1.5:../../converters/libiconv
 
 USE_LIBINTL=		YES
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 2c3345985ba..33dae6daf03 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2001/02/26 20:19:45 tron Exp $
+# $NetBSD: Makefile,v 1.69 2001/03/27 03:20:04 hubertf Exp $
 
 DISTNAME=	mutt-1.2.5i
 CATEGORIES=	mail
@@ -11,9 +11,9 @@ MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.mutt.org/
 COMMENT=	text-based MIME mail client with PGP support
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf:../../devel/autoconf
-BUILD_DEPENDS+=	${LOCALBASE}/bin/automake:../../devel/automake
-BUILD_DEPENDS+=	msgfmt:../../devel/gettext
+BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
+BUILD_DEPENDS+=	automake-1.4:../../devel/automake
+BUILD_USES_MSGFMT=	yes
 
 USE_LIBINTL=		YES
 MAKE_ENV+=		CPPFLAGS=-I${LOCALBASE}/include LIBS=-lintl
diff --git a/mail/p5-MailTools/Makefile b/mail/p5-MailTools/Makefile
index 18cdfe92b10..b937925ed4a 100644
--- a/mail/p5-MailTools/Makefile
+++ b/mail/p5-MailTools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/03/25 07:23:18 mjl Exp $
+# $NetBSD: Makefile,v 1.10 2001/03/27 03:20:05 hubertf Exp $
 
 DISTNAME=	MailTools-1.15
 PKGNAME=	p5-${DISTNAME}
@@ -8,7 +8,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Mail/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	perl5 modules related to mail applications
 
-BUILD_DEPENDS+=	${PERL5_SITEARCH}/auto/Net/.packlist:../../net/p5-Net
+BUILD_DEPENDS+=	p5-Net-1.0703:../../net/p5-Net
 
 USE_PERL5=	# defined
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Mail/.packlist
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index ced305a5281..043f58038d3 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/03/05 20:11:26 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2001/03/27 03:20:05 hubertf Exp $
 #
 
 DISTNAME=		xfmail-1.4.7
@@ -10,7 +10,7 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://xfmail.slappy.org/
 COMMENT=		Xforms based mail application for Unix operating systems
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/autoheader:../../devel/autoconf
+BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
 DEPENDS+=		gdbm>=1.7.3:../../databases/gdbm
 DEPENDS+=		xforms>=0.88nb1:../../x11/xforms
 DEPENDS+=		glib-*:../../devel/glib