Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 13 Jul 2023 06:46:50 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: 071a590d67a4 - main - =?utf-8?Q?math/vampire:=20Update=204.7-423=20=E2=86=92=204.8?=
Message-ID:  <202307130646.36D6koqW051455@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=071a590d67a4870c5dfa690bb2e89ebbf243c2ec

commit 071a590d67a4870c5dfa690bb2e89ebbf243c2ec
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-07-13 06:11:31 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-07-13 06:11:31 +0000

    math/vampire: Update 4.7-423 → 4.8
    
    Reported by:    portscout
---
 math/vampire/Makefile             | 21 +++++++--------------
 math/vampire/distinfo             |  6 +++---
 math/vampire/files/patch-Makefile | 27 ---------------------------
 3 files changed, 10 insertions(+), 44 deletions(-)

diff --git a/math/vampire/Makefile b/math/vampire/Makefile
index e6c388df2c19..74b11062d4bf 100644
--- a/math/vampire/Makefile
+++ b/math/vampire/Makefile
@@ -1,34 +1,27 @@
 PORTNAME=	vampire
-DISTVERSIONPREFIX=	v
-DISTVERSION=	4.7-423
-DISTVERSIONSUFFIX=	-gc1643839b
+DISTVERSIONPREFIX=	vHO
+DISTVERSION=	4.8
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Automatic theorem prover
 WWW=		https://vprover.github.io/
 
-LICENSE=	BSD2CLAUSE
+LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
 BROKEN_i386=	error: static_assert failed due to requirement 'sizeof(void *) == 8'
 
-USES=		compiler:c++11-lang gmake
+USES=		cmake compiler:c++14-lang
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	vprover
 
-ALL_TARGET=	vampire_rel # do we also need the z3 target?
-
-BINARY_ALIAS=	g++=${CXX}
-
-CXXFLAGS+=	-DCHECK_LEAKS=0
-MAKE_ARGS=	FREEBSD_VERSION_NUMBER="${PORTVERSION}"
-
-#MAKE_ARGS=	GNUMPF=1 # This causes compillation failure, additionally GitHub failed to create the issue for this project.
+CMAKE_ARGS=	-DCMAKE_BUILD_HOL=On # code is broken w/out this
 
 PLIST_FILES=	bin/${PORTNAME}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${ALL_TARGET}* ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/bin/${PORTNAME}* ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/math/vampire/distinfo b/math/vampire/distinfo
index 9f2d7a14fd32..6781a1c504eb 100644
--- a/math/vampire/distinfo
+++ b/math/vampire/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1687719811
-SHA256 (vprover-vampire-v4.7-423-gc1643839b_GH0.tar.gz) = 64251a4c914e3bfaacf790d7466d515c763760a7997e8549d9adb41b16c37fb0
-SIZE (vprover-vampire-v4.7-423-gc1643839b_GH0.tar.gz) = 1521191
+TIMESTAMP = 1689226827
+SHA256 (vprover-vampire-vHO4.8_GH0.tar.gz) = 7d6f906c08c265aeac5601c7eceefec3dc5d8e1e720f3fd2466eec0cc4f6cc9c
+SIZE (vprover-vampire-vHO4.8_GH0.tar.gz) = 1538556
diff --git a/math/vampire/files/patch-Makefile b/math/vampire/files/patch-Makefile
deleted file mode 100644
index f660afdcee74..000000000000
--- a/math/vampire/files/patch-Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.orig	2023-06-15 19:13:02 UTC
-+++ Makefile
-@@ -522,20 +522,17 @@ VERSION_NUMBER = 4.7
- # The dependency on .git/HEAD tracks switching between branches,
- # the dependency on .git/index tracks new commits.
- 
--.git/HEAD:
--.git/index:
--
--version.cpp: .git/HEAD .git/index Makefile
-+version.cpp: Makefile
- 	@echo "//Automatically generated file, see Makefile for details" > $@
--	@echo "const char* VERSION_STRING = \"Vampire $(VERSION_NUMBER) (commit $(shell git log -1 --format=%h\ on\ %ci || echo unknown))\";" >> $@
-+	@echo "const char* VERSION_STRING = \"Vampire $(FREEBSD_VERSION_NUMBER)\";" >> $@
- 
- ################################################################
- # separate directory for object files implementation
- 
- # different directory for each configuration, so there is no need for "make clean"
- SED_CMD='s/.*[(].*/detached/' # if branch name contains an opening bracket, replace it with detached (in order to avoid a crash during linking). This covers at least the case '(HEAD' occuring if one is in detached state, and '(no' occuring if one currently performs a rebase.
--BRANCH=$(shell git branch | grep "\*" | cut -d ' ' -f 2 | sed -e $(SED_CMD)  )
--COM_CNT=$(shell git rev-list HEAD --count)
-+BRANCH="master"
-+COM_CNT="0"
- CONF_ID := obj/$(shell echo -n "$(BRANCH) $(XFLAGS)"|sum|cut -d ' ' -f1)X
- 
- obj:



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