diff --git a/devel/ikos/Makefile b/devel/ikos/Makefile
index c7835baf657b..2c4570ccff8a 100644
--- a/devel/ikos/Makefile
+++ b/devel/ikos/Makefile
@@ -1,45 +1,46 @@
 PORTNAME=	ikos
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.0
-PORTREVISION=	8
+DISTVERSION=	3.1
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Static analyzer for C/C++ based on theory of abstract interpretation
 WWW=		https://github.com/NASA-SW-VnV/ikos
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.pdf
 
 BUILD_DEPENDS=	llvm${LLVM_VERSION}>0:devel/llvm${LLVM_VERSION}
 LIB_DEPENDS=	libapron.so:math/apron \
 		libboost_system.so:devel/boost-libs \
 		libmpfr.so:math/mpfr \
 		libgmp.so:math/gmp \
 		libppl.so:devel/ppl \
-		libtbb.so:devel/tbb
+		libtbb.so:devel/onetbb
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		llvm${LLVM_VERSION}>0:devel/llvm${LLVM_VERSION}
 
 USES=		cmake ncurses python:3.6+ sqlite
 USE_GITHUB=	yes
 GH_ACCOUNT=	NASA-SW-VnV
 USE_LDCONFIG=	yes
 
-LLVM_VERSION=	90 # ${LLVM_DEFAULT} isn't desirable here since ikos only supports llvm>=90, but LLVM_DEFAULT implies that many/any llvm versions are supported
+LLVM_VERSION=	14 # only llvm-14 is currently supported
 
 CXXFLAGS+=	-DNDEBUG # https://github.com/NASA-SW-VnV/ikos/issues/36, it also breaks with assert without NDEBUG
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_ARGS=	-DLLVM_CONFIG_EXECUTABLE:PATH=${LOCALBASE}/bin/llvm-config${LLVM_VERSION} \
 		-DPYTHON_EXECUTABLE:STRING=${PYTHON_CMD}
 
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
+
 post-configure: # workaround for the problem that --color-diagnostics gets into the linker command lines
 	@${REINPLACE_CMD} 's|-Wl,--color-diagnostics| |' ${BUILD_WRKSRC}/build.ninja
 
 # use clang corresponding to the used llvm version
 CPP=		clang-cpp${LLVM_VERSION}
 CC=		clang${LLVM_VERSION}
 CXX=		clang++${LLVM_VERSION}
 
 .include <bsd.port.mk>
