From owner-dev-commits-ports-main@freebsd.org Wed Jun 23 17:59:16 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6E3E4654DD0; Wed, 23 Jun 2021 17:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G99xw24Qbz3P1h; Wed, 23 Jun 2021 17:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2F950A49; Wed, 23 Jun 2021 17:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15NHxGX7080141; Wed, 23 Jun 2021 17:59:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15NHxGj0080140; Wed, 23 Jun 2021 17:59:16 GMT (envelope-from git) Date: Wed, 23 Jun 2021 17:59:16 GMT Message-Id: <202106231759.15NHxGj0080140@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 9d873e8ca054 - main - math/openturns: Disable the math/hmat-oss dependency; Add missing python dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d873e8ca054483b3dea95edc0ca4f7d200cc6dd Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Jun 2021 17:59:16 -0000 The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=9d873e8ca054483b3dea95edc0ca4f7d200cc6dd commit 9d873e8ca054483b3dea95edc0ca4f7d200cc6dd Author: Yuri Victorovich AuthorDate: 2021-06-23 17:57:37 +0000 Commit: Yuri Victorovich CommitDate: 2021-06-23 17:59:12 +0000 math/openturns: Disable the math/hmat-oss dependency; Add missing python dependencies openturns isn't compatible with the latest hmat-oss versions. Reported by: fallout (math/hmat-oss part) --- math/openturns/Makefile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/math/openturns/Makefile b/math/openturns/Makefile index 2c33fe0cdc7b..95dbfd3f49aa 100644 --- a/math/openturns/Makefile +++ b/math/openturns/Makefile @@ -1,7 +1,7 @@ PORTNAME= openturns DISTVERSIONPREFIX= v DISTVERSION= 1.17 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -27,7 +27,6 @@ LIB_DEPENDS= libbonmin.so:math/bonmin \ libgflags.so:devel/gflags \ libglog.so:devel/glog \ libhdf5_cpp.so:science/hdf5 \ - libhmat.so:math/hmat-oss \ libipopt.so:math/ipopt \ libmpc.so:math/mpc \ libmpfr.so:math/mpfr \ @@ -48,6 +47,7 @@ CMAKE_ARGS= -DBLAS_LIBRARIES=${LOCALBASE}/lib/libopenblas.so -DLAPACK_LIBRARIES= -DOPENTURNS_EXAMPLE_PATH:STRING=share/examples/openturns \ -DOPENTURNS_DOC_PATH:STRING=share/doc/openturns CMAKE_OFF= USE_DOXYGEN USE_SPHINX +CMAKE_OFF+= USE_HMAT # broken with hmat-oss-1.7.1: https://github.com/openturns/openturns/issues/1868 OPTIONS_DEFINE= PYTHON EXAMPLES OPTIONS_DEFAULT= PYTHON @@ -56,9 +56,15 @@ OPTIONS_SUB= yes PYTHON_USES= python PYTHON_CMAKE_BOOL= BUILD_PYTHON PYTHON_CMAKE_ON= -DSWIG_EXECUTABLE=${LOCALBASE}/bin/swig +PYTHON_PY_DEPENDS= ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}chaospy>0:math/py-chaospy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dill>0:devel/py-dill@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} PYTHON_BUILD_DEPENDS= swig:devel/swig \ - ${PYTHON_RUN_DEPENDS} -PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} + ${PYTHON_PY_DEPENDS} +PYTHON_RUN_DEPENDS= ${PYTHON_PY_DEPENDS} PORTEXAMPLES= *