From nobody Sun Jul 23 02:23:45 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 4R7nCj34nDz4mnG8; Sun, 23 Jul 2023 02:23:45 +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 4R7nCj2X4yz4B7B; Sun, 23 Jul 2023 02:23:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690079025; 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=oCLuELVDY/Dbezuo5p9RxGoLqk0XKgjIwJwIvO/bmSg=; b=WweAQ2C52RM9PZC6tlNcDLQGMYt4lJYz1RKi7jfZEND12DPqy2Z8mA1eWGfwAG8tfgwhuK DIPjbiUeik5XhA2ZA11FqehDjdWPgNQLZV4ZRA17yMjUZ3XlfWkXAKByg9xe9iAtYec+ir 8qflGGbL5ntR+LB+62Gvl2lNMXC3Qs+/AJD17APtMY5n+waX0OE6qSBGkbK72rweHzzedt HhtIUlkX9N2M2Vrh386dFXrB5Ibv5TvralSkGMD4iSOQ1vhOnitcF3gFsT2Y66irNyFC4v 2LYHwJqLABtGJpNuTHEDwM5Qi3amrM3LXRYYnOTfeNE7dBiLy1+qNIU5tKWIvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690079025; 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=oCLuELVDY/Dbezuo5p9RxGoLqk0XKgjIwJwIvO/bmSg=; b=yPN9tguz63Zv3p7xG4aUZti78Q14cLP0gmm2BCgEUIFHKUCQy6CN6N9t/rZM8M+gZF9VdL yNY3jgNgpq59GCY7TJMk+eW8qZWZ+BCiph3BiebHKZ3jsYprqcg6Gprwsmqpw1IVfhIUlE V9XI3+e3dRyeQAi0574puRsxHmfxwTRLnKckzC0vB1evsKSJIQ3uwMgMJpc9mDiiTZTM18 udiSRhU7rUvO9iT8FMAa/nZ7ROTjqM3Og1qloo9/EhSghjXMbWnLzghYETANmYf8M3JYPX G7wPP9QHClz27z6+oX60zs0Z+zi2SSVqLj7JQayw1id7r1IsT/UiJC7t11PEKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690079025; a=rsa-sha256; cv=none; b=QZ5FiP1cOVkuUMSVBtTicQjdI+oHBgg+YGJ7LamlrCpYbVMftHETH1WyQJICTljcYHcBMZ uPZBc3gTHEUCxwx7ZDkLaWjv+RS7yoke5RJJP4MljaC0ZhGvs41Rx5eFVpH706l9qbM3OR 9+YblXux6xXnT7C4W07La0wVzNvixMArsRzrz52en/VJwN8sfJ8kaDty5NG1QpKTkM3wMX fuBY+AOeDzgrCBp0HWi7jSGeaUdLi+4IbhzVBeKIB8Ma12b+a5H3pkJm++1kbAGBfGfdF/ is9M9sGE2aM6E2rPFvPFxBbSUK48fEuBsgL27pL0hhcGe1srxKlJwSgEcNCLkg== 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 4R7nCj1b2lzJST; Sun, 23 Jul 2023 02:23:45 +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 36N2Njnh068010; Sun, 23 Jul 2023 02:23:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36N2NjPq068009; Sun, 23 Jul 2023 02:23:45 GMT (envelope-from git) Date: Sun, 23 Jul 2023 02:23:45 GMT Message-Id: <202307230223.36N2NjPq068009@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: b35d6c05018a - main - =?utf-8?Q?math/eprover:=20Update=202.0=20=E2=86=92=202.6?= 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: b35d6c05018a3d671e96820a7c51458cc9668ef5 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=b35d6c05018a3d671e96820a7c51458cc9668ef5 commit b35d6c05018a3d671e96820a7c51458cc9668ef5 Author: Yuri Victorovich AuthorDate: 2023-07-23 02:23:30 +0000 Commit: Yuri Victorovich CommitDate: 2023-07-23 02:23:43 +0000 math/eprover: Update 2.0 → 2.6 --- math/eprover/Makefile | 24 ++++++++++++++++-------- math/eprover/distinfo | 6 +++--- math/eprover/files/patch-Makefile | 10 ---------- math/eprover/files/patch-Makefile.vars | 16 ++++++---------- math/eprover/pkg-plist | 6 ++---- 5 files changed, 27 insertions(+), 35 deletions(-) diff --git a/math/eprover/Makefile b/math/eprover/Makefile index ef857bd81056..aa472ab3b7ef 100644 --- a/math/eprover/Makefile +++ b/math/eprover/Makefile @@ -1,6 +1,6 @@ PORTNAME= eprover DISTVERSIONPREFIX= E- -DISTVERSION= 2.0 +DISTVERSION= 2.6 PORTREVISION= 1 CATEGORIES= math @@ -16,23 +16,31 @@ BUILD_DEPENDS= bash:shells/bash \ help2man:misc/help2man RUN_DEPENDS= bash:shells/bash -USES= shebangfix +USES= gmake shebangfix USE_GITHUB= yes +SHEBANG_FILES= etc/bjob_classify \ + development_tools/spec_version.sh \ + PYTHON/bsub_eprover.py + HAS_CONFIGURE= yes + CONFIGURE_ARGS= --bindir=${STAGEDIR}${PREFIX}/bin/ \ --man-prefix=${STAGEDIR}${PREFIX}/man/man1/ -SHEBANG_FILES= PROVER/eproof PROVER/eproof_ram +MAKE_ARGS= CC=${CC} + +ALL_TARGET= all man -post-build: - @cd ${WRKSRC} && ${MAKE} man - @${REINPLACE_CMD} -e 's|EXECPATH=.|EXECPATH=${PREFIX}/bin|' \ - ${WRKSRC}/PROVER/eproof ${WRKSRC}/PROVER/eproof_ram +BINARY_ALIAS= make=${GMAKE} \ + gcc=${CC} post-install: -.for f in checkproof e_axfilter e_deduction_server e_ltb_runner eground \ + # strip binaries +.for f in checkproof e_axfilter e_deduction_server e_ltb_runner e_stratpar eground \ ekb_create ekb_delete ekb_ginsert ekb_insert epclextract eprover @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f} .endfor + # remove the unnecessary 'picosat' executable + @${RM} ${STAGEDIR}${PREFIX}/bin/picosat .include diff --git a/math/eprover/distinfo b/math/eprover/distinfo index cb94072c149c..c008110decc5 100644 --- a/math/eprover/distinfo +++ b/math/eprover/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1508690062 -SHA256 (eprover-eprover-E-2.0_GH0.tar.gz) = 63986bcfa139381831c14af5ef83e350f8efb169b1d22d15cb92026259ea14d2 -SIZE (eprover-eprover-E-2.0_GH0.tar.gz) = 1315451 +TIMESTAMP = 1690054815 +SHA256 (eprover-eprover-E-2.6_GH0.tar.gz) = 401ecbe4e9abd1a89df47a74929ea970bbde5e863ad9f9f672b24434fa8259ca +SIZE (eprover-eprover-E-2.6_GH0.tar.gz) = 1709485 diff --git a/math/eprover/files/patch-Makefile b/math/eprover/files/patch-Makefile deleted file mode 100644 index 6a45f6aa974d..000000000000 --- a/math/eprover/files/patch-Makefile +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.orig 2017-11-18 22:48:40 UTC -+++ Makefile -@@ -175,6 +175,7 @@ documentation: - - man: E - mkdir -p DOC/man -+ help2man -N -i DOC/bug_reporting PROVER/e_deduction_server > DOC/man/e_deduction_server.1 - help2man -N -i DOC/bug_reporting PROVER/eproof > DOC/man/eproof.1 - help2man -N -i DOC/bug_reporting PROVER/eproof_ram > DOC/man/eproof_ram.1 - help2man -N -i DOC/bug_reporting PROVER/eprover > DOC/man/eprover.1 diff --git a/math/eprover/files/patch-Makefile.vars b/math/eprover/files/patch-Makefile.vars index fa864acda681..8fa9df18e9d3 100644 --- a/math/eprover/files/patch-Makefile.vars +++ b/math/eprover/files/patch-Makefile.vars @@ -1,11 +1,13 @@ ---- Makefile.vars.orig 2017-07-07 12:35:57 UTC +--- Makefile.vars.orig 2021-06-22 23:43:03 UTC +++ Makefile.vars -@@ -134,17 +134,17 @@ PROFFLAGS = # -pg +@@ -138,14 +138,14 @@ PROFFLAGS = # -pg DEBUGGER = # -g -ggdb LTOFLAGS = # -flto WFLAGS = -Wall --OPTFLAGS = -O3 -fomit-frame-pointer -fno-common -+OPTFLAGS = +-OPTFLAGS = -O03 -fomit-frame-pointer -fno-common ++OPTFLAGS = #-O03 -fomit-frame-pointer -fno-common + #OPTFLAGS = -O03 -fno-common + EHOH = DEBUGFLAGS = $(PROFFLAGS) $(MEMDEBUG) $(DEBUGGER) $(NODEBUG) @@ -16,9 +18,3 @@ LD = $(CC) $(LDFLAGS) # Generic - AR = ar rcs -- CC = gcc -+ CC ?= gcc - - # Builds with link time optimization - # diff --git a/math/eprover/pkg-plist b/math/eprover/pkg-plist index b06233797330..173761dd63b0 100644 --- a/math/eprover/pkg-plist +++ b/math/eprover/pkg-plist @@ -2,25 +2,23 @@ bin/checkproof bin/e_axfilter bin/e_deduction_server bin/e_ltb_runner +bin/e_stratpar bin/eground bin/ekb_create bin/ekb_delete bin/ekb_ginsert bin/ekb_insert bin/epclextract -bin/eproof -bin/eproof_ram bin/eprover man/man1/checkproof.1.gz man/man1/e_axfilter.1.gz man/man1/e_deduction_server.1.gz man/man1/e_ltb_runner.1.gz +man/man1/e_stratpar.1.gz man/man1/eground.1.gz man/man1/ekb_create.1.gz man/man1/ekb_delete.1.gz man/man1/ekb_ginsert.1.gz man/man1/ekb_insert.1.gz man/man1/epclextract.1.gz -man/man1/eproof.1.gz -man/man1/eproof_ram.1.gz man/man1/eprover.1.gz