openblas*: Fix pkglint issues

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: openblas*: Fix pkglint issues
From: Jason Bacon <bacon%NetBSD.org@localhost>
Date: Sun, 19 Jul 2020 14:06:58 +0000
Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Sun Jul 19 14:06:58 2020 +0000
Changeset:	aba4405dd3bf2508d7f061a7d05b6abbcbd83e23

Modified Files:
	openblas/Makefile
	openblas/Makefile.common
	openblas/distinfo
	openblas/options.mk
	openblas_openmp/Makefile
	openblas_pthread/Makefile

Log Message:
openblas*: Fix pkglint issues

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

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

diffstat:
 openblas/Makefile         |  1 +
 openblas/Makefile.common  | 44 +++++++++++++++++++++-----------------------
 openblas/distinfo         | 24 ++++++++++++------------
 openblas/options.mk       |  8 ++++----
 openblas_openmp/Makefile  |  1 +
 openblas_pthread/Makefile |  1 +
 6 files changed, 40 insertions(+), 39 deletions(-)

diffs:
diff --git a/openblas/Makefile b/openblas/Makefile
index 7952bb0ffd..1b8c82faa3 100644
--- a/openblas/Makefile
+++ b/openblas/Makefile
@@ -4,3 +4,4 @@ MAINTAINER=	thomas.orgis%uni-hamburg.de@localhost
 
 OPENBLAS_VARIANT= openblas
 .include "../../wip/openblas/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/openblas/Makefile.common b/openblas/Makefile.common
index ba94aaee6d..b5e100e5e6 100644
--- a/openblas/Makefile.common
+++ b/openblas/Makefile.common
@@ -8,12 +8,11 @@
 # OPENBLAS_VARIANT = (openblas|openblas_pthread|openblas_openmp)
 # being set.
 
-PORTVERSION=	0.3.7
-DISTNAME=	OpenBLAS-${PORTVERSION}
-PKGNAME=	${OPENBLAS_VARIANT}-${PORTVERSION}
+DISTNAME=	OpenBLAS-0.3.7
+PKGNAME=	${OPENBLAS_VARIANT}-0.3.7
 # ThOr: I do not like that. Can we rather rename the benchmark files
 # to be unique?
-DIST_SUBDIR=	openblas
+DIST_SUBDIR=	openblas-0.3.7
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GITHUB:=xianyi/} \
 		http://www.netlib.org/lapack/timing/
@@ -21,7 +20,7 @@ DISTFILES=	${DISTNAME}.tar.gz ${LARGE_FILE} ${TIMING_FILE}
 LARGE_FILE=	large.tgz
 TIMING_FILE=	timing.tgz
 GITHUB_PROJECT=	OpenBLAS
-GITHUB_TAG=	v${PORTVERSION}
+GITHUB_TAG=	v0.3.7
 
 DISTINFO_FILE=	${.CURDIR}/../../wip/openblas/distinfo
 PATCHDIR=	${.CURDIR}/../../wip/openblas/patches
@@ -96,27 +95,27 @@ MAKE_FLAGS+=	LIBNAMESUFFIX=openmp USE_OPENMP=1 NO_AFFINITY=1
 SUBST_CLASSES+=		arch
 SUBST_STAGE.arch=	pre-build
 SUBST_SED.arch+=	-e "s+(ARCH)+(ARCH_)+"
