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>

11 files changed, 26 insertions, 26 deletions

diff --git a/security/PAM/Makefile b/security/PAM/Makefile
index 1ce5cfcbea3..d2767115607 100644
--- a/security/PAM/Makefile
+++ b/security/PAM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 17:49:38 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/03/27 03:20:14 hubertf Exp $
 #
 
 DISTNAME=	Linux-${PKGNAME}
@@ -10,7 +10,7 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.kernel.org/pub/linux/libs/pam/
 COMMENT=	Pluggable Authentication Modules
 
-BUILD_DEPENDS+=	bison:../../devel/bison
+BUILD_DEPENDS+=	bison-*:../../devel/bison
 DEPENDS+=	libcrack-*:../../security/libcrack
 
 USE_GMAKE=	YES
diff --git a/security/aide/Makefile b/security/aide/Makefile
index 22b2e2ac2c3..0cf56d66237 100644
--- a/security/aide/Makefile
+++ b/security/aide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/17 17:49:39 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/03/27 03:20:14 hubertf Exp $
 #
 
 DISTNAME=       aide-0.6
@@ -10,7 +10,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.cs.tut.fi/~rammer/aide.html
 COMMENT=	free intrusion detection system for checking file integrity
 
-BUILD_DEPENDS+=	bison:../../devel/bison
+BUILD_DEPENDS+=	bison-*:../../devel/bison
 
 GNU_CONFIGURE=	yes
 #don't set YACC so configure can correctly find bison
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 63709f45c50..99e4dbd3571 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/03/04 03:26:51 assar Exp $
+# $NetBSD: Makefile,v 1.14 2001/03/27 03:20:15 hubertf Exp $
 
 DISTNAME=		cyrus-sasl-1.5.24
 PKGNAME=		${DISTNAME}nb3
@@ -10,7 +10,7 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://asg2.web.cmu.edu/sasl/
 COMMENT=		Simple Authentication and Security Layer
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/automake:../../devel/automake
+BUILD_DEPENDS+=		automake-1.4:../../devel/automake
 
 GNU_CONFIGURE=		# defined
 USE_SSL=		# defined
diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile
index 9b31a24fc67..5e6daa1ec60 100644
--- a/security/dsniff/Makefile
+++ b/security/dsniff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/17 17:49:42 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/03/27 03:20:15 hubertf Exp $
 # $OpenBSD: Makefile,v 1.13 2000/06/19 18:38:55 dugsong Exp $
 
 DISTNAME=	dsniff-2.3
@@ -13,7 +13,7 @@ DEPENDS+=	libnet-*:../../devel/libnet
 # libnids provides static library only, thus it isn't necessary at run-time,
 # only at compile-time.
 #
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libnids.a:../../net/libnids
+BUILD_DEPENDS+=	libnids-1.14:../../net/libnids
 
 GNU_CONFIGURE=	yes
 USE_X11=	yes
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 0f9f5cb9dc6..cd7466b316d 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/02/17 17:49:45 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2001/03/27 03:20:15 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp
 #
 
@@ -17,7 +17,7 @@ MAINTAINER=	wiz@netbsd.org
 HOMEPAGE=	http://www.gnupg.org/
 COMMENT=	Privacy Guard, a public-Key encryption and digital signature utility
 
-BUILD_DEPENDS+=	msgfmt:../../devel/gettext
+BUILD_USES_MSGFMT=	yes
 
 CRYPTO=		yes
 GNU_CONFIGURE=	yes
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 3369b664b7a..61e4c26ac88 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2001/03/22 08:49:28 itojun Exp $
+# $NetBSD: Makefile,v 1.44 2001/03/27 03:20:15 hubertf Exp $
 
 DISTNAME=		openssh-2.5.2p2
 CATEGORIES=		security
@@ -12,8 +12,8 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.openssh.com/
 COMMENT=		Open Source Secure shell client and server (remote login program)
 
