Skip to content

Commit

Permalink
math/{,py-}or-tools: Update 9.2 -> 9.4
Browse files Browse the repository at this point in the history 
Reported by:	portscout
  • Loading branch information
@yurivict
yurivict committed Sep 20, 2022
1 parent 40c39de commit e41c3e8
Show file tree
Hide file tree
Showing 10 changed files with 149 additions and 124 deletions.
24 changes: 12 additions & 12 deletions math/or-tools/Makefile
View file
@@ -1,15 +1,14 @@
PORTNAME= or-tools
DISTVERSIONPREFIX= v
DISTVERSION= 9.2
PORTREVISION= 6
DISTVERSION= 9.4
CATEGORIES= math

MAINTAINER= yuri@FreeBSD.org
COMMENT= Google's Operations Research tools
WWW= https://github.com/google/or-tools

LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE-2.0.txt
LICENSE_FILE= ${WRKSRC}/LICENSE

PATCH_DEPENDS= gsed:textproc/gsed
LIB_DEPENDS= libabsl_base.so:devel/abseil \
Expand All @@ -18,15 +17,16 @@ LIB_DEPENDS= libabsl_base.so:devel/abseil \
libcoinasl.so:math/asl \
libcoinmumps.so:math/coin-or-mumps \
libCoinUtils.so:math/coinutils \
libgflags.so:devel/gflags \
libglog.so:devel/glog \
libnauty.so:math/nauty \
libopenblas.so:math/openblas \
libOsi.so:math/osi \
libOsiClp.so:math/clp \
libgflags.so:devel/gflags \
libglog.so:devel/glog \
libprotobuf.so:devel/protobuf
libprotobuf.so:devel/protobuf \
libre2.so:devel/re2

USES= blaslapack cmake:testing compiler:c++17-lang pkgconfig
USES= blaslapack cmake:testing compiler:c++17-lang eigen:3 pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= google
USE_LDCONFIG= yes
Expand All @@ -37,7 +37,7 @@ CMAKE_TESTING_ON= BUILD_EXAMPLES BUILD_CXX_EXAMPLES

CONFIGURE_ENV= UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE}

OPTIONS_DEFINE= FLATZINC SCIP
OPTIONS_DEFINE= DOCS FLATZINC SCIP
OPTIONS_DEFAULT= FLATZINC #SCIP
OPTIONS_SUB= yes

Expand All @@ -48,10 +48,10 @@ SCIP_DESC= Use the SCIP solver # SCIP package isn't built because of licensing
SCIP_CMAKE_BOOL= USE_SCIP
SCIP_LIB_DEPENDS= libscip.so:math/SCIP

post-patch:
# fix for https://github.com/google/or-tools/issues/2526 suggested there
@gsed -i '11i \ \ LINKER_LANGUAGE Cxx' \
${WRKSRC}/ortools/init/CMakeLists.txt
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:S/-//}
PORTDOCS= *

# 4 tests are known to fail, see https://github.com/google/or-tools/issues/3429

post-install:
@${FIND} ${STAGEDIR}${PREFIX} -type d -empty -delete
Expand Down
6 changes: 3 additions & 3 deletions math/or-tools/distinfo
View file
@@ -1,3 +1,3 @@
TIMESTAMP = 1639967041
SHA256 (google-or-tools-v9.2_GH0.tar.gz) = 5337935ea1fa010bb62cf0fc8bedd6de07dda77bff3db7a0f6a36c84c7bd58db
SIZE (google-or-tools-v9.2_GH0.tar.gz) = 246278500
TIMESTAMP = 1660340684
SHA256 (google-or-tools-v9.4_GH0.tar.gz) = 180fbc45f6e5ce5ff153bea2df0df59b15346f2a7f8ffbd7cb4aed0fb484b8f6
SIZE (google-or-tools-v9.4_GH0.tar.gz) = 14411489
15 changes: 0 additions & 15 deletions math/or-tools/files/patch-makefiles_Makefile.dotnet.mk
View file

