diff --git a/math/heyoka/Makefile b/math/heyoka/Makefile
index 00c9347447bf..f3abc7260f2b 100644
--- a/math/heyoka/Makefile
+++ b/math/heyoka/Makefile
@@ -1,48 +1,41 @@
 PORTNAME=	heyoka
 DISTVERSIONPREFIX=	v
-DISTVERSION=	5.0.0
-PORTREVISION=	1
+DISTVERSION=	6.0.0
 CATEGORIES=	math
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	e9ca3726897a0b114876f4486d8903740c167893.patch:-p1 # 4 release followup patches from https://github.com/bluescarni/heyoka/pull/428
-PATCHFILES+=	86e10d0115074b347d74e78102d59395091c66ac.patch:-p1
-PATCHFILES+=	c5609ec799822a3a44044d061a8376221863f747.patch:-p1
-PATCHFILES+=	f60ce702cb5d2005598c139c87a2b93460f0771a.patch:-p1
-
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ library for ODE integration via Taylor's method and LLVM
 WWW=		https://bluescarni.github.io/heyoka/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_FreeBSD_13=	compilation fails: no member named 'transform' in namespace 'std::ranges'; did you mean 'llvm::transform' (std::ranges::transform isn't present)
 
 LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs \
 		libfmt.so:devel/libfmt \
 		libgmp.so:math/gmp \
 		libmp++.so:math/mppp \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr \
 		libtbb.so:devel/onetbb \
 		libsleef.so:math/sleef \
 		libspdlog.so:devel/spdlog
 TEST_DEPENDS=	xtensor>0:math/xtensor \
 		xtensor-blas>0:math/xtensor-blas
 
-USES=		cmake:testing compiler:c++17-lang llvm:min=16,build,run
+USES=		cmake:testing compiler:c++20-lang llvm:min=16,build,run
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bluescarni
 
 CMAKE_ON=		HEYOKA_WITH_MPPP HEYOKA_WITH_SLEEF
 CMAKE_ARGS=		-DFREEBSD_LLVM_VERSION=${LLVM_VERSION}
 CMAKE_TESTING_ON=	HEYOKA_BUILD_TESTS # 1 test fails, see https://github.com/bluescarni/heyoka/issues/338
 
 # 2 tests fail:
 # * https://github.com/bluescarni/heyoka/issues/429
 # * https://github.com/bluescarni/heyoka/issues/430
 
 .include <bsd.port.mk>
diff --git a/math/heyoka/distinfo b/math/heyoka/distinfo
index bd390a29c892..b344e48194e1 100644
--- a/math/heyoka/distinfo
+++ b/math/heyoka/distinfo
@@ -1,11 +1,3 @@
-TIMESTAMP = 1718356708
-SHA256 (bluescarni-heyoka-v5.0.0_GH0.tar.gz) = e9a4b5683a08706addc1b448e232f1e269d78586859fe3f4d93d4c5eee3bc8ae
-SIZE (bluescarni-heyoka-v5.0.0_GH0.tar.gz) = 104391096
-SHA256 (e9ca3726897a0b114876f4486d8903740c167893.patch) = ebc1dcf41e0b827512fd7551152c3b16b188b69b8b3e6236e594859aa79a8c61
-SIZE (e9ca3726897a0b114876f4486d8903740c167893.patch) = 1198
-SHA256 (86e10d0115074b347d74e78102d59395091c66ac.patch) = 9813a89a0f749872424715827f31a7683df290bc58675746583ed0da7337183a
-SIZE (86e10d0115074b347d74e78102d59395091c66ac.patch) = 2573
-SHA256 (c5609ec799822a3a44044d061a8376221863f747.patch) = 96203f43462281e176fec3a50b3e95d1482a98c341d3f51ea2251df6bd3a0ddf
-SIZE (c5609ec799822a3a44044d061a8376221863f747.patch) = 2701
-SHA256 (f60ce702cb5d2005598c139c87a2b93460f0771a.patch) = d1887691e6b13c39dbd551d58f1be647cda9548b48a86732e5eaf8b535568b7a
-SIZE (f60ce702cb5d2005598c139c87a2b93460f0771a.patch) = 1941
+TIMESTAMP = 1726978227
+SHA256 (bluescarni-heyoka-v6.0.0_GH0.tar.gz) = 9cf56a6a29db5c72c5203af70d568aede78cb549baf1505b8abd04b888492895
+SIZE (bluescarni-heyoka-v6.0.0_GH0.tar.gz) = 104464800
diff --git a/math/heyoka/pkg-plist b/math/heyoka/pkg-plist
index bdc5e0fb5b17..7f564523e6ba 100644
--- a/math/heyoka/pkg-plist
+++ b/math/heyoka/pkg-plist
@@ -1,142 +1,149 @@
 include/heyoka/callable.hpp
 include/heyoka/callback/angle_reducer.hpp
 include/heyoka/callbacks.hpp
 include/heyoka/config.hpp
 include/heyoka/continuous_output.hpp
