diff --git a/math/cbc/Makefile b/math/cbc/Makefile index f084c7aaeac9..d16cf9de3407 100644 --- a/math/cbc/Makefile +++ b/math/cbc/Makefile @@ -1,40 +1,40 @@ PORTNAME= cbc DISTVERSIONPREFIX= releases/ -DISTVERSION= 2.10.5 -PORTREVISION= 6 +DISTVERSION= 2.10.7 CATEGORIES= math PKGNAMEPREFIX= coin-or- MAINTAINER= yuri@FreeBSD.org COMMENT= Coin-or Branch and Cut: mixed integer programming solver LICENSE= EPL LICENSE_FILE= ${WRKSRC}/Cbc/LICENSE LIB_DEPENDS= libblas.so:math/blas \ libCgl.so:math/cgl \ 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 \ libopenblas.so:math/openblas \ libOsi.so:math/osi USES= compiler:c++11-lang fortran gmake libtool pkgconfig USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= coin-or GH_PROJECT= Cbc GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-nauty-lib="-L${LOCALBASE}/lib -lnauty" --with-nauty-incdir=${LOCALBASE}/include/nauty CONFLICTS_INSTALL= libcouchbase # bin/cbc post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so .include 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 @@ -1,92 +1,91 @@ bin/cbc include/coin/CbcBranchActual.hpp include/coin/CbcBranchAllDifferent.hpp include/coin/CbcBranchBase.hpp include/coin/CbcBranchCut.hpp include/coin/CbcBranchDecision.hpp include/coin/CbcBranchDefaultDecision.hpp include/coin/CbcBranchDynamic.hpp include/coin/CbcBranchLotsize.hpp include/coin/CbcBranchToFixLots.hpp include/coin/CbcBranchingObject.hpp include/coin/CbcClique.hpp include/coin/CbcCompare.hpp include/coin/CbcCompareActual.hpp include/coin/CbcCompareBase.hpp include/coin/CbcCompareDefault.hpp include/coin/CbcCompareDepth.hpp include/coin/CbcCompareEstimate.hpp include/coin/CbcCompareObjective.hpp include/coin/CbcConfig.h include/coin/CbcConsequence.hpp include/coin/CbcCountRowCut.hpp include/coin/CbcCutGenerator.hpp include/coin/CbcCutModifier.hpp include/coin/CbcCutSubsetModifier.hpp include/coin/CbcDummyBranchingObject.hpp include/coin/CbcEventHandler.hpp include/coin/CbcFathom.hpp include/coin/CbcFathomDynamicProgramming.hpp include/coin/CbcFeasibilityBase.hpp include/coin/CbcFixVariable.hpp include/coin/CbcFollowOn.hpp include/coin/CbcFullNodeInfo.hpp include/coin/CbcGeneral.hpp include/coin/CbcGeneralDepth.hpp include/coin/CbcHeuristic.hpp include/coin/CbcHeuristicDINS.hpp include/coin/CbcHeuristicDW.hpp include/coin/CbcHeuristicDive.hpp include/coin/CbcHeuristicDiveCoefficient.hpp include/coin/CbcHeuristicDiveFractional.hpp include/coin/CbcHeuristicDiveGuided.hpp include/coin/CbcHeuristicDiveLineSearch.hpp include/coin/CbcHeuristicDivePseudoCost.hpp include/coin/CbcHeuristicDiveVectorLength.hpp include/coin/CbcHeuristicFPump.hpp include/coin/CbcHeuristicGreedy.hpp include/coin/CbcHeuristicLocal.hpp include/coin/CbcHeuristicPivotAndFix.hpp include/coin/CbcHeuristicRENS.hpp include/coin/CbcHeuristicRINS.hpp include/coin/CbcHeuristicRandRound.hpp include/coin/CbcHeuristicVND.hpp include/coin/CbcLinked.hpp include/coin/CbcMessage.hpp include/coin/CbcMipStartIO.hpp include/coin/CbcModel.hpp include/coin/CbcNWay.hpp include/coin/CbcNode.hpp include/coin/CbcNodeInfo.hpp include/coin/CbcObject.hpp include/coin/CbcObjectUpdateData.hpp include/coin/CbcParam.hpp include/coin/CbcPartialNodeInfo.hpp include/coin/CbcSOS.hpp include/coin/CbcSimpleInteger.hpp include/coin/CbcSimpleIntegerDynamicPseudoCost.hpp include/coin/CbcSimpleIntegerPseudoCost.hpp include/coin/CbcSolver.hpp include/coin/CbcStrategy.hpp include/coin/CbcSubProblem.hpp include/coin/CbcTree.hpp include/coin/CbcTreeLocal.hpp include/coin/Cbc_C_Interface.h include/coin/ClpAmplObjective.hpp 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