From nobody Thu Jul 13 06:46:50 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 4R1lWt3vqGz4nCQm; Thu, 13 Jul 2023 06:46:50 +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 4R1lWt3T6Xz42vP; Thu, 13 Jul 2023 06:46:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689230810; 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=3k/ngrCsyHFZCKj3WJeezS4QLpw0q6udYkIMGrO9Ug8=; b=kRaSjvLtAILlbgmvm77i39OCc2ToUE60JqeYYWvvaYm9zyEztMpn3I+WDDR1JIKXRc0eui 6a3rkHmZGxwmJFTaCPoON8FknEsQzFKTwcu41amTXFI042o6j/7XobMwcBDYoflwSQPYV3 Tw+DZfxFCUDJz1csn+KLy9ECmPZKDLLqr+ygOrkXn8TBcZOp2YUWMwknSnxL+S8DyDKrtu IAPvfnQ7Xi3wvZ6EkcWz9aYnO0i0czpR8byEdDLgh+5S2bDtElDgZFBoLLjWSzagQ/ytpD OgHJmYEwm9hYcnogWg9qc4K3MtaWpGIb8isAcbeXFp9wCEbm0L6YK7WSmxOWKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689230810; 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=3k/ngrCsyHFZCKj3WJeezS4QLpw0q6udYkIMGrO9Ug8=; b=bYggi4JDzxb1nFmzBnxmlM4HQxPTNBADE/bJlKYlB+Jhs/Fnbx/5irsM8WPyOt7OP/hRZZ WW1AeCO5FkxgfnakZYqoC/77W3R/6zeYHpilJ4BCj2xc+0vgh1Tx4Iz81PMrjoi57TJ5nS thzSE3WXMht7RW2OmZI5zOONDIzMlTeBgcEQ1rtCbuis5pNyvis2YYYBSDb3WCiOgaxaOW /dj0FmaAAoQrZn4YXmK0VF4sZYflKG4PSIkL6ByxhkbeKQFUEUxRy8SpVIqKivtZ6KmfDv sJctJQ2lYxZqgDc8QVG1RTA4Od/6UfzFZBFmZefktF7KJXVngPJ7lnBPNtAJqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689230810; a=rsa-sha256; cv=none; b=RD4GMvW1ld+W/F59QlYVA4qyjvH4oDDOTWpxN8lTT4XFN8h0cGhfiOCZ3vD8GfQSFjln6q s5iWLcMclhO3GLa64+cj+3m4UISL+z5TsTeH9dySC4cpitqwFY2ZboQIVQ6WLsseHp68p5 Zz9UNAyU052bl+KsFhibhP1RPWgG8TK5gE2/8gD95NSjl0kqk2KzjGegRG7Jpw49XiqGIE 2TWRsuVSeZOn4Mk7dDkA92TwMQgbORRW9Ak5htvUzhHsdUAtqecxBKnk6QhkxIyUUWbCMJ gTWcPUtI+qy3mk5Kp4JJ8pJLAlwcPNESiH7Pm/yACVZpPlRAGYGqaj4reY1kHw== 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 4R1lWt2NqHzhPv; Thu, 13 Jul 2023 06:46:50 +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 36D6koFk051456; Thu, 13 Jul 2023 06:46:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36D6koqW051455; Thu, 13 Jul 2023 06:46:50 GMT (envelope-from git) Date: Thu, 13 Jul 2023 06:46:50 GMT Message-Id: <202307130646.36D6koqW051455@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: 071a590d67a4 - main - =?utf-8?Q?math/vampire:=20Update=204.7-423=20=E2=86=92=204.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: 071a590d67a4870c5dfa690bb2e89ebbf243c2ec Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=071a590d67a4870c5dfa690bb2e89ebbf243c2ec commit 071a590d67a4870c5dfa690bb2e89ebbf243c2ec Author: Yuri Victorovich AuthorDate: 2023-07-13 06:11:31 +0000 Commit: Yuri Victorovich 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 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: