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>

22 files changed, 50 insertions, 51 deletions

diff --git a/www/ap-auth-cookie/Makefile b/www/ap-auth-cookie/Makefile
index fb51b1934a1..a9e5b22ca97 100644
--- a/www/ap-auth-cookie/Makefile
+++ b/www/ap-auth-cookie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/02/17 17:21:43 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2001/03/27 03:20:20 hubertf Exp $
 #
 # There are a few more mod_auth_cookie's out there doing slightly
 # different things.  This one pkg would be a good place to dump them all in
@@ -17,7 +17,7 @@ COMMENT=	Cookie-based authentication for Apache
 
 DEPENDS+=	apache-1.3.*:../../www/apache
 # For "apxs":
-BUILD_DEPENDS=	${PERL5}:../../lang/perl5-base
+BUILD_DEPENDS=	perl-5.*:../../lang/perl5
 
 EXTRACT_CMD=	${DO_NADA}
 
diff --git a/www/ap-auth-ldap/Makefile b/www/ap-auth-ldap/Makefile
index e96d21a381b..5a36b3cde80 100644
--- a/www/ap-auth-ldap/Makefile
+++ b/www/ap-auth-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 17:21:44 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/03/27 03:20:20 hubertf Exp $
 
 DISTNAME=	auth_ldap-1.5.2
 PKGNAME=	ap-auth-ldap-1.5.2
@@ -13,7 +13,7 @@ DEPENDS+=	apache-1.3.*:../../www/apache
 DEPENDS+=	openldap-1.2.*:../../databases/openldap
 
 # For "apxs":
-BUILD_DEPENDS=	${PERL5}:../../lang/perl5-base
+BUILD_DEPENDS=	perl-5.*:../../lang/perl5
 
 do-build:
 	@cd ${WRKSRC} && ${LOCALBASE}/sbin/apxs -c			\
diff --git a/www/ap-auth-postgresql/Makefile b/www/ap-auth-postgresql/Makefile
index 9bd22e1d311..553c7fbde78 100644
--- a/www/ap-auth-postgresql/Makefile
+++ b/www/ap-auth-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 17:21:45 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/03/27 03:20:21 hubertf Exp $
 
 DISTNAME=	AuthPG-1.2b2
 PKGNAME=	ap-auth-postgresql-1.2b2
@@ -12,7 +12,7 @@ COMMENT=	Module to allow apache authentication against a Postgresql database
 DEPENDS+=	apache-1.3.*:../../www/apache
 DEPENDS+=	postgresql-*:../../databases/postgresql
 # For "apxs":
-BUILD_DEPENDS=	${PERL5}:../../lang/perl5-base
+BUILD_DEPENDS=	perl-5.*:../../lang/perl5
 
 CPPFLAGS+=	-I${LOCALBASE}/include/pgsql
 LIBS=		-lpq -lcrypt
diff --git a/www/ap-csacek/Makefile b/www/ap-csacek/Makefile
index 9524d1b4250..855f1a70b17 100644
--- a/www/ap-csacek/Makefile
+++ b/www/ap-csacek/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/17 17:21:46 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/03/27 03:20:21 hubertf Exp $
 #
 
 DISTNAME=	csacek-2.1.4
@@ -14,7 +14,7 @@ COMMENT=	on-fly code set recoder
 
 DEPENDS+=	apache*-1.3*:../../www/apache
 # For "apxs":
-BUILD_DEPENDS=	${PERL5}:../../lang/perl5-base
+BUILD_DEPENDS=	perl-5.*:../../lang/perl5
 
 HAS_CONFIGURE=	yes
 
diff --git a/www/ap-dtcl/Makefile b/www/ap-dtcl/Makefile
index 1401fbb0cb9..928a4f59a0f 100644
--- a/www/ap-dtcl/Makefile
+++ b/www/ap-dtcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/02/25 04:18:22 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 2001/03/27 03:20:21 hubertf Exp $
 
 DISTNAME=	mod_dtcl-0.8.12
 PKGNAME=	ap-dtcl-0.8.12
@@ -13,7 +13,7 @@ COMMENT=	Simple, fast Tcl server side scripting for apache
 DEPENDS+=	apache-1.3.*:../../www/apache
 DEPENDS+=	tcl>=8.3.2:../../lang/tcl
 # For "apxs":
-BUILD_DEPENDS=	${PERL5}:../../lang/perl5-base
+BUILD_DEPENDS=	perl-5.*:../../lang/perl5
 
 INCLUDES=	-I${PREFIX}/include/
 LIBS=		-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -ltcl83 -lm
