math/{,py-}heyoka: Update 0.18.0 -> 0.19.0

Reported by:	portscout

7 files changed, 36 insertions, 33 deletions

diff --git a/math/heyoka/Makefile b/math/heyoka/Makefile
index 3ac77714b7d5..63b8ac5e1789 100644
--- a/math/heyoka/Makefile
+++ b/math/heyoka/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	heyoka
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.18.0
-PORTREVISION=	2
+DISTVERSION=	0.19.0
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/math/heyoka/distinfo b/math/heyoka/distinfo
index e54e5c3f8765..df32dcdb8d3f 100644
--- a/math/heyoka/distinfo
+++ b/math/heyoka/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1652286102
-SHA256 (bluescarni-heyoka-v0.18.0_GH0.tar.gz) = 2a14a988d973d9a76424df05d38f89ae64f7a1e1c12131022e338fe2de2dcb94
-SIZE (bluescarni-heyoka-v0.18.0_GH0.tar.gz) = 103041768
+TIMESTAMP = 1663717406
+SHA256 (bluescarni-heyoka-v0.19.0_GH0.tar.gz) = 7a7634379233be778fd6b15090df287787cc429314ec521d0336cdc1ae26642a
+SIZE (bluescarni-heyoka-v0.19.0_GH0.tar.gz) = 103075151
diff --git a/math/heyoka/pkg-plist b/math/heyoka/pkg-plist
index 069c5af345db..220773c75d09 100644
--- a/math/heyoka/pkg-plist
+++ b/math/heyoka/pkg-plist
@@ -2,8 +2,10 @@ include/heyoka/callable.hpp
 include/heyoka/celmec/vsop2013.hpp
 include/heyoka/config.hpp
 include/heyoka/detail/binomial.hpp
+include/heyoka/detail/cm_utils.hpp
 include/heyoka/detail/dfloat.hpp
 include/heyoka/detail/event_detection.hpp
+include/heyoka/detail/fmt_compat.hpp
 include/heyoka/detail/fwd_decl.hpp
 include/heyoka/detail/igor.hpp
 include/heyoka/detail/llvm_fwd.hpp
@@ -76,5 +78,5 @@ lib/cmake/heyoka/heyoka-config.cmake
 lib/cmake/heyoka/heyoka_export-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/heyoka/heyoka_export.cmake
 lib/libheyoka.so
-lib/libheyoka.so.18
-lib/libheyoka.so.18.0
+lib/libheyoka.so.19
+lib/libheyoka.so.19.0
diff --git a/math/py-heyoka/Makefile b/math/py-heyoka/Makefile
index 8cd01a3d5f46..f51838deb38e 100644
--- a/math/py-heyoka/Makefile
+++ b/math/py-heyoka/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	heyoka
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.18.0
-PORTREVISION=	2
+DISTVERSION=	0.19.0
 CATEGORIES=	math
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -12,11 +11,13 @@ WWW=		https://bluescarni.github.io/heyoka.py/
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	pybind11>0:devel/pybind11
+BUILD_DEPENDS=	pybind11>0:devel/pybind11 \
+		${PYNUMPY}
 LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs \
 		libfmt.so:devel/libfmt \
 		libheyoka.so:math/heyoka \
 		libmp++.so:math/mppp \
+		libtbb.so:devel/onetbb \
 		libspdlog.so:devel/spdlog
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}cloudpickle>0:devel/py-cloudpickle@${PY_FLAVOR} \
@@ -32,12 +33,14 @@ GH_ACCOUNT=	bluescarni
 GH_PROJECT=	${PORTNAME}.py
 
 CMAKE_ON=	HEYOKA_PY_ENABLE_IPO
-CMAKE_ARGS=	-DFREEBSD_PYTHON_DISTVERSION=${PYTHON_DISTVERSION}
+CMAKE_ARGS=	-DFREEBSD_PYTHON_DISTVERSION=${PYTHON_DISTVERSION:R}
 
-do-test: install
+TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
+
+do-test:
 	# testsuite based on instructions in https://bluescarni.github.io/heyoka.py/install.html#verifying-the-installation
