Remove mk/find-prefix.mk usage from the math category.

The find-prefix infrastructure was required in a pkgviews world where
packages installed from pkgsrc could have different installation
prefixes, and this was a way for a dependency prefix to be determined.

Now that pkgviews has been removed there is no longer any need for the
overhead of this infrastructure.  Instead we use BUILDLINK_PREFIX.pkg
for dependencies pulled in via buildlink, or LOCALBASE/PREFIX where the
dependency is coming from pkgsrc.

Provides a reasonable performance win due to the reduction of `pkg_info
-qp` calls, some of which were redundant anyway as they were duplicating
the same information provided by BUILDLINK_PREFIX.pkg.

5 files changed, 12 insertions, 20 deletions

diff --git a/math/eukleides/Makefile b/math/eukleides/Makefile
index 4607e63f39a..18c450926ad 100644
--- a/math/eukleides/Makefile
+++ b/math/eukleides/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2015/08/18 07:31:12 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2015/11/25 12:51:41 jperkin Exp $
 
 DISTNAME=	eukleides-1.5.4
 PKGREVISION=	3
@@ -20,14 +20,11 @@ REPLACE_BASH=	bash/*
 
 BUILDLINK_TRANSFORM+=	l:ncurses:curses
 
-FIND_PREFIX:=		GETOPTDIR=getopt
-.include "../../mk/find-prefix.mk"
-
 SUBST_CLASSES+=		getopt
 SUBST_STAGE.getopt=	pre-configure
 SUBST_MESSAGE.getopt=	Replacing getopt.
 SUBST_FILES.getopt=	bash/euktoeps
-SUBST_SED.getopt+=	-e 's,@GETOPT@,${GETOPTDIR}/bin/getopt,'
+SUBST_SED.getopt+=	-e 's,@GETOPT@,${LOCALBASE}/bin/getopt,'
 
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS}					\
 			PREFIX=${DESTDIR}${PREFIX}			\
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index d3096c4fb40..de51feb001f 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2015/10/14 20:17:27 wiz Exp $
+# $NetBSD: Makefile,v 1.100 2015/11/25 12:51:42 jperkin Exp $
 #
 
 DISTNAME=	${SCIBASE}-src
@@ -28,12 +28,10 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-local-xaw
 CONFIGURE_ARGS+=	--without-java
 
-EVAL_PREFIX+=		TCL_PREFIX=tcl
-EVAL_PREFIX+=		TK_PREFIX=tk
-CONFIGURE_ARGS+=	--with-tcl-library=${TCL_PREFIX}/lib
-CONFIGURE_ARGS+=	--with-tcl-include=${TCL_PREFIX}/include
-CONFIGURE_ARGS+=	--with-tk-library=${TK_PREFIX}/lib
-CONFIGURE_ARGS+=	--with-tk-include=${TK_PREFIX}/include
+CONFIGURE_ARGS+=	--with-tcl-library=${BUILDLINK_PREFIX.tcl}/lib
+CONFIGURE_ARGS+=	--with-tcl-include=${BUILDLINK_PREFIX.tcl}/include
+CONFIGURE_ARGS+=	--with-tk-library=${BUILDLINK_PREFIX.tk}/lib
+CONFIGURE_ARGS+=	--with-tk-include=${BUILDLINK_PREFIX.tk}/include
 CONFIGURE_ENV+=		TCL_CONFIG_SH=${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
 CONFIGURE_ENV+=		TK_CONFIG_SH=${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
 CONFIGURE_ENV+=		CC_LDFLAGS=${X11_LDFLAGS:Q}\ ${COMPILER_RPATH_FLAG:Q}${BUILDLINK_PREFIX.tk:Q}/lib
diff --git a/math/superlu/Makefile b/math/superlu/Makefile
index a8e34fd8cf5..aa2b47778a1 100644
--- a/math/superlu/Makefile
+++ b/math/superlu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2015/06/12 10:50:32 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2015/11/25 12:51:42 jperkin Exp $
 
 DISTNAME=		superlu_3.0
 PKGNAME=		superlu-3.0.1
@@ -12,9 +12,6 @@ COMMENT=		ANSI C routine library for the solution of sparse linear systems
 
 DEPENDS+=		blas-[0-9]*:../../math/blas
 
-BLAS_PREFIX_DEFAULT=	${LOCALBASE}
-EVAL_PREFIX+=		BLAS_PREFIX=blas
-
 DIST_SUBDIR=		${PKGNAME_NOREV}
 WRKSRC=			${WRKDIR}/SuperLU_3.0
 BUILD_TARGET=		superlulib
diff --git a/math/superlu/distinfo b/math/superlu/distinfo
index 9d742ddd3e6..aa51ac4e8f8 100644
--- a/math/superlu/distinfo
+++ b/math/superlu/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 23:33:44 agc Exp $
+$NetBSD: distinfo,v 1.8 2015/11/25 12:51:42 jperkin Exp $
 
 SHA1 (superlu-3.0.1/superlu_3.0.tar.gz) = 662803e2c2ec6c604884ba356219dec98eae0976
 RMD160 (superlu-3.0.1/superlu_3.0.tar.gz) = eb570724216ae09fd53931caffce62ce5160e347
 SHA512 (superlu-3.0.1/superlu_3.0.tar.gz) = 40bba86999105172656c6825789e9f4808007687e4fc4316873add68ad2113d54a2e0cb1ac8ef2596d3894bb9f128518c75ae892ac2f5c12410c071fc8191f09
 Size (superlu-3.0.1/superlu_3.0.tar.gz) = 1116795 bytes
-SHA1 (patch-aa) = e35d3e257b091a9241f41c81b211de10af65f321
+SHA1 (patch-aa) = fd3c02f94989c8eb4a83193faaec3f67607f0634
diff --git a/math/superlu/patches/patch-aa b/math/superlu/patches/patch-aa
index 7a5f3577ab2..e0fdd43a175 100644
--- a/math/superlu/patches/patch-aa
+++ b/math/superlu/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2004/07/19 13:47:51 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2015/11/25 12:51:42 jperkin Exp $
 
 --- make.inc.orig	2004-02-05 20:01:19.000000000 +0100
 +++ make.inc
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.3 2004/07/19 13:47:51 wiz Exp $
 +TMGLIB       = tmglib.a
 +SUPERLULIB   = libsuperlu.a
 +BLASDEF	     = -DUSE_VENDOR_BLAS
-+BLASLIB      = -L${BLAS_PREFIX}/lib -lblas
++BLASLIB      = -L${LOCALBASE}/lib -lblas
  
  #
  #  The archiver and the flag(s) to use when building archive (library)