Date: Thu, 8 Aug 2024 08:40:01 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: ce1c651a0d53 - main - math/or-tools: fix packaging with FLATZINC option and enable it back. Message-ID: <202408080840.4788e14V049765@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=ce1c651a0d53694ea59ea1d19f9eed4100bd56e2 commit ce1c651a0d53694ea59ea1d19f9eed4100bd56e2 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2024-08-08 08:39:10 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2024-08-08 08:39:10 +0000 math/or-tools: fix packaging with FLATZINC option and enable it back. --- math/or-tools/Makefile | 2 +- math/or-tools/pkg-plist | 37 +++++++++++++++++++++---------------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/math/or-tools/Makefile b/math/or-tools/Makefile index 907087ee5013..60276d788d65 100644 --- a/math/or-tools/Makefile +++ b/math/or-tools/Makefile @@ -39,7 +39,7 @@ CXXFLAGS+= -DABSL_LEGACY_THREAD_ANNOTATIONS CONFIGURE_ENV= UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE} OPTIONS_DEFINE= DOCS FLATZINC SCIP -#OPTIONS_DEFAULT= FLATZINC SCIP +OPTIONS_DEFAULT= FLATZINC # SCIP OPTIONS_SUB= yes FLATZINC_DESC= Build FlatZinc - MiniZinc interface diff --git a/math/or-tools/pkg-plist b/math/or-tools/pkg-plist index f398a995eafa..5745c8e2b392 100644 --- a/math/or-tools/pkg-plist +++ b/math/or-tools/pkg-plist @@ -1,4 +1,4 @@ -%%FLATZINC%%bin/fzn-ortools +%%FLATZINC%%bin/fzn-cp-sat bin/sat_runner bin/solve include/ortools/algorithms/binary_indexed_tree.h @@ -515,18 +515,23 @@ lib/libortools.so.9.8.9999 %%FLATZINC%%lib/libortools_flatzinc.so %%FLATZINC%%lib/libortools_flatzinc.so.9 %%FLATZINC%%lib/libortools_flatzinc.so.9.8.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 +%%FLATZINC%%share/minizinc/cpsat/fzn_all_different_int.mzn +%%FLATZINC%%share/minizinc/cpsat/fzn_circuit.mzn +%%FLATZINC%%share/minizinc/cpsat/fzn_cumulative.mzn +%%FLATZINC%%share/minizinc/cpsat/fzn_cumulative_opt.mzn +%%FLATZINC%%share/minizinc/cpsat/fzn_diffn.mzn +%%FLATZINC%%share/minizinc/cpsat/fzn_diffn_nonstrict.mzn +%%FLATZINC%%share/minizinc/cpsat/fzn_disjunctive.mzn +%%FLATZINC%%share/minizinc/cpsat/fzn_disjunctive_opt.mzn +%%FLATZINC%%share/minizinc/cpsat/fzn_disjunctive_strict.mzn +%%FLATZINC%%share/minizinc/cpsat/fzn_disjunctive_strict_opt.mzn +%%FLATZINC%%share/minizinc/cpsat/fzn_inverse.mzn +%%FLATZINC%%share/minizinc/cpsat/fzn_network_flow.mzn +%%FLATZINC%%share/minizinc/cpsat/fzn_network_flow_cost.mzn +%%FLATZINC%%share/minizinc/cpsat/fzn_regular.mzn +%%FLATZINC%%share/minizinc/cpsat/fzn_subcircuit.mzn +%%FLATZINC%%share/minizinc/cpsat/fzn_table_bool.mzn +%%FLATZINC%%share/minizinc/cpsat/fzn_table_int.mzn +%%FLATZINC%%share/minizinc/cpsat/nostrings.mzn +%%FLATZINC%%share/minizinc/cpsat/redefinitions-2.0.mzn +%%FLATZINC%%share/minizinc/solvers/cpsat.msc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408080840.4788e14V049765>