From nobody Thu Aug 08 15:53:56 2024 X-Original-To: dev-commits-ports-main@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 4Wfs6D5jYlz5T6S0; Thu, 08 Aug 2024 15:53:56 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wfs6D59rDz4JpF; Thu, 8 Aug 2024 15:53:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723132436; 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=ifahU+q6vZZy4hL6rul5nKCGn5IAAYMy3mFJl0oVbaA=; b=rpkwnypU0KxXrXpgoLGSqMPRFBeIT7JRu8P6Ulfr3B+2QxXU0ZpVIa4qAZSYTDEm9JuDsw LEDlexD4D7YB98+Cjsn3oOQbSATr+WSDIbPF2Zo1l/s4A65cYODsCi1USPUhB/FQdI8TBD IPwZ5LaSgNJYSxpeXHR6MOt8SNjFwFkBuZdRcgywbCLHJWb1M9rzA5wJ6knStY1g/Tkc+f 4+f5R9oFREYpXkDuSOhfgHMv1icxxp3G0kzoQ7/hYwZT/82wvHudC3CVH9VHVV0WsWYXvm KQ2iws4hLMi5yiAUSjrVUzpieYYPJI981gtuVKJ+b9FZ6SYbCF73RHwUME95gA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723132436; a=rsa-sha256; cv=none; b=LIPoa7J9Ncxbx5/LYAEH5RnL0BySM0wPUyerjGfOSzpr9uThkYYjEMqz7ZI3L94zFp0s+J Flqf+qwU+xx7ZryodbVIIWUu2KEyXMl0JhXW3MVKtfeRqW8Mu+EZm6AJ0NFq9fQddfi7EZ LFg4USFe4k68EsTROV4Am27+3/I+ZuKffD/739dvjZEjmcHbBNo8QNpaw3GlCHBm+0OK3q NlVP9NX0tlQJy+qJtTV2IRTJFaWuh8oCJC7MZbvDZGNcrQnY24804RfBT6nmQ6rZgmUOSH iCYeGmXlQ32TUYm5cyzrB7eEcvaYnqVBeRVNvxWP0J4X2Azs5xxxCSdkzBBMpg== 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=1723132436; 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=ifahU+q6vZZy4hL6rul5nKCGn5IAAYMy3mFJl0oVbaA=; b=bCCAelhVZJZp0hUte6eRw43Tk3MEtGMbhCR774MgqxchHq2REWp+3mm2Kb37DFvMwCeFbo DxL25crsP1zsoZ1+wgnrBfhuS4Ly0xNkDkva+ML+LErKrHm0n7LS9hcVgleLPVJcpMT/A+ yhlKq6MDGA4QaG5DGsEwij/3ATxypLu4/BV4sdvY6MIDHIS8SuwTggKGRmeoCy3CDztcUs AtzzgXRJ6bUUqeZjwPvu9Ojk2chxH2kD7ybVEtnn/EhLqz0dL1+BPCG89vD9TAZZK9zMzr GzWGnPARJq3yaLZPDxTE56jF9pH3sP6YL98OlqyM7glUmxzaTKfKsN7joGK7gQ== 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 4Wfs6D4dzgzg05; Thu, 8 Aug 2024 15:53:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 478FruV4091757; Thu, 8 Aug 2024 15:53:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 478FruGD091754; Thu, 8 Aug 2024 15:53:56 GMT (envelope-from git) Date: Thu, 8 Aug 2024 15:53:56 GMT Message-Id: <202408081553.478FruGD091754@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: b50e289ad39d - main - math/py-or-tools: the port had been updated to version 9.6 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b50e289ad39de7c7a91c9bc43614931237952afb Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=b50e289ad39de7c7a91c9bc43614931237952afb commit b50e289ad39de7c7a91c9bc43614931237952afb Author: Alexey Dokuchaev AuthorDate: 2024-08-08 15:52:46 +0000 Commit: Alexey Dokuchaev 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