math/eprover: Update 2.0 → 2.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 <bsd.port.mk>
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