This file was deleted.

21 changes: 0 additions & 21 deletions math/or-tools/files/patch-makefiles_Makefile.third__party.unix.mk
View file

This file was deleted.

105 changes: 90 additions & 15 deletions math/or-tools/pkg-plist
View file
@@ -1,4 +1,4 @@
%%FLATZINC%%bin/fz
%%FLATZINC%%bin/fzn-ortools
include/ortools/algorithms/dense_doubly_linked_list.h
include/ortools/algorithms/dynamic_partition.h
include/ortools/algorithms/dynamic_permutation.h
Expand All @@ -20,9 +20,10 @@ include/ortools/base/container_logging.h
include/ortools/base/dynamic_library.h
include/ortools/base/encodingutils.h
include/ortools/base/file.h
include/ortools/base/filelineiter.h
include/ortools/base/gzipstring.h
include/ortools/base/hash.h
include/ortools/base/helpers.h
include/ortools/base/init_google.h
include/ortools/base/int_type.h
include/ortools/base/integral_types.h
include/ortools/base/iterator_adaptors.h
Expand All @@ -31,24 +32,29 @@ include/ortools/base/linked_hash_map.h
include/ortools/base/log_severity.h
include/ortools/base/logging.h
include/ortools/base/logging_export.h
include/ortools/base/logging_extensions.h
include/ortools/base/logging_flags.h
include/ortools/base/logging_utilities.h
include/ortools/base/macros.h
include/ortools/base/map_util.h
include/ortools/base/mathutil.h
include/ortools/base/murmur.h
include/ortools/base/path.h
include/ortools/base/protobuf_util.h
include/ortools/base/protoutil.h
include/ortools/base/ptr_util.h
include/ortools/base/python-swig.h
include/ortools/base/raw_logging.h
include/ortools/base/recordio.h
include/ortools/base/small_map.h
include/ortools/base/small_ordered_set.h
include/ortools/base/source_location.h
include/ortools/base/status_builder.h
include/ortools/base/status_macros.h
include/ortools/base/stl_logging.h
include/ortools/base/stl_util.h
include/ortools/base/strong_int.h
include/ortools/base/strong_vector.h
include/ortools/base/strtoint.h
include/ortools/base/sysinfo.h
include/ortools/base/thorough_hash.h
include/ortools/base/threadpool.h
Expand All @@ -73,7 +79,6 @@ include/ortools/constraint_solver/constraint_solver.h
include/ortools/constraint_solver/constraint_solveri.h
include/ortools/constraint_solver/demon_profiler.pb.h
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
Expand Down Expand Up @@ -112,6 +117,9 @@ include/ortools/glop/status.h
include/ortools/glop/update_row.h
include/ortools/glop/variable_values.h
include/ortools/glop/variables_info.h
include/ortools/glpk/glpk_computational_form.h
include/ortools/glpk/glpk_env_deleter.h
include/ortools/glpk/glpk_formatters.h
include/ortools/graph/assignment.h
include/ortools/graph/christofides.h
include/ortools/graph/cliques.h
Expand Down Expand Up @@ -151,6 +159,7 @@ include/ortools/linear_solver/linear_solver_callback.h
include/ortools/linear_solver/model_exporter.h
include/ortools/linear_solver/model_exporter_swig_helper.h
include/ortools/linear_solver/model_validator.h
include/ortools/linear_solver/pdlp_proto_solver.h
include/ortools/linear_solver/sat_proto_solver.h
include/ortools/linear_solver/sat_solver_utils.h
include/ortools/linear_solver/scip_callback.h
Expand All @@ -174,47 +183,101 @@ 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/core/indexed_model.h
include/ortools/math_opt/constraints/quadratic/validator.h
include/ortools/math_opt/constraints/sos/validator.h
include/ortools/math_opt/core/arrow_operator_proxy.h
include/ortools/math_opt/core/inverted_bounds.h
include/ortools/math_opt/core/math_opt_proto_utils.h
include/ortools/math_opt/core/model_summary.h
include/ortools/math_opt/core/model_update_merge.h
include/ortools/math_opt/core/non_streamable_solver_init_arguments.h
include/ortools/math_opt/core/solve_interrupter.h
include/ortools/math_opt/core/solver.h
include/ortools/math_opt/core/solver_debug.h
include/ortools/math_opt/core/solver_interface.h
include/ortools/math_opt/core/sparse_collection_matchers.h
include/ortools/math_opt/core/sparse_submatrix.h
include/ortools/math_opt/core/sparse_vector.h
include/ortools/math_opt/core/sparse_vector_view.h
include/ortools/math_opt/cpp/arrow_operator_proxy.h
include/ortools/math_opt/cpp/basis_status.h
include/ortools/math_opt/cpp/callback.h
include/ortools/math_opt/cpp/enums.h
include/ortools/math_opt/cpp/formatters.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/matchers.h
include/ortools/math_opt/cpp/math_opt.h
include/ortools/math_opt/cpp/message_callback.h
include/ortools/math_opt/cpp/model.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/parameters.h
include/ortools/math_opt/cpp/solution.h
include/ortools/math_opt/cpp/solve.h
include/ortools/math_opt/cpp/solve_arguments.h
include/ortools/math_opt/cpp/solve_result.h
include/ortools/math_opt/cpp/solver_init_arguments.h
include/ortools/math_opt/cpp/sparse_containers.h
include/ortools/math_opt/cpp/statistics.h
include/ortools/math_opt/cpp/streamable_solver_init_arguments.h
include/ortools/math_opt/cpp/update_tracker.h
include/ortools/math_opt/cpp/variable_and_expressions.h
include/ortools/math_opt/io/mps_converter.h
include/ortools/math_opt/io/names_removal.h
include/ortools/math_opt/io/proto_converter.h
include/ortools/math_opt/solvers/cp_sat_solver.h
include/ortools/math_opt/solvers/glop_solver.h
include/ortools/math_opt/solvers/glpk/glpk_sparse_vector.h
include/ortools/math_opt/solvers/glpk/rays.h
include/ortools/math_opt/solvers/glpk_solver.h
include/ortools/math_opt/solvers/gscip_solver.h
include/ortools/math_opt/solvers/gscip_solver_callback.h
include/ortools/math_opt/solvers/gscip_solver_message_callback_handler.h
include/ortools/math_opt/solvers/gurobi/g_gurobi.h
include/ortools/math_opt/solvers/gurobi_callback.h
include/ortools/math_opt/solvers/gurobi_init_arguments.h
include/ortools/math_opt/solvers/gurobi_solver.h
include/ortools/math_opt/solvers/message_callback_data.h
include/ortools/math_opt/solvers/pdlp_bridge.h
include/ortools/math_opt/solvers/pdlp_solver.h
include/ortools/math_opt/storage/model_storage.h
include/ortools/math_opt/storage/model_storage_types.h
include/ortools/math_opt/storage/sparse_matrix.h
include/ortools/math_opt/storage/update_trackers.h
include/ortools/math_opt/validators/callback_validator.h
include/ortools/math_opt/validators/enum_sets.h
include/ortools/math_opt/validators/ids_validator.h
include/ortools/math_opt/validators/linear_expression_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/result_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/solve_parameters_validator.h
include/ortools/math_opt/validators/solve_stats_validator.h
include/ortools/math_opt/validators/sparse_matrix_validator.h
include/ortools/math_opt/validators/sparse_vector_validator.h
include/ortools/model_builder/wrappers/model_builder_helper.h
include/ortools/packing/arc_flow_builder.h
include/ortools/packing/arc_flow_solver.h
include/ortools/packing/binpacking_2d_parser.h
include/ortools/packing/multiple_dimensions_bin_packing.pb.h
include/ortools/packing/vector_bin_packing.pb.h
include/ortools/packing/vector_bin_packing_parser.h
include/ortools/pdlp/iteration_stats.h
include/ortools/pdlp/primal_dual_hybrid_gradient.h
include/ortools/pdlp/quadratic_program.h
include/ortools/pdlp/quadratic_program_io.h
include/ortools/pdlp/sharded_optimization_utils.h
include/ortools/pdlp/sharded_quadratic_program.h
include/ortools/pdlp/sharder.h
include/ortools/pdlp/solve_log.pb.h
include/ortools/pdlp/solvers.pb.h
include/ortools/pdlp/solvers_proto_validation.h
include/ortools/pdlp/termination.h
include/ortools/pdlp/test_util.h
include/ortools/pdlp/trust_region.h
include/ortools/port/file.h
include/ortools/port/proto_utils.h
include/ortools/port/sysinfo.h
Expand Down Expand Up @@ -252,6 +315,7 @@ include/ortools/sat/drat_writer.h
include/ortools/sat/encoding.h
include/ortools/sat/feasibility_pump.h
include/ortools/sat/implied_bounds.h
include/ortools/sat/inclusion.h
include/ortools/sat/integer.h
include/ortools/sat/integer_expr.h
include/ortools/sat/integer_search.h
Expand All @@ -262,6 +326,7 @@ include/ortools/sat/linear_constraint_manager.h
include/ortools/sat/linear_programming_constraint.h
include/ortools/sat/linear_relaxation.h
include/ortools/sat/lp_utils.h
include/ortools/sat/max_hs.h
include/ortools/sat/model.h
include/ortools/sat/optimization.h
include/ortools/sat/parameters_validation.h
Expand Down Expand Up @@ -293,6 +358,7 @@ include/ortools/sat/timetable_edgefinding.h
include/ortools/sat/util.h
include/ortools/sat/var_domination.h
include/ortools/sat/zero_half_cuts.h
include/ortools/scheduling/course_scheduling.pb.h
include/ortools/scheduling/jobshop_scheduling.pb.h
include/ortools/scheduling/jobshop_scheduling_parser.h
include/ortools/scheduling/rcpsp.pb.h
Expand All @@ -302,6 +368,8 @@ include/ortools/util/affine_relation.h
include/ortools/util/bitset.h
include/ortools/util/cached_log.h
include/ortools/util/file_util.h
include/ortools/util/filelineiter.h
include/ortools/util/fp_roundtrip_conv.h
include/ortools/util/fp_utils.h
include/ortools/util/functions_swig_helpers.h
include/ortools/util/functions_swig_test_helpers.h
Expand All @@ -326,24 +394,31 @@ include/ortools/util/sigint.h
include/ortools/util/sort.h
include/ortools/util/sorted_interval_list.h
include/ortools/util/stats.h
include/ortools/util/status_macros.h
include/ortools/util/string_array.h
include/ortools/util/string_util.h
include/ortools/util/strong_integers.h
include/ortools/util/testing_utils.h
include/ortools/util/time_limit.h
include/ortools/util/tuple_set.h
include/ortools/util/vector_map.h
include/ortools/util/vector_or_function.h
include/ortools/util/zvector.h
include/ortools_export.h
lib/cmake/ortools/modules/FindCbc.cmake
lib/cmake/ortools/modules/FindClp.cmake
lib/cmake/ortools/modules/FindEigen3.cmake
lib/cmake/ortools/modules/Findre2.cmake
lib/cmake/ortools/ortoolsConfig.cmake
lib/cmake/ortools/ortoolsConfigVersion.cmake
lib/cmake/ortools/ortoolsTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/ortools/ortoolsTargets.cmake
lib/libflatzinc.so
lib/libflatzinc.so.9
lib/libflatzinc.so.9.2.9999
lib/libortools.so
lib/libortools.so.9
lib/libortools.so.9.2.9999
lib/libortools.so.9.4.9999
%%FLATZINC%%lib/libortools_flatzinc.so
%%FLATZINC%%lib/libortools_flatzinc.so.9
%%FLATZINC%%lib/libortools_flatzinc.so.9.4.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 e41c3e8

Please sign in to comment.