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>

17 files changed, 58 insertions, 42 deletions

diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index e61ea2b4f1b..354a179e66b 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2001/03/10 23:36:22 tron Exp $
+# $NetBSD: Makefile,v 1.51 2001/03/27 03:20:09 hubertf Exp $
 #
 
 DISTNAME=		ORBit-0.5.6
@@ -11,9 +11,8 @@ COMMENT=		high-performance CORBA ORB with support for the C language
 
 DEPENDS+=		glib>=1.2.7:../../devel/glib
 DEPENDS+=		gindent-*:../../devel/gindent
-BUILD_DEPENDS+=		${LOCALBASE}/bin/autoconf:../../devel/autoconf
-BUILD_DEPENDS+=		${LOCALBASE}/bin/automake:../../devel/automake
-BUILD_DEPENDS+=		${LOCALBASE}/share/aclocal/gettext.m4:../../devel/gettext
+BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
+BUILD_DEPENDS+=		automake-1.4:../../devel/automake
 
 USE_LIBINTL=		YES
 USE_GMAKE=		YES
@@ -32,6 +31,10 @@ INFO_FILES=		libIDL.info
 
 .include "../../mk/bsd.prefs.mk"
 
+.if !exists(${LOCALBASE}/share/aclocal/gettext.m4)
+BUILD_DEPENDS+=		gettext-0.10.35nb1:../../devel/gettext
+.endif
+
 .if (${OPSYS} == SunOS)
 DEPENDS+=		tcp_wrappers>=7.6.1nb1:../../security/tcp_wrappers
 .endif
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index c07b9ac8910..8576a74d483 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2001/03/13 15:44:21 tron Exp $
+# $NetBSD: Makefile,v 1.44 2001/03/27 03:20:09 hubertf Exp $
 #
 
 ETHEREAL_VERSION=	0.8.16
@@ -13,7 +13,7 @@ COMMENT=		Network protocol analyzer
 
 DEPENDS+=		gtk+-1.2.*:../../x11/gtk
 DEPENDS+=		ucd-snmp>=4.1.2:../../net/ucd-snmp
-BUILD_DEPENDS+=		${PERL5}:../../lang/perl5-base
+BUILD_DEPENDS+=		perl-5.*:../../lang/perl5
 
 USE_X11=		YES
 USE_SSL=		YES
diff --git a/net/freewais-sf/Makefile b/net/freewais-sf/Makefile
index 04a5eee3303..5a78ba33e36 100644
--- a/net/freewais-sf/Makefile
+++ b/net/freewais-sf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/17 18:18:52 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/03/27 03:20:10 hubertf Exp $
 #
 
 DISTNAME=	freeWAIS-sf-2.2.12
@@ -10,7 +10,7 @@ MAINTAINER=	bad@NetBSD.org
 HOMEPAGE=	http://ls6-www.informatik.uni-dortmund.de/ir/projects/freeWAIS-sf/index.html
 COMMENT=	Enhanced Wide Area Information Server
 
-BUILD_DEPENDS=	${PERL5}:../../lang/perl5-base
+BUILD_DEPENDS=	perl-5.*:../../lang/perl5
 
 USE_LIBTOOL=	# defined
 
diff --git a/net/gnapster/Makefile b/net/gnapster/Makefile
index 09609495b29..543cd832f5d 100644
--- a/net/gnapster/Makefile
+++ b/net/gnapster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/02/17 18:18:54 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2001/03/27 03:20:10 hubertf Exp $
 
 DISTNAME=	gnapster-1.4.2
 CATEGORIES=	net
@@ -9,7 +9,7 @@ HOMEPAGE=	http://www.faradic.net/~jasta/programs.html
 COMMENT=	simple client for the online mp3 community
 
 DEPENDS+=	gnome-core-*:../../x11/gnome-core
-BUILD_DEPENDS+=	msgfmt:../../devel/gettext
+BUILD_USES_MSGFMT=	yes
 
 USE_X11BASE=	YES
 USE_GMAKE=	YES
diff --git a/net/irrd/Makefile b/net/irrd/Makefile
index 3d991678353..28c6b603ed6 100644
--- a/net/irrd/Makefile
+++ b/net/irrd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/02/17 18:18:59 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2001/03/27 03:20:10 hubertf Exp $
 #
 
 DISTNAME=	irrd2.0a-Aug22-2000
@@ -11,8 +11,8 @@ MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://www.irrd.net/
 COMMENT=	Internet Routing Registry Daemon
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/autoreconf:../../devel/autoconf
-BUILD_DEPENDS+=	bison:../../devel/bison
+BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
+BUILD_DEPENDS+=	bison-*:../../devel/bison
 DEPENDS+=	gdbm-*:../../databases/gdbm
 DEPENDS+=	pgp5-*:../../security/pgp5
 DEPENDS+=	wget-*:../../net/wget
diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index 278bca702f4..361a0e179c5 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/17 18:19:01 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/03/27 03:20:11 hubertf Exp $
 #
 
 DISTNAME=		jwhois-2.4.1
@@ -9,8 +9,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnu.org/software/jwhois/
 COMMENT=		Configurable WHOIS client
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/autoreconf:../../devel/autoconf
-BUILD_DEPENDS+=		${LOCALBASE}/share/autoconf/gettext.m4:../../devel/gettext
+BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
 
 GNU_CONFIGURE=		# defined
 USE_LIBINTL=		# defined
@@ -20,6 +19,12 @@ CONFIGURE_ARGS+=	--with-cache
 
 INFO_FILES=		jwhois.info
 
+.include "../../mk/bsd.prefs.mk"
+
+.if !exists(${LOCALBASE}/share/aclocal/gettext.m4)
+BUILD_DEPENDS+=		gettext-0.10.35nb1:../../devel/gettext
+.endif
+
 pre-configure:
 	cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf
 
diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile
index 51e5fa9ff7f..a347fa1f4f4 100644
--- a/net/libpcap/Makefile
+++ b/net/libpcap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 18:19:04 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/03/27 03:20:11 hubertf Exp $
 
 DISTNAME=		libpcap-0.6.1
 CATEGORIES=		net
@@ -8,8 +8,8 @@ MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.tcpdump.org/
 COMMENT=		System-independent interface for user-level packet capture
 
-BUILD_DEPENDS+=		bison:../../devel/bison
-BUILD_DEPENDS+=		flex:../../devel/flex
+BUILD_DEPENDS+=		bison-*:../../devel/bison
+BUILD_DEPENDS+=		flex-*:../../devel/flex
 
 ONLY_FOR_PLATFORM=	SunOS-*-*	# in NetBSD base system
 
diff --git a/net/md-whois/Makefile b/net/md-whois/Makefile
index a3f5b2d6be8..5fef8d869d5 100644
--- a/net/md-whois/Makefile
+++ b/net/md-whois/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 18:19:06 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/03/27 03:20:11 hubertf Exp $
 
 DISTNAME=	whois_4.5.2
 PKGNAME=	md-whois-4.5.2
@@ -9,7 +9,7 @@ MAINTAINER=	reed@reedmedia.net
 HOMEPAGE=	http://www.linux.it/~md/software/
 COMMENT=	Improved whois client
 
-BUILD_DEPENDS+=	${PERL5}:../../lang/perl5-base
+BUILD_DEPENDS+=	perl-5.*:../../lang/perl5
 
 WRKSRC=		${WRKDIR}/whois-4.5.2
 
diff --git a/net/ppp-mppe/Makefile b/net/ppp-mppe/Makefile
index e84286ed150..88482246dfc 100644
--- a/net/ppp-mppe/Makefile
+++ b/net/ppp-mppe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 18:19:29 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/03/27 03:20:11 hubertf Exp $
 
 DISTNAME=	ppp-2.3.9
 PKGNAME=	ppp-mppe-2.3.9
@@ -12,8 +12,6 @@ COMMENT=	PPP daemon and LKM with MPPE - Microsoft Point-to-Point Encryption
 OPENSSL_VERS=	0.9.5a
 OPENSSL_SRC=	${BUILD_ROOT}/security/openssl/${WRKDIR:T}/openssl-${OPENSSL_VERS}
 
-BUILD_DEPENDS= ${OPENSSL_SRC}/crypto/rc4:../../security/openssl:extract
-
 HAS_CONFIGURE=  yes
 MANCOMPRESSED_IF_MANZ=	yes
 
@@ -35,9 +33,18 @@ post-extract:
 	@${CP} ${OPENSSL_SRC}/crypto/sha/sha_locl.h ${WRKSRC}/netbsd-1.4/sha_locl.h
 	@${CP} ${OPENSSL_SRC}/crypto/sha/sha.h ${WRKSRC}/netbsd-1.4/sha.h
 
+
+pre-configure:
+	if [ ! -e ${OPENSSL_SRC}/crypto/rc4 ]; then			\
+		cd ../../security/openssl && ${MAKE} extract;		\
+	fi
+
 pre-install:
 	${INSTALL_PROGRAM_DIR} ${PREFIX}/lkm
 
+pre-clean:
+	cd ../../security/openssl && ${MAKE} clean
+
 SYSDIR?=	/sys
 MAKE_ENV+=	SYSDIR="${SYSDIR}"
 
diff --git a/net/samba/Makefile b/net/samba/Makefile
index e79aacfed28..95d80094502 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2001/02/25 04:18:08 hubertf Exp $
+# $NetBSD: Makefile,v 1.46 2001/03/27 03:20:11 hubertf Exp $
 
 DISTNAME=		samba-2.0.7-ja-1.3
 PKGNAME=		samba-2.0.7.1.3
