diff --git a/math/clp/Makefile b/math/clp/Makefile index 230a66a40aab..fa0be5a1be93 100644 --- a/math/clp/Makefile +++ b/math/clp/Makefile @@ -1,47 +1,47 @@ # Created by: Robin Schilham PORTNAME= Clp -DISTVERSION= 1.17.3 -PORTREVISION= 6 +DISTVERSION= 1.17.6 CATEGORIES= math MASTER_SITES= https://www.coin-or.org/download/source/${PORTNAME}/ PKGNAMEPREFIX= coin-or- MAINTAINER= co9co9@gmail.com COMMENT= Linear Programming Solver LICENSE= EPL 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 \ + libcoinmetis.so:math/coin-or-metis \ + libcoinmumps.so:math/coin-or-mumps \ 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 USES= blaslapack compiler:c++11-lang fortran libtool pathfix pkgconfig tar:tgz GNU_CONFIGURE= yes USE_LDCONFIG= yes 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" \ --datadir=${DATADIR} TEST_TARGET= unitTest TEST_WRKSRC= ${WRKSRC}/${PORTNAME} OPTIONS_DEFINE= DEBUG DOCS PORTDOCS= * CXXFLAGS+= -ffast-math DEBUG_CXXFLAGS= -fomit-frame-pointer .include diff --git a/math/clp/distinfo b/math/clp/distinfo index 2e31d5c129b0..7837287980fd 100644 --- a/math/clp/distinfo +++ b/math/clp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1576960990 -SHA256 (Clp-1.17.3.tgz) = a13bf54291ad503cf76f5f93f2643d2add4faa5d0e60ff2db902ef715c094573 -SIZE (Clp-1.17.3.tgz) = 9983267 +TIMESTAMP = 1645727981 +SHA256 (Clp-1.17.6.tgz) = f9cfcdd3db23bbc2d18b562012a7e25b99a40e8ce72dc296bd46dddb2970e12a +SIZE (Clp-1.17.6.tgz) = 9972859 diff --git a/math/clp/files/patch-Clp_src_ClpPackedMatrix.cpp b/math/clp/files/patch-Clp_src_ClpPackedMatrix.cpp deleted file mode 100644 index c232f2be67a2..000000000000 --- a/math/clp/files/patch-Clp_src_ClpPackedMatrix.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- Clp/src/ClpPackedMatrix.cpp.orig 2019-12-29 17:14:00 UTC -+++ Clp/src/ClpPackedMatrix.cpp -@@ -6752,7 +6752,7 @@ ClpPackedMatrix3::ClpPackedMatrix3() - #elif defined(__arm__) - #include - #else --#include -+//#include - //#include - #endif - /* Constructor from copy. */ diff --git a/math/clp/files/patch-Clp_src_ClpSimplexDual.cpp b/math/clp/files/patch-Clp_src_ClpSimplexDual.cpp deleted file mode 100644 index 5f88f8b7db6d..000000000000 --- a/math/clp/files/patch-Clp_src_ClpSimplexDual.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- Clp/src/ClpSimplexDual.cpp.orig 2019-12-29 17:45:58 UTC -+++ Clp/src/ClpSimplexDual.cpp -@@ -3559,7 +3559,7 @@ void moveAndZero(clpTempInfo *info, int type, void *ex - #elif defined(__arm__) - #include - #else --#include -+//#include - //#include - #endif - int ClpSimplexDual::dualColumn0(const CoinIndexedVector *rowArray, diff --git a/math/clp/pkg-plist b/math/clp/pkg-plist index 02077c26978e..2e4b29c03503 100644 --- a/math/clp/pkg-plist +++ b/math/clp/pkg-plist @@ -1,68 +1,68 @@ bin/clp include/coin/CbcOrClpParam.cpp include/coin/CbcOrClpParam.hpp include/coin/ClpCholeskyBase.hpp include/coin/ClpCholeskyDense.hpp include/coin/ClpCholeskyMumps.hpp include/coin/ClpCholeskyPardiso.hpp include/coin/ClpConfig.h include/coin/ClpConstraint.hpp include/coin/ClpConstraintLinear.hpp include/coin/ClpConstraintQuadratic.hpp include/coin/ClpDualRowDantzig.hpp include/coin/ClpDualRowPivot.hpp include/coin/ClpDualRowSteepest.hpp include/coin/ClpDummyMatrix.hpp include/coin/ClpDynamicExampleMatrix.hpp include/coin/ClpDynamicMatrix.hpp include/coin/ClpEventHandler.hpp include/coin/ClpFactorization.hpp include/coin/ClpGubDynamicMatrix.hpp include/coin/ClpGubMatrix.hpp include/coin/ClpInterior.hpp include/coin/ClpLinearObjective.hpp include/coin/ClpMatrixBase.hpp include/coin/ClpMessage.hpp include/coin/ClpModel.hpp include/coin/ClpNetworkMatrix.hpp include/coin/ClpNode.hpp include/coin/ClpNonLinearCost.hpp include/coin/ClpObjective.hpp include/coin/ClpPEDualRowDantzig.hpp include/coin/ClpPEDualRowSteepest.hpp include/coin/ClpPEPrimalColumnDantzig.hpp include/coin/ClpPEPrimalColumnSteepest.hpp include/coin/ClpPESimplex.hpp include/coin/ClpPackedMatrix.hpp include/coin/ClpParameters.hpp include/coin/ClpPdcoBase.hpp include/coin/ClpPlusMinusOneMatrix.hpp include/coin/ClpPresolve.hpp include/coin/ClpPrimalColumnDantzig.hpp include/coin/ClpPrimalColumnPivot.hpp include/coin/ClpPrimalColumnSteepest.hpp include/coin/ClpQuadraticObjective.hpp include/coin/ClpSimplex.hpp include/coin/ClpSimplexDual.hpp include/coin/ClpSimplexNonlinear.hpp include/coin/ClpSimplexOther.hpp include/coin/ClpSimplexPrimal.hpp include/coin/ClpSolve.hpp include/coin/Clp_C_Interface.h include/coin/Idiot.hpp include/coin/OsiClpSolverInterface.hpp lib/libClp.so lib/libClp.so.1 -lib/libClp.so.1.14.3 +lib/libClp.so.1.14.6 lib/libClpSolver.so lib/libClpSolver.so.1 -lib/libClpSolver.so.1.14.3 +lib/libClpSolver.so.1.14.6 lib/libOsiClp.so lib/libOsiClp.so.1 -lib/libOsiClp.so.1.14.3 +lib/libOsiClp.so.1.14.6 libdata/pkgconfig/clp.pc libdata/pkgconfig/osi-clp.pc %%DATADIR%%/coin/doc/Clp/AUTHORS %%DATADIR%%/coin/doc/Clp/LICENSE %%DATADIR%%/coin/doc/Clp/README %%DATADIR%%/coin/doc/Clp/clp_addlibs.txt