Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 9CA121A921F for ; Mon, 12 Oct 2020 21:52:11 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 0869684DAA; Mon, 12 Oct 2020 21:52:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 838BA84DA4 for ; Mon, 12 Oct 2020 21:52:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id OoxcefKCjGJE for ; Mon, 12 Oct 2020 21:52:06 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 01AAE84D74 for ; Mon, 12 Oct 2020 21:52:05 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id EDC3CFB28; Mon, 12 Oct 2020 21:52:05 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1602539525129420" MIME-Version: 1.0 Date: Mon, 12 Oct 2020 21:52:05 +0000 From: "Jason Bacon" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: bacon@netbsd.org X-Mailer: log_accum Message-Id: <20201012215205.EDC3CFB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1602539525129420 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bacon Date: Mon Oct 12 21:52:05 UTC 2020 Modified Files: pkgsrc/audio/aeneas: Makefile pkgsrc/audio/libsndfile: Makefile pkgsrc/audio/py-music21: Makefile pkgsrc/biology/mpqc: Makefile pkgsrc/biology/plink: Makefile pkgsrc/biology/py-biopython: Makefile pkgsrc/biology/py-mol: Makefile pkgsrc/cad/py-gds: Makefile pkgsrc/devel/py-bcolz: Makefile pkgsrc/devel/py-boost: Makefile pkgsrc/devel/py-h5py: Makefile pkgsrc/games/singularity: Makefile pkgsrc/geography/py-gdal: Makefile pkgsrc/geography/py-obspy: Makefile pkgsrc/geography/qgis: Makefile pkgsrc/graphics/blender: Makefile pkgsrc/graphics/blender-lts: Makefile pkgsrc/graphics/mypaint: Makefile pkgsrc/graphics/opencv: Makefile pkgsrc/graphics/pfstools: Makefile pkgsrc/graphics/py-OpenGL: Makefile pkgsrc/graphics/py-OpenGL-accelerate: Makefile pkgsrc/graphics/py-biggles: Makefile pkgsrc/graphics/py-fits: Makefile pkgsrc/graphics/py-gnuplot: Makefile pkgsrc/graphics/py-matplotlib: Makefile pkgsrc/graphics/veusz: Makefile pkgsrc/lang/lush: Makefile pkgsrc/math/R: Makefile buildlink3.mk pkgsrc/math/R-RandomFields: Makefile pkgsrc/math/R-gstat: Makefile pkgsrc/math/R-quantreg: Makefile pkgsrc/math/R-wle: Makefile pkgsrc/math/arpack-ng: Makefile pkgsrc/math/blas: Makefile PLIST buildlink3.mk pkgsrc/math/harmgen: Makefile pkgsrc/math/harminv: Makefile pkgsrc/math/ipopt: Makefile buildlink3.mk pkgsrc/math/itpp: Makefile pkgsrc/math/lapack: DESCR Makefile Makefile.common PLIST buildlink3.mk distinfo pkgsrc/math/lapack/patches: patch-TESTING_MATGEN_CMakeLists.txt pkgsrc/math/octave: Makefile buildlink3.mk pkgsrc/math/py-Scientific: Makefile pkgsrc/math/py-Theano: Makefile pkgsrc/math/py-autograd: Makefile pkgsrc/math/py-bottleneck: Makefile pkgsrc/math/py-fftw: Makefile pkgsrc/math/py-netCDF4: Makefile pkgsrc/math/py-numba: Makefile pkgsrc/math/py-numexpr: Makefile pkgsrc/math/py-numpy: Makefile buildlink3.mk pkgsrc/math/py-numpy/patches: patch-numpy_distutils_system__info.py pkgsrc/math/py-numpy16: Makefile pkgsrc/math/py-numpy16/patches: patch-numpy_distutils_system__info.py pkgsrc/math/py-pandas: Makefile pkgsrc/math/py-patsy: Makefile pkgsrc/math/py-pywavelets: Makefile pkgsrc/math/py-rpy: Makefile pkgsrc/math/py-scikit-image: Makefile pkgsrc/math/py-scikit-learn: Makefile pkgsrc/math/py-scipy: Makefile pkgsrc/math/py-statsmodels: Makefile pkgsrc/math/py-tables: Makefile pkgsrc/math/py-uncertainties: Makefile pkgsrc/pkgtools/R2pkg: Makefile pkgsrc/time/py-cftime: Makefile pkgsrc/x11/py-gtk2: Makefile Added Files: pkgsrc/math/lapack: version.mk pkgsrc/math/lapack/patches: patch-BLAS_SRC_CMakeLists.txt patch-CBLAS_cblas.pc.in patch-CBLAS_src_CMakeLists.txt patch-CMakeLists.txt patch-LAPACKE_CMakeLists.txt patch-LAPACKE_lapacke.pc.in patch-SRC_CMakeLists.txt pkgsrc/mk: blas.buildlink3.mk Removed Files: pkgsrc/math/lapack/patches: patch-TESTING_dbal.in Log Message: math/blas, math/lapack: Install interchangeable BLAS system Install the new interchangeable BLAS system created by Thomas Orgis, currently supporting Netlib BLAS/LAPACK, OpenBLAS, cblas, lapacke, and Apple's Accelerate.framework. This system allows the user to select any BLAS implementation without modifying packages or using package options, by setting PKGSRC_BLAS_TYPES in mk.conf. See mk/blas.buildlink3.mk for details. This commit should not alter behavior of existing packages as the system defaults to Netlib BLAS/LAPACK, which until now has been the only supported implementation. Details: Add new mk/blas.buildlink3.mk for inclusion in dependent packages Install compatible Netlib math/blas and math/lapack packages Update math/blas and math/lapack MAINTAINER approved by adam@ OpenBLAS, cblas, and lapacke will follow in separate commits Update direct dependents to use mk/blas.buildlink3.mk Perform recursive revbump To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 pkgsrc/audio/aeneas/Makefile cvs rdiff -u -r1.83 -r1.84 pkgsrc/audio/libsndfile/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/audio/py-music21/Makefile cvs rdiff -u -r1.17 -r1.18 pkgsrc/biology/mpqc/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/biology/plink/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/biology/py-biopython/Makefile cvs rdiff -u -r1.36 -r1.37 pkgsrc/biology/py-mol/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/cad/py-gds/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-bcolz/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/py-boost/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/py-h5py/Makefile cvs rdiff -u -r1.23 -r1.24 pkgsrc/games/singularity/Makefile cvs rdiff -u -r1.25 -r1.26 pkgsrc/geography/py-gdal/Makefile cvs rdiff -u -r1.15 -r1.16 pkgsrc/geography/py-obspy/Makefile cvs rdiff -u -r1.101 -r1.102 pkgsrc/geography/qgis/Makefile cvs rdiff -u -r1.167 -r1.168 pkgsrc/graphics/blender/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/blender-lts/Makefile cvs rdiff -u -r1.49 -r1.50 pkgsrc/graphics/mypaint/Makefile cvs rdiff -u -r1.94 -r1.95 pkgsrc/graphics/opencv/Makefile cvs rdiff -u -r1.67 -r1.68 pkgsrc/graphics/pfstools/Makefile cvs rdiff -u -r1.30 -r1.31 pkgsrc/graphics/py-OpenGL/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/py-OpenGL-accelerate/Makefile cvs rdiff -u -r1.29 -r1.30 pkgsrc/graphics/py-biggles/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/py-fits/Makefile cvs rdiff -u -r1.28 -r1.29 pkgsrc/graphics/py-gnuplot/Makefile cvs rdiff -u -r1.59 -r1.60 pkgsrc/graphics/py-matplotlib/Makefile cvs rdiff -u -r1.66 -r1.67 pkgsrc/graphics/veusz/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/lush/Makefile cvs rdiff -u -r1.218 -r1.219 pkgsrc/math/R/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/math/R/buildlink3.mk cvs rdiff -u -r1.6 -r1.7 pkgsrc/math/R-RandomFields/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/math/R-gstat/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/math/R-quantreg/Makefile cvs rdiff -u -r1.15 -r1.16 pkgsrc/math/R-wle/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/arpack-ng/Makefile cvs rdiff -u -r1.37 -r1.38 pkgsrc/math/blas/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/blas/PLIST cvs rdiff -u -r1.9 -r1.10 pkgsrc/math/blas/buildlink3.mk cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/harmgen/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/harminv/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/ipopt/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/math/ipopt/buildlink3.mk cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/itpp/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/lapack/DESCR cvs rdiff -u -r1.40 -r1.41 pkgsrc/math/lapack/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/math/lapack/Makefile.common cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/lapack/PLIST cvs rdiff -u -r1.9 -r1.10 pkgsrc/math/lapack/buildlink3.mk cvs rdiff -u -r1.22 -r1.23 pkgsrc/math/lapack/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/math/lapack/version.mk cvs rdiff -u -r0 -r1.1 \ pkgsrc/math/lapack/patches/patch-BLAS_SRC_CMakeLists.txt \ pkgsrc/math/lapack/patches/patch-CBLAS_cblas.pc.in \ pkgsrc/math/lapack/patches/patch-CBLAS_src_CMakeLists.txt \ pkgsrc/math/lapack/patches/patch-CMakeLists.txt \ pkgsrc/math/lapack/patches/patch-LAPACKE_CMakeLists.txt \ pkgsrc/math/lapack/patches/patch-LAPACKE_lapacke.pc.in \ pkgsrc/math/lapack/patches/patch-SRC_CMakeLists.txt cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/math/lapack/patches/patch-TESTING_MATGEN_CMakeLists.txt cvs rdiff -u -r1.1 -r0 pkgsrc/math/lapack/patches/patch-TESTING_dbal.in cvs rdiff -u -r1.209 -r1.210 pkgsrc/math/octave/Makefile cvs rdiff -u -r1.21 -r1.22 pkgsrc/math/octave/buildlink3.mk cvs rdiff -u -r1.67 -r1.68 pkgsrc/math/py-Scientific/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/py-Theano/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/py-autograd/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/py-bottleneck/Makefile cvs rdiff -u -r1.10 -r1.11 pkgsrc/math/py-fftw/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/math/py-netCDF4/Makefile cvs rdiff -u -r1.22 -r1.23 pkgsrc/math/py-numba/Makefile cvs rdiff -u -r1.17 -r1.18 pkgsrc/math/py-numexpr/Makefile cvs rdiff -u -r1.70 -r1.71 pkgsrc/math/py-numpy/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/py-numpy/buildlink3.mk cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/math/py-numpy/patches/patch-numpy_distutils_system__info.py cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/py-numpy16/Makefile cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/math/py-numpy16/patches/patch-numpy_distutils_system__info.py cvs rdiff -u -r1.30 -r1.31 pkgsrc/math/py-pandas/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/py-patsy/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/py-pywavelets/Makefile cvs rdiff -u -r1.46 -r1.47 pkgsrc/math/py-rpy/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/py-scikit-image/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/math/py-scikit-learn/Makefile cvs rdiff -u -r1.42 -r1.43 pkgsrc/math/py-scipy/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/math/py-statsmodels/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/math/py-tables/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/py-uncertainties/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/mk/blas.buildlink3.mk cvs rdiff -u -r1.11 -r1.12 pkgsrc/pkgtools/R2pkg/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/time/py-cftime/Makefile cvs rdiff -u -r1.127 -r1.128 pkgsrc/x11/py-gtk2/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1602539525129420 Content-Disposition: inline Content-Length: 73328 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/audio/aeneas/Makefile diff -u pkgsrc/audio/aeneas/Makefile:1.7 pkgsrc/audio/aeneas/Makefile:1.8 --- pkgsrc/audio/aeneas/Makefile:1.7 Tue Aug 18 17:57:33 2020 +++ pkgsrc/audio/aeneas/Makefile Mon Oct 12 21:51:58 2020 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2020/08/18 17:57:33 leot Exp $ +# $NetBSD: Makefile,v 1.8 2020/10/12 21:51:58 bacon Exp $ DISTNAME= aeneas-1.7.3 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_GITHUB:=readbeyond/} GITHUB_TAG= v${PKGVERSION_NOREV} Index: pkgsrc/audio/libsndfile/Makefile diff -u pkgsrc/audio/libsndfile/Makefile:1.83 pkgsrc/audio/libsndfile/Makefile:1.84 --- pkgsrc/audio/libsndfile/Makefile:1.83 Fri Sep 25 12:43:11 2020 +++ pkgsrc/audio/libsndfile/Makefile Mon Oct 12 21:51:58 2020 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.83 2020/09/25 12:43:11 tnn Exp $ +# $NetBSD: Makefile,v 1.84 2020/10/12 21:51:58 bacon Exp $ DISTNAME= libsndfile-1.0.30 +PKGREVISION= 1 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_GITHUB:=erikd/} GITHUB_PROJECT= libsndfile Index: pkgsrc/audio/py-music21/Makefile diff -u pkgsrc/audio/py-music21/Makefile:1.6 pkgsrc/audio/py-music21/Makefile:1.7 --- pkgsrc/audio/py-music21/Makefile:1.6 Sat Sep 5 00:07:17 2020 +++ pkgsrc/audio/py-music21/Makefile Mon Oct 12 21:51:58 2020 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.6 2020/09/05 00:07:17 gutteridge Exp $ +# $NetBSD: Makefile,v 1.7 2020/10/12 21:51:58 bacon Exp $ VERSION= 6.1.0 DISTNAME= music21-noCorpus-${VERSION} PKGNAME= ${PYPKGPREFIX}-music21-${VERSION} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= audio python MASTER_SITES= ${MASTER_SITE_GITHUB:=cuthbertLab/} GITHUB_PROJECT= music21 Index: pkgsrc/biology/mpqc/Makefile diff -u pkgsrc/biology/mpqc/Makefile:1.17 pkgsrc/biology/mpqc/Makefile:1.18 --- pkgsrc/biology/mpqc/Makefile:1.17 Mon Aug 31 18:06:39 2020 +++ pkgsrc/biology/mpqc/Makefile Mon Oct 12 21:51:58 2020 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2020/08/31 18:06:39 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2020/10/12 21:51:58 bacon Exp $ DISTNAME= mpqc-2.3.1 -PKGREVISION= 9 +PKGREVISION= 10 CATEGORIES= biology MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpqc/} EXTRACT_SUFX= .tar.bz2 @@ -39,7 +39,6 @@ CHECK_INTERPRETER_SKIP= bin/tkmolrender .include "../../x11/tk/interpreter.mk" -.include "../../math/blas/buildlink3.mk" -.include "../../math/lapack/buildlink3.mk" +.include "../../mk/blas.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/biology/plink/Makefile diff -u pkgsrc/biology/plink/Makefile:1.8 pkgsrc/biology/plink/Makefile:1.9 --- pkgsrc/biology/plink/Makefile:1.8 Sun Jan 13 22:06:42 2019 +++ pkgsrc/biology/plink/Makefile Mon Oct 12 21:51:58 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2019/01/13 22:06:42 bacon Exp $ +# $NetBSD: Makefile,v 1.9 2020/10/12 21:51:58 bacon Exp $ DISTNAME= plink-1.07-src PKGNAME= ${DISTNAME:-src=} +PKGREVISION= 1 CATEGORIES= biology #MASTER_SITES= http://pngu.mgh.harvard.edu/~purcell/plink/dist/ EXTRACT_SUFX= .zip @@ -36,7 +37,6 @@ do-test: .include "../../devel/libf2c/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../math/lapack/buildlink3.mk" -.include "../../math/blas/buildlink3.mk" +.include "../../mk/blas.buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/biology/py-biopython/Makefile diff -u pkgsrc/biology/py-biopython/Makefile:1.3 pkgsrc/biology/py-biopython/Makefile:1.4 --- pkgsrc/biology/py-biopython/Makefile:1.3 Sun Jan 26 17:30:46 2020 +++ pkgsrc/biology/py-biopython/Makefile Mon Oct 12 21:51:59 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2020/01/26 17:30:46 rillig Exp $ +# $NetBSD: Makefile,v 1.4 2020/10/12 21:51:59 bacon Exp $ DISTNAME= biopython-1.74 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= biology MASTER_SITES= http://biopython.org/DIST/ Index: pkgsrc/biology/py-mol/Makefile diff -u pkgsrc/biology/py-mol/Makefile:1.36 pkgsrc/biology/py-mol/Makefile:1.37 --- pkgsrc/biology/py-mol/Makefile:1.36 Mon Apr 27 18:33:18 2020 +++ pkgsrc/biology/py-mol/Makefile Mon Oct 12 21:51:59 2020 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.36 2020/04/27 18:33:18 adam Exp $ +# $NetBSD: Makefile,v 1.37 2020/10/12 21:51:59 bacon Exp $ DISTNAME= pymol-v1.5.0.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pymol-v/mol-/} EGG_NAME= pymol-1.5.0.1 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= biology MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pymol/} EXTRACT_SUFX= .tar.bz2 Index: pkgsrc/cad/py-gds/Makefile diff -u pkgsrc/cad/py-gds/Makefile:1.13 pkgsrc/cad/py-gds/Makefile:1.14 --- pkgsrc/cad/py-gds/Makefile:1.13 Fri Sep 4 16:05:20 2020 +++ pkgsrc/cad/py-gds/Makefile Mon Oct 12 21:51:59 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2020/09/04 16:05:20 mef Exp $ +# $NetBSD: Makefile,v 1.14 2020/10/12 21:51:59 bacon Exp $ DISTNAME= gdspy-1.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} +PKGREVISION= 1 CATEGORIES= cad python MASTER_SITES= ${MASTER_SITE_PYPI:=g/gdspy/} EXTRACT_SUFX= .zip Index: pkgsrc/devel/py-bcolz/Makefile diff -u pkgsrc/devel/py-bcolz/Makefile:1.7 pkgsrc/devel/py-bcolz/Makefile:1.8 --- pkgsrc/devel/py-bcolz/Makefile:1.7 Fri Apr 26 13:13:51 2019 +++ pkgsrc/devel/py-bcolz/Makefile Mon Oct 12 21:51:59 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2019/04/26 13:13:51 maya Exp $ +# $NetBSD: Makefile,v 1.8 2020/10/12 21:51:59 bacon Exp $ DISTNAME= bcolz-1.2.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=b/bcolz/} Index: pkgsrc/devel/py-boost/Makefile diff -u pkgsrc/devel/py-boost/Makefile:1.12 pkgsrc/devel/py-boost/Makefile:1.13 --- pkgsrc/devel/py-boost/Makefile:1.12 Fri Jan 24 15:36:39 2020 +++ pkgsrc/devel/py-boost/Makefile Mon Oct 12 21:51:59 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2020/01/24 15:36:39 jperkin Exp $ +# $NetBSD: Makefile,v 1.13 2020/10/12 21:51:59 bacon Exp $ BOOST_PACKAGE= python BOOST_COMMENT= (Boost.Python binary library) @@ -6,6 +6,7 @@ BOOST_CONFIG= installed INSTALLATION_DIRS+= lib +PKGREVISION= 1 .include "../../meta-pkgs/boost/Makefile.common" PKGNAME= ${PYPKGPREFIX}-boost-${BOOST_VERSION} Index: pkgsrc/devel/py-h5py/Makefile diff -u pkgsrc/devel/py-h5py/Makefile:1.8 pkgsrc/devel/py-h5py/Makefile:1.9 --- pkgsrc/devel/py-h5py/Makefile:1.8 Sun Jan 26 17:31:03 2020 +++ pkgsrc/devel/py-h5py/Makefile Mon Oct 12 21:51:59 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2020/01/26 17:31:03 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2020/10/12 21:51:59 bacon Exp $ DISTNAME= h5py-2.9.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=h/h5py/} Index: pkgsrc/games/singularity/Makefile diff -u pkgsrc/games/singularity/Makefile:1.23 pkgsrc/games/singularity/Makefile:1.24 --- pkgsrc/games/singularity/Makefile:1.23 Thu Apr 25 07:32:56 2019 +++ pkgsrc/games/singularity/Makefile Mon Oct 12 21:51:59 2020 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.23 2019/04/25 07:32:56 maya Exp $ +# $NetBSD: Makefile,v 1.24 2020/10/12 21:51:59 bacon Exp $ DISTNAME= singularity-0.30c-src PKGNAME= ${DISTNAME:S/-src//} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= games MASTER_SITES= http://endgame-singularity.googlecode.com/files/ Index: pkgsrc/geography/py-gdal/Makefile diff -u pkgsrc/geography/py-gdal/Makefile:1.25 pkgsrc/geography/py-gdal/Makefile:1.26 --- pkgsrc/geography/py-gdal/Makefile:1.25 Fri Jun 5 12:49:06 2020 +++ pkgsrc/geography/py-gdal/Makefile Mon Oct 12 21:51:59 2020 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.25 2020/06/05 12:49:06 jperkin Exp $ +# $NetBSD: Makefile,v 1.26 2020/10/12 21:51:59 bacon Exp $ #PKGREVISION= 0 -PKGREVISION= 4 +PKGREVISION= 5 .include "../../geography/gdal-lib/Makefile.common" PKGNAME= ${PYPKGPREFIX}-${DISTNAME} Index: pkgsrc/geography/py-obspy/Makefile diff -u pkgsrc/geography/py-obspy/Makefile:1.15 pkgsrc/geography/py-obspy/Makefile:1.16 --- pkgsrc/geography/py-obspy/Makefile:1.15 Sat Jun 15 18:06:04 2019 +++ pkgsrc/geography/py-obspy/Makefile Mon Oct 12 21:51:59 2020 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2019/06/15 18:06:04 adam Exp $ +# $NetBSD: Makefile,v 1.16 2020/10/12 21:51:59 bacon Exp $ DISTNAME= obspy-1.1.1 -PKGREVISION= 1 +PKGREVISION= 2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= geography python MASTER_SITES= ${MASTER_SITE_PYPI:=o/obspy/} Index: pkgsrc/geography/qgis/Makefile diff -u pkgsrc/geography/qgis/Makefile:1.101 pkgsrc/geography/qgis/Makefile:1.102 --- pkgsrc/geography/qgis/Makefile:1.101 Sat Sep 12 23:56:44 2020 +++ pkgsrc/geography/qgis/Makefile Mon Oct 12 21:52:00 2020 @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.101 2020/09/12 23:56:44 gdt Exp $ +# $NetBSD: Makefile,v 1.102 2020/10/12 21:52:00 bacon Exp $ # This is intentionally 3.10 Long Term Release. Please do not update # to 3.14, and instead discuss whether/how we want multiple versions. DISTNAME= qgis-3.10.10 +PKGREVISION= 1 CATEGORIES= geography MASTER_SITES= https://qgis.org/downloads/ EXTRACT_SUFX= .tar.bz2 Index: pkgsrc/graphics/blender/Makefile diff -u pkgsrc/graphics/blender/Makefile:1.167 pkgsrc/graphics/blender/Makefile:1.168 --- pkgsrc/graphics/blender/Makefile:1.167 Sat Sep 5 11:40:58 2020 +++ pkgsrc/graphics/blender/Makefile Mon Oct 12 21:52:00 2020 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.167 2020/09/05 11:40:58 ryoon Exp $ +# $NetBSD: Makefile,v 1.168 2020/10/12 21:52:00 bacon Exp $ DISTNAME= blender-2.90.0 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= https://download.blender.org/source/ EXTRACT_SUFX= .tar.xz Index: pkgsrc/graphics/blender-lts/Makefile diff -u pkgsrc/graphics/blender-lts/Makefile:1.1 pkgsrc/graphics/blender-lts/Makefile:1.2 --- pkgsrc/graphics/blender-lts/Makefile:1.1 Sat Sep 5 11:46:40 2020 +++ pkgsrc/graphics/blender-lts/Makefile Mon Oct 12 21:52:00 2020 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2020/09/05 11:46:40 ryoon Exp $ +# $NetBSD: Makefile,v 1.2 2020/10/12 21:52:00 bacon Exp $ DISTNAME= blender-2.83.5 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= https://download.blender.org/source/ EXTRACT_SUFX= .tar.xz Index: pkgsrc/graphics/mypaint/Makefile diff -u pkgsrc/graphics/mypaint/Makefile:1.49 pkgsrc/graphics/mypaint/Makefile:1.50 --- pkgsrc/graphics/mypaint/Makefile:1.49 Mon Aug 17 20:19:06 2020 +++ pkgsrc/graphics/mypaint/Makefile Mon Oct 12 21:52:00 2020 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.49 2020/08/17 20:19:06 leot Exp $ +# $NetBSD: Makefile,v 1.50 2020/10/12 21:52:00 bacon Exp $ DISTNAME= mypaint-2.0.0 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GITHUB:=mypaint/} EXTRACT_SUFX= .tar.xz Index: pkgsrc/graphics/opencv/Makefile diff -u pkgsrc/graphics/opencv/Makefile:1.94 pkgsrc/graphics/opencv/Makefile:1.95 --- pkgsrc/graphics/opencv/Makefile:1.94 Mon Aug 17 20:19:06 2020 +++ pkgsrc/graphics/opencv/Makefile Mon Oct 12 21:52:00 2020 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.94 2020/08/17 20:19:06 leot Exp $ +# $NetBSD: Makefile,v 1.95 2020/10/12 21:52:00 bacon Exp $ .include "Makefile.common" DISTNAME= opencv-${OPENCV_VERSION} -PKGREVISION= 5 +PKGREVISION= 6 MAINTAINER= anthony.mallet@laas.fr COMMENT= Library for computer vision problems Index: pkgsrc/graphics/pfstools/Makefile diff -u pkgsrc/graphics/pfstools/Makefile:1.67 pkgsrc/graphics/pfstools/Makefile:1.68 --- pkgsrc/graphics/pfstools/Makefile:1.67 Mon Aug 31 18:09:45 2020 +++ pkgsrc/graphics/pfstools/Makefile Mon Oct 12 21:52:00 2020 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.67 2020/08/31 18:09:45 wiz Exp $ +# $NetBSD: Makefile,v 1.68 2020/10/12 21:52:00 bacon Exp $ DISTNAME= pfstools-2.1.0 -PKGREVISION= 10 +PKGREVISION= 11 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pfstools/} EXTRACT_SUFX= .tgz Index: pkgsrc/graphics/py-OpenGL/Makefile diff -u pkgsrc/graphics/py-OpenGL/Makefile:1.30 pkgsrc/graphics/py-OpenGL/Makefile:1.31 --- pkgsrc/graphics/py-OpenGL/Makefile:1.30 Sun Apr 26 10:07:06 2020 +++ pkgsrc/graphics/py-OpenGL/Makefile Mon Oct 12 21:52:00 2020 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.30 2020/04/26 10:07:06 rillig Exp $ +# $NetBSD: Makefile,v 1.31 2020/10/12 21:52:00 bacon Exp $ DISTNAME= PyOpenGL-3.1.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^Py//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_PYPI:=P/PyOpenGL/} Index: pkgsrc/graphics/py-OpenGL-accelerate/Makefile diff -u pkgsrc/graphics/py-OpenGL-accelerate/Makefile:1.1 pkgsrc/graphics/py-OpenGL-accelerate/Makefile:1.2 --- pkgsrc/graphics/py-OpenGL-accelerate/Makefile:1.1 Mon Jan 27 06:24:36 2020 +++ pkgsrc/graphics/py-OpenGL-accelerate/Makefile Mon Oct 12 21:52:00 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2020/01/27 06:24:36 adam Exp $ +# $NetBSD: Makefile,v 1.2 2020/10/12 21:52:00 bacon Exp $ DISTNAME= PyOpenGL-accelerate-3.1.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^Py//} +PKGREVISION= 1 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_PYPI:=P/PyOpenGL-accelerate/} Index: pkgsrc/graphics/py-biggles/Makefile diff -u pkgsrc/graphics/py-biggles/Makefile:1.29 pkgsrc/graphics/py-biggles/Makefile:1.30 --- pkgsrc/graphics/py-biggles/Makefile:1.29 Fri Mar 20 11:57:52 2020 +++ pkgsrc/graphics/py-biggles/Makefile Mon Oct 12 21:52:00 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.29 2020/03/20 11:57:52 nia Exp $ +# $NetBSD: Makefile,v 1.30 2020/10/12 21:52:00 bacon Exp $ DISTNAME= python2-biggles-1.6.6 PKGNAME= ${PYPKGPREFIX}${DISTNAME:S/python2//} +PKGREVISION= 1 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=biggles/} Index: pkgsrc/graphics/py-fits/Makefile diff -u pkgsrc/graphics/py-fits/Makefile:1.8 pkgsrc/graphics/py-fits/Makefile:1.9 --- pkgsrc/graphics/py-fits/Makefile:1.8 Mon May 25 05:29:32 2020 +++ pkgsrc/graphics/py-fits/Makefile Mon Oct 12 21:52:01 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2020/05/25 05:29:32 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2020/10/12 21:52:01 bacon Exp $ DISTNAME= pyfits-3.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} +PKGREVISION= 1 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_PYPI:=p/pyfits/} Index: pkgsrc/graphics/py-gnuplot/Makefile diff -u pkgsrc/graphics/py-gnuplot/Makefile:1.28 pkgsrc/graphics/py-gnuplot/Makefile:1.29 --- pkgsrc/graphics/py-gnuplot/Makefile:1.28 Mon Apr 27 18:35:01 2020 +++ pkgsrc/graphics/py-gnuplot/Makefile Mon Oct 12 21:52:01 2020 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.28 2020/04/27 18:35:01 adam Exp $ +# $NetBSD: Makefile,v 1.29 2020/10/12 21:52:01 bacon Exp $ DISTNAME= gnuplot-py-1.8 PKGNAME= ${PYPKGPREFIX}-gnuplot-1.8 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnuplot-py/} Index: pkgsrc/graphics/py-matplotlib/Makefile diff -u pkgsrc/graphics/py-matplotlib/Makefile:1.59 pkgsrc/graphics/py-matplotlib/Makefile:1.60 --- pkgsrc/graphics/py-matplotlib/Makefile:1.59 Thu Jun 18 12:24:55 2020 +++ pkgsrc/graphics/py-matplotlib/Makefile Mon Oct 12 21:52:01 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.59 2020/06/18 12:24:55 adam Exp $ +# $NetBSD: Makefile,v 1.60 2020/10/12 21:52:01 bacon Exp $ DISTNAME= matplotlib-3.2.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_PYPI:=m/matplotlib/} Index: pkgsrc/graphics/veusz/Makefile diff -u pkgsrc/graphics/veusz/Makefile:1.66 pkgsrc/graphics/veusz/Makefile:1.67 --- pkgsrc/graphics/veusz/Makefile:1.66 Mon Aug 17 20:19:11 2020 +++ pkgsrc/graphics/veusz/Makefile Mon Oct 12 21:52:01 2020 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.66 2020/08/17 20:19:11 leot Exp $ +# $NetBSD: Makefile,v 1.67 2020/10/12 21:52:01 bacon Exp $ DISTNAME= veusz-3.1 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GITHUB:=veusz/} GITHUB_RELEASE= ${DISTNAME} Index: pkgsrc/lang/lush/Makefile diff -u pkgsrc/lang/lush/Makefile:1.13 pkgsrc/lang/lush/Makefile:1.14 --- pkgsrc/lang/lush/Makefile:1.13 Fri Mar 20 11:57:55 2020 +++ pkgsrc/lang/lush/Makefile Mon Oct 12 21:52:01 2020 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2020/03/20 11:57:55 nia Exp $ +# $NetBSD: Makefile,v 1.14 2020/10/12 21:52:01 bacon Exp $ DISTNAME= lush-1.2.1 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lush/} @@ -21,8 +21,7 @@ post-install: ${RM} ${DESTDIR}${PREFIX}/share/lush/lsh/libc/*.lsh.orig .include "../../math/gsl/buildlink3.mk" -.include "../../math/lapack/buildlink3.mk" -.include "../../math/blas/buildlink3.mk" +.include "../../mk/blas.buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" # rl_getc, rl_basic_quote_characters, rl_insert_close .include "../../devel/readline/buildlink3.mk" Index: pkgsrc/math/R/Makefile diff -u pkgsrc/math/R/Makefile:1.218 pkgsrc/math/R/Makefile:1.219 --- pkgsrc/math/R/Makefile:1.218 Sun Oct 11 15:22:56 2020 +++ pkgsrc/math/R/Makefile Mon Oct 12 21:51:58 2020 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.218 2020/10/11 15:22:56 wen Exp $ +# $NetBSD: Makefile,v 1.219 2020/10/12 21:51:58 bacon Exp $ DISTNAME= R-4.0.3 +PKGREVISION= 1 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_R_CRAN:=base/R-4/} @@ -168,8 +169,7 @@ fix-darwin-install-name: .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .if !exists(/System/Library/Frameworks/Accelerate.framework) -.include "../../math/blas/buildlink3.mk" -.include "../../math/lapack/buildlink3.mk" +.include "../../mk/blas.buildlink3.mk" .endif .include "../../www/curl/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" Index: pkgsrc/math/R/buildlink3.mk diff -u pkgsrc/math/R/buildlink3.mk:1.13 pkgsrc/math/R/buildlink3.mk:1.14 --- pkgsrc/math/R/buildlink3.mk:1.13 Wed Mar 7 23:16:03 2018 +++ pkgsrc/math/R/buildlink3.mk Mon Oct 12 21:51:58 2020 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2018/03/07 23:16:03 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2020/10/12 21:51:58 bacon Exp $ BUILDLINK_TREE+= R @@ -6,7 +6,7 @@ BUILDLINK_TREE+= R R_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.R+= R>=1.7.0 -BUILDLINK_ABI_DEPENDS.R+= R>=2.2.1nb2 +BUILDLINK_ABI_DEPENDS.R+= R>=4.0.3nb1 BUILDLINK_PKGSRCDIR.R?= ../../math/R .endif # R_BUILDLINK3_MK @@ -15,8 +15,7 @@ BUILDLINK_PKGSRCDIR.R?= ../../math/R .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .if !exists(/System/Library/Frameworks/Accelerate.framework) -.include "../../math/blas/buildlink3.mk" -.include "../../math/lapack/buildlink3.mk" +.include "../../mk/blas.buildlink3.mk" .endif BUILDLINK_TREE+= -R Index: pkgsrc/math/R-RandomFields/Makefile diff -u pkgsrc/math/R-RandomFields/Makefile:1.6 pkgsrc/math/R-RandomFields/Makefile:1.7 --- pkgsrc/math/R-RandomFields/Makefile:1.6 Sun Sep 20 23:29:09 2020 +++ pkgsrc/math/R-RandomFields/Makefile Mon Oct 12 21:52:01 2020 @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.6 2020/09/20 23:29:09 mef Exp $ +# $NetBSD: Makefile,v 1.7 2020/10/12 21:52:01 bacon Exp $ R_PKGNAME= RandomFields R_PKGVER= 3.3.8 MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Simulation and analysis of random fields +PKGREVISION= 1 LICENSE= gnu-gpl-v3 DEPENDS+= R-sp>=1.3.1:../../math/R-sp @@ -20,5 +21,5 @@ USE_LANGUAGES+= c c++ fortran .include "../../math/R/Makefile.extension" .include "../../math/R-RandomFieldsUtils/buildlink3.mk" -.include "../../math/blas/buildlink3.mk" +.include "../../mk/blas.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/math/R-gstat/Makefile diff -u pkgsrc/math/R-gstat/Makefile:1.12 pkgsrc/math/R-gstat/Makefile:1.13 --- pkgsrc/math/R-gstat/Makefile:1.12 Thu Aug 8 19:53:50 2019 +++ pkgsrc/math/R-gstat/Makefile Mon Oct 12 21:52:01 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2019/08/08 19:53:50 brook Exp $ +# $NetBSD: Makefile,v 1.13 2020/10/12 21:52:01 bacon Exp $ R_PKGNAME= gstat R_PKGVER= 2.0-2 +PKGREVISION= 1 CATEGORIES= math MAINTAINER= pkgsrc-users@NetBSD.org @@ -16,5 +17,5 @@ DEPENDS+= R-zoo>=1.8.3:../../math/R-zoo USE_LANGUAGES+= c fortran .include "../../math/R/Makefile.extension" -.include "../../math/blas/buildlink3.mk" +.include "../../mk/blas.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/math/R-quantreg/Makefile diff -u pkgsrc/math/R-quantreg/Makefile:1.7 pkgsrc/math/R-quantreg/Makefile:1.8 --- pkgsrc/math/R-quantreg/Makefile:1.7 Thu Aug 8 19:53:53 2019 +++ pkgsrc/math/R-quantreg/Makefile Mon Oct 12 21:52:01 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2019/08/08 19:53:53 brook Exp $ +# $NetBSD: Makefile,v 1.8 2020/10/12 21:52:01 bacon Exp $ R_PKGNAME= quantreg R_PKGVER= 5.42.1 +PKGREVISION= 1 CATEGORIES= math MAINTAINER= pkgsrc-users@NetBSD.org @@ -14,6 +15,5 @@ DEPENDS+= R-SparseM>=1.77:../../math/R-S USE_LANGUAGES= c fortran .include "../../math/R/Makefile.extension" -.include "../../math/blas/buildlink3.mk" -.include "../../math/lapack/buildlink3.mk" +.include "../../mk/blas.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/math/R-wle/Makefile diff -u pkgsrc/math/R-wle/Makefile:1.15 pkgsrc/math/R-wle/Makefile:1.16 --- pkgsrc/math/R-wle/Makefile:1.15 Thu Aug 8 19:53:55 2019 +++ pkgsrc/math/R-wle/Makefile Mon Oct 12 21:52:01 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.15 2019/08/08 19:53:55 brook Exp $ +# $NetBSD: Makefile,v 1.16 2020/10/12 21:52:01 bacon Exp $ R_PKGNAME= wle R_PKGVER= 0.9-9 +PKGREVISION= 1 CATEGORIES= math MAINTAINER= pkgsrc-users@NetBSD.org @@ -14,5 +15,5 @@ USE_LANGUAGES+= c fortran .include "../../math/R/Makefile.extension" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../math/blas/buildlink3.mk" +.include "../../mk/blas.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/math/arpack-ng/Makefile diff -u pkgsrc/math/arpack-ng/Makefile:1.1 pkgsrc/math/arpack-ng/Makefile:1.2 --- pkgsrc/math/arpack-ng/Makefile:1.1 Fri Feb 28 21:51:40 2020 +++ pkgsrc/math/arpack-ng/Makefile Mon Oct 12 21:52:02 2020 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2020/02/28 21:51:40 plunky Exp $ +# $NetBSD: Makefile,v 1.2 2020/10/12 21:52:02 bacon Exp $ DISTNAME= arpack-ng-3.7.0 +PKGREVISION= 1 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_GITHUB:=opencollab/} @@ -26,6 +27,5 @@ pre-configure: INSTALLATION_DIRS= lib -.include "../../math/blas/buildlink3.mk" -.include "../../math/lapack/buildlink3.mk" +.include "../../mk/blas.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/math/blas/Makefile diff -u pkgsrc/math/blas/Makefile:1.37 pkgsrc/math/blas/Makefile:1.38 --- pkgsrc/math/blas/Makefile:1.37 Fri Feb 28 21:48:53 2020 +++ pkgsrc/math/blas/Makefile Mon Oct 12 21:51:57 2020 @@ -1,16 +1,14 @@ -# $NetBSD: Makefile,v 1.37 2020/02/28 21:48:53 plunky Exp $ +# $NetBSD: Makefile,v 1.38 2020/10/12 21:51:57 bacon Exp $ .include "../../math/lapack/Makefile.common" -PKGNAME= ${DISTNAME:S/lapack/blas/} +PKGREVISION= 1 -COMMENT= Basic Linear Algebra Subprograms (Fortran) +COMMENT= Basic Linear Algebra System (Netlib reference implementation) -# not actually true but pretend as we package it separately -CMAKE_ARGS+= -DLATESTLAPACK_FOUND:BOOL=TRUE - -BUILD_TARGET= blas - -TEST_DIRS= ${WRKSRC}/${OBJDIR}/BLAS +LAPACK_COMPONENT= blas +LAPACK_COMPONENT_CMAKE_ARGS= \ + -DUSE_OPTIMIZED_BLAS=OFF \ + -DCBLAS=OFF -DLAPACKE=OFF -DLAPACK=OFF .include "../../mk/bsd.pkg.mk" Index: pkgsrc/math/blas/PLIST diff -u pkgsrc/math/blas/PLIST:1.5 pkgsrc/math/blas/PLIST:1.6 --- pkgsrc/math/blas/PLIST:1.5 Fri Feb 28 21:48:53 2020 +++ pkgsrc/math/blas/PLIST Mon Oct 12 21:51:57 2020 @@ -1,4 +1,6 @@ -@comment $NetBSD: PLIST,v 1.5 2020/02/28 21:48:53 plunky Exp $ +@comment $NetBSD: PLIST,v 1.6 2020/10/12 21:51:57 bacon Exp $ +lib/libblas.a lib/libblas.so lib/libblas.so.3 lib/libblas.so.${PKGVERSION} +lib/pkgconfig/blas.pc Index: pkgsrc/math/blas/buildlink3.mk diff -u pkgsrc/math/blas/buildlink3.mk:1.9 pkgsrc/math/blas/buildlink3.mk:1.10 --- pkgsrc/math/blas/buildlink3.mk:1.9 Fri Feb 28 21:48:53 2020 +++ pkgsrc/math/blas/buildlink3.mk Mon Oct 12 21:51:57 2020 @@ -1,15 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.9 2020/02/28 21:48:53 plunky Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2020/10/12 21:51:57 bacon Exp $ BUILDLINK_TREE+= blas .if !defined(BLAS_BUILDLINK3_MK) BLAS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.blas+= blas>=1.0nb2 -BUILDLINK_ABI_DEPENDS.blas+= blas>=1.0nb3 +BUILDLINK_API_DEPENDS.blas+= blas>=3.9.0 +BUILDLINK_ABI_DEPENDS.blas+= blas>=3.9.0nb1 BUILDLINK_PKGSRCDIR.blas?= ../../math/blas - -BLAS_LIBS= -lblas .endif # BLAS_BUILDLINK3_MK BUILDLINK_TREE+= -blas Index: pkgsrc/math/harmgen/Makefile diff -u pkgsrc/math/harmgen/Makefile:1.2 pkgsrc/math/harmgen/Makefile:1.3 --- pkgsrc/math/harmgen/Makefile:1.2 Tue Aug 18 17:58:05 2020 +++ pkgsrc/math/harmgen/Makefile Mon Oct 12 21:52:02 2020 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2020/08/18 17:58:05 leot Exp $ +# $NetBSD: Makefile,v 1.3 2020/10/12 21:52:02 bacon Exp $ DISTNAME= harmgen-3.1.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= math MASTER_SITES= https://flaterco.com/files/xtide/ EXTRACT_SUFX= .tar.xz Index: pkgsrc/math/harminv/Makefile diff -u pkgsrc/math/harminv/Makefile:1.4 pkgsrc/math/harminv/Makefile:1.5 --- pkgsrc/math/harminv/Makefile:1.4 Sat Nov 2 16:16:19 2019 +++ pkgsrc/math/harminv/Makefile Mon Oct 12 21:52:02 2020 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2019/11/02 16:16:19 rillig Exp $ +# $NetBSD: Makefile,v 1.5 2020/10/12 21:52:02 bacon Exp $ DISTNAME= harminv-1.3.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= math MASTER_SITES= http://ab-initio.mit.edu/harminv/ @@ -19,7 +19,6 @@ PKGCONFIG_OVERRIDE+= harminv.pc.in TEST_TARGET= check -.include "../../math/blas/buildlink3.mk" -.include "../../math/lapack/buildlink3.mk" +.include "../../mk/blas.buildlink3.mk" .include "../../math/mpcomplex/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/math/ipopt/Makefile diff -u pkgsrc/math/ipopt/Makefile:1.2 pkgsrc/math/ipopt/Makefile:1.3 --- pkgsrc/math/ipopt/Makefile:1.2 Wed Jul 18 00:06:21 2018 +++ pkgsrc/math/ipopt/Makefile Mon Oct 12 21:51:57 2020 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2018/07/18 00:06:21 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2020/10/12 21:51:57 bacon Exp $ DISTNAME= Ipopt-3.11.5 +PKGREVISION= 1 CATEGORIES= math MASTER_SITES= http://www.coin-or.org/download/source/Ipopt/ EXTRACT_SUFX= .tgz @@ -16,6 +17,5 @@ USE_TOOLS+= pkg-config TEST_TARGET= test -.include "../../math/blas/buildlink3.mk" -.include "../../math/lapack/buildlink3.mk" +.include "../../mk/blas.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/math/ipopt/buildlink3.mk diff -u pkgsrc/math/ipopt/buildlink3.mk:1.1.1.1 pkgsrc/math/ipopt/buildlink3.mk:1.2 --- pkgsrc/math/ipopt/buildlink3.mk:1.1.1.1 Thu Nov 14 15:04:12 2013 +++ pkgsrc/math/ipopt/buildlink3.mk Mon Oct 12 21:51:57 2020 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2013/11/14 15:04:12 asau Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2020/10/12 21:51:57 bacon Exp $ BUILDLINK_TREE+= Ipopt @@ -6,10 +6,10 @@ BUILDLINK_TREE+= Ipopt IPOPT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.Ipopt+= Ipopt>=3.11.5 +BUILDLINK_ABI_DEPENDS.Ipopt?= Ipopt>=3.11.5nb1 BUILDLINK_PKGSRCDIR.Ipopt?= ../../math/ipopt -.include "../../math/blas/buildlink3.mk" -.include "../../math/lapack/buildlink3.mk" +.include "../../mk/blas.buildlink3.mk" .endif # IPOPT_BUILDLINK3_MK BUILDLINK_TREE+= -Ipopt Index: pkgsrc/math/itpp/Makefile diff -u pkgsrc/math/itpp/Makefile:1.5 pkgsrc/math/itpp/Makefile:1.6 --- pkgsrc/math/itpp/Makefile:1.5 Wed Aug 16 20:21:11 2017 +++ pkgsrc/math/itpp/Makefile Mon Oct 12 21:52:02 2020 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2017/08/16 20:21:11 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2020/10/12 21:52:02 bacon Exp $ DISTNAME= itpp-4.0.7 +PKGREVISION= 1 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=itpp/} @@ -15,8 +16,7 @@ USE_TOOLS= gmake USE_LANGUAGES+= c c++ fortran77 -.include "../../math/blas/buildlink3.mk" +.include "../../mk/blas.buildlink3.mk" .include "../../math/fftw/buildlink3.mk" -.include "../../math/lapack/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/math/lapack/DESCR diff -u pkgsrc/math/lapack/DESCR:1.1 pkgsrc/math/lapack/DESCR:1.2 --- pkgsrc/math/lapack/DESCR:1.1 Thu Nov 1 00:12:32 2001 +++ pkgsrc/math/lapack/DESCR Mon Oct 12 21:51:57 2020 @@ -1,3 +1,11 @@ +The BLAS (Basic Linear Algebra Subprograms) are high quality "building +block" routines for performing basic vector and matrix +operations. Level 1 BLAS do vector-vector operations, Level 2 BLAS do +matrix-vector operations, and Level 3 BLAS do matrix-matrix +operations. Because the BLAS are efficient, portable, and widely +available, they're commonly used in the development of high quality +linear algebra software, LINPACK and LAPACK for example. + LAPACK is a highly portable Fortran 77 library which provides routines for solving systems of simultaneous linear equations, least-squares solutions of linear systems of equations, eigenvalue problems, and @@ -8,3 +16,7 @@ and estimating condition numbers. Dense handled, but not general sparse matrices. In all areas, similar functionality is provided for real and complex matrices, in both single and double precision. + +This package contains the Fortran 77 reference implementation of BLAS +and LAPACK from Netlib. The C wrappers CBLAS and LAPACKE are provided +in separate packages. Index: pkgsrc/math/lapack/Makefile diff -u pkgsrc/math/lapack/Makefile:1.40 pkgsrc/math/lapack/Makefile:1.41 --- pkgsrc/math/lapack/Makefile:1.40 Fri Feb 28 21:48:53 2020 +++ pkgsrc/math/lapack/Makefile Mon Oct 12 21:51:57 2020 @@ -1,13 +1,19 @@ -# $NetBSD: Makefile,v 1.40 2020/02/28 21:48:53 plunky Exp $ +# $NetBSD: Makefile,v 1.41 2020/10/12 21:51:57 bacon Exp $ -.include "Makefile.common" +MAINTAINER= thomas.orgis@uni-hamburg.de +COMMENT= Linear Algebra PACKage (Netlib reference implementation) +PKGREVISION= 1 -COMMENT= Linear Algebra PACKage - -# use external blas -CMAKE_ARGS+= -DBLAS_LIBRARIES:STRING=${BLAS_LIBS} - -BUILD_TARGET= lapack +LAPACK_COMPONENT= lapack +LAPACK_COMPONENT_CMAKE_ARGS= \ + -DUSE_OPTIMIZED_BLAS=ON \ + -DBLAS_LIBRARIES=${BLAS_LIBS:Q} \ + -DUSE_OPTIMIZED_LAPACK=OFF \ + -DCBLAS=OFF -DLAPACKE=OFF -DLAPACK=ON +# 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 "../../math/blas/buildlink3.mk" +.include "../../math/lapack/Makefile.common" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/math/lapack/Makefile.common diff -u pkgsrc/math/lapack/Makefile.common:1.11 pkgsrc/math/lapack/Makefile.common:1.12 --- pkgsrc/math/lapack/Makefile.common:1.11 Fri Feb 28 21:48:53 2020 +++ pkgsrc/math/lapack/Makefile.common Mon Oct 12 21:51:57 2020 @@ -1,46 +1,43 @@ -# $NetBSD: Makefile.common,v 1.11 2020/02/28 21:48:53 plunky Exp $ +# $NetBSD: Makefile.common,v 1.12 2020/10/12 21:51:57 bacon Exp $ # used by math/blas/Makefile +# used by math/cblas/Makefile +# used by math/lapacke/Makefile # used by math/lapack/Makefile -DISTNAME= lapack-3.9.0 +# 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" + +DISTNAME= lapack-${NETLIB_BLAS_VERSION} +PKGNAME= ${LAPACK_COMPONENT}-${NETLIB_BLAS_VERSION} CATEGORIES= math -MASTER_SITES= ${MASTER_SITE_NETLIB:=lapack/} -EXTRACT_SUFX= .tgz +MASTER_SITES= ${MASTER_SITE_GITHUB:=Reference-LAPACK/} +GITHUB_PROJECT= lapack +GITHUB_TAG= v${NETLIB_BLAS_VERSION} -MAINTAINER= adam@NetBSD.org HOMEPAGE= https://www.netlib.org/lapack/ LICENSE= modified-bsd -DISTINFO_FILE= ${.CURDIR}/../../math/lapack/distinfo +# All parts are in the same section PATCHDIR= ${.CURDIR}/../../math/lapack/patches +DISTINFO_FILE= ${.CURDIR}/../../math/lapack/distinfo USE_LANGUAGES= c fortran USE_CMAKE= yes -OBJDIR= obj - -CONFIGURE_DIRS= ${OBJDIR} -CMAKE_ARG_PATH= .. -CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON -CMAKE_ARGS+= -DBUILD_DEPRECATED:BOOL=ON -CMAKE_ARGS+= -DBUILD_TESTING:BOOL=ON - -TEST_TARGET= all test -TEST_ENV= LD_LIBRARY_PATH=${WRKSRC}/${OBJDIR}/lib - -pre-configure: - cd ${WRKSRC} && ${MKDIR} ${OBJDIR} - -do-install: - cd ${WRKSRC}/${OBJDIR} && \ - ${PKGSRC_SETENV} ${INSTALL_ENV} ${MAKE_ENV} \ - ${CMAKE} -DCMAKE_INSTALL_COMPONENT=RuntimeLibraries \ - -P cmake_install.cmake - -INSTALLATION_DIRS= lib +WRKSRC= ${WRKDIR}/${DISTNAME} +CONFIGURE_DIRS= build +CMAKE_ARG_PATH= ${WRKSRC} + +# Note: We patch the build to install both static and +# shared libraries. +CMAKE_ARGS= -DBUILD_DEPRECATED=ON \ + -DBUILD_SHARED_LIBS=ON \ + -DBUILD_STATIC_LIBS=ON \ + ${LAPACK_COMPONENT_CMAKE_ARGS} -# blas fails using the gold linker with: -# fatal error: --sysroot=: must take a non-empty argument -# Work around it on DragonFly by specifying the classic gnu linker +.include "../../math/lapack/version.mk" -MAKE_ENV.DragonFly+= LDVER=ld.bfd +post-extract: + ${RUN} ${MKDIR} ${WRKSRC}/build Index: pkgsrc/math/lapack/PLIST diff -u pkgsrc/math/lapack/PLIST:1.4 pkgsrc/math/lapack/PLIST:1.5 --- pkgsrc/math/lapack/PLIST:1.4 Fri Feb 28 21:48:53 2020 +++ pkgsrc/math/lapack/PLIST Mon Oct 12 21:51:57 2020 @@ -1,4 +1,10 @@ -@comment $NetBSD: PLIST,v 1.4 2020/02/28 21:48:53 plunky Exp $ +@comment $NetBSD: PLIST,v 1.5 2020/10/12 21:51:57 bacon Exp $ +lib/cmake/lapack-${PKGVERSION}/lapack-config-version.cmake +lib/cmake/lapack-${PKGVERSION}/lapack-config.cmake +lib/cmake/lapack-${PKGVERSION}/lapack-targets-release.cmake +lib/cmake/lapack-${PKGVERSION}/lapack-targets.cmake +lib/liblapack.a lib/liblapack.so lib/liblapack.so.3 lib/liblapack.so.${PKGVERSION} +lib/pkgconfig/lapack.pc Index: pkgsrc/math/lapack/buildlink3.mk diff -u pkgsrc/math/lapack/buildlink3.mk:1.9 pkgsrc/math/lapack/buildlink3.mk:1.10 --- pkgsrc/math/lapack/buildlink3.mk:1.9 Fri Mar 20 19:24:57 2009 +++ pkgsrc/math/lapack/buildlink3.mk Mon Oct 12 21:51:57 2020 @@ -1,13 +1,16 @@ -# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:57 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2020/10/12 21:51:57 bacon Exp $ BUILDLINK_TREE+= lapack .if !defined(LAPACK_BUILDLINK3_MK) LAPACK_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.lapack+= lapack>=3.1.1 -BUILDLINK_ABI_DEPENDS.lapack+= lapack>=3.1.1 +BUILDLINK_API_DEPENDS.lapack+= lapack>=3.9.0 +BUILDLINK_ABI_DEPENDS.lapack+= lapack>=3.9.0nb1 BUILDLINK_PKGSRCDIR.lapack?= ../../math/lapack + +.include "../../math/blas/buildlink3.mk" + .endif # LAPACK_BUILDLINK3_MK BUILDLINK_TREE+= -lapack Index: pkgsrc/math/lapack/distinfo diff -u pkgsrc/math/lapack/distinfo:1.22 pkgsrc/math/lapack/distinfo:1.23 --- pkgsrc/math/lapack/distinfo:1.22 Fri Feb 28 21:48:53 2020 +++ pkgsrc/math/lapack/distinfo Mon Oct 12 21:51:57 2020 @@ -1,8 +1,14 @@ -$NetBSD: distinfo,v 1.22 2020/02/28 21:48:53 plunky Exp $ +$NetBSD: distinfo,v 1.23 2020/10/12 21:51:57 bacon Exp $ -SHA1 (lapack-3.9.0.tgz) = 9da5f17521260e9f0cfefd9dfc5616d9ef10efb0 -RMD160 (lapack-3.9.0.tgz) = 136c181f31fd056956a96cec723ceb5a4fdf3feb -SHA512 (lapack-3.9.0.tgz) = 90c2c8372c2567b15c25653ed64e7c86a2cb0f1dda116f33716c6877490415210217af5badb67cb50e9d428f56ff83d33a3dad60b6ed7d31919164f6e7e98e0f -Size (lapack-3.9.0.tgz) = 9347104 bytes -SHA1 (patch-TESTING_MATGEN_CMakeLists.txt) = 695655299ccc48eec4c38c75d50144b3a13ee8db -SHA1 (patch-TESTING_dbal.in) = 3a6a726b6504a07fb1c0908a3893ea46aca670ea +SHA1 (lapack-3.9.0.tar.gz) = 0451d180eed2b12b94aaae77e772d7573e87bec4 +RMD160 (lapack-3.9.0.tar.gz) = 333bf17b3e2503c26cdd2139566fdc788be1d0c3 +SHA512 (lapack-3.9.0.tar.gz) = 424956ad941a60a4b71e0d451ad48db12a692f8a71a90f3ca7f71d6ecc1922f392746ea84df1c47a46577ed2db32e9e47ec44ad248207c5ac7da179becb712ef +Size (lapack-3.9.0.tar.gz) = 7534567 bytes +SHA1 (patch-BLAS_SRC_CMakeLists.txt) = c8c69e6e0c67337af999863c4f5c64618d1374d7 +SHA1 (patch-CBLAS_cblas.pc.in) = 3befb18c1b7f2f82c6da83ea10f913c817acf09f +SHA1 (patch-CBLAS_src_CMakeLists.txt) = faa1ad6c322830cb62e0f5bdab33732c0372cce3 +SHA1 (patch-CMakeLists.txt) = ea2bec54dd2c283a96862ef760826bf6e633613e +SHA1 (patch-LAPACKE_CMakeLists.txt) = b5d4fb36550e1ae47e7e68ffec0e10afa3ac8864 +SHA1 (patch-LAPACKE_lapacke.pc.in) = 7f0d91aaceac7f9980650ec90dbda95cf09b768f +SHA1 (patch-SRC_CMakeLists.txt) = 2908cdeb0d94f51ec16b02b8a6426dd6cde7e10f +SHA1 (patch-TESTING_MATGEN_CMakeLists.txt) = 84d4cde8fef49c6efc9f50a3219b0299375934d5 Index: pkgsrc/math/lapack/patches/patch-TESTING_MATGEN_CMakeLists.txt diff -u pkgsrc/math/lapack/patches/patch-TESTING_MATGEN_CMakeLists.txt:1.1 pkgsrc/math/lapack/patches/patch-TESTING_MATGEN_CMakeLists.txt:1.2 --- pkgsrc/math/lapack/patches/patch-TESTING_MATGEN_CMakeLists.txt:1.1 Fri Feb 28 21:48:54 2020 +++ pkgsrc/math/lapack/patches/patch-TESTING_MATGEN_CMakeLists.txt Mon Oct 12 21:51:57 2020 @@ -1,12 +1,19 @@ -$NetBSD: patch-TESTING_MATGEN_CMakeLists.txt,v 1.1 2020/02/28 21:48:54 plunky Exp $ +$NetBSD: patch-TESTING_MATGEN_CMakeLists.txt,v 1.2 2020/10/12 21:51:57 bacon Exp $ -we don't actually want to install the testing matrix generator lib +Support combined build of shared and static libraries. ---- TESTING/MATGEN/CMakeLists.txt.orig 2020-02-20 13:46:28.024672825 +0000 +--- TESTING/MATGEN/CMakeLists.txt.orig 2017-11-13 04:15:54.000000000 +0000 +++ TESTING/MATGEN/CMakeLists.txt -@@ -49,4 +49,4 @@ list(REMOVE_DUPLICATES SOURCES) - +@@ -50,3 +50,12 @@ list(REMOVE_DUPLICATES SOURCES) add_library(tmglib ${SOURCES}) target_link_libraries(tmglib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES}) --lapack_install_library(tmglib) -+#lapack_install_library(tmglib) + lapack_install_library(tmglib) ++if(BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS) ++ add_library(tmglib_static STATIC ${SOURCES}) ++ set_target_properties( ++ tmglib_static PROPERTIES ++ OUTPUT_NAME tmglib ++ ) ++ target_link_libraries(tmglib_static ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES}) ++ lapack_install_library(tmglib_static) ++endif() Index: pkgsrc/math/octave/Makefile diff -u pkgsrc/math/octave/Makefile:1.209 pkgsrc/math/octave/Makefile:1.210 --- pkgsrc/math/octave/Makefile:1.209 Mon Aug 31 18:10:12 2020 +++ pkgsrc/math/octave/Makefile Mon Oct 12 21:51:58 2020 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.209 2020/08/31 18:10:12 wiz Exp $ +# $NetBSD: Makefile,v 1.210 2020/10/12 21:51:58 bacon Exp $ DISTNAME= octave-5.2.0 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_GNU:=octave/} EXTRACT_SUFX= .tar.xz @@ -106,10 +106,9 @@ post-install: .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../math/arpack-ng/buildlink3.mk" -.include "../../math/blas/buildlink3.mk" +.include "../../mk/blas.buildlink3.mk" .include "../../math/fftw/buildlink3.mk" .include "../../math/fftwf/buildlink3.mk" -.include "../../math/lapack/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../www/curl/buildlink3.mk" .include "../../x11/fltk13/buildlink3.mk" Index: pkgsrc/math/octave/buildlink3.mk diff -u pkgsrc/math/octave/buildlink3.mk:1.21 pkgsrc/math/octave/buildlink3.mk:1.22 --- pkgsrc/math/octave/buildlink3.mk:1.21 Tue Aug 18 17:57:29 2020 +++ pkgsrc/math/octave/buildlink3.mk Mon Oct 12 21:51:58 2020 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2020/08/18 17:57:29 leot Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2020/10/12 21:51:58 bacon Exp $ BUILDLINK_TREE+= octave @@ -6,7 +6,7 @@ BUILDLINK_TREE+= octave OCTAVE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.octave+= octave>=3.0.0 -BUILDLINK_ABI_DEPENDS.octave+= octave>=5.2.0nb5 +BUILDLINK_ABI_DEPENDS.octave+= octave>=5.2.0nb7 BUILDLINK_PKGSRCDIR.octave?= ../../math/octave .include "../../mk/bsd.fast.prefs.mk" @@ -22,9 +22,8 @@ pkgbase := octave .include "../../devel/readline/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../math/blas/buildlink3.mk" +.include "../../mk/blas.buildlink3.mk" .include "../../math/fftw/buildlink3.mk" -.include "../../math/lapack/buildlink3.mk" .endif # OCTAVE_BUILDLINK3_MK BUILDLINK_TREE+= -octave Index: pkgsrc/math/py-Scientific/Makefile diff -u pkgsrc/math/py-Scientific/Makefile:1.67 pkgsrc/math/py-Scientific/Makefile:1.68 --- pkgsrc/math/py-Scientific/Makefile:1.67 Fri May 22 10:56:21 2020 +++ pkgsrc/math/py-Scientific/Makefile Mon Oct 12 21:52:02 2020 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.67 2020/05/22 10:56:21 adam Exp $ +# $NetBSD: Makefile,v 1.68 2020/10/12 21:52:02 bacon Exp $ DISTNAME= ScientificPython-2.8.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/Python//} -PKGREVISION= 17 +PKGREVISION= 18 CATEGORIES= math python MASTER_SITES= http://sourcesup.cru.fr/frs/download.php/4411/ Index: pkgsrc/math/py-Theano/Makefile diff -u pkgsrc/math/py-Theano/Makefile:1.5 pkgsrc/math/py-Theano/Makefile:1.6 --- pkgsrc/math/py-Theano/Makefile:1.5 Sat Jun 15 18:13:14 2019 +++ pkgsrc/math/py-Theano/Makefile Mon Oct 12 21:52:02 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2019/06/15 18:13:14 adam Exp $ +# $NetBSD: Makefile,v 1.6 2020/10/12 21:52:02 bacon Exp $ DISTNAME= Theano-1.0.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_PYPI:=T/Theano/} Index: pkgsrc/math/py-autograd/Makefile diff -u pkgsrc/math/py-autograd/Makefile:1.3 pkgsrc/math/py-autograd/Makefile:1.4 --- pkgsrc/math/py-autograd/Makefile:1.3 Mon Apr 27 19:03:26 2020 +++ pkgsrc/math/py-autograd/Makefile Mon Oct 12 21:52:02 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2020/04/27 19:03:26 adam Exp $ +# $NetBSD: Makefile,v 1.4 2020/10/12 21:52:02 bacon Exp $ DISTNAME= autograd-1.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_PYPI:=a/autograd/} Index: pkgsrc/math/py-bottleneck/Makefile diff -u pkgsrc/math/py-bottleneck/Makefile:1.3 pkgsrc/math/py-bottleneck/Makefile:1.4 --- pkgsrc/math/py-bottleneck/Makefile:1.3 Mon Apr 27 08:06:41 2020 +++ pkgsrc/math/py-bottleneck/Makefile Mon Oct 12 21:52:02 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2020/04/27 08:06:41 adam Exp $ +# $NetBSD: Makefile,v 1.4 2020/10/12 21:52:02 bacon Exp $ DISTNAME= Bottleneck-1.3.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} +PKGREVISION= 1 CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_PYPI:=B/Bottleneck/} Index: pkgsrc/math/py-fftw/Makefile diff -u pkgsrc/math/py-fftw/Makefile:1.10 pkgsrc/math/py-fftw/Makefile:1.11 --- pkgsrc/math/py-fftw/Makefile:1.10 Sat Nov 2 16:16:21 2019 +++ pkgsrc/math/py-fftw/Makefile Mon Oct 12 21:52:02 2020 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2019/11/02 16:16:21 rillig Exp $ +# $NetBSD: Makefile,v 1.11 2020/10/12 21:52:02 bacon Exp $ DISTNAME= PyFFTW3-0.2.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/Py//S/FFTW/fftw/S/3//} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_PYPI:=P/PyFFTW3/} Index: pkgsrc/math/py-netCDF4/Makefile diff -u pkgsrc/math/py-netCDF4/Makefile:1.8 pkgsrc/math/py-netCDF4/Makefile:1.9 --- pkgsrc/math/py-netCDF4/Makefile:1.8 Wed Jul 1 15:59:40 2020 +++ pkgsrc/math/py-netCDF4/Makefile Mon Oct 12 21:52:03 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2020/07/01 15:59:40 adam Exp $ +# $NetBSD: Makefile,v 1.9 2020/10/12 21:52:03 bacon Exp $ DISTNAME= netCDF4-1.5.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_PYPI:=n/netCDF4/} Index: pkgsrc/math/py-numba/Makefile diff -u pkgsrc/math/py-numba/Makefile:1.22 pkgsrc/math/py-numba/Makefile:1.23 --- pkgsrc/math/py-numba/Makefile:1.22 Fri Oct 2 08:34:39 2020 +++ pkgsrc/math/py-numba/Makefile Mon Oct 12 21:52:03 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.22 2020/10/02 08:34:39 adam Exp $ +# $NetBSD: Makefile,v 1.23 2020/10/12 21:52:03 bacon Exp $ DISTNAME= numba-0.51.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_PYPI:=n/numba/} Index: pkgsrc/math/py-numexpr/Makefile diff -u pkgsrc/math/py-numexpr/Makefile:1.17 pkgsrc/math/py-numexpr/Makefile:1.18 --- pkgsrc/math/py-numexpr/Makefile:1.17 Tue Apr 28 13:21:33 2020 +++ pkgsrc/math/py-numexpr/Makefile Mon Oct 12 21:52:03 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.17 2020/04/28 13:21:33 adam Exp $ +# $NetBSD: Makefile,v 1.18 2020/10/12 21:52:03 bacon Exp $ DISTNAME= numexpr-2.7.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_PYPI:=n/numexpr/} Index: pkgsrc/math/py-numpy/Makefile diff -u pkgsrc/math/py-numpy/Makefile:1.70 pkgsrc/math/py-numpy/Makefile:1.71 --- pkgsrc/math/py-numpy/Makefile:1.70 Fri Oct 2 07:44:15 2020 +++ pkgsrc/math/py-numpy/Makefile Mon Oct 12 21:51:58 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.70 2020/10/02 07:44:15 adam Exp $ +# $NetBSD: Makefile,v 1.71 2020/10/12 21:51:58 bacon Exp $ DISTNAME= numpy-1.19.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_PYPI:=n/numpy/} EXTRACT_SUFX= .zip @@ -55,9 +56,9 @@ BUILDLINK_API_DEPENDS.py-cython+= ${PYPK .include "../../devel/py-cython/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" +# Consider allowing mk/blas.buildlink3.mk to handle Accelerate.framework .if ${OPSYS} != "Darwin" # blas and lapack are not needed; numpy will use Accelerate.framework -.include "../../math/blas/buildlink3.mk" -.include "../../math/lapack/buildlink3.mk" +.include "../../mk/blas.buildlink3.mk" .endif .include "../../mk/bsd.pkg.mk" Index: pkgsrc/math/py-numpy/buildlink3.mk diff -u pkgsrc/math/py-numpy/buildlink3.mk:1.5 pkgsrc/math/py-numpy/buildlink3.mk:1.6 --- pkgsrc/math/py-numpy/buildlink3.mk:1.5 Mon Apr 27 17:00:35 2020 +++ pkgsrc/math/py-numpy/buildlink3.mk Mon Oct 12 21:51:58 2020 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2020/04/27 17:00:35 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2020/10/12 21:51:58 bacon Exp $ BUILDLINK_TREE+= py-numpy @@ -9,6 +9,7 @@ PY_NUMPY_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.py-numpy+= ${PYPKGPREFIX}-numpy>=1.0 .if ${_PYTHON_VERSION} == 27 +BUILDLINK_ABI_DEPENDS.py-numpy?= ${PYPKGPREFIX}-numpy>=1.19.2nb1 BUILDLINK_PKGSRCDIR.py-numpy?= ../../math/py-numpy16 .else BUILDLINK_PKGSRCDIR.py-numpy?= ../../math/py-numpy @@ -17,8 +18,7 @@ BUILDLINK_PKGSRCDIR.py-numpy?= ../../ma .include "../../mk/bsd.fast.prefs.mk" .if ${OPSYS} != "Darwin" -.include "../../math/blas/buildlink3.mk" -.include "../../math/lapack/buildlink3.mk" +.include "../../mk/blas.buildlink3.mk" .endif .endif # PY_NUMPY_BUILDLINK3_MK Index: pkgsrc/math/py-numpy/patches/patch-numpy_distutils_system__info.py diff -u pkgsrc/math/py-numpy/patches/patch-numpy_distutils_system__info.py:1.2 pkgsrc/math/py-numpy/patches/patch-numpy_distutils_system__info.py:1.3 --- pkgsrc/math/py-numpy/patches/patch-numpy_distutils_system__info.py:1.2 Mon Apr 27 17:00:35 2020 +++ pkgsrc/math/py-numpy/patches/patch-numpy_distutils_system__info.py Mon Oct 12 21:51:58 2020 @@ -1,6 +1,6 @@ -$NetBSD: patch-numpy_distutils_system__info.py,v 1.2 2020/04/27 17:00:35 adam Exp $ +$NetBSD: patch-numpy_distutils_system__info.py,v 1.3 2020/10/12 21:51:58 bacon Exp $ -Disable openblas detection. In pkgsrc, py-numpy should use math/blas. +Disable openblas detection. In pkgsrc, use mk/blas.buildlink.mk. --- numpy/distutils/system_info.py.orig 2020-04-19 08:51:58.000000000 +0000 +++ numpy/distutils/system_info.py Index: pkgsrc/math/py-numpy16/Makefile diff -u pkgsrc/math/py-numpy16/Makefile:1.4 pkgsrc/math/py-numpy16/Makefile:1.5 --- pkgsrc/math/py-numpy16/Makefile:1.4 Wed Aug 5 13:47:43 2020 +++ pkgsrc/math/py-numpy16/Makefile Mon Oct 12 21:52:03 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2020/08/05 13:47:43 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2020/10/12 21:52:03 bacon Exp $ DISTNAME= numpy-1.16.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_PYPI:=n/numpy/} EXTRACT_SUFX= .zip @@ -58,9 +59,9 @@ BUILDLINK_API_DEPENDS.py-cython+= ${PYPK .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../lang/python/versioned_dependencies.mk" +# Consider allowing mk/blas.buildlink3.mk to handle Accelerate.framework .if ${OPSYS} != "Darwin" # blas and lapack are not needed; numpy will use Accelerate.framework -.include "../../math/blas/buildlink3.mk" -.include "../../math/lapack/buildlink3.mk" +.include "../../mk/blas.buildlink3.mk" .endif .include "../../mk/bsd.pkg.mk" Index: pkgsrc/math/py-numpy16/patches/patch-numpy_distutils_system__info.py diff -u pkgsrc/math/py-numpy16/patches/patch-numpy_distutils_system__info.py:1.1 pkgsrc/math/py-numpy16/patches/patch-numpy_distutils_system__info.py:1.2 --- pkgsrc/math/py-numpy16/patches/patch-numpy_distutils_system__info.py:1.1 Mon Apr 27 16:52:56 2020 +++ pkgsrc/math/py-numpy16/patches/patch-numpy_distutils_system__info.py Mon Oct 12 21:52:03 2020 @@ -1,6 +1,6 @@ -$NetBSD: patch-numpy_distutils_system__info.py,v 1.1 2020/04/27 16:52:56 adam Exp $ +$NetBSD: patch-numpy_distutils_system__info.py,v 1.2 2020/10/12 21:52:03 bacon Exp $ -Disable openblas detection. In pkgsrc, py-numpy should use math/blas. +Disable openblas detection. In pkgsrc, use mk/blas.buildlink.mk. --- numpy/distutils/system_info.py.orig 2018-04-02 21:18:11.535155000 +0000 +++ numpy/distutils/system_info.py Index: pkgsrc/math/py-pandas/Makefile diff -u pkgsrc/math/py-pandas/Makefile:1.30 pkgsrc/math/py-pandas/Makefile:1.31 --- pkgsrc/math/py-pandas/Makefile:1.30 Fri Feb 14 16:21:55 2020 +++ pkgsrc/math/py-pandas/Makefile Mon Oct 12 21:52:03 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.30 2020/02/14 16:21:55 minskim Exp $ +# $NetBSD: Makefile,v 1.31 2020/10/12 21:52:03 bacon Exp $ DISTNAME= pandas-0.25.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= math graphics python MASTER_SITES= ${MASTER_SITE_PYPI:=p/pandas/} Index: pkgsrc/math/py-patsy/Makefile diff -u pkgsrc/math/py-patsy/Makefile:1.4 pkgsrc/math/py-patsy/Makefile:1.5 --- pkgsrc/math/py-patsy/Makefile:1.4 Mon Apr 27 18:56:16 2020 +++ pkgsrc/math/py-patsy/Makefile Mon Oct 12 21:52:03 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2020/04/27 18:56:16 adam Exp $ +# $NetBSD: Makefile,v 1.5 2020/10/12 21:52:03 bacon Exp $ DISTNAME= patsy-0.5.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_PYPI:=p/patsy/} Index: pkgsrc/math/py-pywavelets/Makefile diff -u pkgsrc/math/py-pywavelets/Makefile:1.2 pkgsrc/math/py-pywavelets/Makefile:1.3 --- pkgsrc/math/py-pywavelets/Makefile:1.2 Mon Jun 17 14:54:57 2019 +++ pkgsrc/math/py-pywavelets/Makefile Mon Oct 12 21:52:03 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2019/06/17 14:54:57 adam Exp $ +# $NetBSD: Makefile,v 1.3 2020/10/12 21:52:03 bacon Exp $ DISTNAME= PyWavelets-1.0.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} +PKGREVISION= 1 CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_PYPI:=P/PyWavelets/} Index: pkgsrc/math/py-rpy/Makefile diff -u pkgsrc/math/py-rpy/Makefile:1.46 pkgsrc/math/py-rpy/Makefile:1.47 --- pkgsrc/math/py-rpy/Makefile:1.46 Mon Aug 24 06:40:20 2020 +++ pkgsrc/math/py-rpy/Makefile Mon Oct 12 21:52:03 2020 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.46 2020/08/24 06:40:20 tnn Exp $ +# $NetBSD: Makefile,v 1.47 2020/10/12 21:52:03 bacon Exp $ DISTNAME= rpy2-2.9.1 -PKGREVISION= 1 +PKGREVISION= 2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/rpy2/rpy/} CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_PYPI:=r/rpy2/} Index: pkgsrc/math/py-scikit-image/Makefile diff -u pkgsrc/math/py-scikit-image/Makefile:1.4 pkgsrc/math/py-scikit-image/Makefile:1.5 --- pkgsrc/math/py-scikit-image/Makefile:1.4 Mon Jun 17 15:03:46 2019 +++ pkgsrc/math/py-scikit-image/Makefile Mon Oct 12 21:52:04 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2019/06/17 15:03:46 adam Exp $ +# $NetBSD: Makefile,v 1.5 2020/10/12 21:52:04 bacon Exp $ DISTNAME= scikit-image-0.15.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_PYPI:=s/scikit-image/} Index: pkgsrc/math/py-scikit-learn/Makefile diff -u pkgsrc/math/py-scikit-learn/Makefile:1.11 pkgsrc/math/py-scikit-learn/Makefile:1.12 --- pkgsrc/math/py-scikit-learn/Makefile:1.11 Wed May 27 19:37:40 2020 +++ pkgsrc/math/py-scikit-learn/Makefile Mon Oct 12 21:52:04 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2020/05/27 19:37:40 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2020/10/12 21:52:04 bacon Exp $ DISTNAME= scikit-learn-0.22.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_PYPI:=s/scikit-learn/} @@ -23,9 +24,9 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../devel/py-cython/buildlink3.mk" .include "../../lang/python/egg.mk" +# Consider letting mk/blas.buildlink3.mk handle this check .if !exists(/System/Library/Frameworks/Accelerate.framework) -.include "../../math/blas/buildlink3.mk" -.include "../../math/lapack/buildlink3.mk" +.include "../../mk/blas.buildlink3.mk" .endif BUILDLINK_API_DEPENDS.py-numpy+= ${PYPKGPREFIX}-numpy>=1.11.0 .include "../../math/py-numpy/buildlink3.mk" Index: pkgsrc/math/py-scipy/Makefile diff -u pkgsrc/math/py-scipy/Makefile:1.42 pkgsrc/math/py-scipy/Makefile:1.43 --- pkgsrc/math/py-scipy/Makefile:1.42 Tue Aug 4 01:16:19 2020 +++ pkgsrc/math/py-scipy/Makefile Mon Oct 12 21:52:04 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.42 2020/08/04 01:16:19 tnn Exp $ +# $NetBSD: Makefile,v 1.43 2020/10/12 21:52:04 bacon Exp $ DISTNAME= scipy-1.5.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_PYPI:=s/scipy/} @@ -60,9 +61,8 @@ do-test: .include "../../devel/py-pybind11/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" -.include "../../math/blas/buildlink3.mk" +.include "../../mk/blas.buildlink3.mk" .include "../../math/fftw/buildlink3.mk" -.include "../../math/lapack/buildlink3.mk" BUILDLINK_API_DEPENDS.py-numpy+= ${PYPKGPREFIX}-numpy>=1.17.3 .include "../../math/py-numpy/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/math/py-statsmodels/Makefile diff -u pkgsrc/math/py-statsmodels/Makefile:1.7 pkgsrc/math/py-statsmodels/Makefile:1.8 --- pkgsrc/math/py-statsmodels/Makefile:1.7 Sun May 3 16:13:11 2020 +++ pkgsrc/math/py-statsmodels/Makefile Mon Oct 12 21:52:04 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2020/05/03 16:13:11 minskim Exp $ +# $NetBSD: Makefile,v 1.8 2020/10/12 21:52:04 bacon Exp $ DISTNAME= statsmodels-0.11.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_PYPI:=s/statsmodels/} Index: pkgsrc/math/py-tables/Makefile diff -u pkgsrc/math/py-tables/Makefile:1.6 pkgsrc/math/py-tables/Makefile:1.7 --- pkgsrc/math/py-tables/Makefile:1.6 Thu May 14 19:31:40 2020 +++ pkgsrc/math/py-tables/Makefile Mon Oct 12 21:52:04 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2020/05/14 19:31:40 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2020/10/12 21:52:04 bacon Exp $ DISTNAME= tables-3.6.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_PYPI:=t/tables/} Index: pkgsrc/math/py-uncertainties/Makefile diff -u pkgsrc/math/py-uncertainties/Makefile:1.5 pkgsrc/math/py-uncertainties/Makefile:1.6 --- pkgsrc/math/py-uncertainties/Makefile:1.5 Thu Jun 11 08:16:27 2020 +++ pkgsrc/math/py-uncertainties/Makefile Mon Oct 12 21:52:04 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2020/06/11 08:16:27 adam Exp $ +# $NetBSD: Makefile,v 1.6 2020/10/12 21:52:04 bacon Exp $ DISTNAME= uncertainties-3.1.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_PYPI:=u/uncertainties/} Index: pkgsrc/pkgtools/R2pkg/Makefile diff -u pkgsrc/pkgtools/R2pkg/Makefile:1.11 pkgsrc/pkgtools/R2pkg/Makefile:1.12 --- pkgsrc/pkgtools/R2pkg/Makefile:1.11 Mon Jan 13 18:06:47 2020 +++ pkgsrc/pkgtools/R2pkg/Makefile Mon Oct 12 21:52:04 2020 @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.11 2020/01/13 18:06:47 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2020/10/12 21:52:04 bacon Exp $ # VERS= 0.6.4 PKGNAME= R2pkg-${VERS} +PKGREVISION= 1 CATEGORIES= pkgtools MAINTAINER= brook@NetBSD.org Index: pkgsrc/time/py-cftime/Makefile diff -u pkgsrc/time/py-cftime/Makefile:1.1 pkgsrc/time/py-cftime/Makefile:1.2 --- pkgsrc/time/py-cftime/Makefile:1.1 Wed Jul 1 15:57:35 2020 +++ pkgsrc/time/py-cftime/Makefile Mon Oct 12 21:52:04 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2020/07/01 15:57:35 adam Exp $ +# $NetBSD: Makefile,v 1.2 2020/10/12 21:52:04 bacon Exp $ DISTNAME= cftime-1.1.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= time python MASTER_SITES= ${MASTER_SITE_PYPI:=c/cftime/} Index: pkgsrc/x11/py-gtk2/Makefile diff -u pkgsrc/x11/py-gtk2/Makefile:1.127 pkgsrc/x11/py-gtk2/Makefile:1.128 --- pkgsrc/x11/py-gtk2/Makefile:1.127 Mon Aug 17 20:17:56 2020 +++ pkgsrc/x11/py-gtk2/Makefile Mon Oct 12 21:52:04 2020 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.127 2020/08/17 20:17:56 leot Exp $ +# $NetBSD: Makefile,v 1.128 2020/10/12 21:52:04 bacon Exp $ DISTNAME= pygtk-2.24.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/} -PKGREVISION= 34 +PKGREVISION= 35 CATEGORIES= x11 python MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygtk/2.24/} EXTRACT_SUFX= .tar.bz2 Added files: Index: pkgsrc/math/lapack/version.mk diff -u /dev/null pkgsrc/math/lapack/version.mk:1.1 --- /dev/null Mon Oct 12 21:52:05 2020 +++ pkgsrc/math/lapack/version.mk Mon Oct 12 21:51:57 2020 @@ -0,0 +1,3 @@ +# $NetBSD: version.mk,v 1.1 2020/10/12 21:51:57 bacon Exp $ + +NETLIB_BLAS_VERSION= 3.9.0 Index: pkgsrc/math/lapack/patches/patch-BLAS_SRC_CMakeLists.txt diff -u /dev/null pkgsrc/math/lapack/patches/patch-BLAS_SRC_CMakeLists.txt:1.1 --- /dev/null Mon Oct 12 21:52:05 2020 +++ pkgsrc/math/lapack/patches/patch-BLAS_SRC_CMakeLists.txt Mon Oct 12 21:51:57 2020 @@ -0,0 +1,18 @@ +$NetBSD: patch-BLAS_SRC_CMakeLists.txt,v 1.1 2020/10/12 21:51:57 bacon Exp $ + +Support combined build of shared and static libraries. + +--- BLAS/SRC/CMakeLists.txt.orig 2017-11-13 04:15:54.000000000 +0000 ++++ BLAS/SRC/CMakeLists.txt +@@ -104,3 +104,11 @@ set_target_properties( + SOVERSION ${LAPACK_MAJOR_VERSION} + ) + lapack_install_library(blas) ++if(BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS) ++ add_library(blas_static STATIC ${SOURCES}) ++ set_target_properties( ++ blas_static PROPERTIES ++ OUTPUT_NAME blas ++ ) ++ lapack_install_library(blas_static) ++endif() Index: pkgsrc/math/lapack/patches/patch-CBLAS_cblas.pc.in diff -u /dev/null pkgsrc/math/lapack/patches/patch-CBLAS_cblas.pc.in:1.1 --- /dev/null Mon Oct 12 21:52:05 2020 +++ pkgsrc/math/lapack/patches/patch-CBLAS_cblas.pc.in Mon Oct 12 21:51:57 2020 @@ -0,0 +1,13 @@ +$NetBSD: patch-CBLAS_cblas.pc.in,v 1.1 2020/10/12 21:51:57 bacon Exp $ + +Install BLAS libs here rather than from a separate package + +--- CBLAS/cblas.pc.in.orig 2019-03-27 14:34:40.823289167 +0000 ++++ CBLAS/cblas.pc.in +@@ -6,5 +6,5 @@ Description: C Standard Interface to BLA + Version: @LAPACK_VERSION@ + URL: http://www.netlib.org/blas/#_cblas + Libs: -L${libdir} -lcblas ++Libs.private: @BLAS_LIBRARIES@ + Cflags: -I${includedir} +-Requires.private: blas Index: pkgsrc/math/lapack/patches/patch-CBLAS_src_CMakeLists.txt diff -u /dev/null pkgsrc/math/lapack/patches/patch-CBLAS_src_CMakeLists.txt:1.1 --- /dev/null Mon Oct 12 21:52:05 2020 +++ pkgsrc/math/lapack/patches/patch-CBLAS_src_CMakeLists.txt Mon Oct 12 21:51:57 2020 @@ -0,0 +1,25 @@ +$NetBSD: patch-CBLAS_src_CMakeLists.txt,v 1.1 2020/10/12 21:51:57 bacon Exp $ + +Support combined build of shared and static libraries. + +--- CBLAS/src/CMakeLists.txt.orig 2017-11-13 04:15:54.000000000 +0000 ++++ CBLAS/src/CMakeLists.txt +@@ -126,3 +126,18 @@ target_include_directories(cblas PUBLIC + ) + target_link_libraries(cblas PRIVATE ${BLAS_LIBRARIES}) + lapack_install_library(cblas) ++ ++if(BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS) ++ add_library(cblas_static STATIC ${SOURCES}) ++ set_target_properties( ++ cblas_static PROPERTIES ++ LINKER_LANGUAGE C ++ OUTPUT_NAME cblas ++ ) ++ target_include_directories(cblas_static PUBLIC ++ $ ++ $ ++ ) ++ target_link_libraries(cblas_static PRIVATE ${BLAS_LIBRARIES}) ++ lapack_install_library(cblas_static) ++endif() Index: pkgsrc/math/lapack/patches/patch-CMakeLists.txt diff -u /dev/null pkgsrc/math/lapack/patches/patch-CMakeLists.txt:1.1 --- /dev/null Mon Oct 12 21:52:05 2020 +++ pkgsrc/math/lapack/patches/patch-CMakeLists.txt Mon Oct 12 21:51:57 2020 @@ -0,0 +1,153 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2020/10/12 21:51:57 bacon Exp $ + +Avoid installation of LAPACK CMake and pkg-config files when not installing +LAPACK, also allowing explicitly to switch off LAPACK build for BLAS-only +packaging. + +--- CMakeLists.txt.orig 2020-03-03 15:36:43.155560348 +0100 ++++ CMakeLists.txt 2020-03-03 15:36:34.827560837 +0100 +@@ -112,8 +112,10 @@ + + + # -------------------------------------------------- +-set(LAPACK_INSTALL_EXPORT_NAME lapack-targets) + ++if(LAPACK) ++ ++set(LAPACK_INSTALL_EXPORT_NAME lapack-targets) + macro(lapack_install_library lib) + install(TARGETS ${lib} + EXPORT ${LAPACK_INSTALL_EXPORT_NAME} +@@ -123,6 +125,18 @@ + ) + endmacro() + ++else() ++ ++macro(lapack_install_library lib) ++ install(TARGETS ${lib} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT RuntimeLibraries ++ ) ++endmacro() ++ ++endif() ++ + set(PKG_CONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + + # -------------------------------------------------- +@@ -252,6 +266,10 @@ + + option(USE_OPTIMIZED_LAPACK "Whether or not to use an optimized LAPACK library instead of included netlib LAPACK" OFF) + ++option(LAPACK "Whether to build or use LAPACK (to enable a BLAS-only build)") ++ ++if(LAPACK) ++ + # -------------------------------------------------- + # LAPACK + # User did not provide a LAPACK Library but specified to search for one +@@ -293,6 +311,8 @@ + CACHE STRING "Linker flags for shared libs" FORCE) + endif() + ++endif() ++ + if(BUILD_TESTING) + add_subdirectory(TESTING) + endif() +@@ -374,14 +394,18 @@ + set(ALL_TARGETS ${ALL_TARGETS} blas) + endif() + ++if(LAPACK) + if(NOT LATESTLAPACK_FOUND) + set(ALL_TARGETS ${ALL_TARGETS} lapack) ++ set(BUILD_LAPACK ON) ++endif() + endif() + + if(BUILD_TESTING OR LAPACKE_WITH_TMG) + set(ALL_TARGETS ${ALL_TARGETS} tmglib) + endif() + ++if(LAPACK) + # Export lapack targets, not including lapacke, from the + # install tree, if any. + set(_lapack_config_install_guard_target "") +@@ -395,6 +419,7 @@ + # lapack-config.cmake to load targets from the install tree. + list(GET ALL_TARGETS 0 _lapack_config_install_guard_target) + endif() ++endif() + + # Include cblas in targets exported from the build tree. + if(CBLAS) +@@ -406,6 +431,7 @@ + set(ALL_TARGETS ${ALL_TARGETS} lapacke) + endif() + ++if(LAPACK) + # Export lapack and lapacke targets from the build tree, if any. + set(_lapack_config_build_guard_target "") + if(ALL_TARGETS) +@@ -415,32 +441,34 @@ + # for lapack-config.cmake to load targets from the build tree. + list(GET ALL_TARGETS 0 _lapack_config_build_guard_target) + endif() ++endif() + +-configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in +- ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY) +- ++if(BUILD_LAPACK) ++ configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in ++ ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY) + +-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY) ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY) + install(FILES +- ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc +- DESTINATION ${PKG_CONFIG_DIR} +- COMPONENT Development +- ) ++ ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc ++ DESTINATION ${PKG_CONFIG_DIR} ++ COMPONENT Development ++ ) + +-configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-install.cmake.in +- ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake @ONLY) ++ configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-install.cmake.in ++ ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake @ONLY) + +-include(CMakePackageConfigHelpers) +-write_basic_package_version_file( +- ${LAPACK_BINARY_DIR}/lapack-config-version.cmake +- VERSION ${LAPACK_VERSION} +- COMPATIBILITY SameMajorVersion +- ) ++ include(CMakePackageConfigHelpers) ++ write_basic_package_version_file( ++ ${LAPACK_BINARY_DIR}/lapack-config-version.cmake ++ VERSION ${LAPACK_VERSION} ++ COMPATIBILITY SameMajorVersion ++ ) + +-install(FILES +- ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake +- ${LAPACK_BINARY_DIR}/lapack-config-version.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION} +- COMPONENT Development +- ) +- +\ Kein Zeilenumbruch am Dateiende. ++ install(FILES ++ ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake ++ ${LAPACK_BINARY_DIR}/lapack-config-version.cmake ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapack-${LAPACK_VERSION} ++ COMPONENT Development ++ ) ++endif() ++ Index: pkgsrc/math/lapack/patches/patch-LAPACKE_CMakeLists.txt diff -u /dev/null pkgsrc/math/lapack/patches/patch-LAPACKE_CMakeLists.txt:1.1 --- /dev/null Mon Oct 12 21:52:05 2020 +++ pkgsrc/math/lapack/patches/patch-LAPACKE_CMakeLists.txt Mon Oct 12 21:51:57 2020 @@ -0,0 +1,46 @@ +$NetBSD: patch-LAPACKE_CMakeLists.txt,v 1.1 2020/10/12 21:51:57 bacon Exp $ + +Support combined build of shared and static libraries. + +--- LAPACKE/CMakeLists.txt.orig 2020-01-03 19:33:52.766364829 +0100 ++++ LAPACKE/CMakeLists.txt 2020-01-03 19:49:05.115280246 +0100 +@@ -94,6 +94,26 @@ + target_link_libraries(lapacke PRIVATE ${LAPACK_LIBRARIES}) + + lapack_install_library(lapacke) ++ ++if(BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS) ++ add_library(lapacke_static STATIC ${SOURCES}) ++ set_target_properties( ++ lapacke_static PROPERTIES ++ OUTPUT_NAME lapacke ++ ) ++ target_include_directories(lapacke_static PUBLIC ++ $ ++ $ ++ ) ++ ++ if(LAPACKE_WITH_TMG) ++ target_link_libraries(lapacke_static PRIVATE tmglib) ++ endif() ++ target_link_libraries(lapacke_static PRIVATE ${LAPACK_LIBRARIES}) ++ ++ lapack_install_library(lapacke_static) ++endif() ++ + install( + FILES ${LAPACKE_INCLUDE} ${LAPACK_BINARY_DIR}/include/lapacke_mangling.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} +@@ -126,7 +146,8 @@ + COMPONENT Development + ) + +-install(EXPORT lapacke-targets +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapacke-${LAPACK_VERSION} +- COMPONENT Development +- ) ++#install(EXPORT lapacke-targets ++# DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/lapacke-${LAPACK_VERSION} ++# COMPONENT Development ++# ) ++ Index: pkgsrc/math/lapack/patches/patch-LAPACKE_lapacke.pc.in diff -u /dev/null pkgsrc/math/lapack/patches/patch-LAPACKE_lapacke.pc.in:1.1 --- /dev/null Mon Oct 12 21:52:05 2020 +++ pkgsrc/math/lapack/patches/patch-LAPACKE_lapacke.pc.in Mon Oct 12 21:51:57 2020 @@ -0,0 +1,13 @@ +$NetBSD: patch-LAPACKE_lapacke.pc.in,v 1.1 2020/10/12 21:51:57 bacon Exp $ + +Install libs here rather than from a separate package + +--- LAPACKE/lapacke.pc.in.orig 2019-03-27 14:35:14.016006535 +0000 ++++ LAPACKE/lapacke.pc.in +@@ -6,5 +6,5 @@ Description: C Standard Interface to LAP + Version: @LAPACK_VERSION@ + URL: http://www.netlib.org/lapack/#_standard_c_language_apis_for_lapack + Libs: -L${libdir} -llapacke ++Libs.private: @LAPACK_LIBRARIES@ @BLAS_LIBRARIES@ + Cflags: -I${includedir} +-Requires.private: lapack Index: pkgsrc/math/lapack/patches/patch-SRC_CMakeLists.txt diff -u /dev/null pkgsrc/math/lapack/patches/patch-SRC_CMakeLists.txt:1.1 --- /dev/null Mon Oct 12 21:52:05 2020 +++ pkgsrc/math/lapack/patches/patch-SRC_CMakeLists.txt Mon Oct 12 21:51:57 2020 @@ -0,0 +1,30 @@ +$NetBSD: patch-SRC_CMakeLists.txt,v 1.1 2020/10/12 21:51:57 bacon Exp $ + +Support combined build of shared and static libraries. + +--- SRC/CMakeLists.txt.orig 2019-11-21 08:57:43.000000000 +0100 ++++ SRC/CMakeLists.txt 2020-01-03 19:53:12.452257316 +0100 +@@ -518,3 +518,23 @@ + endif() + + lapack_install_library(lapack) ++ ++if(BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS) ++ add_library(lapack_static STATIC ${SOURCES}) ++ set_target_properties( ++ lapack_static PROPERTIES ++ OUTPUT_NAME lapack ++ ) ++ ++ if(USE_XBLAS) ++ target_link_libraries(lapack_static PRIVATE ${XBLAS_LIBRARY}) ++ endif() ++ target_link_libraries(lapack_static PRIVATE ${BLAS_LIBRARIES}) ++ ++ if (_is_coverage_build) ++ target_link_libraries(lapack_static PRIVATE gcov) ++ add_coverage(lapack_static) ++ endif() ++ ++ lapack_install_library(lapack_static) ++endif() Index: pkgsrc/mk/blas.buildlink3.mk diff -u /dev/null pkgsrc/mk/blas.buildlink3.mk:1.1 --- /dev/null Mon Oct 12 21:52:05 2020 +++ pkgsrc/mk/blas.buildlink3.mk Mon Oct 12 21:51:57 2020 @@ -0,0 +1,108 @@ +# $NetBSD: blas.buildlink3.mk,v 1.1 2020/10/12 21:51:57 bacon Exp $ +# +# 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 implementation 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 openblas openblas_pthread openblas_openmp +# Darwin +.if exists(/System/Library/Frameworks/Accelerate.framework) +_BLAS_TYPES+= accelerate.framework +.endif + +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= math/lapack +BLAS_LIBS= -lblas +LAPACK_LIBS= -llapack ${BLAS_LIBS} +.elif ${BLAS_TYPE} == "openblas" +_BLAS_PKGPATH= math/openblas +BLAS_LIBS= -lopenblas +LAPACK_LIBS= ${BLAS_LIBS} +.elif ${BLAS_TYPE} == "openblas_pthread" +_BLAS_PKGPATH= math/openblas_pthread +BLAS_LIBS= -lopenblas_pthread +LAPACK_LIBS= ${BLAS_LIBS} +.elif ${BLAS_TYPE} == "openblas_openmp" +_BLAS_PKGPATH= math/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 --_----------=_1602539525129420--