Date: Sat, 15 Jun 2024 08:43:27 GMT From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4c6970a7b825 - main - math/stp: Update to 2.3.4 Message-ID: <202406150843.45F8hRTr040481@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=4c6970a7b82561887ab6e6190fd81089ec4009aa commit 4c6970a7b82561887ab6e6190fd81089ec4009aa Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2024-06-15 08:42:57 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> CommitDate: 2024-06-15 08:42:57 +0000 math/stp: Update to 2.3.4 Reported by: portscout! --- math/stp/Makefile | 7 ++-- math/stp/distinfo | 6 ++-- math/stp/files/patch-STPConfig.cmake.in | 12 ------- math/stp/files/patch-tools_stp_main__common.cpp | 45 ------------------------- 4 files changed, 7 insertions(+), 63 deletions(-) diff --git a/math/stp/Makefile b/math/stp/Makefile index 39f0370568f8..a9edc2122cde 100644 --- a/math/stp/Makefile +++ b/math/stp/Makefile @@ -1,6 +1,5 @@ PORTNAME= stp -DISTVERSION= 2.3.3 -PORTREVISION= 13 +DISTVERSION= 2.3.4 PORTEPOCH= 1 CATEGORIES= math @@ -15,9 +14,11 @@ LIB_DEPENDS= libboost_program_options.so:devel/boost-libs \ libminisat.so:math/minisat \ libcryptominisat5.so:math/cryptominisat -USES= bison:build compiler:c++11-lang cmake perl5 python +USES= bison:build cmake perl5 python USE_GITHUB= yes +GH_TAGNAME= ${DISTVERSION}_cadical USE_PERL5= build USE_LDCONFIG= yes +CMAKE_ARGS= -DUSE_CADICAL=OFF .include <bsd.port.mk> diff --git a/math/stp/distinfo b/math/stp/distinfo index 868d6a803e52..1fa8f3148b4f 100644 --- a/math/stp/distinfo +++ b/math/stp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1563715848 -SHA256 (stp-stp-2.3.3_GH0.tar.gz) = ea6115c0fc11312c797a4b7c4db8734afcfce4908d078f386616189e01b4fffa -SIZE (stp-stp-2.3.3_GH0.tar.gz) = 2577550 +TIMESTAMP = 1718440069 +SHA256 (stp-stp-2.3.4-2.3.4_cadical_GH0.tar.gz) = 9cf16be7613554c96dec74123dcfdb6905636c10b4b7cddaf8b25474bfc9e966 +SIZE (stp-stp-2.3.4-2.3.4_cadical_GH0.tar.gz) = 3543795 diff --git a/math/stp/files/patch-STPConfig.cmake.in b/math/stp/files/patch-STPConfig.cmake.in deleted file mode 100644 index ee70478bf021..000000000000 --- a/math/stp/files/patch-STPConfig.cmake.in +++ /dev/null @@ -1,12 +0,0 @@ ---- STPConfig.cmake.in.orig 2019-03-02 14:26:01 UTC -+++ STPConfig.cmake.in -@@ -11,6 +11,9 @@ - get_filename_component(STP_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) - set(STP_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@") - -+include(CMakeFindDependencyMacro) -+find_dependency(cryptominisat5) -+ - # Our library dependencies (contains definitions for IMPORTED targets) - include("${STP_CMAKE_DIR}/@STP_TARGETS_FILENAME@") - diff --git a/math/stp/files/patch-tools_stp_main__common.cpp b/math/stp/files/patch-tools_stp_main__common.cpp deleted file mode 100644 index 1ad6bb03f991..000000000000 --- a/math/stp/files/patch-tools_stp_main__common.cpp +++ /dev/null @@ -1,45 +0,0 @@ ---- tools/stp/main_common.cpp.orig -+++ tools/stp/main_common.cpp -@@ -27,16 +27,8 @@ - #include "stp/Parser/parser.h" - #include "stp/cpp_interface.h" - --//for srbk() function --#if !defined(__MINGW32__) && !defined(__MINGW64__) && !defined(_MSC_VER) --#include <unistd.h> --#endif -- - extern void errorHandler(const char* error_msg); - --// Amount of memory to ask for at beginning of main. --extern const intptr_t INITIAL_MEMORY_PREALLOCATION_SIZE; -- - using namespace stp; - using std::unique_ptr; - using std::cout; -@@ -49,9 +41,6 @@ - exit(-1); - } - --// Amount of memory to ask for at beginning of main. --const intptr_t INITIAL_MEMORY_PREALLOCATION_SIZE = 4000000; -- - Main::Main() : onePrintBack(false) - { - bm = NULL; -@@ -62,15 +51,6 @@ - - // Register the error handler - vc_error_hdlr = errorHandler; -- --#if !defined(__MINGW32__) && !defined(__MINGW64__) && !defined(_MSC_VER) -- // Grab some memory from the OS upfront to reduce system time when -- // individual hash tables are being allocated -- if (sbrk(INITIAL_MEMORY_PREALLOCATION_SIZE) == ((void*)-1)) -- { -- FatalError("Initial allocation of memory failed."); -- } --#endif - - bm = new STPMgr(); - GlobalParserBM = bm;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406150843.45F8hRTr040481>