Mon Oct 12 21:52:05 2020 UTC ()
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


(bacon)
diff -r1.7 -r1.8 pkgsrc/audio/aeneas/Makefile
diff -r1.83 -r1.84 pkgsrc/audio/libsndfile/Makefile
diff -r1.6 -r1.7 pkgsrc/audio/py-music21/Makefile
diff -r1.17 -r1.18 pkgsrc/biology/mpqc/Makefile
diff -r1.8 -r1.9 pkgsrc/biology/plink/Makefile
diff -r1.3 -r1.4 pkgsrc/biology/py-biopython/Makefile
diff -r1.36 -r1.37 pkgsrc/biology/py-mol/Makefile
diff -r1.13 -r1.14 pkgsrc/cad/py-gds/Makefile
diff -r1.7 -r1.8 pkgsrc/devel/py-bcolz/Makefile
diff -r1.12 -r1.13 pkgsrc/devel/py-boost/Makefile
diff -r1.8 -r1.9 pkgsrc/devel/py-h5py/Makefile
diff -r1.23 -r1.24 pkgsrc/games/singularity/Makefile
diff -r1.25 -r1.26 pkgsrc/geography/py-gdal/Makefile
diff -r1.15 -r1.16 pkgsrc/geography/py-obspy/Makefile
diff -r1.101 -r1.102 pkgsrc/geography/qgis/Makefile
diff -r1.167 -r1.168 pkgsrc/graphics/blender/Makefile
diff -r1.1 -r1.2 pkgsrc/graphics/blender-lts/Makefile
diff -r1.49 -r1.50 pkgsrc/graphics/mypaint/Makefile
diff -r1.94 -r1.95 pkgsrc/graphics/opencv/Makefile
diff -r1.67 -r1.68 pkgsrc/graphics/pfstools/Makefile
diff -r1.30 -r1.31 pkgsrc/graphics/py-OpenGL/Makefile
diff -r1.1 -r1.2 pkgsrc/graphics/py-OpenGL-accelerate/Makefile
diff -r1.29 -r1.30 pkgsrc/graphics/py-biggles/Makefile
diff -r1.8 -r1.9 pkgsrc/graphics/py-fits/Makefile
diff -r1.28 -r1.29 pkgsrc/graphics/py-gnuplot/Makefile
diff -r1.59 -r1.60 pkgsrc/graphics/py-matplotlib/Makefile
diff -r1.66 -r1.67 pkgsrc/graphics/veusz/Makefile
diff -r1.13 -r1.14 pkgsrc/lang/lush/Makefile
diff -r1.218 -r1.219 pkgsrc/math/R/Makefile
diff -r1.13 -r1.14 pkgsrc/math/R/buildlink3.mk
diff -r1.6 -r1.7 pkgsrc/math/R-RandomFields/Makefile
diff -r1.12 -r1.13 pkgsrc/math/R-gstat/Makefile
diff -r1.7 -r1.8 pkgsrc/math/R-quantreg/Makefile
diff -r1.15 -r1.16 pkgsrc/math/R-wle/Makefile
diff -r1.1 -r1.2 pkgsrc/math/arpack-ng/Makefile
diff -r1.37 -r1.38 pkgsrc/math/blas/Makefile
diff -r1.5 -r1.6 pkgsrc/math/blas/PLIST
diff -r1.9 -r1.10 pkgsrc/math/blas/buildlink3.mk
diff -r1.2 -r1.3 pkgsrc/math/harmgen/Makefile
diff -r1.4 -r1.5 pkgsrc/math/harminv/Makefile
diff -r1.2 -r1.3 pkgsrc/math/ipopt/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/math/ipopt/buildlink3.mk
diff -r1.5 -r1.6 pkgsrc/math/itpp/Makefile
diff -r1.1 -r1.2 pkgsrc/math/lapack/DESCR
diff -r1.40 -r1.41 pkgsrc/math/lapack/Makefile
diff -r1.11 -r1.12 pkgsrc/math/lapack/Makefile.common
diff -r1.4 -r1.5 pkgsrc/math/lapack/PLIST
diff -r1.9 -r1.10 pkgsrc/math/lapack/buildlink3.mk
diff -r1.22 -r1.23 pkgsrc/math/lapack/distinfo
diff -r0 -r1.1 pkgsrc/math/lapack/version.mk
diff -r0 -r1.1 pkgsrc/math/lapack/patches/patch-BLAS_SRC_CMakeLists.txt
diff -r0 -r1.1 pkgsrc/math/lapack/patches/patch-CBLAS_cblas.pc.in
diff -r0 -r1.1 pkgsrc/math/lapack/patches/patch-CBLAS_src_CMakeLists.txt
diff -r0 -r1.1 pkgsrc/math/lapack/patches/patch-CMakeLists.txt
diff -r0 -r1.1 pkgsrc/math/lapack/patches/patch-LAPACKE_CMakeLists.txt
diff -r0 -r1.1 pkgsrc/math/lapack/patches/patch-LAPACKE_lapacke.pc.in
diff -r0 -r1.1 pkgsrc/math/lapack/patches/patch-SRC_CMakeLists.txt
diff -r1.1 -r1.2 pkgsrc/math/lapack/patches/patch-TESTING_MATGEN_CMakeLists.txt
diff -r1.1 -r0 pkgsrc/math/lapack/patches/patch-TESTING_dbal.in
diff -r1.209 -r1.210 pkgsrc/math/octave/Makefile
diff -r1.21 -r1.22 pkgsrc/math/octave/buildlink3.mk
diff -r1.67 -r1.68 pkgsrc/math/py-Scientific/Makefile
diff -r1.5 -r1.6 pkgsrc/math/py-Theano/Makefile
diff -r1.3 -r1.4 pkgsrc/math/py-autograd/Makefile
diff -r1.3 -r1.4 pkgsrc/math/py-bottleneck/Makefile
diff -r1.10 -r1.11 pkgsrc/math/py-fftw/Makefile
diff -r1.8 -r1.9 pkgsrc/math/py-netCDF4/Makefile
diff -r1.22 -r1.23 pkgsrc/math/py-numba/Makefile
diff -r1.17 -r1.18 pkgsrc/math/py-numexpr/Makefile
diff -r1.70 -r1.71 pkgsrc/math/py-numpy/Makefile
diff -r1.5 -r1.6 pkgsrc/math/py-numpy/buildlink3.mk
diff -r1.2 -r1.3 pkgsrc/math/py-numpy/patches/patch-numpy_distutils_system__info.py
diff -r1.4 -r1.5 pkgsrc/math/py-numpy16/Makefile
diff -r1.1 -r1.2 pkgsrc/math/py-numpy16/patches/patch-numpy_distutils_system__info.py
diff -r1.30 -r1.31 pkgsrc/math/py-pandas/Makefile
diff -r1.4 -r1.5 pkgsrc/math/py-patsy/Makefile
diff -r1.2 -r1.3 pkgsrc/math/py-pywavelets/Makefile
diff -r1.46 -r1.47 pkgsrc/math/py-rpy/Makefile
diff -r1.4 -r1.5 pkgsrc/math/py-scikit-image/Makefile
diff -r1.11 -r1.12 pkgsrc/math/py-scikit-learn/Makefile
diff -r1.42 -r1.43 pkgsrc/math/py-scipy/Makefile
diff -r1.7 -r1.8 pkgsrc/math/py-statsmodels/Makefile
diff -r1.6 -r1.7 pkgsrc/math/py-tables/Makefile
diff -r1.5 -r1.6 pkgsrc/math/py-uncertainties/Makefile
diff -r0 -r1.1 pkgsrc/mk/blas.buildlink3.mk
diff -r1.11 -r1.12 pkgsrc/pkgtools/R2pkg/Makefile
diff -r1.1 -r1.2 pkgsrc/time/py-cftime/Makefile
diff -r1.127 -r1.128 pkgsrc/x11/py-gtk2/Makefile
cvs diff -r1.7 -r1.8 pkgsrc/audio/aeneas/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/aeneas/Makefile 2020/08/18 17:57:33 1.7
+++ pkgsrc/audio/aeneas/Makefile 2020/10/12 21:51:58 1.8
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.7 2020/08/18 17:57:33 leot Exp $ 1# $NetBSD: Makefile,v 1.8 2020/10/12 21:51:58 bacon Exp $
2 2
3DISTNAME= aeneas-1.7.3 3DISTNAME= aeneas-1.7.3
4PKGREVISION= 5 4PKGREVISION= 6
5CATEGORIES= audio 5CATEGORIES= audio
6MASTER_SITES= ${MASTER_SITE_GITHUB:=readbeyond/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=readbeyond/}
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/readbeyond/aeneas/ 10HOMEPAGE= https://github.com/readbeyond/aeneas/
11COMMENT= Automagically synchronize audio and text 11COMMENT= Automagically synchronize audio and text
12LICENSE= gnu-agpl-v3 12LICENSE= gnu-agpl-v3
13 13
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15 15
16DEPENDS+= ${PYPKGPREFIX}-beautifulsoup4-[0-9]*:../../www/py-beautifulsoup4 16DEPENDS+= ${PYPKGPREFIX}-beautifulsoup4-[0-9]*:../../www/py-beautifulsoup4
17DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml 17DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
cvs diff -r1.83 -r1.84 pkgsrc/audio/libsndfile/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/libsndfile/Makefile 2020/09/25 12:43:11 1.83
+++ pkgsrc/audio/libsndfile/Makefile 2020/10/12 21:51:58 1.84
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.83 2020/09/25 12:43:11 tnn Exp $ 1# $NetBSD: Makefile,v 1.84 2020/10/12 21:51:58 bacon Exp $
2 2
3DISTNAME= libsndfile-1.0.30 3DISTNAME= libsndfile-1.0.30
 4PKGREVISION= 1
4CATEGORIES= audio 5CATEGORIES= audio
5MASTER_SITES= ${MASTER_SITE_GITHUB:=erikd/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=erikd/}
6GITHUB_PROJECT= libsndfile 7GITHUB_PROJECT= libsndfile
7GITHUB_RELEASE= v${PKGVERSION_NOREV} 8GITHUB_RELEASE= v${PKGVERSION_NOREV}
8EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
9 10
10MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.mega-nerd.com/libsndfile/ 12HOMEPAGE= http://www.mega-nerd.com/libsndfile/
12COMMENT= Library for reading and writing audio files 13COMMENT= Library for reading and writing audio files
13LICENSE= gnu-lgpl-v2.1 14LICENSE= gnu-lgpl-v2.1
14 15
15USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
16USE_LIBTOOL= yes 17USE_LIBTOOL= yes
cvs diff -r1.6 -r1.7 pkgsrc/audio/py-music21/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/py-music21/Makefile 2020/09/05 00:07:17 1.6
+++ pkgsrc/audio/py-music21/Makefile 2020/10/12 21:51:58 1.7
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.6 2020/09/05 00:07:17 gutteridge Exp $ 1# $NetBSD: Makefile,v 1.7 2020/10/12 21:51:58 bacon Exp $
2 2
3VERSION= 6.1.0 3VERSION= 6.1.0
4DISTNAME= music21-noCorpus-${VERSION} 4DISTNAME= music21-noCorpus-${VERSION}
5PKGNAME= ${PYPKGPREFIX}-music21-${VERSION} 5PKGNAME= ${PYPKGPREFIX}-music21-${VERSION}
6PKGREVISION= 1 6PKGREVISION= 2
7CATEGORIES= audio python 7CATEGORIES= audio python
8MASTER_SITES= ${MASTER_SITE_GITHUB:=cuthbertLab/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=cuthbertLab/}
9GITHUB_PROJECT= music21 9GITHUB_PROJECT= music21
10GITHUB_RELEASE= v${VERSION} 10GITHUB_RELEASE= v${VERSION}
11 11
12MAINTAINER= gutteridge@NetBSD.org 12MAINTAINER= gutteridge@NetBSD.org
13HOMEPAGE= https://github.com/cuthbertLab/music21 13HOMEPAGE= https://github.com/cuthbertLab/music21
14COMMENT= Python toolkit for computer-aided musical analysis 14COMMENT= Python toolkit for computer-aided musical analysis
15LICENSE= modified-bsd OR gnu-lgpl-v3 15LICENSE= modified-bsd OR gnu-lgpl-v3
16 16
17PYTHON_VERSIONS_INCOMPATIBLE= 27 17PYTHON_VERSIONS_INCOMPATIBLE= 27
18 18
19EGG_NAME= music21-${VERSION} 19EGG_NAME= music21-${VERSION}
cvs diff -r1.17 -r1.18 pkgsrc/biology/mpqc/Makefile (expand / switch to unified diff)

--- pkgsrc/biology/mpqc/Makefile 2020/08/31 18:06:39 1.17
+++ pkgsrc/biology/mpqc/Makefile 2020/10/12 21:51:58 1.18
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.17 2020/08/31 18:06:39 wiz Exp $ 1# $NetBSD: Makefile,v 1.18 2020/10/12 21:51:58 bacon Exp $
2 2
3DISTNAME= mpqc-2.3.1 3DISTNAME= mpqc-2.3.1
4PKGREVISION= 9 4PKGREVISION= 10
5CATEGORIES= biology 5CATEGORIES= biology
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpqc/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpqc/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= asau@inbox.ru 9MAINTAINER= asau@inbox.ru
10HOMEPAGE= http://www.mpqc.org/ 10HOMEPAGE= http://www.mpqc.org/
11COMMENT= The Massively Parallel Quantum Chemistry Program 11COMMENT= The Massively Parallel Quantum Chemistry Program
12 12
13USE_LANGUAGES= c c++ fortran77 13USE_LANGUAGES= c c++ fortran77
14PKGSRC_FORTRAN= f2c # XXX force f2c for now 14PKGSRC_FORTRAN= f2c # XXX force f2c for now
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16CONFIGURE_ARGS+= --with-libdirs="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" # fixme 16CONFIGURE_ARGS+= --with-libdirs="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" # fixme
17#CONFIGURE_ARGS= -without-f77 # this doesn't work out of the box 17#CONFIGURE_ARGS= -without-f77 # this doesn't work out of the box
@@ -29,17 +29,16 @@ REPLACE_PERL= src/bin/mpqc/ccarun.in src @@ -29,17 +29,16 @@ REPLACE_PERL= src/bin/mpqc/ccarun.in src
29 29
30# Don't introduce Tk dependency for minor things, just leave a hook: 30# Don't introduce Tk dependency for minor things, just leave a hook:
31REPLACE_WISH= src/bin/molrender/tkmolrender.in 31REPLACE_WISH= src/bin/molrender/tkmolrender.in
32CHECK_INTERPRETER_SKIP= bin/tkmolrender 32CHECK_INTERPRETER_SKIP= bin/tkmolrender
33 33
34# optional: 34# optional:
35# MPI, niama-config, libr12, libderiv 35# MPI, niama-config, libr12, libderiv
36.include "../../devel/libexecinfo/buildlink3.mk" # optional 36.include "../../devel/libexecinfo/buildlink3.mk" # optional
37.include "../../mk/dlopen.buildlink3.mk" # optional? 37.include "../../mk/dlopen.buildlink3.mk" # optional?
38.include "../../math/libint/buildlink3.mk" # optional 38.include "../../math/libint/buildlink3.mk" # optional
39 39
40.include "../../x11/tk/interpreter.mk" 40.include "../../x11/tk/interpreter.mk"
41 41
42.include "../../math/blas/buildlink3.mk" 42.include "../../mk/blas.buildlink3.mk"
43.include "../../math/lapack/buildlink3.mk" 
44.include "../../mk/pthread.buildlink3.mk" 43.include "../../mk/pthread.buildlink3.mk"
45.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/biology/plink/Makefile (expand / switch to unified diff)

--- pkgsrc/biology/plink/Makefile 2019/01/13 22:06:42 1.8
+++ pkgsrc/biology/plink/Makefile 2020/10/12 21:51:58 1.9
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.8 2019/01/13 22:06:42 bacon Exp $ 1# $NetBSD: Makefile,v 1.9 2020/10/12 21:51:58 bacon Exp $
2 2
3DISTNAME= plink-1.07-src 3DISTNAME= plink-1.07-src
4PKGNAME= ${DISTNAME:-src=} 4PKGNAME= ${DISTNAME:-src=}
 5PKGREVISION= 1
5CATEGORIES= biology 6CATEGORIES= biology
6#MASTER_SITES= http://pngu.mgh.harvard.edu/~purcell/plink/dist/ 7#MASTER_SITES= http://pngu.mgh.harvard.edu/~purcell/plink/dist/
7EXTRACT_SUFX= .zip 8EXTRACT_SUFX= .zip
8 9
9MAINTAINER= bacon@NetBSD.org 10MAINTAINER= bacon@NetBSD.org
10#HOMEPAGE= http://pngu.mgh.harvard.edu/~purcell/plink/ 11#HOMEPAGE= http://pngu.mgh.harvard.edu/~purcell/plink/
11COMMENT= Whole-genome association analysis toolset 12COMMENT= Whole-genome association analysis toolset
12LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
13 14
14USE_LANGUAGES= c c++ fortran77 15USE_LANGUAGES= c c++ fortran77
15USE_TOOLS+= gmake 16USE_TOOLS+= gmake
16 17
17CXXFLAGS+= -Dfopen64=fopen 18CXXFLAGS+= -Dfopen64=fopen
@@ -26,17 +27,16 @@ MAKE_ENV.SunOS+= LIB="-lsocket -lnsl" @@ -26,17 +27,16 @@ MAKE_ENV.SunOS+= LIB="-lsocket -lnsl"
26INSTALLATION_DIRS= bin 27INSTALLATION_DIRS= bin
27 28
28do-install: 29do-install:
29 ${INSTALL_PROGRAM} ${WRKSRC}/plink ${DESTDIR}${PREFIX}/bin 30 ${INSTALL_PROGRAM} ${WRKSRC}/plink ${DESTDIR}${PREFIX}/bin
30 31
31do-test: 32do-test:
32 cd ${WRKSRC} && ./plink --file test 33 cd ${WRKSRC} && ./plink --file test
33 cd ${WRKSRC} && ./plink --file test --freq 34 cd ${WRKSRC} && ./plink --file test --freq
34 cd ${WRKSRC} && ./plink --file test --assoc 35 cd ${WRKSRC} && ./plink --file test --assoc
35 cd ${WRKSRC} && ./plink --file test --make-bed 36 cd ${WRKSRC} && ./plink --file test --make-bed
36 37
37.include "../../devel/libf2c/buildlink3.mk" 38.include "../../devel/libf2c/buildlink3.mk"
38.include "../../devel/zlib/buildlink3.mk" 39.include "../../devel/zlib/buildlink3.mk"
39.include "../../math/lapack/buildlink3.mk" 40.include "../../mk/blas.buildlink3.mk"
40.include "../../math/blas/buildlink3.mk" 
41.include "../../mk/dlopen.buildlink3.mk" 41.include "../../mk/dlopen.buildlink3.mk"
42.include "../../mk/bsd.pkg.mk" 42.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/biology/py-biopython/Makefile (expand / switch to unified diff)

--- pkgsrc/biology/py-biopython/Makefile 2020/01/26 17:30:46 1.3
+++ pkgsrc/biology/py-biopython/Makefile 2020/10/12 21:51:59 1.4
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.3 2020/01/26 17:30:46 rillig Exp $ 1# $NetBSD: Makefile,v 1.4 2020/10/12 21:51:59 bacon Exp $
2 2
3DISTNAME= biopython-1.74 3DISTNAME= biopython-1.74
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= biology 6CATEGORIES= biology
6MASTER_SITES= http://biopython.org/DIST/ 7MASTER_SITES= http://biopython.org/DIST/
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://biopython.org/ 10HOMEPAGE= https://biopython.org/
10COMMENT= Python libraries for computational molecular biology 11COMMENT= Python libraries for computational molecular biology
11LICENSE= biopython 12LICENSE= biopython
12 13
13USE_TOOLS+= pax 14USE_TOOLS+= pax
14 15
15INSTALLATION_DIRS+= share/doc/biopython share/examples/biopython 16INSTALLATION_DIRS+= share/doc/biopython share/examples/biopython
16 17
17post-install: 18post-install:
cvs diff -r1.36 -r1.37 pkgsrc/biology/py-mol/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/biology/py-mol/Attic/Makefile 2020/04/27 18:33:18 1.36
+++ pkgsrc/biology/py-mol/Attic/Makefile 2020/10/12 21:51:59 1.37
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.36 2020/04/27 18:33:18 adam Exp $ 1# $NetBSD: Makefile,v 1.37 2020/10/12 21:51:59 bacon Exp $
2 2
3DISTNAME= pymol-v1.5.0.1 3DISTNAME= pymol-v1.5.0.1
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pymol-v/mol-/} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pymol-v/mol-/}
5EGG_NAME= pymol-1.5.0.1 5EGG_NAME= pymol-1.5.0.1
6PKGREVISION= 7 6PKGREVISION= 8
7CATEGORIES= biology 7CATEGORIES= biology
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pymol/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pymol/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.pymol.org/ 12HOMEPAGE= http://www.pymol.org/
13COMMENT= Molecular Visualization System 13COMMENT= Molecular Visualization System
14 14
15PYTHON_VERSIONED_DEPENDENCIES= Pmw 15PYTHON_VERSIONED_DEPENDENCIES= Pmw
16PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 1.5.0.1 16PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 1.5.0.1
17 17
18WRKSRC= ${WRKDIR}/pymol 18WRKSRC= ${WRKDIR}/pymol
19 19
cvs diff -r1.13 -r1.14 pkgsrc/cad/py-gds/Makefile (expand / switch to unified diff)

--- pkgsrc/cad/py-gds/Makefile 2020/09/04 16:05:20 1.13
+++ pkgsrc/cad/py-gds/Makefile 2020/10/12 21:51:59 1.14
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.13 2020/09/04 16:05:20 mef Exp $ 1# $NetBSD: Makefile,v 1.14 2020/10/12 21:51:59 bacon Exp $
2 2
3DISTNAME= gdspy-1.6 3DISTNAME= gdspy-1.6
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
 5PKGREVISION= 1
5CATEGORIES= cad python 6CATEGORIES= cad python
6MASTER_SITES= ${MASTER_SITE_PYPI:=g/gdspy/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=g/gdspy/}
7EXTRACT_SUFX= .zip 8EXTRACT_SUFX= .zip
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://github.com/heitzmann/gdspy 11HOMEPAGE= https://github.com/heitzmann/gdspy
11COMMENT= Python module for creating GDSII stream files 12COMMENT= Python module for creating GDSII stream files
12LICENSE= boost-license 13LICENSE= boost-license
13 14
14.include "../../lang/python/pyversion.mk" 15.include "../../lang/python/pyversion.mk"
15.if ${_PYTHON_VERSION} == 27 16.if ${_PYTHON_VERSION} == 27
16DEPENDS+= ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future 17DEPENDS+= ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
17.endif 18.endif
cvs diff -r1.7 -r1.8 pkgsrc/devel/py-bcolz/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-bcolz/Attic/Makefile 2019/04/26 13:13:51 1.7
+++ pkgsrc/devel/py-bcolz/Attic/Makefile 2020/10/12 21:51:59 1.8
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.7 2019/04/26 13:13:51 maya Exp $ 1# $NetBSD: Makefile,v 1.8 2020/10/12 21:51:59 bacon Exp $
2 2
3DISTNAME= bcolz-1.2.1 3DISTNAME= bcolz-1.2.1
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= devel python 6CATEGORIES= devel python
6MASTER_SITES= ${MASTER_SITE_PYPI:=b/bcolz/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=b/bcolz/}
7 8
8MAINTAINER= kamelderouiche@yahoo.com 9MAINTAINER= kamelderouiche@yahoo.com
9HOMEPAGE= https://github.com/Blosc/bcolz 10HOMEPAGE= https://github.com/Blosc/bcolz
10COMMENT= Columnar and compressed data containers 11COMMENT= Columnar and compressed data containers
11LICENSE= modified-bsd 12LICENSE= modified-bsd
12 13
13BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm 14BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm
14 15
15MAKE_ENV+= BLOSC_DIR=${BUILDLINK_PREFIX.blosc} 16MAKE_ENV+= BLOSC_DIR=${BUILDLINK_PREFIX.blosc}
16 17
17.include "../../devel/blosc/buildlink3.mk" 18.include "../../devel/blosc/buildlink3.mk"
cvs diff -r1.12 -r1.13 pkgsrc/devel/py-boost/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-boost/Makefile 2020/01/24 15:36:39 1.12
+++ pkgsrc/devel/py-boost/Makefile 2020/10/12 21:51:59 1.13
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: Makefile,v 1.12 2020/01/24 15:36:39 jperkin Exp $ 1# $NetBSD: Makefile,v 1.13 2020/10/12 21:51:59 bacon Exp $
2 2
3BOOST_PACKAGE= python 3BOOST_PACKAGE= python
4BOOST_COMMENT= (Boost.Python binary library) 4BOOST_COMMENT= (Boost.Python binary library)
5BOOST_CONFIG= installed 5BOOST_CONFIG= installed
6 6
7INSTALLATION_DIRS+= lib 7INSTALLATION_DIRS+= lib
8 8
 9PKGREVISION= 1
9.include "../../meta-pkgs/boost/Makefile.common" 10.include "../../meta-pkgs/boost/Makefile.common"
10 11
11PKGNAME= ${PYPKGPREFIX}-boost-${BOOST_VERSION} 12PKGNAME= ${PYPKGPREFIX}-boost-${BOOST_VERSION}
12 13
13BJAM_ARGS+= --user-config=${WRKSRC}/user-config.jam 14BJAM_ARGS+= --user-config=${WRKSRC}/user-config.jam
14BJAM_ARGS+= --with-python 15BJAM_ARGS+= --with-python
15MAKE_ENV+= BOOST_BUILD_PATH=${WRKSRC} 16MAKE_ENV+= BOOST_BUILD_PATH=${WRKSRC}
16 17
17.include "../../devel/boost-jam/bjam.mk" 18.include "../../devel/boost-jam/bjam.mk"
18.include "../../lang/python/pyversion.mk" 19.include "../../lang/python/pyversion.mk"
19 20
20post-configure: 21post-configure:
21 ${ECHO} 'using python : ${PYVERSSUFFIX} :' \ 22 ${ECHO} 'using python : ${PYVERSSUFFIX} :' \
cvs diff -r1.8 -r1.9 pkgsrc/devel/py-h5py/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-h5py/Makefile 2020/01/26 17:31:03 1.8
+++ pkgsrc/devel/py-h5py/Makefile 2020/10/12 21:51:59 1.9
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.8 2020/01/26 17:31:03 rillig Exp $ 1# $NetBSD: Makefile,v 1.9 2020/10/12 21:51:59 bacon Exp $
2 2
3DISTNAME= h5py-2.9.0 3DISTNAME= h5py-2.9.0
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= devel python 6CATEGORIES= devel python
6MASTER_SITES= ${MASTER_SITE_PYPI:=h/h5py/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=h/h5py/}
7 8
8MAINTAINER= jihbed.research@gmail.com 9MAINTAINER= jihbed.research@gmail.com
9HOMEPAGE= https://www.h5py.org/ 10HOMEPAGE= https://www.h5py.org/
10COMMENT= Python interface to the HDF5 library 11COMMENT= Python interface to the HDF5 library
11LICENSE= modified-bsd 12LICENSE= modified-bsd
12 13
13BUILD_DEPENDS+= ${PYPKGPREFIX}-pkgconfig-[0-9]*:../../devel/py-pkgconfig 14BUILD_DEPENDS+= ${PYPKGPREFIX}-pkgconfig-[0-9]*:../../devel/py-pkgconfig
14DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six 15DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
15 16
16BUILDLINK_API_DEPENDS.hdf5+= hdf5>=1.10 17BUILDLINK_API_DEPENDS.hdf5+= hdf5>=1.10
17.include "../../devel/hdf5/buildlink3.mk" 18.include "../../devel/hdf5/buildlink3.mk"
cvs diff -r1.23 -r1.24 pkgsrc/games/singularity/Makefile (expand / switch to unified diff)

