Index: head/security/klee/Makefile
===================================================================
--- head/security/klee/Makefile	(revision 557374)
+++ head/security/klee/Makefile	(revision 557375)
@@ -1,49 +1,48 @@
 # $FreeBSD$
 
 PORTNAME=	klee
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.1
-PORTREVISION=	1
+DISTVERSION=	2.2
 CATEGORIES=	security devel
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	Symbolic virtual machine built on top of LLVM
 
 LICENSE=	NCSA
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
 BUILD_DEPENDS=	llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \
 		gmake:devel/gmake
 # Should be a LIB_DEPEND, but hard to express in a generic manner
 RUN_DEPENDS=	llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \
 		${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR}
 
 USES=		cmake compiler:c++14-lang localbase pkgconfig python:3.5+,run \
 		shebangfix sqlite
 USE_GITHUB=	yes
-SHEBANG_FILES=	tools/klee-stats/klee-stats tools/ktest-tool/ktest-tool
+SHEBANG_FILES=	tools/klee-stats/klee-stats tools/ktest-tool/ktest-tool tools/klee-zesti/klee-zesti
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	ENABLE_POSIX_RUNTIME ENABLE_UNIT_TESTS ENABLE_SYSTEM_TESTS
 CMAKE_ARGS=	-DLLVM_CONFIG_BINARY=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT} \
 		-DMAKE_BINARY=${LOCALBASE}/bin/gmake
 
 # TODO METASMT
 OPTIONS_DEFINE=		TCMALLOC Z3 STP
 OPTIONS_DEFAULT=	TCMALLOC Z3 STP
 
 TCMALLOC_DESC=		Use tcmalloc library for memory management
 TCMALLOC_CMAKE_BOOL=	ENABLE_TCMALLOC
 TCMALLOC_LIB_DEPENDS=	libtcmalloc.so:devel/google-perftools
 
 Z3_DESC=		Enable Z3 SMT solver
 Z3_CMAKE_BOOL=		ENABLE_SOLVER_Z3
 Z3_BUILD_DEPENDS=	z3:math/z3
 Z3_RUN_DEPENDS=		z3:math/z3
 
 STP_DESC=		Enable STP SMT solver
 STP_CMAKE_BOOL=		ENABLE_SOLVER_STP
-STP_BUILD_DEPENDS=	stp>0:math/stp
-STP_LIB_DEPENDS=	libcryptominisat5.so:math/cryptominisat
+STP_LIB_DEPENDS=	libstp.so:math/stp \
+			libcryptominisat5.so:math/cryptominisat
 
 .include <bsd.port.mk>
Index: head/security/klee/distinfo
===================================================================
--- head/security/klee/distinfo	(revision 557374)
+++ head/security/klee/distinfo	(revision 557375)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1583304181
-SHA256 (klee-klee-v2.1_GH0.tar.gz) = bb3db767a159b42611e56367480a1fbfb12783c8920902d57a2b26422036a8fe
-SIZE (klee-klee-v2.1_GH0.tar.gz) = 1038275
+TIMESTAMP = 1607522464
+SHA256 (klee-klee-v2.2_GH0.tar.gz) = 1ff2e37ed3128e005b89920fad7bcf98c7792a11a589dd443186658f5eb91362
+SIZE (klee-klee-v2.2_GH0.tar.gz) = 1073138
Index: head/security/klee/pkg-plist
===================================================================
--- head/security/klee/pkg-plist	(revision 557374)
+++ head/security/klee/pkg-plist	(revision 557375)
@@ -1,13 +1,59 @@
 bin/gen-bout
 bin/gen-random-bout
 bin/kleaver
 bin/klee
 bin/klee-replay
 bin/klee-stats
+bin/klee-zesti
 bin/ktest-tool
 include/klee/klee.h
