From owner-dev-commits-ports-all@freebsd.org Wed May 12 16:00:25 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 5AF53643E30; Wed, 12 May 2021 16:00:25 +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 4FgKJ929blz4myn; Wed, 12 May 2021 16:00:25 +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 3D4BB6374; Wed, 12 May 2021 16:00:25 +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 14CG0PnK046680; Wed, 12 May 2021 16:00:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14CG0PNx046679; Wed, 12 May 2021 16:00:25 GMT (envelope-from git) Date: Wed, 12 May 2021 16:00:25 GMT Message-Id: <202105121600.14CG0PNx046679@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: 975c4836a6e0 - main - math/clp: Remove bundled osi project in favor of math/osi dependency 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: 975c4836a6e01d1e62e4f075d1d00c7c3c59f196 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 May 2021 16:00:25 -0000 The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=975c4836a6e01d1e62e4f075d1d00c7c3c59f196 commit 975c4836a6e01d1e62e4f075d1d00c7c3c59f196 Author: Yuri Victorovich AuthorDate: 2021-05-12 15:57:54 +0000 Commit: Yuri Victorovich CommitDate: 2021-05-12 16:00:23 +0000 math/clp: Remove bundled osi project in favor of math/osi dependency This fixes file conflict between math/clp and math/osi. --- math/clp/Makefile | 6 ++++-- math/clp/pkg-plist | 27 --------------------------- math/highs/Makefile | 3 ++- 3 files changed, 6 insertions(+), 30 deletions(-) diff --git a/math/clp/Makefile b/math/clp/Makefile index 2fab3a46b48f..8951df549c13 100644 --- a/math/clp/Makefile +++ b/math/clp/Makefile @@ -2,7 +2,7 @@ PORTNAME= Clp DISTVERSION= 1.17.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math MASTER_SITES= https://www.coin-or.org/download/source/${PORTNAME}/ PKGNAMEPREFIX= coin-or- @@ -16,7 +16,8 @@ BUILD_DEPENDS= coin-or-Data-Sample>0:math/coin-or-data-sample \ coin-or-Data-Netlib>0:math/coin-or-data-netlib LIB_DEPENDS= libcoinasl.so:math/asl \ libcoinmumps.so:math/ipopt \ - libCoinUtils.so:math/coinutils + libCoinUtils.so:math/coinutils \ + libOsi.so:math/osi RUN_DEPENDS= coin-or-Data-Sample>0:math/coin-or-data-sample \ coin-or-Data-Netlib>0:math/coin-or-data-netlib @@ -28,6 +29,7 @@ INSTALL_TARGET= install-strip CONFIGURE_ARGS= --with-lapack-lib="${LAPACKLIB} -L${LOCALBASE}/lib" \ --with-blas-lib="${BLASLIB} -L${LOCALBASE}/lib" \ + --with-osi-incdir="${LOCALBASE}/include/coin" --with-osi-lib="${LOCALBASE}/lib/libOsi.so" \ --with-coinutils-incdir="${LOCALBASE}/include/coin" --with-coinutils-lib="${LOCALBASE}/lib/libCoinUtils.so" \ --with-netlib-datadir="${LOCALBASE}/share/coin/Data/Netlib" \ --with-sample-datadir="${LOCALBASE}/share/coin/Data/Sample" \ diff --git a/math/clp/pkg-plist b/math/clp/pkg-plist index 4620b207105e..02077c26978e 100644 --- a/math/clp/pkg-plist +++ b/math/clp/pkg-plist @@ -50,46 +50,19 @@ include/coin/ClpSimplexPrimal.hpp include/coin/ClpSolve.hpp include/coin/Clp_C_Interface.h include/coin/Idiot.hpp -include/coin/OsiAuxInfo.hpp -include/coin/OsiBranchingObject.hpp -include/coin/OsiChooseVariable.hpp include/coin/OsiClpSolverInterface.hpp -include/coin/OsiColCut.hpp -include/coin/OsiCollections.hpp -include/coin/OsiConfig.h -include/coin/OsiCut.hpp -include/coin/OsiCuts.hpp -include/coin/OsiPresolve.hpp -include/coin/OsiRowCut.hpp -include/coin/OsiRowCutDebugger.hpp -include/coin/OsiSolverBranch.hpp -include/coin/OsiSolverInterface.hpp -include/coin/OsiSolverParameters.hpp -include/coin/OsiUnitTests.hpp lib/libClp.so lib/libClp.so.1 lib/libClp.so.1.14.3 lib/libClpSolver.so lib/libClpSolver.so.1 lib/libClpSolver.so.1.14.3 -lib/libOsi.so -lib/libOsi.so.1 -lib/libOsi.so.1.13.4 lib/libOsiClp.so lib/libOsiClp.so.1 lib/libOsiClp.so.1.14.3 -lib/libOsiCommonTests.so -lib/libOsiCommonTests.so.1 -lib/libOsiCommonTests.so.1.13.4 libdata/pkgconfig/clp.pc libdata/pkgconfig/osi-clp.pc -libdata/pkgconfig/osi-unittests.pc -libdata/pkgconfig/osi.pc %%DATADIR%%/coin/doc/Clp/AUTHORS %%DATADIR%%/coin/doc/Clp/LICENSE %%DATADIR%%/coin/doc/Clp/README %%DATADIR%%/coin/doc/Clp/clp_addlibs.txt -%%DATADIR%%/coin/doc/Osi/AUTHORS -%%DATADIR%%/coin/doc/Osi/LICENSE -%%DATADIR%%/coin/doc/Osi/README -%%DATADIR%%/coin/doc/Osi/osi_addlibs.txt diff --git a/math/highs/Makefile b/math/highs/Makefile index 8b79d344b7b2..a1902ae5df05 100644 --- a/math/highs/Makefile +++ b/math/highs/Makefile @@ -1,5 +1,6 @@ PORTNAME= highs DISTVERSION= g20210408 +PORTREVISION= 1 CATEGORIES= math PKGNAMEPREFIX= coin-or- @@ -11,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_i386= undefined reference to fmax, see https://github.com/ERGO-Code/HiGHS/issues/505 -LIB_DEPENDS= libOsi.so:math/clp +LIB_DEPENDS= libOsi.so:math/osi USES= blaslapack cmake compiler:c++11-lang pkgconfig