-	@${PYTHON_CMD} -c "import heyoka; heyoka.test.run_test_suite();"
+	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -c "import heyoka; heyoka.test.run_test_suite();"
 	# integrate and plot an example
-	@${PYTHON_CMD} ${FILESDIR}/example-restricted-three-body-problem.py
+	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${FILESDIR}/example-restricted-three-body-problem.py
 
 .include <bsd.port.mk>
diff --git a/math/py-heyoka/distinfo b/math/py-heyoka/distinfo
index 0c493d315b9c..2fc1dd2f9d27 100644
--- a/math/py-heyoka/distinfo
+++ b/math/py-heyoka/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1652378005
-SHA256 (bluescarni-heyoka.py-v0.18.0_GH0.tar.gz) = 88082a64dedac71f08f1222d8659befe14edcdcff01158e9a99fcc534d11b97a
-SIZE (bluescarni-heyoka.py-v0.18.0_GH0.tar.gz) = 101967972
+TIMESTAMP = 1663734102
+SHA256 (bluescarni-heyoka.py-v0.19.0_GH0.tar.gz) = 5191a6976fe89f14c6cde0d69607397db059009fecb0a3390c4b33c29e5d31ea
+SIZE (bluescarni-heyoka.py-v0.19.0_GH0.tar.gz) = 101947693
diff --git a/math/py-heyoka/files/patch-CMakeLists.txt b/math/py-heyoka/files/patch-CMakeLists.txt
index 69e357ccfe68..09dff89eed8a 100644
--- a/math/py-heyoka/files/patch-CMakeLists.txt
+++ b/math/py-heyoka/files/patch-CMakeLists.txt
@@ -1,11 +1,20 @@
---- CMakeLists.txt.orig	2022-05-11 09:27:30 UTC
+--- CMakeLists.txt.orig	2022-09-19 07:53:52 UTC
 +++ CMakeLists.txt
-@@ -136,7 +136,7 @@ if(${heyoka_VERSION} VERSION_LESS ${_HEYOKA_PY_MIN_HEY
+@@ -144,7 +144,7 @@ else()
+     # and Python3 is *not* found, we try again, this time with the full Development
+     # component (rather than only Development.Module). This seems to work around the
+     # issue, for now at least.
+-    find_package(Python3 QUIET COMPONENTS ${_HEYOKA_PY_PYTHON3_COMPONENTS})
++    find_package(Python3 ${FREEBSD_PYTHON_DISTVERSION} QUIET COMPONENTS ${_HEYOKA_PY_PYTHON3_COMPONENTS})
+ 
+     if(NOT Python3_FOUND)
+         list(POP_BACK _HEYOKA_PY_PYTHON3_COMPONENTS)
+@@ -152,7 +152,7 @@ else()
+     endif()
  endif()
  
- # Python.
--find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
-+find_package(Python3 ${FREEBSD_PYTHON_DISTVERSION} REQUIRED EXACT COMPONENTS Interpreter Development)
+-find_package(Python3 QUIET REQUIRED COMPONENTS ${_HEYOKA_PY_PYTHON3_COMPONENTS})
++find_package(Python3 ${FREEBSD_PYTHON_DISTVERSION} QUIET REQUIRED COMPONENTS ${_HEYOKA_PY_PYTHON3_COMPONENTS})
+ 
  message(STATUS "Python3 interpreter: ${Python3_EXECUTABLE}")
  message(STATUS "Python3 installation directory: ${Python3_SITEARCH}")
- if(${Python3_VERSION_MINOR} LESS 5)
diff --git a/math/py-heyoka/files/patch-heyoka_core.cpp b/math/py-heyoka/files/patch-heyoka_core.cpp
deleted file mode 100644
index 71a64aed3772..000000000000
--- a/math/py-heyoka/files/patch-heyoka_core.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- heyoka/core.cpp.orig	2022-07-28 02:38:59 UTC
-+++ heyoka/core.cpp
-@@ -14,6 +14,7 @@
- #include <exception>
- #include <functional>
- #include <initializer_list>
-+#include <iostream>
- #include <optional>
- #include <sstream>
- #include <string>