From owner-dev-commits-ports-main@freebsd.org Sun May 2 23:19:14 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 65B2F5FD862; Sun, 2 May 2021 23:19:14 +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 4FYMW62QLbz3gyQ; Sun, 2 May 2021 23:19:14 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 455B413853; Sun, 2 May 2021 23:19:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 142NJEKY060270; Sun, 2 May 2021 23:19:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 142NJE9l060269; Sun, 2 May 2021 23:19:14 GMT (envelope-from git) Date: Sun, 2 May 2021 23:19:14 GMT Message-Id: <202105022319.142NJE9l060269@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: f0d1bb56e2ec - main - math/minizinc: Add patch to skip path that doesn't exist on FreeBSD 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: f0d1bb56e2ec4c354bdf6e5bc1d80710ef0a72be Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 May 2021 23:19:14 -0000 The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=f0d1bb56e2ec4c354bdf6e5bc1d80710ef0a72be commit f0d1bb56e2ec4c354bdf6e5bc1d80710ef0a72be Author: Yuri Victorovich AuthorDate: 2021-05-02 21:06:23 +0000 Commit: Yuri Victorovich CommitDate: 2021-05-02 23:19:09 +0000 math/minizinc: Add patch to skip path that doesn't exist on FreeBSD Also improve Makefile format. --- math/minizinc/Makefile | 10 +++++++--- math/minizinc/files/patch-lib_solver__config.cpp | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/math/minizinc/Makefile b/math/minizinc/Makefile index 8255529f9070..fdcb402d8024 100644 --- a/math/minizinc/Makefile +++ b/math/minizinc/Makefile @@ -1,5 +1,6 @@ PORTNAME= minizinc DISTVERSION= 2.5.5 +PORTREVISION= 1 CATEGORIES= math lang MAINTAINER= yuri@FreeBSD.org @@ -8,21 +9,24 @@ COMMENT= Constraint modeling language LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt +CONFLICTS_BUILD= CoinMP + LIB_DEPENDS= libCbc.so:math/cbc \ libCgl.so:math/cgl \ libgecodekernel.so:devel/gecode \ libOsiClp.so:math/clp USES= bison cmake compiler:c++11-lang +USE_LDCONFIG= yes + USE_GITHUB= yes GH_ACCOUNT= MiniZinc GH_PROJECT= libminizinc -USE_LDCONFIG= yes - -CXXFLAGS+= -DFREEBSD_MZN_STDLIB_DIR="\\\"${DATADIR}\\\"" CMAKE_ON= BUILD_SHARED_LIBS +CXXFLAGS+= -DFREEBSD_MZN_STDLIB_DIR="\\\"${DATADIR}\\\"" + OPTIONS_DEFINE= WITH_SCIP WITH_SCIP_DESC= Build with the SCIP optimizer diff --git a/math/minizinc/files/patch-lib_solver__config.cpp b/math/minizinc/files/patch-lib_solver__config.cpp new file mode 100644 index 000000000000..6cc277581d7f --- /dev/null +++ b/math/minizinc/files/patch-lib_solver__config.cpp @@ -0,0 +1,16 @@ +- Remove a non-existent directory from search. + +--- lib/solver_config.cpp.orig 2021-05-02 20:37:56 UTC ++++ lib/solver_config.cpp +@@ -662,9 +662,11 @@ SolverConfigs::SolverConfigs(std::ostream& log) { + FileUtils::directory_exists("/usr/local/share")) { + _solverPath.emplace_back("/usr/local/share/minizinc/solvers"); + } ++# if !defined(__FreeBSD__) + if (_mznlibDir != "/usr/share/minizinc" && FileUtils::directory_exists("/usr/share")) { + _solverPath.emplace_back("/usr/share/minizinc/solvers"); + } ++# endif + #endif + } +