Skip to content

Commit

Permalink
math/or-tools: Update 8.2 -> 9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
yurivict committed Sep 13, 2021
1 parent 5ac8e1a commit 9186361
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 16 deletions.
14 changes: 7 additions & 7 deletions 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
Expand All @@ -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 \
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions 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
56 changes: 50 additions & 6 deletions math/or-tools/pkg-plist
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 9186361

Please sign in to comment.