git: b3beb06c6504 - main - math/stp: Update to 2.4.1

Gleb Popov <[email protected]> Tue, 04 Aug 2026 13:02:03 +0000
Newsgroups gmane.os.freebsd.devel.cvs.ports
Message-ID <[email protected]>
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b3beb06c650486a93b93f34394823f565cb236f8

commit b3beb06c650486a93b93f34394823f565cb236f8
Author:     Gleb Popov <[email protected]>
AuthorDate: 2026-08-04 12:56:30 +0000
Commit:     Gleb Popov <[email protected]>
CommitDate: 2026-08-04 13:01:27 +0000

    math/stp: Update to 2.4.1
    
    Reported by:    portscout!
---
 math/stp/Makefile  | 36 ++++++++++++++++++++++++++++--------
 math/stp/distinfo  | 12 +++++++++---
 math/stp/pkg-plist |  2 +-
 3 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/math/stp/Makefile b/math/stp/Makefile
index 51c77b7b1585..341d2c9a82b0 100644
--- a/math/stp/Makefile
+++ b/math/stp/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	stp
-DISTVERSION=	2.3.4
-PORTREVISION=	5
+DISTVERSION=	2.4.1
 PORTEPOCH=	1
 CATEGORIES=	math
 
@@ -11,16 +10,37 @@ WWW=		https://stp.github.io/
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	gmake:devel/gmake \
+		git:devel/git
 LIB_DEPENDS=	libboost_program_options.so:devel/boost-libs \
+		libgmp.so:math/gmp \
 		libminisat.so:math/minisat \
 		libcryptominisat5.so:math/cryptominisat
-BUILD_DEPENDS=	${PY_SETUPTOOLS}
+TEST_DEPENDS=	lit${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
+
+USES=		bison:build cmake:testing 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
+GH_TUPLE=	berkeley-abc:abc:95393064368b7c05da4d6f0264fc3419c175c7cb:abc/lib/extlib-abc \
+		google:googletest:v1.17.0:googletest/deps/gtest \
+		stp:OutputCheck:e0133ed42b091a7ddea6b901055e142447819a9e:outputcheck/deps/OutputCheck
+
+CMAKE_ARGS=		-DUSE_CADICAL=OFF \
+			-DSTP_ALLOCATOR=system
+CMAKE_TESTING_ARGS=	-DLIT_TOOL=${LOCALBASE}/bin/lit${LLVM_DEFAULT}
+CMAKE_TESTING_ON=	ENABLE_TESTING
+
+# Workaround the Python problem
+# OSError: /usr/local/lib/libstp.so: No space available for static Thread Local Storage
+TEST_ENV=	LD_PRELOAD=${BUILD_WRKSRC}/lib/libstp.so
+
+TESTING_UNSAFE=	llvm-lit based tests fail because our LLVM package does not ship "not"
+
+post-patch:
+	${REINPLACE_CMD} 's| make| gmake|g' ${WRKSRC_abc}/CMakeLists.txt
+	${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_DEFAULT}|g' \
+		-e 's|lit\.util|lit${LLVM_DEFAULT}\.util|g' \
+		-e 's|lit\.formats|lit${LLVM_DEFAULT}\.formats|g' \
+		${WRKSRC}/tests/query-files/lit.cfg
 
 .include <bsd.port.mk>
diff --git a/math/stp/distinfo b/math/stp/distinfo
index 1fa8f3148b4f..be406e8e2871 100644
--- a/math/stp/distinfo
+++ b/math/stp/distinfo
@@ -1,3 +1,9 @@
-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
+TIMESTAMP = 1785840204
+SHA256 (stp-stp-2.4.1_GH0.tar.gz) = 6f8bca3612e3d61868450dbf7771897b2a909f446e8de460bdf31f13a6cd0318
+SIZE (stp-stp-2.4.1_GH0.tar.gz) = 3243916
+SHA256 (berkeley-abc-abc-95393064368b7c05da4d6f0264fc3419c175c7cb_GH0.tar.gz) = b23f9384edb297a27cb0420d9f99ca4cf4e2a2a301ac10b41418f770a839cb9e
+SIZE (berkeley-abc-abc-95393064368b7c05da4d6f0264fc3419c175c7cb_GH0.tar.gz) = 6266682
+SHA256 (google-googletest-v1.17.0_GH0.tar.gz) = 65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c
+SIZE (google-googletest-v1.17.0_GH0.tar.gz) = 885595
+SHA256 (stp-OutputCheck-e0133ed42b091a7ddea6b901055e142447819a9e_GH0.tar.gz) = 5a65302bc13c46a204c353f25ce76ce4d29dafab660126be7bd2613f64290da7
+SIZE (stp-OutputCheck-e0133ed42b091a7ddea6b901055e142447819a9e_GH0.tar.gz) = 16516
diff --git a/math/stp/pkg-plist b/math/stp/pkg-plist
index 2e1c8ef7ae6d..384a4c910e62 100644
--- a/math/stp/pkg-plist
+++ b/math/stp/pkg-plist
@@ -6,7 +6,7 @@ lib/cmake/STP/STPConfigVersion.cmake
 lib/cmake/STP/STPTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/STP/STPTargets.cmake
 lib/libstp.so
-lib/libstp.so.2.3
+lib/libstp.so.2.4
 %%PYTHON_SITELIBDIR%%/stp/__init__.py
 %%PYTHON_SITELIBDIR%%/stp/library_path.py
 %%PYTHON_SITELIBDIR%%/stp/stp.py