git: 67a380f36257 - main - math/cbc: Update 2.10.5 -> 2.10.7
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 13 Mar 2022 18:30:18 UTC
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=67a380f362572612cec84b77fd20dbdaf753e373 commit 67a380f362572612cec84b77fd20dbdaf753e373 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2022-03-13 02:52:07 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2022-03-13 18:30:14 +0000 math/cbc: Update 2.10.5 -> 2.10.7 Reported by: portscout --- math/cbc/Makefile | 4 ++-- math/cbc/distinfo | 6 +++--- math/cbc/files/patch-Cbc_src_CbcModel.cpp | 11 ----------- math/cbc/pkg-plist | 7 +++---- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/math/cbc/Makefile b/math/cbc/Makefile index f084c7aaeac9..d16cf9de3407 100644 --- a/math/cbc/Makefile +++ b/math/cbc/Makefile @@ -1,7 +1,6 @@ PORTNAME= cbc DISTVERSIONPREFIX= releases/ -DISTVERSION= 2.10.5 -PORTREVISION= 6 +DISTVERSION= 2.10.7 CATEGORIES= math PKGNAMEPREFIX= coin-or- @@ -16,6 +15,7 @@ LIB_DEPENDS= libblas.so:math/blas \ libClp.so:math/clp \ libcoinasl.so:math/asl \ libcoinmumps.so:math/ipopt \ + libcoinmumps.so:math/coin-or-mumps \ libCoinUtils.so:math/coinutils \ liblapack.so:math/lapack \ libnauty.so:math/nauty \ diff --git a/math/cbc/distinfo b/math/cbc/distinfo index 0655d254e50d..8386b9e1b64b 100644 --- a/math/cbc/distinfo +++ b/math/cbc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1583739281 -SHA256 (coin-or-Cbc-releases-2.10.5_GH0.tar.gz) = cc44c1950ff4615e7791d7e03ea34318ca001d3cac6dc3f7f5ee392459ce6719 -SIZE (coin-or-Cbc-releases-2.10.5_GH0.tar.gz) = 1639188 +TIMESTAMP = 1647139211 +SHA256 (coin-or-Cbc-releases-2.10.7_GH0.tar.gz) = 5aa5490e2bc39c3c03f3636c9bca459cb3f8f365e0280fd0c4759ce3119e5b19 +SIZE (coin-or-Cbc-releases-2.10.7_GH0.tar.gz) = 1656786 diff --git a/math/cbc/files/patch-Cbc_src_CbcModel.cpp b/math/cbc/files/patch-Cbc_src_CbcModel.cpp deleted file mode 100644 index 8c8bbe09102c..000000000000 --- a/math/cbc/files/patch-Cbc_src_CbcModel.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- Cbc/src/CbcModel.cpp.orig 2019-12-21 21:30:53 UTC -+++ Cbc/src/CbcModel.cpp -@@ -5417,7 +5417,7 @@ void CbcModel::branchAndBound(int doStatistics) - OsiClpSolverInterface *clpSolver - = dynamic_cast< OsiClpSolverInterface * >(solver_); - if (clpSolver) -- clpSolver->setFakeObjective(reinterpret_cast< double * >(NULL)); -+ clpSolver->setFakeObjective((double*)nullptr); - } - #endif - moreSpecialOptions_ = saveMoreSpecialOptions; diff --git a/math/cbc/pkg-plist b/math/cbc/pkg-plist index 68918fffb6ee..082e1cc9edd8 100644 --- a/math/cbc/pkg-plist +++ b/math/cbc/pkg-plist @@ -77,16 +77,15 @@ include/coin/ClpConstraintAmpl.hpp include/coin/OsiCbcSolverInterface.hpp lib/libCbc.so lib/libCbc.so.3 -lib/libCbc.so.3.10.5 +lib/libCbc.so.3.10.7 lib/libCbcSolver.so lib/libCbcSolver.so.3 -lib/libCbcSolver.so.3.10.5 +lib/libCbcSolver.so.3.10.7 lib/libOsiCbc.so lib/libOsiCbc.so.3 -lib/libOsiCbc.so.3.10.5 +lib/libOsiCbc.so.3.10.7 libdata/pkgconfig/cbc.pc libdata/pkgconfig/osi-cbc.pc share/coin/doc/Cbc/AUTHORS share/coin/doc/Cbc/LICENSE -share/coin/doc/Cbc/README share/coin/doc/Cbc/cbc_addlibs.txt