git: d4b2c70756a1 - main - cad/yosys: update 0.51 → 0.52

The branch main has been updated by yuri:

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

commit d4b2c70756a1a303d7293fb99bec05406e69a56f
Author:     Älven <alster@vinterdalen.se>
AuthorDate: 2025-04-28 09:19:21 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2025-04-28 09:19:53 +0000

    cad/yosys: update 0.51 → 0.52
    
    PR:     286408
---
 cad/yosys/Makefile                     | 37 +++++++++++++++++-----------------
 cad/yosys/distinfo                     |  8 +++-----
 cad/yosys/files/patch-kernel_driver.cc | 11 ++++++++++
 cad/yosys/pkg-plist                    |  2 ++
 4 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/cad/yosys/Makefile b/cad/yosys/Makefile
index 3306cdc0f222..9ff7e94963c6 100644
--- a/cad/yosys/Makefile
+++ b/cad/yosys/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	yosys
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.51
+DISTVERSION=	0.52
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -13,47 +13,46 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	abc:cad/abc \
 		bash:shells/bash \
+		cxxopts>0:devel/cxxopts \
 		gawk:lang/gawk
 LIB_DEPENDS=	libffi.so:devel/libffi
-RUN_DEPENDS=	xdot:x11/py-xdot@${PY_FLAVOR} \
-		bash:shells/bash
+RUN_DEPENDS=	bash:shells/bash \
+		xdot:x11/py-xdot@${PY_FLAVOR}
 
 TEST_DEPENDS=	iverilog:cad/iverilog
 
 USES=		bison compiler:c++11-lang gmake pkgconfig python readline \
 		shebangfix tcl
 
-SHEBANG_FILES=	backends/smt2/smtbmc.py \
-		misc/yosys-config.in
-SHEBANG_GLOB=	*.sh *.py
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	YosysHQ
-GH_TUPLE=	jarro2783:cxxopts:4bf61f0:cxxopts/libs/cxxopts
 
-BINARY_ALIAS=	python3=${PYTHON_CMD} tclsh=${TCLSH}
+SHEBANG_FILES=	backends/smt2/smtbmc.py misc/yosys-config.in
+SHEBANG_GLOB=	*.py *.sh
+
 MAKE_ARGS=	ABCEXTERNAL=abc
 MAKE_ENV=	MAKE=${GMAKE}
 
-TEST_TARGET=	test # some tests fail, see https://github.com/YosysHQ/yosys/issues/3731
+TEST_TARGET=	test
+
+BINARY_ALIAS=	python3=${PYTHON_CMD} tclsh=${TCLSH}
 
-OPTIONS_GROUP=		SOLVERS
-OPTIONS_GROUP_SOLVERS=	CVC5 YICES Z3
 OPTIONS_DEFINE=		TCMALLOC
 OPTIONS_DEFAULT=	TCMALLOC YICES # YICES: same as the default in C++ code ; TCMALLOC: should be the same default as in cad/surelog, cad/uhdm because surelog's lib is used in the yosys plugin cad/yosys-systemverilog
+OPTIONS_GROUP=		SOLVERS
+OPTIONS_GROUP_SOLVERS=	CVC5 YICES Z3
 
-SOLVERS_DESC=		Install SAT solvers
-CVC5_DESC=		CVC SAT Solver
-YICES_DESC=		Yices SAT Solver
-Z3_DESC=		Z3 SAT Solver
+CVC5_DESC=	CVC SAT Solver
+SOLVERS_DESC=	Install SAT solvers
+YICES_DESC=	Yices SAT Solver
+Z3_DESC=	Z3 SAT Solver
 
 CVC5_RUN_DEPENDS=	cvc5:math/cvc5
+TCMALLOC_LIB_DEPENDS=	libtcmalloc.so:devel/google-perftools
+TCMALLOC_LDFLAGS=	`pkg-config --libs libtcmalloc`
 YICES_RUN_DEPENDS=	yices_smt2:math/yices
 Z3_RUN_DEPENDS=		z3:math/z3
 
-TCMALLOC_LDFLAGS=	`pkg-config --libs libtcmalloc`
-TCMALLOC_LIB_DEPENDS=	libtcmalloc.so:devel/google-perftools
-
 post-patch:
 	${REINPLACE_CMD} -e '/^CXX =/d; s/^LD = .*/LD = $$(CXX)/' \
 		-e '/^CONFIG/s/clang/${CHOSEN_COMPILER_TYPE}/' \
diff --git a/cad/yosys/distinfo b/cad/yosys/distinfo
index 93d41536d8f3..01a4fd06fe8d 100644
--- a/cad/yosys/distinfo
+++ b/cad/yosys/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1741841221
-SHA256 (YosysHQ-yosys-v0.51_GH0.tar.gz) = aeec40346c862b08dfa1fb9c67c410cca5630828cb8ebfa2f79cda12d78ded99
-SIZE (YosysHQ-yosys-v0.51_GH0.tar.gz) = 3289010
-SHA256 (jarro2783-cxxopts-4bf61f0_GH0.tar.gz) = b82f3475956e9456e416c2234e12dcd8151099278b9cbf1617aa30483af00c58
-SIZE (jarro2783-cxxopts-4bf61f0_GH0.tar.gz) = 160621
+TIMESTAMP = 1745810869
+SHA256 (YosysHQ-yosys-v0.52_GH0.tar.gz) = b6212f132edb4127099406ebdd1c6aee0f5db4175d8ce44053c45089e00dabbe
+SIZE (YosysHQ-yosys-v0.52_GH0.tar.gz) = 3295413
diff --git a/cad/yosys/files/patch-kernel_driver.cc b/cad/yosys/files/patch-kernel_driver.cc
new file mode 100644
index 000000000000..cb4521933188
--- /dev/null
+++ b/cad/yosys/files/patch-kernel_driver.cc
@@ -0,0 +1,11 @@
+--- kernel/driver.cc.orig	2025-04-09 05:38:42 UTC
++++ kernel/driver.cc
+@@ -20,7 +20,7 @@
+ #include "kernel/yosys.h"
+ #include "kernel/hashlib.h"
+ #include "libs/sha1/sha1.h"
+-#include "libs/cxxopts/include/cxxopts.hpp"
++#include <cxxopts.hpp>
+ #include <iostream>
+ 
+ #ifdef YOSYS_ENABLE_READLINE
diff --git a/cad/yosys/pkg-plist b/cad/yosys/pkg-plist
index 4035bb596f37..3502eb9eccf7 100644
--- a/cad/yosys/pkg-plist
+++ b/cad/yosys/pkg-plist
@@ -126,7 +126,9 @@ bin/yosys-witness
 %%DATADIR%%/include/kernel/ffmerge.h
 %%DATADIR%%/include/kernel/fmt.h
 %%DATADIR%%/include/kernel/fstdata.h
+%%DATADIR%%/include/kernel/gzip.h
 %%DATADIR%%/include/kernel/hashlib.h
+%%DATADIR%%/include/kernel/io.h
 %%DATADIR%%/include/kernel/json.h
 %%DATADIR%%/include/kernel/log.h
 %%DATADIR%%/include/kernel/macc.h