diff --git a/cad/surelog/Makefile b/cad/surelog/Makefile
index cbd8b17df190..22926892a425 100644
--- a/cad/surelog/Makefile
+++ b/cad/surelog/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	surelog
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.56
+DISTVERSION=	1.57
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	SystemVerilog 2017 Pre-processor, Parser, Elaborator, etc
 WWW=		https://github.com/chipsalliance/Surelog
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_aarch64=	compilation fails: Creating OVM precompiled package... Segmentation fault (core dumped) # update to the current revision might help but it has C++ errors
 BROKEN_armv6=	compilation fails: Creating OVM precompiled package... libunwind: personality function returned unknown result 5
 BROKEN_i386=	compilation fails: conversion function cannot be redeclared, see https://github.com/chipsalliance/Surelog/issues/3206
 
 BUILD_DEPENDS=	utf8cpp>0:devel/utf8cpp \
 		${PYTHON_PKGNAMEPREFIX}orderedmultidict>0:devel/py-orderedmultidict@${PY_FLAVOR}
 LIB_DEPENDS=	libcapnp.so:devel/capnproto \
 		libtcmalloc.so:devel/google-perftools \
 		libuhdm.so:cad/uhdm
 
 USES=		cmake:testing compiler:c++17-lang localbase:ldflags tcl:86,build
 USE_JAVA=	17 # Java selection fails in cmake when Java 11 is also installed, see https://gitlab.kitware.com/cmake/cmake/-/issues/24674
 USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/surelog
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	chipsalliance
 GH_PROJECT=	Surelog
-GH_TUPLE=	alainmarcel:antlr4:3143e88:antlr4/third_party/antlr4 \
-		google:googletest:e1ee0fa:googletest/third_party/googletest \
-		google:flatbuffers:32a6744:flatbuffers/third_party/flatbuffers
+GH_TUPLE=	alainmarcel:antlr4:2406774:antlr4/third_party/antlr4 \
+		google:googletest:dea0484:googletest/third_party/googletest \
+		google:flatbuffers:6eae49a:flatbuffers/third_party/flatbuffers
 
 CMAKE_ON=	BUILD_SHARED_LIBS SURELOG_USE_HOST_UHDM
 CMAKE_OFF=	SURELOG_BUILD_TESTS
 CMAKE_ARGS=	-DFREEBSD_JAVA_VERSION=${USE_JAVA} \
 		-DPython3_EXECUTABLE=${PYTHON_CMD}
 CMAKE_TESTING_ON=	SURELOG_BUILD_TESTS # unclear how to run tests, see https://github.com/chipsalliance/Surelog/issues/3545
 CMAKE_TESTING_TARGET=	UnitTests
 
 CONFLICTS_INSTALL=	capnproto capnproto080
 
 BINARY_ALIAS=	python3=${PYTHON_CMD} tclsh=${TCLSH}
 
 OPTIONS_DEFINE=	PYTHON
 OPTIONS_SUB=	yes
 
 PYTHON_USES=		python
 PYTHON_USES_OFF=	python:build
 PYTHON_CMAKE_BOOL=	SURELOG_WITH_PYTHON
 PYTHON_CMAKE_ON=	-DFREEBSD_PYTHON_DISTVERSION=${PYTHON_DISTVERSION}
 
 PORTSCOUT=	limit:^.*[0-9]\.[0-9] # prevent tags like 'show'
 
 post-install: # workaound for https://github.com/chipsalliance/Surelog/issues/3596
 	@${RMDIR} \
 		${STAGEDIR}${DATADIR}/pkg/work \
 		${STAGEDIR}${DATADIR}/pkg \
 		${STAGEDIR}${DATADIR}
 
 post-test:
 	cd ${BUILD_WRKSRC} && ctest
 
 .include <bsd.port.mk>
