diff --git a/math/rumur/Makefile b/math/rumur/Makefile index eed17408c9d6..b0c10f58e492 100644 --- a/math/rumur/Makefile +++ b/math/rumur/Makefile @@ -1,35 +1,35 @@ PORTNAME= rumur DISTVERSIONPREFIX= v -DISTVERSION= 2025.08.31 +DISTVERSION= 2026.03.11 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org COMMENT= Model checker, a formal verification tool for state machines WWW= https://github.com/Smattr/rumur LICENSE= PD LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libgmpxx.so:math/gmp USES= bison cmake compiler:c++11-lang python:build shebangfix USE_LDCONFIG= yes SHEBANG_FILES= rumur/src/rumur-run SHEBANG_GLOB= *.py USE_GITHUB= yes GH_ACCOUNT= Smattr CMAKE_ON= BUILD_SHARED_LIBS CMAKE_ARGS= BISON_EXECUTABLE:STRING=${LOCALBASE}/bin/bison BINARY_ALIAS= python3=${PYTHON_CMD} do-test: # the test command outputs only in the end of the run @cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} --build . --target check # tests as of 2025.01.05: 2 failed, 5381 passed, 238 skipped in 1032.03s (0:17:12), see https://github.com/Smattr/rumur/issues/289 .include diff --git a/math/rumur/distinfo b/math/rumur/distinfo index 349a57374998..a94d80c516c9 100644 --- a/math/rumur/distinfo +++ b/math/rumur/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1762710274 -SHA256 (Smattr-rumur-v2025.08.31_GH0.tar.gz) = 5be73475ec4dd9f59596c62e84a428ebe1efead9b8ded4e9bfda70c4b07651ce -SIZE (Smattr-rumur-v2025.08.31_GH0.tar.gz) = 354447 +TIMESTAMP = 1773511840 +SHA256 (Smattr-rumur-v2026.03.11_GH0.tar.gz) = 62c05ed7b73dc31cea80bdcab3ec0ef7cdfe47af3cc03c5845d521b0494fb15d +SIZE (Smattr-rumur-v2026.03.11_GH0.tar.gz) = 355190 diff --git a/math/rumur/files/patch-tests_tests.py b/math/rumur/files/patch-tests_tests.py new file mode 100644 index 000000000000..c2c9b2a9387b --- /dev/null +++ b/math/rumur/files/patch-tests_tests.py @@ -0,0 +1,56 @@ +--- tests/tests.py.orig2026-03-14 18:12:00 UTC ++++ tests/tests.py +@@ -431,7 +431,7 @@ def print_info(): + print(" smt_args() = {}".format(smt_args())) + + +-def parse_test_options( ++def _parse_test_options( + src, debug=False, multithreaded=False, xml=False + ): # pylint:disable=unused-argument + """ +@@ -1104,7 +1104,7 @@ def test_murphi2c(model): + """test cases for murphi2c""" + + testcase = Path(__file__).parent / model +- tweaks = dict(parse_test_options(testcase)) ++ tweaks = dict(_parse_test_options(testcase)) + + # there is no C equivalent of isundefined, because an implicit assumption in the C + # representation is that you do not rely on undefined values +@@ -1151,7 +1151,7 @@ def test_murphi2c_header(model, tmp_path): + """test cases for murphi2c --header""" + + testcase = Path(__file__).parent / model +- tweaks = dict(parse_test_options(testcase)) ++ tweaks = dict(_parse_test_options(testcase)) + + # there is no C equivalent of isundefined, because an implicit assumption in the C + # representation is that you do not rely on undefined values +@@ -1216,7 +1216,7 @@ def test_murphi2xml(model): + """test cases for murphi2xml""" + + testcase = Path(__file__).parent / model +- tweaks = dict(parse_test_options(testcase)) ++ tweaks = dict(_parse_test_options(testcase)) + + args = ["murphi2xml", "--", testcase] + if has_valgrind(): +@@ -1257,7 +1257,7 @@ def test_murphi2uclid(model, tmp_path): + """test cases for murphi2uclid""" + + testcase = Path(__file__).parent / model +- tweaks = dict(parse_test_options(testcase)) ++ tweaks = dict(_parse_test_options(testcase)) + + # test cases for which murphi2uclid is expected to fail + murphi2uclid_fail = ( +@@ -1429,7 +1429,7 @@ def test_rumur(model, multithreaded, mode, optimised) + testcase = Path(__file__).parent / model + debug = mode == "debug" + xml = mode == "XML" +- tweaks = dict(parse_test_options(testcase, debug, multithreaded, xml)) ++ tweaks = dict(_parse_test_options(testcase, debug, multithreaded, xml)) + + if tweaks.get("skip_reason") is not None: + pytest.skip(tweaks["skip_reason"]) diff --git a/math/rumur/pkg-plist b/math/rumur/pkg-plist index d460ee5f94f6..ce18eaf64ba3 100644 --- a/math/rumur/pkg-plist +++ b/math/rumur/pkg-plist @@ -1,57 +1,59 @@ bin/murphi-format bin/murphi2c bin/murphi2murphi bin/murphi2smv bin/murphi2uclid bin/murphi2xml bin/rumur bin/rumur-run include/rumur/Boolean.h include/rumur/Comment.h include/rumur/Decl.h include/rumur/Expr.h include/rumur/Function.h include/rumur/Model.h include/rumur/Node.h include/rumur/Number.h include/rumur/Property.h include/rumur/Ptr.h include/rumur/Rule.h include/rumur/Stmt.h include/rumur/Symtab.h include/rumur/TypeExpr.h include/rumur/except.h include/rumur/indexer.h include/rumur/location.hh include/rumur/parse.h include/rumur/parser.yy.hh include/rumur/position.hh include/rumur/resolve-symbols.h include/rumur/rumur.h include/rumur/sanitise_rule_names.h include/rumur/scanner.h include/rumur/stack.hh include/rumur/traverse.h include/rumur/validate.h include/rumur/version.h lib/cmake/rumur/librumurConfig-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/rumur/librumurConfig.cmake lib/cmake/rumur/rumurConfig.cmake lib/librumur.so share/man/man1/murphi-format.1.gz share/man/man1/murphi2c.1.gz share/man/man1/murphi2murphi.1.gz share/man/man1/murphi2smv.1.gz share/man/man1/murphi2uclid.1.gz share/man/man1/murphi2xml.1.gz share/man/man1/rumur-run.1.gz share/man/man1/rumur.1.gz %%DATADIR%%/lib/README.rst %%DATADIR%%/lib/_list %%DATADIR%%/lib/_set %%DATADIR%%/lib/v2025.01.04/list %%DATADIR%%/lib/v2025.01.05/list %%DATADIR%%/lib/v2025.02.02/_list %%DATADIR%%/lib/v2025.02.02/_set %%DATADIR%%/lib/v2025.08.31/_list %%DATADIR%%/lib/v2025.08.31/_set +%%DATADIR%%/lib/v2026.0%%PYTHON_VER%%/_list +%%DATADIR%%/lib/v2026.0%%PYTHON_VER%%/_set