From nobody Tue Feb 7 03:00:47 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P9nv32rsRz3nn7R; Tue, 7 Feb 2023 03:00:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P9nv328stz3jqP; Tue, 7 Feb 2023 03:00:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675738847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K8jiISUEU5fN8Yt0jW9QT3TdiwqyN8fb91b2p4hrCpE=; b=nZrVfJYqdAs+aq49V+bi14ouKgWQbg6WLMtSWKvdQz+0ZkvwpoCaPFf3vzZIBHdgFxkb/1 xi0PRJUm+uZjhdUXO8L8ZIjZ5PXltQnqAvfA/3trXpAdwbztrR9z1+CJQLMStw5t6ZAVka Fls3plKl0ItyLO/AP06oGsmllNUsQTTWeyG5EFpaIUNYkN2Tz/6rablpBaQKm6bvy8yYk0 PbOSt/i+S4v590D8UmKvlqzj2ubMKZpGirSZTFxSUsd1BhF142a+rflOKzInOrl1/yuVPU waJY4yhHVWYuKtOjN0chFMITIA/jPFmE2PWuC9t2Ln/jrH0EQ+hsjophaQYQpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675738847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K8jiISUEU5fN8Yt0jW9QT3TdiwqyN8fb91b2p4hrCpE=; b=YJV5cybqcmrnhEoQbTIW0/8dhtySj3h9S6zl/uIwhSYo/T4tGckv5Aaa3sK7NTzjY5Tm8a 33LAeg9ZueZitoteFw3n5nwRJ1FULduoQMJvFXrcfna9wLO+qi2yQDsWNh4egeGYGHimzq AteC9srZnD3QFmIfmgq3dUXp+B/SabHei9rZShLiPhpSkAq/54Fl8U7gFiiSYRnZJmv6vY 3Uez7qncI2SaXzkHDx061oJA3pM8fQFELcCIuYQBgQmmSPm8M2cr9amt2kD0MqLTOH+2Ny XOw4JDzEYcTnzgMIlXeuEb+/q9hsENVlbazH6Rg0Hi/cjpheoq2Z+uLhfwV14w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675738847; a=rsa-sha256; cv=none; b=VcdZAzyIKkw1anBmgxbyYCJ0CBuPYcV8pWosnt/qSkyOOUES8KjCXUIyHvZ6TpjzeFSPZu 2cVVNC2lF/PYez5Cu+HyMpTjnWa5l0bpi6RGnPRtxNBMFMWZQ9LtZCMl+mpo1llspkhsHT 7r0mDZJ6sa12yfqn/3C/wwFHyH6NPlSEq9IiPrM3Q54F1N0Fa+QxW3d9ZZe7OcoRsuZv2J SFMsnV7ZqPj3Ly8z83DMvndvSFiTbyqyG4X+91JbrGzj7XajeINbPZGyWSXog77kAAAGp3 8FoA2Yx/LTc/w2j9wCKf7bp/c3mlcLhkX+JGyXHAKxrJfAcFtsmGwg7DPxzLGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P9nv31Dtgz10pY; Tue, 7 Feb 2023 03:00:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31730lOa059141; Tue, 7 Feb 2023 03:00:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31730lZd059140; Tue, 7 Feb 2023 03:00:47 GMT (envelope-from git) Date: Tue, 7 Feb 2023 03:00:47 GMT Message-Id: <202302070300.31730lZd059140@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 7c8a6b010bfa - main - =?utf-8?Q?math/cvc5:=20Update=201.0.3=20=E2=86=92=201.0.4?= List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c8a6b010bfac0c78c4123c4d3e8049600d95f73 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=7c8a6b010bfac0c78c4123c4d3e8049600d95f73 commit 7c8a6b010bfac0c78c4123c4d3e8049600d95f73 Author: Yuri Victorovich AuthorDate: 2023-02-07 03:00:28 +0000 Commit: Yuri Victorovich CommitDate: 2023-02-07 03:00:43 +0000 math/cvc5: Update 1.0.3 → 1.0.4 --- math/cvc5/Makefile | 73 ++++++++++++++++++++++++++++++++--------------------- math/cvc5/distinfo | 8 +++--- math/cvc5/pkg-plist | 4 ++- 3 files changed, 50 insertions(+), 35 deletions(-) diff --git a/math/cvc5/Makefile b/math/cvc5/Makefile index 88d76016dd4b..2ad2c2e7086a 100644 --- a/math/cvc5/Makefile +++ b/math/cvc5/Makefile @@ -1,7 +1,6 @@ PORTNAME= cvc5 DISTVERSIONPREFIX= cvc5- -DISTVERSION= 1.0.3 -PORTREVISION= 1 +DISTVERSION= 1.0.4 CATEGORIES= math java MASTER_SITES+= http://www.antlr3.org/download/:antlr3 DISTFILES+= antlr-3.4-complete.jar:antlr3 @@ -17,11 +16,12 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= bash:shells/bash \ ${LOCALBASE}/lib/libcadical.a:math/cadical \ ${LOCALBASE}/lib/symfpu.a:math/symfpu \ - ${PYTHON_PKGNAMEPREFIX}toml>0:textproc/py-toml@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}toml>0:textproc/py-toml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing@${PY_FLAVOR} LIB_DEPENDS= libantlr3c.so:devel/libantlr3c \ libboost_system.so:devel/boost-libs -USES= cmake ncurses compiler:c++17-lang \ +USES= cmake:testing ncurses compiler:c++17-lang \ localbase:ldflags pkgconfig python:3.5+,build USE_LDCONFIG= yes USE_GITHUB= yes @@ -31,39 +31,54 @@ JAVA_BUILD= yes CMAKE_BUILD_TYPE= Production CMAKE_ARGS+= -DANTLR_BINARY=${WRKDIR}/antlr3 \ - -DFREEBSD_DISTDIR=${DISTDIR} + -DFREEBSD_DISTDIR=${DISTDIR} \ + -DPython_EXECUTABLE:STRING=${PYTHON_CMD} CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= BUILD_BINDINGS_PYTHON USE_PYTHON3 # Python binding should be a separate port - -OPTIONS_DEFINE= CRYPTOMINISAT JAVA EDITLINE -OPTIONS_RADIO= NUMLIB -OPTIONS_RADIO_NUMLIB= GMP CLN -OPTIONS_DEFAULT= CRYPTOMINISAT JAVA EDITLINE GMP -OPTIONS_SUB= yes - -CRYPTOMINISAT_DESC= Use CryptoMiniSat as the SAT solver - +CMAKE_TESTING_ON= ENABLE_UNIT_TESTING + +OPTIONS_DEFINE= JAVA EDITLINE # COCOALIB +OPTIONS_GROUP= SOLVERS +OPTIONS_GROUP_SOLVERS= CRYPTOMINISAT KISSAT +OPTIONS_RADIO= NUMLIB +OPTIONS_RADIO_NUMLIB= GMP CLN +OPTIONS_DEFAULT= COCOALIB CRYPTOMINISAT JAVA EDITLINE GMP # KISSAT +OPTIONS_SUB= yes + +COCOALIB_DESC= Use CoCoALib for further polynomial operations +COCOALIB_CMAKE_BOOL= USE_COCOA +COCOALIB_BROKEN= fails to compile with cocoalib, see https://github.com/cvc5/cvc5/issues/9484 + +JAVA_CMAKE_BOOL= BUILD_BINDINGS_JAVA +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 + +EDITLINE_DESC= Use Editline for better interactive support +EDITLINE_CMAKE_BOOL= USE_EDITLINE +EDITLINE_BUILD_DEPENDS= libedit>0:devel/libedit +EDITLINE_RUN_DEPENDS= libedit>0:devel/libedit + +# SOLVERS options + +CRYPTOMINISAT_DESC= Use CryptoMiniSat as the SAT solver CRYPTOMINISAT_CMAKE_BOOL= USE_CRYPTOMINISAT CRYPTOMINISAT_LIB_DEPENDS= libcryptominisat5.so:math/cryptominisat -JAVA_CMAKE_BOOL= BUILD_BINDINGS_JAVA -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 +KISSAT_DESC= Use Kissat solver +KISSAT_CMAKE_BOOL= USE_KISSAT +KISSAT_BROKEN= fails to link with libkissat.so, see https://github.com/cvc5/cvc5/issues/9483 -EDITLINE_DESC= Use Editline for better interactive support -EDITLINE_CMAKE_BOOL= USE_EDITLINE -EDITLINE_BUILD_DEPENDS= libedit>0:devel/libedit -EDITLINE_RUN_DEPENDS= libedit>0:devel/libedit +# NUMLIB options -GMP_DESC= Use GMP numeric library -GMP_LIB_DEPENDS= libgmp.so:math/gmp +GMP_DESC= Use GMP numeric library +GMP_LIB_DEPENDS= libgmp.so:math/gmp -CLN_DESC= Use CLN numeric library -CLN_CMAKE_BOOL= USE_CLN -CLN_LIB_DEPENDS= libcln.so:math/cln \ - libgmp.so:math/gmp +CLN_DESC= Use CLN numeric library +CLN_CMAKE_BOOL= USE_CLN +CLN_LIB_DEPENDS= libcln.so:math/cln \ + libgmp.so:math/gmp .include diff --git a/math/cvc5/distinfo b/math/cvc5/distinfo index 76743a798912..2a42dd80e001 100644 --- a/math/cvc5/distinfo +++ b/math/cvc5/distinfo @@ -1,7 +1,5 @@ -TIMESTAMP = 1672779263 +TIMESTAMP = 1675723547 SHA256 (antlr-3.4-complete.jar) = 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SIZE (antlr-3.4-complete.jar) = 2388361 -SHA256 (cvc5-cvc5-cvc5-1.0.3_GH0.tar.gz) = bf787b74c35ef61958865902e21dcb8f98f79d910b00a9e762a00ff8fcd2c462 -SIZE (cvc5-cvc5-cvc5-1.0.3_GH0.tar.gz) = 8335175 -SHA256 (fc8907afc08d.patch) = dfb42f7c9fbc4091d21ce4804f11c72945ccc9131f3d79dbc275fd9238ff55d4 -SIZE (fc8907afc08d.patch) = 1156 +SHA256 (cvc5-cvc5-cvc5-1.0.4_GH0.tar.gz) = b9cc1924fcbc289a5855967cb1528deac857b9aa8f71847483eb2f58370d70d2 +SIZE (cvc5-cvc5-cvc5-1.0.4_GH0.tar.gz) = 8409826 diff --git a/math/cvc5/pkg-plist b/math/cvc5/pkg-plist index 75d440acfa8e..48b1cefc2099 100644 --- a/math/cvc5/pkg-plist +++ b/math/cvc5/pkg-plist @@ -2,6 +2,7 @@ bin/cvc5 include/cvc5/cvc5.h include/cvc5/cvc5_export.h include/cvc5/cvc5_kind.h +include/cvc5/cvc5_sort_kind.h include/cvc5/cvc5_types.h lib/cmake/cvc5/cvc5Config.cmake lib/cmake/cvc5/cvc5ConfigVersion.cmake @@ -9,8 +10,9 @@ lib/cmake/cvc5/cvc5JavaTargets.cmake lib/cmake/cvc5/cvc5Targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/cvc5/cvc5Targets.cmake lib/libcvc5.so +lib/libcvc5.so.1 %%JAVA%%lib/libcvc5jni.so lib/libcvc5parser.so lib/libcvc5parser.so.1 -%%JAVA%%%%JAVASHAREDIR%%/cvc5-1.0.3.jar +%%JAVA%%%%JAVASHAREDIR%%/cvc5-1.0.4.jar %%JAVA%%%%JAVASHAREDIR%%/cvc5.jar