diff --git a/devel/angr/Makefile.inc b/devel/angr/Makefile.inc
index 2639521879e..1e790254c96 100644
--- a/devel/angr/Makefile.inc
+++ b/devel/angr/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.3 2019/09/30 08:24:44 jasper Exp $
+# $OpenBSD: Makefile.inc,v 1.4 2019/11/10 09:29:32 kn Exp $
 
 # vex is amd64-only; sync with security/angrop
 ONLY_FOR_ARCHS =	amd64
@@ -21,7 +21,7 @@ MODPY_PI ?=		Yes
 MODPY_SETUPTOOLS ?=	Yes
 MODPY_VERSION ?=	${MODPY_DEFAULT_VERSION_3}
 
-MODPY_EGG_VERSION ?=	8.19.7.25
+MODPY_EGG_VERSION ?=	8.19.10.30
 DISTNAME ?=		${ANGR_PYTHON_MODULE}-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 .endif
diff --git a/devel/angr/py-ailment/distinfo b/devel/angr/py-ailment/distinfo
index 37677496aa3..7b1f4f93955 100644
--- a/devel/angr/py-ailment/distinfo
+++ b/devel/angr/py-ailment/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ailment-8.19.7.25.tar.gz) = IM624corWR83fgs2rEElM4wvkyWCOKuY+o+AiL1T+Vo=
-SIZE (ailment-8.19.7.25.tar.gz) = 10437
+SHA256 (ailment-8.19.10.30.tar.gz) = Vxxx4TdNDViLAI3xuAqGLYSpf81b3XQsu+H7EADIRZ0=
+SIZE (ailment-8.19.10.30.tar.gz) = 10574
diff --git a/devel/angr/py-angr/Makefile b/devel/angr/py-angr/Makefile
index 7da3e029469..ade8791837a 100644
--- a/devel/angr/py-angr/Makefile
+++ b/devel/angr/py-angr/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2019/10/26 12:12:24 kn Exp $
+# $OpenBSD: Makefile,v 1.4 2019/11/10 09:29:32 kn Exp $
 
 COMMENT =	multi-architecture binary analysis toolkit
 
 ANGR_PYTHON_MODULE =	angr
-REVISION =	0
 
 HOMEPAGE =	https://angr.io/
 
diff --git a/devel/angr/py-angr/distinfo b/devel/angr/py-angr/distinfo
index 1a79deb02d9..a7e45904f44 100644
--- a/devel/angr/py-angr/distinfo
+++ b/devel/angr/py-angr/distinfo
@@ -1,2 +1,2 @@
-SHA256 (angr-8.19.7.25.tar.gz) = ih8FDRclY5fVdm69y5z1DIAaXPKP2SdVM4cMOJQmhJ8=
-SIZE (angr-8.19.7.25.tar.gz) = 876657
+SHA256 (angr-8.19.10.30.tar.gz) = KP//UAHNoiQJlQVXGmuQopXRgrhEEerDqOmrmbxTvSU=
+SIZE (angr-8.19.10.30.tar.gz) = 885334
diff --git a/devel/angr/py-angr/patches/patch-angr_knowledge_plugins_functions_function_py b/devel/angr/py-angr/patches/patch-angr_knowledge_plugins_functions_function_py
index a981c305d4a..79e84861eee 100644
--- a/devel/angr/py-angr/patches/patch-angr_knowledge_plugins_functions_function_py
+++ b/devel/angr/py-angr/patches/patch-angr_knowledge_plugins_functions_function_py
@@ -1,11 +1,11 @@
-$OpenBSD: patch-angr_knowledge_plugins_functions_function_py,v 1.2 2019/09/15 13:29:50 kn Exp $
+$OpenBSD: patch-angr_knowledge_plugins_functions_function_py,v 1.3 2019/11/10 09:29:32 kn Exp $
 
 Drop itanium_demangler dependency
 
 Index: angr/knowledge_plugins/functions/function.py
 --- angr/knowledge_plugins/functions/function.py.orig
 +++ angr/knowledge_plugins/functions/function.py
-@@ -7,8 +7,6 @@ import pickle
+@@ -6,8 +6,6 @@ import itertools
  from collections import defaultdict
  from typing import Union
  
@@ -14,7 +14,7 @@ Index: angr/knowledge_plugins/functions/function.py
  from cle.backends.symbol import Symbol
  from archinfo.arch_arm import get_real_address_if_arm
  import claripy
