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>

8 files changed, 18 insertions, 19 deletions

diff --git a/math/R/Makefile b/math/R/Makefile
index fdcf9a0075d..71749b63a12 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/03/04 09:06:16 tron Exp $
+# $NetBSD: Makefile,v 1.21 2001/03/27 03:20:05 hubertf Exp $
 #
 
 DISTNAME=		R-1.1.1
@@ -20,7 +20,7 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.R-project.org/
 COMMENT=		Statistical language for data analysis and graphics
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/autoreconf:../../devel/autoconf
+BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
 DEPENDS+=		readline>=4.0:../../devel/readline
 DEPENDS+=		jpeg-*:../../graphics/jpeg
 DEPENDS+=		png>1.0.9:../../graphics/png
diff --git a/math/cassowary/Makefile b/math/cassowary/Makefile
index a9cb6cfa536..8ec6a0207cf 100644
--- a/math/cassowary/Makefile
+++ b/math/cassowary/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/17 18:22:17 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/03/27 03:20:05 hubertf Exp $
 #
 
 DISTNAME=		cassowary-0.60
@@ -9,7 +9,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.cs.washington.edu/research/constraints/cassowary/
 COMMENT=		Constraint-solving toolkit for linear equalities and inequalities
 
-BUILD_DEPENDS+=		bison:../../devel/bison
+BUILD_DEPENDS+=		bison-*:../../devel/bison
 DEPENDS+=		guile>=1.3.2:../../lang/guile
 DEPENDS+=		gtl>=0.3.2:../../devel/gtl
 
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 11c39914621..3ae25918236 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2001/03/19 13:23:43 tron Exp $
+# $NetBSD: Makefile,v 1.29 2001/03/27 03:20:06 hubertf Exp $
 #
 
 DISTNAME=		gnumeric-0.64
@@ -9,7 +9,7 @@ MAINTAINER=		rh@netbsd.org
 HOMEPAGE=		http://www.gnome.org/gnumeric/
 COMMENT=		Powerful and easy to use spreadsheet program from the GNOME project
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/python:../../lang/python
+BUILD_DEPENDS+=		python-2.0:../../lang/python
 DEPENDS+=		libglade>=0.16:../../devel/libglade
 DEPENDS+=		gal>=0.3:../../devel/gal
 DEPENDS+=		gb>=0.0.17:../../lang/gb
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 63508e6d7df..ebff1ae99c1 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/03/22 13:30:58 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2001/03/27 03:20:06 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp
 
 DISTNAME=	octave-2.0.16
@@ -13,8 +13,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.che.wisc.edu/octave/
 COMMENT=	High-level language, primarily intended for numerical computations
 
-BUILD_DEPENDS+=	tex:../../print/teTeX
-BUILD_DEPENDS+=	dvips:../../print/teTeX
+BUILD_DEPENDS+=	teTeX-1.0.7:../../print/teTeX
 DEPENDS+=	gnuplot>=3.7:../../graphics/gnuplot
 
 USE_X11=		yes
diff --git a/math/pari/Makefile b/math/pari/Makefile
index ac46f8a501f..3024c2ba980 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/03/07 20:57:48 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/03/27 03:20:06 hubertf Exp $
 
 DISTNAME=		pari-2.1.0
 CATEGORIES=		math
@@ -10,8 +10,8 @@ HOMEPAGE=		http://www.parigp-home.de
 COMMENT=		PARI-GP is a software package for computer-aided number theory
 
 DEPENDS+=		readline>=4.0:../../devel/readline
-BUILD_DEPENDS+=		${LOCALBASE}/bin/emacs:../../editors/emacs
-BUILD_DEPENDS+= 	${LOCALBASE}/bin/tex:../../print/teTeX
+BUILD_DEPENDS+=		{emacs-*,xemacs-*}:../../editors/emacs
+BUILD_DEPENDS+= 	teTeX-*:../../print/teTeX
 
 USE_PERL5=		#defined
 USE_X11=		#defined
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index c6a1e119728..aac5eaa5aca 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/02/17 18:22:36 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2001/03/27 03:20:06 hubertf Exp $
 #
 
 DISTNAME=	pspp-0.3.0
@@ -16,8 +16,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/pspp/
 COMMENT=	Program for statistical analysis of sampled data
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf:../../devel/autoconf
-BUILD_DEPENDS+=	msgfmt:../../devel/gettext
+BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
+BUILD_USES_MSGFMT=	yes
 
 GNU_CONFIGURE=	yes
 USE_GTEXINFO=	yes
diff --git a/math/rlab/Makefile b/math/rlab/Makefile
index 26db30e144e..3a6e5f748e5 100644
--- a/math/rlab/Makefile
+++ b/math/rlab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 18:22:40 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/03/27 03:20:06 hubertf Exp $
 
 DISTNAME=		rlab-2.1.05
 CATEGORIES=		math
@@ -11,7 +11,7 @@ COMMENT=		Matrix oriented, interactive programming environment
 DEPENDS+=		boehm-gc>=5.3:../../devel/boehm-gc
 DEPENDS+=		readline>=4.0:../../devel/readline
 
-BUILD_DEPENDS+=		${LOCALBASE}/bin/autoconf:../../devel/autoconf
+BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
 
 GNU_CONFIGURE=		YES
 USE_FORTRAN=		YES
diff --git a/math/xmgr/Makefile b/math/xmgr/Makefile
index 8406b14630a..c50e5d45e03 100644
--- a/math/xmgr/Makefile
+++ b/math/xmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/17 18:22:49 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/03/27 03:20:07 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.13 1998/12/12 22:27:21 jseger Exp
 #
 
@@ -15,7 +15,7 @@ MAINTAINER=		packages@NetBSD.org
 HOMEPAGE=		http://plasma-gate.weizmann.ac.il/Xmgr/
 COMMENT=		Powerful XY plotting tool for workstations or X-terminals using X
 
-BUILD_DEPENDS=		bison:../../devel/bison
+BUILD_DEPENDS=		bison-*:../../devel/bison
 DEPENDS+=		netcdf-3.4:../../devel/netcdf
 
 USE_FORTRAN=		YES