+include/heyoka/detail/aligned_buffer.hpp
 include/heyoka/detail/binomial.hpp
 include/heyoka/detail/cm_utils.hpp
+include/heyoka/detail/debug.hpp
 include/heyoka/detail/dfloat.hpp
 include/heyoka/detail/div.hpp
 include/heyoka/detail/dtens_impl.hpp
 include/heyoka/detail/ed_data.hpp
 include/heyoka/detail/elp2000/elp2000_10_15.hpp
 include/heyoka/detail/elp2000/elp2000_16_21.hpp
 include/heyoka/detail/elp2000/elp2000_1_3.hpp
 include/heyoka/detail/elp2000/elp2000_22_36.hpp
 include/heyoka/detail/elp2000/elp2000_4_9.hpp
 include/heyoka/detail/event_detection.hpp
 include/heyoka/detail/fast_unordered.hpp
 include/heyoka/detail/func_cache.hpp
 include/heyoka/detail/fwd_decl.hpp
 include/heyoka/detail/i_data.hpp
 include/heyoka/detail/igor.hpp
 include/heyoka/detail/llvm_func_create.hpp
 include/heyoka/detail/llvm_fwd.hpp
 include/heyoka/detail/llvm_helpers.hpp
 include/heyoka/detail/llvm_vector_type.hpp
 include/heyoka/detail/logging_impl.hpp
 include/heyoka/detail/mdspan/__p0009_bits/compressed_pair.hpp
 include/heyoka/detail/mdspan/__p0009_bits/config.hpp
 include/heyoka/detail/mdspan/__p0009_bits/default_accessor.hpp
 include/heyoka/detail/mdspan/__p0009_bits/dynamic_extent.hpp
 include/heyoka/detail/mdspan/__p0009_bits/extents.hpp
 include/heyoka/detail/mdspan/__p0009_bits/full_extent_t.hpp
 include/heyoka/detail/mdspan/__p0009_bits/layout_left.hpp
 include/heyoka/detail/mdspan/__p0009_bits/layout_right.hpp
 include/heyoka/detail/mdspan/__p0009_bits/layout_stride.hpp
 include/heyoka/detail/mdspan/__p0009_bits/macros.hpp
 include/heyoka/detail/mdspan/__p0009_bits/mdspan.hpp
 include/heyoka/detail/mdspan/__p0009_bits/no_unique_address.hpp
 include/heyoka/detail/mdspan/__p0009_bits/trait_backports.hpp
 include/heyoka/detail/mdspan/__p0009_bits/type_list.hpp
 include/heyoka/detail/mdspan/__p1684_bits/mdarray.hpp
 include/heyoka/detail/mdspan/__p2630_bits/strided_slice.hpp
 include/heyoka/detail/mdspan/__p2630_bits/submdspan.hpp
 include/heyoka/detail/mdspan/__p2630_bits/submdspan_extents.hpp
 include/heyoka/detail/mdspan/__p2630_bits/submdspan_mapping.hpp
 include/heyoka/detail/mdspan/mdarray
 include/heyoka/detail/mdspan/mdspan
 include/heyoka/detail/num_identity.hpp
 include/heyoka/detail/num_utils.hpp
 include/heyoka/detail/optional_s11n.hpp
 include/heyoka/detail/real_helpers.hpp