-@@ -1370,10 +1368,12 @@ class Function(Serializable):
+@@ -1272,10 +1270,12 @@ class Function(Serializable):
      @property
      def demangled_name(self):
  
diff --git a/devel/angr/py-angr/pkg/PLIST b/devel/angr/py-angr/pkg/PLIST
index b87b4b9639d..86f5b0393cd 100644
--- a/devel/angr/py-angr/pkg/PLIST
+++ b/devel/angr/py-angr/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2019/09/15 13:29:50 kn Exp $
+@comment $OpenBSD: PLIST,v 1.3 2019/11/10 09:29:32 kn Exp $
 lib/python${MODPY_VERSION}/site-packages/angr/
 lib/python${MODPY_VERSION}/site-packages/angr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/angr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -53,7 +53,6 @@ lib/python${MODPY_VERSION}/site-packages/angr/analyses/${MODPY_PYCACHE}ddg.${MOD
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/${MODPY_PYCACHE}disassembly.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/${MODPY_PYCACHE}disassembly_utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/${MODPY_PYCACHE}dominance_frontier.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/angr/analyses/${MODPY_PYCACHE}forward_analysis.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/${MODPY_PYCACHE}girlscout.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/${MODPY_PYCACHE}loop_analysis.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/${MODPY_PYCACHE}loopfinder.${MODPY_PYC_MAGIC_TAG}pyc
@@ -149,7 +148,26 @@ lib/python${MODPY_VERSION}/site-packages/angr/analyses/decompiler/structurer.py
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/disassembly.py
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/disassembly_utils.py
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/dominance_frontier.py
-lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis.py
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/${MODPY_PYCACHE}job_info.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/job_info.py
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/${MODPY_PYCACHE}call_graph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/${MODPY_PYCACHE}function_graph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/${MODPY_PYCACHE}graph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/${MODPY_PYCACHE}loop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/${MODPY_PYCACHE}single_node_graph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/call_graph.py
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/function_graph.py
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/graph.py
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/loop.py
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/forward_analysis/visitors/single_node_graph.py
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/girlscout.py
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/identifier/
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/identifier/__init__.py
@@ -240,20 +258,24 @@ lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/${MO
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/${MODPY_PYCACHE}atoms.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/${MODPY_PYCACHE}dataset.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/${MODPY_PYCACHE}def_use.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/${MODPY_PYCACHE}definition.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/${MODPY_PYCACHE}engine_ail.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/${MODPY_PYCACHE}engine_vex.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/${MODPY_PYCACHE}external_codeloc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/${MODPY_PYCACHE}live_definitions.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/${MODPY_PYCACHE}reaching_definitions.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/${MODPY_PYCACHE}undefined.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/${MODPY_PYCACHE}uses.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/atoms.py
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/constants.py
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/dataset.py
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/def_use.py
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/definition.py
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/engine_ail.py
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/engine_vex.py
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/external_codeloc.py
+lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/live_definitions.py
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/reaching_definitions.py
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/undefined.py
 lib/python${MODPY_VERSION}/site-packages/angr/analyses/reaching_definitions/uses.py
@@ -592,9 +614,11 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/angr/knowledge_plugins/
 lib/python${MODPY_VERSION}/site-packages/angr/knowledge_plugins/functions/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/knowledge_plugins/functions/${MODPY_PYCACHE}function.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/knowledge_plugins/functions/${MODPY_PYCACHE}function_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/knowledge_plugins/functions/${MODPY_PYCACHE}function_parser.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/knowledge_plugins/functions/${MODPY_PYCACHE}soot_function.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/knowledge_plugins/functions/function.py
 lib/python${MODPY_VERSION}/site-packages/angr/knowledge_plugins/functions/function_manager.py
+lib/python${MODPY_VERSION}/site-packages/angr/knowledge_plugins/functions/function_parser.py
 lib/python${MODPY_VERSION}/site-packages/angr/knowledge_plugins/functions/soot_function.py
 lib/python${MODPY_VERSION}/site-packages/angr/knowledge_plugins/indirect_jumps.py
 lib/python${MODPY_VERSION}/site-packages/angr/knowledge_plugins/labels.py
@@ -818,6 +842,7 @@ lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/${MODPY_PYCACHE}fp
 lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/${MODPY_PYCACHE}fputs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/${MODPY_PYCACHE}fread.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/${MODPY_PYCACHE}free.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/${MODPY_PYCACHE}fscanf.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/${MODPY_PYCACHE}fseek.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/${MODPY_PYCACHE}ftell.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/${MODPY_PYCACHE}fwrite.${MODPY_PYC_MAGIC_TAG}pyc
@@ -874,6 +899,7 @@ lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/fputc.py
 lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/fputs.py
 lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/fread.py
 lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/free.py
+lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/fscanf.py
 lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/fseek.py
 lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/ftell.py
 lib/python${MODPY_VERSION}/site-packages/angr/procedures/libc/fwrite.py
@@ -1001,6 +1027,7 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/$
 lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/${MODPY_PYCACHE}accept.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/${MODPY_PYCACHE}bind.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/${MODPY_PYCACHE}bzero.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/${MODPY_PYCACHE}close.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/${MODPY_PYCACHE}closedir.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/${MODPY_PYCACHE}dup.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1041,6 +1068,7 @@ lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/${MODPY_PYCACHE}u
 lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/${MODPY_PYCACHE}write.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/accept.py
 lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/bind.py
+lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/bzero.py
 lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/close.py
 lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/closedir.py
 lib/python${MODPY_VERSION}/site-packages/angr/procedures/posix/dup.py
@@ -1259,6 +1287,7 @@ lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/${MODPY_PYCACHE}sim_
 lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/${MODPY_PYCACHE}sim_event.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/${MODPY_PYCACHE}solver.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/${MODPY_PYCACHE}symbolic_memory.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/${MODPY_PYCACHE}symbolizer.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/${MODPY_PYCACHE}trace_additions.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/${MODPY_PYCACHE}uc_manager.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/${MODPY_PYCACHE}unicorn_engine.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1306,6 +1335,7 @@ lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/sim_action_object.py
 lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/sim_event.py
 lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/solver.py
 lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/symbolic_memory.py
+lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/symbolizer.py
 lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/trace_additions.py
 lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/uc_manager.py
 lib/python${MODPY_VERSION}/site-packages/angr/state_plugins/unicorn_engine.py
diff --git a/devel/angr/py-archinfo/distinfo b/devel/angr/py-archinfo/distinfo
index 39874fd7ca3..094d298bd41 100644
--- a/devel/angr/py-archinfo/distinfo
+++ b/devel/angr/py-archinfo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (archinfo-8.19.7.25.tar.gz) = /kfLQ3659F83aOf1mY77bB/NnUfrn+aTRS9+NOKQcDk=
-SIZE (archinfo-8.19.7.25.tar.gz) = 42946
+SHA256 (archinfo-8.19.10.30.tar.gz) = HPha6T6bh7seewkBo8KOipbDZiOQSPLndzA03XvSQcM=
+SIZE (archinfo-8.19.10.30.tar.gz) = 43824
diff --git a/devel/angr/py-claripy/Makefile b/devel/angr/py-claripy/Makefile
index 59709068057..1575a20bc9e 100644
--- a/devel/angr/py-claripy/Makefile
+++ b/devel/angr/py-claripy/Makefile
@@ -1,11 +1,14 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2019/07/23 19:22:21 jasper Exp $
+# $OpenBSD: Makefile,v 1.2 2019/11/10 09:29:32 kn Exp $
 
 COMMENT =		abstraction layer for constraint solvers
 
 ANGR_PYTHON_MODULE =	claripy
 
-# See https://github.com/angr/claripy/issues/86 regarding py-z3-solver version.
-RUN_DEPENDS =		devel/angr/py-z3-solver<4.6 \
+# tests write here
+PORTHOME =		${WRKDIR}
+
+# See https://github.com/angr/claripy/issues/86 wrt. old py-z3-solver version.
+RUN_DEPENDS =		devel/angr/py-z3-solver>=4.8.6.0 \
 			devel/py-cachetools${MODPY_FLAVOR} \
 			devel/py-future${MODPY_FLAVOR} \
 			math/py-pysmt${MODPY_FLAVOR}
diff --git a/devel/angr/py-claripy/distinfo b/devel/angr/py-claripy/distinfo
index 4dd253732e3..96c9815d54a 100644
--- a/devel/angr/py-claripy/distinfo
+++ b/devel/angr/py-claripy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (claripy-8.19.7.25.tar.gz) = slCsI8e7hMnLpjvyTaomRr0ry/gW1prqG0smsr1HmLg=
-SIZE (claripy-8.19.7.25.tar.gz) = 119364
+SHA256 (claripy-8.19.10.30.tar.gz) = s64h5vXloCiGzKpxR31r9jDeS15489cJ/cjsVsDBZRY=
+SIZE (claripy-8.19.10.30.tar.gz) = 121644
diff --git a/devel/angr/py-cle/distinfo b/devel/angr/py-cle/distinfo
index 17c92e20866..207984be953 100644
--- a/devel/angr/py-cle/distinfo
+++ b/devel/angr/py-cle/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cle-8.19.7.25.tar.gz) = kDW3md6GyaGfK4A99zIiO+ixqH4WlrRqsd8LhtVoZ9A=
-SIZE (cle-8.19.7.25.tar.gz) = 91800
+SHA256 (cle-8.19.10.30.tar.gz) = 6/3Nd1oauhroqkTxab0PUOgVXT0xTNE3B/40xOVG8Yg=
+SIZE (cle-8.19.10.30.tar.gz) = 92981
diff --git a/devel/angr/py-cle/patches/patch-cle_loader_py b/devel/angr/py-cle/patches/patch-cle_loader_py
index 7eed526331c..b0d325f4545 100644
--- a/devel/angr/py-cle/patches/patch-cle_loader_py
+++ b/devel/angr/py-cle/patches/patch-cle_loader_py
@@ -1,9 +1,9 @@
-$OpenBSD: patch-cle_loader_py,v 1.1.1.1 2019/07/23 19:22:21 jasper Exp $
+$OpenBSD: patch-cle_loader_py,v 1.2 2019/11/10 09:29:32 kn Exp $
 
 Index: cle/loader.py
 --- cle/loader.py.orig
 +++ cle/loader.py
-@@ -894,6 +894,9 @@ class Loader:
+@@ -895,6 +895,9 @@ class Loader:
                  dirs.extend(self.main_object.extra_load_path)
                  if sys.platform.startswith('linux'):
                      dirs.extend(self.main_object.arch.library_search_path())
diff --git a/devel/angr/py-pyvex/Makefile b/devel/angr/py-pyvex/Makefile
index 36130737e5a..a1ae93176eb 100644
--- a/devel/angr/py-pyvex/Makefile
+++ b/devel/angr/py-pyvex/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 2019/10/26 12:12:24 kn Exp $
+# $OpenBSD: Makefile,v 1.3 2019/11/10 09:29:32 kn Exp $
 
 COMMENT =		Python interface to libVEX and VEX IR
 
 ANGR_PYTHON_MODULE =	pyvex
-REVISION =		0
 
 USE_GMAKE =		Yes
 CFLAGS +=		-shared -fPIC -I${LOCALBASE}/include/angr-vex/
diff --git a/devel/angr/py-pyvex/distinfo b/devel/angr/py-pyvex/distinfo
index 9525863b94b..88dbf29de26 100644
--- a/devel/angr/py-pyvex/distinfo
+++ b/devel/angr/py-pyvex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pyvex-8.19.7.25.tar.gz) = dGIJ1CN0L8sczvPv8oi7yH9Ljq2AJOiZe9amfe3FMm8=
-SIZE (pyvex-8.19.7.25.tar.gz) = 1727804
+SHA256 (pyvex-8.19.10.30.tar.gz) = Pb1JSHGSZrsfcB85J+YhiCqZnE1GK9bHXRdBil7m2IQ=
+SIZE (pyvex-8.19.10.30.tar.gz) = 1738924
diff --git a/devel/angr/py-z3-solver/Makefile b/devel/angr/py-z3-solver/Makefile
index 5051cc5d657..37b5160954b 100644
--- a/devel/angr/py-z3-solver/Makefile
+++ b/devel/angr/py-z3-solver/Makefile
@@ -1,11 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2019/08/16 23:27:09 cwen Exp $
+# $OpenBSD: Makefile,v 1.4 2019/11/10 09:29:32 kn Exp $
 
 COMMENT =		efficient SMT solver library (angr fork)
 
 ANGR_PYTHON_MODULE =	z3-solver
