Index: head/devel/py-grpcio/Makefile
===================================================================
--- head/devel/py-grpcio/Makefile	(revision 544267)
+++ head/devel/py-grpcio/Makefile	(revision 544268)
@@ -1,34 +1,34 @@
 # Created by: vanilla@
 # $FreeBSD$
 
 PORTNAME=	grpcio
-PORTVERSION=	1.30.0
+PORTVERSION=	1.31.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	HTTP/2-based RPC framework
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>1:devel/py-six@${PY_FLAVOR} \
 		${PY_ENUM34} \
 		${PY_FUTURES} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>=3:devel/py-protobuf@${PY_FLAVOR}
 LIB_DEPENDS=	libcares.so:dns/c-ares
 
 USES=		compiler:c++11-lib localbase:ldflags python:3.5+
 USE_PYTHON=	autoplist distutils
 MAKE_ENV+=	GRPC_PYTHON_BUILD_SYSTEM_ZLIB=true \
 		GRPC_PYTHON_BUILD_SYSTEM_CARES=true
 CFLAGS+=	-Ithird_party/boringssl/include
 CFLAGS_powerpc64=	-maltivec -mvsx
 CFLAGS_powerpc=	-maltivec
 LDFLAGS+=	-lcares
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/grpc/_cython/cygrpc.so
 	${REINPLACE_CMD} -e 's|${PYTHONPREFIX_SITELIBDIR}/\(.*\)/grpcio/grpc/_cython/cygrpc.so|${PYTHONPREFIX_SITELIBDIR}/grpc/_cython/cygrpc.so|g' ${_PYTHONPKGLIST}
 
 .include <bsd.port.mk>
Index: head/devel/py-grpcio/distinfo
===================================================================
--- head/devel/py-grpcio/distinfo	(revision 544267)
+++ head/devel/py-grpcio/distinfo	(revision 544268)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1593141108
-SHA256 (grpcio-1.30.0.tar.gz) = e8f2f5d16e0164c415f1b31a8d9a81f2e4645a43d1b261375d6bab7b0adf511f
-SIZE (grpcio-1.30.0.tar.gz) = 19674635
+TIMESTAMP = 1596695331
+SHA256 (grpcio-1.31.0.tar.gz) = 5043440c45c0a031f387e7f48527541c65d672005fb24cf18ef6857483557d39
+SIZE (grpcio-1.31.0.tar.gz) = 20039534
Index: head/devel/py-grpcio/files/patch-src_python_grpcio_grpc__core__dependencies.py
===================================================================
--- head/devel/py-grpcio/files/patch-src_python_grpcio_grpc__core__dependencies.py	(revision 544267)
+++ head/devel/py-grpcio/files/patch-src_python_grpcio_grpc__core__dependencies.py	(revision 544268)
@@ -1,59 +1,59 @@
---- src/python/grpcio/grpc_core_dependencies.py.orig	2020-06-22 21:42:27 UTC
+--- src/python/grpcio/grpc_core_dependencies.py.orig	2020-08-05 07:00:06 UTC
 +++ src/python/grpcio/grpc_core_dependencies.py
-@@ -791,56 +791,6 @@ CORE_SOURCE_FILES = [
+@@ -793,56 +793,6 @@ CORE_SOURCE_FILES = [
      'third_party/boringssl-with-bazel/src/ssl/tls13_server.cc',
      'third_party/boringssl-with-bazel/src/ssl/tls_method.cc',
      'third_party/boringssl-with-bazel/src/ssl/tls_record.cc',
 -    'third_party/cares/cares/ares__close_sockets.c',
 -    'third_party/cares/cares/ares__get_hostent.c',
 -    'third_party/cares/cares/ares__read_line.c',
 -    'third_party/cares/cares/ares__timeval.c',
 -    'third_party/cares/cares/ares_cancel.c',
 -    'third_party/cares/cares/ares_create_query.c',
 -    'third_party/cares/cares/ares_data.c',
 -    'third_party/cares/cares/ares_destroy.c',
 -    'third_party/cares/cares/ares_expand_name.c',
 -    'third_party/cares/cares/ares_expand_string.c',
 -    'third_party/cares/cares/ares_fds.c',
 -    'third_party/cares/cares/ares_free_hostent.c',
 -    'third_party/cares/cares/ares_free_string.c',
 -    'third_party/cares/cares/ares_getenv.c',
 -    'third_party/cares/cares/ares_gethostbyaddr.c',
 -    'third_party/cares/cares/ares_gethostbyname.c',
 -    'third_party/cares/cares/ares_getnameinfo.c',
 -    'third_party/cares/cares/ares_getopt.c',
 -    'third_party/cares/cares/ares_getsock.c',
 -    'third_party/cares/cares/ares_init.c',
 -    'third_party/cares/cares/ares_library_init.c',
 -    'third_party/cares/cares/ares_llist.c',
 -    'third_party/cares/cares/ares_mkquery.c',
 -    'third_party/cares/cares/ares_nowarn.c',
 -    'third_party/cares/cares/ares_options.c',
 -    'third_party/cares/cares/ares_parse_a_reply.c',
 -    'third_party/cares/cares/ares_parse_aaaa_reply.c',
 -    'third_party/cares/cares/ares_parse_mx_reply.c',
 -    'third_party/cares/cares/ares_parse_naptr_reply.c',
 -    'third_party/cares/cares/ares_parse_ns_reply.c',
 -    'third_party/cares/cares/ares_parse_ptr_reply.c',
 -    'third_party/cares/cares/ares_parse_soa_reply.c',
 -    'third_party/cares/cares/ares_parse_srv_reply.c',
 -    'third_party/cares/cares/ares_parse_txt_reply.c',
 -    'third_party/cares/cares/ares_platform.c',
 -    'third_party/cares/cares/ares_process.c',
 -    'third_party/cares/cares/ares_query.c',
 -    'third_party/cares/cares/ares_search.c',
 -    'third_party/cares/cares/ares_send.c',
 -    'third_party/cares/cares/ares_strcasecmp.c',
 -    'third_party/cares/cares/ares_strdup.c',
 -    'third_party/cares/cares/ares_strerror.c',
 -    'third_party/cares/cares/ares_strsplit.c',
 -    'third_party/cares/cares/ares_timeout.c',
 -    'third_party/cares/cares/ares_version.c',
 -    'third_party/cares/cares/ares_writev.c',
 -    'third_party/cares/cares/bitncmp.c',
 -    'third_party/cares/cares/inet_net_pton.c',
 -    'third_party/cares/cares/inet_ntop.c',
 -    'third_party/cares/cares/windows_port.c',
-     'third_party/upb/upb/decode.c',
-     'third_party/upb/upb/encode.c',
-     'third_party/upb/upb/msg.c',
+     'third_party/re2/re2/bitstate.cc',
+     'third_party/re2/re2/compile.cc',
+     'third_party/re2/re2/dfa.cc',