+include/heyoka/detail/rng_to_vec.hpp
 include/heyoka/detail/simple_timer.hpp
 include/heyoka/detail/string_conv.hpp
 include/heyoka/detail/sub.hpp
 include/heyoka/detail/sum_sq.hpp
 include/heyoka/detail/tanuki.hpp
 include/heyoka/detail/tanuki_impl.hpp
 include/heyoka/detail/taylor_common.hpp
 include/heyoka/detail/type_traits.hpp
 include/heyoka/detail/variant_s11n.hpp
 include/heyoka/detail/vector_math.hpp
 include/heyoka/detail/visibility.hpp
 include/heyoka/detail/vsop2013/vsop2013_1.hpp
 include/heyoka/detail/vsop2013/vsop2013_2.hpp
 include/heyoka/detail/vsop2013/vsop2013_3.hpp
 include/heyoka/detail/vsop2013/vsop2013_4.hpp
 include/heyoka/detail/vsop2013/vsop2013_5.hpp
 include/heyoka/detail/vsop2013/vsop2013_6.hpp
 include/heyoka/detail/vsop2013/vsop2013_7.hpp
 include/heyoka/detail/vsop2013/vsop2013_8.hpp
 include/heyoka/detail/vsop2013/vsop2013_9.hpp
 include/heyoka/ensemble_propagate.hpp
 include/heyoka/events.hpp
 include/heyoka/exceptions.hpp
 include/heyoka/expression.hpp
 include/heyoka/func.hpp
 include/heyoka/gp.hpp
 include/heyoka/hamiltonian.hpp
 include/heyoka/heyoka.hpp
 include/heyoka/kw.hpp
 include/heyoka/lagrangian.hpp
 include/heyoka/llvm_state.hpp
 include/heyoka/logging.hpp
 include/heyoka/math.hpp
 include/heyoka/math/acos.hpp
 include/heyoka/math/acosh.hpp
 include/heyoka/math/asin.hpp
 include/heyoka/math/asinh.hpp
 include/heyoka/math/atan.hpp
 include/heyoka/math/atan2.hpp
 include/heyoka/math/atanh.hpp
 include/heyoka/math/constants.hpp
 include/heyoka/math/cos.hpp
 include/heyoka/math/cosh.hpp
 include/heyoka/math/dfun.hpp
 include/heyoka/math/erf.hpp
 include/heyoka/math/exp.hpp
 include/heyoka/math/kepDE.hpp
 include/heyoka/math/kepE.hpp
 include/heyoka/math/kepF.hpp
 include/heyoka/math/log.hpp
+include/heyoka/math/logical.hpp
 include/heyoka/math/pow.hpp
 include/heyoka/math/prod.hpp
+include/heyoka/math/relational.hpp
 include/heyoka/math/relu.hpp
+include/heyoka/math/select.hpp
 include/heyoka/math/sigmoid.hpp
 include/heyoka/math/sin.hpp
 include/heyoka/math/sinh.hpp
 include/heyoka/math/sqrt.hpp
 include/heyoka/math/sum.hpp
 include/heyoka/math/tan.hpp
 include/heyoka/math/tanh.hpp
 include/heyoka/math/time.hpp
 include/heyoka/mdspan.hpp
 include/heyoka/model/cart2geo.hpp
 include/heyoka/model/cr3bp.hpp
 include/heyoka/model/elp2000.hpp
 include/heyoka/model/ffnn.hpp
 include/heyoka/model/fixed_centres.hpp
 include/heyoka/model/jb08_tn.hpp
 include/heyoka/model/mascon.hpp
 include/heyoka/model/nbody.hpp
 include/heyoka/model/nrlmsise00_tn.hpp
 include/heyoka/model/pendulum.hpp
 include/heyoka/model/rotating.hpp
+include/heyoka/model/sgp4.hpp
 include/heyoka/model/vsop2013.hpp
 include/heyoka/models.hpp
 include/heyoka/number.hpp
 include/heyoka/param.hpp
 include/heyoka/s11n.hpp
 include/heyoka/splitmix64.hpp
 include/heyoka/step_callback.hpp
 include/heyoka/taylor.hpp
 include/heyoka/var_ode_sys.hpp
 include/heyoka/variable.hpp
 lib/cmake/heyoka/heyoka-config-version.cmake
 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.28
-lib/libheyoka.so.28.0
+lib/libheyoka.so.30
+lib/libheyoka.so.30.0
diff --git a/math/py-heyoka/Makefile b/math/py-heyoka/Makefile
index ce1cf6006a5c..fdca6765393c 100644
--- a/math/py-heyoka/Makefile
+++ b/math/py-heyoka/Makefile
@@ -1,51 +1,50 @@
 PORTNAME=	heyoka
 DISTVERSIONPREFIX=	v
