From nobody Sat Jun 15 08:43:27 2024 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 4W1V6S09fHz5NdDj; Sat, 15 Jun 2024 08:43:28 +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 4W1V6R6gSgz4hpm; Sat, 15 Jun 2024 08:43:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718441007; 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=/I76mHLOmGpsARW4c5OTWYMJDEkfS5qNEMc1t3AF5pM=; b=pVJDBg8sqb0oNtCrgfPdT21e+7lET81XGcDnErKzKFCpLqmGzuzlPX9ybsOWMxcQXT0tAK aaOsimDf6eZRblrdWaHxo7HpX97kNazFTW/h86kdtBDvSF3e2Yff9nLFv7yOHPaKGhz88C OfW7p4Z8IljFkMpXfi4SmbiGCIr+Fh1+GNaHH+ZRJrnJQRvJCs5T1ox8fXMFnf964gBDsA qjFTYslLzvUTxWUp/bBouG4PUAA2sO/U9gr2+8H5tgslKh2GgwSQ5xOPW2X404vUFMfr5L KHzvXH+EUV08cxnAsv2uTiSfHWxROedKWY7y9ej1nPHkNLzt9D9hR1K7BRPaJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718441007; a=rsa-sha256; cv=none; b=t0rMm6g1ENqIfr8pcJkPySXmQGp64joGmOih7RyyZjAAkYBwLF7+lzr3cIDRdZl4nnWIC2 TrsFiwEcDuH5RT8EP/jX+HVmcz4+4IE9qYZglpcFotbgPxRgWfc4uwZnkXob9bGnlWKIBq 4k1NMZ9J2jLd1jX7VEXX4SIsDDNUFypxURUpXMEU4VNX6ckC4BegX265x/Yj54qR6MmV9E SQWklwWYnxkP1eqnHBHkM9Rc3FB1fp9SDiPq40zal3VhwHWSHUOwLvAyZVcmu3Gi8ViF8D 15YMuYqNFm3R9G6CGREdjZzpcI59XuFmmg6mlwKZG2wAhztltorqXUb+yBScJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718441007; 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=/I76mHLOmGpsARW4c5OTWYMJDEkfS5qNEMc1t3AF5pM=; b=BZokD1bYb9IBMHpxKK7559AAIoCg0SCjjvA39RkxsBukowfVoPyZUqxP0UrzpYn09NezTP ZHFTqt5ADt14qWAzQJ3y5QESv2Mu5lNMYCeXpdj2XDozf+gTAR6dngAIPFtZM8G/s6JalD M5n49lGIv7daBTt3XnTrOv8kzWzan0JyA/PDtAU4OGq/1j41vRSNIaxeVqp9N06DYOW3tQ mfYeRH3KjsCi0BAX0h+VaDHSs2Y0osEP24/CSJ78pEEsgUJZecrHrOng9IHt2k/lakITHa TLvJNa5/aZFp0RF9m3CwT8fSd5SityTGL6OmRtivxuuVJ1zl1mHM7uDCZcU0Sw== 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 4W1V6R69gSzxYn; Sat, 15 Jun 2024 08:43:27 +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 45F8hRY7040484; Sat, 15 Jun 2024 08:43:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45F8hRTr040481; Sat, 15 Jun 2024 08:43:27 GMT (envelope-from git) Date: Sat, 15 Jun 2024 08:43:27 GMT Message-Id: <202406150843.45F8hRTr040481@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 4c6970a7b825 - main - math/stp: Update to 2.3.4 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c6970a7b82561887ab6e6190fd81089ec4009aa Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=4c6970a7b82561887ab6e6190fd81089ec4009aa commit 4c6970a7b82561887ab6e6190fd81089ec4009aa Author: Gleb Popov AuthorDate: 2024-06-15 08:42:57 +0000 Commit: Gleb Popov 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 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 --#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;