Re: Request upgrade of devel/yosys

[Mayuresh <mayuresh%acm.org@localhost>]

Request upgrade to latest version 0.47.

Patches attached.

diff --git a/devel/yosys/Makefile b/devel/yosys/Makefile
index 4d520f22837..d4f4d032139 100644
--- a/devel/yosys/Makefile
+++ b/devel/yosys/Makefile
@@ -2,7 +2,7 @@
 
 # XXX Yosys changed their release tag format in 0.45 to just a bare
 # XXX number, sigh.
-YOSYS_VERSION=	0.46
+YOSYS_VERSION=	0.47
 YOSYS_TAG=	${YOSYS_VERSION}
 ABC_TAG=	yosys-${YOSYS_VERSION}
 ABC_DISTNAME=	abc-${ABC_TAG}
@@ -24,6 +24,7 @@ DEPENDS+=	graphviz-[0-9]*:../../graphics/graphviz
 ONLY_FOR_COMPILER=	clang gcc
 USE_LANGUAGES=		c c++
 USE_CXX_FEATURES=	c++17
+GCC_REQD+=		10
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/compiler.mk"
@@ -78,5 +79,6 @@ do-configure:
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"
+.include "../../devel/cxxopts/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/yosys/distinfo b/devel/yosys/distinfo
index 2e7a40b21eb..4b7480d0cb9 100644
--- a/devel/yosys/distinfo
+++ b/devel/yosys/distinfo
@@ -1,10 +1,10 @@
 $NetBSD: distinfo,v 1.6 2024/10/15 01:32:59 thorpej Exp $
 
-BLAKE2s (abc-yosys-0.46.tar.gz) = dfd05bc9646cf2d97dd655cf2f90ba71b498cd7e7d3be04282084d67ce4bd994
-SHA512 (abc-yosys-0.46.tar.gz) = e2b12c1adf7fbfd477999c791cfe237ab4cf66b2615be0e9fed9070383f0a386fd26031a2f59fea98f53095b109a1421d71c775bdca13f4901d168958fda9fb2
-Size (abc-yosys-0.46.tar.gz) = 6264660 bytes
-BLAKE2s (yosys-0.46.tar.gz) = ee9b8d88b723052bc0dbbbc2ef12a341d58b721dcb630fab33aa878126dcaf01
-SHA512 (yosys-0.46.tar.gz) = cc95c1372db4260fe0241770cd2eb490370ab4249dfd72019fe5f33fc99195081cab80aeb6c7eb3049d6e93eb0e2cad1e8a8d285d79113daa5141e453ed37076
-Size (yosys-0.46.tar.gz) = 3043092 bytes
+BLAKE2s (abc-yosys-0.47.tar.gz) = 267c6776c8320697514966a22e0d0cce8330ffd0a477dc583d31739a2489d32c
+SHA512 (abc-yosys-0.47.tar.gz) = 7327efe99523b74034d8bbe6d3add0d25f4a764b15de6c8abe058451463e18fdf87d8388225f50c7335164e185d8b36aa317cf0826297cbe0cfc69fdb8617fd7
+Size (abc-yosys-0.47.tar.gz) = 6264697 bytes
+BLAKE2s (yosys-0.47.tar.gz) = 7371b62b7320d0349bc8b89d8a0a2b46c7deeaf5a2b47a1e008befea67e77c8b
+SHA512 (yosys-0.47.tar.gz) = d45dc8983fd03687f06e13e9938fb5424c9a297110d670e79d69f821f51e60ce0c19901488b62aeea801c4ff2616166c50386b3f3fb9c03fe655bb50f2ac7b0a
+Size (yosys-0.47.tar.gz) = 3020517 bytes
 SHA1 (patch-Makefile) = db77fa7d0274a1f11290e46ee92dfc80b7d88556
-SHA1 (patch-misc_yosys-config.in) = 4ad255685debcd985b185a4dbe31be2c31117574
+SHA1 (patch-kernel_driver.cc) = 00d7c1b437fdc1cb9f37ad53874a0db0c3aac71b
diff --git a/devel/yosys/patches/patch-misc_yosys-config.in b/devel/yosys/patches/patch-misc_yosys-config.in
deleted file mode 100644
index 53bbc0bb897..00000000000
--- a/devel/yosys/patches/patch-misc_yosys-config.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-misc_yosys-config.in,v 1.2 2024/09/07 02:10:29 thorpej Exp $
-
-Fix unportable test(1) operator.
-
---- misc/yosys-config.in.orig	2024-09-07 02:04:12.105679875 +0000
-+++ misc/yosys-config.in	2024-09-07 02:04:20.346019658 +0000
-@@ -44,7 +44,7 @@ if [ $# -eq 0 ]; then
- 	help
- fi
- 
--if [ "$1" == "--build" ]; then
-+if [ "$1" = "--build" ]; then
- 	modname="$2"; shift 2
- 	set -- --exec --cxx --cxxflags --ldflags -o "$modname" -shared "$@" --libs
- fi

$NetBSD$

--- kernel/driver.cc.orig	2024-11-19 15:16:25.907765578 +0000
+++ kernel/driver.cc
@@ -19,7 +19,7 @@
 
 #include "kernel/yosys.h"
 #include "libs/sha1/sha1.h"
-#include "libs/cxxopts/include/cxxopts.hpp"
+#include "cxxopts.hpp"
 #include <iostream>
 
 #ifdef YOSYS_ENABLE_READLINE