diff --git a/math/heyoka/Makefile b/math/heyoka/Makefile
index eaafe4c48598..a5949f348b1d 100644
--- a/math/heyoka/Makefile
+++ b/math/heyoka/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	heyoka
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.20.0
-PORTREVISION=	2
+DISTVERSION=	0.21.0
 CATEGORIES=	math
 
 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
 
 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=14,build,run
+USES=		cmake:testing compiler:c++17-lang llvm:min=15,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 # 3 tests fail, see https://github.com/bluescarni/heyoka/issues/228, also #229 and #230
 
 .include <bsd.port.mk>
diff --git a/math/heyoka/distinfo b/math/heyoka/distinfo
index 9b2b14e66148..0d6f94ef0981 100644
--- a/math/heyoka/distinfo
+++ b/math/heyoka/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1671405240
-SHA256 (bluescarni-heyoka-v0.20.0_GH0.tar.gz) = d6b4601ee28fc2dbb84c317bbe2619c776ce448f782c045a801dfa46b0d5e52c
-SIZE (bluescarni-heyoka-v0.20.0_GH0.tar.gz) = 103126787
+TIMESTAMP = 1676706398
+SHA256 (bluescarni-heyoka-v0.21.0_GH0.tar.gz) = 16d22e99397139d25b2a0c418a654e9cba3684c7eb28933791526bb163f50f27
+SIZE (bluescarni-heyoka-v0.21.0_GH0.tar.gz) = 103553019
diff --git a/math/heyoka/pkg-plist b/math/heyoka/pkg-plist
index ea5337fab25d..f07667826248 100644
--- a/math/heyoka/pkg-plist
+++ b/math/heyoka/pkg-plist
@@ -1,84 +1,84 @@
 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
 include/heyoka/detail/llvm_helpers.hpp
 include/heyoka/detail/llvm_vector_type.hpp
 include/heyoka/detail/logging_impl.hpp
 include/heyoka/detail/num_utils.hpp
 include/heyoka/detail/real_helpers.hpp
 include/heyoka/detail/simple_timer.hpp
 include/heyoka/detail/sleef.hpp
 include/heyoka/detail/string_conv.hpp
 include/heyoka/detail/taylor_common.hpp
 include/heyoka/detail/type_traits.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/exceptions.hpp
 include/heyoka/expression.hpp
 include/heyoka/func.hpp
 include/heyoka/gp.hpp
 include/heyoka/heyoka.hpp
 include/heyoka/kw.hpp
 include/heyoka/llvm_state.hpp
 include/heyoka/logging.hpp
 include/heyoka/mascon.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/binary_op.hpp
 include/heyoka/math/constants.hpp
 include/heyoka/math/cos.hpp
 include/heyoka/math/cosh.hpp
 include/heyoka/math/erf.hpp
 include/heyoka/math/exp.hpp
 include/heyoka/math/kepE.hpp
 include/heyoka/math/log.hpp
 include/heyoka/math/neg.hpp
 include/heyoka/math/pow.hpp
 include/heyoka/math/sigmoid.hpp
 include/heyoka/math/sin.hpp
 include/heyoka/math/sinh.hpp
 include/heyoka/math/sqrt.hpp
 include/heyoka/math/square.hpp
 include/heyoka/math/sum.hpp
 include/heyoka/math/sum_sq.hpp
 include/heyoka/math/tan.hpp
 include/heyoka/math/tanh.hpp
 include/heyoka/math/time.hpp
 include/heyoka/math/tpoly.hpp
 include/heyoka/nbody.hpp
 include/heyoka/number.hpp
 include/heyoka/param.hpp
 include/heyoka/s11n.hpp
 include/heyoka/splitmix64.hpp
 include/heyoka/taylor.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.20
-lib/libheyoka.so.20.0
+lib/libheyoka.so.21
+lib/libheyoka.so.21.0
diff --git a/math/py-heyoka/Makefile b/math/py-heyoka/Makefile
index 696ce969f18c..de4d8851d8ec 100644
--- a/math/py-heyoka/Makefile
+++ b/math/py-heyoka/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	heyoka
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.20.0
-PORTREVISION=	1
+DISTVERSION=	0.21.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 python:3.7+
 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}
 
 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 72aeb542d8ff..cd7e2a76563b 100644
--- a/math/py-heyoka/distinfo
+++ b/math/py-heyoka/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1671607325
-SHA256 (bluescarni-heyoka.py-v0.20.0_GH0.tar.gz) = 65c90a5ffb870b4d2d19eef066b56964777f03eb7d081e331ae5bf903bbf94af
-SIZE (bluescarni-heyoka.py-v0.20.0_GH0.tar.gz) = 102109366
+TIMESTAMP = 1676708533
+SHA256 (bluescarni-heyoka.py-v0.21.0_GH0.tar.gz) = 3808ba516fe5165f19118b167704f90176a34e8f268df4f2ec1f1dbc12c8ae95
+SIZE (bluescarni-heyoka.py-v0.21.0_GH0.tar.gz) = 102255406
diff --git a/math/py-heyoka/pkg-plist b/math/py-heyoka/pkg-plist
index 22ca7351b0c3..e8992dce2d41 100644
--- a/math/py-heyoka/pkg-plist
+++ b/math/py-heyoka/pkg-plist
@@ -1,9 +1,10 @@
 %%PYTHON_SITELIBDIR%%/heyoka/__init__.py
 %%PYTHON_SITELIBDIR%%/heyoka/_ensemble_impl.py
 %%PYTHON_SITELIBDIR%%/heyoka/_sympy_utils.py
+%%PYTHON_SITELIBDIR%%/heyoka/_test_cfunc.py
 %%PYTHON_SITELIBDIR%%/heyoka/_test_mp.py
 %%PYTHON_SITELIBDIR%%/heyoka/_test_real.py
 %%PYTHON_SITELIBDIR%%/heyoka/_test_real128.py
 %%PYTHON_SITELIBDIR%%/heyoka/_version.py
 %%PYTHON_SITELIBDIR%%/heyoka/core%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/heyoka/test.py