Add buildlink infrastructure.

4 files changed, 39 insertions, 10 deletions

diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index 7ebdcc3a97e..09cb59d5c57 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/05/05 20:53:02 jtb Exp $
+# $NetBSD: Makefile,v 1.6 2002/05/03 22:44:04 jtb Exp $
 
 DISTNAME=		lapack
 PKGNAME=		lapack-20010201
@@ -14,16 +14,12 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.netlib.org/lapack/index.html
 COMMENT=		Linear Algebra PACKage
 
-DEPENDS+=		blas-[0-9]*:../../math/blas
-
 DIST_SUBDIR=		lapack-20010201
 WRKSRC=			${WRKDIR}/LAPACK
 USE_FORTRAN=		yes
 
-BLAS_PREFIX_DEFAULT=	${LOCALBASE}
-EVAL_PREFIX+=		BLAS_PREFIX=blas
-
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/liblapack.a ${PREFIX}/lib
 
+.include "../../math/blas/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/lapack/buildlink.mk b/math/lapack/buildlink.mk
new file mode 100644
index 00000000000..18be71ccc91
--- /dev/null
+++ b/math/lapack/buildlink.mk
@@ -0,0 +1,33 @@
+# $NetBSD: buildlink.mk,v 1.1 2002/05/03 22:44:04 jtb Exp $
+#
+# This Makefile fragment is included by packages that use lapack.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally define BUILDLINK_DEPENDS.lapack to the dependency pattern
+#     for the version of lapack desired.
+# (2) Include this Makefile fragment in the package Makefile,
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
+#     search path, and
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
+#     path.
+
+.if !defined(LAPACK_BUILDLINK_MK)
+LAPACK_BUILDLINK_MK=	# defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_DEPENDS.lapack?=	lapack>=20010201
+BUILD_DEPENDS+=			${BUILDLINK_DEPENDS.lapack}:../../math/lapack
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.lapack=lapack
+BUILDLINK_PREFIX.lapack_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.lapack=		lib/liblapack.*
+
+BUILDLINK_TARGETS.lapack=		lapack-buildlink
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.lapack}
+
+pre-configure: ${BUILDLINK_TARGETS.lapack}
+lapack-buildlink: _BUILDLINK_USE
+
+.endif	# LAPACK_BUILDLINK_MK
diff --git a/math/lapack/distinfo b/math/lapack/distinfo
index 3b4609826b1..bf34f79e75a 100644
--- a/math/lapack/distinfo
+++ b/math/lapack/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2001/05/05 20:53:02 jtb Exp $
+$NetBSD: distinfo,v 1.5 2002/05/03 22:44:04 jtb Exp $
 
 SHA1 (lapack-20010201/lapack.tgz) = 47d85508d87d60e32b613ef0c951d0be4bf10e72
 Size (lapack-20010201/lapack.tgz) = 4991992 bytes
 SHA1 (patch-aa) = 523854177f1f91d7ad6eed9e61b9f69895e10f0a
-SHA1 (patch-ab) = 038fb06fa5ce760e2764c7492a1a194f6fbc2c75
+SHA1 (patch-ab) = b96dae9628481b1fdc5e9faf53711929511540c6
diff --git a/math/lapack/patches/patch-ab b/math/lapack/patches/patch-ab
index 771dc0978b3..4f2b9ab797c 100644
--- a/math/lapack/patches/patch-ab
+++ b/math/lapack/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2001/05/01 01:21:11 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.3 2002/05/03 22:44:04 jtb Exp $
 
 --- make.inc.orig	Thu Nov  4 14:23:14 1999
 +++ make.inc	Mon Apr 30 21:15:38 2001
@@ -43,7 +43,7 @@ $NetBSD: patch-ab,v 1.2 2001/05/01 01:21:11 dmcmahill Exp $
  #BLASLIB     = -xlic_lib=sunperf_mt
 -BLASLIB     = -xlic_lib=sunperf
 -LAPACKLIB    = lapack$(PLAT).a
-+BLASLIB     = -Wl,-R${BLAS_PREFIX}/lib -L${BLAS_PREFIX}/lib -lblas
++BLASLIB     = -Wl,-R${BUILDLINK_PREFIX.blas}/lib -L${BUILDLINK_PREFIX.blas}/lib -lblas
 +LAPACKLIB    = liblapack.a
  TMGLIB       = tmglib$(PLAT).a
  EIGSRCLIB    = eigsrc$(PLAT).a