git: b50e289ad39d - main - math/py-or-tools: the port had been updated to version 9.6

From: Alexey Dokuchaev <danfe_at_FreeBSD.org>
Date: Thu, 08 Aug 2024 15:53:56 UTC
The branch main has been updated by danfe:

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

commit b50e289ad39de7c7a91c9bc43614931237952afb
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2024-08-08 15:52:46 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2024-08-08 15:52:46 +0000

    math/py-or-tools: the port had been updated to version 9.6
    
    This makes it more up-to-date against current versions of `devel/abseil'
    and `devel/protobuf' (versions 9.7+ require `pybind11_protobuf' package
    which had not been ported yet).
    
    Approved by:    yuri (maintainer, implicit)
---
 math/py-or-tools/Makefile  | 5 +++--
 math/py-or-tools/distinfo  | 6 +++---
 math/py-or-tools/pkg-plist | 5 ++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/math/py-or-tools/Makefile b/math/py-or-tools/Makefile
index 701a29736dcb..af592a1f4c0b 100644
--- a/math/py-or-tools/Makefile
+++ b/math/py-or-tools/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	or-tools
 DISTVERSIONPREFIX=	v
-DISTVERSION=	9.5
-PORTREVISION=	9
+DISTVERSION=	9.6
 CATEGORIES=	math
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -69,6 +68,8 @@ post-patch:
 		${WRKSRC}/ortools/glop/CMakeLists.txt \
 		${WRKSRC}/ortools/linear_solver/CMakeLists.txt \
 		${WRKSRC}/ortools/sat/CMakeLists.txt
+	@${REINPLACE_CMD} -e '17,19d ; /AbslStringify/,+10d' \
+		${WRKSRC}/ortools/base/logging.h
 
 do-install: # by default cmake installs the whole or-tools project without the python part, so extract the wheel and install python files manually here
 	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
diff --git a/math/py-or-tools/distinfo b/math/py-or-tools/distinfo
index f3b496e5344c..300375641e49 100644
--- a/math/py-or-tools/distinfo
+++ b/math/py-or-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1672604938
-SHA256 (google-or-tools-v9.5_GH0.tar.gz) = 57f81b94949d35dc042690db3fa3f53245cffbf6824656e1a03f103a3623c939
-SIZE (google-or-tools-v9.5_GH0.tar.gz) = 14795911
+TIMESTAMP = 1678436391
+SHA256 (google-or-tools-v9.6_GH0.tar.gz) = bc4b07dc9c23f0cca43b1f5c889f08a59c8f2515836b03d4cc7e0f8f2c879234
+SIZE (google-or-tools-v9.6_GH0.tar.gz) = 19252960
diff --git a/math/py-or-tools/pkg-plist b/math/py-or-tools/pkg-plist
index 9fa42e4ba88a..92504e12116f 100644
--- a/math/py-or-tools/pkg-plist
+++ b/math/py-or-tools/pkg-plist
@@ -49,6 +49,8 @@
 %%PYTHON_SITELIBDIR%%/ortools/packing/vector_bin_packing_pb2.py
 %%PYTHON_SITELIBDIR%%/ortools/packing/vector_bin_packing_pb2.pyi
 %%PYTHON_SITELIBDIR%%/ortools/pdlp/__init__.py
+%%PYTHON_SITELIBDIR%%/ortools/pdlp/python/__init__.py
+%%PYTHON_SITELIBDIR%%/ortools/pdlp/python/pywrap_pdlp%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/ortools/pdlp/solve_log_pb2.py
 %%PYTHON_SITELIBDIR%%/ortools/pdlp/solve_log_pb2.pyi
 %%PYTHON_SITELIBDIR%%/ortools/pdlp/solvers_pb2.py
@@ -56,6 +58,8 @@
 %%PYTHON_SITELIBDIR%%/ortools/sat/__init__.py
 %%PYTHON_SITELIBDIR%%/ortools/sat/boolean_problem_pb2.py
 %%PYTHON_SITELIBDIR%%/ortools/sat/boolean_problem_pb2.pyi
+%%PYTHON_SITELIBDIR%%/ortools/sat/colab/__init__.py
+%%PYTHON_SITELIBDIR%%/ortools/sat/colab/visualization.py
 %%PYTHON_SITELIBDIR%%/ortools/sat/cp_model_pb2.py
 %%PYTHON_SITELIBDIR%%/ortools/sat/cp_model_pb2.pyi
 %%PYTHON_SITELIBDIR%%/ortools/sat/cp_model_service_pb2.py
@@ -64,7 +68,6 @@
 %%PYTHON_SITELIBDIR%%/ortools/sat/python/cp_model.py
 %%PYTHON_SITELIBDIR%%/ortools/sat/python/cp_model_helper.py
 %%PYTHON_SITELIBDIR%%/ortools/sat/python/swig_helper%%PYTHON_EXT_SUFFIX%%.so
-%%PYTHON_SITELIBDIR%%/ortools/sat/python/visualization.py
 %%PYTHON_SITELIBDIR%%/ortools/sat/sat_parameters_pb2.py
 %%PYTHON_SITELIBDIR%%/ortools/sat/sat_parameters_pb2.pyi
 %%PYTHON_SITELIBDIR%%/ortools/scheduling/__init__.py