diff --git a/cad/surelog/distinfo b/cad/surelog/distinfo
index 58193bf0aedb..1e2b3147f677 100644
--- a/cad/surelog/distinfo
+++ b/cad/surelog/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1681668095
-SHA256 (chipsalliance-Surelog-v1.56_GH0.tar.gz) = 36396d327aa4d433b38e0673608316e25f696e0d37c5f2ce14976b71a24f0683
-SIZE (chipsalliance-Surelog-v1.56_GH0.tar.gz) = 91906822
-SHA256 (alainmarcel-antlr4-3143e88_GH0.tar.gz) = cc950334f511b91b9b47bc8b84b60a7f7ae85d3ab2cb7a8596a9a226a53386ce
-SIZE (alainmarcel-antlr4-3143e88_GH0.tar.gz) = 4310506
-SHA256 (google-googletest-e1ee0fa_GH0.tar.gz) = d2d59b967237e554f5d816892b4aa831ed024d3af7ffcfde1e232260a19d4501
-SIZE (google-googletest-e1ee0fa_GH0.tar.gz) = 865239
-SHA256 (google-flatbuffers-32a6744_GH0.tar.gz) = 826bb0eb96e79a909592c9fb4c4ef775d61a0b4c30e9db0249ff924830cf3cf7
-SIZE (google-flatbuffers-32a6744_GH0.tar.gz) = 2198497
+TIMESTAMP = 1682575094
+SHA256 (chipsalliance-Surelog-v1.57_GH0.tar.gz) = d114afc9eb121e310214324ecef9d6959dee754474ee6ac6f4c4a489360b58ae
+SIZE (chipsalliance-Surelog-v1.57_GH0.tar.gz) = 91932475
+SHA256 (alainmarcel-antlr4-2406774_GH0.tar.gz) = 47c777fe91a0533fa24600bd2cf44328a8811e638d3fb8a76b89b6c96b65d023
+SIZE (alainmarcel-antlr4-2406774_GH0.tar.gz) = 4312960
+SHA256 (google-googletest-dea0484_GH0.tar.gz) = de1bde669e89841b71dbad128a37a8678981941138653941f4a1453638af6609
+SIZE (google-googletest-dea0484_GH0.tar.gz) = 867311
+SHA256 (google-flatbuffers-6eae49a_GH0.tar.gz) = f2acb5069cc0509f7e234664806a869c2f385f0a81540126473db79ee1167991
+SIZE (google-flatbuffers-6eae49a_GH0.tar.gz) = 2214541
diff --git a/cad/surelog/files/patch-CMakeLists.txt b/cad/surelog/files/patch-CMakeLists.txt
index 4fb99220f363..530c39f79b1d 100644
--- a/cad/surelog/files/patch-CMakeLists.txt
+++ b/cad/surelog/files/patch-CMakeLists.txt
@@ -1,20 +1,28 @@
---- CMakeLists.txt.orig	2022-08-20 02:45:49 UTC
+--- CMakeLists.txt.orig	2023-04-25 18:21:08 UTC
 +++ CMakeLists.txt
-@@ -53,7 +53,7 @@ set(GENDIR ${CMAKE_CURRENT_BINARY_DIR}/generated)
+@@ -141,14 +141,14 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BIN
  
  # Python
  if (SURELOG_WITH_PYTHON)
--  find_package(Python3 3.3 REQUIRED COMPONENTS Interpreter Development)
+-  find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
 +  find_package(Python3 ${FREEBSD_PYTHON_DISTVERSION} EXACT REQUIRED COMPONENTS Interpreter Development)
-   find_package(SWIG 3.0 REQUIRED)
+   find_package(SWIG REQUIRED)
    message(STATUS "Python3_LIBRARIES = ${Python3_LIBRARIES}")
    message(STATUS "Python3_EXECUTABLE = ${Python3_EXECUTABLE}")
-@@ -140,7 +140,7 @@ add_custom_command(
-           ${FLATBUFFERS_FLATC_EXECUTABLE})
+   message(STATUS "Python3_INCLUDE_DIRS = ${Python3_INCLUDE_DIRS}")
+   message(STATUS "Python3_RUNTIME_LIBRARY_DIRS = ${Python3_RUNTIME_LIBRARY_DIRS}")
+ else()
+-  find_package(Python3 3.3 REQUIRED Interpreter)
++  find_package(Python3 ${FREEBSD_PYTHON_DISTVERSION} EXACT REQUIRED Interpreter)
+   message(STATUS "Python3_EXECUTABLE = ${Python3_EXECUTABLE}")
+ endif()
+ 
+@@ -231,7 +231,7 @@ add_custom_command(
+           ${PROJECT_SOURCE_DIR}/src/Cache/preproc.fbs)
  
  # Java
 -find_package(Java 11 REQUIRED COMPONENTS Runtime)
 +find_package(Java ${FREEBSD_JAVA_VERSION} REQUIRED COMPONENTS Runtime)
  message(STATUS "Java_JAVA_EXECUTABLE = ${Java_JAVA_EXECUTABLE}")
- set(ANTLR_JAR_LOCATION
-     ${PROJECT_SOURCE_DIR}/third_party/antlr4_bin/antlr-4.10-complete.jar)
+ 
+ add_custom_target(GenerateParser DEPENDS