From nobody Sun Nov 5 18:23:59 2023 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 4SNjYC5chCz4yrmR; Sun, 5 Nov 2023 18:23:59 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SNjYC3Xlrz3TxS; Sun, 5 Nov 2023 18:23:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699208639; 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=UeHwbe/5s0+smXOAc97o7D+n6+GGZlWt9esQqMvBzB8=; b=qWiZoysUer43a6GefjxE4Njo7S/NZ3vj59gw7Ih0WFiIedSsE06EL4IexIswnhJV3FHQYh zrQPs8d37ol5xdjFuF+QxVVN+M6YLx3ol/RS3+OtfuBdmWBcJp/R1HE6WeRUsrRQ87aVaa TOP9wSeMLgPBIsXV3EerBGg0u9f48V4vMNKJd9wBXcMOgRNNDxeR+vkoiW0xBvNoqm2BVf qdrAaMY1ogjh3GH/fcS6LWLuf9eXc3f1Q7PcyIoTdA1UTraueiXh5Gp72X77HCug8e+5SY 7Bvbtbj4RHI4GqbWc6EgATdQbNeTspfuKnLS1Lff56ZsTnhk2zaM77yuF/enzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699208639; 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=UeHwbe/5s0+smXOAc97o7D+n6+GGZlWt9esQqMvBzB8=; b=N+kBdDlkGijv/reMl2WDCNeYoMjcG3qvOehqELhQ6C4DqZh7dN4DaOfjmcOK49NUJLQmzA atidAOlEySPqlvG8uS3Svu8BtZX2TRogepqHkiHSZxBNJLiT625rvh6Du1xx4HmpEL2OUK tv1Hc34rOIs4GLAPPhZB7OMJ5SbA1ZESwW60mgtBmHrRZv/TVyM5AmcgUcs3WD1Svowti1 dvlbAUnLKmJmrq8yBgZRqfX2Ad/kAg/aD6AemRfVbVjn19dfzRTGGJuZ05akVqn95bxB7h Zfh8xOEEg1lMEqU/ThyUEJ7EJXuAQQPtuFPGsDKvmzeo0Mktq7Lni1lw/8di9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699208639; a=rsa-sha256; cv=none; b=QgXbVvopcM231XVlu4/54nSMuRiC+n8i8XYkfY8NYQBHEqnyP6QODsOuyeqBpjYSHjojPL XGJasqCuTRJDUZKZbt1FuoGpjBu6MZL7ZuBfa6+xuXNXbrrfVqOhrIc+1fiZadHvf910Y5 J17+0qulQH2Q7I94Wyd0mKHWbnNVBRFD6/Dz4hvhxIv+6ZLpNEZpddMgWksfxd791DS84m U50szelQ9ErpcSS61KCscyiC8jxAPxCwzKpwtLAWUd2d68Iqmx3wGv8FGwQGOQBq7nomaZ AwOJ+C/z7p6OC2atj+6MeScuy/eqz/0wyme6lpYjWGLcIMMO4FBQeSkDQarqeA== 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 4SNjYC2ckTzbCp; Sun, 5 Nov 2023 18:23:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A5INxPt021755; Sun, 5 Nov 2023 18:23:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A5INxXa021752; Sun, 5 Nov 2023 18:23:59 GMT (envelope-from git) Date: Sun, 5 Nov 2023 18:23:59 GMT Message-Id: <202311051823.3A5INxXa021752@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 0907c99193c5 - main - math/minizinc: update 2.6.4 =?utf-8?Q?=E2=86=92?= 2.7.6 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0907c99193c59903b3448ef000f75341252a6247 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=0907c99193c59903b3448ef000f75341252a6247 commit 0907c99193c59903b3448ef000f75341252a6247 Author: Yuri Victorovich AuthorDate: 2023-11-05 17:53:30 +0000 Commit: Yuri Victorovich CommitDate: 2023-11-05 17:53:30 +0000 math/minizinc: update 2.6.4 → 2.7.6 Reported by: portscout --- math/minizinc/Makefile | 6 ++++-- math/minizinc/distinfo | 6 +++--- math/minizinc/pkg-plist | 31 +++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 5 deletions(-) diff --git a/math/minizinc/Makefile b/math/minizinc/Makefile index d4d71f3db17d..ac2964cf5fb7 100644 --- a/math/minizinc/Makefile +++ b/math/minizinc/Makefile @@ -1,6 +1,5 @@ PORTNAME= minizinc -DISTVERSION= 2.6.4 -PORTREVISION= 1 +DISTVERSION= 2.7.6 CATEGORIES= math lang MAINTAINER= yuri@FreeBSD.org @@ -16,6 +15,7 @@ LIB_DEPENDS= libCbc.so:math/cbc \ libCgl.so:math/cgl \ libCoinUtils.so:math/coinutils \ libgecodekernel.so:math/gecode \ + libhighs.so:math/highs \ libOsi.so:math/osi \ libOsiClp.so:math/clp @@ -29,6 +29,8 @@ GH_PROJECT= libminizinc CMAKE_ON= BUILD_SHARED_LIBS CXXFLAGS+= -DFREEBSD_MZN_STDLIB_DIR="\\\"${DATADIR}\\\"" +CXXFLAGS+= -I${LOCALBASE}/include/highs # workaround for https://github.com/MiniZinc/libminizinc/issues/744 +LDFLAGS+= -L${LOCALBASE}/lib # workaround for https://github.com/MiniZinc/libminizinc/issues/744 OPTIONS_DEFINE= WITH_SCIP diff --git a/math/minizinc/distinfo b/math/minizinc/distinfo index 2e157cf031cd..58b314ad5b4f 100644 --- a/math/minizinc/distinfo +++ b/math/minizinc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656370768 -SHA256 (MiniZinc-libminizinc-2.6.4_GH0.tar.gz) = f1f5adba23c749ddfdb2420e797d7ff46e72b843850529978f867583dbc599ca -SIZE (MiniZinc-libminizinc-2.6.4_GH0.tar.gz) = 12975175 +TIMESTAMP = 1699204241 +SHA256 (MiniZinc-libminizinc-2.7.6_GH0.tar.gz) = 99de3a1051bd4b3ed2d436f62d965fce067286d954b5693d74a5f7c75877ddfb +SIZE (MiniZinc-libminizinc-2.7.6_GH0.tar.gz) = 13053472 diff --git a/math/minizinc/pkg-plist b/math/minizinc/pkg-plist index 98ed1711c4b8..61cc7b6f0a7e 100644 --- a/math/minizinc/pkg-plist +++ b/math/minizinc/pkg-plist @@ -1,6 +1,7 @@ bin/minizinc bin/mzn2doc include/minizinc/MIPdomains.hh +include/minizinc/_thirdparty/b64/ccommon.h include/minizinc/_thirdparty/b64/cdecode.h include/minizinc/_thirdparty/b64/cencode.h include/minizinc/_thirdparty/b64/decode.h @@ -58,6 +59,8 @@ include/minizinc/solvers/MIP/MIP_cplex_solverfactory.hh include/minizinc/solvers/MIP/MIP_cplex_wrap.hh include/minizinc/solvers/MIP/MIP_gurobi_solverfactory.hh include/minizinc/solvers/MIP/MIP_gurobi_wrap.hh +include/minizinc/solvers/MIP/MIP_highs_solverfactory.hh +include/minizinc/solvers/MIP/MIP_highs_wrap.hh include/minizinc/solvers/MIP/MIP_osicbc_solverfactory.hh include/minizinc/solvers/MIP/MIP_osicbc_wrap.hh include/minizinc/solvers/MIP/MIP_scip_solverfactory.hh @@ -67,6 +70,8 @@ include/minizinc/solvers/MIP/MIP_solverinstance.hpp include/minizinc/solvers/MIP/MIP_wrap.hh include/minizinc/solvers/MIP/MIP_xpress_solverfactory.hh include/minizinc/solvers/MIP/MIP_xpress_wrap.hh +include/minizinc/solvers/chuffed_solverfactory.hh +include/minizinc/solvers/chuffed_solverinstance.hh include/minizinc/solvers/fzn_solverfactory.hh include/minizinc/solvers/fzn_solverinstance.hh include/minizinc/solvers/geas/geas_constraints.hh @@ -244,6 +249,7 @@ lib/libmzn.so %%DATADIR%%/std/arg_sort_float.mzn.deprecated.mzn %%DATADIR%%/std/arg_sort_int.mzn %%DATADIR%%/std/arg_sort_int.mzn.deprecated.mzn +%%DATADIR%%/std/arg_val.mzn %%DATADIR%%/std/at_least.mzn %%DATADIR%%/std/at_least.mzn.deprecated.mzn %%DATADIR%%/std/at_least_int.mzn @@ -311,6 +317,20 @@ lib/libmzn.so %%DATADIR%%/std/exactly_int.mzn %%DATADIR%%/std/exactly_set.mzn %%DATADIR%%/std/experimental.mzn +%%DATADIR%%/std/experimental/all.mzn +%%DATADIR%%/std/experimental/on_restart.mzn +%%DATADIR%%/std/experimental/on_restart/fzn_on_restart_complete.mzn +%%DATADIR%%/std/experimental/on_restart/fzn_on_restart_last_val_bool.mzn +%%DATADIR%%/std/experimental/on_restart/fzn_on_restart_last_val_float.mzn +%%DATADIR%%/std/experimental/on_restart/fzn_on_restart_last_val_int.mzn +%%DATADIR%%/std/experimental/on_restart/fzn_on_restart_last_val_set.mzn +%%DATADIR%%/std/experimental/on_restart/fzn_on_restart_sol_bool.mzn +%%DATADIR%%/std/experimental/on_restart/fzn_on_restart_sol_float.mzn +%%DATADIR%%/std/experimental/on_restart/fzn_on_restart_sol_int.mzn +%%DATADIR%%/std/experimental/on_restart/fzn_on_restart_sol_set.mzn +%%DATADIR%%/std/experimental/on_restart/fzn_on_restart_status.mzn +%%DATADIR%%/std/experimental/on_restart/fzn_on_restart_uniform_float.mzn +%%DATADIR%%/std/experimental/on_restart/fzn_on_restart_uniform_int.mzn %%DATADIR%%/std/flatzinc_builtins.mzn %%DATADIR%%/std/fzn_all_different_int.mzn %%DATADIR%%/std/fzn_all_different_int_opt.mzn @@ -347,6 +367,12 @@ lib/libmzn.so %%DATADIR%%/std/fzn_arg_sort_float_reif.mzn %%DATADIR%%/std/fzn_arg_sort_int.mzn %%DATADIR%%/std/fzn_arg_sort_int_reif.mzn +%%DATADIR%%/std/fzn_arg_val_bool.mzn +%%DATADIR%%/std/fzn_arg_val_bool_opt.mzn +%%DATADIR%%/std/fzn_arg_val_float.mzn +%%DATADIR%%/std/fzn_arg_val_float_opt.mzn +%%DATADIR%%/std/fzn_arg_val_int.mzn +%%DATADIR%%/std/fzn_arg_val_int_opt.mzn %%DATADIR%%/std/fzn_array_int_union.mzn %%DATADIR%%/std/fzn_array_opt_int_union.mzn %%DATADIR%%/std/fzn_array_set_intersect.mzn @@ -661,6 +687,8 @@ lib/libmzn.so %%DATADIR%%/std/fzn_value_precede_int_reif.mzn %%DATADIR%%/std/fzn_value_precede_set.mzn %%DATADIR%%/std/fzn_value_precede_set_reif.mzn +%%DATADIR%%/std/fzn_var_perm_sym.mzn +%%DATADIR%%/std/fzn_var_sqr_sym.mzn %%DATADIR%%/std/fzn_write.mzn %%DATADIR%%/std/fzn_write_reif.mzn %%DATADIR%%/std/fzn_writes.mzn @@ -772,6 +800,7 @@ lib/libmzn.so %%DATADIR%%/std/redefinitions-2.2.1.mzn %%DATADIR%%/std/redefinitions-2.3.3.mzn %%DATADIR%%/std/redefinitions-2.5.2.mzn +%%DATADIR%%/std/redefinitions-2.7.1.mzn %%DATADIR%%/std/redefinitions.mzn %%DATADIR%%/std/regular.mzn %%DATADIR%%/std/regular_nfa.mzn @@ -829,6 +858,8 @@ lib/libmzn.so %%DATADIR%%/std/value_precede_int.mzn.deprecated.mzn %%DATADIR%%/std/value_precede_set.mzn %%DATADIR%%/std/value_precede_set.mzn.deprecated.mzn +%%DATADIR%%/std/var_perm_sym.mzn +%%DATADIR%%/std/var_sqr_sym.mzn %%DATADIR%%/std/weighted_spanning_tree.mzn %%DATADIR%%/std/write.mzn %%DATADIR%%/std/writes.mzn