diff --git a/cad/surelog/Makefile b/cad/surelog/Makefile
index 172fe5ba3b60..d93b2b1a75b1 100644
--- a/cad/surelog/Makefile
+++ b/cad/surelog/Makefile
@@ -1,68 +1,67 @@
 PORTNAME=	surelog
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.57
-PORTREVISION=	1
+DISTVERSION=	1.58
 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
 
 JAVA_BUILD=	yes
 JAVA_RUN=	no
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	chipsalliance
 GH_PROJECT=	Surelog
 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_ON=	SURELOG_BUILD_TESTS # 2 tests fail, 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 1e2b3147f677..550e6f2639d4 100644
--- a/cad/surelog/distinfo
+++ b/cad/surelog/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1682575094
-SHA256 (chipsalliance-Surelog-v1.57_GH0.tar.gz) = d114afc9eb121e310214324ecef9d6959dee754474ee6ac6f4c4a489360b58ae
-SIZE (chipsalliance-Surelog-v1.57_GH0.tar.gz) = 91932475
+TIMESTAMP = 1683480434
+SHA256 (chipsalliance-Surelog-v1.58_GH0.tar.gz) = 95489fc571d990d313578800d3aa706ca085bc8fdcaec746e00ac2b785f51ee0
+SIZE (chipsalliance-Surelog-v1.58_GH0.tar.gz) = 91953045
 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