-SUBST_FILES.arch+=	${WRKSRC}/Makefile.tail
-SUBST_FILES.arch+=	${WRKSRC}/driver/level3/Makefile
-SUBST_FILES.arch+=	${WRKSRC}/driver/others/Makefile
-SUBST_FILES.arch+=	${WRKSRC}/exports/Makefile
-SUBST_FILES.arch+=	${WRKSRC}/interface/Makefile
-SUBST_FILES.arch+=	${WRKSRC}/kernel/Makefile
-SUBST_FILES.arch+=	${WRKSRC}/kernel/Makefile.L3
-SUBST_FILES.arch+=	${WRKSRC}/lapack/laswp/Makefile
-SUBST_FILES.arch+=	${WRKSRC}/lapack-netlib/SRC/Makefile
-SUBST_FILES.arch+=	${WRKSRC}/lapack-netlib/SRC/VARIANTS/Makefile
-SUBST_FILES.arch+=	${WRKSRC}/lapack-netlib/TESTING/MATGEN/Makefile
-SUBST_FILES.arch+=	${WRKSRC}/lapack-netlib/LAPACKE/src/Makefile
-SUBST_FILES.arch+=	${WRKSRC}/lapack-netlib/LAPACKE/utils/Makefile
-SUBST_FILES.arch+=	${WRKSRC}/reference/Makefile
-SUBST_FILES.arch+=	${WRKSRC}/Makefile.system
+SUBST_FILES.arch+=	Makefile.tail
+SUBST_FILES.arch+=	driver/level3/Makefile
+SUBST_FILES.arch+=	driver/others/Makefile
+SUBST_FILES.arch+=	exports/Makefile
+SUBST_FILES.arch+=	interface/Makefile
+SUBST_FILES.arch+=	kernel/Makefile
+SUBST_FILES.arch+=	kernel/Makefile.L3
+SUBST_FILES.arch+=	lapack/laswp/Makefile
+SUBST_FILES.arch+=	lapack-netlib/SRC/Makefile
+SUBST_FILES.arch+=	lapack-netlib/SRC/VARIANTS/Makefile
+SUBST_FILES.arch+=	lapack-netlib/TESTING/MATGEN/Makefile
+SUBST_FILES.arch+=	lapack-netlib/LAPACKE/src/Makefile
+SUBST_FILES.arch+=	lapack-netlib/LAPACKE/utils/Makefile
+SUBST_FILES.arch+=	reference/Makefile
+SUBST_FILES.arch+=	Makefile.system
 
 SUBST_CLASSES+=		threads
 SUBST_STAGE.threads=	pre-build
 SUBST_SED.threads+=	-e "s+OPENBLAS_NUM_THREADS+OMP_NUM_THREADS+g"
-SUBST_FILES.threads+=	${WRKSRC}/test/Makefile
-SUBST_FILES.threads+=	${WRKSRC}/ctest/Makefile
+SUBST_FILES.threads+=	test/Makefile
+SUBST_FILES.threads+=	ctest/Makefile
 
 # Fix up pkgconfig file installation.
 SUBST_CLASSES+=		pc
@@ -139,4 +138,3 @@ benchmark: build
 	  ${BENCHMARK_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS})
 
 .include "options.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/openblas/distinfo b/openblas/distinfo
index adb086d821..5c2012b120 100644
--- a/openblas/distinfo
+++ b/openblas/distinfo
@@ -1,17 +1,17 @@
 $NetBSD$
 
