Add defaults for all instances of EVAL_PREFIX.

6 files changed, 31 insertions, 13 deletions

diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index 905dc7db69f..ea8b19cc953 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/04/14 21:43:52 jtb Exp $
+# $NetBSD: Makefile,v 1.4 2001/05/03 22:16:51 jtb Exp $
 
 DISTNAME=		lapack-20010201
 CATEGORIES=		math
@@ -13,6 +13,8 @@ DEPENDS+=		blas-[0-9]*:../../math/blas
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 WRKSRC=			${WRKDIR}/LAPACK
 USE_FORTRAN=		YES
+
+BLAS_PREFIX_DEFAULT=	${LOCALBASE}
 EVAL_PREFIX+=		BLAS_PREFIX=blas
 
 do-install:
diff --git a/math/ntl/Makefile b/math/ntl/Makefile
index c963962dc1e..ca96c8ab327 100644
--- a/math/ntl/Makefile
+++ b/math/ntl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/04/14 21:43:53 jtb Exp $
+# $NetBSD: Makefile,v 1.6 2001/05/03 22:16:51 jtb Exp $
 
 DISTNAME=		ntl-5.0c
 CATEGORIES=		math devel
@@ -16,6 +16,7 @@ NO_CONFIGURE=		#defined
 
 MAKEFILE=		makefile
 
+GMP_PREFIX_DEFAULT=	${LOCALBASE}
 EVAL_PREFIX+=		GMP_PREFIX=gmp
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/odepack/Makefile b/math/odepack/Makefile
index f24f4ba4197..959c92fdce2 100644
--- a/math/odepack/Makefile
+++ b/math/odepack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/04/28 23:59:21 jtb Exp $
+# $NetBSD: Makefile,v 1.8 2001/05/03 22:16:51 jtb Exp $
 
 DISTNAME=		odepack-20001130
 CATEGORIES=		math
@@ -7,10 +7,13 @@ MASTER_SITES=		${MASTER_SITE_LOCAL}
 MAINTAINER=		packages@netbsd.org
 COMMENT=		Systematized Collection of ODE Solvers
 
+DEPENDS+=		linpack>=20010427:../../math/linpack
+
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 WRKSRC=			${WRKDIR}/odepack
 USE_FORTRAN=		YES
 
+
 pre-build:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
diff --git a/math/pari/Makefile b/math/pari/Makefile
index 0f9cd43dc8a..91d6b158b7b 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/04/16 15:43:55 jtb Exp $
+# $NetBSD: Makefile,v 1.5 2001/05/03 22:16:51 jtb Exp $
 
 DISTNAME=		pari-2.1.0
 CATEGORIES=		math
@@ -15,15 +15,21 @@ BUILD_DEPENDS+= 	teTeX-[0-9]*:../../print/teTeX
 
 USE_PERL5=		#defined
 USE_X11=		#defined
+
 HAS_CONFIGURE=		#defined
 CONFIGURE_SCRIPT=	${WRKSRC}/Configure
+REPLACE_NCURSES=	${WRKSRC}/Configure
+
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
+
+READLINE_PREFIX_DEFAULT=${LOCALBASE}
 EVAL_PREFIX+=		READLINE_PREFIX=readline
+CONFIGURE_ENV+=		READLINE_PREFIX=${READLINE_PREFIX}
+
 CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE}
+
 CONFIGURE_ENV+=		X11BASE=${X11BASE}
-CONFIGURE_ENV+=		READLINE_PREFIX=${READLINE_PREFIX}
-CONFIGURE_ENV+=		miscdir=${PREFIX}/share/pari
 CONFIGURE_ARGS+=	--graphic=X11
-REPLACE_NCURSES=	${WRKSRC}/Configure
+CONFIGURE_ENV+=		miscdir=${PREFIX}/share/pari
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/rlab/Makefile b/math/rlab/Makefile
index 52b4808911b..f4678628ea3 100644
--- a/math/rlab/Makefile
+++ b/math/rlab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/04/28 23:59:21 jtb Exp $
+# $NetBSD: Makefile,v 1.10 2001/05/03 22:16:51 jtb Exp $
 
 DISTNAME=		rlab-2.1.05
 CATEGORIES=		math
@@ -11,11 +11,12 @@ COMMENT=		Matrix oriented, interactive programming environment
 DEPENDS+=		boehm-gc>=5.3:../../devel/boehm-gc
 DEPENDS+=		readline>=4.0:../../devel/readline
 
-BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
+BUILD_DEPENDS+=		autoconf>=2.13:../../devel/autoconf
 
-GNU_CONFIGURE=		YES
-USE_FORTRAN=		YES
+GNU_CONFIGURE=		yes
+USE_FORTRAN=		yes
 
+GC_PREFIX_DEFAULT=	${LOCALBASE}
 EVAL_PREFIX+=		GC_PREFIX=boehm-gc
 CONFIGURE_ARGS+=	--with-GC=${GC_PREFIX}
 
@@ -26,6 +27,7 @@ PLIST_SRC=		${PKGDIR}/PLIST
 RLAB_PLOT_PKG?=		gnuplot
 .if (${RLAB_PLOT_PKG} == "plplot")
 DEPENDS+=		plplot>=5.0.1:../../graphics/plplot
+PLPLOT_PREFIX_DEFAULT=	${LOCALBASE}
 EVAL_PREFIX+=		PLPLOT_PREFIX=plplot
 CONFIGURE_ARGS+=	--with-plplot=${PLPLOT_PREFIX}
 PLIST_SRC+=		${PKGDIR}/PLIST.plplot
@@ -35,6 +37,7 @@ CONFIGURE_ARGS+=	--with-plotmtv=yes
 PLIST_SRC+=		${PKGDIR}/PLIST.plotmtv
 .elif (${RLAB_PLOT_PKG} == "pgraf")
 DEPENDS+=		pgraf-[0-9]*:../../graphics/pgraf
+PGRAF_PREFIX_DEFAULT=	${LOCALBASE}
 EVAL_PREFIX+=		PGRAF_PREFIX=pgraf
 CONFIGURE_ARGS+=	--with-pgraf=yes
 PLIST_SRC+=		${PKGDIR}/PLIST.pgraf
@@ -51,7 +54,7 @@ CONFIGURE_ARGS+=	--enable-SUPERLU
 .endif
 
 .if defined(RLAB_PAGER)
-CONFIGURE_ENV+=		PAGER="${RLAB_PAGER}"
+CONFIGURE_ENV+=		PAGER=${RLAB_PAGER}
 .endif
 
 pre-configure:
diff --git a/math/superlu/Makefile b/math/superlu/Makefile
index eece8ed61f3..7fa5c6bc22b 100644
--- a/math/superlu/Makefile
+++ b/math/superlu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/04/14 21:43:57 jtb Exp $
+# $NetBSD: Makefile,v 1.4 2001/05/03 22:16:51 jtb Exp $
 
 DISTNAME=		superlu_2.0
 PKGNAME=		superlu-2.0
@@ -12,7 +12,10 @@ COMMENT=		ANSI C routine library for the solution of sparse linear systems
 DEPENDS+=		blas-[0-9]*:../../math/blas
 
 WRKSRC=			${WRKDIR}/SuperLU
+
+BLAS_PREFIX_DEFAULT=	${LOCALBASE}
 EVAL_PREFIX+=		BLAS_PREFIX=blas
+
 ALL_TARGET=		superlulib
 
 do-install: