diff --git a/math/clp/Makefile b/math/clp/Makefile index 5be6ddc4ac35..167f2eff41ab 100644 --- a/math/clp/Makefile +++ b/math/clp/Makefile @@ -1,47 +1,50 @@ PORTNAME= Clp -DISTVERSION= 1.17.6 -PORTREVISION= 2 +DISTVERSION= 1.17.8 CATEGORIES= math -MASTER_SITES= https://www.coin-or.org/download/source/${PORTNAME}/ PKGNAMEPREFIX= coin-or- MAINTAINER= co9co9@gmail.com COMMENT= Linear Programming Solver WWW= https://www.coin-or.org/Clp/index.html 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 \ 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 +USE_GITHUB= yes +GH_ACCOUNT= coin-or +GH_TAGNAME= releases/${DISTVERSION} + +GNU_CONFIGURE= 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 7837287980fd..3e16e0663ba1 100644 --- a/math/clp/distinfo +++ b/math/clp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1645727981 -SHA256 (Clp-1.17.6.tgz) = f9cfcdd3db23bbc2d18b562012a7e25b99a40e8ce72dc296bd46dddb2970e12a -SIZE (Clp-1.17.6.tgz) = 9972859 +TIMESTAMP = 1686847296 +SHA256 (coin-or-Clp-1.17.8-releases-1.17.8_GH0.tar.gz) = f9931b5ba44f0daf445c6b48fc2c250dc12e667e59ace8ea7b025f158fe31556 +SIZE (coin-or-Clp-1.17.8-releases-1.17.8_GH0.tar.gz) = 2168391 diff --git a/math/clp/files/patch-Osi_test_OsiTestSolverInterfaceIO.cpp b/math/clp/files/patch-Osi_test_OsiTestSolverInterfaceIO.cpp deleted file mode 100644 index 2a921f8eb236..000000000000 --- a/math/clp/files/patch-Osi_test_OsiTestSolverInterfaceIO.cpp +++ /dev/null @@ -1,16 +0,0 @@ ---- Osi/test/OsiTestSolverInterfaceIO.cpp.orig 2018-04-16 06:54:20 UTC -+++ Osi/test/OsiTestSolverInterfaceIO.cpp -@@ -422,10 +422,10 @@ OsiTestSolverInterface::writeMps(const c - writer.setMpsData(*getMatrixByCol(), getInfinity(), - getColLower(), getColUpper(), - getObjCoefficients(), -- reinterpret_cast (NULL) /*integrality*/, -+ nullptr /*integrality*/, - getRowLower(), getRowUpper(), -- reinterpret_cast (NULL) /*colnam*/, -- reinterpret_cast (NULL) /*rownam*/); -+ nullptr /*colnam*/, -+ nullptr /*rownam*/); - std::string fname = filename; - if (extension) - { if (extension[0] != '\0' && extension[0] != '.') diff --git a/math/clp/pkg-plist b/math/clp/pkg-plist index 2e4b29c03503..fc40cc55b527 100644 --- a/math/clp/pkg-plist +++ b/math/clp/pkg-plist @@ -1,68 +1,67 @@ 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.6 +lib/libClp.so.1.14.8 lib/libClpSolver.so lib/libClpSolver.so.1 -lib/libClpSolver.so.1.14.6 +lib/libClpSolver.so.1.14.8 lib/libOsiClp.so lib/libOsiClp.so.1 -lib/libOsiClp.so.1.14.6 +lib/libOsiClp.so.1.14.8 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