From nobody Thu Aug 08 08:40:01 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WfgTY1yyrz5Strn; Thu, 08 Aug 2024 08:40:01 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WfgTY1NzBz4plw; Thu, 8 Aug 2024 08:40:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723106401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HYSBSR+tndYcEQ6455fpX2V6huaBJkHeMy82IRGwMXA=; b=rPKUqhJYwfdHCXgALpuSIll9sUn+MbRRxrK1OpIH8ZHysSGFqULeYWBGtgwAPEUi7XsN9o WbUSFF4lUKm+oxXDn0KimKxdoQhWOBFIyphD7hW7U3QSglYx4oWN3NXIW6enqLwXehhgjg g4llcoec9kUKrDNNDtzeVwSLtC4Hh+jYtSxXUfM20kqRRAUOT9hGLBj+eDUS23RH4QS7IZ mIKoBeDLAq3aygVTfheh2uGaYuChkznAuOOcfjRauzYlFSCPI1PhO8hpXoJGpasg1FG3H5 XScWUulqYjA0aVcl0awBo0SWSQVhu0Vff+V+5ZxcWAfCzniDDYsbloBUhZ8jTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723106401; a=rsa-sha256; cv=none; b=sdE2ykFHfQIU2KYZPug81a3ai9+sqLMrK2ZRasr6y1/NYt0Ximtb0id+Wghs38udRZftVJ TYyrS2JlpmiOwqLEGUrIJgI7TKhas6mNnMFplAClFmB3GlqZqj63R6PavoZrWSuJdX8VhX zFkmaptQL0xl7LzIR6kL/Z72pJMuIw0IuMg7a7Br1If+I23jgKI4M6b+xsD37rtyzOGvAW oy96tiqfL0mtgX+d3B3qcuQIGdkO+f6gYLcDoU3fo3ljRNlO2ZQrmOhp1OE5u+lnEisE5y UyC+RWFx5H55bDk6c4C3zUDq9zlKuu5WkSkZ2005s5akKZ0nO8JzB5gybudujw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723106401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HYSBSR+tndYcEQ6455fpX2V6huaBJkHeMy82IRGwMXA=; b=E0dtrueAdAyYHvL9xbxRj7nl5lR91X6wIXviVN5KAiXvtd9RIPeRsB9JG+7Biim2bwuik+ eF2qQ5kjWRY2RxYcdXYVwyDmdJoZH9A/YHRKzSyYjHqA9J/qG6v3Tz7hUg1LFdpCgxP0tu DU0x6DRFHXDq18wvdGWkboy3fCXhl5oFtHcbhAPhd1n9hl8MAxNXFVD7LSpe6bojYVqJXx HTldItXpxwIAlODQuvLtMKAiLezB/SAYT5JNjHk5tv+3bH509WoNnFVrBXsTNqulgwmlFX FTWIFCJ/5EoOgCfd8ZxaoaOWBOw396pQ4tCg2p8W4Tlu1VicWrTZ/681y9uYfw== 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 4WfgTY10DkzQ2G; Thu, 8 Aug 2024 08:40:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4788e1Gs049770; Thu, 8 Aug 2024 08:40:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4788e14V049765; Thu, 8 Aug 2024 08:40:01 GMT (envelope-from git) Date: Thu, 8 Aug 2024 08:40:01 GMT Message-Id: <202408080840.4788e14V049765@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: ce1c651a0d53 - main - math/or-tools: fix packaging with FLATZINC option and enable it back. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce1c651a0d53694ea59ea1d19f9eed4100bd56e2 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=ce1c651a0d53694ea59ea1d19f9eed4100bd56e2 commit ce1c651a0d53694ea59ea1d19f9eed4100bd56e2 Author: Alexey Dokuchaev AuthorDate: 2024-08-08 08:39:10 +0000 Commit: Alexey Dokuchaev 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