git: fbbc4632ca7f - main - cad/surelog: update 1.86 → 1.87

The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fbbc4632ca7ff2da47048804c28fa9c24ae825dc

commit fbbc4632ca7ff2da47048804c28fa9c24ae825dc
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2026-09-16 05:17:52 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2026-09-16 06:27:37 +0000

    cad/surelog: update 1.86 → 1.87
---
 cad/surelog/Makefile                                   | 13 +++++++------
 cad/surelog/distinfo                                   | 14 +++++++-------
 .../files/patch-src_ErrorReporting_ErrorContainer.cpp  | 18 ++++++++++++++++++
 cad/surelog/pkg-plist                                  |  4 ++--
 4 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/cad/surelog/Makefile b/cad/surelog/Makefile
index b844df2847b6..3ee0eb06e3bc 100644
--- a/cad/surelog/Makefile
+++ b/cad/surelog/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	surelog
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.86
-PORTREVISION=	1
+DISTVERSION=	1.87
 CATEGORIES=	cad java
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -26,8 +25,8 @@ JAVA_VERSION=	17 # Java selection fails in cmake when Java 11 is also installed,
 USE_GITHUB=	yes
 GH_ACCOUNT=	chipsalliance
 GH_PROJECT=	Surelog
-GH_TUPLE=	alainmarcel:antlr4:6a15cc32de:antlr4/third_party/antlr4 \
-		nlohmann:json:788e5468e4:json/third_party/json
+GH_TUPLE=	antlr:antlr4:bd8f9930d0:antlr4/third_party/antlr4 \
+		nlohmann:json:867127c2f4:json/third_party/json
 
 CMAKE_ARGS=	-DFREEBSD_JAVA_VERSION=${JAVA_VERSION} \
 		-DPython3_EXECUTABLE=${PYTHON_CMD}
@@ -36,7 +35,7 @@ CMAKE_ON=	BUILD_SHARED_LIBS \
 		SURELOG_USE_HOST_CAPNP \
 		SURELOG_USE_HOST_GTEST
 CMAKE_OFF=	SURELOG_BUILD_TESTS
-CMAKE_TESTING_ON=	SURELOG_BUILD_TESTS # 2 tests fail, see https://github.com/chipsalliance/Surelog/issues/3545
+CMAKE_TESTING_ON=	SURELOG_BUILD_TESTS
 CMAKE_TESTING_TARGET=	UnitTests
 
 CONFLICTS_BUILD=	openjdk8 openjdk11 openjdk18 openjdk19
@@ -66,7 +65,9 @@ post-install:
 	@${RM} -r \
 		${STAGEDIR}${DATADIR}
 
-post-test: # 9 tests fail, see https://github.com/chipsalliance/Surelog/issues/3971
+post-test:
 	@cd ${BUILD_WRKSRC} && ctest
 
+# tests as of 1.87: 100% tests passed, 0 tests failed out of 90
+
 .include <bsd.port.mk>
diff --git a/cad/surelog/distinfo b/cad/surelog/distinfo
index 610dcd6f5d2c..1b93d912362f 100644
--- a/cad/surelog/distinfo
+++ b/cad/surelog/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1762226270
-SHA256 (chipsalliance-Surelog-v1.86_GH0.tar.gz) = 5bffc61334f38b16b5dd57e5209d38bc1e07b0e0bda452e4580678aa3e9daf53
-SIZE (chipsalliance-Surelog-v1.86_GH0.tar.gz) = 98792218
-SHA256 (alainmarcel-antlr4-6a15cc32de_GH0.tar.gz) = 836d9de8021f67710290812e24ed75c9131cb54f824939e311c516343a0fc55b
-SIZE (alainmarcel-antlr4-6a15cc32de_GH0.tar.gz) = 4173382
-SHA256 (nlohmann-json-788e5468e4_GH0.tar.gz) = d3dff09c8c00c37cac1243f4dc9e29f2f593ec45832be3f6c3523960242fc855
-SIZE (nlohmann-json-788e5468e4_GH0.tar.gz) = 8040326
+TIMESTAMP = 1789527396
+SHA256 (chipsalliance-Surelog-v1.87_GH0.tar.gz) = 5d3895ebaa08890db858988143264e2bc84c1dc6d36344628dc9f4a2aee2027b
+SIZE (chipsalliance-Surelog-v1.87_GH0.tar.gz) = 99059311
+SHA256 (antlr-antlr4-bd8f9930d0_GH0.tar.gz) = 83ed6531bbfa032ad872800367d13eaed22dd91f70f2021d53972fa222966933
+SIZE (antlr-antlr4-bd8f9930d0_GH0.tar.gz) = 4173439
+SHA256 (nlohmann-json-867127c2f4_GH0.tar.gz) = 53eee3a0b78dd24e028e10b5cfe3c90c086b975b95b3896bac1e154e7c6bd7c5
+SIZE (nlohmann-json-867127c2f4_GH0.tar.gz) = 9731984
diff --git a/cad/surelog/files/patch-src_ErrorReporting_ErrorContainer.cpp b/cad/surelog/files/patch-src_ErrorReporting_ErrorContainer.cpp
new file mode 100644
index 000000000000..1fc0232c980a
--- /dev/null
+++ b/cad/surelog/files/patch-src_ErrorReporting_ErrorContainer.cpp
@@ -0,0 +1,18 @@
+-- Fix unit tests crashing when Python support is compiled in but not initialized.
+-- ErrorContainer::createErrorMessage() was unconditionally calling PythonAPI::evalScript()
+-- with a null interpreter pointer, causing a fatal Python GIL error.
+-- Fall back to the built-in message formatting when the Python interpreter has
+-- not been initialized (m_interpState is nullptr).
+-- See https://github.com/chipsalliance/Surelog/issues/3971
+--- src/ErrorReporting/ErrorContainer.cpp.orig	2026-09-16 05:28:55 UTC
++++ src/ErrorReporting/ErrorContainer.cpp
+@@ -261,7 +261,8 @@ std::tuple<std::string, bool, bool> ErrorContainer::cr
+         padding = "00";
+       else if (msg.m_errorId < 1000)
+         padding = "0";
+-      if ((reentrantPython == false) || (!m_clp->pythonAllowed())) {
++      if ((reentrantPython == false) || (!m_clp->pythonAllowed()) ||
++          (m_interpState == nullptr)) {
+         tmp = "[" + severity + ":" + category + padding +
+               std::to_string(msg.m_errorId) + "] " + location + text + "\n";
+       } else {
diff --git a/cad/surelog/pkg-plist b/cad/surelog/pkg-plist
index 6781e4073e07..70504c63a59a 100644
--- a/cad/surelog/pkg-plist
+++ b/cad/surelog/pkg-plist
@@ -260,5 +260,5 @@ lib/libsurelog.so.%%SOVERSION%%
 %%PYTHON%%lib/surelog-python/python/slformatmsg.py
 %%PYTHON%%lib/surelog-python/python/slwaivers.py
 libdata/pkgconfig/Surelog.pc
-share/doc/libantlr4/README.md
-share/doc/libantlr4/VERSION
+share/doc/SURELOG/README.md
+share/doc/SURELOG/VERSION