-DISTVERSION=	5.0.1
-PORTREVISION=	1
+DISTVERSION=	6.0.0
 CATEGORIES=	math
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python library for ODE integration via Taylor's method and LLVM
 WWW=		https://bluescarni.github.io/heyoka.py/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	pybind11>0:devel/pybind11 \
 		${PYNUMPY}
 LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs \
 		libfmt.so:devel/libfmt \
 		libgmp.so:math/gmp \
 		libheyoka.so:math/heyoka \
 		libmp++.so:math/mppp \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr \
 		libtbb.so:devel/onetbb \
 		libspdlog.so:devel/spdlog
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}cloudpickle>0:devel/py-cloudpickle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mpmath>0:math/py-mpmath@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
 
 USES=		cmake compiler:c++17-lang llvm:min=16,build,run python
 USE_PYTHON=	flavors
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bluescarni
 GH_PROJECT=	${PORTNAME}.py
 
 CMAKE_ON=	HEYOKA_PY_ENABLE_IPO
 CMAKE_ARGS=	-DFREEBSD_PYTHON_DISTVERSION=${PYTHON_DISTVERSION:R} \
 		-DPython3_EXECUTABLE=${PYTHON_CMD}
 
 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
 	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -c "import heyoka; heyoka.test.run_test_suite();"
 	# integrate and plot an example
 	@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 4fd40a96b109..75f8f60eeb03 100644
--- a/math/py-heyoka/distinfo
+++ b/math/py-heyoka/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1718439020
-SHA256 (bluescarni-heyoka.py-v5.0.1_GH0.tar.gz) = 5a2b71ace5b17215e755512147d1967fed8a7108dac1c40cebec8074f90d1542
-SIZE (bluescarni-heyoka.py-v5.0.1_GH0.tar.gz) = 149321640
+TIMESTAMP = 1726987730
+SHA256 (bluescarni-heyoka.py-v6.0.0_GH0.tar.gz) = 63af3b3d3b40d449323740d61dff374f3e628147056bfaa7f1d27d0c911281bf
+SIZE (bluescarni-heyoka.py-v6.0.0_GH0.tar.gz) = 152747308
diff --git a/math/py-heyoka/pkg-plist b/math/py-heyoka/pkg-plist
index befd6b006602..abc95f356377 100644
--- a/math/py-heyoka/pkg-plist
+++ b/math/py-heyoka/pkg-plist
@@ -1,26 +1,28 @@
 %%PYTHON_SITELIBDIR%%/heyoka/__init__.py
 %%PYTHON_SITELIBDIR%%/heyoka/_ensemble_impl.py
+%%PYTHON_SITELIBDIR%%/heyoka/_sgp4_test_data.py
 %%PYTHON_SITELIBDIR%%/heyoka/_sympy_utils.py
 %%PYTHON_SITELIBDIR%%/heyoka/_test_batch_integrator.py
 %%PYTHON_SITELIBDIR%%/heyoka/_test_celmec.py
 %%PYTHON_SITELIBDIR%%/heyoka/_test_cfunc.py
 %%PYTHON_SITELIBDIR%%/heyoka/_test_dtens.py
 %%PYTHON_SITELIBDIR%%/heyoka/_test_elp2000.py
 %%PYTHON_SITELIBDIR%%/heyoka/_test_ensemble.py
 %%PYTHON_SITELIBDIR%%/heyoka/_test_expression.py
 %%PYTHON_SITELIBDIR%%/heyoka/_test_lagham.py
 %%PYTHON_SITELIBDIR%%/heyoka/_test_memcache.py
 %%PYTHON_SITELIBDIR%%/heyoka/_test_model.py
 %%PYTHON_SITELIBDIR%%/heyoka/_test_mp.py
 %%PYTHON_SITELIBDIR%%/heyoka/_test_real.py
 %%PYTHON_SITELIBDIR%%/heyoka/_test_real128.py
 %%PYTHON_SITELIBDIR%%/heyoka/_test_scalar_integrator.py
+%%PYTHON_SITELIBDIR%%/heyoka/_test_sgp4_propagator.py
 %%PYTHON_SITELIBDIR%%/heyoka/_test_sympy.py
 %%PYTHON_SITELIBDIR%%/heyoka/_test_var_integrator.py
 %%PYTHON_SITELIBDIR%%/heyoka/_test_var_ode_sys.py
 %%PYTHON_SITELIBDIR%%/heyoka/_test_vsop2013.py
 %%PYTHON_SITELIBDIR%%/heyoka/_version.py
 %%PYTHON_SITELIBDIR%%/heyoka/callback/__init__.py
 %%PYTHON_SITELIBDIR%%/heyoka/core%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/heyoka/model/__init__.py
 %%PYTHON_SITELIBDIR%%/heyoka/test.py