diff --git a/www/ap-fastcgi/Makefile b/www/ap-fastcgi/Makefile
index 9097e9144a0..461bd5fccf5 100644
--- a/www/ap-fastcgi/Makefile
+++ b/www/ap-fastcgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/02/17 17:21:48 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2001/03/27 03:20:22 hubertf Exp $
 #
 
 DISTNAME=	mod_fastcgi_2.2.10
@@ -12,7 +12,7 @@ COMMENT=	New, improved CGI-like interface module for Apache
 
 DEPENDS+=	apache-1.3.*:../../www/apache
 # For "apxs":
-BUILD_DEPENDS=	${PERL5}:../../lang/perl5-base
+BUILD_DEPENDS=	perl-5.*:../../lang/perl5
 
 do-build:
 	@cd ${WRKSRC} && ${PREFIX}/sbin/apxs -c -o mod_fastcgi.so *.c
diff --git a/www/ap-jserv/Makefile b/www/ap-jserv/Makefile
index 8e7e834f1c7..cd9c4f6da18 100644
--- a/www/ap-jserv/Makefile
+++ b/www/ap-jserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/02/17 17:21:49 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2001/03/27 03:20:22 hubertf Exp $
 
 DISTNAME=	ApacheJServ-1.1.2
 PKGNAME=	ap-jserv-1.1.2
@@ -13,7 +13,7 @@ DEPENDS+=	apache>=1.3.9:../../www/apache
 # yes, this needs _exactly_ version 2.0
 DEPENDS+=	jsdk-2.0:../../www/jsdk20
 # For "apxs":
-BUILD_DEPENDS=	${PERL5}:../../lang/perl5-base
+BUILD_DEPENDS=	perl-5.*:../../lang/perl5
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/www/ap-php4/Makefile b/www/ap-php4/Makefile
index ca2195357eb..a19f890ad51 100644
--- a/www/ap-php4/Makefile
+++ b/www/ap-php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/17 17:21:52 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/03/27 03:20:22 hubertf Exp $
 
 .include "../../www/php4/Makefile.common"
 
@@ -12,7 +12,7 @@ DEPENDS+=		php-${PHP_VERS}:../../www/php4
 DEPENDS+=		apache>=1.3:../../www/apache
 
 # For "apxs":
-BUILD_DEPENDS+=		${PERL5}:../../lang/perl5-base
+BUILD_DEPENDS+=		perl-5.*:../../lang/perl5
 
 CONFIGURE_ARGS+=	--with-apxs=${LOCALBASE}/sbin/apxs
 
diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index 7ca78abc4d0..2255070379e 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2001/03/13 20:54:47 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2001/03/27 03:20:22 hubertf Exp $
 
 DISTNAME=		mod_ssl-2.8.1-1.3.19
 PKGNAME=		ap-ssl-2.8.1
@@ -11,7 +11,7 @@ COMMENT=		SSL/TLS protocols module for Apache
 
 DEPENDS+=		apache-1.3.19:../../www/apache
 # For "apxs":
-BUILD_DEPENDS+=		${PERL5}:../../lang/perl5-base
+BUILD_DEPENDS+=		perl-5.*:../../lang/perl5
 
 CONFLICTS=		apache-1.3.[0-9] apache-*modssl-* apache6-*
 
diff --git a/www/arena/Makefile b/www/arena/Makefile
index ed5e150639b..c30a957066f 100644
--- a/www/arena/Makefile
+++ b/www/arena/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2001/03/04 09:06:19 tron Exp $
+# $NetBSD: Makefile,v 1.33 2001/03/27 03:20:22 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.10 1998/05/04 20:22:31 jseger Exp
 #
 
@@ -11,8 +11,9 @@ MAINTAINER=		tv@netbsd.org
 HOMEPAGE=		http://www.yggdrasil.com/Products/Arena/
 COMMENT=		Experimental HTML 3 browser, supports math and style sheets
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/autoconf:../../devel/autoconf
-BUILD_DEPENDS+=		msgfmt:../../devel/gettext
+BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
+BUILD_USES_MSGFMT=	yes
+
 DEPENDS+=		jpeg-6b:../../graphics/jpeg
 DEPENDS+=		libwww>=5.2.8:../../www/libwww
 DEPENDS+=		png>1.0.9:../../graphics/png
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 168eec8a5d0..d683f67205e 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/02/22 14:57:41 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2001/03/27 03:20:23 hubertf Exp $
 #
 
 DISTNAME=	bluefish-0.6
