diff --git a/math/or-tools/Makefile b/math/or-tools/Makefile index c6f0ef40a9e5..b092bc4f6400 100644 --- a/math/or-tools/Makefile +++ b/math/or-tools/Makefile @@ -1,55 +1,57 @@ PORTNAME= or-tools DISTVERSIONPREFIX= v -DISTVERSION= 9.1 +DISTVERSION= 9.2 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org 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 \ libprotobuf.so:devel/protobuf -USES= blaslapack cmake compiler:c++17-lang pkgconfig +USES= blaslapack cmake:testing compiler:c++17-lang pkgconfig USE_GITHUB= yes GH_ACCOUNT= google USE_LDCONFIG= yes CMAKE_OFF= BUILD_PYTHON BUILD_DEPS INSTALL_BUILD_DEPS BUILD_EXAMPLES BUILD_SAMPLES CMAKE_ON= BUILD_CXX +CMAKE_TESTING_ON= BUILD_EXAMPLES BUILD_CXX_EXAMPLES + CONFIGURE_ENV= UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE} OPTIONS_DEFINE= FLATZINC SCIP OPTIONS_DEFAULT= FLATZINC #SCIP OPTIONS_SUB= yes FLATZINC_DESC= Build FlatZinc - MiniZinc interface FLATZINC_CMAKE_BOOL= BUILD_FLATZINC SCIP_DESC= Use the SCIP solver # SCIP package isn't built because of licensing restrictions 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 post-install: @${FIND} ${STAGEDIR}${PREFIX} -type d -empty -delete .include diff --git a/math/or-tools/distinfo b/math/or-tools/distinfo index 90b53a5ca9c3..0ab443a1a46e 100644 --- a/math/or-tools/distinfo +++ b/math/or-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1633363392 -SHA256 (google-or-tools-v9.1_GH0.tar.gz) = b51ca3b08f768de5a0c1029f7127264640e50d9c7b83383a175109ef213bd307 -SIZE (google-or-tools-v9.1_GH0.tar.gz) = 245524168 +TIMESTAMP = 1639967041 +SHA256 (google-or-tools-v9.2_GH0.tar.gz) = 5337935ea1fa010bb62cf0fc8bedd6de07dda77bff3db7a0f6a36c84c7bd58db +SIZE (google-or-tools-v9.2_GH0.tar.gz) = 246278500 diff --git a/math/or-tools/pkg-plist b/math/or-tools/pkg-plist index bf378b323d8d..a3b4846297e4 100644 --- a/math/or-tools/pkg-plist +++ b/math/or-tools/pkg-plist @@ -1,360 +1,361 @@ %%FLATZINC%%bin/fz include/ortools/algorithms/dense_doubly_linked_list.h include/ortools/algorithms/dynamic_partition.h include/ortools/algorithms/dynamic_permutation.h include/ortools/algorithms/find_graph_symmetries.h include/ortools/algorithms/hungarian.h include/ortools/algorithms/knapsack_solver.h include/ortools/algorithms/knapsack_solver_for_cuts.h include/ortools/algorithms/sparse_permutation.h include/ortools/base/accurate_sum.h include/ortools/base/adjustable_priority_queue-inl.h include/ortools/base/adjustable_priority_queue.h include/ortools/base/base_export.h include/ortools/base/basictypes.h include/ortools/base/bitmap.h +include/ortools/base/case.h include/ortools/base/cleanup.h include/ortools/base/commandlineflags.h 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/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 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/protobuf_util.h include/ortools/base/protoutil.h include/ortools/base/ptr_util.h include/ortools/base/python-swig.h -include/ortools/base/random.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/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_vector.h include/ortools/base/sysinfo.h include/ortools/base/thorough_hash.h include/ortools/base/threadpool.h include/ortools/base/timer.h include/ortools/base/typeid.h include/ortools/base/version.h include/ortools/base/vlog_is_on.h include/ortools/bop/bop_base.h include/ortools/bop/bop_fs.h include/ortools/bop/bop_lns.h include/ortools/bop/bop_ls.h include/ortools/bop/bop_parameters.pb.h include/ortools/bop/bop_portfolio.h include/ortools/bop/bop_solution.h include/ortools/bop/bop_solver.h include/ortools/bop/bop_types.h include/ortools/bop/bop_util.h include/ortools/bop/complete_optimizer.h include/ortools/bop/integral_solver.h include/ortools/constraint_solver/assignment.pb.h 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 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 include/ortools/constraint_solver/solver_parameters.pb.h include/ortools/flatzinc/checker.h include/ortools/flatzinc/cp_model_fz_solver.h include/ortools/flatzinc/model.h include/ortools/flatzinc/parser.h include/ortools/flatzinc/parser_util.h include/ortools/flatzinc/presolve.h include/ortools/glop/basis_representation.h include/ortools/glop/dual_edge_norms.h include/ortools/glop/entering_variable.h include/ortools/glop/initial_basis.h include/ortools/glop/lp_solver.h 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 include/ortools/glop/revised_simplex.h 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/graph/assignment.h include/ortools/graph/christofides.h include/ortools/graph/cliques.h include/ortools/graph/connected_components.h include/ortools/graph/ebert_graph.h include/ortools/graph/eulerian_path.h include/ortools/graph/flow_problem.pb.h include/ortools/graph/graph.h include/ortools/graph/graphs.h include/ortools/graph/hamiltonian_path.h include/ortools/graph/io.h include/ortools/graph/iterators.h include/ortools/graph/linear_assignment.h include/ortools/graph/max_flow.h include/ortools/graph/min_cost_flow.h include/ortools/graph/minimum_spanning_tree.h include/ortools/graph/one_tree_lower_bound.h include/ortools/graph/perfect_matching.h include/ortools/graph/shortestpaths.h 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_proto_solver.h include/ortools/linear_solver/linear_expr.h include/ortools/linear_solver/linear_solver.h include/ortools/linear_solver/linear_solver.pb.h 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/sat_proto_solver.h include/ortools/linear_solver/sat_solver_utils.h include/ortools/linear_solver/scip_callback.h include/ortools/linear_solver/scip_helper_macros.h include/ortools/linear_solver/scip_proto_solver.h include/ortools/lp_data/lp_data.h include/ortools/lp_data/lp_data_utils.h include/ortools/lp_data/lp_decomposer.h +include/ortools/lp_data/lp_parser.h include/ortools/lp_data/lp_print_utils.h include/ortools/lp_data/lp_types.h include/ortools/lp_data/lp_utils.h include/ortools/lp_data/matrix_scaler.h include/ortools/lp_data/matrix_utils.h include/ortools/lp_data/model_reader.h include/ortools/lp_data/mps_reader.h include/ortools/lp_data/permutation.h include/ortools/lp_data/proto_utils.h include/ortools/lp_data/scattered_vector.h 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/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/solver.h include/ortools/math_opt/core/solver_interface.h include/ortools/math_opt/core/sparse_collection_matchers.h include/ortools/math_opt/core/sparse_vector_view.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/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/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/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/packing/arc_flow_builder.h include/ortools/packing/arc_flow_solver.h include/ortools/packing/vector_bin_packing.pb.h include/ortools/packing/vector_bin_packing_parser.h include/ortools/port/file.h include/ortools/port/proto_utils.h include/ortools/port/sysinfo.h include/ortools/port/utf8.h include/ortools/sat/all_different.h include/ortools/sat/boolean_problem.h include/ortools/sat/boolean_problem.pb.h include/ortools/sat/circuit.h include/ortools/sat/clause.h include/ortools/sat/cp_constraints.h include/ortools/sat/cp_model.h include/ortools/sat/cp_model.pb.h include/ortools/sat/cp_model_checker.h include/ortools/sat/cp_model_expand.h include/ortools/sat/cp_model_lns.h include/ortools/sat/cp_model_loader.h include/ortools/sat/cp_model_mapping.h include/ortools/sat/cp_model_objective.h include/ortools/sat/cp_model_postsolve.h include/ortools/sat/cp_model_presolve.h include/ortools/sat/cp_model_search.h include/ortools/sat/cp_model_service.pb.h include/ortools/sat/cp_model_solver.h include/ortools/sat/cp_model_symmetries.h include/ortools/sat/cp_model_utils.h include/ortools/sat/cumulative.h include/ortools/sat/cumulative_energy.h include/ortools/sat/cuts.h include/ortools/sat/diffn.h include/ortools/sat/diffn_util.h include/ortools/sat/disjunctive.h include/ortools/sat/drat_checker.h include/ortools/sat/drat_proof_handler.h 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/integer.h include/ortools/sat/integer_expr.h include/ortools/sat/integer_search.h include/ortools/sat/intervals.h include/ortools/sat/lb_tree_search.h include/ortools/sat/linear_constraint.h 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/model.h include/ortools/sat/optimization.h include/ortools/sat/parameters_validation.h include/ortools/sat/pb_constraint.h include/ortools/sat/precedences.h include/ortools/sat/presolve_context.h include/ortools/sat/presolve_util.h include/ortools/sat/probing.h include/ortools/sat/pseudo_costs.h include/ortools/sat/restart.h include/ortools/sat/rins.h include/ortools/sat/sat_base.h include/ortools/sat/sat_decision.h include/ortools/sat/sat_inprocessing.h include/ortools/sat/sat_parameters.pb.h include/ortools/sat/sat_solver.h include/ortools/sat/scheduling_constraints.h include/ortools/sat/scheduling_cuts.h include/ortools/sat/simplification.h include/ortools/sat/subsolver.h include/ortools/sat/swig_helper.h include/ortools/sat/symmetry.h include/ortools/sat/symmetry_util.h include/ortools/sat/synchronization.h include/ortools/sat/table.h include/ortools/sat/theta_tree.h include/ortools/sat/timetable.h 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/jobshop_scheduling.pb.h include/ortools/scheduling/jobshop_scheduling_parser.h include/ortools/scheduling/rcpsp.pb.h include/ortools/scheduling/rcpsp_parser.h include/ortools/util/adaptative_parameter_value.h 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/fp_utils.h include/ortools/util/functions_swig_helpers.h 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 include/ortools/util/piecewise_linear_function.h include/ortools/util/proto_tools.h include/ortools/util/random_engine.h include/ortools/util/range_minimum_query.h include/ortools/util/range_query_function.h include/ortools/util/rational_approximation.h include/ortools/util/return_macros.h include/ortools/util/rev.h include/ortools/util/running_stat.h include/ortools/util/saturated_arithmetic.h 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/string_array.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/ortoolsConfig.cmake 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.9 -%%FLATZINC%%lib/libflatzinc.so.9.1.9999 +lib/libflatzinc.so +lib/libflatzinc.so.9 +lib/libflatzinc.so.9.2.9999 lib/libortools.so lib/libortools.so.9 -lib/libortools.so.9.1.9999 +lib/libortools.so.9.2.9999 %%FLATZINC%%share/minizinc/ortools/fzn_all_different_int.mzn %%FLATZINC%%share/minizinc/ortools/fzn_circuit.mzn %%FLATZINC%%share/minizinc/ortools/fzn_cumulative.mzn %%FLATZINC%%share/minizinc/ortools/fzn_diffn.mzn %%FLATZINC%%share/minizinc/ortools/fzn_diffn_nonstrict.mzn %%FLATZINC%%share/minizinc/ortools/fzn_inverse.mzn %%FLATZINC%%share/minizinc/ortools/fzn_network_flow.mzn %%FLATZINC%%share/minizinc/ortools/fzn_network_flow_cost.mzn %%FLATZINC%%share/minizinc/ortools/fzn_regular.mzn %%FLATZINC%%share/minizinc/ortools/fzn_subcircuit.mzn %%FLATZINC%%share/minizinc/ortools/fzn_table_bool.mzn %%FLATZINC%%share/minizinc/ortools/fzn_table_int.mzn %%FLATZINC%%share/minizinc/ortools/nostrings.mzn %%FLATZINC%%share/minizinc/ortools/redefinitions-2.0.mzn %%FLATZINC%%share/minizinc/solvers/ortools.msc diff --git a/math/py-or-tools/Makefile b/math/py-or-tools/Makefile index 6620f812d36c..623d97c15228 100644 --- a/math/py-or-tools/Makefile +++ b/math/py-or-tools/Makefile @@ -1,83 +1,79 @@ PORTNAME= or-tools DISTVERSIONPREFIX= v -DISTVERSION= 9.1 +DISTVERSION= 9.2 CATEGORIES= math PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ -PATCHFILES= c68ae78b1d78406dc4379afcacbfb156492c80c0.patch:-p1 # fixes https://github.com/google/or-tools/issues/2526 -PATCHFILES+= 3bbe33d9776c8f200a3296344e7df7bdf91188fe.patch:-p1 # fixes https://github.com/google/or-tools/issues/2814 - MAINTAINER= yuri@FreeBSD.org COMMENT= Google's Operations Research tools (Python binding) LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE-2.0.txt BROKEN_i386= SWIG wrapped code invalid in 32 bit architecture, regenerate code using -DSWIGWORDSIZE32 # see https://github.com/google/or-tools/issues/2130 -PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}absl-py>0:devel/py-absl-py@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mypy-protobuf>0:devel/py-mypy-protobuf@${PY_FLAVOR} \ +PY_DEPENDS= ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}absl-py>0:devel/py-absl-py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} \ protoc-gen-mypy:devel/py-mypy-protobuf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}virtualenv>0:devel/py-virtualenv@${PY_FLAVOR} \ swig:devel/swig LIB_DEPENDS= libabsl_base.so:devel/abseil \ libCbc.so:math/cbc \ libCgl.so:math/cgl \ libcoinasl.so:math/asl \ libcoinmumps.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 \ libprotobuf.so:devel/protobuf RUN_DEPENDS= ${PY_DEPENDS} USES= blaslapack cmake:insource compiler:c++17-lang pkgconfig python:3.6+ USE_PYTHON= flavors USE_GITHUB= yes GH_ACCOUNT= google CMAKE_OFF= BUILD_DEPS INSTALL_BUILD_DEPS BUILD_TESTING BUILD_EXAMPLES CMAKE_ON= BUILD_PYTHON CMAKE_ARGS= -DSWIG_EXECUTABLE=${LOCALBASE}/bin/swig -DFREEBSD_PYTHON_VER=${PYTHON_VER} CONFIGURE_ENV= UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE} BUILD_ENV= UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE} OPTIONS_DEFINE= SCIP SCIP_DESC= Use the SCIP solver # SCIP package isn't built because of licensing restrictions 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 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} cd ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} && \ unzip ${BUILD_WRKSRC}/python/dist/ortools-${DISTVERSION}*.whl && \ ${RM} -rf ortools-*.dist-info ${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name "*.so" -o -name "*.so.*" | ${XARGS} ${STRIP_CMD} do-test: install .for e in arc_flow_cutting_stock_sat.py bus_driver_scheduling_sat.py cover_rectangle_sat.py cvrptw_plot.py qubo_sat.py # list is from examples/python/CMakeLists.txt @cd ${WRKSRC}/examples/python && \ ${ECHO} "==> Running ${PORTNAME} test ${e} ..." && \ ${PYTHON_CMD} ${e} && \ ${ECHO} "... test ${e} succeeded" .endfor .include diff --git a/math/py-or-tools/distinfo b/math/py-or-tools/distinfo index 93a796e356b3..c08313ca51fe 100644 --- a/math/py-or-tools/distinfo +++ b/math/py-or-tools/distinfo @@ -1,7 +1,3 @@ -TIMESTAMP = 1633451473 -SHA256 (google-or-tools-v9.1_GH0.tar.gz) = b51ca3b08f768de5a0c1029f7127264640e50d9c7b83383a175109ef213bd307 -SIZE (google-or-tools-v9.1_GH0.tar.gz) = 245524168 -SHA256 (c68ae78b1d78406dc4379afcacbfb156492c80c0.patch) = c073b783b1923da1f63f5f4f089aac20213b7e8bdb8ef0ccfa94ba4f6190b87b -SIZE (c68ae78b1d78406dc4379afcacbfb156492c80c0.patch) = 680 -SHA256 (3bbe33d9776c8f200a3296344e7df7bdf91188fe.patch) = 1b4e3d25d019877e5622acbf69367e0e615c88f45bb336c20fffedf74786be50 -SIZE (3bbe33d9776c8f200a3296344e7df7bdf91188fe.patch) = 2778 +TIMESTAMP = 1639979871 +SHA256 (google-or-tools-v9.2_GH0.tar.gz) = 5337935ea1fa010bb62cf0fc8bedd6de07dda77bff3db7a0f6a36c84c7bd58db +SIZE (google-or-tools-v9.2_GH0.tar.gz) = 246278500 diff --git a/math/py-or-tools/files/patch-cmake_python.cmake b/math/py-or-tools/files/patch-cmake_python.cmake index a8ffda0d7611..8e5e3e4d5f7b 100644 --- a/math/py-or-tools/files/patch-cmake_python.cmake +++ b/math/py-or-tools/files/patch-cmake_python.cmake @@ -1,20 +1,23 @@ ---- cmake/python.cmake.orig 2021-10-01 03:13:58 UTC +--- cmake/python.cmake.orig 2021-12-14 20:57:53 UTC +++ cmake/python.cmake @@ -23,7 +23,7 @@ if(UNIX AND NOT APPLE) endif() # Find Python 3 -find_package(Python3 REQUIRED COMPONENTS Interpreter Development.Module) +find_package(Python3 ${FREEBSD_PYTHON_VER} REQUIRED EXACT COMPONENTS Interpreter Development.Module) list(APPEND CMAKE_SWIG_FLAGS "-py3" "-DPY3") - # Find if python module MODULE_NAME is available, -@@ -214,7 +214,7 @@ if(BUILD_TESTING) - COMMAND ${VENV_EXECUTABLE} ${VENV_DIR} - # Must not call it in a folder containing the setup.py otherwise pip call it + # Find if the python module is available, +@@ -294,9 +294,9 @@ if(BUILD_TESTING) + #COMMAND ${VENV_EXECUTABLE} ${VENV_DIR} + # Must NOT call it in a folder containing the setup.py otherwise pip call it # (i.e. "python setup.py bdist") while we want to consume the wheel package -- COMMAND ${VENV_Python3_EXECUTABLE} -m pip install --find-links=${CMAKE_CURRENT_BINARY_DIR}/python/dist ${PROJECT_NAME} -+ COMMAND ${VENV_Python3_EXECUTABLE} -m pip install --no-index --find-links=${CMAKE_CURRENT_BINARY_DIR}/python/dist ${PROJECT_NAME} - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/test.py.in ${VENV_DIR}/test.py +- COMMAND ${VENV_Python3_EXECUTABLE} -m pip install --find-links=${CMAKE_CURRENT_BINARY_DIR}/python/dist ${PYTHON_PROJECT} ++ COMMAND ${VENV_Python3_EXECUTABLE} -m pip install --no-index --find-links=${CMAKE_CURRENT_BINARY_DIR}/python/dist ${PYTHON_PROJECT} + # install modules only required to run examples +- COMMAND ${VENV_Python3_EXECUTABLE} -m pip install pandas matplotlib ++ #COMMAND ${VENV_Python3_EXECUTABLE} -m pip install pandas matplotlib BYPRODUCTS ${VENV_DIR} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} VERBATIM) + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMENT "Create venv and install ${PYTHON_PROJECT}" diff --git a/math/py-or-tools/files/patch-ortools_python_setup.py.in b/math/py-or-tools/files/patch-ortools_python_setup.py.in index 16b2bc7ca247..b490847ca28a 100644 --- a/math/py-or-tools/files/patch-ortools_python_setup.py.in +++ b/math/py-or-tools/files/patch-ortools_python_setup.py.in @@ -1,15 +1,17 @@ See https://github.com/google/or-tools/issues/2305 ---- ortools/python/setup.py.in.orig 2021-10-01 03:13:58 UTC +--- ortools/python/setup.py.in.orig 2021-12-14 20:57:53 UTC +++ ortools/python/setup.py.in -@@ -42,8 +42,8 @@ setup( - version='@PROJECT_VERSION@', +@@ -43,9 +43,9 @@ setup( packages=find_packages(), + python_requires='>= 3.6', install_requires=[ -- 'protobuf >= 3.18.0', - 'absl-py >= 0.13', -+ #'protobuf >= 3.18.0', +- 'numpy >= 1.13.3', +- 'protobuf >= 3.19.1', + #'absl-py >= 0.13', ++ #'numpy >= 1.13.3', ++ #'protobuf >= 3.19.1', ], package_data={ '@PROJECT_NAME@':[$<$,SHARED_LIBRARY>:'.libs/*', '../$'>], diff --git a/math/py-or-tools/files/patch-tools_setup.py.in b/math/py-or-tools/files/patch-tools_setup.py.in index 1303279af5ec..02afbb69eed0 100644 --- a/math/py-or-tools/files/patch-tools_setup.py.in +++ b/math/py-or-tools/files/patch-tools_setup.py.in @@ -1,15 +1,17 @@ See https://github.com/google/or-tools/issues/2305 ---- tools/setup.py.in.orig 2021-10-01 03:13:58 UTC +--- tools/setup.py.in.orig 2021-12-14 20:57:53 UTC +++ tools/setup.py.in -@@ -42,8 +42,8 @@ setup( - version='VVVV', +@@ -43,9 +43,9 @@ setup( packages=find_packages(), + python_requires='>= 3.6', install_requires=[ -- 'protobuf >= 3.18.0', - 'absl-py >= 0.13', -+ #'protobuf >= 3.18.0', +- 'numpy >= 1.13.3', +- 'protobuf >= 3.19.1', + #'absl-py >= 0.13', ++ #'numpy >= 1.13.3', ++ #'protobuf >= 3.19.1', ], package_data={ 'ortools.init' : ['_pywrapinit.dll', '*.pyi'],