@@ -10,8 +10,8 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.samba.org/
 COMMENT=		SMB/CIFS protocol server suite for UNIX
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/autoreconf:../../devel/autoconf
-BUILD_DEPENDS+=		msgfmt:../../devel/gettext
+BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
+BUILD_USES_MSGFMT=	yes
 
 .if !exists(/usr/include/readline.h)
 DEPENDS+=		readline>=4.0:../../devel/readline
diff --git a/net/trafshow/Makefile b/net/trafshow/Makefile
index f2e481c750a..b665cc2005f 100644
--- a/net/trafshow/Makefile
+++ b/net/trafshow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/03/22 06:46:11 itojun Exp $
+# $NetBSD: Makefile,v 1.9 2001/03/27 03:20:12 hubertf Exp $
 # $FreeBSD: ports/net/trafshow/Makefile,v 1.14 2000/06/28 12:53:15 alex Exp $
 #
 
@@ -15,7 +15,7 @@ MAINTAINER=     packages@netbsd.org
 HOMEPAGE=	http://soft.risp.ru/trafshow/index.shtml
 COMMENT=	Full screen visualization of the network traffic
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/autoreconf:../../devel/autoconf
+BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
 
 GNU_CONFIGURE=	yes
 ALL_TARGET=	trafshow
diff --git a/net/ucd-snmp-current/Makefile b/net/ucd-snmp-current/Makefile
index b5dfb9b5e74..cc7d7c655be 100644
--- a/net/ucd-snmp-current/Makefile
+++ b/net/ucd-snmp-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/25 04:18:09 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2001/03/27 03:20:12 hubertf Exp $
 #
 
 DISTNAME=	ucd-snmp-4.0.1
@@ -19,7 +19,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.ece.ucdavis.edu/ucd-snmp/
 COMMENT=	Extensible SNMP implementation
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf:../../devel/autoconf
+BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= --with-defaults
diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile
index 69a25886084..f83570199a3 100644
--- a/net/ucd-snmp/Makefile
+++ b/net/ucd-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2001/03/05 19:06:47 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2001/03/27 03:20:12 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.18 1998/04/06 20:50:31 andreas Exp
 #
 
@@ -13,7 +13,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://net-snmp.sourceforge.net/
 COMMENT=	Extensible SNMP implementation
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/autoreconf:../../devel/autoconf
+BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
 
 BUILD_DEFS+=	USE_INET6
 
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 2276a733ad9..a362ab2937e 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 18:19:50 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/03/27 03:20:12 hubertf Exp $
 #
 
 DISTNAME=	src
@@ -10,7 +10,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.cis.upenn.edu/~bcpierce/unison/
 COMMENT=	file-synchronization tool
 
-BUILD_DEPENDS=	ocamlc:../../lang/ocaml
+BUILD_DEPENDS=	ocaml-3.00:../../lang/ocaml
 
 DIST_SUBDIR=	unison
 
diff --git a/net/wget/Makefile b/net/wget/Makefile
index 58c915962d2..d95666e96b2 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2001/02/17 18:19:55 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2001/03/27 03:20:12 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/05/22 07:53:29 tg Exp
 #
 
@@ -14,7 +14,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/wget/wget.html
 COMMENT=	Retrieve files from the 'net via HTTP and FTP
 
-BUILD_DEPENDS+=	msgfmt:../../devel/gettext
+BUILD_USES_MSGFMT=	yes
 
 GNU_CONFIGURE=	yes
 USE_LIBINTL=	yes
diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile
index 5c751064513..afbb74c3b31 100644
--- a/net/xtraceroute/Makefile
+++ b/net/xtraceroute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/02/17 18:19:59 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2001/03/27 03:20:13 hubertf Exp $
 #
 
 DISTNAME=	xtraceroute-0.8.14
@@ -11,7 +11,8 @@ MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.dtek.chalmers.se/~d3august/xt/index.html
 COMMENT=	Graphical version of traceroute, which traces the route IP packets go
 
-BUILD_DEPENDS+=	msgfmt:../../devel/gettext
+BUILD_USES_MSGFMT=	yes
+
 DEPENDS+=	gtkglarea-1.2.1:../../x11/gtkglarea
 DEPENDS+=	tiff-*:../../graphics/tiff
 
diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index a78620969ea..70e3d3e2081 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2001/03/09 12:55:48 itojun Exp $
+# $NetBSD: Makefile,v 1.36 2001/03/27 03:20:13 hubertf Exp $
 # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
 #
 
@@ -12,8 +12,8 @@ MAINTAINER=	itojun@itojun.org
 HOMEPAGE=	http://www.zebra.org/
 COMMENT=	Free multithreaded routing daemon software
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/automake:../../devel/automake
-BUILD_DEPENDS+=	${LOCALBASE}/bin/autoreconf:../../devel/autoconf
+BUILD_DEPENDS+=	automake-1.4:../../devel/automake
+BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
 
 .include "../../mk/bsd.prefs.mk"