@@ -15,8 +15,9 @@ MAINTAINER=	wulf@ping.net.au
 HOMEPAGE=	http://bluefish.openoffice.nl/
 COMMENT=	GTK HTML editor for the experienced web designer
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/autoreconf:../../devel/autoconf
-BUILD_DEPENDS+=	msgfmt:../../devel/gettext
+BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
+BUILD_USES_MSGFMT=	yes
+
 DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 DEPENDS+=	imlib-*:../../graphics/imlib
 DEPENDS+=	weblint-*:../../www/weblint
diff --git a/www/cgilib/Makefile b/www/cgilib/Makefile
index d7ffda3d22a..1b45ab49b8f 100644
--- a/www/cgilib/Makefile
+++ b/www/cgilib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:22:00 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/03/27 03:20:23 hubertf Exp $
 #
 
 DISTNAME=	cgilib-0.5
@@ -9,6 +9,6 @@ MAINTAINER=	wulf@ping.net.au
 HOMEPAGE=	http://www.infodrom.north.de/cgilib/
 COMMENT=	Common gateway interface library
 
-BUILD_DEPENDS+= rman:../../textproc/rman
+BUILD_DEPENDS+= rman-3.0.9:../../textproc/rman
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/jsdk20/Makefile b/www/jsdk20/Makefile
index 5f85f7c28ef..1db36e8e16c 100644
--- a/www/jsdk20/Makefile
+++ b/www/jsdk20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/02/25 04:18:23 hubertf Exp $
+# $NetBSD: Makefile,v 1.14 2001/03/27 03:20:23 hubertf Exp $
 # STOP!  Don't update this to a later version of this software.
 # The JSDK and Apache Jakarta projects have merged, making the
 # jakarta-tomcat package the current version of this software.
@@ -15,7 +15,7 @@ MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://java.sun.com/products/servlet/index.html
 COMMENT=	Sun's Java Servlet Development Kit, version 2.0
 
-BUILD_DEPENDS+=        ${LOCALBASE}/bin/urlget:../../www/urlget
+BUILD_DEPENDS+=        urlget-1.3:../../www/urlget
 
 LICENSE=	sun-jsdk20-license
 USE_JAVA=	yes
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index 01d59e1b5f0..916f1f24902 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/02/17 17:22:12 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2001/03/27 03:20:23 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.10 1998/06/14 23:34:59 jseger Exp
 #
 
@@ -12,7 +12,7 @@ MAINTAINER=		tv@netbsd.org
 HOMEPAGE=		http://www.w3.org/Library/
 COMMENT=		The W3C Reference Library
 
-BUILD_DEPENDS+=		${PERL5}:../../lang/perl5-base
+BUILD_DEPENDS+=		perl-5.*:../../lang/perl5
 
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index 5dfaba4f337..dd31a05e143 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2001/03/27 02:58:39 fredb Exp $
+# $NetBSD: Makefile,v 1.31 2001/03/27 03:20:24 hubertf Exp $
 #
 
 DISTNAME=		lynx2.8.4dev.19
@@ -13,7 +13,7 @@ MAINTAINER=		fredb@netbsd.org
 HOMEPAGE=		http://lynx.browser.org/
 COMMENT=		Alphanumeric display oriented World-Wide Web Client
 
-BUILD_DEPENDS+=		msgfmt:../../devel/gettext
+BUILD_USES_MSGFMT=	yes
 
 WRKSRC=			${WRKDIR}/lynx2-8-4
 
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 6f697947739..d8220c450b8 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2001/02/17 17:22:13 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2001/03/27 03:20:23 hubertf Exp $
 #
 
 DISTNAME=		lynx2.8.3rel.1
@@ -28,7 +28,7 @@ MAINTAINER=		fb@enteract.com
 HOMEPAGE=		http://lynx.browser.org/
 COMMENT=		Alphanumeric display oriented World-Wide Web Client
 
-BUILD_DEPENDS+=		msgfmt:../../devel/gettext
+BUILD_USES_MSGFMT=	yes
 
 USE_LIBINTL=		yes
 
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 48f1718298b..b7e52296b85 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2001/03/04 09:06:20 tron Exp $
+# $NetBSD: Makefile,v 1.59 2001/03/27 03:20:24 hubertf Exp $
 
 MOZ_VER=	0.8
 DISTNAME=	mozilla-source-${MOZ_VER}
@@ -13,9 +13,9 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.mozilla.org/
 COMMENT=	The open-source version of the Netscape browser
 
-BUILD_DEPENDS+=	${PERL5}:../../lang/perl5-base
-BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf:../../devel/autoconf
-BUILD_DEPENDS+=	zip:../../archivers/zip
+BUILD_DEPENDS+=	perl-5.*:../../lang/perl5
+BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
+BUILD_DEPENDS+=	zip-2.3:../../archivers/zip
 DEPENDS+=	gtk+>=1.2.8:../../x11/gtk
 DEPENDS+=	ORBit>=0.5.3:../../net/ORBit
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common
index b4221e2829e..292d5f20781 100644
--- a/www/navigator/Makefile.common
+++ b/www/navigator/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2001/03/10 22:31:57 kei Exp $
+# $NetBSD: Makefile.common,v 1.32 2001/03/27 03:20:24 hubertf Exp $
 #
 # Common include file for communicator and navigator packages
 