-# devel/angr/py-claripy requires this exact version, newer 4.8.5.0 breaks it.
-MODPY_EGG_VERSION =	4.5.1.0.post2
-REVISION =	0
+MODPY_EGG_VERSION =	4.8.6.0
 
 CATEGORIES +=		math
 
diff --git a/devel/angr/py-z3-solver/distinfo b/devel/angr/py-z3-solver/distinfo
index c57bb7d443e..3f7243bbec8 100644
--- a/devel/angr/py-z3-solver/distinfo
+++ b/devel/angr/py-z3-solver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (z3-solver-4.5.1.0.post2.tar.gz) = yALb5TaHQ90w3SpoTBW4OxfDyV31S2b5dhGlmIrg9pY=
-SIZE (z3-solver-4.5.1.0.post2.tar.gz) = 3891600
+SHA256 (z3-solver-4.8.6.0.tar.gz) = C4+6LnVopC0Xr6R1ti4ykL0vM5fmCA3EQ16ubBGuFbs=
+SIZE (z3-solver-4.8.6.0.tar.gz) = 4198038
diff --git a/devel/angr/py-z3-solver/patches/patch-core_scripts_mk_util_py b/devel/angr/py-z3-solver/patches/patch-core_scripts_mk_util_py
index b8e21f15ebb..485685c3874 100644
--- a/devel/angr/py-z3-solver/patches/patch-core_scripts_mk_util_py
+++ b/devel/angr/py-z3-solver/patches/patch-core_scripts_mk_util_py
@@ -1,31 +1,16 @@
-$OpenBSD: patch-core_scripts_mk_util_py,v 1.2 2019/08/02 12:59:51 sthen Exp $
+$OpenBSD: patch-core_scripts_mk_util_py,v 1.3 2019/11/10 09:29:32 kn Exp $
 
 Remove hardcoded optimizations.
 
 Index: core/scripts/mk_util.py
 --- core/scripts/mk_util.py.orig
 +++ core/scripts/mk_util.py
