diff --git a/cad/surelog/Makefile b/cad/surelog/Makefile --- a/cad/surelog/Makefile +++ b/cad/surelog/Makefile @@ -1,7 +1,7 @@ PORTNAME= surelog DISTVERSIONPREFIX= v -DISTVERSION= 1.84 -CATEGORIES= cad +DISTVERSION= 1.86 +CATEGORIES= cad java MAINTAINER= yuri@FreeBSD.org COMMENT= SystemVerilog 2017 Pre-processor, Parser, Elaborator, etc @@ -28,37 +28,38 @@ USE_GITHUB= yes GH_ACCOUNT= chipsalliance GH_PROJECT= Surelog -GH_TUPLE= alainmarcel:antlr4:a27cf84:antlr4/third_party/antlr4 \ - nlohmann:json:788e546:json/third_party/json +GH_TUPLE= alainmarcel:antlr4:6a15cc32de:antlr4/third_party/antlr4 \ + nlohmann:json:788e5468e4:json/third_party/json +CMAKE_ARGS= -DFREEBSD_JAVA_VERSION=${JAVA_VERSION} \ + -DPython3_EXECUTABLE=${PYTHON_CMD} CMAKE_ON= BUILD_SHARED_LIBS \ SURELOG_USE_HOST_UHDM \ SURELOG_USE_HOST_CAPNP \ SURELOG_USE_HOST_GTEST CMAKE_OFF= SURELOG_BUILD_TESTS -CMAKE_ARGS= -DFREEBSD_JAVA_VERSION=${JAVA_VERSION} \ - -DPython3_EXECUTABLE=${PYTHON_CMD} CMAKE_TESTING_ON= SURELOG_BUILD_TESTS # 2 tests fail, see https://github.com/chipsalliance/Surelog/issues/3545 CMAKE_TESTING_TARGET= UnitTests +CONFLICTS_BUILD= openjdk8 openjdk11 openjdk18 openjdk19 + BINARY_ALIAS= python3=${PYTHON_CMD} tclsh=${TCLSH} +PORTSCOUT= limit:^.*[0-9]\.[0-9] # prevent tags like 'show' -CONFLICTS_BUILD= openjdk8 openjdk11 openjdk18 openjdk19 +PLIST_SUB= SOVERSION=${DISTVERSION} OPTIONS_DEFINE= PYTHON TCMALLOC OPTIONS_DEFAULT= PYTHON TCMALLOC # should be the same TCMALLOC default as in cad/yosys, cad/uhdm because surelog's lib is used in the yosys plugin cad/yosys-systemverilog OPTIONS_SUB= yes +PYTHON_BUILD_DEPENDS= swig:devel/swig PYTHON_USES= python PYTHON_USES_OFF= python:build -PYTHON_BUILD_DEPENDS= swig:devel/swig PYTHON_CMAKE_BOOL= SURELOG_WITH_PYTHON PYTHON_CMAKE_ON= -DFREEBSD_PYTHON_DISTVERSION=${PYTHON_DISTVERSION} -TCMALLOC_CMAKE_BOOL= SURELOG_WITH_TCMALLOC TCMALLOC_LIB_DEPENDS= libtcmalloc.so:devel/google-perftools - -PORTSCOUT= limit:^.*[0-9]\.[0-9] # prevent tags like 'show' +TCMALLOC_CMAKE_BOOL= SURELOG_WITH_TCMALLOC post-install: # workaround for https://github.com/chipsalliance/Surelog/issues/3965 diff --git a/cad/surelog/distinfo b/cad/surelog/distinfo --- a/cad/surelog/distinfo +++ b/cad/surelog/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1723105478 -SHA256 (chipsalliance-Surelog-v1.84_GH0.tar.gz) = ddcbc0d943ee52f2487b7a064c57a8239d525efd9a45b1f3e3e4a96a56cb3377 -SIZE (chipsalliance-Surelog-v1.84_GH0.tar.gz) = 96078248 -SHA256 (alainmarcel-antlr4-a27cf84_GH0.tar.gz) = f1d2636c219d2fa9faad1672739e409d6a9a78ac1495a911ae2a5e43bd5194d1 -SIZE (alainmarcel-antlr4-a27cf84_GH0.tar.gz) = 4205182 -SHA256 (nlohmann-json-788e546_GH0.tar.gz) = 5d7e9a9fafbb0d0ddd6b1364fd701a86972782ca7c2dace80eefa9c312c5926f -SIZE (nlohmann-json-788e546_GH0.tar.gz) = 8039831 +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 diff --git a/cad/surelog/files/patch-CMakeLists.txt b/cad/surelog/files/patch-CMakeLists.txt --- a/cad/surelog/files/patch-CMakeLists.txt +++ b/cad/surelog/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2023-04-25 18:21:08 UTC +--- CMakeLists.txt.orig 2025-08-30 03:55:56 UTC +++ CMakeLists.txt -@@ -141,14 +141,14 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BIN +@@ -172,14 +172,14 @@ if (SURELOG_WITH_PYTHON) # Python if (SURELOG_WITH_PYTHON) @@ -17,12 +17,12 @@ message(STATUS "Python3_EXECUTABLE = ${Python3_EXECUTABLE}") endif() -@@ -231,7 +231,7 @@ add_custom_command( - ${PROJECT_SOURCE_DIR}/src/Cache/preproc.fbs) +@@ -278,7 +278,7 @@ add_custom_command( + ) # 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}") - add_custom_target(GenerateParser DEPENDS + set(surelog_grammars diff --git a/cad/surelog/files/patch-include_Surelog_DesignCompile_CompileHelper.h b/cad/surelog/files/patch-include_Surelog_DesignCompile_CompileHelper.h --- a/cad/surelog/files/patch-include_Surelog_DesignCompile_CompileHelper.h +++ b/cad/surelog/files/patch-include_Surelog_DesignCompile_CompileHelper.h @@ -1,10 +1,10 @@ ---- include/Surelog/DesignCompile/CompileHelper.h.orig 2022-09-09 21:48:59 UTC +--- include/Surelog/DesignCompile/CompileHelper.h.orig 2025-08-30 03:55:56 UTC +++ include/Surelog/DesignCompile/CompileHelper.h -@@ -29,6 +29,7 @@ - #include +@@ -33,6 +33,7 @@ #include + #include +#include #include + #include #include - diff --git a/cad/surelog/files/patch-include_Surelog_Design_ModuleInstance.h b/cad/surelog/files/patch-include_Surelog_Design_ModuleInstance.h --- a/cad/surelog/files/patch-include_Surelog_Design_ModuleInstance.h +++ b/cad/surelog/files/patch-include_Surelog_Design_ModuleInstance.h @@ -1,10 +1,10 @@ ---- include/Surelog/Design/ModuleInstance.h.orig 2022-09-09 21:24:46 UTC +--- include/Surelog/Design/ModuleInstance.h.orig 2025-08-30 03:55:56 UTC +++ include/Surelog/Design/ModuleInstance.h -@@ -30,6 +30,7 @@ - #include - #include +@@ -36,6 +36,7 @@ + #include + #include +#include - #include - - namespace SURELOG { + #include + #include + #include diff --git a/cad/surelog/files/patch-src_DesignCompile_CompileDesign.cpp b/cad/surelog/files/patch-src_DesignCompile_CompileDesign.cpp deleted file mode 100644 --- a/cad/surelog/files/patch-src_DesignCompile_CompileDesign.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/DesignCompile/CompileDesign.cpp.orig 2022-09-09 21:31:51 UTC -+++ src/DesignCompile/CompileDesign.cpp -@@ -52,6 +52,7 @@ - #include - - #include -+#include - #include - - #ifdef USETBB diff --git a/cad/surelog/files/patch-src_DesignCompile_CompileExpression.cpp b/cad/surelog/files/patch-src_DesignCompile_CompileExpression.cpp deleted file mode 100644 --- a/cad/surelog/files/patch-src_DesignCompile_CompileExpression.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/DesignCompile/CompileExpression.cpp.orig 2022-09-09 21:42:55 UTC -+++ src/DesignCompile/CompileExpression.cpp -@@ -46,6 +46,7 @@ - - #include - #include -+#include - - // UHDM - #include diff --git a/cad/surelog/files/patch-src_DesignCompile_ElaborationStep.cpp b/cad/surelog/files/patch-src_DesignCompile_ElaborationStep.cpp deleted file mode 100644 --- a/cad/surelog/files/patch-src_DesignCompile_ElaborationStep.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/DesignCompile/ElaborationStep.cpp.orig 2022-09-09 21:47:31 UTC -+++ src/DesignCompile/ElaborationStep.cpp -@@ -49,6 +49,7 @@ - - #include - #include -+#include - - // UHDM - #include diff --git a/cad/surelog/pkg-plist b/cad/surelog/pkg-plist --- a/cad/surelog/pkg-plist +++ b/cad/surelog/pkg-plist @@ -76,14 +76,189 @@ include/Surelog/config.h include/Surelog/surelog-version.h include/Surelog/surelog.h +include/antlr4-runtime/ANTLRErrorListener.h +include/antlr4-runtime/ANTLRErrorStrategy.h +include/antlr4-runtime/ANTLRFileStream.h +include/antlr4-runtime/ANTLRInputStream.h +include/antlr4-runtime/BailErrorStrategy.h +include/antlr4-runtime/BaseErrorListener.h +include/antlr4-runtime/BufferedTokenStream.h +include/antlr4-runtime/CharStream.h +include/antlr4-runtime/CommonToken.h +include/antlr4-runtime/CommonTokenFactory.h +include/antlr4-runtime/CommonTokenStream.h +include/antlr4-runtime/ConsoleErrorListener.h +include/antlr4-runtime/DefaultErrorStrategy.h +include/antlr4-runtime/DiagnosticErrorListener.h +include/antlr4-runtime/Exceptions.h +include/antlr4-runtime/FailedPredicateException.h +include/antlr4-runtime/FlatHashMap.h +include/antlr4-runtime/FlatHashSet.h +include/antlr4-runtime/InputMismatchException.h +include/antlr4-runtime/IntStream.h +include/antlr4-runtime/InterpreterRuleContext.h +include/antlr4-runtime/Lexer.h +include/antlr4-runtime/LexerInterpreter.h +include/antlr4-runtime/LexerNoViableAltException.h +include/antlr4-runtime/ListTokenSource.h +include/antlr4-runtime/NoViableAltException.h +include/antlr4-runtime/Parser.h +include/antlr4-runtime/ParserInterpreter.h +include/antlr4-runtime/ParserRuleContext.h +include/antlr4-runtime/ProxyErrorListener.h +include/antlr4-runtime/RecognitionException.h +include/antlr4-runtime/Recognizer.h +include/antlr4-runtime/RuleContext.h +include/antlr4-runtime/RuleContextWithAltNum.h +include/antlr4-runtime/RuntimeMetaData.h +include/antlr4-runtime/Token.h +include/antlr4-runtime/TokenFactory.h +include/antlr4-runtime/TokenSource.h +include/antlr4-runtime/TokenStream.h +include/antlr4-runtime/TokenStreamRewriter.h +include/antlr4-runtime/UnbufferedCharStream.h +include/antlr4-runtime/UnbufferedTokenStream.h +include/antlr4-runtime/Version.h +include/antlr4-runtime/Vocabulary.h +include/antlr4-runtime/WritableToken.h +include/antlr4-runtime/antlr4-common.h +include/antlr4-runtime/antlr4-runtime.h +include/antlr4-runtime/atn/ATN.h +include/antlr4-runtime/atn/ATNConfig.h +include/antlr4-runtime/atn/ATNConfigSet.h +include/antlr4-runtime/atn/ATNDeserializationOptions.h +include/antlr4-runtime/atn/ATNDeserializer.h +include/antlr4-runtime/atn/ATNSimulator.h +include/antlr4-runtime/atn/ATNState.h +include/antlr4-runtime/atn/ATNStateType.h +include/antlr4-runtime/atn/ATNType.h +include/antlr4-runtime/atn/ActionTransition.h +include/antlr4-runtime/atn/AmbiguityInfo.h +include/antlr4-runtime/atn/ArrayPredictionContext.h +include/antlr4-runtime/atn/AtomTransition.h +include/antlr4-runtime/atn/BasicBlockStartState.h +include/antlr4-runtime/atn/BasicState.h +include/antlr4-runtime/atn/BlockEndState.h +include/antlr4-runtime/atn/BlockStartState.h +include/antlr4-runtime/atn/ContextSensitivityInfo.h +include/antlr4-runtime/atn/DecisionEventInfo.h +include/antlr4-runtime/atn/DecisionInfo.h +include/antlr4-runtime/atn/DecisionState.h +include/antlr4-runtime/atn/EpsilonTransition.h +include/antlr4-runtime/atn/ErrorInfo.h +include/antlr4-runtime/atn/HashUtils.h +include/antlr4-runtime/atn/LL1Analyzer.h +include/antlr4-runtime/atn/LexerATNConfig.h +include/antlr4-runtime/atn/LexerATNSimulator.h +include/antlr4-runtime/atn/LexerAction.h +include/antlr4-runtime/atn/LexerActionExecutor.h +include/antlr4-runtime/atn/LexerActionType.h +include/antlr4-runtime/atn/LexerChannelAction.h +include/antlr4-runtime/atn/LexerCustomAction.h +include/antlr4-runtime/atn/LexerIndexedCustomAction.h +include/antlr4-runtime/atn/LexerModeAction.h +include/antlr4-runtime/atn/LexerMoreAction.h +include/antlr4-runtime/atn/LexerPopModeAction.h +include/antlr4-runtime/atn/LexerPushModeAction.h +include/antlr4-runtime/atn/LexerSkipAction.h +include/antlr4-runtime/atn/LexerTypeAction.h +include/antlr4-runtime/atn/LookaheadEventInfo.h +include/antlr4-runtime/atn/LoopEndState.h +include/antlr4-runtime/atn/NotSetTransition.h +include/antlr4-runtime/atn/OrderedATNConfigSet.h +include/antlr4-runtime/atn/ParseInfo.h +include/antlr4-runtime/atn/ParserATNSimulator.h +include/antlr4-runtime/atn/ParserATNSimulatorOptions.h +include/antlr4-runtime/atn/PlusBlockStartState.h +include/antlr4-runtime/atn/PlusLoopbackState.h +include/antlr4-runtime/atn/PrecedencePredicateTransition.h +include/antlr4-runtime/atn/PredicateEvalInfo.h +include/antlr4-runtime/atn/PredicateTransition.h +include/antlr4-runtime/atn/PredictionContext.h +include/antlr4-runtime/atn/PredictionContextCache.h +include/antlr4-runtime/atn/PredictionContextMergeCache.h +include/antlr4-runtime/atn/PredictionContextMergeCacheOptions.h +include/antlr4-runtime/atn/PredictionContextType.h +include/antlr4-runtime/atn/PredictionMode.h +include/antlr4-runtime/atn/ProfilingATNSimulator.h +include/antlr4-runtime/atn/RangeTransition.h +include/antlr4-runtime/atn/RuleStartState.h +include/antlr4-runtime/atn/RuleStopState.h +include/antlr4-runtime/atn/RuleTransition.h +include/antlr4-runtime/atn/SemanticContext.h +include/antlr4-runtime/atn/SemanticContextType.h +include/antlr4-runtime/atn/SerializedATNView.h +include/antlr4-runtime/atn/SetTransition.h +include/antlr4-runtime/atn/SingletonPredictionContext.h +include/antlr4-runtime/atn/StarBlockStartState.h +include/antlr4-runtime/atn/StarLoopEntryState.h +include/antlr4-runtime/atn/StarLoopbackState.h +include/antlr4-runtime/atn/TokensStartState.h +include/antlr4-runtime/atn/Transition.h +include/antlr4-runtime/atn/TransitionType.h +include/antlr4-runtime/atn/WildcardTransition.h +include/antlr4-runtime/dfa/DFA.h +include/antlr4-runtime/dfa/DFASerializer.h +include/antlr4-runtime/dfa/DFAState.h +include/antlr4-runtime/dfa/LexerDFASerializer.h +include/antlr4-runtime/internal/Synchronization.h +include/antlr4-runtime/misc/InterpreterDataReader.h +include/antlr4-runtime/misc/Interval.h +include/antlr4-runtime/misc/IntervalSet.h +include/antlr4-runtime/misc/MurmurHash.h +include/antlr4-runtime/misc/Predicate.h +include/antlr4-runtime/support/Any.h +include/antlr4-runtime/support/Arrays.h +include/antlr4-runtime/support/BitSet.h +include/antlr4-runtime/support/CPPUtils.h +include/antlr4-runtime/support/Casts.h +include/antlr4-runtime/support/Declarations.h +include/antlr4-runtime/support/StringUtils.h +include/antlr4-runtime/support/Unicode.h +include/antlr4-runtime/support/Utf8.h +include/antlr4-runtime/tree/AbstractParseTreeVisitor.h +include/antlr4-runtime/tree/ErrorNode.h +include/antlr4-runtime/tree/ErrorNodeImpl.h +include/antlr4-runtime/tree/IterativeParseTreeWalker.h +include/antlr4-runtime/tree/ParseTree.h +include/antlr4-runtime/tree/ParseTreeListener.h +include/antlr4-runtime/tree/ParseTreeProperty.h +include/antlr4-runtime/tree/ParseTreeType.h +include/antlr4-runtime/tree/ParseTreeVisitor.h +include/antlr4-runtime/tree/ParseTreeWalker.h +include/antlr4-runtime/tree/TerminalNode.h +include/antlr4-runtime/tree/TerminalNodeImpl.h +include/antlr4-runtime/tree/Trees.h +include/antlr4-runtime/tree/pattern/Chunk.h +include/antlr4-runtime/tree/pattern/ParseTreeMatch.h +include/antlr4-runtime/tree/pattern/ParseTreePattern.h +include/antlr4-runtime/tree/pattern/ParseTreePatternMatcher.h +include/antlr4-runtime/tree/pattern/RuleTagToken.h +include/antlr4-runtime/tree/pattern/TagChunk.h +include/antlr4-runtime/tree/pattern/TextChunk.h +include/antlr4-runtime/tree/pattern/TokenTagToken.h +include/antlr4-runtime/tree/xpath/XPath.h +include/antlr4-runtime/tree/xpath/XPathElement.h +include/antlr4-runtime/tree/xpath/XPathLexer.h +include/antlr4-runtime/tree/xpath/XPathLexerErrorListener.h +include/antlr4-runtime/tree/xpath/XPathRuleAnywhereElement.h +include/antlr4-runtime/tree/xpath/XPathRuleElement.h +include/antlr4-runtime/tree/xpath/XPathTokenAnywhereElement.h +include/antlr4-runtime/tree/xpath/XPathTokenElement.h +include/antlr4-runtime/tree/xpath/XPathWildcardAnywhereElement.h +include/antlr4-runtime/tree/xpath/XPathWildcardElement.h lib/cmake/Surelog/SurelogConfig.cmake lib/cmake/Surelog/SurelogConfigVersion.cmake lib/cmake/Surelog/SurelogTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Surelog/SurelogTargets.cmake lib/libantlr4-runtime.a +lib/libantlr4-runtime.so +lib/libantlr4-runtime.so.4.13.2 lib/libsurelog.so -lib/libsurelog.so.1.84 -lib/surelog-python/python/slSV3_1aPythonListener.py -lib/surelog-python/python/slformatmsg.py -lib/surelog-python/python/slwaivers.py +lib/libsurelog.so.%%SOVERSION%% +%%PYTHON%%lib/surelog-python/python/slSV3_1aPythonListener.py +%%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 diff --git a/cad/uhdm/Makefile b/cad/uhdm/Makefile --- a/cad/uhdm/Makefile +++ b/cad/uhdm/Makefile @@ -1,6 +1,6 @@ PORTNAME= uhdm DISTVERSIONPREFIX= v -DISTVERSION= 1.84 +DISTVERSION= 1.86 CATEGORIES= cad MAINTAINER= yuri@FreeBSD.org @@ -21,13 +21,15 @@ GH_ACCOUNT= chipsalliance GH_PROJECT= ${PORTNAME:tu} +CMAKE_ARGS= -DPython_EXECUTABLE=${PYTHON_CMD} -DPython3_EXECUTABLE=${PYTHON_CMD} CMAKE_ON= BUILD_SHARED_LIBS \ UHDM_USE_HOST_CAPNP \ UHDM_USE_HOST_GTEST CMAKE_OFF= UHDM_BUILD_TESTS -CMAKE_ARGS= -DPython_EXECUTABLE=${PYTHON_CMD} -DPython3_EXECUTABLE=${PYTHON_CMD} CMAKE_TESTING_ON= UHDM_BUILD_TESTS # tests fail to compile, see https://github.com/chipsalliance/UHDM/issues/1045 BINARY_ALIAS= tclsh=${TCLSH} +PLIST_SUB= SOVERSION=${DISTVERSION} + .include diff --git a/cad/uhdm/distinfo b/cad/uhdm/distinfo --- a/cad/uhdm/distinfo +++ b/cad/uhdm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1723101718 -SHA256 (chipsalliance-UHDM-v1.84_GH0.tar.gz) = bb2acbdd294dd05660c78ba34704440032935b8bc77cae352c853533b5a7c583 -SIZE (chipsalliance-UHDM-v1.84_GH0.tar.gz) = 1756419 +TIMESTAMP = 1762219339 +SHA256 (chipsalliance-UHDM-v1.86_GH0.tar.gz) = 179203b166be5d1be12b901c69c6a569ebebf4fe47bc674b1268bd9319216fce +SIZE (chipsalliance-UHDM-v1.86_GH0.tar.gz) = 1762968 diff --git a/cad/uhdm/pkg-plist b/cad/uhdm/pkg-plist --- a/cad/uhdm/pkg-plist +++ b/cad/uhdm/pkg-plist @@ -305,6 +305,6 @@ lib/cmake/UHDM/UHDMTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/UHDM/UHDMTargets.cmake lib/libuhdm.so -lib/libuhdm.so.1.84 +lib/libuhdm.so.%%SOVERSION%% libdata/pkgconfig/UHDM.pc %%DATADIR%%/UHDM.capnp diff --git a/cad/yosys-systemverilog/Makefile b/cad/yosys-systemverilog/Makefile --- a/cad/yosys-systemverilog/Makefile +++ b/cad/yosys-systemverilog/Makefile @@ -1,6 +1,6 @@ PORTNAME= yosys-systemverilog DISTVERSION= 2023-06-14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad PKGNAMEPREFIX=