git: 83f444184530 - main - science/opensph: Disable options related to TBB (TBB, VDB) until OpenSPH supports OneTBB.

[Yuri Victorovich]

The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=83f4441845300a1698c0b7452df8f3e692a16fdc

commit 83f4441845300a1698c0b7452df8f3e692a16fdc
Author:     Yuri Victorovich <yuri at FreeBSD.org>
AuthorDate: 2021-08-15 08:05:00 +0000
Commit:     Yuri Victorovich <yuri at FreeBSD.org>
CommitDate: 2021-08-15 09:32:16 +0000

    science/opensph: Disable options related to TBB (TBB,VDB) until OpenSPH supports OneTBB.
    
    Reason: misc/openvdb will soon switch to devel/onetbb and would become incompatible otherwise.
---
 science/opensph/Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/science/opensph/Makefile b/science/opensph/Makefile
index 5fa87c13d31e..858225997b6a 100644
--- a/science/opensph/Makefile
+++ b/science/opensph/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	OpenSPH
 DISTVERSION=	0.3.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 
 MAINTAINER=	yuri at FreeBSD.org
@@ -32,7 +32,7 @@ BINARY_ALIAS=	wx-config=${LOCALBASE}/bin/wxgtk3u-3.1-config
 PLIST_FILES=	bin/opensph bin/opensph-cli bin/opensph-info
 
 OPTIONS_DEFINE=			CHAISCRIPT EIGEN HDF5 OPENMP TBB VDB
-OPTIONS_DEFAULT=		CHAISCRIPT EIGEN HDF5 OPENMP TBB VDB
+OPTIONS_DEFAULT=		CHAISCRIPT EIGEN HDF5 OPENMP # TBB VDB - disabled pending OneTBB support, see https://gitlab.com/sevecekp/sph/-/issues/36
 
 CHAISCRIPT_DESC=		Be able to read and modify particle data from a script
 CHAISCRIPT_QMAKE_ON=		CONFIG+=use_chaiscript
@@ -50,13 +50,15 @@ OPENMP_QMAKE_ON=		CONFIG+=use_openmp
 
 TBB_DESC=			Parallelize with Intel Threading Building Blocks
 TBB_QMAKE_ON=			CONFIG+=use_tbb
-TBB_LIB_DEPENDS=		libtbb.so:devel/tbb
+TBB_LIB_DEPENDS=		libtbb.so:devel/onetbb
+TBB_BROKEN=			OneTBB support is missing, but the dependency misc/openvdb already switched to OneTBB
 
 VDB_DESC=			Use OpenVDB for converting particles to volumetric data
 VDB_QMAKE_ON=			CONFIG+=use_vdb
 VDB_LIB_DEPENDS=		libImath.so:math/Imath \
 				libopenvdb.so:misc/openvdb \
-				libtbb.so:devel/tbb
+				libtbb.so:devel/onetbb
+VDB_BROKEN=			OneTBB support is missing, but the dependency misc/openvdb already switched to OneTBB
 
 do-test:
 	@${REINPLACE_CMD} -e 's|Path(.*|Path("${TEST_WRKSRC}");|' ${WRKSRC}/test/utils/Config.h