From d6bfa03a47b0d2d8a26d9cb799a9fbbc1a2f67a9 Mon Sep 17 00:00:00 2001
From: Jason Bacon <bacon@NetBSD.org>
Date: Sun, 19 Jul 2020 17:06:13 -0500
Subject: [PATCH] blas and lapack: Minor clean-up

---
 blas/Makefile          |  6 ++++--
 lapack/Makefile        |  6 +++---
 lapack/Makefile.common | 15 ++++++++-------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/blas/Makefile b/blas/Makefile
index 6552051126..36df4b46ae 100644
--- a/blas/Makefile
+++ b/blas/Makefile
@@ -1,10 +1,12 @@
 # $NetBSD$
 
-COMMENT=		Netlib reference BLAS library
+.include "../../wip/lapack/Makefile.common"
+
+COMMENT=	Basic Linear Algebra System (Netlib reference implementation)
+
 LAPACK_COMPONENT=	blas
 LAPACK_COMPONENT_CMAKE_ARGS=	\
 	-DUSE_OPTIMIZED_BLAS=OFF \
 	-DCBLAS=OFF -DLAPACKE=OFF -DLAPACK=OFF
 
-.include "../../wip/lapack/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lapack/Makefile b/lapack/Makefile
index 20ebe34eb2..1843d18667 100644
--- a/lapack/Makefile
+++ b/lapack/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 MAINTAINER=	thomas.orgis@uni-hamburg.de
-COMMENT=	Linear Algebra PACKage (Netlib reference code)
+COMMENT=	Linear Algebra PACKage (Netlib reference implementation)
 
 LAPACK_COMPONENT=	lapack
 LAPACK_COMPONENT_CMAKE_ARGS= \
@@ -13,6 +13,6 @@ LAPACK_COMPONENT_CMAKE_ARGS= \
 # This always uses Netlib BLAS. Other optimized BLAS packages bring
 # their own LAPACK, hence cblas and lapacke packages use
 # mk/blas.buildlink3.mk instead.
-.include	"../../wip/blas/buildlink3.mk"
-.include	"../../wip/lapack/Makefile.common"
+.include "../../wip/blas/buildlink3.mk"
+.include "../../wip/lapack/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lapack/Makefile.common b/lapack/Makefile.common
index 49a455f2d4..892178fdfc 100644
--- a/lapack/Makefile.common
+++ b/lapack/Makefile.common
@@ -1,9 +1,10 @@
 # $NetBSD$
+# used by wip/blas/Makefile
 # used by wip/cblas/Makefile
 # used by wip/lapacke/Makefile
 # used by wip/lapack/Makefile
 
-# Common Makefile for packages derived from the Netlib LAPACK sources.
+# Common Makefile for packages derived from the Netlib BLAS/LAPACK sources.
 # Package Makefile sets LAPACK_COMPONENT and LAPACK_COMPONENT_CMAKE_ARGS to
 # choose the library to install.
 # LAPACK_COMPONENT can be "lapack", "lapacke", or "cblas"
@@ -22,12 +23,12 @@ LICENSE=	modified-bsd
 PATCHDIR=	${.CURDIR}/../../wip/lapack/patches
 DISTINFO_FILE=	${.CURDIR}/../../wip/lapack/distinfo
 
-USE_LANGUAGES=		c fortran
-USE_CMAKE=		yes
+USE_LANGUAGES=	c fortran
+USE_CMAKE=	yes
 
-WRKSRC=			${WRKDIR}/${DISTNAME}
-CONFIGURE_DIRS=		build
-CMAKE_ARG_PATH=		${WRKSRC}
+WRKSRC=		${WRKDIR}/${DISTNAME}
+CONFIGURE_DIRS=	build
+CMAKE_ARG_PATH=	${WRKSRC}
 
 # Note: We patch the build to install both static and
 # shared libraries.
@@ -39,4 +40,4 @@ CMAKE_ARGS=	-DBUILD_DEPRECATED=ON \
 .include "../../wip/lapack/version.mk"
 
 post-extract:
-	${RUN} mkdir -p ${WRKSRC}/build
+	${RUN} ${MKDIR} ${WRKSRC}/build