<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4c912b2f428364b13932d903f8f6cace874a7314">https://github.com/macports/macports-ports/commit/4c912b2f428364b13932d903f8f6cace874a7314</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4c912b2f428364b13932d903f8f6cace874a7314
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Mon Apr 24 02:10:46 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> oce, tbb, onetbb, opencascade: revbump and fix dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [skip ci]
</span>---
cad/freecad/Portfile | 4 ++--
databases/rocksdb/Portfile | 4 +++-
devel/onedpl/Portfile | 2 +-
devel/pika/Portfile | 5 +++--
graphics/blender/Portfile | 4 +++-
graphics/embree/Portfile | 6 +++++-
graphics/oidn/Portfile | 6 ++++--
graphics/opencv3-devel/Portfile | 14 ++++++++++++--
graphics/opencv3/Portfile | 14 ++++++++++++--
graphics/opencv4-devel/Portfile | 14 ++++++++++++--
graphics/opencv4/Portfile | 14 ++++++++++++--
graphics/openimageio/Portfile | 10 ++++++++--
graphics/openimageio/files/patch-manual-tbb.diff | 14 ++++++++++++++
graphics/opensubdiv/Portfile | 3 ++-
graphics/openvdb/Portfile | 5 ++++-
graphics/usd/Portfile | 5 ++++-
graphics/vtk-m/Portfile | 5 ++++-
lang/qore/Portfile | 6 ++++++
math/deal.ii/Portfile | 3 ++-
math/papilo/Portfile | 2 +-
math/scip/Portfile | 2 +-
math/stanmath/Portfile | 3 ++-
python/py-mkl/Portfile | 7 ++++---
python/py-numba/Portfile | 3 ++-
science/gerbil/Portfile | 1 +
science/gmsh/Portfile | 7 +++++--
science/kicad/Portfile | 6 +++---
science/nektarpp/Portfile | 17 +++++++++++++++--
science/root6/Portfile | 5 ++++-
29 files changed, 151 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cad/freecad/Portfile b/cad/freecad/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a4de7fb8c3e..cb4c700ff07 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cad/freecad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cad/freecad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ PortGroup boost 1.0
</span> PortGroup active_variants 1.1
github.setup FreeCAD FreeCAD 0.18.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> name freecad
categories cad
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,7 +120,7 @@ pre-configure {
</span> -DPYTHON_EXECUTABLE=${python_prefix}/bin/python${python_branch} \
-DShiboken_DIR=${python_prefix}/lib/cmake/Shiboken-1.2.4 \
-DPySide_DIR=${python_prefix}/lib/cmake/PySide-1.2.4 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DOCE_DIR=${frameworks_dir}/OCE.framework/Versions/0.17/Resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOCE_DIR=${prefix}/libexec/oce
</span> }
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/rocksdb/Portfile b/databases/rocksdb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c517078c4e5..deb0d17882d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/rocksdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/rocksdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,9 @@ variant jemalloc description "Use jemalloc" {
</span>
variant tbb description "Use TBB" {
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libtbb.dylib:onetbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:onetbb
</span> configure.args-replace \
-DWITH_TBB=OFF -DWITH_TBB=ON
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTBB_ROOT_DIR=${prefix}/libexec/tbb
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/onedpl/Portfile b/devel/onedpl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1466f9cca3a..1d74db052dd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/onedpl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/onedpl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup cmake 1.1
</span>
github.setup oneapi-src oneDPL 2022.0.0 oneDPL- -release
name onedpl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories devel parallel
platforms darwin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/pika/Portfile b/devel/pika/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9769b0a3732..677df48a9cd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/pika/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/pika/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,9 +103,10 @@ variant jemalloc conflicts tbb description "Use jemalloc instead of system mallo
</span>
variant tbb conflicts jemalloc description "Use oneTBB instead of system malloc" {
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:include/tbb/task_arena.h:onetbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:onetbb
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPIKA_WITH_MALLOC=tbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPIKA_WITH_MALLOC=tbbmalloc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTBBMALLOC_ROOT=${prefix}/libexec/onetbb
</span> }
variant tests description "Enable testing" {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/blender/Portfile b/graphics/blender/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 15b70474841..7f67da1905f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/blender/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/blender/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup boost 1.0
</span>
name blender
version 2.93.17
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories graphics multimedia
platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -406,6 +406,8 @@ configure.args-append -DLLVM_STATIC=OFF
</span> # MacPorts hasn't got NanoVDB from Nvidia, disable it
configure.args-append -DWITH_NANOVDB=OFF
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DTBB_ROOT_DIR=${prefix}/libexec/tbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
# Make sure that an addons_contrib folder makes it into the final
# distribution, even if it is empty.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/embree/Portfile b/graphics/embree/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d6855457100..286ebac472d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/embree/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/embree/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span> PortGroup cmake 1.1
github.setup embree embree 3.13.5 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories graphics
platforms darwin
license Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,6 +45,10 @@ SET(CMAKE_INSTALL_BINDIR \${CMAKE_INSTALL_PREFIX}/share/embree\${EMBREE_VERSION_
</span>
configure.args-append -DEMBREE_TUTORIALS=OFF
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# NOTE it may picks OneTBB via CMake config, disable it until port is migrated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DTBB_FIND_PACKAGE_OPTION=NO_DEFAULT_PATH \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTBB_ROOT=${prefix}/libexec/tbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
if {[file exists ${destroot}${prefix}/share/uninstall.command]} {
delete ${destroot}${prefix}/share/uninstall.command
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/oidn/Portfile b/graphics/oidn/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6a3c37e6c4b..cb31cca2106 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/oidn/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/oidn/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup legacysupport 1.1
</span>
github.setup OpenImageDenoise oidn 1.4.3 v
github.tarball_from releases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> extract.suffix .src${extract.suffix}
categories graphics
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,4 +44,6 @@ compiler.cxx_standard 2011
</span> # * https://reviews.llvm.org/D31417)
compiler.blacklist-append clang
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DOIDN_APPS_OPENIMAGEIO=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOIDN_APPS_OPENIMAGEIO=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTBB_ROOT=${prefix}/libexec/tbb
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv3-devel/Portfile b/graphics/opencv3-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bd9e29287bf..be32bcdc1e9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -552,8 +552,18 @@ if {${name} eq ${subport}} {
</span> -DWITH_TBB=OFF \
-DWITH_TBB=ON
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DHAVE_TBB=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DTBB_INCLUDE_DIRS=${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DHAVE_TBB=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # NOTE: TBB 2020 (tbb port) doesn't provide cmake package and to prevent
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # from pickinkg OneTBB it uses TBBROO env to verify that cmake picks the right one
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TBBROOT=${prefix}/libexec/tbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${prefix}/libexec/tbb/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${prefix}/libexec/tbb/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L${prefix}/libexec/tbb/lib
</span> }
variant vtk description {Include VTK support} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv3/Portfile b/graphics/opencv3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bb610429e99..08396506469 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -552,8 +552,18 @@ if {${name} eq ${subport}} {
</span> -DWITH_TBB=OFF \
-DWITH_TBB=ON
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DHAVE_TBB=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DTBB_INCLUDE_DIRS=${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DHAVE_TBB=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # NOTE: TBB 2020 (tbb port) doesn't provide cmake package and to prevent
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # from pickinkg OneTBB it uses TBBROO env to verify that cmake picks the right one
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TBBROOT=${prefix}/libexec/tbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${prefix}/libexec/tbb/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${prefix}/libexec/tbb/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L${prefix}/libexec/tbb/lib
</span> }
variant vtk description {Include VTK support} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv4-devel/Portfile b/graphics/opencv4-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8e83866779e..34590aa906d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv4-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv4-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -677,8 +677,18 @@ if {${name} eq ${subport}} {
</span> -DWITH_TBB:BOOL=OFF \
-DWITH_TBB:BOOL=ON
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DHAVE_TBB:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DTBB_INCLUDE_DIRS=${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DHAVE_TBB=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # NOTE: TBB 2020 (tbb port) doesn't provide cmake package and to prevent
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # from pickinkg OneTBB it uses TBBROO env to verify that cmake picks the right one
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TBBROOT=${prefix}/libexec/tbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${prefix}/libexec/tbb/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${prefix}/libexec/tbb/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L${prefix}/libexec/tbb/lib
</span> }
variant vtk description {Include VTK support} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv4/Portfile b/graphics/opencv4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a3573519280..5c97c21d3a1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -678,8 +678,18 @@ if {${name} eq ${subport}} {
</span> -DWITH_TBB:BOOL=OFF \
-DWITH_TBB:BOOL=ON
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DHAVE_TBB:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DTBB_INCLUDE_DIRS=${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DHAVE_TBB=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # NOTE: TBB 2020 (tbb port) doesn't provide cmake package and to prevent
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # from pickinkg OneTBB it uses TBBROO env to verify that cmake picks the right one
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TBBROOT=${prefix}/libexec/tbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${prefix}/libexec/tbb/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${prefix}/libexec/tbb/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-prepend \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L${prefix}/libexec/tbb/lib
</span> }
variant vtk description {Include VTK support} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openimageio/Portfile b/graphics/openimageio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 06e154741ce..1425ec5605f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openimageio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openimageio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup boost 1.0
github.setup OpenImageIO oiio 2.4.5.0 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> checksums rmd160 32b2b0f0b01268a91fc98cfca948a71e89d8e54b \
sha256 21177a9665021a99123885cd8383116d15013b6610b4b09bcf209612423fedc5 \
size 31938357
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +42,7 @@ configure.cxxflags-append \
</span> # this, it also forces used version of osl
if {${os.platform} eq "darwin" && ${os.major} < 20} {
github.setup OpenImageIO oiio 2.1.20.0 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 7
</span> checksums rmd160 d10c488b93ab2335d53545d8a1b35ba4c1babb98 \
sha256 75222543286d3a12473aa03fdb4e6c9f98760c5ad1ad89d3cf82a5da41385ae0 \
size 29115990
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -165,6 +165,12 @@ depends_lib-append port:libraw
</span> depends_lib-append port:tbb \
port:openvdb
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# NOTE it may picks OneTBB via CMake config, disable it until port is migrated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {!(${os.platform} eq "darwin" && ${os.major} < 18)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-manual-tbb.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DTBB_ROOT=${prefix}/libexec/tbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # not in MacPorts
configure.args-append -DUSE_NUKE=OFF
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openimageio/files/patch-manual-tbb.diff b/graphics/openimageio/files/patch-manual-tbb.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4da0941303f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openimageio/files/patch-manual-tbb.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/cmake/externalpackages.cmake src/cmake/externalpackages.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3ca046b2..daf1d17e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/cmake/externalpackages.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/cmake/externalpackages.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -187,8 +187,7 @@ checked_find_package (OpenCV 3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Intel TBB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set (TBB_USE_DEBUG_BUILD OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checked_find_package (TBB 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SETVARIABLES OIIO_TBB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PREFER_CONFIG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SETVARIABLES OIIO_TBB)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checked_find_package (DCMTK VERSION_MIN 3.6.1) # For DICOM images
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checked_find_package (FFmpeg VERSION_MIN 3.0)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opensubdiv/Portfile b/graphics/opensubdiv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 76e55a4ec8f..e0908cdd2ab 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opensubdiv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opensubdiv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span> PortGroup cmake 1.1
github.setup PixarAnimationStudios OpenSubdiv 3_4_4 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> name opensubdiv
version [string map {_ .} ${github.version}]
categories graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,6 +77,7 @@ configure.args -DCMAKE_BINDIR_BASE=${prefix}/share/${name} \
</span> -DNO_CUDA=1 \
-DNO_CLEW=1 \
-DNO_OMP=1 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTBB_LOCATION=${prefix}/libexec/tbb \
</span> -DCMAKE_AR=${prefix}/bin/ar \
-DCMAKE_NM=${prefix}/bin/nm \
-DCMAKE_OBJDUMP=${prefix}/bin/objdump \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openvdb/Portfile b/graphics/openvdb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b26dd7fb90e..0f4e12b225c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openvdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openvdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup boost 1.0
github.setup AcademySoftwareFoundation openvdb 10.0.1 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories graphics
platforms darwin
license {MPL-2 LGPL-2.1+}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,6 +46,9 @@ depends_lib-append port:zlib \
</span> port:ilmbase \
port:openexr
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DTBB_INCLUDEDIR=${prefix}/libexec/tbb/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTBB_LIBRARYDIR=${prefix}/libexec/tbb/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # avoid
# ccache: error: Failed to create directory
# ${prefix}/var/macports/build/.ccache/tmp: Operation not permitted
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/usd/Portfile b/graphics/usd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 16768164390..c47cf83ea22 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/usd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/usd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ PortGroup boost 1.0
</span>
github.setup PixarAnimationStudios USD 20.05 v
name usd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> categories graphics
platforms darwin
license Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,6 +107,9 @@ configure.args -DPXR_BUILD_TESTS=OFF \
</span> -DPXR_ENABLE_HDF5_SUPPORT=OFF \
-DPXR_ENABLE_PTEX_SUPPORT=OFF
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TBBROOT=${prefix}/libexec/tbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-test {
if {![variant_isset tests]} {
ui_error "'tests' variant must be activated to enable test support"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/vtk-m/Portfile b/graphics/vtk-m/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7c8562a5ada..11def71b170 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/vtk-m/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/vtk-m/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup gitlab 1.0
</span>
gitlab.setup vtk vtk-m 1.7.1 v
gitlab.instance https://gitlab.kitware.com
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories graphics science devel
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,7 +63,10 @@ variant tbb description {Enable Intel Threading Building Blocks support} {
</span> configure.args-replace \
-DVTKm_ENABLE_TBB=OFF -DVTKm_ENABLE_TBB=ON
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # NOTE: since v1.9.0 it picks OneTBB via TBBConfig.cmake before checking TBB_ROOT
</span> depends_lib-append port:tbb
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TBB_ROOT=${prefix}/libexec/tbb
</span> }
livecheck.url https://gitlab.kitware.com/vtk/vtk-m/-/tags?format=atom
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/qore/Portfile b/lang/qore/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9ddf2281412..2e8d3e0fdba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/qore/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/qore/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,7 @@ PortSystem 1.0
</span> PortGroup github 1.0
github.setup qorelanguage qore 1.14.2 release-
github.tarball_from releases
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,3 +40,8 @@ compiler.thread_local_storage yes
</span>
configure.args-append -DSINGLE_COMPILATION_UNIT=1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# check_function_exists doesn't catch tbb's function, enforce it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INCLUDE_PATH="${prefix}/include\;${prefix}/libexec/tbb/include" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_LIBRARY_PATH="${prefix}/lib\;${prefix}/libexec/tbb/lib" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DHAVE_TBBMALLOC=ON
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/deal.ii/Portfile b/math/deal.ii/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 372f8399452..6eae1855c7c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/deal.ii/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/deal.ii/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ PortGroup boost 1.0
</span>
name deal.ii
github.setup dealii dealii 9.4.1 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> categories math science
license LGPL-2.1+
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,6 +75,7 @@ depends_lib-append port:gmsh \
</span> port:metis \
port:muparser \
port:opencascade
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append CASROOT=${prefix}/libexec/opencascade
</span> configure.args-append -DDEAL_II_WITH_P4EST=OFF \
-DDEAL_II_WITH_PETSC=OFF \
-DDEAL_II_WITH_SCALAPACK=OFF \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/papilo/Portfile b/math/papilo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 33762461094..795bdbe9c50 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/papilo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/papilo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ PortGroup compilers 1.0
</span>
# NOTE: PaPILO can be used as a header-based library, please bump all dependent ports
github.setup scipopt papilo 2.1.2 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories math
license {LGPL-3 GPL-3}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/scip/Portfile b/math/scip/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6a9818337c1..4125edbd2c3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/scip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/scip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup compilers 1.0
</span>
name scip
version 8.0.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories math
license Apache-2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/stanmath/Portfile b/math/stanmath/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7ccbdc6f62c..54c5f92d481 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/stanmath/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/stanmath/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,6 +6,7 @@ PortGroup github 1.0
</span>
github.setup stan-dev math 4.6.1 v
name stanmath
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories math
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +26,7 @@ boost.depends_type run
</span>
# compiler define -DTBB_INTERFACE_NEW chooses oneTBB over TBB.
depends_run-append path:include/eigen3:eigen3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:include/tbb/task_arena.h:onetbb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:onetbb \
</span> port:sundials6
use_configure no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-mkl/Portfile b/python/py-mkl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a5fe5016218..37b5285166c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-mkl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-mkl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 19} {
</span> } else {
version 2023.1.0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
# https://software.intel.com/en-us/license/intel-simplified-software-license
license Restrictive/Distributable
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,8 +108,9 @@ if {${name} ne ${subport}} {
</span> set PythonVersionWithDot [string index ${python.version} 0].[string range ${python.version} 1 end]
set py_lib_root ${prefix}/Library/Frameworks/Python.framework/Versions/${PythonVersionWithDot}/lib
foreach dlib [glob -directory ${destroot}${py_lib_root} *.dylib] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -add_rpath ${prefix}/lib ${dlib} ; echo true"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "install_name_tool -add_rpath ${prefix}/lib/libomp ${dlib} ; echo true"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -add_rpath ${prefix}/lib ${dlib} ; echo true"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -add_rpath ${prefix}/lib/libomp ${dlib} ; echo true"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -add_rpath ${prefix}/libexec/tbb ${dlib} ; echo true"
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numba/Portfile b/python/py-numba/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 237dcd49ef3..05a0a6e904c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-numba/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numba/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,6 +7,7 @@ PortGroup compiler_wrapper 1.0
</span>
github.setup numba numba 0.57.0
name py-numba
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories-append devel
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +30,7 @@ checksums rmd160 f1e50c2151c27192ccbe2e4ffdec81132721535a \
</span>
variant tbb description "Add support for TBB" {
depends_lib-append port:onetbb
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append TBBROOT=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append TBBROOT=${prefix}/libexec/onetbb
</span> }
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gerbil/Portfile b/science/gerbil/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bf206ba86b7..a274bcbdd0c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gerbil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gerbil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,6 +35,7 @@ boost.version 1.71
</span> cmake.out_of_source yes
configure.args-append \
-DOpenCV_DIR="${prefix}/libexec/opencv4/cmake" \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTBB_ROOT_DIR=${prefix}/libexec/tbb \
</span> -DCMAKE_BUILD_TYPE=Release
# the gerbil makefiles do not provide an install target
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmsh/Portfile b/science/gmsh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fed2f683b5c..211971230be 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmsh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gmsh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup muniversal 1.1
</span>
name gmsh
version 4.11.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories science
license GPL-2+
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +70,7 @@ configure.args-append -DENABLE_BUILD_LIB=ON \
</span> configure.args-append -DENABLE_ACIS=OFF \
-DENABLE_GETDP=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append CASROOT=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append CASROOT=${prefix}/libexec/opencascade
</span>
pre-configure {
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,6 +108,9 @@ variant petsc description {Enable PETSc linear solvers and SLEPc eigensolvers} {
</span>
variant oce description {use Community Edition version of Open CASCADE} {
depends_lib-replace port:opencascade port:oce
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CASROOT=${prefix}/libexec/opencascade \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CASROOT=${prefix}/libexec/oce
</span> }
variant openmp description {enable support for OpenMP} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/kicad/Portfile b/science/kicad/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1f968841706..f80f4d7fad1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/kicad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/kicad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ if {${name} eq ${subport}} {
</span> checksums rmd160 b13a0b899f0548ed8ff76c0c78d33f80c1ab7473 \
sha256 f2b7ad72942c7e154bebb06d4e6d9fd7ea765f679edafb25b059b387860fbe5d \
size 34083016
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
patchfiles-append \
wxwidgets-4.1-deprecated.patch \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,8 +76,8 @@ if {${name} eq ${subport}} {
</span> -DDOXYGEN_DOT_EXECUTABLE=${prefix}/bin/dot \
-DDOXYGEN_EXECUTABLE=${prefix}/bin/doxygen \
-DNGSPICE_LIB_NAME=libngspice.0.dylib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DOCC_INCLUDE_DIR=${prefix}/include/opencascade \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DOCC_LIBRARY_DIR=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOCC_INCLUDE_DIR=${prefix}/libexec/opencascade/include/opencascade \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOCC_LIBRARY_DIR=${prefix}/libexec/opencascade/lib \
</span> -Wno-dev
post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/nektarpp/Portfile b/science/nektarpp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6b3f62e140a..51b2293ec82 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/nektarpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/nektarpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,10 +9,16 @@ PortGroup boost 1.0
</span> gitlab.instance https://gitlab.nektar.info
gitlab.setup nektar nektar 5.2.0 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-boost.version 1.71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Boost 1.71 can't be used because
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Undefined symbols for architecture x86_64:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# "boost::filesystem::detail::create_directory(boost::filesystem::path const&, boost::filesystem::path const*, boost::system::error_code*)", referenced from:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Nektar::LibUtilities::FieldIO::SetUpOutput(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, bool, bool) in FieldIO.cpp.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# "boost::filesystem::detail::directory_iterator_construct(boost::filesystem::directory_iterator&, boost::filesystem::path const&, unsigned int, boost::system::error_code*)", referenced from:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Nektar::LibUtilities::FieldIO::GetFileType(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, std::__1::shared_ptr<Nektar::LibUtilities::Comm>) in FieldIO.cpp.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+boost.version 1.76
</span>
name nektarpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span>
categories science
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,6 +123,13 @@ variant oce description {
</span> depends_lib-replace port:opencascade port:oce
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# NOTE: v5.2.0 looking for OCE before OpenCASCADE, disable when it doesn't required
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset oce]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "/FIND_PACKAGE\(OCE /s/^/#/g" ${worksrcpath}/cmake/FindOCC.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-extract {
# Copy additional third-party sources into correct position.
file mkdir ${worksrcpath}/ThirdParty
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/root6/Portfile b/science/root6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fc9c4bdc9ad..a1ec77ad85a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/root6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/root6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@ PortGroup legacysupport 1.1
</span> # Please also check if Gate needs a revbump after root6 update
github.setup root-project root 6-28-02 v
version [string map {- .} ${github.version}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> livecheck.version ${github.version}
# Use git commit
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -164,6 +164,9 @@ configure.args-append \
</span> -DPNG_LIBRARY=${prefix}/lib/libpng.dylib \
-DPNG_PNG_INCLUDE_DIR=${prefix}/include
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TBB_ROOT=${prefix}/libexec/tbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Work-around until ROOT supports building for macOS 11.X as deployment target.
if {${os.platform} eq "darwin" && ${os.major} >= 20} {
macosx_deployment_target 10.16
</pre><pre style='margin:0'>
</pre>