--- pkgsrc/games/singularity/Makefile 2019/04/25 07:32:56 1.23
+++ pkgsrc/games/singularity/Makefile 2020/10/12 21:51:59 1.24
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.23 2019/04/25 07:32:56 maya Exp $ 1# $NetBSD: Makefile,v 1.24 2020/10/12 21:51:59 bacon Exp $
2 2
3DISTNAME= singularity-0.30c-src 3DISTNAME= singularity-0.30c-src
4PKGNAME= ${DISTNAME:S/-src//} 4PKGNAME= ${DISTNAME:S/-src//}
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= games 6CATEGORIES= games
7MASTER_SITES= http://endgame-singularity.googlecode.com/files/ 7MASTER_SITES= http://endgame-singularity.googlecode.com/files/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.emhsoft.com/singularity/ 10HOMEPAGE= http://www.emhsoft.com/singularity/
11COMMENT= Endgame: Singularity game 11COMMENT= Endgame: Singularity game
12 12
13WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 13WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
14 14
15INSTALLATION_DIRS= bin share/doc/singularity 15INSTALLATION_DIRS= bin share/doc/singularity
16INSTALLATION_DIRS+= share/singularity/code 16INSTALLATION_DIRS+= share/singularity/code
17INSTALLATION_DIRS+= share/singularity/code/graphics 17INSTALLATION_DIRS+= share/singularity/code/graphics
18INSTALLATION_DIRS+= share/singularity/code/screens 18INSTALLATION_DIRS+= share/singularity/code/screens
cvs diff -r1.25 -r1.26 pkgsrc/geography/py-gdal/Makefile (expand / switch to unified diff)

--- pkgsrc/geography/py-gdal/Makefile 2020/06/05 12:49:06 1.25
+++ pkgsrc/geography/py-gdal/Makefile 2020/10/12 21:51:59 1.26
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.25 2020/06/05 12:49:06 jperkin Exp $ 1# $NetBSD: Makefile,v 1.26 2020/10/12 21:51:59 bacon Exp $
2 2
3#PKGREVISION= 0 3#PKGREVISION= 0
4PKGREVISION= 4 4PKGREVISION= 5
5.include "../../geography/gdal-lib/Makefile.common" 5.include "../../geography/gdal-lib/Makefile.common"
6PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 6PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
7 7
8HOMEPAGE= http://www.gdal.org/ 8HOMEPAGE= http://www.gdal.org/
9COMMENT= Translator library for raster geospatial data formats, Python binding 9COMMENT= Translator library for raster geospatial data formats, Python binding
10LICENSE= mit 10LICENSE= mit
11 11
12BUILD_DIRS= swig/python 12BUILD_DIRS= swig/python
13 13
14MAKE_FILE= GNUmakefile 14MAKE_FILE= GNUmakefile
15 15
16REPLACE_PYTHON+= swig/python/scripts/*py 16REPLACE_PYTHON+= swig/python/scripts/*py
17 17
cvs diff -r1.15 -r1.16 pkgsrc/geography/py-obspy/Makefile (expand / switch to unified diff)

--- pkgsrc/geography/py-obspy/Makefile 2019/06/15 18:06:04 1.15
+++ pkgsrc/geography/py-obspy/Makefile 2020/10/12 21:51:59 1.16
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.15 2019/06/15 18:06:04 adam Exp $ 1# $NetBSD: Makefile,v 1.16 2020/10/12 21:51:59 bacon Exp $
2 2
3DISTNAME= obspy-1.1.1 3DISTNAME= obspy-1.1.1
4PKGREVISION= 1 4PKGREVISION= 2
5PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 5PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
6CATEGORIES= geography python 6CATEGORIES= geography python
7MASTER_SITES= ${MASTER_SITE_PYPI:=o/obspy/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=o/obspy/}
8EXTRACT_SUFX= .zip 8EXTRACT_SUFX= .zip
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.obspy.org/ 11HOMEPAGE= http://www.obspy.org/
12COMMENT= Python framework for seismological observatories 12COMMENT= Python framework for seismological observatories
13LICENSE= gnu-lgpl-v3 13LICENSE= gnu-lgpl-v3
14 14
15DEPENDS+= ${PYPKGPREFIX}-decorator>=0:../../devel/py-decorator 15DEPENDS+= ${PYPKGPREFIX}-decorator>=0:../../devel/py-decorator
16DEPENDS+= ${PYPKGPREFIX}-future>=0.12.4:../../devel/py-future 16DEPENDS+= ${PYPKGPREFIX}-future>=0.12.4:../../devel/py-future
17DEPENDS+= ${PYPKGPREFIX}-lxml>=3.2.3:../../textproc/py-lxml 17DEPENDS+= ${PYPKGPREFIX}-lxml>=3.2.3:../../textproc/py-lxml
cvs diff -r1.101 -r1.102 pkgsrc/geography/qgis/Makefile (expand / switch to unified diff)

--- pkgsrc/geography/qgis/Makefile 2020/09/12 23:56:44 1.101
+++ pkgsrc/geography/qgis/Makefile 2020/10/12 21:52:00 1.102
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.101 2020/09/12 23:56:44 gdt Exp $ 1# $NetBSD: Makefile,v 1.102 2020/10/12 21:52:00 bacon Exp $
2 2
3# This is intentionally 3.10 Long Term Release. Please do not update 3# This is intentionally 3.10 Long Term Release. Please do not update
4# to 3.14, and instead discuss whether/how we want multiple versions. 4# to 3.14, and instead discuss whether/how we want multiple versions.
5DISTNAME= qgis-3.10.10 5DISTNAME= qgis-3.10.10
 6PKGREVISION= 1
6CATEGORIES= geography 7CATEGORIES= geography
7MASTER_SITES= https://qgis.org/downloads/ 8MASTER_SITES= https://qgis.org/downloads/
8EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
9 10
10MAINTAINER= gdt@NetBSD.org 11MAINTAINER= gdt@NetBSD.org
11#MAINTAINER+= brook@nmsu.edu 12#MAINTAINER+= brook@nmsu.edu
12#MAINTAINER+= bouyer@NetBSD.orrg 13#MAINTAINER+= bouyer@NetBSD.orrg
13HOMEPAGE= http://www.qgis.org/ 14HOMEPAGE= http://www.qgis.org/
14COMMENT= Geographic Information System (GIS) 15COMMENT= Geographic Information System (GIS)
15LICENSE= gnu-gpl-v2 16LICENSE= gnu-gpl-v2
16 17
17USE_CMAKE= yes 18USE_CMAKE= yes
18USE_LANGUAGES= c c++ fortran77 19USE_LANGUAGES= c c++ fortran77
cvs diff -r1.167 -r1.168 pkgsrc/graphics/blender/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/blender/Makefile 2020/09/05 11:40:58 1.167
+++ pkgsrc/graphics/blender/Makefile 2020/10/12 21:52:00 1.168
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.167 2020/09/05 11:40:58 ryoon Exp $ 1# $NetBSD: Makefile,v 1.168 2020/10/12 21:52:00 bacon Exp $
2 2
3DISTNAME= blender-2.90.0 3DISTNAME= blender-2.90.0
 4PKGREVISION= 1
4CATEGORIES= graphics 5CATEGORIES= graphics
5MASTER_SITES= https://download.blender.org/source/ 6MASTER_SITES= https://download.blender.org/source/
6EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.blender.org/ 10HOMEPAGE= https://www.blender.org/
10COMMENT= Fully integrated 3D graphics creation suite 11COMMENT= Fully integrated 3D graphics creation suite
11LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
12 13
13USE_CMAKE= yes 14USE_CMAKE= yes
14USE_LANGUAGES= c gnu++11 15USE_LANGUAGES= c gnu++11
15 16
16# C++11 17# C++11
cvs diff -r1.1 -r1.2 pkgsrc/graphics/blender-lts/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/blender-lts/Makefile 2020/09/05 11:46:40 1.1
+++ pkgsrc/graphics/blender-lts/Makefile 2020/10/12 21:52:00 1.2
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.1 2020/09/05 11:46:40 ryoon Exp $ 1# $NetBSD: Makefile,v 1.2 2020/10/12 21:52:00 bacon Exp $
2 2
3DISTNAME= blender-2.83.5 3DISTNAME= blender-2.83.5
 4PKGREVISION= 1
4CATEGORIES= graphics 5CATEGORIES= graphics
5MASTER_SITES= https://download.blender.org/source/ 6MASTER_SITES= https://download.blender.org/source/
6EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.blender.org/ 10HOMEPAGE= https://www.blender.org/
10COMMENT= Fully integrated 3D graphics creation suite 11COMMENT= Fully integrated 3D graphics creation suite
11LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
12 13
13USE_CMAKE= yes 14USE_CMAKE= yes
14USE_LANGUAGES= c gnu++11 15USE_LANGUAGES= c gnu++11
15 16
16# C++11 17# C++11
cvs diff -r1.49 -r1.50 pkgsrc/graphics/mypaint/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/mypaint/Makefile 2020/08/17 20:19:06 1.49
+++ pkgsrc/graphics/mypaint/Makefile 2020/10/12 21:52:00 1.50
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.49 2020/08/17 20:19:06 leot Exp $ 1# $NetBSD: Makefile,v 1.50 2020/10/12 21:52:00 bacon Exp $
2 2
3DISTNAME= mypaint-2.0.0 3DISTNAME= mypaint-2.0.0
4PKGREVISION= 5 4PKGREVISION= 6
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= ${MASTER_SITE_GITHUB:=mypaint/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=mypaint/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8GITHUB_PROJECT= mypaint 8GITHUB_PROJECT= mypaint
9GITHUB_RELEASE= v${PKGVERSION_NOREV} 9GITHUB_RELEASE= v${PKGVERSION_NOREV}
10 10
11MAINTAINER= ryoon@NetBSD.org 11MAINTAINER= ryoon@NetBSD.org
12HOMEPAGE= http://mypaint.org/ 12HOMEPAGE= http://mypaint.org/
13COMMENT= Fast and easy open-source graphics application for digital painters 13COMMENT= Fast and easy open-source graphics application for digital painters
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
15 15
16DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3 16DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
17TOOL_DEPENDS+= swig3-[0-9]*:../../devel/swig3 17TOOL_DEPENDS+= swig3-[0-9]*:../../devel/swig3
cvs diff -r1.94 -r1.95 pkgsrc/graphics/opencv/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/opencv/Makefile 2020/08/17 20:19:06 1.94
+++ pkgsrc/graphics/opencv/Makefile 2020/10/12 21:52:00 1.95
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.94 2020/08/17 20:19:06 leot Exp $ 1# $NetBSD: Makefile,v 1.95 2020/10/12 21:52:00 bacon Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5DISTNAME= opencv-${OPENCV_VERSION} 5DISTNAME= opencv-${OPENCV_VERSION}
6PKGREVISION= 5 6PKGREVISION= 6
7 7
8MAINTAINER= anthony.mallet@laas.fr 8MAINTAINER= anthony.mallet@laas.fr
9COMMENT= Library for computer vision problems 9COMMENT= Library for computer vision problems
10 10
11INSTALLATION_DIRS+= share/doc/opencv/papers 11INSTALLATION_DIRS+= share/doc/opencv/papers
12INSTALLATION_DIRS+= share/doc/opencv/ref/pics 12INSTALLATION_DIRS+= share/doc/opencv/ref/pics
13INSTALLATION_DIRS+= share/OpenCV/haarcascades 13INSTALLATION_DIRS+= share/OpenCV/haarcascades
14 14
15PKGCONFIG_OVERRIDE+= build/unix-install/opencv.pc 15PKGCONFIG_OVERRIDE+= build/unix-install/opencv.pc
16PKGCONFIG_OVERRIDE_STAGE= post-configure 16PKGCONFIG_OVERRIDE_STAGE= post-configure
17 17
18PY_PATCHPLIST= yes 18PY_PATCHPLIST= yes
19REPLACE_PYTHON+= samples/python/*.py 19REPLACE_PYTHON+= samples/python/*.py
cvs diff -r1.67 -r1.68 pkgsrc/graphics/pfstools/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/pfstools/Makefile 2020/08/31 18:09:45 1.67
+++ pkgsrc/graphics/pfstools/Makefile 2020/10/12 21:52:00 1.68
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.67 2020/08/31 18:09:45 wiz Exp $ 1# $NetBSD: Makefile,v 1.68 2020/10/12 21:52:00 bacon Exp $
2 2
3DISTNAME= pfstools-2.1.0 3DISTNAME= pfstools-2.1.0
4PKGREVISION= 10 4PKGREVISION= 11
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pfstools/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pfstools/}
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://pfstools.sourceforge.net/ 10HOMEPAGE= http://pfstools.sourceforge.net/
11COMMENT= Tools for manipulating HDR images and video frames 11COMMENT= Tools for manipulating HDR images and video frames
12LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
13 13
14DEPENDS+= dcraw-[0-9]*:../../graphics/dcraw 14DEPENDS+= dcraw-[0-9]*:../../graphics/dcraw
15 15
16USE_CMAKE= yes 16USE_CMAKE= yes
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
cvs diff -r1.30 -r1.31 pkgsrc/graphics/py-OpenGL/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/py-OpenGL/Makefile 2020/04/26 10:07:06 1.30
+++ pkgsrc/graphics/py-OpenGL/Makefile 2020/10/12 21:52:00 1.31
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.30 2020/04/26 10:07:06 rillig Exp $ 1# $NetBSD: Makefile,v 1.31 2020/10/12 21:52:00 bacon Exp $
2 2
3DISTNAME= PyOpenGL-3.1.5 3DISTNAME= PyOpenGL-3.1.5
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^Py//} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^Py//}
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= graphics python 6CATEGORIES= graphics python
7MASTER_SITES= ${MASTER_SITE_PYPI:=P/PyOpenGL/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=P/PyOpenGL/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://pyopengl.sourceforge.net/ 10HOMEPAGE= http://pyopengl.sourceforge.net/
11COMMENT= Python bindings for OpenGL 11COMMENT= Python bindings for OpenGL
12# There are many similar licenses, see license.txt 12# There are many similar licenses, see license.txt
13LICENSE= modified-bsd AND mit 13LICENSE= modified-bsd AND mit
14 14
15DEPENDS+= ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk 15DEPENDS+= ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
16TEST_DEPENDS+= ${PYPKGPREFIX}-OpenGL-accelerate-[0-9]*:../../graphics/py-OpenGL-accelerate 16TEST_DEPENDS+= ${PYPKGPREFIX}-OpenGL-accelerate-[0-9]*:../../graphics/py-OpenGL-accelerate
17TEST_DEPENDS+= ${PYPKGPREFIX}-game-[0-9]*:../../devel/py-game 17TEST_DEPENDS+= ${PYPKGPREFIX}-game-[0-9]*:../../devel/py-game
18 18
cvs diff -r1.1 -r1.2 pkgsrc/graphics/py-OpenGL-accelerate/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/py-OpenGL-accelerate/Makefile 2020/01/27 06:24:36 1.1
+++ pkgsrc/graphics/py-OpenGL-accelerate/Makefile 2020/10/12 21:52:00 1.2
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.1 2020/01/27 06:24:36 adam Exp $ 1# $NetBSD: Makefile,v 1.2 2020/10/12 21:52:00 bacon Exp $
2 2
3DISTNAME= PyOpenGL-accelerate-3.1.5 3DISTNAME= PyOpenGL-accelerate-3.1.5
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^Py//} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^Py//}
 5PKGREVISION= 1
5CATEGORIES= graphics python 6CATEGORIES= graphics python
6MASTER_SITES= ${MASTER_SITE_PYPI:=P/PyOpenGL-accelerate/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=P/PyOpenGL-accelerate/}
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://pyopengl.sourceforge.net/ 10HOMEPAGE= http://pyopengl.sourceforge.net/
10COMMENT= Acceleration code for PyOpenGL 11COMMENT= Acceleration code for PyOpenGL
11# There are many similar licenses, see license.txt 12# There are many similar licenses, see license.txt
12LICENSE= modified-bsd AND mit 13LICENSE= modified-bsd AND mit
13 14
14.include "../../lang/python/egg.mk" 15.include "../../lang/python/egg.mk"
15.include "../../math/py-numpy/buildlink3.mk" 16.include "../../math/py-numpy/buildlink3.mk"
16.include "../../mk/bsd.pkg.mk" 17.include "../../mk/bsd.pkg.mk"
cvs diff -r1.29 -r1.30 pkgsrc/graphics/py-biggles/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/py-biggles/Attic/Makefile 2020/03/20 11:57:52 1.29
+++ pkgsrc/graphics/py-biggles/Attic/Makefile 2020/10/12 21:52:00 1.30
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.29 2020/03/20 11:57:52 nia Exp $ 1# $NetBSD: Makefile,v 1.30 2020/10/12 21:52:00 bacon Exp $
2 2
3DISTNAME= python2-biggles-1.6.6 3DISTNAME= python2-biggles-1.6.6
4PKGNAME= ${PYPKGPREFIX}${DISTNAME:S/python2//} 4PKGNAME= ${PYPKGPREFIX}${DISTNAME:S/python2//}
 5PKGREVISION= 1
5CATEGORIES= graphics python 6CATEGORIES= graphics python
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=biggles/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=biggles/}
7 8
8MAINTAINER= Kai.Puolamaki@iki.fi 9MAINTAINER= Kai.Puolamaki@iki.fi
9HOMEPAGE= http://biggles.sourceforge.net/ 10HOMEPAGE= http://biggles.sourceforge.net/
10COMMENT= Python module for creating 2D scientific plots 11COMMENT= Python module for creating 2D scientific plots
11 12
12PYTHON_VERSIONS_ACCEPTED= 27 # not ported yet as of 1.6.6 13PYTHON_VERSIONS_ACCEPTED= 27 # not ported yet as of 1.6.6
13 14
14.include "../../lang/python/distutils.mk" 15.include "../../lang/python/distutils.mk"
15.include "../../math/py-numpy/buildlink3.mk" 16.include "../../math/py-numpy/buildlink3.mk"
16.include "../../graphics/plotutils/buildlink3.mk" 17.include "../../graphics/plotutils/buildlink3.mk"
17.include "../../mk/bsd.pkg.mk" 18.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/graphics/py-fits/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/py-fits/Attic/Makefile 2020/05/25 05:29:32 1.8
+++ pkgsrc/graphics/py-fits/Attic/Makefile 2020/10/12 21:52:01 1.9
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.8 2020/05/25 05:29:32 rillig Exp $ 1# $NetBSD: Makefile,v 1.9 2020/10/12 21:52:01 bacon Exp $
2 2
3DISTNAME= pyfits-3.5 3DISTNAME= pyfits-3.5
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
 5PKGREVISION= 1
5CATEGORIES= graphics python 6CATEGORIES= graphics python
6MASTER_SITES= ${MASTER_SITE_PYPI:=p/pyfits/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=p/pyfits/}
7 8
8MAINTAINER= kamelderouiche@yahoo.com 9MAINTAINER= kamelderouiche@yahoo.com
9HOMEPAGE= http://www.stsci.edu/resources/software_hardware/pyfits 10HOMEPAGE= http://www.stsci.edu/resources/software_hardware/pyfits
10COMMENT= Python module for reading, writing, and manipulating FITS files 11COMMENT= Python module for reading, writing, and manipulating FITS files
11LICENSE= modified-bsd 12LICENSE= modified-bsd
12 13
13BUILD_DEPENDS+= ${PYPKGPREFIX}-d2to1>=0.2.12:../../devel/py-d2to1 14BUILD_DEPENDS+= ${PYPKGPREFIX}-d2to1>=0.2.12:../../devel/py-d2to1
14BUILD_DEPENDS+= ${PYPKGPREFIX}-stsci.distutils>=0.3:../../devel/py-stsci.distutils 15BUILD_DEPENDS+= ${PYPKGPREFIX}-stsci.distutils>=0.3:../../devel/py-stsci.distutils
15 16
16post-install: 17post-install:
17 cd ${DESTDIR}${PREFIX}/bin && \ 18 cd ${DESTDIR}${PREFIX}/bin && \
cvs diff -r1.28 -r1.29 pkgsrc/graphics/py-gnuplot/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/py-gnuplot/Attic/Makefile 2020/04/27 18:35:01 1.28
+++ pkgsrc/graphics/py-gnuplot/Attic/Makefile 2020/10/12 21:52:01 1.29
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.28 2020/04/27 18:35:01 adam Exp $ 1# $NetBSD: Makefile,v 1.29 2020/10/12 21:52:01 bacon Exp $
2 2
3DISTNAME= gnuplot-py-1.8 3DISTNAME= gnuplot-py-1.8
4PKGNAME= ${PYPKGPREFIX}-gnuplot-1.8 4PKGNAME= ${PYPKGPREFIX}-gnuplot-1.8
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= graphics python 6CATEGORIES= graphics python
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnuplot-py/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnuplot-py/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://gnuplot-py.sourceforge.net/ 10HOMEPAGE= http://gnuplot-py.sourceforge.net/
11COMMENT= Python package that interfaces to gnuplot 11COMMENT= Python package that interfaces to gnuplot
12LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
13 13
14USE_LANGUAGES= # empty 14USE_LANGUAGES= # empty
15 15
16PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 1.8 16PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 1.8
17 17
18.include "../../lang/python/distutils.mk" 18.include "../../lang/python/distutils.mk"
cvs diff -r1.59 -r1.60 pkgsrc/graphics/py-matplotlib/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/py-matplotlib/Makefile 2020/06/18 12:24:55 1.59
+++ pkgsrc/graphics/py-matplotlib/Makefile 2020/10/12 21:52:01 1.60
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.59 2020/06/18 12:24:55 adam Exp $ 1# $NetBSD: Makefile,v 1.60 2020/10/12 21:52:01 bacon Exp $
2 2
3DISTNAME= matplotlib-3.2.2 3DISTNAME= matplotlib-3.2.2
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= graphics python 6CATEGORIES= graphics python
6MASTER_SITES= ${MASTER_SITE_PYPI:=m/matplotlib/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=m/matplotlib/}
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://matplotlib.org/ 10HOMEPAGE= https://matplotlib.org/
10COMMENT= Matlab-style plotting package for Python 11COMMENT= Matlab-style plotting package for Python
11# LICENSE= see ${WRKSRC}/LICENSE/LICENSE 12# LICENSE= see ${WRKSRC}/LICENSE/LICENSE
12 13
13DEPENDS+= ${PYPKGPREFIX}-Pillow>=3.4:../../graphics/py-Pillow 14DEPENDS+= ${PYPKGPREFIX}-Pillow>=3.4:../../graphics/py-Pillow
14DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo 15DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
15DEPENDS+= ${PYPKGPREFIX}-cycler>=0.10:../../graphics/py-cycler 16DEPENDS+= ${PYPKGPREFIX}-cycler>=0.10:../../graphics/py-cycler
16DEPENDS+= ${PYPKGPREFIX}-dateutil>=2.1:../../time/py-dateutil 17DEPENDS+= ${PYPKGPREFIX}-dateutil>=2.1:../../time/py-dateutil
17DEPENDS+= ${PYPKGPREFIX}-kiwisolver>=1.0.1:../../math/py-kiwisolver 18DEPENDS+= ${PYPKGPREFIX}-kiwisolver>=1.0.1:../../math/py-kiwisolver
cvs diff -r1.66 -r1.67 pkgsrc/graphics/veusz/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/veusz/Makefile 2020/08/17 20:19:11 1.66
+++ pkgsrc/graphics/veusz/Makefile 2020/10/12 21:52:01 1.67
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.66 2020/08/17 20:19:11 leot Exp $ 1# $NetBSD: Makefile,v 1.67 2020/10/12 21:52:01 bacon Exp $
2 2
3DISTNAME= veusz-3.1 3DISTNAME= veusz-3.1
4PKGREVISION= 6 4PKGREVISION= 7
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= ${MASTER_SITE_GITHUB:=veusz/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=veusz/}
7GITHUB_RELEASE= ${DISTNAME} 7GITHUB_RELEASE= ${DISTNAME}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10#HOMEPAGE= https://veusz.github.io/ 10#HOMEPAGE= https://veusz.github.io/
11COMMENT= Scientific plotting package 11COMMENT= Scientific plotting package
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15 15
16REPLACE_PYTHON+= examples/embedexample.py 16REPLACE_PYTHON+= examples/embedexample.py
17REPLACE_PYTHON+= veusz/veusz_listen.py 17REPLACE_PYTHON+= veusz/veusz_listen.py
cvs diff -r1.13 -r1.14 pkgsrc/lang/lush/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/lush/Makefile 2020/03/20 11:57:55 1.13
+++ pkgsrc/lang/lush/Makefile 2020/10/12 21:52:01 1.14
@@ -1,32 +1,31 @@ @@ -1,32 +1,31 @@
1# $NetBSD: Makefile,v 1.13 2020/03/20 11:57:55 nia Exp $ 1# $NetBSD: Makefile,v 1.14 2020/10/12 21:52:01 bacon Exp $
2 2
3DISTNAME= lush-1.2.1 3DISTNAME= lush-1.2.1
4PKGREVISION= 3 4PKGREVISION= 4
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lush/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lush/}
7 7
8MAINTAINER= dauphin@enst.fr 8MAINTAINER= dauphin@enst.fr
9HOMEPAGE= http://lush.sourceforge.net/ 9HOMEPAGE= http://lush.sourceforge.net/
10COMMENT= Lisp interpreter/compiler with a seamless interface to C 10COMMENT= Lisp interpreter/compiler with a seamless interface to C
11 11
12GNU_CONFIGURE= yes 12GNU_CONFIGURE= yes
13USE_TOOLS+= gmake 13USE_TOOLS+= gmake
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15 15
16CONFIGURE_ARGS+= --without-bfd 16CONFIGURE_ARGS+= --without-bfd
17 17
18WRKSRC= ${WRKDIR}/lush 18WRKSRC= ${WRKDIR}/lush
19 19
20post-install: 20post-install:
21 ${RM} ${DESTDIR}${PREFIX}/share/lush/lsh/libc/*.lsh.orig 21 ${RM} ${DESTDIR}${PREFIX}/share/lush/lsh/libc/*.lsh.orig
22 22
23.include "../../math/gsl/buildlink3.mk" 23.include "../../math/gsl/buildlink3.mk"
24.include "../../math/lapack/buildlink3.mk" 24.include "../../mk/blas.buildlink3.mk"
25.include "../../math/blas/buildlink3.mk" 
26.include "../../devel/SDL/buildlink3.mk" 25.include "../../devel/SDL/buildlink3.mk"
27# rl_getc, rl_basic_quote_characters, rl_insert_close 26# rl_getc, rl_basic_quote_characters, rl_insert_close
28.include "../../devel/readline/buildlink3.mk" 27.include "../../devel/readline/buildlink3.mk"
29.include "../../graphics/MesaLib/buildlink3.mk" 28.include "../../graphics/MesaLib/buildlink3.mk"
30.include "../../audio/libaudiofile/buildlink3.mk" 29.include "../../audio/libaudiofile/buildlink3.mk"
31.include "../../mk/pthread.buildlink3.mk" 30.include "../../mk/pthread.buildlink3.mk"
32.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.218 -r1.219 pkgsrc/math/R/Makefile (expand / switch to unified diff)

--- pkgsrc/math/R/Makefile 2020/10/11 15:22:56 1.218
+++ pkgsrc/math/R/Makefile 2020/10/12 21:51:58 1.219
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.218 2020/10/11 15:22:56 wen Exp $ 1# $NetBSD: Makefile,v 1.219 2020/10/12 21:51:58 bacon Exp $
2 2
3DISTNAME= R-4.0.3 3DISTNAME= R-4.0.3
 4PKGREVISION= 1
4CATEGORIES= math 5CATEGORIES= math
5MASTER_SITES= ${MASTER_SITE_R_CRAN:=base/R-4/} 6MASTER_SITES= ${MASTER_SITE_R_CRAN:=base/R-4/}
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= https://www.R-project.org/ 9HOMEPAGE= https://www.R-project.org/
9COMMENT= Statistical language for data analysis and graphics 10COMMENT= Statistical language for data analysis and graphics
10LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
11 12
12USE_GCC_RUNTIME= yes 13USE_GCC_RUNTIME= yes
13 14
14BUILD_TARGET= all info 15BUILD_TARGET= all info
15INSTALL_TARGET= install install-info 16INSTALL_TARGET= install install-info
16TEST_TARGET= check 17TEST_TARGET= check
@@ -158,28 +159,27 @@ fix-darwin-install-name: @@ -158,28 +159,27 @@ fix-darwin-install-name:
158.include "../../converters/libiconv/buildlink3.mk" 159.include "../../converters/libiconv/buildlink3.mk"
159.include "../../devel/gettext-lib/buildlink3.mk" 160.include "../../devel/gettext-lib/buildlink3.mk"
160.include "../../devel/glib2/buildlink3.mk" 161.include "../../devel/glib2/buildlink3.mk"
161.include "../../devel/pango/buildlink3.mk" 162.include "../../devel/pango/buildlink3.mk"
162.include "../../devel/pcre2/buildlink3.mk" 163.include "../../devel/pcre2/buildlink3.mk"
163# uses callback interface 164# uses callback interface
164.include "../../devel/readline/buildlink3.mk" 165.include "../../devel/readline/buildlink3.mk"
165.include "../../devel/zlib/buildlink3.mk" 166.include "../../devel/zlib/buildlink3.mk"
166.include "../../graphics/cairo/buildlink3.mk" 167.include "../../graphics/cairo/buildlink3.mk"
167.include "../../mk/jpeg.buildlink3.mk" 168.include "../../mk/jpeg.buildlink3.mk"
168.include "../../graphics/png/buildlink3.mk" 169.include "../../graphics/png/buildlink3.mk"
169.include "../../graphics/tiff/buildlink3.mk" 170.include "../../graphics/tiff/buildlink3.mk"
170.if !exists(/System/Library/Frameworks/Accelerate.framework) 171.if !exists(/System/Library/Frameworks/Accelerate.framework)
171.include "../../math/blas/buildlink3.mk" 172.include "../../mk/blas.buildlink3.mk"
172.include "../../math/lapack/buildlink3.mk" 
173.endif 173.endif
174.include "../../www/curl/buildlink3.mk" 174.include "../../www/curl/buildlink3.mk"
175.include "../../x11/tk/buildlink3.mk" 175.include "../../x11/tk/buildlink3.mk"
176 176
177.if ${OPSYS} != "Darwin" 177.if ${OPSYS} != "Darwin"
178.include "../../x11/libXt/buildlink3.mk" 178.include "../../x11/libXt/buildlink3.mk"
179.endif 179.endif
180 180
181INSTALL_TEMPLATES+= ../../math/R/files/pkg-index.tmpl 181INSTALL_TEMPLATES+= ../../math/R/files/pkg-index.tmpl
182DEINSTALL_TEMPLATES+= ../../math/R/files/pkg-index.tmpl 182DEINSTALL_TEMPLATES+= ../../math/R/files/pkg-index.tmpl
183PRINT_PLIST_AWK+= /^lib\/R\/doc\/html\/packages.html$$/ { next; } 183PRINT_PLIST_AWK+= /^lib\/R\/doc\/html\/packages.html$$/ { next; }
184 184
185.include "../../mk/pthread.buildlink3.mk" 185.include "../../mk/pthread.buildlink3.mk"
cvs diff -r1.13 -r1.14 pkgsrc/math/R/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/math/R/buildlink3.mk 2018/03/07 23:16:03 1.13
+++ pkgsrc/math/R/buildlink3.mk 2020/10/12 21:51:58 1.14
@@ -1,22 +1,21 @@ @@ -1,22 +1,21 @@
1# $NetBSD: buildlink3.mk,v 1.13 2018/03/07 23:16:03 minskim Exp $ 1# $NetBSD: buildlink3.mk,v 1.14 2020/10/12 21:51:58 bacon Exp $
2 2
3BUILDLINK_TREE+= R 3BUILDLINK_TREE+= R
4 4
5.if !defined(R_BUILDLINK3_MK) 5.if !defined(R_BUILDLINK3_MK)
6R_BUILDLINK3_MK:= 6R_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.R+= R>=1.7.0 8BUILDLINK_API_DEPENDS.R+= R>=1.7.0
9BUILDLINK_ABI_DEPENDS.R+= R>=2.2.1nb2 9BUILDLINK_ABI_DEPENDS.R+= R>=4.0.3nb1
10BUILDLINK_PKGSRCDIR.R?= ../../math/R 10BUILDLINK_PKGSRCDIR.R?= ../../math/R
11.endif # R_BUILDLINK3_MK 11.endif # R_BUILDLINK3_MK
12 12
13.include "../../archivers/bzip2/buildlink3.mk" 13.include "../../archivers/bzip2/buildlink3.mk"
14.include "../../archivers/xz/buildlink3.mk" 14.include "../../archivers/xz/buildlink3.mk"
15.include "../../devel/gettext-lib/buildlink3.mk" 15.include "../../devel/gettext-lib/buildlink3.mk"
16.include "../../devel/zlib/buildlink3.mk" 16.include "../../devel/zlib/buildlink3.mk"
17.if !exists(/System/Library/Frameworks/Accelerate.framework) 17.if !exists(/System/Library/Frameworks/Accelerate.framework)
18.include "../../math/blas/buildlink3.mk" 18.include "../../mk/blas.buildlink3.mk"
19.include "../../math/lapack/buildlink3.mk" 
20.endif 19.endif
21 20
22BUILDLINK_TREE+= -R 21BUILDLINK_TREE+= -R
cvs diff -r1.6 -r1.7 pkgsrc/math/R-RandomFields/Makefile (expand / switch to unified diff)

--- pkgsrc/math/R-RandomFields/Makefile 2020/09/20 23:29:09 1.6
+++ pkgsrc/math/R-RandomFields/Makefile 2020/10/12 21:52:01 1.7
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1# $NetBSD: Makefile,v 1.6 2020/09/20 23:29:09 mef Exp $ 1# $NetBSD: Makefile,v 1.7 2020/10/12 21:52:01 bacon Exp $
2 2
3R_PKGNAME= RandomFields 3R_PKGNAME= RandomFields
4R_PKGVER= 3.3.8 4R_PKGVER= 3.3.8
5 5
6MAINTAINER= pkgsrc-users@NetBSD.org 6MAINTAINER= pkgsrc-users@NetBSD.org
7COMMENT= Simulation and analysis of random fields 7COMMENT= Simulation and analysis of random fields
 8PKGREVISION= 1
8LICENSE= gnu-gpl-v3 9LICENSE= gnu-gpl-v3
9 10
10DEPENDS+= R-sp>=1.3.1:../../math/R-sp 11DEPENDS+= R-sp>=1.3.1:../../math/R-sp
11DEPENDS+= R-RandomFieldsUtils>=0.5.1:../../math/R-RandomFieldsUtils 12DEPENDS+= R-RandomFieldsUtils>=0.5.1:../../math/R-RandomFieldsUtils
12 13
13# Packages suggested but not available: 14# Packages suggested but not available:
14# 'tkrplot', 'spam', 'soma', 'optimx', 'pso', 'GenSA' 15# 'tkrplot', 'spam', 'soma', 'optimx', 'pso', 'GenSA'
15TEST_DEPENDS+= R-raster-[0-9]*:../../geography/R-raster 16TEST_DEPENDS+= R-raster-[0-9]*:../../geography/R-raster
16TEST_DEPENDS+= R-mvtnorm-[0-9]*:../../math/R-mvtnorm 17TEST_DEPENDS+= R-mvtnorm-[0-9]*:../../math/R-mvtnorm
17TEST_DEPENDS+= R-tcltk2-[0-9]*:../../devel/R-tcltk2 18TEST_DEPENDS+= R-tcltk2-[0-9]*:../../devel/R-tcltk2
18 19
19USE_LANGUAGES+= c c++ fortran 20USE_LANGUAGES+= c c++ fortran
20 21
21.include "../../math/R/Makefile.extension" 22.include "../../math/R/Makefile.extension"
22.include "../../math/R-RandomFieldsUtils/buildlink3.mk" 23.include "../../math/R-RandomFieldsUtils/buildlink3.mk"
23.include "../../math/blas/buildlink3.mk" 24.include "../../mk/blas.buildlink3.mk"
24.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/math/R-gstat/Makefile (expand / switch to unified diff)

--- pkgsrc/math/R-gstat/Makefile 2019/08/08 19:53:50 1.12
+++ pkgsrc/math/R-gstat/Makefile 2020/10/12 21:52:01 1.13
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1# $NetBSD: Makefile,v 1.12 2019/08/08 19:53:50 brook Exp $ 1# $NetBSD: Makefile,v 1.13 2020/10/12 21:52:01 bacon Exp $
2 2
3R_PKGNAME= gstat 3R_PKGNAME= gstat
4R_PKGVER= 2.0-2 4R_PKGVER= 2.0-2
 5PKGREVISION= 1
5CATEGORIES= math 6CATEGORIES= math
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8COMMENT= Spatial and spatio-temporal geostatistical modelling, prediction and simulation 9COMMENT= Spatial and spatio-temporal geostatistical modelling, prediction and simulation
9LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 10LICENSE= gnu-gpl-v2 OR gnu-gpl-v3
10 11
11DEPENDS+= R-FNN>=1.1.3:../../math/R-FNN 12DEPENDS+= R-FNN>=1.1.3:../../math/R-FNN
12DEPENDS+= R-sp>=0.9.98:../../math/R-sp 13DEPENDS+= R-sp>=0.9.98:../../math/R-sp
13DEPENDS+= R-spacetime>=1.0.0:../../math/R-spacetime 14DEPENDS+= R-spacetime>=1.0.0:../../math/R-spacetime
14DEPENDS+= R-zoo>=1.8.3:../../math/R-zoo 15DEPENDS+= R-zoo>=1.8.3:../../math/R-zoo
15 16
16USE_LANGUAGES+= c fortran 17USE_LANGUAGES+= c fortran
17 18
18.include "../../math/R/Makefile.extension" 19.include "../../math/R/Makefile.extension"
19.include "../../math/blas/buildlink3.mk" 20.include "../../mk/blas.buildlink3.mk"
20.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/math/R-quantreg/Makefile (expand / switch to unified diff)

--- pkgsrc/math/R-quantreg/Makefile 2019/08/08 19:53:53 1.7
+++ pkgsrc/math/R-quantreg/Makefile 2020/10/12 21:52:01 1.8
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.7 2019/08/08 19:53:53 brook Exp $ 1# $NetBSD: Makefile,v 1.8 2020/10/12 21:52:01 bacon Exp $
2 2
3R_PKGNAME= quantreg 3R_PKGNAME= quantreg
4R_PKGVER= 5.42.1 4R_PKGVER= 5.42.1
 5PKGREVISION= 1
5CATEGORIES= math 6CATEGORIES= math
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8COMMENT= Quantile regression 9COMMENT= Quantile regression
9LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 10LICENSE= gnu-gpl-v2 OR gnu-gpl-v3
10 11
11DEPENDS+= R-MatrixModels>=0:../../math/R-MatrixModels 12DEPENDS+= R-MatrixModels>=0:../../math/R-MatrixModels
12DEPENDS+= R-SparseM>=1.77:../../math/R-SparseM 13DEPENDS+= R-SparseM>=1.77:../../math/R-SparseM
13 14
14USE_LANGUAGES= c fortran 15USE_LANGUAGES= c fortran
15 16
16.include "../../math/R/Makefile.extension" 17.include "../../math/R/Makefile.extension"
17.include "../../math/blas/buildlink3.mk" 18.include "../../mk/blas.buildlink3.mk"
18.include "../../math/lapack/buildlink3.mk" 
19.include "../../mk/bsd.pkg.mk" 19.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/math/R-wle/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/math/R-wle/Attic/Makefile 2019/08/08 19:53:55 1.15
+++ pkgsrc/math/R-wle/Attic/Makefile 2020/10/12 21:52:01 1.16
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.15 2019/08/08 19:53:55 brook Exp $ 1# $NetBSD: Makefile,v 1.16 2020/10/12 21:52:01 bacon Exp $
2 2
3R_PKGNAME= wle 3R_PKGNAME= wle
4R_PKGVER= 0.9-9 4R_PKGVER= 0.9-9
 5PKGREVISION= 1
5CATEGORIES= math 6CATEGORIES= math
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8COMMENT= Weighted likelihood estimation 9COMMENT= Weighted likelihood estimation
9LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
10 11
11DEPENDS+= R-circular>=0.4.3:../../math/R-circular 12DEPENDS+= R-circular>=0.4.3:../../math/R-circular
12 13
13USE_LANGUAGES+= c fortran 14USE_LANGUAGES+= c fortran
14 15
15.include "../../math/R/Makefile.extension" 16.include "../../math/R/Makefile.extension"
16.include "../../devel/gettext-lib/buildlink3.mk" 17.include "../../devel/gettext-lib/buildlink3.mk"
17.include "../../math/blas/buildlink3.mk" 18.include "../../mk/blas.buildlink3.mk"
18.include "../../mk/bsd.pkg.mk" 19.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/math/arpack-ng/Makefile (expand / switch to unified diff)

--- pkgsrc/math/arpack-ng/Makefile 2020/02/28 21:51:40 1.1
+++ pkgsrc/math/arpack-ng/Makefile 2020/10/12 21:52:02 1.2
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: Makefile,v 1.1 2020/02/28 21:51:40 plunky Exp $ 1# $NetBSD: Makefile,v 1.2 2020/10/12 21:52:02 bacon Exp $
2 2
3DISTNAME= arpack-ng-3.7.0 3DISTNAME= arpack-ng-3.7.0
 4PKGREVISION= 1
4CATEGORIES= math 5CATEGORIES= math
5MASTER_SITES= ${MASTER_SITE_GITHUB:=opencollab/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=opencollab/}
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= https://github.com/opencollab/arpack-ng 9HOMEPAGE= https://github.com/opencollab/arpack-ng
9COMMENT= Library of subroutines to solve eigenvalue problems 10COMMENT= Library of subroutines to solve eigenvalue problems
10LICENSE= original-bsd 11LICENSE= original-bsd
11 12
12USE_LANGUAGES= c fortran 13USE_LANGUAGES= c fortran
13USE_CMAKE= yes 14USE_CMAKE= yes
14 15
15OBJDIR= obj 16OBJDIR= obj
16 17
17CONFIGURE_DIRS= ${OBJDIR} 18CONFIGURE_DIRS= ${OBJDIR}
18 19
19CMAKE_ARG_PATH= .. 20CMAKE_ARG_PATH= ..
20CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON 21CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON
21 22
22TEST_TARGET= test 23TEST_TARGET= test
23 24
24pre-configure: 25pre-configure:
25 cd ${WRKSRC} && ${MKDIR} ${OBJDIR} 26 cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
26 27
27INSTALLATION_DIRS= lib 28INSTALLATION_DIRS= lib
28 29
29.include "../../math/blas/buildlink3.mk" 30.include "../../mk/blas.buildlink3.mk"
30.include "../../math/lapack/buildlink3.mk" 
31.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.37 -r1.38 pkgsrc/math/blas/Makefile (expand / switch to unified diff)

--- pkgsrc/math/blas/Makefile 2020/02/28 21:48:53 1.37
+++ pkgsrc/math/blas/Makefile 2020/10/12 21:51:57 1.38
@@ -1,16 +1,14 @@ @@ -1,16 +1,14 @@
1# $NetBSD: Makefile,v 1.37 2020/02/28 21:48:53 plunky Exp $ 1# $NetBSD: Makefile,v 1.38 2020/10/12 21:51:57 bacon Exp $
2 2
3.include "../../math/lapack/Makefile.common" 3.include "../../math/lapack/Makefile.common"
4 4
5PKGNAME= ${DISTNAME:S/lapack/blas/} 5PKGREVISION= 1
6 6
7COMMENT= Basic Linear Algebra Subprograms (Fortran) 7COMMENT= Basic Linear Algebra System (Netlib reference implementation)
8 8
9# not actually true but pretend as we package it separately 9LAPACK_COMPONENT= blas
10CMAKE_ARGS+= -DLATESTLAPACK_FOUND:BOOL=TRUE 10LAPACK_COMPONENT_CMAKE_ARGS= \
11 11 -DUSE_OPTIMIZED_BLAS=OFF \
12BUILD_TARGET= blas 12 -DCBLAS=OFF -DLAPACKE=OFF -DLAPACK=OFF
13 
14TEST_DIRS= ${WRKSRC}/${OBJDIR}/BLAS 
15 13
16.include "../../mk/bsd.pkg.mk" 14.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/math/blas/PLIST (expand / switch to unified diff)

--- pkgsrc/math/blas/PLIST 2020/02/28 21:48:53 1.5
+++ pkgsrc/math/blas/PLIST 2020/10/12 21:51:57 1.6
@@ -1,4 +1,6 @@ @@ -1,4 +1,6 @@
1@comment $NetBSD: PLIST,v 1.5 2020/02/28 21:48:53 plunky Exp $ 1@comment $NetBSD: PLIST,v 1.6 2020/10/12 21:51:57 bacon Exp $
 2lib/libblas.a
2lib/libblas.so 3lib/libblas.so
3lib/libblas.so.3 4lib/libblas.so.3
4lib/libblas.so.${PKGVERSION} 5lib/libblas.so.${PKGVERSION}
 6lib/pkgconfig/blas.pc
cvs diff -r1.9 -r1.10 pkgsrc/math/blas/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/math/blas/buildlink3.mk 2020/02/28 21:48:53 1.9
+++ pkgsrc/math/blas/buildlink3.mk 2020/10/12 21:51:57 1.10
@@ -1,15 +1,13 @@ @@ -1,15 +1,13 @@
1# $NetBSD: buildlink3.mk,v 1.9 2020/02/28 21:48:53 plunky Exp $ 1# $NetBSD: buildlink3.mk,v 1.10 2020/10/12 21:51:57 bacon Exp $
2 2
3BUILDLINK_TREE+= blas 3BUILDLINK_TREE+= blas
4 4
5.if !defined(BLAS_BUILDLINK3_MK) 5.if !defined(BLAS_BUILDLINK3_MK)
6BLAS_BUILDLINK3_MK:= 6BLAS_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.blas+= blas>=1.0nb2 8BUILDLINK_API_DEPENDS.blas+= blas>=3.9.0
9BUILDLINK_ABI_DEPENDS.blas+= blas>=1.0nb3 9BUILDLINK_ABI_DEPENDS.blas+= blas>=3.9.0nb1
10BUILDLINK_PKGSRCDIR.blas?= ../../math/blas 10BUILDLINK_PKGSRCDIR.blas?= ../../math/blas
11 
12BLAS_LIBS= -lblas 
13.endif # BLAS_BUILDLINK3_MK 11.endif # BLAS_BUILDLINK3_MK
14 12
15BUILDLINK_TREE+= -blas 13BUILDLINK_TREE+= -blas
cvs diff -r1.2 -r1.3 pkgsrc/math/harmgen/Makefile (expand / switch to unified diff)

--- pkgsrc/math/harmgen/Makefile 2020/08/18 17:58:05 1.2
+++ pkgsrc/math/harmgen/Makefile 2020/10/12 21:52:02 1.3
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.2 2020/08/18 17:58:05 leot Exp $ 1# $NetBSD: Makefile,v 1.3 2020/10/12 21:52:02 bacon Exp $
2 2
3DISTNAME= harmgen-3.1.3 3DISTNAME= harmgen-3.1.3
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= math 5CATEGORIES= math
6MASTER_SITES= https://flaterco.com/files/xtide/ 6MASTER_SITES= https://flaterco.com/files/xtide/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://flaterco.com/ 10HOMEPAGE= https://flaterco.com/
11COMMENT= Program to derive harmonic constants from water level observations 11COMMENT= Program to derive harmonic constants from water level observations
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15USE_TOOLS= bash gmake gsed 15USE_TOOLS= bash gmake gsed
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
cvs diff -r1.4 -r1.5 pkgsrc/math/harminv/Makefile (expand / switch to unified diff)

--- pkgsrc/math/harminv/Makefile 2019/11/02 16:16:19 1.4
+++ pkgsrc/math/harminv/Makefile 2020/10/12 21:52:02 1.5
@@ -1,25 +1,24 @@ @@ -1,25 +1,24 @@
1# $NetBSD: Makefile,v 1.4 2019/11/02 16:16:19 rillig Exp $ 1# $NetBSD: Makefile,v 1.5 2020/10/12 21:52:02 bacon Exp $
2 2
3DISTNAME= harminv-1.3.1 3DISTNAME= harminv-1.3.1
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= math 5CATEGORIES= math
6MASTER_SITES= http://ab-initio.mit.edu/harminv/ 6MASTER_SITES= http://ab-initio.mit.edu/harminv/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://ab-initio.mit.edu/wiki/index.php/Harminv 9HOMEPAGE= http://ab-initio.mit.edu/wiki/index.php/Harminv
10COMMENT= Solver of harmonic inversion 10COMMENT= Solver of harmonic inversion
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
16USE_LANGUAGES= c c++ fortran77 16USE_LANGUAGES= c c++ fortran77
17 17
18PKGCONFIG_OVERRIDE+= harminv.pc.in 18PKGCONFIG_OVERRIDE+= harminv.pc.in
19 19
20TEST_TARGET= check 20TEST_TARGET= check
21 21
22.include "../../math/blas/buildlink3.mk" 22.include "../../mk/blas.buildlink3.mk"
23.include "../../math/lapack/buildlink3.mk" 
24.include "../../math/mpcomplex/buildlink3.mk" 23.include "../../math/mpcomplex/buildlink3.mk"
25.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/math/ipopt/Makefile (expand / switch to unified diff)

--- pkgsrc/math/ipopt/Makefile 2018/07/18 00:06:21 1.2
+++ pkgsrc/math/ipopt/Makefile 2020/10/12 21:51:57 1.3
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile,v 1.2 2018/07/18 00:06:21 joerg Exp $ 1# $NetBSD: Makefile,v 1.3 2020/10/12 21:51:57 bacon Exp $
2 2
3DISTNAME= Ipopt-3.11.5 3DISTNAME= Ipopt-3.11.5
 4PKGREVISION= 1
4CATEGORIES= math 5CATEGORIES= math
5MASTER_SITES= http://www.coin-or.org/download/source/Ipopt/ 6MASTER_SITES= http://www.coin-or.org/download/source/Ipopt/
6EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
7 8
8MAINTAINER= asau@inbox.ru 9MAINTAINER= asau@inbox.ru
9HOMEPAGE= https://projects.coin-or.org/Ipopt 10HOMEPAGE= https://projects.coin-or.org/Ipopt
10COMMENT= Interior Point OPTimizer 11COMMENT= Interior Point OPTimizer
11 12
12USE_LANGUAGES= c c++03 fortran 13USE_LANGUAGES= c c++03 fortran
13GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
14USE_LIBTOOL= yes 15USE_LIBTOOL= yes
15USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
16 17
17TEST_TARGET= test 18TEST_TARGET= test
18 19
19.include "../../math/blas/buildlink3.mk" 20.include "../../mk/blas.buildlink3.mk"
20.include "../../math/lapack/buildlink3.mk" 
21.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/math/ipopt/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/math/ipopt/buildlink3.mk 2013/11/14 15:04:12 1.1.1.1
+++ pkgsrc/math/ipopt/buildlink3.mk 2020/10/12 21:51:57 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: buildlink3.mk,v 1.1.1.1 2013/11/14 15:04:12 asau Exp $ 1# $NetBSD: buildlink3.mk,v 1.2 2020/10/12 21:51:57 bacon Exp $
2 2
3BUILDLINK_TREE+= Ipopt 3BUILDLINK_TREE+= Ipopt
4 4
5.if !defined(IPOPT_BUILDLINK3_MK) 5.if !defined(IPOPT_BUILDLINK3_MK)
6IPOPT_BUILDLINK3_MK:= 6IPOPT_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.Ipopt+= Ipopt>=3.11.5 8BUILDLINK_API_DEPENDS.Ipopt+= Ipopt>=3.11.5
 9BUILDLINK_ABI_DEPENDS.Ipopt?= Ipopt>=3.11.5nb1
9BUILDLINK_PKGSRCDIR.Ipopt?= ../../math/ipopt 10BUILDLINK_PKGSRCDIR.Ipopt?= ../../math/ipopt
10 11
11.include "../../math/blas/buildlink3.mk" 12.include "../../mk/blas.buildlink3.mk"
12.include "../../math/lapack/buildlink3.mk" 
13.endif # IPOPT_BUILDLINK3_MK 13.endif # IPOPT_BUILDLINK3_MK
14 14
15BUILDLINK_TREE+= -Ipopt 15BUILDLINK_TREE+= -Ipopt
cvs diff -r1.5 -r1.6 pkgsrc/math/itpp/Makefile (expand / switch to unified diff)

--- pkgsrc/math/itpp/Makefile 2017/08/16 20:21:11 1.5
+++ pkgsrc/math/itpp/Makefile 2020/10/12 21:52:02 1.6
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: Makefile,v 1.5 2017/08/16 20:21:11 wiz Exp $ 1# $NetBSD: Makefile,v 1.6 2020/10/12 21:52:02 bacon Exp $
2 2
3DISTNAME= itpp-4.0.7 3DISTNAME= itpp-4.0.7
 4PKGREVISION= 1
4CATEGORIES= math 5CATEGORIES= math
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=itpp/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=itpp/}
6 7
7MAINTAINER= agc@NetBSD.org 8MAINTAINER= agc@NetBSD.org
8HOMEPAGE= https://sourceforge.net/projects/itpp/ 9HOMEPAGE= https://sourceforge.net/projects/itpp/
9COMMENT= Library of mathematical, signal processing and communication routines 10COMMENT= Library of mathematical, signal processing and communication routines
10LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
11 12
12GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
13USE_LIBTOOL= yes 14USE_LIBTOOL= yes
14USE_TOOLS= gmake 15USE_TOOLS= gmake
15 16
16USE_LANGUAGES+= c c++ fortran77 17USE_LANGUAGES+= c c++ fortran77
17 18
18.include "../../math/blas/buildlink3.mk" 19.include "../../mk/blas.buildlink3.mk"
19.include "../../math/fftw/buildlink3.mk" 20.include "../../math/fftw/buildlink3.mk"
20.include "../../math/lapack/buildlink3.mk" 
21 21
22.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/math/lapack/DESCR (expand / switch to unified diff)

--- pkgsrc/math/lapack/DESCR 2001/11/01 00:12:32 1.1
+++ pkgsrc/math/lapack/DESCR 2020/10/12 21:51:57 1.2
@@ -1,10 +1,22 @@ @@ -1,10 +1,22 @@
 1The BLAS (Basic Linear Algebra Subprograms) are high quality "building
 2block" routines for performing basic vector and matrix
 3operations. Level 1 BLAS do vector-vector operations, Level 2 BLAS do
 4matrix-vector operations, and Level 3 BLAS do matrix-matrix
 5operations. Because the BLAS are efficient, portable, and widely
 6available, they're commonly used in the development of high quality
 7linear algebra software, LINPACK and LAPACK for example.
 8
1LAPACK is a highly portable Fortran 77 library which provides routines 9LAPACK is a highly portable Fortran 77 library which provides routines
2for solving systems of simultaneous linear equations, least-squares 10for solving systems of simultaneous linear equations, least-squares
3solutions of linear systems of equations, eigenvalue problems, and 11solutions of linear systems of equations, eigenvalue problems, and
4singular value problems. The associated matrix factorizations (LU, 12singular value problems. The associated matrix factorizations (LU,
5Cholesky, QR, SVD, Schur, generalized Schur) are also provided, as are 13Cholesky, QR, SVD, Schur, generalized Schur) are also provided, as are
6related computations such as reordering of the Schur factorizations 14related computations such as reordering of the Schur factorizations
7and estimating condition numbers. Dense and banded matrices are 15and estimating condition numbers. Dense and banded matrices are
8handled, but not general sparse matrices. In all areas, similar 16handled, but not general sparse matrices. In all areas, similar
9functionality is provided for real and complex matrices, in both 17functionality is provided for real and complex matrices, in both
10single and double precision. 18single and double precision.
 19
 20This package contains the Fortran 77 reference implementation of BLAS
 21and LAPACK from Netlib. The C wrappers CBLAS and LAPACKE are provided
 22in separate packages.
cvs diff -r1.40 -r1.41 pkgsrc/math/lapack/Makefile (expand / switch to unified diff)

--- pkgsrc/math/lapack/Makefile 2020/02/28 21:48:53 1.40
+++ pkgsrc/math/lapack/Makefile 2020/10/12 21:51:57 1.41
@@ -1,13 +1,19 @@ @@ -1,13 +1,19 @@
1# $NetBSD: Makefile,v 1.40 2020/02/28 21:48:53 plunky Exp $ 1# $NetBSD: Makefile,v 1.41 2020/10/12 21:51:57 bacon Exp $
2 2
3.include "Makefile.common" 3MAINTAINER= thomas.orgis@uni-hamburg.de
 4COMMENT= Linear Algebra PACKage (Netlib reference implementation)
 5PKGREVISION= 1
4 6
5COMMENT= Linear Algebra PACKage 7LAPACK_COMPONENT= lapack
6 8LAPACK_COMPONENT_CMAKE_ARGS= \
7# use external blas 9 -DUSE_OPTIMIZED_BLAS=ON \
8CMAKE_ARGS+= -DBLAS_LIBRARIES:STRING=${BLAS_LIBS} 10 -DBLAS_LIBRARIES=${BLAS_LIBS:Q} \
9 11 -DUSE_OPTIMIZED_LAPACK=OFF \
10BUILD_TARGET= lapack 12 -DCBLAS=OFF -DLAPACKE=OFF -DLAPACK=ON
11 13
 14# This always uses Netlib BLAS. Other optimized BLAS packages bring
 15# their own LAPACK, hence cblas and lapacke packages use
 16# mk/blas.buildlink3.mk instead.
12.include "../../math/blas/buildlink3.mk" 17.include "../../math/blas/buildlink3.mk"
 18.include "../../math/lapack/Makefile.common"
13.include "../../mk/bsd.pkg.mk" 19.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/math/lapack/Makefile.common (expand / switch to unified diff)

--- pkgsrc/math/lapack/Makefile.common 2020/02/28 21:48:53 1.11
+++ pkgsrc/math/lapack/Makefile.common 2020/10/12 21:51:57 1.12
@@ -1,46 +1,43 @@ @@ -1,46 +1,43 @@
1# $NetBSD: Makefile.common,v 1.11 2020/02/28 21:48:53 plunky Exp $ 1# $NetBSD: Makefile.common,v 1.12 2020/10/12 21:51:57 bacon Exp $
2# used by math/blas/Makefile 2# used by math/blas/Makefile
 3# used by math/cblas/Makefile
 4# used by math/lapacke/Makefile
3# used by math/lapack/Makefile 5# used by math/lapack/Makefile
4 6
5DISTNAME= lapack-3.9.0 7# Common Makefile for packages derived from the Netlib BLAS/LAPACK sources.
 8# Package Makefile sets LAPACK_COMPONENT and LAPACK_COMPONENT_CMAKE_ARGS to
 9# choose the library to install.
 10# LAPACK_COMPONENT can be "lapack", "lapacke", or "cblas"
 11
 12DISTNAME= lapack-${NETLIB_BLAS_VERSION}
 13PKGNAME= ${LAPACK_COMPONENT}-${NETLIB_BLAS_VERSION}
6CATEGORIES= math 14CATEGORIES= math
7MASTER_SITES= ${MASTER_SITE_NETLIB:=lapack/} 15MASTER_SITES= ${MASTER_SITE_GITHUB:=Reference-LAPACK/}
8EXTRACT_SUFX= .tgz 16GITHUB_PROJECT= lapack
 17GITHUB_TAG= v${NETLIB_BLAS_VERSION}
9 18
10MAINTAINER= adam@NetBSD.org 
11HOMEPAGE= https://www.netlib.org/lapack/ 19HOMEPAGE= https://www.netlib.org/lapack/
12LICENSE= modified-bsd 20LICENSE= modified-bsd
13 21
14DISTINFO_FILE= ${.CURDIR}/../../math/lapack/distinfo 22# All parts are in the same section
15PATCHDIR= ${.CURDIR}/../../math/lapack/patches 23PATCHDIR= ${.CURDIR}/../../math/lapack/patches
 24DISTINFO_FILE= ${.CURDIR}/../../math/lapack/distinfo
16 25
17USE_LANGUAGES= c fortran 26USE_LANGUAGES= c fortran
18USE_CMAKE= yes 27USE_CMAKE= yes
19 28
20OBJDIR= obj 29WRKSRC= ${WRKDIR}/${DISTNAME}
21 30CONFIGURE_DIRS= build
22CONFIGURE_DIRS= ${OBJDIR} 31CMAKE_ARG_PATH= ${WRKSRC}
23CMAKE_ARG_PATH= .. 32
24CMAKE_ARGS+= -DBUILD_SHARED_LIBS:BOOL=ON 33# Note: We patch the build to install both static and
25CMAKE_ARGS+= -DBUILD_DEPRECATED:BOOL=ON 34# shared libraries.
26CMAKE_ARGS+= -DBUILD_TESTING:BOOL=ON 35CMAKE_ARGS= -DBUILD_DEPRECATED=ON \
27 36 -DBUILD_SHARED_LIBS=ON \
28TEST_TARGET= all test 37 -DBUILD_STATIC_LIBS=ON \
29TEST_ENV= LD_LIBRARY_PATH=${WRKSRC}/${OBJDIR}/lib 38 ${LAPACK_COMPONENT_CMAKE_ARGS}
30 
31pre-configure: 
32 cd ${WRKSRC} && ${MKDIR} ${OBJDIR} 
33 
34do-install: 
35 cd ${WRKSRC}/${OBJDIR} && \ 
36 ${PKGSRC_SETENV} ${INSTALL_ENV} ${MAKE_ENV} \ 
37 ${CMAKE} -DCMAKE_INSTALL_COMPONENT=RuntimeLibraries \ 
38 -P cmake_install.cmake 
39 
40INSTALLATION_DIRS= lib 
41 39
42# blas fails using the gold linker with: 40.include "../../math/lapack/version.mk"
43# fatal error: --sysroot=: must take a non-empty argument 
44# Work around it on DragonFly by specifying the classic gnu linker 
45 41
46MAKE_ENV.DragonFly+= LDVER=ld.bfd 42post-extract:
 43 ${RUN} ${MKDIR} ${WRKSRC}/build
cvs diff -r1.4 -r1.5 pkgsrc/math/lapack/PLIST (expand / switch to unified diff)

--- pkgsrc/math/lapack/PLIST 2020/02/28 21:48:53 1.4
+++ pkgsrc/math/lapack/PLIST 2020/10/12 21:51:57 1.5
@@ -1,4 +1,10 @@ @@ -1,4 +1,10 @@
1@comment $NetBSD: PLIST,v 1.4 2020/02/28 21:48:53 plunky Exp $ 1@comment $NetBSD: PLIST,v 1.5 2020/10/12 21:51:57 bacon Exp $
 2lib/cmake/lapack-${PKGVERSION}/lapack-config-version.cmake
 3lib/cmake/lapack-${PKGVERSION}/lapack-config.cmake
 4lib/cmake/lapack-${PKGVERSION}/lapack-targets-release.cmake
 5lib/cmake/lapack-${PKGVERSION}/lapack-targets.cmake
 6lib/liblapack.a
2lib/liblapack.so 7lib/liblapack.so
3lib/liblapack.so.3 8lib/liblapack.so.3
4lib/liblapack.so.${PKGVERSION} 9lib/liblapack.so.${PKGVERSION}
 10lib/pkgconfig/lapack.pc
cvs diff -r1.9 -r1.10 pkgsrc/math/lapack/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/math/lapack/buildlink3.mk 2009/03/20 19:24:57 1.9
+++ pkgsrc/math/lapack/buildlink3.mk 2020/10/12 21:51:57 1.10
@@ -1,13 +1,16 @@ @@ -1,13 +1,16 @@
1# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:57 joerg Exp $ 1# $NetBSD: buildlink3.mk,v 1.10 2020/10/12 21:51:57 bacon Exp $
2 2
3BUILDLINK_TREE+= lapack 3BUILDLINK_TREE+= lapack
4 4
5.if !defined(LAPACK_BUILDLINK3_MK) 5.if !defined(LAPACK_BUILDLINK3_MK)
6LAPACK_BUILDLINK3_MK:= 6LAPACK_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.lapack+= lapack>=3.1.1 8BUILDLINK_API_DEPENDS.lapack+= lapack>=3.9.0
9BUILDLINK_ABI_DEPENDS.lapack+= lapack>=3.1.1 9BUILDLINK_ABI_DEPENDS.lapack+= lapack>=3.9.0nb1
10BUILDLINK_PKGSRCDIR.lapack?= ../../math/lapack 10BUILDLINK_PKGSRCDIR.lapack?= ../../math/lapack
 11
 12.include "../../math/blas/buildlink3.mk"
 13
11.endif # LAPACK_BUILDLINK3_MK 14.endif # LAPACK_BUILDLINK3_MK
12 15
13BUILDLINK_TREE+= -lapack 16BUILDLINK_TREE+= -lapack
cvs diff -r1.22 -r1.23 pkgsrc/math/lapack/distinfo (expand / switch to unified diff)

--- pkgsrc/math/lapack/distinfo 2020/02/28 21:48:53 1.22
+++ pkgsrc/math/lapack/distinfo 2020/10/12 21:51:57 1.23
@@ -1,8 +1,14 @@ @@ -1,8 +1,14 @@
1$NetBSD: distinfo,v 1.22 2020/02/28 21:48:53 plunky Exp $ 1$NetBSD: distinfo,v 1.23 2020/10/12 21:51:57 bacon Exp $
2 2
3SHA1 (lapack-3.9.0.tgz) = 9da5f17521260e9f0cfefd9dfc5616d9ef10efb0 3SHA1 (lapack-3.9.0.tar.gz) = 0451d180eed2b12b94aaae77e772d7573e87bec4
4RMD160 (lapack-3.9.0.tgz) = 136c181f31fd056956a96cec723ceb5a4fdf3feb 4RMD160 (lapack-3.9.0.tar.gz) = 333bf17b3e2503c26cdd2139566fdc788be1d0c3
5SHA512 (lapack-3.9.0.tgz) = 90c2c8372c2567b15c25653ed64e7c86a2cb0f1dda116f33716c6877490415210217af5badb67cb50e9d428f56ff83d33a3dad60b6ed7d31919164f6e7e98e0f 5SHA512 (lapack-3.9.0.tar.gz) = 424956ad941a60a4b71e0d451ad48db12a692f8a71a90f3ca7f71d6ecc1922f392746ea84df1c47a46577ed2db32e9e47ec44ad248207c5ac7da179becb712ef
6Size (lapack-3.9.0.tgz) = 9347104 bytes 6Size (lapack-3.9.0.tar.gz) = 7534567 bytes
7SHA1 (patch-TESTING_MATGEN_CMakeLists.txt) = 695655299ccc48eec4c38c75d50144b3a13ee8db 7SHA1 (patch-BLAS_SRC_CMakeLists.txt) = c8c69e6e0c67337af999863c4f5c64618d1374d7
8SHA1 (patch-TESTING_dbal.in) = 3a6a726b6504a07fb1c0908a3893ea46aca670ea 8SHA1 (patch-CBLAS_cblas.pc.in) = 3befb18c1b7f2f82c6da83ea10f913c817acf09f
 9SHA1 (patch-CBLAS_src_CMakeLists.txt) = faa1ad6c322830cb62e0f5bdab33732c0372cce3
 10SHA1 (patch-CMakeLists.txt) = ea2bec54dd2c283a96862ef760826bf6e633613e
 11SHA1 (patch-LAPACKE_CMakeLists.txt) = b5d4fb36550e1ae47e7e68ffec0e10afa3ac8864
 12SHA1 (patch-LAPACKE_lapacke.pc.in) = 7f0d91aaceac7f9980650ec90dbda95cf09b768f
 13SHA1 (patch-SRC_CMakeLists.txt) = 2908cdeb0d94f51ec16b02b8a6426dd6cde7e10f
 14SHA1 (patch-TESTING_MATGEN_CMakeLists.txt) = 84d4cde8fef49c6efc9f50a3219b0299375934d5
File Added: pkgsrc/math/lapack/version.mk
# $NetBSD: version.mk,v 1.1 2020/10/12 21:51:57 bacon Exp $

NETLIB_BLAS_VERSION=	3.9.0
File Added: pkgsrc/math/lapack/patches/patch-BLAS_SRC_CMakeLists.txt
$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()
File Added: pkgsrc/math/lapack/patches/patch-CBLAS_cblas.pc.in
$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
File Added: pkgsrc/math/lapack/patches/patch-CBLAS_src_CMakeLists.txt
$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
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
+    $<INSTALL_INTERFACE:include>
+  )
+  target_link_libraries(cblas_static PRIVATE ${BLAS_LIBRARIES})
+  lapack_install_library(cblas_static)
+endif()
File Added: pkgsrc/math/lapack/patches/patch-CMakeLists.txt
$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()
+
File Added: pkgsrc/math/lapack/patches/patch-LAPACKE_CMakeLists.txt
$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
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
+    $<INSTALL_INTERFACE:include>
+  )
+
+  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
+#  )
+
File Added: pkgsrc/math/lapack/patches/patch-LAPACKE_lapacke.pc.in
$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
File Added: pkgsrc/math/lapack/patches/patch-SRC_CMakeLists.txt
$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()
cvs diff -r1.1 -r1.2 pkgsrc/math/lapack/patches/patch-TESTING_MATGEN_CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/math/lapack/patches/patch-TESTING_MATGEN_CMakeLists.txt 2020/02/28 21:48:54 1.1
+++ pkgsrc/math/lapack/patches/patch-TESTING_MATGEN_CMakeLists.txt 2020/10/12 21:51:57 1.2
@@ -1,12 +1,19 @@ @@ -1,12 +1,19 @@
1$NetBSD: patch-TESTING_MATGEN_CMakeLists.txt,v 1.1 2020/02/28 21:48:54 plunky Exp $ 1$NetBSD: patch-TESTING_MATGEN_CMakeLists.txt,v 1.2 2020/10/12 21:51:57 bacon Exp $
2 2
3we don't actually want to install the testing matrix generator lib 3Support combined build of shared and static libraries.
4 4
5--- TESTING/MATGEN/CMakeLists.txt.orig 2020-02-20 13:46:28.024672825 +0000 5--- TESTING/MATGEN/CMakeLists.txt.orig 2017-11-13 04:15:54.000000000 +0000
6+++ TESTING/MATGEN/CMakeLists.txt 6+++ TESTING/MATGEN/CMakeLists.txt
7@@ -49,4 +49,4 @@ list(REMOVE_DUPLICATES SOURCES) 7@@ -50,3 +50,12 @@ list(REMOVE_DUPLICATES SOURCES)
8  
9 add_library(tmglib ${SOURCES}) 8 add_library(tmglib ${SOURCES})
10 target_link_libraries(tmglib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES}) 9 target_link_libraries(tmglib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
11-lapack_install_library(tmglib) 10 lapack_install_library(tmglib)
12+#lapack_install_library(tmglib) 11+if(BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS)
 12+ add_library(tmglib_static STATIC ${SOURCES})
 13+ set_target_properties(
 14+ tmglib_static PROPERTIES
 15+ OUTPUT_NAME tmglib
 16+ )
 17+ target_link_libraries(tmglib_static ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
 18+ lapack_install_library(tmglib_static)
 19+endif()
File Deleted: pkgsrc/math/lapack/patches/Attic/patch-TESTING_dbal.in
cvs diff -r1.209 -r1.210 pkgsrc/math/octave/Makefile (expand / switch to unified diff)

--- pkgsrc/math/octave/Makefile 2020/08/31 18:10:12 1.209
+++ pkgsrc/math/octave/Makefile 2020/10/12 21:51:58 1.210
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.209 2020/08/31 18:10:12 wiz Exp $ 1# $NetBSD: Makefile,v 1.210 2020/10/12 21:51:58 bacon Exp $
2 2
3DISTNAME= octave-5.2.0 3DISTNAME= octave-5.2.0
4PKGREVISION= 6 4PKGREVISION= 7
5CATEGORIES= math 5CATEGORIES= math
6MASTER_SITES= ${MASTER_SITE_GNU:=octave/} 6MASTER_SITES= ${MASTER_SITE_GNU:=octave/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= adam@NetBSD.org 9MAINTAINER= adam@NetBSD.org
10HOMEPAGE= https://www.gnu.org/software/octave/ 10HOMEPAGE= https://www.gnu.org/software/octave/
11COMMENT= High-level language, intended for numerical computations 11COMMENT= High-level language, intended for numerical computations
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14# These BUILD_DEPENDS are only needed if we need to rebuild the documentation 14# These BUILD_DEPENDS are only needed if we need to rebuild the documentation
15#BUILD_DEPENDS+= tex-latex-fonts-[0-9]*:../../fonts/tex-latex-fonts 15#BUILD_DEPENDS+= tex-latex-fonts-[0-9]*:../../fonts/tex-latex-fonts
16#BUILD_DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk 16#BUILD_DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk
17#BUILD_DEPENDS+= tex-epsf-[0-9]*:../../print/tex-epsf 17#BUILD_DEPENDS+= tex-epsf-[0-9]*:../../print/tex-epsf
@@ -96,26 +96,25 @@ post-install: @@ -96,26 +96,25 @@ post-install:
96.for f in ${OCTAVE_DOC} 96.for f in ${OCTAVE_DOC}
97 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/octave/${PKGVERSION_NOREV}/doc 97 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/octave/${PKGVERSION_NOREV}/doc
98.endfor 98.endfor
99 ${RM} -f ${DESTDIR}/${PREFIX}/lib/charset.alias 99 ${RM} -f ${DESTDIR}/${PREFIX}/lib/charset.alias
100 100
101.include "../../audio/libsndfile/buildlink3.mk" 101.include "../../audio/libsndfile/buildlink3.mk"
102.include "../../devel/gperf/buildlink3.mk" 102.include "../../devel/gperf/buildlink3.mk"
103.include "../../devel/ncurses/buildlink3.mk" 103.include "../../devel/ncurses/buildlink3.mk"
104.include "../../devel/pcre/buildlink3.mk" 104.include "../../devel/pcre/buildlink3.mk"
105.include "../../devel/readline/buildlink3.mk" 105.include "../../devel/readline/buildlink3.mk"
106.include "../../devel/zlib/buildlink3.mk" 106.include "../../devel/zlib/buildlink3.mk"
107.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 107.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
108.include "../../math/arpack-ng/buildlink3.mk" 108.include "../../math/arpack-ng/buildlink3.mk"
109.include "../../math/blas/buildlink3.mk" 109.include "../../mk/blas.buildlink3.mk"
110.include "../../math/fftw/buildlink3.mk" 110.include "../../math/fftw/buildlink3.mk"
111.include "../../math/fftwf/buildlink3.mk" 111.include "../../math/fftwf/buildlink3.mk"
112.include "../../math/lapack/buildlink3.mk" 
113.include "../../sysutils/desktop-file-utils/desktopdb.mk" 112.include "../../sysutils/desktop-file-utils/desktopdb.mk"
114.include "../../www/curl/buildlink3.mk" 113.include "../../www/curl/buildlink3.mk"
115.include "../../x11/fltk13/buildlink3.mk" 114.include "../../x11/fltk13/buildlink3.mk"
116.if ${OPSYS} != "Darwin" 115.if ${OPSYS} != "Darwin"
117.include "../../x11/libX11/buildlink3.mk" 116.include "../../x11/libX11/buildlink3.mk"
118.endif 117.endif
119.include "../../x11/qt5-qtbase/buildlink3.mk" 118.include "../../x11/qt5-qtbase/buildlink3.mk"
120.include "../../x11/qt5-qttools/buildlink3.mk" 119.include "../../x11/qt5-qttools/buildlink3.mk"
121.include "../../mk/bsd.pkg.mk" 120.include "../../mk/bsd.pkg.mk"
cvs diff -r1.21 -r1.22 pkgsrc/math/octave/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/math/octave/buildlink3.mk 2020/08/18 17:57:29 1.21
+++ pkgsrc/math/octave/buildlink3.mk 2020/10/12 21:51:58 1.22
@@ -1,30 +1,29 @@ @@ -1,30 +1,29 @@
1# $NetBSD: buildlink3.mk,v 1.21 2020/08/18 17:57:29 leot Exp $ 1# $NetBSD: buildlink3.mk,v 1.22 2020/10/12 21:51:58 bacon Exp $
2 2
3BUILDLINK_TREE+= octave 3BUILDLINK_TREE+= octave
4 4
5.if !defined(OCTAVE_BUILDLINK3_MK) 5.if !defined(OCTAVE_BUILDLINK3_MK)
6OCTAVE_BUILDLINK3_MK:= 6OCTAVE_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.octave+= octave>=3.0.0 8BUILDLINK_API_DEPENDS.octave+= octave>=3.0.0
9BUILDLINK_ABI_DEPENDS.octave+= octave>=5.2.0nb5 9BUILDLINK_ABI_DEPENDS.octave+= octave>=5.2.0nb7
10BUILDLINK_PKGSRCDIR.octave?= ../../math/octave 10BUILDLINK_PKGSRCDIR.octave?= ../../math/octave
11 11
12.include "../../mk/bsd.fast.prefs.mk" 12.include "../../mk/bsd.fast.prefs.mk"
13 13
14pkgbase := octave 14pkgbase := octave
15.include "../../mk/pkg-build-options.mk" 15.include "../../mk/pkg-build-options.mk"
16 16
17.if ${PKG_BUILD_OPTIONS.octave:Mhdf5} 17.if ${PKG_BUILD_OPTIONS.octave:Mhdf5}
18. include "../../devel/hdf5/buildlink3.mk" 18. include "../../devel/hdf5/buildlink3.mk"
19.endif 19.endif
20 20
21.include "../../audio/libsndfile/buildlink3.mk" 21.include "../../audio/libsndfile/buildlink3.mk"
22.include "../../devel/readline/buildlink3.mk" 22.include "../../devel/readline/buildlink3.mk"
23.include "../../devel/ncurses/buildlink3.mk" 23.include "../../devel/ncurses/buildlink3.mk"
24.include "../../devel/zlib/buildlink3.mk" 24.include "../../devel/zlib/buildlink3.mk"
25.include "../../math/blas/buildlink3.mk" 25.include "../../mk/blas.buildlink3.mk"
26.include "../../math/fftw/buildlink3.mk" 26.include "../../math/fftw/buildlink3.mk"
27.include "../../math/lapack/buildlink3.mk" 
28.endif # OCTAVE_BUILDLINK3_MK 27.endif # OCTAVE_BUILDLINK3_MK
29 28
30BUILDLINK_TREE+= -octave 29BUILDLINK_TREE+= -octave
cvs diff -r1.67 -r1.68 pkgsrc/math/py-Scientific/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-Scientific/Attic/Makefile 2020/05/22 10:56:21 1.67
+++ pkgsrc/math/py-Scientific/Attic/Makefile 2020/10/12 21:52:02 1.68
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.67 2020/05/22 10:56:21 adam Exp $ 1# $NetBSD: Makefile,v 1.68 2020/10/12 21:52:02 bacon Exp $
2 2
3DISTNAME= ScientificPython-2.8.1 3DISTNAME= ScientificPython-2.8.1
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/Python//} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/Python//}
5PKGREVISION= 17 5PKGREVISION= 18
6CATEGORIES= math python 6CATEGORIES= math python
7MASTER_SITES= http://sourcesup.cru.fr/frs/download.php/4411/ 7MASTER_SITES= http://sourcesup.cru.fr/frs/download.php/4411/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://dirac.cnrs-orleans.fr/ScientificPython/ 10HOMEPAGE= http://dirac.cnrs-orleans.fr/ScientificPython/
11COMMENT= Python modules for scientific computing 11COMMENT= Python modules for scientific computing
12LICENSE= cecill-2.1 12LICENSE= cecill-2.1
13 13
14CONFLICTS+= py-Scientific-[0-9]* 14CONFLICTS+= py-Scientific-[0-9]*
15 15
16MAKE_ENV+= NETCDF_PREFIX=${BUILDLINK_PREFIX.netcdf} 16MAKE_ENV+= NETCDF_PREFIX=${BUILDLINK_PREFIX.netcdf}
17 17
18PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 2.8.1 18PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 2.8.1
cvs diff -r1.5 -r1.6 pkgsrc/math/py-Theano/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-Theano/Makefile 2019/06/15 18:13:14 1.5
+++ pkgsrc/math/py-Theano/Makefile 2020/10/12 21:52:02 1.6
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.5 2019/06/15 18:13:14 adam Exp $ 1# $NetBSD: Makefile,v 1.6 2020/10/12 21:52:02 bacon Exp $
2 2
3DISTNAME= Theano-1.0.4 3DISTNAME= Theano-1.0.4
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= math python 6CATEGORIES= math python
6MASTER_SITES= ${MASTER_SITE_PYPI:=T/Theano/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=T/Theano/}
7 8
8MAINTAINER= jihbed.research@gmail.com 9MAINTAINER= jihbed.research@gmail.com
9HOMEPAGE= http://deeplearning.net/software/theano/ 10HOMEPAGE= http://deeplearning.net/software/theano/
10COMMENT= Optimizing compiler for evaluating mathematical expressions 11COMMENT= Optimizing compiler for evaluating mathematical expressions
11LICENSE= modified-bsd 12LICENSE= modified-bsd
12 13
13DEPENDS+= ${PYPKGPREFIX}-scipy>=0.17.0:../../math/py-scipy 14DEPENDS+= ${PYPKGPREFIX}-scipy>=0.17.0:../../math/py-scipy
14DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six 15DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
15TEST_DEPENDS+= ${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8 16TEST_DEPENDS+= ${PYPKGPREFIX}-flake8-[0-9]*:../../devel/py-flake8
16TEST_DEPENDS+= ${PYPKGPREFIX}-nose>=1.3.0:../../devel/py-nose 17TEST_DEPENDS+= ${PYPKGPREFIX}-nose>=1.3.0:../../devel/py-nose
17TEST_DEPENDS+= ${PYPKGPREFIX}-parameterized-[0-9]*:../../devel/py-parameterized 18TEST_DEPENDS+= ${PYPKGPREFIX}-parameterized-[0-9]*:../../devel/py-parameterized
cvs diff -r1.3 -r1.4 pkgsrc/math/py-autograd/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-autograd/Attic/Makefile 2020/04/27 19:03:26 1.3
+++ pkgsrc/math/py-autograd/Attic/Makefile 2020/10/12 21:52:02 1.4
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.3 2020/04/27 19:03:26 adam Exp $ 1# $NetBSD: Makefile,v 1.4 2020/10/12 21:52:02 bacon Exp $
2 2
3DISTNAME= autograd-1.3 3DISTNAME= autograd-1.3
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= math python 6CATEGORIES= math python
6MASTER_SITES= ${MASTER_SITE_PYPI:=a/autograd/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=a/autograd/}
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/HIPS/autograd 10HOMEPAGE= https://github.com/HIPS/autograd
10COMMENT= Efficiently computes derivatives of numpy code 11COMMENT= Efficiently computes derivatives of numpy code
11LICENSE= mit 12LICENSE= mit
12 13
13DEPENDS+= ${PYPKGPREFIX}-future>=0.15.2:../../devel/py-future 14DEPENDS+= ${PYPKGPREFIX}-future>=0.15.2:../../devel/py-future
14 15
15USE_LANGUAGES= # none 16USE_LANGUAGES= # none
16 17
17.include "../../lang/python/egg.mk" 18.include "../../lang/python/egg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/math/py-bottleneck/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-bottleneck/Makefile 2020/04/27 08:06:41 1.3
+++ pkgsrc/math/py-bottleneck/Makefile 2020/10/12 21:52:02 1.4
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.3 2020/04/27 08:06:41 adam Exp $ 1# $NetBSD: Makefile,v 1.4 2020/10/12 21:52:02 bacon Exp $
2 2
3DISTNAME= Bottleneck-1.3.2 3DISTNAME= Bottleneck-1.3.2
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
 5PKGREVISION= 1
5CATEGORIES= math python 6CATEGORIES= math python
6MASTER_SITES= ${MASTER_SITE_PYPI:=B/Bottleneck/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=B/Bottleneck/}
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/kwgoodman/bottleneck 10HOMEPAGE= https://github.com/kwgoodman/bottleneck
10COMMENT= Collection of fast NumPy array functions written in C 11COMMENT= Collection of fast NumPy array functions written in C
11LICENSE= 2-clause-bsd 12LICENSE= 2-clause-bsd
12 13
13TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner 14TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
14 15
15PYSETUPTESTTARGET= pytest 16PYSETUPTESTTARGET= pytest
16 17
17.include "../../math/py-numpy/buildlink3.mk" 18.include "../../math/py-numpy/buildlink3.mk"
cvs diff -r1.10 -r1.11 pkgsrc/math/py-fftw/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-fftw/Attic/Makefile 2019/11/02 16:16:21 1.10
+++ pkgsrc/math/py-fftw/Attic/Makefile 2020/10/12 21:52:02 1.11
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.10 2019/11/02 16:16:21 rillig Exp $ 1# $NetBSD: Makefile,v 1.11 2020/10/12 21:52:02 bacon Exp $
2 2
3DISTNAME= PyFFTW3-0.2.1 3DISTNAME= PyFFTW3-0.2.1
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/Py//S/FFTW/fftw/S/3//} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/Py//S/FFTW/fftw/S/3//}
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= math 6CATEGORIES= math
7MASTER_SITES= ${MASTER_SITE_PYPI:=P/PyFFTW3/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=P/PyFFTW3/}
8 8
9MAINTAINER= jihbed.research@gmail.com 9MAINTAINER= jihbed.research@gmail.com
10HOMEPAGE= https://pypi.python.org/pypi/PyFFTW3 10HOMEPAGE= https://pypi.python.org/pypi/PyFFTW3
11COMMENT= Python bindings to the FFTW3 C-library 11COMMENT= Python bindings to the FFTW3 C-library
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14USE_LANGUAGES= c 14USE_LANGUAGES= c
15 15
16PYTHON_VERSIONS_ACCEPTED= 27 # as of 0.2.1 16PYTHON_VERSIONS_ACCEPTED= 27 # as of 0.2.1
17 17
18MAKE_ENV+= FFTW_PATH=${PREFIX}/lib 18MAKE_ENV+= FFTW_PATH=${PREFIX}/lib
cvs diff -r1.8 -r1.9 pkgsrc/math/py-netCDF4/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-netCDF4/Makefile 2020/07/01 15:59:40 1.8
+++ pkgsrc/math/py-netCDF4/Makefile 2020/10/12 21:52:03 1.9
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.8 2020/07/01 15:59:40 adam Exp $ 1# $NetBSD: Makefile,v 1.9 2020/10/12 21:52:03 bacon Exp $
2 2
3DISTNAME= netCDF4-1.5.3 3DISTNAME= netCDF4-1.5.3
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= math python 6CATEGORIES= math python
6MASTER_SITES= ${MASTER_SITE_PYPI:=n/netCDF4/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=n/netCDF4/}
7 8
8MAINTAINER= jihbed.research@gmail.com 9MAINTAINER= jihbed.research@gmail.com
9HOMEPAGE= https://github.com/Unidata/netcdf4-python 10HOMEPAGE= https://github.com/Unidata/netcdf4-python
10COMMENT= Object-oriented python interface to netCDF version 4 11COMMENT= Object-oriented python interface to netCDF version 4
11LICENSE= mit 12LICENSE= mit
12 13
13DEPENDS+= ${PYPKGPREFIX}-cftime-[0-9]*:../../time/py-cftime 14DEPENDS+= ${PYPKGPREFIX}-cftime-[0-9]*:../../time/py-cftime
14 15
15USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
16 17
17SUBST_CLASSES+= paths 18SUBST_CLASSES+= paths
cvs diff -r1.22 -r1.23 pkgsrc/math/py-numba/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-numba/Makefile 2020/10/02 08:34:39 1.22
+++ pkgsrc/math/py-numba/Makefile 2020/10/12 21:52:03 1.23
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.22 2020/10/02 08:34:39 adam Exp $ 1# $NetBSD: Makefile,v 1.23 2020/10/12 21:52:03 bacon Exp $
2 2
3DISTNAME= numba-0.51.2 3DISTNAME= numba-0.51.2
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= math python 6CATEGORIES= math python
6MASTER_SITES= ${MASTER_SITE_PYPI:=n/numba/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=n/numba/}
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://numba.pydata.org/ 10HOMEPAGE= https://numba.pydata.org/
10COMMENT= NumPy aware dynamic Python compiler using LLVM 11COMMENT= NumPy aware dynamic Python compiler using LLVM
11LICENSE= 2-clause-bsd 12LICENSE= 2-clause-bsd
12 13
13DEPENDS+= ${PYPKGPREFIX}-llvmlite>=0.33.0:../../devel/py-llvmlite 14DEPENDS+= ${PYPKGPREFIX}-llvmlite>=0.33.0:../../devel/py-llvmlite
14DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools 15DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
15 16
16USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
17 18
cvs diff -r1.17 -r1.18 pkgsrc/math/py-numexpr/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-numexpr/Makefile 2020/04/28 13:21:33 1.17
+++ pkgsrc/math/py-numexpr/Makefile 2020/10/12 21:52:03 1.18
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.17 2020/04/28 13:21:33 adam Exp $ 1# $NetBSD: Makefile,v 1.18 2020/10/12 21:52:03 bacon Exp $
2 2
3DISTNAME= numexpr-2.7.1 3DISTNAME= numexpr-2.7.1
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= math python 6CATEGORIES= math python
6MASTER_SITES= ${MASTER_SITE_PYPI:=n/numexpr/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=n/numexpr/}
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/pydata/numexpr 10HOMEPAGE= https://github.com/pydata/numexpr
10COMMENT= Numerical expression evaluator for NumPy 11COMMENT= Numerical expression evaluator for NumPy
11LICENSE= mit 12LICENSE= mit
12 13
13USE_LANGUAGES= c++ 14USE_LANGUAGES= c++
14REPLACE_PYTHON= numexpr/cpuinfo.py 15REPLACE_PYTHON= numexpr/cpuinfo.py
15 16
16do-test: 17do-test:
17 ${PYTHONBIN} -c "import numexpr; numexpr.test()" 18 ${PYTHONBIN} -c "import numexpr; numexpr.test()"
cvs diff -r1.70 -r1.71 pkgsrc/math/py-numpy/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-numpy/Makefile 2020/10/02 07:44:15 1.70
+++ pkgsrc/math/py-numpy/Makefile 2020/10/12 21:51:58 1.71
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.70 2020/10/02 07:44:15 adam Exp $ 1# $NetBSD: Makefile,v 1.71 2020/10/12 21:51:58 bacon Exp $
2 2
3DISTNAME= numpy-1.19.2 3DISTNAME= numpy-1.19.2
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= math python 6CATEGORIES= math python
6MASTER_SITES= ${MASTER_SITE_PYPI:=n/numpy/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=n/numpy/}
7EXTRACT_SUFX= .zip 8EXTRACT_SUFX= .zip
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.numpy.org/ 11HOMEPAGE= http://www.numpy.org/
11COMMENT= Array processing for numbers, strings, records, and objects 12COMMENT= Array processing for numbers, strings, records, and objects
12LICENSE= modified-bsd 13LICENSE= modified-bsd
13 14
14TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis 15TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis
15TEST_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose 16TEST_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
16TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test 17TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
17 18
@@ -45,19 +46,19 @@ LDFLAGS+= ${_COMPILER_ABI_FLAG.${ABI}} @@ -45,19 +46,19 @@ LDFLAGS+= ${_COMPILER_ABI_FLAG.${ABI}}
45MAKE_ENV.DragonFly+= LDVER=ld.bfd 46MAKE_ENV.DragonFly+= LDVER=ld.bfd
46 47
47post-install: 48post-install:
48 cd ${DESTDIR}${PREFIX}/bin && ${RM} f2py || ${TRUE} 49 cd ${DESTDIR}${PREFIX}/bin && ${RM} f2py || ${TRUE}
49 50
50do-test: 51do-test:
51 cd ${WRKDIR} && \ 52 cd ${WRKDIR} && \
52 ${RUN} PYTHONPATH=${DESTDIR}${PREFIX}/${PYSITELIB} ${PYTHONBIN} -c "import numpy; numpy.test()" 53 ${RUN} PYTHONPATH=${DESTDIR}${PREFIX}/${PYSITELIB} ${PYTHONBIN} -c "import numpy; numpy.test()"
53 54
54BUILDLINK_API_DEPENDS.py-cython+= ${PYPKGPREFIX}-cython>=0.29.21 55BUILDLINK_API_DEPENDS.py-cython+= ${PYPKGPREFIX}-cython>=0.29.21
55.include "../../devel/py-cython/buildlink3.mk" 56.include "../../devel/py-cython/buildlink3.mk"
56.include "../../lang/python/application.mk" 57.include "../../lang/python/application.mk"
57.include "../../lang/python/egg.mk" 58.include "../../lang/python/egg.mk"
 59# Consider allowing mk/blas.buildlink3.mk to handle Accelerate.framework
58.if ${OPSYS} != "Darwin" 60.if ${OPSYS} != "Darwin"
59# blas and lapack are not needed; numpy will use Accelerate.framework 61# blas and lapack are not needed; numpy will use Accelerate.framework
60.include "../../math/blas/buildlink3.mk" 62.include "../../mk/blas.buildlink3.mk"
61.include "../../math/lapack/buildlink3.mk" 
62.endif 63.endif
63.include "../../mk/bsd.pkg.mk" 64.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/math/py-numpy/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/math/py-numpy/buildlink3.mk 2020/04/27 17:00:35 1.5
+++ pkgsrc/math/py-numpy/buildlink3.mk 2020/10/12 21:51:58 1.6
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: buildlink3.mk,v 1.5 2020/04/27 17:00:35 adam Exp $ 1# $NetBSD: buildlink3.mk,v 1.6 2020/10/12 21:51:58 bacon Exp $
2 2
3BUILDLINK_TREE+= py-numpy 3BUILDLINK_TREE+= py-numpy
4 4
5.if !defined(PY_NUMPY_BUILDLINK3_MK) 5.if !defined(PY_NUMPY_BUILDLINK3_MK)
6PY_NUMPY_BUILDLINK3_MK:= 6PY_NUMPY_BUILDLINK3_MK:=
7 7
8.include "../../lang/python/pyversion.mk" 8.include "../../lang/python/pyversion.mk"
9 9
10BUILDLINK_API_DEPENDS.py-numpy+= ${PYPKGPREFIX}-numpy>=1.0 10BUILDLINK_API_DEPENDS.py-numpy+= ${PYPKGPREFIX}-numpy>=1.0
11.if ${_PYTHON_VERSION} == 27 11.if ${_PYTHON_VERSION} == 27
 12BUILDLINK_ABI_DEPENDS.py-numpy?= ${PYPKGPREFIX}-numpy>=1.19.2nb1
12BUILDLINK_PKGSRCDIR.py-numpy?= ../../math/py-numpy16 13BUILDLINK_PKGSRCDIR.py-numpy?= ../../math/py-numpy16
13.else 14.else
14BUILDLINK_PKGSRCDIR.py-numpy?= ../../math/py-numpy 15BUILDLINK_PKGSRCDIR.py-numpy?= ../../math/py-numpy
15.endif 16.endif
16 17
17.include "../../mk/bsd.fast.prefs.mk" 18.include "../../mk/bsd.fast.prefs.mk"
18 19
19.if ${OPSYS} != "Darwin" 20.if ${OPSYS} != "Darwin"
20.include "../../math/blas/buildlink3.mk" 21.include "../../mk/blas.buildlink3.mk"
21.include "../../math/lapack/buildlink3.mk" 
22.endif 22.endif
23.endif # PY_NUMPY_BUILDLINK3_MK 23.endif # PY_NUMPY_BUILDLINK3_MK
24 24
25BUILDLINK_TREE+= -py-numpy 25BUILDLINK_TREE+= -py-numpy
cvs diff -r1.2 -r1.3 pkgsrc/math/py-numpy/patches/Attic/patch-numpy_distutils_system__info.py (expand / switch to unified diff)

--- pkgsrc/math/py-numpy/patches/Attic/patch-numpy_distutils_system__info.py 2020/04/27 17:00:35 1.2
+++ pkgsrc/math/py-numpy/patches/Attic/patch-numpy_distutils_system__info.py 2020/10/12 21:51:58 1.3
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-numpy_distutils_system__info.py,v 1.2 2020/04/27 17:00:35 adam Exp $ 1$NetBSD: patch-numpy_distutils_system__info.py,v 1.3 2020/10/12 21:51:58 bacon Exp $
2 2
3Disable openblas detection. In pkgsrc, py-numpy should use math/blas. 3Disable openblas detection. In pkgsrc, use mk/blas.buildlink.mk.
4 4
5--- numpy/distutils/system_info.py.orig 2020-04-19 08:51:58.000000000 +0000 5--- numpy/distutils/system_info.py.orig 2020-04-19 08:51:58.000000000 +0000
6+++ numpy/distutils/system_info.py 6+++ numpy/distutils/system_info.py
7@@ -1644,14 +1644,6 @@ class lapack_opt_info(system_info): 7@@ -1644,14 +1644,6 @@ class lapack_opt_info(system_info):
8 return False 8 return False
9  9
10 def _calc_info_openblas(self): 10 def _calc_info_openblas(self):
11- info = get_info('openblas_lapack') 11- info = get_info('openblas_lapack')
12- if info: 12- if info:
13- self.set_info(**info) 13- self.set_info(**info)
14- return True 14- return True
15- info = get_info('openblas_clapack') 15- info = get_info('openblas_clapack')
16- if info: 16- if info:
cvs diff -r1.4 -r1.5 pkgsrc/math/py-numpy16/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-numpy16/Makefile 2020/08/05 13:47:43 1.4
+++ pkgsrc/math/py-numpy16/Makefile 2020/10/12 21:52:03 1.5
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.4 2020/08/05 13:47:43 joerg Exp $ 1# $NetBSD: Makefile,v 1.5 2020/10/12 21:52:03 bacon Exp $
2 2
3DISTNAME= numpy-1.16.6 3DISTNAME= numpy-1.16.6
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= math python 6CATEGORIES= math python
6MASTER_SITES= ${MASTER_SITE_PYPI:=n/numpy/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=n/numpy/}
7EXTRACT_SUFX= .zip 8EXTRACT_SUFX= .zip
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.numpy.org/ 11HOMEPAGE= http://www.numpy.org/
11COMMENT= Array processing for numbers, strings, records, and objects 12COMMENT= Array processing for numbers, strings, records, and objects
12LICENSE= modified-bsd 13LICENSE= modified-bsd
13 14
14# While this builds with 3, the package only exists to accomodate 15# While this builds with 3, the package only exists to accomodate
15# things that require python2.7. 16# things that require python2.7.
16PYTHON_VERSIONS_ACCEPTED= 27 17PYTHON_VERSIONS_ACCEPTED= 27
17 18
@@ -48,19 +49,19 @@ MAKE_ENV.DragonFly+= LDVER=ld.bfd @@ -48,19 +49,19 @@ MAKE_ENV.DragonFly+= LDVER=ld.bfd
48 49
49post-install: 50post-install:
50 cd ${DESTDIR}${PREFIX}/bin && ${RM} f2py || ${TRUE} 51 cd ${DESTDIR}${PREFIX}/bin && ${RM} f2py || ${TRUE}
51 52
52do-test: 53do-test:
53 cd ${WRKDIR} && \ 54 cd ${WRKDIR} && \
54 ${RUN} PYTHONPATH=${DESTDIR}${PREFIX}/${PYSITELIB} ${PYTHONBIN} -c "import numpy; numpy.test()" 55 ${RUN} PYTHONPATH=${DESTDIR}${PREFIX}/${PYSITELIB} ${PYTHONBIN} -c "import numpy; numpy.test()"
55 56
56BUILDLINK_API_DEPENDS.py-cython+= ${PYPKGPREFIX}-cython>=0.29.2 57BUILDLINK_API_DEPENDS.py-cython+= ${PYPKGPREFIX}-cython>=0.29.2
57.include "../../devel/py-cython/buildlink3.mk" 58.include "../../devel/py-cython/buildlink3.mk"
58.include "../../lang/python/application.mk" 59.include "../../lang/python/application.mk"
59.include "../../lang/python/egg.mk" 60.include "../../lang/python/egg.mk"
60.include "../../lang/python/versioned_dependencies.mk" 61.include "../../lang/python/versioned_dependencies.mk"
 62# Consider allowing mk/blas.buildlink3.mk to handle Accelerate.framework
61.if ${OPSYS} != "Darwin" 63.if ${OPSYS} != "Darwin"
62# blas and lapack are not needed; numpy will use Accelerate.framework 64# blas and lapack are not needed; numpy will use Accelerate.framework
63.include "../../math/blas/buildlink3.mk" 65.include "../../mk/blas.buildlink3.mk"
64.include "../../math/lapack/buildlink3.mk" 
65.endif 66.endif
66.include "../../mk/bsd.pkg.mk" 67.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/math/py-numpy16/patches/patch-numpy_distutils_system__info.py (expand / switch to unified diff)

--- pkgsrc/math/py-numpy16/patches/patch-numpy_distutils_system__info.py 2020/04/27 16:52:56 1.1
+++ pkgsrc/math/py-numpy16/patches/patch-numpy_distutils_system__info.py 2020/10/12 21:52:03 1.2
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-numpy_distutils_system__info.py,v 1.1 2020/04/27 16:52:56 adam Exp $ 1$NetBSD: patch-numpy_distutils_system__info.py,v 1.2 2020/10/12 21:52:03 bacon Exp $
2 2
3Disable openblas detection. In pkgsrc, py-numpy should use math/blas. 3Disable openblas detection. In pkgsrc, use mk/blas.buildlink.mk.
4 4
5--- numpy/distutils/system_info.py.orig 2018-04-02 21:18:11.535155000 +0000 5--- numpy/distutils/system_info.py.orig 2018-04-02 21:18:11.535155000 +0000
6+++ numpy/distutils/system_info.py 6+++ numpy/distutils/system_info.py
7@@ -1531,12 +1531,12 @@ class lapack_opt_info(system_info): 7@@ -1531,12 +1531,12 @@ class lapack_opt_info(system_info):
8 self.set_info(**lapack_mkl_info) 8 self.set_info(**lapack_mkl_info)
9 return 9 return
10  10
11- openblas_info = get_info('openblas_lapack') 11- openblas_info = get_info('openblas_lapack')
12+ openblas_info = None 12+ openblas_info = None
13 if openblas_info: 13 if openblas_info:
14 self.set_info(**openblas_info) 14 self.set_info(**openblas_info)
15 return 15 return
16  16
cvs diff -r1.30 -r1.31 pkgsrc/math/py-pandas/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-pandas/Makefile 2020/02/14 16:21:55 1.30
+++ pkgsrc/math/py-pandas/Makefile 2020/10/12 21:52:03 1.31
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.30 2020/02/14 16:21:55 minskim Exp $ 1# $NetBSD: Makefile,v 1.31 2020/10/12 21:52:03 bacon Exp $
2 2
3DISTNAME= pandas-0.25.3 3DISTNAME= pandas-0.25.3
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= math graphics python 6CATEGORIES= math graphics python
6MASTER_SITES= ${MASTER_SITE_PYPI:=p/pandas/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=p/pandas/}
7 8
8MAINTAINER= bad@NetBSD.org 9MAINTAINER= bad@NetBSD.org
9HOMEPAGE= https://pandas.pydata.org/ 10HOMEPAGE= https://pandas.pydata.org/
10COMMENT= Python Data Analysis Library 11COMMENT= Python Data Analysis Library
11LICENSE= modified-bsd 12LICENSE= modified-bsd
12 13
13DEPENDS+= ${PYPKGPREFIX}-bottleneck-[0-9]*:../../math/py-bottleneck 14DEPENDS+= ${PYPKGPREFIX}-bottleneck-[0-9]*:../../math/py-bottleneck
14DEPENDS+= ${PYPKGPREFIX}-dateutil>=2.6.1:../../time/py-dateutil 15DEPENDS+= ${PYPKGPREFIX}-dateutil>=2.6.1:../../time/py-dateutil
15DEPENDS+= ${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib 16DEPENDS+= ${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
16DEPENDS+= ${PYPKGPREFIX}-numexpr-[0-9]*:../../math/py-numexpr 17DEPENDS+= ${PYPKGPREFIX}-numexpr-[0-9]*:../../math/py-numexpr
17DEPENDS+= ${PYPKGPREFIX}-pytz>=2017.2:../../time/py-pytz 18DEPENDS+= ${PYPKGPREFIX}-pytz>=2017.2:../../time/py-pytz
cvs diff -r1.4 -r1.5 pkgsrc/math/py-patsy/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-patsy/Makefile 2020/04/27 18:56:16 1.4
+++ pkgsrc/math/py-patsy/Makefile 2020/10/12 21:52:03 1.5
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.4 2020/04/27 18:56:16 adam Exp $ 1# $NetBSD: Makefile,v 1.5 2020/10/12 21:52:03 bacon Exp $
2 2
3DISTNAME= patsy-0.5.1 3DISTNAME= patsy-0.5.1
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= math python 6CATEGORIES= math python
6MASTER_SITES= ${MASTER_SITE_PYPI:=p/patsy/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=p/patsy/}
7 8
8MAINTAINER= jihbed.research@gmail.com 9MAINTAINER= jihbed.research@gmail.com
9HOMEPAGE= https://github.com/pydata/patsy 10HOMEPAGE= https://github.com/pydata/patsy
10COMMENT= Python package for describing statistical models 11COMMENT= Python package for describing statistical models
11LICENSE= 2-clause-bsd 12LICENSE= 2-clause-bsd
12 13
13DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six 14DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
14TEST_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose 15TEST_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
15 16
16USE_LANGUAGES= # none 17USE_LANGUAGES= # none
17 18
cvs diff -r1.2 -r1.3 pkgsrc/math/py-pywavelets/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-pywavelets/Makefile 2019/06/17 14:54:57 1.2
+++ pkgsrc/math/py-pywavelets/Makefile 2020/10/12 21:52:03 1.3
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.2 2019/06/17 14:54:57 adam Exp $ 1# $NetBSD: Makefile,v 1.3 2020/10/12 21:52:03 bacon Exp $
2 2
3DISTNAME= PyWavelets-1.0.3 3DISTNAME= PyWavelets-1.0.3
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
 5PKGREVISION= 1
5CATEGORIES= math python 6CATEGORIES= math python
6MASTER_SITES= ${MASTER_SITE_PYPI:=P/PyWavelets/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=P/PyWavelets/}
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/PyWavelets/pywt/releases 10HOMEPAGE= https://github.com/PyWavelets/pywt/releases
10COMMENT= Discrete Wavelet Transforms in Python 11COMMENT= Discrete Wavelet Transforms in Python
11LICENSE= mit 12LICENSE= mit
12 13
13REPLACE_PYTHON+= pywt/tests/*.py 14REPLACE_PYTHON+= pywt/tests/*.py
14 15
15do-test: 16do-test:
16 ${PYTHONBIN} -c 'import pywt; pywt.test()' 17 ${PYTHONBIN} -c 'import pywt; pywt.test()'
17 18
cvs diff -r1.46 -r1.47 pkgsrc/math/py-rpy/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-rpy/Makefile 2020/08/24 06:40:20 1.46
+++ pkgsrc/math/py-rpy/Makefile 2020/10/12 21:52:03 1.47
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.46 2020/08/24 06:40:20 tnn Exp $ 1# $NetBSD: Makefile,v 1.47 2020/10/12 21:52:03 bacon Exp $
2 2
3DISTNAME= rpy2-2.9.1 3DISTNAME= rpy2-2.9.1
4PKGREVISION= 1 4PKGREVISION= 2
5PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/rpy2/rpy/} 5PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/rpy2/rpy/}
6CATEGORIES= math python 6CATEGORIES= math python
7MASTER_SITES= ${MASTER_SITE_PYPI:=r/rpy2/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=r/rpy2/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://rpy.sourceforge.io/ 10HOMEPAGE= https://rpy.sourceforge.io/
11COMMENT= R interface for Python 11COMMENT= R interface for Python
12LICENSE= mpl-1.1 OR gnu-gpl-v2 OR gnu-lgpl-v2.1 12LICENSE= mpl-1.1 OR gnu-gpl-v2 OR gnu-lgpl-v2.1
13 13
14DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2 14DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
15DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six 15DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
16DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 16DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
17 17
cvs diff -r1.4 -r1.5 pkgsrc/math/py-scikit-image/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-scikit-image/Makefile 2019/06/17 15:03:46 1.4
+++ pkgsrc/math/py-scikit-image/Makefile 2020/10/12 21:52:04 1.5
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.4 2019/06/17 15:03:46 adam Exp $ 1# $NetBSD: Makefile,v 1.5 2020/10/12 21:52:04 bacon Exp $
2 2
3DISTNAME= scikit-image-0.15.0 3DISTNAME= scikit-image-0.15.0
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= graphics python 6CATEGORIES= graphics python
6MASTER_SITES= ${MASTER_SITE_PYPI:=s/scikit-image/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=s/scikit-image/}
7 8
8MAINTAINER= jihbed.research@gmail.com 9MAINTAINER= jihbed.research@gmail.com
9HOMEPAGE= https://scikit-image.org/ 10HOMEPAGE= https://scikit-image.org/
10COMMENT= Image processing routines for SciPy 11COMMENT= Image processing routines for SciPy
11LICENSE= modified-bsd 12LICENSE= modified-bsd
12 13
13DEPENDS+= ${PYPKGPREFIX}-Pillow>=4.3.0:../../graphics/py-Pillow 14DEPENDS+= ${PYPKGPREFIX}-Pillow>=4.3.0:../../graphics/py-Pillow
14DEPENDS+= ${PYPKGPREFIX}-imageio>=2.0.1:../../graphics/py-imageio 15DEPENDS+= ${PYPKGPREFIX}-imageio>=2.0.1:../../graphics/py-imageio
15DEPENDS+= ${PYPKGPREFIX}-pywavelets>=0.5.2:../../math/py-pywavelets 16DEPENDS+= ${PYPKGPREFIX}-pywavelets>=0.5.2:../../math/py-pywavelets
16DEPENDS+= ${PYPKGPREFIX}-networkx>=2.0:../../math/py-networkx 17DEPENDS+= ${PYPKGPREFIX}-networkx>=2.0:../../math/py-networkx
17DEPENDS+= ${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six 18DEPENDS+= ${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six
cvs diff -r1.11 -r1.12 pkgsrc/math/py-scikit-learn/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-scikit-learn/Makefile 2020/05/27 19:37:40 1.11
+++ pkgsrc/math/py-scikit-learn/Makefile 2020/10/12 21:52:04 1.12
@@ -1,32 +1,33 @@ @@ -1,32 +1,33 @@
1# $NetBSD: Makefile,v 1.11 2020/05/27 19:37:40 wiz Exp $ 1# $NetBSD: Makefile,v 1.12 2020/10/12 21:52:04 bacon Exp $
2 2
3DISTNAME= scikit-learn-0.22.1 3DISTNAME= scikit-learn-0.22.1
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= math python 6CATEGORIES= math python
6MASTER_SITES= ${MASTER_SITE_PYPI:=s/scikit-learn/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=s/scikit-learn/}
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://scikit-learn.org/ 10HOMEPAGE= https://scikit-learn.org/
10COMMENT= Machine learning algorithms for Python 11COMMENT= Machine learning algorithms for Python
11LICENSE= modified-bsd 12LICENSE= modified-bsd
12 13
13DEPENDS+= ${PYPKGPREFIX}-joblib>=0.11:../../devel/py-joblib 14DEPENDS+= ${PYPKGPREFIX}-joblib>=0.11:../../devel/py-joblib
14DEPENDS+= ${PYPKGPREFIX}-scipy>=0.17.0:../../math/py-scipy 15DEPENDS+= ${PYPKGPREFIX}-scipy>=0.17.0:../../math/py-scipy
15TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner 16TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
16 17
17# XXX: OpenMP is not portable 18# XXX: OpenMP is not portable
18MAKE_ENV+= SKLEARN_NO_OPENMP=1 19MAKE_ENV+= SKLEARN_NO_OPENMP=1
19 20
20USE_LANGUAGES= c c++ fortran 21USE_LANGUAGES= c c++ fortran
21 22
22PYTHON_VERSIONS_INCOMPATIBLE= 27 23PYTHON_VERSIONS_INCOMPATIBLE= 27
23 24
24.include "../../devel/py-cython/buildlink3.mk" 25.include "../../devel/py-cython/buildlink3.mk"
25.include "../../lang/python/egg.mk" 26.include "../../lang/python/egg.mk"
 27# Consider letting mk/blas.buildlink3.mk handle this check
26.if !exists(/System/Library/Frameworks/Accelerate.framework) 28.if !exists(/System/Library/Frameworks/Accelerate.framework)
27.include "../../math/blas/buildlink3.mk" 29.include "../../mk/blas.buildlink3.mk"
28.include "../../math/lapack/buildlink3.mk" 
29.endif 30.endif
30BUILDLINK_API_DEPENDS.py-numpy+= ${PYPKGPREFIX}-numpy>=1.11.0 31BUILDLINK_API_DEPENDS.py-numpy+= ${PYPKGPREFIX}-numpy>=1.11.0
31.include "../../math/py-numpy/buildlink3.mk" 32.include "../../math/py-numpy/buildlink3.mk"
32.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.42 -r1.43 pkgsrc/math/py-scipy/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-scipy/Makefile 2020/08/04 01:16:19 1.42
+++ pkgsrc/math/py-scipy/Makefile 2020/10/12 21:52:04 1.43
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.42 2020/08/04 01:16:19 tnn Exp $ 1# $NetBSD: Makefile,v 1.43 2020/10/12 21:52:04 bacon Exp $
2 2
3DISTNAME= scipy-1.5.2 3DISTNAME= scipy-1.5.2
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= math python 6CATEGORIES= math python
6MASTER_SITES= ${MASTER_SITE_PYPI:=s/scipy/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=s/scipy/}
7 8
8MAINTAINER= markd@NetBSD.org 9MAINTAINER= markd@NetBSD.org
9HOMEPAGE= https://www.scipy.org/ 10HOMEPAGE= https://www.scipy.org/
10COMMENT= Scientific Algorithms Library for Python 11COMMENT= Scientific Algorithms Library for Python
11LICENSE= modified-bsd 12LICENSE= modified-bsd
12 13
13DEPENDS+= ${PYPKGPREFIX}-pybind11-[0-9]*:../../devel/py-pybind11 14DEPENDS+= ${PYPKGPREFIX}-pybind11-[0-9]*:../../devel/py-pybind11
14TEST_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose 15TEST_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
15TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test 16TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
16 17
17USE_LANGUAGES+= c c++ fortran 18USE_LANGUAGES+= c c++ fortran
@@ -50,19 +51,18 @@ fix-darwin-install-name: @@ -50,19 +51,18 @@ fix-darwin-install-name:
50.endif 51.endif
51 52
52# self test failures for 1.1.0 reported at 53# self test failures for 1.1.0 reported at
53# https://github.com/scipy/scipy/issues/9196 54# https://github.com/scipy/scipy/issues/9196
54# needs 'make install' first! 55# needs 'make install' first!
55do-test: 56do-test:
56 cd ${WRKDIR} && \ 57 cd ${WRKDIR} && \
57 ${PYTHONBIN} -c "import scipy; scipy.test('full')" 58 ${PYTHONBIN} -c "import scipy; scipy.test('full')"
58 59
59.include "../../devel/py-cython/buildlink3.mk" 60.include "../../devel/py-cython/buildlink3.mk"
60.include "../../devel/py-pybind11/buildlink3.mk" 61.include "../../devel/py-pybind11/buildlink3.mk"
61.include "../../lang/python/application.mk" 62.include "../../lang/python/application.mk"
62.include "../../lang/python/distutils.mk" 63.include "../../lang/python/distutils.mk"
63.include "../../math/blas/buildlink3.mk" 64.include "../../mk/blas.buildlink3.mk"
64.include "../../math/fftw/buildlink3.mk" 65.include "../../math/fftw/buildlink3.mk"
65.include "../../math/lapack/buildlink3.mk" 
66BUILDLINK_API_DEPENDS.py-numpy+= ${PYPKGPREFIX}-numpy>=1.17.3 66BUILDLINK_API_DEPENDS.py-numpy+= ${PYPKGPREFIX}-numpy>=1.17.3
67.include "../../math/py-numpy/buildlink3.mk" 67.include "../../math/py-numpy/buildlink3.mk"
68.include "../../mk/bsd.pkg.mk" 68.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/math/py-statsmodels/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-statsmodels/Makefile 2020/05/03 16:13:11 1.7
+++ pkgsrc/math/py-statsmodels/Makefile 2020/10/12 21:52:04 1.8
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.7 2020/05/03 16:13:11 minskim Exp $ 1# $NetBSD: Makefile,v 1.8 2020/10/12 21:52:04 bacon Exp $
2 2
3DISTNAME= statsmodels-0.11.1 3DISTNAME= statsmodels-0.11.1
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= math python 6CATEGORIES= math python
6MASTER_SITES= ${MASTER_SITE_PYPI:=s/statsmodels/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=s/statsmodels/}
7 8
8MAINTAINER= jihbed.research@gmail.com 9MAINTAINER= jihbed.research@gmail.com
9HOMEPAGE= https://www.statsmodels.org/ 10HOMEPAGE= https://www.statsmodels.org/
10COMMENT= Statistical computations and models for Python 11COMMENT= Statistical computations and models for Python
11LICENSE= modified-bsd 12LICENSE= modified-bsd
12 13
13BUILD_DEPENDS+= ${PYPKGPREFIX}-cython>=0.24:../../devel/py-cython 14BUILD_DEPENDS+= ${PYPKGPREFIX}-cython>=0.24:../../devel/py-cython
14DEPENDS+= ${PYPKGPREFIX}-pandas>=0.19:../../math/py-pandas 15DEPENDS+= ${PYPKGPREFIX}-pandas>=0.19:../../math/py-pandas
15DEPENDS+= ${PYPKGPREFIX}-patsy>=0.4.0:../../math/py-patsy 16DEPENDS+= ${PYPKGPREFIX}-patsy>=0.4.0:../../math/py-patsy
16DEPENDS+= ${PYPKGPREFIX}-scipy>=0.18:../../math/py-scipy 17DEPENDS+= ${PYPKGPREFIX}-scipy>=0.18:../../math/py-scipy
17 18
cvs diff -r1.6 -r1.7 pkgsrc/math/py-tables/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-tables/Makefile 2020/05/14 19:31:40 1.6
+++ pkgsrc/math/py-tables/Makefile 2020/10/12 21:52:04 1.7
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.6 2020/05/14 19:31:40 joerg Exp $ 1# $NetBSD: Makefile,v 1.7 2020/10/12 21:52:04 bacon Exp $
2 2
3DISTNAME= tables-3.6.1 3DISTNAME= tables-3.6.1
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= math python 6CATEGORIES= math python
6MASTER_SITES= ${MASTER_SITE_PYPI:=t/tables/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=t/tables/}
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.pytables.org/ 10HOMEPAGE= https://www.pytables.org/
10COMMENT= Database package for large amounts of data 11COMMENT= Database package for large amounts of data
11LICENSE= modified-bsd 12LICENSE= modified-bsd
12 13
13PYSETUPBUILDARGS+= --blosc=${BUILDLINK_PREFIX.blosc} 14PYSETUPBUILDARGS+= --blosc=${BUILDLINK_PREFIX.blosc}
14PYSETUPBUILDARGS+= --bzip2=${BUILDLINK_PREFIX.bzip2} 15PYSETUPBUILDARGS+= --bzip2=${BUILDLINK_PREFIX.bzip2}
15PYSETUPBUILDARGS+= --hdf5=${BUILDLINK_PREFIX.hdf5} 16PYSETUPBUILDARGS+= --hdf5=${BUILDLINK_PREFIX.hdf5}
16PYSETUPBUILDARGS+= --lzo=${BUILDLINK_PREFIX.lzo} 17PYSETUPBUILDARGS+= --lzo=${BUILDLINK_PREFIX.lzo}
17 18
cvs diff -r1.5 -r1.6 pkgsrc/math/py-uncertainties/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-uncertainties/Makefile 2020/06/11 08:16:27 1.5
+++ pkgsrc/math/py-uncertainties/Makefile 2020/10/12 21:52:04 1.6
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.5 2020/06/11 08:16:27 adam Exp $ 1# $NetBSD: Makefile,v 1.6 2020/10/12 21:52:04 bacon Exp $
2 2
3DISTNAME= uncertainties-3.1.4 3DISTNAME= uncertainties-3.1.4
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= math python 6CATEGORIES= math python
6MASTER_SITES= ${MASTER_SITE_PYPI:=u/uncertainties/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=u/uncertainties/}
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://uncertainties-python-package.readthedocs.io/ 10HOMEPAGE= https://uncertainties-python-package.readthedocs.io/
10COMMENT= Transparent calculations with uncertainties on the quantities involved 11COMMENT= Transparent calculations with uncertainties on the quantities involved
11LICENSE= modified-bsd 12LICENSE= modified-bsd
12 13
13USE_LANGUAGES= # none 14USE_LANGUAGES= # none
14 15
15.include "../../lang/python/egg.mk" 16.include "../../lang/python/egg.mk"
16.include "../../math/py-numpy/buildlink3.mk" 17.include "../../math/py-numpy/buildlink3.mk"
17.include "../../mk/bsd.pkg.mk" 18.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/mk/blas.buildlink3.mk
# $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
cvs diff -r1.11 -r1.12 pkgsrc/pkgtools/R2pkg/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/R2pkg/Makefile 2020/01/13 18:06:47 1.11
+++ pkgsrc/pkgtools/R2pkg/Makefile 2020/10/12 21:52:04 1.12
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.11 2020/01/13 18:06:47 rillig Exp $ 1# $NetBSD: Makefile,v 1.12 2020/10/12 21:52:04 bacon Exp $
2# 2#
3 3
4VERS= 0.6.4 4VERS= 0.6.4
5PKGNAME= R2pkg-${VERS} 5PKGNAME= R2pkg-${VERS}
 6PKGREVISION= 1
6CATEGORIES= pkgtools 7CATEGORIES= pkgtools
7 8
8MAINTAINER= brook@NetBSD.org 9MAINTAINER= brook@NetBSD.org
9HOMEPAGE= # none 10HOMEPAGE= # none
10COMMENT= Tool to automate initial steps in building an R package 11COMMENT= Tool to automate initial steps in building an R package
11LICENSE= modified-bsd 12LICENSE= modified-bsd
12 13
13WRKSRC= ${WRKDIR} 14WRKSRC= ${WRKDIR}
14NO_BUILD= yes 15NO_BUILD= yes
15USE_LANGUAGES= # none 16USE_LANGUAGES= # none
16AUTO_MKDIRS= yes 17AUTO_MKDIRS= yes
17 18
18DEPENDS+= curl>=7.52.1:../../www/curl 19DEPENDS+= curl>=7.52.1:../../www/curl
cvs diff -r1.1 -r1.2 pkgsrc/time/py-cftime/Makefile (expand / switch to unified diff)

--- pkgsrc/time/py-cftime/Makefile 2020/07/01 15:57:35 1.1
+++ pkgsrc/time/py-cftime/Makefile 2020/10/12 21:52:04 1.2
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.1 2020/07/01 15:57:35 adam Exp $ 1# $NetBSD: Makefile,v 1.2 2020/10/12 21:52:04 bacon Exp $
2 2
3DISTNAME= cftime-1.1.3 3DISTNAME= cftime-1.1.3
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= time python 6CATEGORIES= time python
6MASTER_SITES= ${MASTER_SITE_PYPI:=c/cftime/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=c/cftime/}
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/Unidata/cftime 10HOMEPAGE= https://github.com/Unidata/cftime
10COMMENT= Time-handling functionality 11COMMENT= Time-handling functionality
11LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
12 13
13TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner 14TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
14 15
15# This pulls too many unnecessary dependencies. 16# This pulls too many unnecessary dependencies.
16#PYSETUPTESTTARGET= pytest 17#PYSETUPTESTTARGET= pytest
17 18
cvs diff -r1.127 -r1.128 pkgsrc/x11/py-gtk2/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/py-gtk2/Makefile 2020/08/17 20:17:56 1.127
+++ pkgsrc/x11/py-gtk2/Makefile 2020/10/12 21:52:04 1.128
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.127 2020/08/17 20:17:56 leot Exp $ 1# $NetBSD: Makefile,v 1.128 2020/10/12 21:52:04 bacon Exp $
2 2
3DISTNAME= pygtk-2.24.0 3DISTNAME= pygtk-2.24.0
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/}
5PKGREVISION= 34 5PKGREVISION= 35
6CATEGORIES= x11 python 6CATEGORIES= x11 python
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygtk/2.24/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygtk/2.24/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.pygtk.org/ 11HOMEPAGE= http://www.pygtk.org/
12COMMENT= Python bindings for GTK+2 12COMMENT= Python bindings for GTK+2
13LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
14 14
15CONFLICTS= ${PYPKGPREFIX}-gtk<0.6.10 15CONFLICTS= ${PYPKGPREFIX}-gtk<0.6.10
16 16
17# IOError: [Errno 2] No such file or directory: 'gtk-types.defs' 17# IOError: [Errno 2] No such file or directory: 'gtk-types.defs'
18MAKE_JOBS_SAFE= no 18MAKE_JOBS_SAFE= no