-SHA1 (openblas/OpenBLAS-0.3.7.tar.gz) = 6a79b36d1bf73584a513139806d226f9189d621e
-RMD160 (openblas/OpenBLAS-0.3.7.tar.gz) = 72103fa62efaa9ab77f80f9ae70b1417fa6f2122
-SHA512 (openblas/OpenBLAS-0.3.7.tar.gz) = 9c4898301c675471bbce2bb99b6bbe7c90724784fac06504416d4bd5da3cd4488f727b0a118c9a38ea342daac2af9e32597a847004241cc57de693b58b856262
-Size (openblas/OpenBLAS-0.3.7.tar.gz) = 11986592 bytes
-SHA1 (openblas/large.tgz) = a689e5b180595b40c5719b0f358b31b15b57a2db
-RMD160 (openblas/large.tgz) = 8010ff4002ef42cf22a9ee9345011d68fc27d855
-SHA512 (openblas/large.tgz) = e24db2b8a4253ccff9ca196815901c1fefd55e882f4fe1085715ac84b8f318e1842a91072130c17fdd144344ffc80233a77500da9349acb54e504b3935825965
-Size (openblas/large.tgz) = 2595 bytes
-SHA1 (openblas/timing.tgz) = fd47fc3f26d142a791df51e4a422a49662507252
-RMD160 (openblas/timing.tgz) = f0fe220e7ab611d4db8d8cab960361955e2ab093
-SHA512 (openblas/timing.tgz) = be0abfcfffdf0e118ed7e25a8451639833cf0ad6bb04d101bbe194c16f656b6ce509b2f76acf4ad626d1fb5b126bd5498cfea262f2946c2d077751112a2906af
-Size (openblas/timing.tgz) = 1059485 bytes
+SHA1 (openblas-0.3.7/OpenBLAS-0.3.7.tar.gz) = 6a79b36d1bf73584a513139806d226f9189d621e
+RMD160 (openblas-0.3.7/OpenBLAS-0.3.7.tar.gz) = 72103fa62efaa9ab77f80f9ae70b1417fa6f2122
+SHA512 (openblas-0.3.7/OpenBLAS-0.3.7.tar.gz) = 9c4898301c675471bbce2bb99b6bbe7c90724784fac06504416d4bd5da3cd4488f727b0a118c9a38ea342daac2af9e32597a847004241cc57de693b58b856262
+Size (openblas-0.3.7/OpenBLAS-0.3.7.tar.gz) = 11986592 bytes
+SHA1 (openblas-0.3.7/large.tgz) = a689e5b180595b40c5719b0f358b31b15b57a2db
+RMD160 (openblas-0.3.7/large.tgz) = 8010ff4002ef42cf22a9ee9345011d68fc27d855
+SHA512 (openblas-0.3.7/large.tgz) = e24db2b8a4253ccff9ca196815901c1fefd55e882f4fe1085715ac84b8f318e1842a91072130c17fdd144344ffc80233a77500da9349acb54e504b3935825965
+Size (openblas-0.3.7/large.tgz) = 2595 bytes
+SHA1 (openblas-0.3.7/timing.tgz) = fd47fc3f26d142a791df51e4a422a49662507252
+RMD160 (openblas-0.3.7/timing.tgz) = f0fe220e7ab611d4db8d8cab960361955e2ab093
+SHA512 (openblas-0.3.7/timing.tgz) = be0abfcfffdf0e118ed7e25a8451639833cf0ad6bb04d101bbe194c16f656b6ce509b2f76acf4ad626d1fb5b126bd5498cfea262f2946c2d077751112a2906af
+Size (openblas-0.3.7/timing.tgz) = 1059485 bytes
 SHA1 (patch-Makefile) = 6029076c34765e53a26617fb4bd36b56ba413f1b
 SHA1 (patch-Makefile.install) = 08c80677f8040623eaf5277cf92b5f5969fb4a07
 SHA1 (patch-Makefile.system) = d9dec776fb0d2919850506f682f3623b68751c90
diff --git a/openblas/options.mk b/openblas/options.mk
index aebbc26ebc..91c7d52938 100644
--- a/openblas/options.mk
+++ b/openblas/options.mk
@@ -1,15 +1,15 @@
 # $NetBSD$
 
-PKG_OPTIONS_VAR=		PKG_OPTIONS.openblas
+PKG_OPTIONS_VAR=	PKG_OPTIONS.openblas
 # Choose dynamic target/processor choice at runtime or
 # fixed build with build host CPU.
-PKG_SUPPORTED_OPTIONS= dynamic
-PKG_SUGGESTED_OPTIONS= dynamic
+PKG_SUPPORTED_OPTIONS=	dynamic-arch
+PKG_SUGGESTED_OPTIONS=	dynamic-arch
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mdynamic)
+.if !empty(PKG_OPTIONS:Mdynamic-arch)
 MAKE_FLAGS+=	DYNAMIC_ARCH=1
 .else
 MAKE_FLAGS+=	DYNAMIC_ARCH=0
diff --git a/openblas_openmp/Makefile b/openblas_openmp/Makefile
index db766f5d0e..b017993483 100644
--- a/openblas_openmp/Makefile
+++ b/openblas_openmp/Makefile
@@ -4,3 +4,4 @@ MAINTAINER=	thomas.orgis%uni-hamburg.de@localhost
 
 OPENBLAS_VARIANT= openblas_openmp
 .include "../../wip/openblas/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff --git a/openblas_pthread/Makefile b/openblas_pthread/Makefile
index 41f972065e..48565c355a 100644
--- a/openblas_pthread/Makefile
+++ b/openblas_pthread/Makefile
@@ -4,3 +4,4 @@ MAINTAINER=	thomas.orgis%uni-hamburg.de@localhost
 
 OPENBLAS_VARIANT= openblas_pthread
 .include "../../wip/openblas/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
Prev by Date: lapack and friends: Update Netlib version in bl3s
Next by Date: openblas: Add version.mk for consistency with Netlib packages
Previous by Thread: lapack and friends: Update Netlib version in bl3s
Next by Thread: openblas: Add version.mk for consistency with Netlib packages
Indexes:
Home | Main Index | Thread Index | Old Index