From nobody Sun Sep 17 18:47:41 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 4RpcPB0D8bz4tbyv; Sun, 17 Sep 2023 18:47:42 +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 4RpcP96nRGz4qj4; Sun, 17 Sep 2023 18:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694976462; 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=DUb1OTrplb7Np8xh3U1zbYFDWyad1rXUcchrTyw3lF8=; b=WpnOZXqtb7HrKvecmT12fdd9Zq6TPkm4aBeaRgoDtVSbC3WlWYk8cFieKUIgYMXztW/ts6 UvhAf/FZxkoK7AbCdtfgPfxq4hqlN+nClrxiN5JNA3Yg+2h46c6KgeJLYqA2ltwSMDm4bf YUTzIUt7ZJYio9oAaWCLTRuYUcu95l3iCPLjpEIHpprbFpvYR+/sM7bKweLHiMYzynVppC X+s6XzzewzQYGtNDX5KplQR7Rflh8Q3rwyePItQT9Pdpp6Oi1BSF03AXt4s0EauedJuyQe bbgkdow9IlcFuhtYc0gn5VOiibDpgWkldD1g1jEgvCNcQAGb8ehtH/crx0w+Ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694976462; a=rsa-sha256; cv=none; b=HxtUK0jZ4PEgHYfvTjbBIvQT4l7DoLJJZHvX0l7Jxnd8QIFk7QT33NdlEPUNI1288Li9eN uqkr8MTSThuAVMskSf426Lt3sokY76vtvvoT4VwyzpoXLHqAf6K9OcZ5M1Qs7cYP6tzGhN goCO4Yer8ZQXikoyj3V7twVoOXRYeMR/BSVOFDwAENsYkKZ7iO9X2S8NgDmqRyNap1ORCN 6c+kMi72jD7Fh5vZceTwNjyzneuvj1qe84iYbwrpBcnMr6fXZUaefN2ZFQrNMYGIAh7DI2 0W4OZ1SXOwk7Q9Pzj+dgMklBOOcdYyJybJpU7N42dGpSyniPXhhIBzCaDdIcFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694976462; 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=DUb1OTrplb7Np8xh3U1zbYFDWyad1rXUcchrTyw3lF8=; b=j+ciKjqv1nUC6+mZThDOB1/jxXYhk5b/5Y1TlC/tb3xAdzUasX2R+8IqI8m+NIfoIVAVWy 8vP5cvPDr8hG2CDiU1eGHoFihp4xkUxYhf0blA+8SeLhq3yuM2D4eGSODiBogJAGjUOeSV bNB71gl4GjjFmeOkjaeTpbXytE87QBRo2LSM3iZix82STEYYAfBUrAfH6mNK3xuJHURBC/ lhLGm27fMt94zwm+kyeZtarw/NZfzdwJrXwef8/10ykYS3BUcIjJl+z0Ttj3AMQDDd+l2j XteXRgS58h29upKrNpAm1Sk+GpVA0FizQSk778iQ0siFxxO44lMyhoUkyf5tBg== 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 4RpcP95lNQz10RD; Sun, 17 Sep 2023 18:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38HIlfWm039176; Sun, 17 Sep 2023 18:47:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38HIlfTc039173; Sun, 17 Sep 2023 18:47:41 GMT (envelope-from git) Date: Sun, 17 Sep 2023 18:47:41 GMT Message-Id: <202309171847.38HIlfTc039173@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: a31acf08261d - main - math/cvc5: update 1.0.5 =?utf-8?Q?=E2=86=92?= 1.0.8 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: a31acf08261d5c3a734dea6edbc94008688ffeab Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=a31acf08261d5c3a734dea6edbc94008688ffeab commit a31acf08261d5c3a734dea6edbc94008688ffeab Author: Yuri Victorovich AuthorDate: 2023-09-17 18:47:29 +0000 Commit: Yuri Victorovich CommitDate: 2023-09-17 18:47:39 +0000 math/cvc5: update 1.0.5 → 1.0.8 --- math/cvc5/Makefile | 19 +++---------------- math/cvc5/distinfo | 6 +++--- math/cvc5/files/patch-cmake_FindANTLR3.cmake | 11 ----------- math/cvc5/pkg-plist | 4 ++-- 4 files changed, 8 insertions(+), 32 deletions(-) diff --git a/math/cvc5/Makefile b/math/cvc5/Makefile index eac795e5d7ae..fd65f6ef932f 100644 --- a/math/cvc5/Makefile +++ b/math/cvc5/Makefile @@ -1,10 +1,7 @@ PORTNAME= cvc5 DISTVERSIONPREFIX= cvc5- -DISTVERSION= 1.0.5 -PORTREVISION= 2 +DISTVERSION= 1.0.8 CATEGORIES= math java -MASTER_SITES+= http://www.antlr3.org/download/:antlr3 -DISTFILES+= antlr-3.4-complete.jar:antlr3 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= yuri@FreeBSD.org @@ -18,6 +15,7 @@ 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}tomli>0:textproc/py-tomli@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing@${PY_FLAVOR} LIB_DEPENDS= libantlr3c.so:devel/libantlr3c \ libboost_system.so:devel/boost-libs @@ -31,8 +29,7 @@ USE_JAVA= yes JAVA_BUILD= yes CMAKE_BUILD_TYPE= Production -CMAKE_ARGS+= -DANTLR_BINARY=${WRKDIR}/antlr3 \ - -DFREEBSD_DISTDIR=${DISTDIR} \ +CMAKE_ARGS+= -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 @@ -92,14 +89,4 @@ CMAKE_ARGS+= -DENABLE_GPL:BOOL=ON PORTSCOUT= limit:^cvc5-[1-9].* # prevent older generation versions like 1.8 -post-extract: - @${CP} ${DISTDIR}/antlr-3.4-complete.jar ${WRKDIR}/antlr3.jar - @${ECHO_CMD} "#!/bin/sh" > ${WRKDIR}/antlr3 - @${ECHO_CMD} "exec \"${LOCALBASE}/bin/java\" -classpath \"${WRKDIR}/antlr3.jar\" org.antlr.Tool \"\$$@\"" >> ${WRKDIR}/antlr3 - @${CHMOD} +x ${WRKDIR}/antlr3 - -xpost-patch: - @${REINPLACE_CMD} -e "s|sed -i'' -e 's|sed -i '' -e 's|g" \ - ${WRKSRC}/src/fix-install-headers.sh - .include diff --git a/math/cvc5/distinfo b/math/cvc5/distinfo index 0cbed0d66b6a..f98288404c52 100644 --- a/math/cvc5/distinfo +++ b/math/cvc5/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1678859148 +TIMESTAMP = 1694965126 SHA256 (antlr-3.4-complete.jar) = 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SIZE (antlr-3.4-complete.jar) = 2388361 -SHA256 (cvc5-cvc5-cvc5-1.0.5_GH0.tar.gz) = a9705569fe36c70291dd1eb6dc5f542d33da51f82da46558e3455ed6995b1b7a -SIZE (cvc5-cvc5-cvc5-1.0.5_GH0.tar.gz) = 8431503 +SHA256 (cvc5-cvc5-cvc5-1.0.8_GH0.tar.gz) = 9b61c6e27609db154657f105d7271a03b7798047b3aab1ca2ab58910fac788ba +SIZE (cvc5-cvc5-cvc5-1.0.8_GH0.tar.gz) = 8393754 diff --git a/math/cvc5/files/patch-cmake_FindANTLR3.cmake b/math/cvc5/files/patch-cmake_FindANTLR3.cmake deleted file mode 100644 index 4af6273f9f53..000000000000 --- a/math/cvc5/files/patch-cmake_FindANTLR3.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake/FindANTLR3.cmake.orig 2022-12-12 22:42:47 UTC -+++ cmake/FindANTLR3.cmake -@@ -18,7 +18,7 @@ - - include(deps-helper) - --find_file(ANTLR3_JAR NAMES antlr-3.4-complete.jar PATH_SUFFIXES share/java/) -+set(ANTLR3_JAR ${FREEBSD_DISTDIR}/antlr-3.4-complete.jar) - find_path(ANTLR3_INCLUDE_DIR NAMES antlr3.h) - find_library(ANTLR3_LIBRARIES NAMES antlr3c) - diff --git a/math/cvc5/pkg-plist b/math/cvc5/pkg-plist index dbaa449c1514..9cf6f348cfe8 100644 --- a/math/cvc5/pkg-plist +++ b/math/cvc5/pkg-plist @@ -2,7 +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_parser.h include/cvc5/cvc5_types.h lib/cmake/cvc5/cvc5Config.cmake lib/cmake/cvc5/cvc5ConfigVersion.cmake @@ -14,5 +14,5 @@ lib/libcvc5.so.1 %%JAVA%%lib/libcvc5jni.so lib/libcvc5parser.so lib/libcvc5parser.so.1 -%%JAVA%%%%JAVASHAREDIR%%/cvc5-1.0.5.jar +%%JAVA%%%%JAVASHAREDIR%%/cvc5-1.0.8.jar %%JAVA%%%%JAVASHAREDIR%%/cvc5.jar