-@@ -2422,9 +2422,9 @@ def mk_config():
+@@ -2538,7 +2538,7 @@ def mk_config():
              EXAMP_DEBUG_FLAG = '-g'
+             CPPFLAGS     = '%s -DZ3DEBUG -D_DEBUG' % CPPFLAGS
          else:
+-            CXXFLAGS     = '%s -O3' % CXXFLAGS
++            CXXFLAGS     = '%s' % CXXFLAGS
              if GPROF:
--                CXXFLAGS     = '%s -O3 -D _EXTERNAL_RELEASE' % CXXFLAGS
-+                CXXFLAGS     = '%s -D _EXTERNAL_RELEASE' % CXXFLAGS
-             else:
--                CXXFLAGS     = '%s -O3 -D _EXTERNAL_RELEASE -fomit-frame-pointer' % CXXFLAGS
-+                CXXFLAGS     = '%s -D _EXTERNAL_RELEASE -fomit-frame-pointer' % CXXFLAGS
-         if is_CXX_clangpp():
-             CXXFLAGS   = '%s -Wno-unknown-pragmas -Wno-overloaded-virtual -Wno-unused-value' % CXXFLAGS
-         sysname, _, _, _, machine = os.uname()
-@@ -2457,9 +2457,9 @@ def mk_config():
-             SLIBFLAGS   = '-shared'
-         else:
-             raise MKException('Unsupported platform: %s' % sysname)
-+        if sysname[:6] != 'CYGWIN':
-+            CXXFLAGS     = '%s -fPIC' % CXXFLAGS
-         if is64():
--            if sysname[:6] != 'CYGWIN':
--                CXXFLAGS     = '%s -fPIC' % CXXFLAGS
-             CPPFLAGS     = '%s -D_AMD64_' % CPPFLAGS
-             if sysname == 'Linux':
-                 CPPFLAGS = '%s -D_USE_THREAD_LOCAL' % CPPFLAGS
+                 CXXFLAGS     += '-fomit-frame-pointer'
+             CPPFLAGS     = '%s -DNDEBUG -D_EXTERNAL_RELEASE' % CPPFLAGS
diff --git a/devel/angr/py-z3-solver/patches/patch-core_src_util_lp_permutation_matrix_h b/devel/angr/py-z3-solver/patches/patch-core_src_util_lp_permutation_matrix_h
deleted file mode 100644
index dbc002a3497..00000000000
--- a/devel/angr/py-z3-solver/patches/patch-core_src_util_lp_permutation_matrix_h
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-core_src_util_lp_permutation_matrix_h,v 1.1 2019/08/16 23:27:09 cwen Exp $
-
-Unbreak with ports-gcc, from upstream:
-https://github.com/Z3Prover/z3/commit/2d5dd802386d78117d5ed9ddcbf8bc22ab3cb461
-
-Index: core/src/util/lp/permutation_matrix.h
---- core/src/util/lp/permutation_matrix.h.orig
-+++ core/src/util/lp/permutation_matrix.h
-@@ -117,7 +117,7 @@ class permutation_matrix : public tail_matrix<T, X> {
- 
-         unsigned size() const { return static_cast<unsigned>(m_rev.size()); }
- 
--        unsigned * values() const { return m_permutation; }
-+        unsigned * values() const { return m_permutation.c_ptr(); }
- 
-         void resize(unsigned size) {
-             unsigned old_size = m_permutation.size();
diff --git a/devel/angr/py-z3-solver/pkg/PLIST b/devel/angr/py-z3-solver/pkg/PLIST
index 3a826b24b3c..02bba9b4611 100644
--- a/devel/angr/py-z3-solver/pkg/PLIST
+++ b/devel/angr/py-z3-solver/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2019/07/23 19:22:23 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.2 2019/11/10 09:29:32 kn Exp $
 @conflict z3-*
 @bin bin/z3
 lib/python${MODPY_VERSION}/site-packages/z3/
@@ -15,16 +15,33 @@ lib/python${MODPY_VERSION}/site-packages/z3/${MODPY_PYCACHE}z3rcf.${MODPY_PYC_MA
 lib/python${MODPY_VERSION}/site-packages/z3/${MODPY_PYCACHE}z3types.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/z3/${MODPY_PYCACHE}z3util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/z3/include/
-lib/python${MODPY_VERSION}/site-packages/z3/include/c++/
-lib/python${MODPY_VERSION}/site-packages/z3/include/c++/z3++.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/api_ast_map.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/api_ast_vector.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/api_context.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/api_datalog.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/api_goal.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/api_log_macros.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/api_model.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/api_polynomial.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/api_solver.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/api_stats.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/api_tactic.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/api_util.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/z3++.h
 lib/python${MODPY_VERSION}/site-packages/z3/include/z3.h
 lib/python${MODPY_VERSION}/site-packages/z3/include/z3_algebraic.h
 lib/python${MODPY_VERSION}/site-packages/z3/include/z3_api.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/z3_ast_containers.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/z3_fixedpoint.h
 lib/python${MODPY_VERSION}/site-packages/z3/include/z3_fpa.h
-lib/python${MODPY_VERSION}/site-packages/z3/include/z3_interp.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/z3_logger.h
 lib/python${MODPY_VERSION}/site-packages/z3/include/z3_macros.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/z3_optimization.h
 lib/python${MODPY_VERSION}/site-packages/z3/include/z3_polynomial.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/z3_private.h
 lib/python${MODPY_VERSION}/site-packages/z3/include/z3_rcf.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/z3_replayer.h
+lib/python${MODPY_VERSION}/site-packages/z3/include/z3_spacer.h
 lib/python${MODPY_VERSION}/site-packages/z3/include/z3_v1.h
 lib/python${MODPY_VERSION}/site-packages/z3/lib/
 lib/python${MODPY_VERSION}/site-packages/z3/lib/libz3.so
diff --git a/security/angrop/Makefile b/security/angrop/Makefile
index b4bf57c5ae3..982975c2a25 100644
--- a/security/angrop/Makefile
+++ b/security/angrop/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2019/09/30 08:24:44 jasper Exp $
+# $OpenBSD: Makefile,v 1.4 2019/11/10 09:29:32 kn Exp $
 
 # sync with devel/angr/Makefile.inc
 ONLY_FOR_ARCHS =	amd64
@@ -19,7 +19,7 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 MODPY_VERSION =		${MODPY_DEFAULT_VERSION_3}
-MODPY_EGG_VERSION =	8.19.7.25
+MODPY_EGG_VERSION =	8.19.10.30
 MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
 
diff --git a/security/angrop/distinfo b/security/angrop/distinfo
index e97a5f9d981..830c5ffdb55 100644
--- a/security/angrop/distinfo
+++ b/security/angrop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (angrop-8.19.7.25.tar.gz) = r0s1CMk2IV5MDieanH9uatoCbM/2ws5zdMGJ6YHPCsk=
-SIZE (angrop-8.19.7.25.tar.gz) = 27066
+SHA256 (angrop-8.19.10.30.tar.gz) = /Bjhoh3KlpHh0C3NuLizmrtG16e7K9drZXGkivBTBCM=
+SIZE (angrop-8.19.10.30.tar.gz) = 27016