diff --git a/math/vampire/Makefile b/math/vampire/Makefile index c99cd744cfe0..c4c2a5f24c37 100644 --- a/math/vampire/Makefile +++ b/math/vampire/Makefile @@ -1,30 +1,32 @@ PORTNAME= vampire -DISTVERSION= 4.5.1 +DISTVERSIONPREFIX= v +DISTVERSION= 4.7-423 +DISTVERSIONSUFFIX= -gc1643839b CATEGORIES= math MAINTAINER= yuri@FreeBSD.org COMMENT= Automatic theorem prover WWW= https://vprover.github.io/ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENCE USES= compiler:c++11-lang gmake 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. PLIST_FILES= bin/${PORTNAME} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${ALL_TARGET}* ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include diff --git a/math/vampire/distinfo b/math/vampire/distinfo index 0c3ae9415de6..9f2d7a14fd32 100644 --- a/math/vampire/distinfo +++ b/math/vampire/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1594926953 -SHA256 (vprover-vampire-4.5.1_GH0.tar.gz) = f7bf491a2576a7fc6551eabf37763b2b6ffd36e87ad660ff191dcd88a8969ae7 -SIZE (vprover-vampire-4.5.1_GH0.tar.gz) = 1834216 +TIMESTAMP = 1687719811 +SHA256 (vprover-vampire-v4.7-423-gc1643839b_GH0.tar.gz) = 64251a4c914e3bfaacf790d7466d515c763760a7997e8549d9adb41b16c37fb0 +SIZE (vprover-vampire-v4.7-423-gc1643839b_GH0.tar.gz) = 1521191 diff --git a/math/vampire/files/patch-Lib_Portability.hpp b/math/vampire/files/patch-Lib_Portability.hpp deleted file mode 100644 index e82b0a05f6c8..000000000000 --- a/math/vampire/files/patch-Lib_Portability.hpp +++ /dev/null @@ -1,16 +0,0 @@ ---- Lib/Portability.hpp.orig 2018-12-01 20:14:14 UTC -+++ Lib/Portability.hpp -@@ -25,11 +25,11 @@ - // Detect compiler - - #ifndef __APPLE__ --# define __APPLE__ 0 -+//# define __APPLE__ 0 - #endif - - #ifndef __CYGWIN__ --# define __CYGWIN__ 0 -+//# define __CYGWIN__ 0 - #endif - - ////////////////////////////////////////////////////// diff --git a/math/vampire/files/patch-Lib_System.cpp b/math/vampire/files/patch-Lib_System.cpp deleted file mode 100644 index 1d054dcf2b31..000000000000 --- a/math/vampire/files/patch-Lib_System.cpp +++ /dev/null @@ -1,26 +0,0 @@ ---- Lib/System.cpp.orig 2018-12-01 20:15:38 UTC -+++ Lib/System.cpp -@@ -27,9 +27,13 @@ - #include - # include - # if !__APPLE__ && !__CYGWIN__ --# include -+//# include - # endif - -+#if defined (__FreeBSD__) -+#include -+#endif -+ - #include - - #include -@@ -360,7 +364,7 @@ void System::terminateImmediately(int re - */ - void System::registerForSIGHUPOnParentDeath() - { --#if __APPLE__ || __CYGWIN__ -+#if __APPLE__ || __CYGWIN__ || __FreeBSD__ - // cerr<<"Death of parent process not being handled on Mac and Windows"< $@ - @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: