Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 11 Aug 2024 16:54:46 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: d41c16c98e5d - main - math/cvc5: update 1.1.2 =?utf-8?Q?=E2=86=92?= 1.2.0
Message-ID:  <202408111654.47BGskZx007076@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

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

commit d41c16c98e5d078415711d46cad8206d53e70199
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-08-11 16:54:18 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-08-11 16:54:42 +0000

    math/cvc5: update 1.1.2 → 1.2.0
    
    Reported by:    portscout
---
 math/cvc5/Makefile                             |  9 ++++++---
 math/cvc5/distinfo                             |  6 +++---
 math/cvc5/files/patch-cmake_FindEditline.cmake | 11 -----------
 math/cvc5/pkg-plist                            |  3 ++-
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/math/cvc5/Makefile b/math/cvc5/Makefile
index f35fca75a780..16e235e3ba5a 100644
--- a/math/cvc5/Makefile
+++ b/math/cvc5/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	cvc5
 DISTVERSIONPREFIX=	cvc5-
-DISTVERSION=	1.1.2
-PORTREVISION=	1
+DISTVERSION=	1.2.0
 CATEGORIES=	math java
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -16,6 +15,8 @@ BUILD_DEPENDS=	bash:shells/bash \
 		${LOCALBASE}/lib/symfpu.a:math/symfpu \
 		${PYTHON_PKGNAMEPREFIX}toml>0:textproc/py-toml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tomli>0:textproc/py-tomli@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing@${PY_FLAVOR}
 LIB_DEPENDS=	libantlr3c.so:devel/libantlr3c \
 		libcadical.so:math/cadical
@@ -44,7 +45,7 @@ OPTIONS_GROUP=			SOLVERS
 OPTIONS_GROUP_SOLVERS=		CRYPTOMINISAT KISSAT
 OPTIONS_RADIO=			NUMLIB
 OPTIONS_RADIO_NUMLIB=		GMP CLN
-OPTIONS_DEFAULT=		CRYPTOMINISAT EDITLINE JAVA GMP # COCOALIB KISSAT
+OPTIONS_DEFAULT=		CRYPTOMINISAT EDITLINE GMP # COCOALIB KISSAT # JAVA is broken
 OPTIONS_SUB=			yes
 
 COCOALIB_DESC=			Use CoCoALib for further polynomial operations
@@ -56,6 +57,7 @@ JAVA_CMAKE_ON=			-DJAVA_INCLUDE_PATH:PATH=${JAVA_HOME}/include \
 				-DJAVA_AWT_LIBRARY:PATH=${JAVA_HOME}/jre/lib/${ARCH}/libjawt.so \
 				-DJAVA_JVM_LIBRARY:PATH=${JAVA_HOME}/jre/lib/${ATCH}/libjava.so
 JAVA_BUILD_DEPENDS=		swig:devel/swig
+JAVA_BROKEN=			compilation fails: error: unmappable character for encoding ASCII, see https://github.com/cvc5/cvc5/issues/11145
 
 EDITLINE_DESC=			Use Editline for better interactive support
 EDITLINE_CMAKE_BOOL=		USE_EDITLINE
@@ -92,5 +94,6 @@ CMAKE_ARGS+=		-DENABLE_GPL:BOOL=ON
 PORTSCOUT=	limit:^[1-9]\.[0-9]+\.[0-9]+ # prevent older generation versions like 1.8, 1.7, etc.
 
 # some tests are skipped without any explanation, see https://github.com/cvc5/cvc5/issues/10456
+# test interactive_shell_define_fun_rec_multiline fails, see https://github.com/cvc5/cvc5/issues/11146
 
 .include <bsd.port.mk>
diff --git a/math/cvc5/distinfo b/math/cvc5/distinfo
index b2f4022cb714..23bf8da3445a 100644
--- a/math/cvc5/distinfo
+++ b/math/cvc5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709575825
-SHA256 (cvc5-cvc5-cvc5-1.1.2_GH0.tar.gz) = f2eba3f957f5e064e6a87f0dce88fd647932d02014061c8f6a79bf188203993a
-SIZE (cvc5-cvc5-cvc5-1.1.2_GH0.tar.gz) = 8581968
+TIMESTAMP = 1723346538
+SHA256 (cvc5-cvc5-cvc5-1.2.0_GH0.tar.gz) = 7877b1f89f8b6a6bcc643d9ab1c60535911f6a30e32233eafa9db8a3eae5e34e
+SIZE (cvc5-cvc5-cvc5-1.2.0_GH0.tar.gz) = 8916450
diff --git a/math/cvc5/files/patch-cmake_FindEditline.cmake b/math/cvc5/files/patch-cmake_FindEditline.cmake
deleted file mode 100644
index a8d897cd7b95..000000000000
--- a/math/cvc5/files/patch-cmake_FindEditline.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/FindEditline.cmake.orig	2023-01-04 10:29:29 UTC
-+++ cmake/FindEditline.cmake
-@@ -41,7 +41,7 @@ if(Editline_INCLUDE_DIRS)
-   unset(CMAKE_REQUIRED_LIBRARIES)
-   unset(CMAKE_REQUIRED_INCLUDES)
- 
--  if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-+  if(FALSE AND NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-     set(Editline_LIBRARIES ${Editline_LIBRARIES} bsd tinfo)
-   endif()
- endif()
diff --git a/math/cvc5/pkg-plist b/math/cvc5/pkg-plist
index fe7a8579fc73..afceecf34c6a 100644
--- a/math/cvc5/pkg-plist
+++ b/math/cvc5/pkg-plist
@@ -1,14 +1,15 @@
 bin/cvc5
 include/cvc5/c/cvc5.h
+include/cvc5/c/cvc5_parser.h
 include/cvc5/cvc5.h
 include/cvc5/cvc5_export.h
 include/cvc5/cvc5_kind.h
 include/cvc5/cvc5_parser.h
 include/cvc5/cvc5_proof_rule.h
+include/cvc5/cvc5_skolem_id.h
 include/cvc5/cvc5_types.h
 lib/cmake/cvc5/cvc5Config.cmake
 lib/cmake/cvc5/cvc5ConfigVersion.cmake
-lib/cmake/cvc5/cvc5JavaTargets.cmake
 lib/cmake/cvc5/cvc5Targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/cvc5/cvc5Targets.cmake
 lib/libcvc5.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408111654.47BGskZx007076>