From a31acf08261d5c3a734dea6edbc94008688ffeab Mon Sep 17 00:00:00 2001
From: Yuri Victorovich <yuri@FreeBSD.org>
Date: Sun, 17 Sep 2023 11:47:29 -0700
Subject: [PATCH] =?UTF-8?q?math/cvc5:=20update=201.0.5=20=E2=86=92=201.0.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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(-)
 delete mode 100644 math/cvc5/files/patch-cmake_FindANTLR3.cmake

diff --git a/math/cvc5/Makefile b/math/cvc5/Makefile
index eac795e5d7ae1..fd65f6ef932f8 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 <bsd.port.mk>
diff --git a/math/cvc5/distinfo b/math/cvc5/distinfo
index 0cbed0d66b6a4..f98288404c52a 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 4af6273f9f536..0000000000000
--- 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 dbaa449c15141..9cf6f348cfe80 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