<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ca1eae8095703acff8052402ae7c223889534681">https://github.com/macports/macports-ports/commit/ca1eae8095703acff8052402ae7c223889534681</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ca1eae8095703acff8052402ae7c223889534681
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Tue Feb 20 02:48:44 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> boolector: update to 3.2.3
</span>---
math/boolector/Portfile | 12 ++++------
math/boolector/files/btor2tools.patch | 39 -------------------------------
math/boolector/files/googletest.patch | 43 -----------------------------------
3 files changed, 5 insertions(+), 89 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/boolector/Portfile b/math/boolector/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2d99383c28a..ad3c656141e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/boolector/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/boolector/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,11 +8,11 @@ PortGroup legacysupport 1.1
</span> # MAP_ANONYMOUS
legacysupport.newest_darwin_requires_legacy 14
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup Boolector boolector 3.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup Boolector boolector 3.2.3
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2179695681ba6abbb2812a06caf8a252accc7bc5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9a5bdbacf83f2dd81dbed1e1a9f923766807470afa29b73729c947ae769d42b9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1566009
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ce30cb0839963ddbd4e08fb16c1f7b1b6dae94d7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9862134d33cb3ed0aeb6be3c9b154a4d0a90fd076f46ef97cf872813109cc5d9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1566566
</span>
categories math science
license MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,9 +41,7 @@ depends_build-append \
</span> depends_lib-append port:btor2tools \
port:gmp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles DYLD_LIBRARY_PATH.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- btor2tools.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- googletest.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles DYLD_LIBRARY_PATH.patch
</span>
compiler.c_standard 1999
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/boolector/files/btor2tools.patch b/math/boolector/files/btor2tools.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3ea6efb8c4c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/boolector/files/btor2tools.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,39 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-There is a discrepancy between where btor2tools installs its header and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-where boolector is looking for it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-boolector can download and build btor2tools for us, but we don't want
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build systems to be downloading things for us, and we want to control
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-what flags are used for the build.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/FindBtor2Tools.cmake.orig 2021-05-27 19:47:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/FindBtor2Tools.cmake 2022-01-06 07:01:05.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,7 +11,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Btor2Tools_INCLUDE_DIR - the Btor2Tools include directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Btor2Tools_LIBRARIES - Libraries needed to use Btor2Tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--find_path(Btor2Tools_INCLUDE_DIR NAMES btor2parser/btor2parser.h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+find_path(Btor2Tools_INCLUDE_DIR NAMES btor2parser.h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_library(Btor2Tools_LIBRARIES NAMES btor2parser)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(FindPackageHandleStandardArgs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/btormcmain.c.orig 2021-05-27 19:47:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/btormcmain.c 2022-01-06 07:00:38.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9,7 +9,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "boolectormc.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "btormc.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "btor2parser/btor2parser.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <btor2parser.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "utils/btorhashint.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "utils/btormem.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "utils/btoroptparse.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/parser/btorbtor2.c.orig 2021-05-27 19:47:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/parser/btorbtor2.c 2022-01-06 07:00:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,7 +6,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * See COPYING for more information on using this software.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "btor2parser/btor2parser.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <btor2parser.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "btormsg.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "btorparse.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "btortypes.h"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/boolector/files/googletest.patch b/math/boolector/files/googletest.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c938b8aea65..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/boolector/files/googletest.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,43 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Don't download Google Test. Allow an already installed Google Test to be used.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/Boolector/boolector/commit/91533caf29a2c5b10b4912fd352e7af82c787598
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -440,13 +440,6 @@ configure_file(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #-----------------------------------------------------------------------------#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Regression tests
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Get and configure google test
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--include(cmake/googletest.cmake)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fetch_googletest(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${PROJECT_SOURCE_DIR}/cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${PROJECT_BINARY_DIR}/googletest
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enable_testing()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #-----------------------------------------------------------------------------#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/FindGoogleTest.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,1 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+find_package(GTest 1.10.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- test/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,6 +5,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This file is part of Boolector.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See COPYING for more information on using this software.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+find_package(GoogleTest REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/tests)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(test_names
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,7 +50,7 @@ foreach(test ${test_names})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_executable (test${test} test_${test}.cpp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_include_directories(test${test} PRIVATE ${PROJECT_SOURCE_DIR}/test/new_test)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(test${test} boolector m)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- target_link_libraries(test${test} gtest_main)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_link_libraries(test${test} GTest::gtest_main)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_target_properties(test${test} PROPERTIES OUTPUT_NAME test${test})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_test(${test} ${CMAKE_BINARY_DIR}/bin/tests/test${test})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endforeach()
</span></pre><pre style='margin:0'>
</pre>