diff --git a/devel/ikos/distinfo b/devel/ikos/distinfo
index 15c4e08b8c2c..997c01d5dbaa 100644
--- a/devel/ikos/distinfo
+++ b/devel/ikos/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1576218262
-SHA256 (NASA-SW-VnV-ikos-v3.0_GH0.tar.gz) = c2ee1ced81e48c03bcf641fb4d33e0d64a1205108c2f53247bac6eb7d929e538
-SIZE (NASA-SW-VnV-ikos-v3.0_GH0.tar.gz) = 1377215
+TIMESTAMP = 1670308888
+SHA256 (NASA-SW-VnV-ikos-v3.1_GH0.tar.gz) = e2a9ff32d02aeff92abbb8f69f1a6730ad96b6f59a10e18c30522d033f950844
+SIZE (NASA-SW-VnV-ikos-v3.1_GH0.tar.gz) = 1385982
diff --git a/devel/ikos/pkg-plist b/devel/ikos/pkg-plist
index e0d3b4221330..fb037e1fa2e2 100644
--- a/devel/ikos/pkg-plist
+++ b/devel/ikos/pkg-plist
@@ -1,213 +1,213 @@
 bin/ikos
 bin/ikos-analyzer
 bin/ikos-config
 bin/ikos-import
 bin/ikos-pp
 bin/ikos-report
 bin/ikos-scan
 bin/ikos-scan-c++
 bin/ikos-scan-cc
 bin/ikos-scan-extract
 bin/ikos-view
 include/ikos/analyzer/intrinsic.h
 include/ikos/ar/format/dot.hpp
 include/ikos/ar/format/formatter.hpp
 include/ikos/ar/format/namer.hpp
 include/ikos/ar/format/text.hpp
 include/ikos/ar/pass/add_loop_counters.hpp
 include/ikos/ar/pass/add_partitioning_variables.hpp
 include/ikos/ar/pass/name_values.hpp
 include/ikos/ar/pass/pass.hpp
 include/ikos/ar/pass/simplify_cfg.hpp
 include/ikos/ar/pass/simplify_upcast_comparison.hpp
 include/ikos/ar/semantic.hpp
 include/ikos/ar/semantic/bundle.hpp
 include/ikos/ar/semantic/code.hpp
 include/ikos/ar/semantic/context.hpp
 include/ikos/ar/semantic/data_layout.hpp
 include/ikos/ar/semantic/function.hpp
 include/ikos/ar/semantic/intrinsic.hpp
 include/ikos/ar/semantic/statement.hpp
 include/ikos/ar/semantic/statement_visitor.hpp
 include/ikos/ar/semantic/symbol_table.hpp
 include/ikos/ar/semantic/type.hpp
 include/ikos/ar/semantic/type_visitor.hpp
 include/ikos/ar/semantic/value.hpp
 include/ikos/ar/semantic/value_visitor.hpp
 include/ikos/ar/support/assert.hpp
 include/ikos/ar/support/cast.hpp
 include/ikos/ar/support/flags.hpp
 include/ikos/ar/support/iterator.hpp
 include/ikos/ar/support/number.hpp
 include/ikos/ar/support/string_ref.hpp
 include/ikos/ar/support/traceable.hpp
 include/ikos/ar/verify/frontend.hpp
 include/ikos/ar/verify/type.hpp
 include/ikos/core/adt/patricia_tree/map.hpp
 include/ikos/core/adt/patricia_tree/set.hpp
 include/ikos/core/adt/patricia_tree/utils.hpp
 include/ikos/core/adt/small_vector.hpp
 include/ikos/core/adt/string_ref.hpp
 include/ikos/core/domain/abstract_domain.hpp
 include/ikos/core/domain/discrete_domain.hpp
 include/ikos/core/domain/domain_product.hpp
 include/ikos/core/domain/exception/abstract_domain.hpp
 include/ikos/core/domain/exception/exception.hpp
 include/ikos/core/domain/lifetime/abstract_domain.hpp
 include/ikos/core/domain/lifetime/dummy.hpp
 include/ikos/core/domain/lifetime/separate_domain.hpp
 include/ikos/core/domain/machine_int/abstract_domain.hpp
 include/ikos/core/domain/machine_int/congruence.hpp
 include/ikos/core/domain/machine_int/dummy.hpp
 include/ikos/core/domain/machine_int/interval.hpp
 include/ikos/core/domain/machine_int/interval_congruence.hpp
 include/ikos/core/domain/machine_int/numeric_domain_adapter.hpp
 include/ikos/core/domain/machine_int/operator.hpp
 include/ikos/core/domain/machine_int/polymorphic_domain.hpp
 include/ikos/core/domain/machine_int/separate_domain.hpp
 include/ikos/core/domain/memory/abstract_domain.hpp
 include/ikos/core/domain/memory/dummy.hpp
 include/ikos/core/domain/memory/partitioning.hpp
 include/ikos/core/domain/memory/polymorphic_domain.hpp
 include/ikos/core/domain/memory/value.hpp
 include/ikos/core/domain/memory/value/cell_set.hpp
 include/ikos/core/domain/memory/value/mem_loc_to_cell_set.hpp
 include/ikos/core/domain/memory/value/mem_loc_to_pointer_set.hpp
 include/ikos/core/domain/nullity/abstract_domain.hpp
 include/ikos/core/domain/nullity/dummy.hpp
 include/ikos/core/domain/nullity/separate_domain.hpp
 include/ikos/core/domain/numeric/abstract_domain.hpp
 include/ikos/core/domain/numeric/apron.hpp
 include/ikos/core/domain/numeric/congruence.hpp
 include/ikos/core/domain/numeric/constant.hpp
 include/ikos/core/domain/numeric/dbm.hpp
 include/ikos/core/domain/numeric/domain_product.hpp
 include/ikos/core/domain/numeric/equality_congruence_solver.hpp
 include/ikos/core/domain/numeric/gauge.hpp
 include/ikos/core/domain/numeric/gauge_interval_congruence.hpp
 include/ikos/core/domain/numeric/interval.hpp
 include/ikos/core/domain/numeric/interval_congruence.hpp
 include/ikos/core/domain/numeric/linear_interval_solver.hpp
 include/ikos/core/domain/numeric/octagon.hpp
 include/ikos/core/domain/numeric/operator.hpp
 include/ikos/core/domain/numeric/separate_domain.hpp
 include/ikos/core/domain/numeric/union.hpp
 include/ikos/core/domain/numeric/var_packing_dbm.hpp
 include/ikos/core/domain/numeric/var_packing_dbm_congruence.hpp
 include/ikos/core/domain/numeric/var_packing_domain.hpp
 include/ikos/core/domain/pointer/operator.hpp
 include/ikos/core/domain/pointer/solver.hpp
 include/ikos/core/domain/scalar/abstract_domain.hpp
 include/ikos/core/domain/scalar/composite.hpp
 include/ikos/core/domain/scalar/dummy.hpp
 include/ikos/core/domain/scalar/machine_int.hpp
 include/ikos/core/domain/separate_domain.hpp
 include/ikos/core/domain/uninitialized/abstract_domain.hpp
 include/ikos/core/domain/uninitialized/dummy.hpp
 include/ikos/core/domain/uninitialized/separate_domain.hpp
 include/ikos/core/example/machine_int/variable_factory.hpp
 include/ikos/core/example/memory_factory.hpp
 include/ikos/core/example/muzq.hpp
 include/ikos/core/example/scalar/variable_factory.hpp
 include/ikos/core/example/variable_factory.hpp
 include/ikos/core/exception.hpp
 include/ikos/core/fixpoint/concurrent_fwd_fixpoint_iterator.hpp
 include/ikos/core/fixpoint/fixpoint_iterator.hpp
 include/ikos/core/fixpoint/fwd_fixpoint_iterator.hpp
 include/ikos/core/fixpoint/wpo.hpp
 include/ikos/core/fixpoint/wto.hpp
 include/ikos/core/linear_constraint.hpp
 include/ikos/core/linear_expression.hpp
 include/ikos/core/literal.hpp
 include/ikos/core/number.hpp
 include/ikos/core/number/bound.hpp
 include/ikos/core/number/compatibility.hpp
 include/ikos/core/number/dummy_number.hpp
 include/ikos/core/number/exception.hpp
 include/ikos/core/number/machine_int.hpp
 include/ikos/core/number/q_number.hpp
 include/ikos/core/number/signedness.hpp
 include/ikos/core/number/supported_integral.hpp
 include/ikos/core/number/z_number.hpp
 include/ikos/core/semantic/dumpable.hpp
 include/ikos/core/semantic/graph.hpp
 include/ikos/core/semantic/indexable.hpp
 include/ikos/core/semantic/machine_int/variable.hpp
 include/ikos/core/semantic/memory/value/cell_factory.hpp
 include/ikos/core/semantic/memory/value/cell_variable.hpp
 include/ikos/core/semantic/memory_location.hpp
 include/ikos/core/semantic/scalar/variable.hpp
 include/ikos/core/semantic/variable.hpp
 include/ikos/core/support/assert.hpp
 include/ikos/core/support/cast.hpp
 include/ikos/core/support/compiler.hpp
 include/ikos/core/support/mpl.hpp
 include/ikos/core/value/lifetime.hpp
 include/ikos/core/value/machine_int/congruence.hpp
 include/ikos/core/value/machine_int/constant.hpp
 include/ikos/core/value/machine_int/interval.hpp
 include/ikos/core/value/machine_int/interval_congruence.hpp
 include/ikos/core/value/nullity.hpp
 include/ikos/core/value/numeric/congruence.hpp
 include/ikos/core/value/numeric/constant.hpp
 include/ikos/core/value/numeric/gauge.hpp
 include/ikos/core/value/numeric/interval.hpp
 include/ikos/core/value/numeric/interval_congruence.hpp
 include/ikos/core/value/pointer/pointer.hpp
 include/ikos/core/value/pointer/pointer_set.hpp
 include/ikos/core/value/pointer/points_to_set.hpp
 include/ikos/core/value/uninitialized.hpp
 include/ikos/frontend/llvm/import.hpp
 include/ikos/frontend/llvm/import/exception.hpp
 include/ikos/frontend/llvm/import/importer.hpp
 include/ikos/frontend/llvm/import/source_location.hpp
 include/ikos/frontend/llvm/pass.hpp
 lib/libikos-ar.so
 lib/libikos-llvm-to-ar.so
 lib/libikos-pp.so