-lib/klee/runtime/libklee-libc.bca
-lib/klee/runtime/libkleeRuntimeFreeStanding.bca
-lib/klee/runtime/libkleeRuntimeIntrinsic.bca
+lib/klee/runtime/libkleeRuntimeFortify32_Debug+Asserts.bca
+lib/klee/runtime/libkleeRuntimeFortify32_Debug.bca
+lib/klee/runtime/libkleeRuntimeFortify32_Release+Asserts.bca
+lib/klee/runtime/libkleeRuntimeFortify32_Release+Debug+Asserts.bca
+lib/klee/runtime/libkleeRuntimeFortify32_Release+Debug.bca
+lib/klee/runtime/libkleeRuntimeFortify32_Release.bca
+lib/klee/runtime/libkleeRuntimeFortify64_Debug+Asserts.bca
+lib/klee/runtime/libkleeRuntimeFortify64_Debug.bca
+lib/klee/runtime/libkleeRuntimeFortify64_Release+Asserts.bca
+lib/klee/runtime/libkleeRuntimeFortify64_Release+Debug+Asserts.bca
+lib/klee/runtime/libkleeRuntimeFortify64_Release+Debug.bca
+lib/klee/runtime/libkleeRuntimeFortify64_Release.bca
+lib/klee/runtime/libkleeRuntimeFreestanding32_Debug+Asserts.bca
+lib/klee/runtime/libkleeRuntimeFreestanding32_Debug.bca
+lib/klee/runtime/libkleeRuntimeFreestanding32_Release+Asserts.bca
+lib/klee/runtime/libkleeRuntimeFreestanding32_Release+Debug+Asserts.bca
+lib/klee/runtime/libkleeRuntimeFreestanding32_Release+Debug.bca
+lib/klee/runtime/libkleeRuntimeFreestanding32_Release.bca
+lib/klee/runtime/libkleeRuntimeFreestanding64_Debug+Asserts.bca
+lib/klee/runtime/libkleeRuntimeFreestanding64_Debug.bca
+lib/klee/runtime/libkleeRuntimeFreestanding64_Release+Asserts.bca
+lib/klee/runtime/libkleeRuntimeFreestanding64_Release+Debug+Asserts.bca
+lib/klee/runtime/libkleeRuntimeFreestanding64_Release+Debug.bca
+lib/klee/runtime/libkleeRuntimeFreestanding64_Release.bca
+lib/klee/runtime/libkleeRuntimeIntrinsic32_Debug+Asserts.bca
+lib/klee/runtime/libkleeRuntimeIntrinsic32_Debug.bca
+lib/klee/runtime/libkleeRuntimeIntrinsic32_Release+Asserts.bca
+lib/klee/runtime/libkleeRuntimeIntrinsic32_Release+Debug+Asserts.bca
+lib/klee/runtime/libkleeRuntimeIntrinsic32_Release+Debug.bca
+lib/klee/runtime/libkleeRuntimeIntrinsic32_Release.bca
+lib/klee/runtime/libkleeRuntimeIntrinsic64_Debug+Asserts.bca
+lib/klee/runtime/libkleeRuntimeIntrinsic64_Debug.bca
+lib/klee/runtime/libkleeRuntimeIntrinsic64_Release+Asserts.bca
+lib/klee/runtime/libkleeRuntimeIntrinsic64_Release+Debug+Asserts.bca
+lib/klee/runtime/libkleeRuntimeIntrinsic64_Release+Debug.bca
+lib/klee/runtime/libkleeRuntimeIntrinsic64_Release.bca
+lib/klee/runtime/libkleeRuntimeKLEELibc32_Debug+Asserts.bca
+lib/klee/runtime/libkleeRuntimeKLEELibc32_Debug.bca
+lib/klee/runtime/libkleeRuntimeKLEELibc32_Release+Asserts.bca
+lib/klee/runtime/libkleeRuntimeKLEELibc32_Release+Debug+Asserts.bca
+lib/klee/runtime/libkleeRuntimeKLEELibc32_Release+Debug.bca
+lib/klee/runtime/libkleeRuntimeKLEELibc32_Release.bca
+lib/klee/runtime/libkleeRuntimeKLEELibc64_Debug+Asserts.bca
+lib/klee/runtime/libkleeRuntimeKLEELibc64_Debug.bca
+lib/klee/runtime/libkleeRuntimeKLEELibc64_Release+Asserts.bca
+lib/klee/runtime/libkleeRuntimeKLEELibc64_Release+Debug+Asserts.bca
+lib/klee/runtime/libkleeRuntimeKLEELibc64_Release+Debug.bca
+lib/klee/runtime/libkleeRuntimeKLEELibc64_Release.bca
 lib/libkleeRuntest.so
 lib/libkleeRuntest.so.1.0