From owner-dev-commits-ports-main@freebsd.org Mon Sep 13 08:24:36 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C9FE7677B98; Mon, 13 Sep 2021 08:24:36 +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 4H7KK04LT1z4gn3; Mon, 13 Sep 2021 08:24:36 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 7598223B57; Mon, 13 Sep 2021 08:24:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18D8OaE7039694; Mon, 13 Sep 2021 08:24:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18D8OaSJ039693; Mon, 13 Sep 2021 08:24:36 GMT (envelope-from git) Date: Mon, 13 Sep 2021 08:24:36 GMT Message-Id: <202109130824.18D8OaSJ039693@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 918636170141 - main - math/or-tools: Update 8.2 -> 9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 918636170141f6653d2a8262631cd70549c71924 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Sep 2021 08:24:36 -0000 The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=918636170141f6653d2a8262631cd70549c71924 commit 918636170141f6653d2a8262631cd70549c71924 Author: Yuri Victorovich AuthorDate: 2021-09-13 08:22:51 +0000 Commit: Yuri Victorovich CommitDate: 2021-09-13 08:23:28 +0000 math/or-tools: Update 8.2 -> 9.0 --- math/or-tools/Makefile | 14 ++++++------- math/or-tools/distinfo | 6 +++--- math/or-tools/pkg-plist | 56 +++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 60 insertions(+), 16 deletions(-) diff --git a/math/or-tools/Makefile b/math/or-tools/Makefile index d98dc5c70688..f120e7681230 100644 --- a/math/or-tools/Makefile +++ b/math/or-tools/Makefile @@ -1,7 +1,6 @@ PORTNAME= or-tools DISTVERSIONPREFIX= v -DISTVERSION= 8.2 -PORTREVISION= 2 +DISTVERSION= 9.0 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -10,13 +9,16 @@ COMMENT= Google's Operations Research tools LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE-2.0.txt +PATCH_DEPENDS= gsed:textproc/gsed LIB_DEPENDS= libabsl_base.so:devel/abseil \ libCbc.so:math/cbc \ libCgl.so:math/cgl \ libcoinasl.so:math/asl \ libcoinmetis.so:math/ipopt \ libCoinUtils.so:math/coinutils \ + libnauty.so:math/nauty \ libopenblas.so:math/openblas \ + libOsi.so:math/osi \ libOsiClp.so:math/clp \ libgflags.so:devel/gflags \ libglog.so:devel/glog \ @@ -43,11 +45,9 @@ SCIP_CMAKE_BOOL= USE_SCIP SCIP_LIB_DEPENDS= libscip.so:math/SCIP post-patch: - @${REINPLACE_CMD} -e '/absl::container/s,^,#,' \ - ${WRKSRC}/ortools/constraint_solver/CMakeLists.txt \ - ${WRKSRC}/ortools/glop/CMakeLists.txt \ - ${WRKSRC}/ortools/linear_solver/CMakeLists.txt \ - ${WRKSRC}/ortools/sat/CMakeLists.txt + # fix for https://github.com/google/or-tools/issues/2526 suggested there + @gsed -i '11i \ \ LINKER_LANGUAGE Cxx' \ + ${WRKSRC}/ortools/init/CMakeLists.txt post-install: @${FIND} ${STAGEDIR}${PREFIX} -type d -empty -delete diff --git a/math/or-tools/distinfo b/math/or-tools/distinfo index 7729f80565c2..8bb909cb2115 100644 --- a/math/or-tools/distinfo +++ b/math/or-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1614802562 -SHA256 (google-or-tools-v8.2_GH0.tar.gz) = cf40715fa5cfeee88e2c8f5583465182c8dedf60b4eb7c4a967b32ff61ac4302 -SIZE (google-or-tools-v8.2_GH0.tar.gz) = 236722388 +TIMESTAMP = 1631518052 +SHA256 (google-or-tools-v9.0_GH0.tar.gz) = fa7700b614ea2a5b2b6e37b76874bd2c3f04a80f03cbbf7871a2d2d5cd3a6091 +SIZE (google-or-tools-v9.0_GH0.tar.gz) = 239070483 diff --git a/math/or-tools/pkg-plist b/math/or-tools/pkg-plist index 523900ae8ffb..3eab60d274f3 100644 --- a/math/or-tools/pkg-plist +++ b/math/or-tools/pkg-plist @@ -26,6 +26,7 @@ include/ortools/base/int_type.h include/ortools/base/integral_types.h include/ortools/base/iterator_adaptors.h include/ortools/base/jniutil.h +include/ortools/base/linked_hash_map.h include/ortools/base/log_severity.h include/ortools/base/logging.h include/ortools/base/logging_export.h @@ -75,12 +76,14 @@ include/ortools/constraint_solver/java/javawrapcp_util.h include/ortools/constraint_solver/python/pywrapcp_util.h include/ortools/constraint_solver/routing.h include/ortools/constraint_solver/routing_enums.pb.h +include/ortools/constraint_solver/routing_filters.h include/ortools/constraint_solver/routing_flags.h include/ortools/constraint_solver/routing_index_manager.h include/ortools/constraint_solver/routing_lp_scheduling.h include/ortools/constraint_solver/routing_neighborhoods.h include/ortools/constraint_solver/routing_parameters.h include/ortools/constraint_solver/routing_parameters.pb.h +include/ortools/constraint_solver/routing_search.h include/ortools/constraint_solver/routing_types.h include/ortools/constraint_solver/search_limit.pb.h include/ortools/constraint_solver/search_stats.pb.h @@ -91,9 +94,10 @@ include/ortools/data/rcpsp.pb.h include/ortools/data/rcpsp_parser.h include/ortools/data/set_covering_data.h include/ortools/data/set_covering_parser.h +include/ortools/data/vector_bin_packing.pb.h +include/ortools/data/vector_bin_packing_parser.h include/ortools/flatzinc/checker.h include/ortools/flatzinc/cp_model_fz_solver.h -include/ortools/flatzinc/logging.h include/ortools/flatzinc/model.h include/ortools/flatzinc/parser.h include/ortools/flatzinc/parser_util.h @@ -107,6 +111,7 @@ include/ortools/glop/lu_factorization.h include/ortools/glop/markowitz.h include/ortools/glop/parameters.pb.h include/ortools/glop/preprocessor.h +include/ortools/glop/pricing.h include/ortools/glop/primal_edge_norms.h include/ortools/glop/rank_one_update.h include/ortools/glop/reduced_costs.h @@ -138,11 +143,14 @@ include/ortools/graph/strongly_connected_components.h include/ortools/graph/topologicalsorter.h include/ortools/graph/util.h include/ortools/gscip/gscip.h +include/ortools/gscip/gscip_event_handler.h include/ortools/gscip/gscip_ext.h +include/ortools/gscip/gscip_message_handler.h include/ortools/gscip/gscip_parameters.h include/ortools/gscip/legacy_scip_params.h +include/ortools/gurobi/environment.h +include/ortools/init/init.h include/ortools/linear_solver/glop_utils.h -include/ortools/linear_solver/gurobi_environment.h include/ortools/linear_solver/gurobi_proto_solver.h include/ortools/linear_solver/linear_expr.h include/ortools/linear_solver/linear_solver.h @@ -173,6 +181,41 @@ include/ortools/lp_data/sparse.h include/ortools/lp_data/sparse_column.h include/ortools/lp_data/sparse_row.h include/ortools/lp_data/sparse_vector.h +include/ortools/math_opt/cpp/arrow_operator_proxy.h +include/ortools/math_opt/cpp/callback.h +include/ortools/math_opt/cpp/id_map.h +include/ortools/math_opt/cpp/id_set.h +include/ortools/math_opt/cpp/key_types.h +include/ortools/math_opt/cpp/linear_constraint.h +include/ortools/math_opt/cpp/map_filter.h +include/ortools/math_opt/cpp/math_opt.h +include/ortools/math_opt/cpp/model_solve_parameters.h +include/ortools/math_opt/cpp/objective.h +include/ortools/math_opt/cpp/result.h +include/ortools/math_opt/cpp/variable_and_expressions.h +include/ortools/math_opt/indexed_model.h +include/ortools/math_opt/math_opt_proto_utils.h +include/ortools/math_opt/model_summary.h +include/ortools/math_opt/proto_converter.h +include/ortools/math_opt/solver.h +include/ortools/math_opt/solver_interface.h +include/ortools/math_opt/solvers/cp_sat_solver.h +include/ortools/math_opt/solvers/glop_solver.h +include/ortools/math_opt/solvers/gscip_solver.h +include/ortools/math_opt/solvers/gscip_solver_callback.h +include/ortools/math_opt/solvers/gurobi_callback.h +include/ortools/math_opt/solvers/gurobi_solver.h +include/ortools/math_opt/solvers/message_callback_data.h +include/ortools/math_opt/sparse_vector_view.h +include/ortools/math_opt/validators/callback_validator.h +include/ortools/math_opt/validators/ids_validator.h +include/ortools/math_opt/validators/model_parameters_validator.h +include/ortools/math_opt/validators/model_validator.h +include/ortools/math_opt/validators/name_validator.h +include/ortools/math_opt/validators/scalar_validator.h +include/ortools/math_opt/validators/solution_validator.h +include/ortools/math_opt/validators/solver_parameters_validator.h +include/ortools/math_opt/validators/sparse_vector_validator.h include/ortools/port/file.h include/ortools/port/proto_utils.h include/ortools/port/sysinfo.h @@ -257,6 +300,7 @@ include/ortools/util/functions_swig_test_helpers.h include/ortools/util/graph_export.h include/ortools/util/integer_pq.h include/ortools/util/lazy_mutable_copy.h +include/ortools/util/logging.h include/ortools/util/monoid_operation_tree.h include/ortools/util/optional_boolean.pb.h include/ortools/util/permutation.h @@ -287,11 +331,11 @@ lib/cmake/ortools/ortoolsConfigVersion.cmake lib/cmake/ortools/ortoolsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/ortools/ortoolsTargets.cmake %%FLATZINC%%lib/libflatzinc.so -%%FLATZINC%%lib/libflatzinc.so.8 -%%FLATZINC%%lib/libflatzinc.so.8.2.9999 +%%FLATZINC%%lib/libflatzinc.so.9 +%%FLATZINC%%lib/libflatzinc.so.9.0.9999 lib/libortools.so -lib/libortools.so.8 -lib/libortools.so.8.2.9999 +lib/libortools.so.9 +lib/libortools.so.9.0.9999 %%FLATZINC%%share/minizinc/ortools/fzn_all_different_int.mzn %%FLATZINC%%share/minizinc/ortools/fzn_circuit.mzn %%FLATZINC%%share/minizinc/ortools/fzn_cumulative.mzn