@@ -86,7 +86,7 @@ WRKSRC=		${WRKDIR}
 MASTER_SITES=	ftp://ftp.linuxppc.org/linuxppc-halloween/software/
 EXTRACT_SUFX=	.rpm
 HOMEPAGE=	http://linuxppc.org/software/index/linuxppc_stable/software/netscape-4.7-3.ppc.html
-BUILD_DEPENDS=	${RPM2PKG}:../../pkgtools/rpm2pkg
+BUILD_DEPENDS=	rpm2pkg-1.2:../../pkgtools/rpm2pkg
 DESCR_SRC=	${WRKDIR}/DESCR.linux-powerpc
 PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
 EMULSUBDIR=	emul/linux
diff --git a/www/p5-URI/Makefile b/www/p5-URI/Makefile
index d8291461332..89ecf92bcc9 100644
--- a/www/p5-URI/Makefile
+++ b/www/p5-URI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/03/21 17:15:33 mjl Exp $
+# $NetBSD: Makefile,v 1.9 2001/03/27 03:20:24 hubertf Exp $
 #
 
 DISTNAME=	URI-1.11
@@ -9,7 +9,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=URI/}
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Perl5 class to represent Uniform Resource Identifier (URI, RFC 2396)
 
-BUILD_DEPENDS=	${PERL5_SITEARCH}/auto/MIME/Base64/.packlist:../../converters/p5-MIME-Base64
+BUILD_DEPENDS=	p5-MIME-Base64-2.12:../../converters/p5-MIME-Base64
 
 CONFLICTS+=	p5-libwww-5.36	# URI used to be part of that package
 
diff --git a/www/php3/Makefile b/www/php3/Makefile
index 66555871da8..8a572fb6c35 100644
--- a/www/php3/Makefile
+++ b/www/php3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/02/25 04:18:23 hubertf Exp $
+# $NetBSD: Makefile,v 1.23 2001/03/27 03:20:25 hubertf Exp $
 #
 
 DISTNAME=	php-${PHP_VERSION}
@@ -11,7 +11,7 @@ MAINTAINER=	cjs@netbsd.org
 HOMEPAGE=	http://www.php.net/
 COMMENT=	PHP3 HTML-embedded programming language with database connectivity
 
-BUILD_DEPENDS+=	${PERL5}:../../lang/perl5-base
+BUILD_DEPENDS+=	perl-5.*:../../lang/perl5
 DEPENDS+=	gdbm>=1.7.3:../../databases/gdbm
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/www/php4-imap/Makefile b/www/php4-imap/Makefile
index 4dd3fbb4562..2ac4725fe5c 100644
--- a/www/php4-imap/Makefile
+++ b/www/php4-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/03/14 00:10:00 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/03/27 03:20:25 hubertf Exp $
 
 .include "../../www/php4/Makefile.module"
 
@@ -8,10 +8,7 @@ PHP_PKG_VERS=		nb2
 
 COMMENT=		PHP4 extension for IMAP (Internet Mailbox Access Protocol)
 
-# We want something like:
-# BUILD_DEPENDS+=	imap-uw>=2000.0.3nb1:../../mail/imap-uw
-#
-BUILD_DEPENDS+=		${CCLIENT_PIC_LIB}:../../mail/imap-uw
+BUILD_DEPENDS+=		imap-uw>=2000.0.3nb1:../../mail/imap-uw
 
 CCLIENT_PIC_LIB=	${LOCALBASE}/lib/libc-client_pic.a
 
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 00885024e26..cc1fb6b211f 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2001/02/25 04:18:24 hubertf Exp $
+# $NetBSD: Makefile,v 1.43 2001/03/27 03:20:25 hubertf Exp $
 
 DISTNAME=	squid-2.3.STABLE4-src
 PKGNAME=	squid-2.3s4nb3
@@ -24,7 +24,7 @@ MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.squid-cache.org/
 COMMENT=	Post-Harvest_cached WWW proxy cache and accelerator
 
-BUILD_DEPENDS+=	${PERL5}:../../lang/perl5-base
+BUILD_DEPENDS+=	perl-5.*:../../lang/perl5
 
 GNU_CONFIGURE=	# defined
 CONFIGURE_ARGS+= --sysconfdir=/etc \