-%%PYTHON_SITELIBDIR%%/ikos-3.0-py%%PYTHON_VER%%.egg-info/PKG-INFO
-%%PYTHON_SITELIBDIR%%/ikos-3.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/ikos-3.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/ikos-3.0-py%%PYTHON_VER%%.egg-info/top_level.txt
+%%PYTHON_SITELIBDIR%%/ikos-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
+%%PYTHON_SITELIBDIR%%/ikos-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/ikos-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/ikos-%%PORTVERSION%%-py%%PYTHON_VER%%.egg-info/top_level.txt
 %%PYTHON_SITELIBDIR%%/ikos/__init__.py
 %%PYTHON_SITELIBDIR%%/ikos/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ikos/__pycache__/abs_int.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ikos/__pycache__/analyzer.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ikos/__pycache__/args.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ikos/__pycache__/colors.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ikos/__pycache__/enums.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ikos/__pycache__/filetype.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ikos/__pycache__/highlight.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ikos/__pycache__/html.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ikos/__pycache__/http.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ikos/__pycache__/log.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ikos/__pycache__/output_db.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ikos/__pycache__/report.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ikos/__pycache__/scan.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ikos/__pycache__/stats.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ikos/__pycache__/view.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ikos/abs_int.py
 %%PYTHON_SITELIBDIR%%/ikos/analyzer.py
 %%PYTHON_SITELIBDIR%%/ikos/args.py
 %%PYTHON_SITELIBDIR%%/ikos/colors.py
 %%PYTHON_SITELIBDIR%%/ikos/enums.py
 %%PYTHON_SITELIBDIR%%/ikos/filetype.py
 %%PYTHON_SITELIBDIR%%/ikos/highlight.py
 %%PYTHON_SITELIBDIR%%/ikos/html.py
 %%PYTHON_SITELIBDIR%%/ikos/http.py
 %%PYTHON_SITELIBDIR%%/ikos/log.py
 %%PYTHON_SITELIBDIR%%/ikos/output_db.py
 %%PYTHON_SITELIBDIR%%/ikos/report.py
 %%PYTHON_SITELIBDIR%%/ikos/scan.py
 %%PYTHON_SITELIBDIR%%/ikos/settings/__init__.py
 %%PYTHON_SITELIBDIR%%/ikos/settings/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/ikos/stats.py
 %%PYTHON_SITELIBDIR%%/ikos/view.py
 %%DATADIR%%/view/static/css/ikos_theme.css
 %%DATADIR%%/view/static/js/ikos_homepage.js
 %%DATADIR%%/view/static/js/ikos_report.js
 %%DATADIR%%/view/template/error.html
 %%DATADIR%%/view/template/homepage.html
 %%DATADIR%%/view/template/not_found.html
 %%DATADIR%%/view/template/report.html
 %%DATADIR%%/view/template/settings.html