mk, various: blas.buildlink3.mk moved to pkgsrc CVS, as did cblas

[Dr. Thomas Orgis <thomas.orgis%uni-hamburg.de@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Dr. Thomas Orgis <thomas.orgis%uni-hamburg.de@localhost>
Pushed By:	thor
Date:		Sun May 23 23:51:25 2021 +0200
Changeset:	6aa7291956ee452dda67fdf4948c16ecae475734

Modified Files:
	bolt-lmm/Makefile
	plink/Makefile
	plink2/Makefile
	py-macs2/Makefile
	superlu/Makefile
	superlu/buildlink3.mk
Removed Files:
	mk/blas.buildlink3.mk

Log Message:
mk, various: blas.buildlink3.mk moved to pkgsrc CVS, as did cblas

This removes the outdated bl3 and fixes the references to BLAS stuff
in these packages. One to follow.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6aa7291956ee452dda67fdf4948c16ecae475734

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 bolt-lmm/Makefile     |   2 +-
 mk/blas.buildlink3.mk | 109 --------------------------------------------------
 plink/Makefile        |   4 +-
 plink2/Makefile       |   2 +-
 py-macs2/Makefile     |   2 +-
 superlu/Makefile      |   2 +-
 superlu/buildlink3.mk |   2 +-
 7 files changed, 7 insertions(+), 116 deletions(-)

diffs:
diff --git a/bolt-lmm/Makefile b/bolt-lmm/Makefile
index efad34ff4e..a3a7438026 100644
--- a/bolt-lmm/Makefile
+++ b/bolt-lmm/Makefile
@@ -49,7 +49,7 @@ do-install:
 	${CHMOD} a+x ${DESTDIR}${PREFIX}/${EXAMPLESDIR}/*.sh
 	${CHMOD} g-w ${DESTDIR}${PREFIX}/${EXAMPLESDIR}/*
 
-.include "../../wip/mk/blas.buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
 .include "../../math/nlopt/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/mk/blas.buildlink3.mk b/mk/blas.buildlink3.mk
deleted file mode 100644
index bfbd9b01a1..0000000000
--- a/mk/blas.buildlink3.mk
+++ /dev/null
@@ -1,109 +0,0 @@
-# $NetBSD$
-#
-# This Makefile fragment is meant to be included by packages that use any BLAS
-# (Basic Linear Algebra System) implementation instead of one particular one.
-#
-# Since pkgsrc always ships BLAS and LAPACK together (as upstream
-# implementations do), this adds both BLAS_LIBS and LAPACK_LIBS to the linker
-# flags.  Often, they will be identical or at least redundant. It is a matter
-# of style to stay consistent in their use.
-#
-# Keywords: blas lapack atlas openblas mkl
-#
-# === User-settable variables ===
-#
-# PKGSRC_BLAS_TYPES
-#  This value specifies an exhaustive list of BLAS implementations we wish to
-#  use in this pkgsrc installation, in descending order of preference.
-#  The implementation selected for a build will be the first one in
-#  PKGSRC_BLAS_TYPES that also appears in BLAS_ACCEPTED (see below).
-#  Typically set in mk.conf.
-#
-#  Possible: one or more of netlib, openblas, openblas_pthread,
-#    openblas_openmp, and Apple's accelerate.framework
-#    (to come: Intel MKL, other external optimized builds)
-#
-#  Default: All currently supported implementations (${_BLAS_TYPES})
-#
-# === Package-settable variables ===
-#
-# BLAS_ACCEPTED
-#   This is a list of blas packages that are compatible with the current
-#   package. If not set, any BLAS implementation is OK.
-#   Typically set in package Makefile.
-#
-# === Variables automatically set here for use in package builds ===
-# 
-# BLAS_TYPE
-#   This is the BLAS implemtation chosen for a particular package build from
-#   PKGSRC_BLAS_TYPES and BLAS_ACCEPTED.  If PKGSRC_BLAS_TYPES and
-#   BLAS_ACCEPTED have no implementations in common, it defaults to none
-#   and the build fails.
-# BLAS_LIBS
-#   Linker flags used for linking to BLAS library
-# LAPACK_LIBS
-#   Linker flags used for linking to LAPACK library
-
-.if !defined(MK_BLAS_BUILDLINK3_MK)
-MK_BLAS_BUILDLINK3_MK=
-
-BUILD_DEFS+=		PKGSRC_BLAS_TYPES
-BUILD_DEFS_EFFECTS+=	BLAS_TYPE BLAS_LIBS LAPACK_LIBS
-
-# TODO: Upon commit change to: .include "bsd.prefs.mk"
-.include "../../mk/bsd.prefs.mk"
-
-# List of all possible BLAS choices, in order of *DEFAULT* preference.
-# netlib is the reference implementation to which all others conform and
-# should come first by default for maximum compatibility.  It is also the
-# slowest and not desirable in many situations.  Users can override by setting
-# PKGSRC_BLAS_TYPES. (See comment above)
-_BLAS_TYPES=	netlib
-# Darwin
-.if exists(/System/Library/Frameworks/Accelerate.framework)
-_BLAS_TYPES+=	accelerate.framework
-.endif
-_BLAS_TYPES+=	openblas openblas_pthread openblas_openmp
-
-BLAS_ACCEPTED?=	${_BLAS_TYPES}
-PKGSRC_BLAS_TYPES?= ${_BLAS_TYPES}
-
-_BLAS_MATCH=
-.for b in ${PKGSRC_BLAS_TYPES}
-_BLAS_MATCH+=	${BLAS_ACCEPTED:M${b}}
-.endfor
-.if !empty(_BLAS_MATCH)
-BLAS_TYPE=	${_BLAS_MATCH:[1]}
-.else
-BLAS_TYPE=	none
-.endif
-
-.if ${BLAS_TYPE} == "netlib"
-_BLAS_PKGPATH=	wip/lapack
-BLAS_LIBS=	-lblas
-LAPACK_LIBS=	-llapack ${BLAS_LIBS}
-.elif ${BLAS_TYPE} == "openblas"
-_BLAS_PKGPATH=	wip/openblas
-BLAS_LIBS=	-lopenblas
-LAPACK_LIBS=	${BLAS_LIBS}
-.elif ${BLAS_TYPE} == "openblas_pthread"
-_BLAS_PKGPATH=	wip/openblas_pthread
-BLAS_LIBS=	-lopenblas_pthread
-LAPACK_LIBS=	${BLAS_LIBS}
-.elif ${BLAS_TYPE} == "openblas_openmp"
-_BLAS_PKGPATH=	wip/openblas_openmp
-BLAS_LIBS=	-lopenblas_openmp
-LAPACK_LIBS=	${BLAS_LIBS}
-.elif ${BLAS_TYPE} == "accelerate.framework"
-BLAS_LIBS=	-framework Accelerate
-LAPACK_LIBS=	${BLAS_LIBS}
-.else # invalid or unimplemented type
-PKG_FAIL_REASON+=	\
-	"There is no acceptable BLAS for ${PKGNAME} in: ${PKGSRC_BLAS_TYPES}."
-.endif
-
-.if defined(_BLAS_PKGPATH)
-.include "../../${_BLAS_PKGPATH}/buildlink3.mk"
-.endif
-
-.endif # BLAS_BUILDLINK3_MK
diff --git a/plink/Makefile b/plink/Makefile
index 2d67aae72c..ab42006943 100644
--- a/plink/Makefile
+++ b/plink/Makefile
@@ -41,8 +41,8 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/plink ${DESTDIR}${PREFIX}/bin
 
-.include "../../wip/mk/blas.buildlink3.mk"
-.include "../../wip/cblas/buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
+.include "../../math/cblas/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/plink2/Makefile b/plink2/Makefile
index 3debaea30c..aca437dad3 100644
--- a/plink2/Makefile
+++ b/plink2/Makefile
@@ -59,7 +59,7 @@ post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/plink2-bench ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/blas.buildlink3.mk"
-.include "../../wip/cblas/buildlink3.mk"
+.include "../../math/cblas/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-macs2/Makefile b/py-macs2/Makefile
index c921c6b4b6..0a6260a384 100644
--- a/py-macs2/Makefile
+++ b/py-macs2/Makefile
@@ -41,6 +41,6 @@ post-patch:
 
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
-.include "../../wip/mk/blas.buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
 .include "../../devel/py-cython/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/superlu/Makefile b/superlu/Makefile
index 7ebade460a..5129f5db83 100644
--- a/superlu/Makefile
+++ b/superlu/Makefile
@@ -27,6 +27,6 @@ TEST_TARGET=		test
 post-extract:
 	${RUN} mkdir -p ${WRKSRC}/build
 
-.include "../../wip/mk/blas.buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/superlu/buildlink3.mk b/superlu/buildlink3.mk
index 66d82fc1b3..c7d9a7aeb3 100644
--- a/superlu/buildlink3.mk
+++ b/superlu/buildlink3.mk
@@ -15,7 +15,7 @@ BUILDLINK_PKGSRCDIR.superlu?=	../../wip/superlu
 
 # When it is the static lib, the users actually have
 # to link to blas themselves. Fragile, perhaps.
-.include "../../wip/mk/blas.buildlink3.mk"
+.include "../../mk/blas.buildlink3.mk"
 
 .endif # SUPERLU_BUILDLINK3_MK