devel/ikos: Update 2.2 -> 3.0

Reported by:	portscout

3 files changed, 40 insertions, 43 deletions

diff --git a/devel/ikos/Makefile b/devel/ikos/Makefile
index b65a4052290a..584ed0b6b299 100644
--- a/devel/ikos/Makefile
+++ b/devel/ikos/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	ikos
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.2
-PORTREVISION=	2
+DISTVERSION=	3.0
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -17,16 +16,17 @@ LIB_DEPENDS=	libapron.so:math/apron \
 		libboost_system.so:devel/boost-libs \
 		libmpfr.so:math/mpfr \
 		libgmp.so:math/gmp \
-		libppl.so:devel/ppl
+		libppl.so:devel/ppl \
+		libtbb.so:devel/tbb
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
-USES=		cmake ncurses python sqlite
+USES=		cmake ncurses python:3.6+ sqlite
 USE_PYTHON=	py3kplist
 USE_GITHUB=	yes
 GH_ACCOUNT=	NASA-SW-VnV
 USE_LDCONFIG=	yes
 
-LLVM_VERSION=	80 # ${LLVM_DEFAULT} isn't desirable here since ikos only supports llvm>=70, but LLVM_DEFAULT implies that many/any llvm versions are supported
+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
 
 CXXFLAGS+=	-DNDEBUG # https://github.com/NASA-SW-VnV/ikos/issues/36, it also breaks with assert without NDEBUG
 
diff --git a/devel/ikos/distinfo b/devel/ikos/distinfo
index 02787bd0b487..15c4e08b8c2c 100644
--- a/devel/ikos/distinfo
+++ b/devel/ikos/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567232625
-SHA256 (NASA-SW-VnV-ikos-v2.2_GH0.tar.gz) = 46f47045f199e25eac4f56876edcdc10c2f7b31a9347d437fa2073fca8cb97f1
-SIZE (NASA-SW-VnV-ikos-v2.2_GH0.tar.gz) = 1363251
+TIMESTAMP = 1576218262
+SHA256 (NASA-SW-VnV-ikos-v3.0_GH0.tar.gz) = c2ee1ced81e48c03bcf641fb4d33e0d64a1205108c2f53247bac6eb7d929e538
+SIZE (NASA-SW-VnV-ikos-v3.0_GH0.tar.gz) = 1377215
diff --git a/devel/ikos/pkg-plist b/devel/ikos/pkg-plist
index 465e058ff325..37aa170c0762 100644
--- a/devel/ikos/pkg-plist
+++ b/devel/ikos/pkg-plist
@@ -15,6 +15,7 @@ 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
@@ -54,7 +55,7 @@ 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/lifetime.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
@@ -66,13 +67,15 @@ 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/nullity.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
@@ -92,33 +95,27 @@ 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/abstract_domain.hpp
-include/ikos/core/domain/pointer/dummy.hpp
 include/ikos/core/domain/pointer/operator.hpp
-include/ikos/core/domain/pointer/pointer.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/uninitialized.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/legacy/adt/mergeable_map.hpp
-include/ikos/core/legacy/adt/patricia_tree.hpp
-include/ikos/core/legacy/common/type.hpp
-include/ikos/core/legacy/domain/array_graph.hpp
-include/ikos/core/legacy/domain/cpa.hpp
-include/ikos/core/legacy/domain/dataflow_domain.hpp
-include/ikos/core/legacy/domain/reaching.hpp
-include/ikos/core/legacy/domain/summary.hpp
-include/ikos/core/legacy/domain/uninitialized_array.hpp
-include/ikos/core/legacy/example/muaz.hpp
-include/ikos/core/legacy/expression.hpp
 include/ikos/core/linear_constraint.hpp
 include/ikos/core/linear_expression.hpp
 include/ikos/core/literal.hpp
@@ -136,10 +133,10 @@ 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/cell.hpp
-include/ikos/core/semantic/memory/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/pointer/variable.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
@@ -168,37 +165,37 @@ include/ikos/frontend/llvm/pass.hpp
 lib/libikos-ar.so
 lib/libikos-llvm-to-ar.so
 lib/libikos-pp.so
-%%PYTHON_SITELIBDIR%%/ikos-2.2-py%%PYTHON_VER%%.egg-info
+%%PYTHON_SITELIBDIR%%/ikos-3.0-py%%PYTHON_VER%%.egg-info
 %%PYTHON_SITELIBDIR%%/ikos/__init__.py
-%%PYTHON_SITELIBDIR%%/ikos/__init__.pyc
+%%PYTHON_SITELIBDIR%%/ikos/__pycache__/__init__.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/ikos/__pycache__/abs_int.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/ikos/__pycache__/analyzer.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/ikos/__pycache__/args.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/ikos/__pycache__/colors.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/ikos/__pycache__/enums.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/ikos/__pycache__/filetype.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/ikos/__pycache__/highlight.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/ikos/__pycache__/html.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/ikos/__pycache__/http.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/ikos/__pycache__/log.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/ikos/__pycache__/output_db.cpython-36.pyc
+%%PYTHON_SITELIBDIR%%/ikos/__pycache__/report.cpython-36.pyc
 %%PYTHON_SITELIBDIR%%/ikos/abs_int.py
-%%PYTHON_SITELIBDIR%%/ikos/abs_int.pyc
 %%PYTHON_SITELIBDIR%%/ikos/analyzer.py
-%%PYTHON_SITELIBDIR%%/ikos/analyzer.pyc
 %%PYTHON_SITELIBDIR%%/ikos/args.py
-%%PYTHON_SITELIBDIR%%/ikos/args.pyc
 %%PYTHON_SITELIBDIR%%/ikos/colors.py
-%%PYTHON_SITELIBDIR%%/ikos/colors.pyc
 %%PYTHON_SITELIBDIR%%/ikos/enums.py
-%%PYTHON_SITELIBDIR%%/ikos/enums.pyc
 %%PYTHON_SITELIBDIR%%/ikos/filetype.py
-%%PYTHON_SITELIBDIR%%/ikos/filetype.pyc
 %%PYTHON_SITELIBDIR%%/ikos/highlight.py
-%%PYTHON_SITELIBDIR%%/ikos/highlight.pyc
 %%PYTHON_SITELIBDIR%%/ikos/html.py
-%%PYTHON_SITELIBDIR%%/ikos/html.pyc
 %%PYTHON_SITELIBDIR%%/ikos/http.py
-%%PYTHON_SITELIBDIR%%/ikos/http.pyc
 %%PYTHON_SITELIBDIR%%/ikos/log.py
-%%PYTHON_SITELIBDIR%%/ikos/log.pyc
 %%PYTHON_SITELIBDIR%%/ikos/output_db.py
-%%PYTHON_SITELIBDIR%%/ikos/output_db.pyc
 %%PYTHON_SITELIBDIR%%/ikos/report.py
-%%PYTHON_SITELIBDIR%%/ikos/report.pyc
 %%PYTHON_SITELIBDIR%%/ikos/scan.py
 %%PYTHON_SITELIBDIR%%/ikos/scan.pyc
 %%PYTHON_SITELIBDIR%%/ikos/settings/__init__.py
-%%PYTHON_SITELIBDIR%%/ikos/settings/__init__.pyc
+%%PYTHON_SITELIBDIR%%/ikos/settings/__pycache__/__init__.cpython-36.pyc
 %%PYTHON_SITELIBDIR%%/ikos/stats.py
 %%PYTHON_SITELIBDIR%%/ikos/stats.pyc
 %%PYTHON_SITELIBDIR%%/ikos/view.py