diff options
Diffstat (limited to 'math')
34 files changed, 165 insertions, 161 deletions
diff --git a/math/octave-forge-financial/Makefile b/math/octave-forge-financial/Makefile index beb5587f00a6..ae647de46802 100644 --- a/math/octave-forge-financial/Makefile +++ b/math/octave-forge-financial/Makefile @@ -1,6 +1,5 @@ PORTNAME= octave-forge-financial -PORTVERSION= 0.5.3 -PORTREVISION= 11 +PORTVERSION= 0.5.4 CATEGORIES= math MASTER_SITES= SF/octave/Octave%20Forge%20Packages/Individual%20Package%20Releases DISTNAME= ${OCTAVE_PKGNAME}-${DISTVERSIONFULL} @@ -15,8 +14,6 @@ LICENSE_FILE= ${WRKDIR}/${OCTAVE_SRC}/COPYING RUN_DEPENDS= ${OCTAVE_TARBALLS_DIR}/io.tar.gz:math/octave-forge-io \ ${OCTAVE_TARBALLS_DIR}/statistics.tar.gz:math/octave-forge-statistics -BROKEN= does not install with octave version >= 9.1.0 - USES= octave NO_ARCH= yes diff --git a/math/octave-forge-financial/distinfo b/math/octave-forge-financial/distinfo index 1b6d83598d91..0728d676b6de 100644 --- a/math/octave-forge-financial/distinfo +++ b/math/octave-forge-financial/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542397369 -SHA256 (octave-forge/financial-0.5.3.tar.gz) = ae6ef255597567c79e15f2b78e2d22febf43bc0d679de7ca6c79f36b9e1f2639 -SIZE (octave-forge/financial-0.5.3.tar.gz) = 80482 +TIMESTAMP = 1750880519 +SHA256 (octave-forge/financial-0.5.4.tar.gz) = 0b906886b4c754c683ad5f464dba797743af5d1faccd032357986f38d16d3fbb +SIZE (octave-forge/financial-0.5.4.tar.gz) = 80390 diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile index 8aa9fd1b7535..c7deaaa6d266 100644 --- a/math/octave-forge/Makefile +++ b/math/octave-forge/Makefile @@ -1,5 +1,6 @@ PORTNAME= octave-forge PORTVERSION= 20250525 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org @@ -37,7 +38,7 @@ OPTIONS_DEFINE= AUDIO ACTUARIAL AUTOMATIC_DIFFERENTIATION \ TSA VIDEO VELAS \ WEBSOCKETS ZENITY ZEROMQ -OPTIONS_DEFAULT= ${OPTIONS_DEFINE:NBIOINFO:NCHARTJS:NDATA_SMOOTHING:NDATABASE:NECONOMETRICS:NFINANCIAL:NFITS:NGNUPLOT:NINFORMATIONTHEORY:NIRSA:NLEVEL_SET:NMECHANICS:NMPI:NNNET:NNLWING2:NPIQP:NPLOT:NOPTIM:NSYMBAND:NSPECFUN} +OPTIONS_DEFAULT= ${OPTIONS_DEFINE:NBIOINFO:NCHARTJS:NDATA_SMOOTHING:NDATABASE:NECONOMETRICS:NFITS:NGNUPLOT:NINFORMATIONTHEORY:NIRSA:NLEVEL_SET:NMECHANICS:NMPI:NNNET:NNLWING2:NPIQP:NPLOT:NOPTIM:NSYMBAND:NSPECFUN} OCTAVE_TARBALLS_DIR= ${LOCALBASE}/share/octave/tarballs diff --git a/math/p5-Math-GMPq/Makefile b/math/p5-Math-GMPq/Makefile index a436ddcc945d..6b4f7392d9e3 100644 --- a/math/p5-Math-GMPq/Makefile +++ b/math/p5-Math-GMPq/Makefile @@ -1,5 +1,5 @@ PORTNAME= Math-GMPq -PORTVERSION= 0.66 +PORTVERSION= 0.67 CATEGORIES= math perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/math/p5-Math-GMPq/distinfo b/math/p5-Math-GMPq/distinfo index 4108a3ecae1f..18277abedf93 100644 --- a/math/p5-Math-GMPq/distinfo +++ b/math/p5-Math-GMPq/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1747715320 -SHA256 (Math-GMPq-0.66.tar.gz) = 4f4da406b3bc646af495a202667b3497114311b84efac9bd7f7ea5576b8ea082 -SIZE (Math-GMPq-0.66.tar.gz) = 70318 +TIMESTAMP = 1750188040 +SHA256 (Math-GMPq-0.67.tar.gz) = 45a5ce5da5975efdb43ca2511b6fba0827baed9224829b26cd7b020a92eb0770 +SIZE (Math-GMPq-0.67.tar.gz) = 70782 diff --git a/math/p5-Math-GMPz/Makefile b/math/p5-Math-GMPz/Makefile index fc5ded25e990..95eb4aa47b8e 100644 --- a/math/p5-Math-GMPz/Makefile +++ b/math/p5-Math-GMPz/Makefile @@ -1,5 +1,5 @@ PORTNAME= Math-GMPz -PORTVERSION= 0.66 +PORTVERSION= 0.67 CATEGORIES= math perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/math/p5-Math-GMPz/distinfo b/math/p5-Math-GMPz/distinfo index 913e2daf3f5e..2669f901db5b 100644 --- a/math/p5-Math-GMPz/distinfo +++ b/math/p5-Math-GMPz/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1748495733 -SHA256 (Math-GMPz-0.66.tar.gz) = 09429af657063e2b0128ab0b2bf8c5a926d2d7536c228fcf046fdd04307d7d84 -SIZE (Math-GMPz-0.66.tar.gz) = 111421 +TIMESTAMP = 1750188042 +SHA256 (Math-GMPz-0.67.tar.gz) = 534ab5799815145161328fff6a4742cc19bbcc9e4c1149478390d73377bc2706 +SIZE (Math-GMPz-0.67.tar.gz) = 110724 diff --git a/math/py-CyLP/Makefile b/math/py-CyLP/Makefile index 24e953829189..088d382fadea 100644 --- a/math/py-CyLP/Makefile +++ b/math/py-CyLP/Makefile @@ -1,7 +1,7 @@ PORTNAME= CyLP DISTVERSIONPREFIX= v DISTVERSION= 0.92.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/math/py-CyLP/files/patch-cython b/math/py-CyLP/files/patch-cython new file mode 100644 index 000000000000..790d2e24b939 --- /dev/null +++ b/math/py-CyLP/files/patch-cython @@ -0,0 +1,10 @@ +--- cylp/cy/CyClpSimplex.pyx.orig 2024-08-20 08:36:08 UTC ++++ cylp/cy/CyClpSimplex.pyx +@@ -20,6 +20,7 @@ from cylp.cy cimport CyCoinMpsIO + from cylp.py.pivots.DualPivotPythonBase import DualPivotPythonBase + from cylp.py.modeling.CyLPModel import CyLPModel + from cylp.cy cimport CyCoinMpsIO ++from ctypes import c_long as long + + # Initialize numpy + np.import_array() diff --git a/math/py-awkward/Makefile b/math/py-awkward/Makefile index 478f457f125b..904d57ed0bfa 100644 --- a/math/py-awkward/Makefile +++ b/math/py-awkward/Makefile @@ -1,5 +1,5 @@ PORTNAME= awkward -PORTVERSION= 2.8.3 +PORTVERSION= 2.8.4 CATEGORIES= math python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}awkward-cpp>=46<46_99:math/py-awkward-cpp@${ ${PYTHON_PKGNAMEPREFIX}numpy>=1.18.0,1:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} -USES= python:3.9+ +USES= python USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes diff --git a/math/py-awkward/distinfo b/math/py-awkward/distinfo index 9c3d98394713..b634b5801200 100644 --- a/math/py-awkward/distinfo +++ b/math/py-awkward/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1747715448 -SHA256 (awkward-2.8.3.tar.gz) = 31db6f8d923a844791d6bfc233397fd4b34c72ade47852727b75278f1351f904 -SIZE (awkward-2.8.3.tar.gz) = 6221920 +TIMESTAMP = 1750188124 +SHA256 (awkward-2.8.4.tar.gz) = 840ee49120d882c892e12fe8be2195991cab95c3dab4a6ee76b4a9696a1ebc9b +SIZE (awkward-2.8.4.tar.gz) = 6222255 diff --git a/math/py-blis/Makefile b/math/py-blis/Makefile index a8040e41539c..153586695a61 100644 --- a/math/py-blis/Makefile +++ b/math/py-blis/Makefile @@ -1,5 +1,6 @@ PORTNAME= blis PORTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= math python MASTER_SITES= PYPI \ https://github.com/explosion/cython-blis/releases/download/release-v${PORTVERSION}/ @@ -18,7 +19,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.19.3,1<3.0.0,1:math/py-numpy@${PY RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.19.0,1<3.0.0,1:math/py-numpy@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist concurrent cython pep517 +USE_PYTHON= autoplist concurrent cython3 pep517 post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} + diff --git a/math/py-blis/files/patch-pyproject.toml b/math/py-blis/files/patch-pyproject.toml deleted file mode 100644 index 6e108948eb19..000000000000 --- a/math/py-blis/files/patch-pyproject.toml +++ /dev/null @@ -1,11 +0,0 @@ ---- pyproject.toml.orig 2025-04-03 12:23:45 UTC -+++ pyproject.toml -@@ -1,7 +1,7 @@ requires = [ - [build-system] - requires = [ - "setuptools", -- "cython>=3.0,<4.0", -+ "cython>=0,<4.0", - "numpy>=1.19.3,<3.0.0" - ] - build-backend = "setuptools.build_meta" diff --git a/math/py-blis/files/patch-setup.py b/math/py-blis/files/patch-setup.py index 7f66284b12b2..ebd4020cd70d 100644 --- a/math/py-blis/files/patch-setup.py +++ b/math/py-blis/files/patch-setup.py @@ -1,12 +1,10 @@ --- setup.py.orig 2025-04-03 12:23:45 UTC +++ setup.py -@@ -302,8 +302,8 @@ setup( - +@@ -303,7 +303,7 @@ setup( setup( setup_requires=[ -- "cython>=3.0,<4.0", + "cython>=3.0,<4.0", - "numpy>=2.0.0,<3.0.0", -+ "cython>=0,<4.0", + "numpy>=1.19.0,<3.0.0", ], install_requires=[ diff --git a/math/py-narwhals/Makefile b/math/py-narwhals/Makefile index 1e738a048f82..6a7915f084b2 100644 --- a/math/py-narwhals/Makefile +++ b/math/py-narwhals/Makefile @@ -1,5 +1,5 @@ PORTNAME= narwhals -PORTVERSION= 1.42.0 +PORTVERSION= 1.43.0 CATEGORIES= math python MASTER_SITES= PYPI \ https://github.com/narwhals-dev/narwhals/releases/download/v${PORTVERSION}/ @@ -31,7 +31,7 @@ SQLFRAME_DESC= SQLFrame support DASK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dask>=2024.8:devel/py-dask@${PY_FLAVOR} DUCKDB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}duckdb>=1.0:databases/py-duckdb@${PY_FLAVOR} -PANDAS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pandas>=0.25.3,1:math/py-pandas@${PY_FLAVOR} +PANDAS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pandas>=1.1.3,1:math/py-pandas@${PY_FLAVOR} MODIN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}modin>=0:math/py-modin@${PY_FLAVOR} POLARS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}polars>=0.20.3:misc/py-polars@${PY_FLAVOR} PYARROW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyarrow>=11.0.0:databases/py-pyarrow@${PY_FLAVOR} diff --git a/math/py-narwhals/distinfo b/math/py-narwhals/distinfo index 19d029424dcc..c6717255dad6 100644 --- a/math/py-narwhals/distinfo +++ b/math/py-narwhals/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749813100 -SHA256 (narwhals-1.42.0.tar.gz) = a5e554782446d1197593312651352cd39b2025e995053d8e6bdfaa01a70a91d3 -SIZE (narwhals-1.42.0.tar.gz) = 490671 +TIMESTAMP = 1750188126 +SHA256 (narwhals-1.43.0.tar.gz) = 5a28119401fccb4d344704f806438a983bb0a5b3f4a638760d25b1d521a18a79 +SIZE (narwhals-1.43.0.tar.gz) = 496455 diff --git a/math/py-numexpr/Makefile b/math/py-numexpr/Makefile index c32a9698a4ab..625e573db981 100644 --- a/math/py-numexpr/Makefile +++ b/math/py-numexpr/Makefile @@ -1,5 +1,5 @@ PORTNAME= numexpr -PORTVERSION= 2.10.2 +PORTVERSION= 2.11.0 CATEGORIES= math python MASTER_SITES= PYPI \ https://github.com/pydata/numexpr/releases/download/v${PORTVERSION}/ @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.23.0,1:math/py-numpy@${PY_FLAVOR} -USES= dos2unix python:3.9+ +USES= dos2unix python:3.10+ USE_PYTHON= autoplist concurrent pep517 post-install: diff --git a/math/py-numexpr/distinfo b/math/py-numexpr/distinfo index 5a8cd7f2b38c..c96ebe825f40 100644 --- a/math/py-numexpr/distinfo +++ b/math/py-numexpr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1734888336 -SHA256 (numexpr-2.10.2.tar.gz) = b0aff6b48ebc99d2f54f27b5f73a58cb92fde650aeff1b397c71c8788b4fff1a -SIZE (numexpr-2.10.2.tar.gz) = 106787 +TIMESTAMP = 1750188128 +SHA256 (numexpr-2.11.0.tar.gz) = 75b2c01a4eda2e7c357bc67a3f5c3dd76506c15b5fd4dc42845ef2e182181bad +SIZE (numexpr-2.11.0.tar.gz) = 108960 diff --git a/math/py-numexpr/files/patch-pyproject.toml b/math/py-numexpr/files/patch-pyproject.toml index 66558beeca1f..da1b991c2e63 100644 --- a/math/py-numexpr/files/patch-pyproject.toml +++ b/math/py-numexpr/files/patch-pyproject.toml @@ -1,4 +1,4 @@ ---- pyproject.toml.orig 2024-06-20 17:09:56 UTC +--- pyproject.toml.orig 2025-06-19 14:14:08 UTC +++ pyproject.toml @@ -2,7 +2,7 @@ requires = [ requires = [ @@ -9,3 +9,12 @@ ] build-backend = "setuptools.build_meta" +@@ -15,7 +15,7 @@ maintainers = [{ name = "Blosc Development Team", emai + readme = "README.rst" + authors = [{name = "David M. Cooke, Francesc Alted, and others", email = "blosc@blosc.org"}] + maintainers = [{ name = "Blosc Development Team", email = "blosc@blosc.org"}] +-license = "MIT" ++license = {text = "MIT"} + classifiers = [ + "Development Status :: 6 - Mature", + "Intended Audience :: Developers", diff --git a/math/py-pandas/Makefile b/math/py-pandas/Makefile index 956fd1610b28..c3ffab971454 100644 --- a/math/py-pandas/Makefile +++ b/math/py-pandas/Makefile @@ -1,5 +1,6 @@ PORTNAME= pandas PORTVERSION= 2.2.3 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= math devel python MASTER_SITES= PYPI diff --git a/math/py-pandas/files/patch-pyproject.toml b/math/py-pandas/files/patch-pyproject.toml index ed0dc0e94664..63506fa05bea 100644 --- a/math/py-pandas/files/patch-pyproject.toml +++ b/math/py-pandas/files/patch-pyproject.toml @@ -9,7 +9,8 @@ + "meson-python>=0.13.1", + "meson>=1.2.1", "wheel", - "Cython~=3.0.5", # Note: sync with setup.py, environment.yml and asv.conf.json +- "Cython~=3.0.5", # Note: sync with setup.py, environment.yml and asv.conf.json ++ "Cython>=3.0.5", # Note: sync with setup.py, environment.yml and asv.conf.json # Force numpy higher than 2.0, so that built wheels are compatible # with both numpy 1 and 2 - "numpy>=2.0", diff --git a/math/py-petsc4py/files/patch-cython b/math/py-petsc4py/files/patch-cython new file mode 100644 index 000000000000..2fb9419b9dbc --- /dev/null +++ b/math/py-petsc4py/files/patch-cython @@ -0,0 +1,101 @@ +Obtained from: https://gitlab.com/petsc/petsc/-/commit/87b0c9e1f4d83439f081eddd06cf19f419b1e4f9 + +--- conf/cyautodoc.py.orig 2025-01-29 22:17:46 UTC ++++ conf/cyautodoc.py +@@ -24,8 +24,9 @@ class ExpressionWriter(BaseExpressionWriter): + self.visit(node.index) + self.put(']') + +- def visit_UnicodeNode(self, node): +- self.emit_string(node, '') ++ if hasattr(BaseExpressionWriter, 'emit_string'): ++ def visit_UnicodeNode(self, node): ++ self.emit_string(node, '') + + + class AnnotationWriter(ExpressionWriter, BaseAnnotationWriter): +--- src/petsc4py/PETSc/petscdm.pxi.orig 2025-01-29 22:17:46 UTC ++++ src/petsc4py/PETSc/petscdm.pxi +@@ -236,9 +236,12 @@ cdef inline PetscInt asBoundary(object boundary, + PetscDMBoundaryType *_z) except -1: + cdef PetscInt dim = 0 + cdef object x=None, y=None, z=None ++ # Use `type(0)` instead of `int` to workaround ++ # Cython 3.1 failing to interpret `int` as a type ++ cdef type pyint = type(0) + if boundary is None or \ + isinstance(boundary, str) or \ +- isinstance(boundary, int): ++ isinstance(boundary, pyint): + _x[0] = _y[0] = _z[0] = asBoundaryType(boundary) + else: + _x[0] = _y[0] = _z[0] = DM_BOUNDARY_NONE +--- src/petsc4py/PETSc/petscis.pxi.orig 2025-01-29 22:17:46 UTC ++++ src/petsc4py/PETSc/petscis.pxi +@@ -181,28 +181,6 @@ cdef class _IS_buffer: + def __exit__(self, *exc): + return self.exit() + +- # buffer interface (legacy) +- +- cdef Py_ssize_t getbuffer(self, void **p) except -1: +- cdef PetscInt n = 0 +- if p != NULL: +- self.acquire() +- p[0] = <void*>self.data +- n = self.size +- elif self.iset != NULL: +- CHKERR(ISGetLocalSize(self.iset, &n)) +- return <Py_ssize_t>(<size_t>n*sizeof(PetscInt)) +- +- def __getsegcount__(self, Py_ssize_t *lenp): +- if lenp != NULL: +- lenp[0] = self.getbuffer(NULL) +- return 1 +- +- def __getreadbuffer__(self, Py_ssize_t idx, void **p): +- if idx != 0: raise SystemError( +- "accessing non-existent buffer segment") +- return self.getbuffer(p) +- + # NumPy array interface (legacy) + + property __array_interface__: +--- src/petsc4py/PETSc/petscvec.pxi.orig 2025-01-29 22:17:46 UTC ++++ src/petsc4py/PETSc/petscvec.pxi +@@ -573,35 +573,6 @@ cdef class _Vec_buffer: + def __exit__(self, *exc): + return self.exit() + +- # buffer interface (legacy) +- +- cdef Py_ssize_t getbuffer(self, void **p) except -1: +- cdef PetscInt n = 0 +- if p != NULL: +- self.acquire() +- p[0] = <void*>self.data +- n = self.size +- elif self.vec != NULL: +- CHKERR(VecGetLocalSize(self.vec, &n)) +- return <Py_ssize_t>(<size_t>n*sizeof(PetscScalar)) +- +- def __getsegcount__(self, Py_ssize_t *lenp): +- if lenp != NULL: +- lenp[0] = self.getbuffer(NULL) +- return 1 +- +- def __getreadbuffer__(self, Py_ssize_t idx, void **p): +- if idx != 0: raise SystemError( +- "accessing non-existent buffer segment") +- return self.getbuffer(p) +- +- def __getwritebuffer__(self, Py_ssize_t idx, void **p): +- if idx != 0: raise SystemError( +- "accessing non-existent buffer segment") +- if self.readonly: raise TypeError( +- "Object is not writable.") +- return self.getbuffer(p) +- + # NumPy array interface (legacy) + + property __array_interface__: diff --git a/math/py-pyreadstat/Makefile b/math/py-pyreadstat/Makefile index a4fc50048746..28702f0c4c52 100644 --- a/math/py-pyreadstat/Makefile +++ b/math/py-pyreadstat/Makefile @@ -1,5 +1,6 @@ PORTNAME= pyreadstat PORTVERSION= 1.2.9 +PORTREVISION= 1 CATEGORIES= math python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,7 +18,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLA RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pandas>=1.2.0,1:math/py-pandas@${PY_FLAVOR} USES= python -USE_PYTHON= autoplist concurrent cython pep517 +USE_PYTHON= autoplist concurrent cython3 pep517 post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} + diff --git a/math/py-pyreadstat/files/patch-setup.py b/math/py-pyreadstat/files/patch-setup.py deleted file mode 100644 index ee04a6d9cc21..000000000000 --- a/math/py-pyreadstat/files/patch-setup.py +++ /dev/null @@ -1,14 +0,0 @@ ---- setup.py.orig 2024-10-18 20:21:39 UTC -+++ setup.py -@@ -26,11 +26,6 @@ if PY_MAJOR_VERSION < 3 and os.name == 'nt': - if PY_MAJOR_VERSION < 3 and os.name == 'nt': - raise Exception("Python 2 is not supported on Windows.") - --cyver = int(Cython.__version__.split(".")[0]) --if cyver < 3: -- msg = "Cython version 3 or newer required" -- raise Exception(msg) -- - ext = '.pyx' - - diff --git a/math/vtk9/Makefile b/math/vtk9/Makefile index 85979ec768e3..41087e74f8e4 100644 --- a/math/vtk9/Makefile +++ b/math/vtk9/Makefile @@ -1,6 +1,5 @@ PORTNAME= vtk -DISTVERSION= 9.2.6 -PORTREVISION= 6 +DISTVERSION= 9.5.0 CATEGORIES= math graphics MASTER_SITES= https://vtk.org/files/release/${VTK_SHORT_VER}/ PKGNAMESUFFIX= 9 diff --git a/math/vtk9/Makefile.version b/math/vtk9/Makefile.version index 66ceb4b6ed8f..0704e0637ff9 100644 --- a/math/vtk9/Makefile.version +++ b/math/vtk9/Makefile.version @@ -1,3 +1,3 @@ # this file is provided for VTK users -VTK_VER=9.2 +VTK_VER=9.5 diff --git a/math/vtk9/distinfo b/math/vtk9/distinfo index c73d546ac962..89bd22215236 100644 --- a/math/vtk9/distinfo +++ b/math/vtk9/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1687488293 -SHA256 (VTK-9.2.6.tar.gz) = 06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12 -SIZE (VTK-9.2.6.tar.gz) = 53810904 +TIMESTAMP = 1750828031 +SHA256 (VTK-9.5.0.tar.gz) = 04ae86246b9557c6b61afbc534a6df099244fbc8f3937f82e6bc0570953af87d +SIZE (VTK-9.5.0.tar.gz) = 50172790 diff --git a/math/vtk9/files/patch-ThirdParty_cgns_vtkcgns_src_adfh_ADFH.c b/math/vtk9/files/patch-ThirdParty_cgns_vtkcgns_src_adfh_ADFH.c deleted file mode 100644 index 908a0098eced..000000000000 --- a/math/vtk9/files/patch-ThirdParty_cgns_vtkcgns_src_adfh_ADFH.c +++ /dev/null @@ -1,13 +0,0 @@ ---- ThirdParty/cgns/vtkcgns/src/adfh/ADFH.c.orig 2022-10-02 11:37:19 UTC -+++ ThirdParty/cgns/vtkcgns/src/adfh/ADFH.c -@@ -287,6 +287,10 @@ if (mta_root == NULL){set_error(ADFH_ERR_ROOTNULL, err - #define CMP_OINFO(r,n) ((r)->fileno==(n)->fileno && \ - (r)->addr==(n)->addr && (r)->addr != HADDR_UNDEF) - -+#if H5_VERSION_GE(1,12,0) -+#undef H5L_info_t -+#define H5L_info_t H5L_info2_t -+#endif - - static herr_t gfind_by_name(hid_t, const char *, const H5L_info_t*, void *); - static herr_t find_by_name(hid_t, const char *, const H5A_info_t*, void *); diff --git a/math/vtk9/files/patch-ThirdParty_diy2_vtkdiy2_include_vtkdiy2_fmt_format.h b/math/vtk9/files/patch-ThirdParty_diy2_vtkdiy2_include_vtkdiy2_fmt_format.h deleted file mode 100644 index eb9c13efbe2f..000000000000 --- a/math/vtk9/files/patch-ThirdParty_diy2_vtkdiy2_include_vtkdiy2_fmt_format.h +++ /dev/null @@ -1,18 +0,0 @@ ---- ThirdParty/diy2/vtkdiy2/include/vtkdiy2/fmt/format.h.orig 2023-02-15 04:03:53 UTC -+++ ThirdParty/diy2/vtkdiy2/include/vtkdiy2/fmt/format.h -@@ -480,6 +480,7 @@ void buffer<T>::append(const U* begin, const U* end) { - } - } // namespace internal - -+#ifdef __cpp_char8_t - // A UTF-8 string view. - class u8string_view : public basic_string_view<char8_t> { - public: -@@ -497,6 +498,7 @@ inline u8string_view operator"" _u(const char* s, std: - } - } // namespace literals - #endif -+#endif // __cpp_char8_t - - // The number of characters to store in the basic_memory_buffer object itself - // to avoid dynamic memory allocation. diff --git a/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__put__prop.c b/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__put__prop.c deleted file mode 100644 index eb29a277f139..000000000000 --- a/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__put__prop.c +++ /dev/null @@ -1,14 +0,0 @@ -- fix build with science/netcdf 4.9.3 -- see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=284680 - ---- ThirdParty/exodusII/vtkexodusII/src/ex_put_prop.c.orig 2025-02-10 02:00:23 UTC -+++ ThirdParty/exodusII/vtkexodusII/src/ex_put_prop.c -@@ -243,7 +243,7 @@ int ex_put_prop(int exoid, ex_entity_type obj_type, ex - vals[0] = 0; /* fill value */ - /* create attribute to cause variable to fill with zeros per routine spec - */ -- if ((status = nc_put_att_longlong(exoid, propid, _FillValue, int_type, 1, vals)) != NC_NOERR) { -+ if ((status = nc_put_att_longlong(exoid, propid, NC_FillValue, int_type, 1, vals)) != NC_NOERR) { - snprintf(errmsg, MAX_ERR_LENGTH, - "ERROR: failed to create property name fill attribute in file id %d", exoid); - ex_err_fn(exoid, __func__, errmsg, status); diff --git a/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__put__prop__names.c b/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__put__prop__names.c deleted file mode 100644 index 335822e40906..000000000000 --- a/math/vtk9/files/patch-ThirdParty_exodusII_vtkexodusII_src_ex__put__prop__names.c +++ /dev/null @@ -1,14 +0,0 @@ -- fix build with science/netcdf 4.9.3 -- see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=284680 - ---- ThirdParty/exodusII/vtkexodusII/src/ex_put_prop_names.c.orig 2025-02-10 02:01:23 UTC -+++ ThirdParty/exodusII/vtkexodusII/src/ex_put_prop_names.c -@@ -172,7 +172,7 @@ int ex_put_prop_names(int exoid, ex_entity_type obj_ty - - /* create attribute to cause variable to fill with zeros per routine spec - */ -- if ((status = nc_put_att_longlong(exoid, propid, _FillValue, int_type, 1, vals)) != NC_NOERR) { -+ if ((status = nc_put_att_longlong(exoid, propid, NC_FillValue, int_type, 1, vals)) != NC_NOERR) { - snprintf(errmsg, MAX_ERR_LENGTH, - "ERROR: failed to create property name fill attribute in file id %d", exoid); - ex_err_fn(exoid, __func__, errmsg, status); diff --git a/math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glew.c b/math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glew.c deleted file mode 100644 index 65889826bdd6..000000000000 --- a/math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glew.c +++ /dev/null @@ -1,10 +0,0 @@ ---- ThirdParty/glew/vtkglew/src/glew.c.orig 2024-02-21 22:29:42 UTC -+++ ThirdParty/glew/vtkglew/src/glew.c -@@ -38,6 +38,7 @@ - - #if defined(GLEW_OSMESA) - # define GLAPI extern -+# define APIENTRY __stdcall - # include <GL/osmesa.h> - #elif defined(GLEW_EGL) - # include <GL/eglew.h> diff --git a/math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glewinfo.c b/math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glewinfo.c deleted file mode 100644 index 0ea9659d6ec5..000000000000 --- a/math/vtk9/files/patch-ThirdParty_glew_vtkglew_src_glewinfo.c +++ /dev/null @@ -1,10 +0,0 @@ ---- ThirdParty/glew/vtkglew/src/glewinfo.c.orig 2024-02-21 22:29:54 UTC -+++ ThirdParty/glew/vtkglew/src/glewinfo.c -@@ -38,6 +38,7 @@ - #include <GL/eglew.h> - #elif defined(GLEW_OSMESA) - #define GLAPI extern -+#define APIENTRY __stdcall - #include <GL/osmesa.h> - #elif defined(_WIN32) - #include <GL/wglew.h> diff --git a/math/vtk9/files/patch-Utilities_octree_octree_octree__node.txx b/math/vtk9/files/patch-Utilities_octree_octree_octree__node.txx deleted file mode 100644 index de91955442bb..000000000000 --- a/math/vtk9/files/patch-Utilities_octree_octree_octree__node.txx +++ /dev/null @@ -1,11 +0,0 @@ ---- Utilities/octree/octree/octree_node.txx.orig 2023-02-15 04:03:53 UTC -+++ Utilities/octree/octree/octree_node.txx -@@ -207,7 +207,7 @@ const octree_node<T_, d_, A_>& octree_node<T_, d_, A_> - { - throw std::domain_error("Attempt to access children of an octree leaf node."); - } -- return this->_M_chilren[child]; -+ return this->m_children[child]; - } - - /**\brief Return a reference to a child node. |