-BUILD_DEPENDS+=		${PERL5}:../../lang/perl5-base
-BUILD_DEPENDS+=		${LOCALBASE}/bin/autoreconf:../../devel/autoconf
+BUILD_DEPENDS+=		perl-5.*:../../lang/perl5
+BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
 
 CRYPTO=			yes
 
diff --git a/security/pakemon/Makefile b/security/pakemon/Makefile
index 261f4b5c0ac..82ed3f6948e 100644
--- a/security/pakemon/Makefile
+++ b/security/pakemon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 17:50:00 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/03/27 03:20:15 hubertf Exp $
 
 DISTNAME=	pakemon-0.3.1
 CATEGORIES=	security
@@ -12,8 +12,8 @@ DEPENDS+=	libnet-*:../../devel/libnet
 # libnids provides static library only, thus it isn't necessary at run-time,
 # only at compile-time.
 #
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libnids.a:../../net/libnids
-BUILD_DEPENDS+=	${LOCALBASE}/bin/autoreconf:../../devel/autoconf
+BUILD_DEPENDS+=	libnids-1.14:../../net/libnids
+BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
 
 GNU_CONFIGURE=	yes
 
diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile
index 83e971b1b9a..d5828115560 100644
--- a/security/pgp5/Makefile
+++ b/security/pgp5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/02/25 04:18:13 hubertf Exp $
+# $NetBSD: Makefile,v 1.13 2001/03/27 03:20:16 hubertf Exp $
 #
 
 DISTNAME=	pgp50i-unix-src
@@ -16,9 +16,9 @@ MASTER_SITES=	ftp://ftp.pgpi.com/pub/pgp/5.0/unix/ \
 
 MAINTAINER=	mjl@netbsd.org
 HOMEPAGE=       http://www.pgpi.com/
-COMMENT=       New, international, Public-Key encryption and digital signature utility
+COMMENT=	New, international, Public-Key encryption and digital signature utility
 
-BUILD_DEPENDS=	${PERL5}:../../lang/perl5-base
+BUILD_DEPENDS=	perl-5.*:../../lang/perl5
 
 CRYPTO=		YES
 GNU_CONFIGURE=	YES
diff --git a/security/srp_client/Makefile b/security/srp_client/Makefile
index ab76b5a0a33..f6899edd5c4 100644
--- a/security/srp_client/Makefile
+++ b/security/srp_client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/03/23 10:31:51 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2001/03/27 03:20:16 hubertf Exp $
 #
 
 DISTNAME=		srp-1.4.4
@@ -10,8 +10,8 @@ MAINTAINER=		jlam@netbsd.org
 #HOMEPAGE=		http://srp.stanford.edu/srp/
 COMMENT=		client programs using Secure Remote Password protocol
 
-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+=		gmp>=2.0.2:../../devel/gmp
 
 CRYPTO=			yes
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 19313cc574f..854df3daa46 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/02/17 17:50:12 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2001/03/27 03:20:16 hubertf Exp $
 #
 
 DISTNAME=		stunnel-3.13
@@ -9,7 +9,7 @@ MAINTAINER=		martin@NetBSD.ORG
 HOMEPAGE=		http://www.stunnel.org/
 COMMENT=		Universal SSL tunnel
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/autoreconf:../../devel/autoconf
+BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
 DEPENDS+=		pth>=1.3.5:../../devel/pth
 
 USE_SSL=		# defined
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 10872442332..0f559dfcde8 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2001/03/04 03:26:52 assar Exp $
+# $NetBSD: Makefile,v 1.34 2001/03/27 03:20:16 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/11/12 03:24:41 obrien Exp
 #
 
@@ -14,7 +14,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.courtesan.com/sudo/
 COMMENT=		Allow others to run commands as root
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/autoconf:../../devel/autoconf
+BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
 
 .include "../../mk/bsd.prefs.mk"