diff --git a/math/clp/Makefile b/math/clp/Makefile index 67803084937f..38d997764567 100644 --- a/math/clp/Makefile +++ b/math/clp/Makefile @@ -1,8 +1,7 @@ # Created by: Robin Schilham PORTNAME= Clp -DISTVERSION= 1.17.3 -PORTREVISION= 1 +DISTVERSION= 1.17.6 CATEGORIES= math MASTER_SITES= http://www.coin-or.org/download/source/${PORTNAME}/ \ http://www.mavetju.org/download/adopted/ @@ -13,6 +12,10 @@ 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= libCoinUtils.so:math/coinutils + USES= blaslapack compiler:c++11-lang fortran libtool pathfix tar:tgz GNU_CONFIGURE= yes USE_LDCONFIG= yes @@ -21,6 +24,9 @@ INSTALL_TARGET= install-strip CONFIGURE_ARGS= --with-lapack-lib="${LAPACKLIB} -L${LOCALBASE}/lib" \ --with-blas-lib="${BLASLIB} -L${LOCALBASE}/lib" \ + --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 diff --git a/math/clp/distinfo b/math/clp/distinfo index 2e31d5c129b0..c1f1552edbbf 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 = 1619999115 +SHA256 (Clp-1.17.6.tgz) = f9cfcdd3db23bbc2d18b562012a7e25b99a40e8ce72dc296bd46dddb2970e12a +SIZE (Clp-1.17.6.tgz) = 9972859 diff --git a/math/clp/pkg-plist b/math/clp/pkg-plist index 913e9a38548d..09431bbac26e 100644 --- a/math/clp/pkg-plist +++ b/math/clp/pkg-plist @@ -48,66 +48,6 @@ include/coin/ClpSimplexOther.hpp include/coin/ClpSimplexPrimal.hpp include/coin/ClpSolve.hpp include/coin/Clp_C_Interface.h -include/coin/CoinAlloc.hpp -include/coin/CoinBuild.hpp -include/coin/CoinDenseFactorization.hpp -include/coin/CoinDenseVector.hpp -include/coin/CoinDistance.hpp -include/coin/CoinError.hpp -include/coin/CoinFactorization.hpp -include/coin/CoinFileIO.hpp -include/coin/CoinFinite.hpp -include/coin/CoinFloatEqual.hpp -include/coin/CoinHelperFunctions.hpp -include/coin/CoinIndexedVector.hpp -include/coin/CoinLpIO.hpp -include/coin/CoinMessage.hpp -include/coin/CoinMessageHandler.hpp -include/coin/CoinModel.hpp -include/coin/CoinModelUseful.hpp -include/coin/CoinMpsIO.hpp -include/coin/CoinOslFactorization.hpp -include/coin/CoinPackedMatrix.hpp -include/coin/CoinPackedVector.hpp -include/coin/CoinPackedVectorBase.hpp -include/coin/CoinParam.hpp -include/coin/CoinPragma.hpp -include/coin/CoinPresolveDoubleton.hpp -include/coin/CoinPresolveDual.hpp -include/coin/CoinPresolveDupcol.hpp -include/coin/CoinPresolveEmpty.hpp -include/coin/CoinPresolveFixed.hpp -include/coin/CoinPresolveForcing.hpp -include/coin/CoinPresolveImpliedFree.hpp -include/coin/CoinPresolveIsolated.hpp -include/coin/CoinPresolveMatrix.hpp -include/coin/CoinPresolveMonitor.hpp -include/coin/CoinPresolvePsdebug.hpp -include/coin/CoinPresolveSingleton.hpp -include/coin/CoinPresolveSubst.hpp -include/coin/CoinPresolveTighten.hpp -include/coin/CoinPresolveTripleton.hpp -include/coin/CoinPresolveUseless.hpp -include/coin/CoinPresolveZeros.hpp -include/coin/CoinRational.hpp -include/coin/CoinSearchTree.hpp -include/coin/CoinShallowPackedVector.hpp -include/coin/CoinSignal.hpp -include/coin/CoinSimpFactorization.hpp -include/coin/CoinSmartPtr.hpp -include/coin/CoinSnapshot.hpp -include/coin/CoinSort.hpp -include/coin/CoinStructuredModel.hpp -include/coin/CoinTime.hpp -include/coin/CoinTypes.hpp -include/coin/CoinUtility.hpp -include/coin/CoinUtilsConfig.h -include/coin/CoinWarmStart.hpp -include/coin/CoinWarmStartBasis.hpp -include/coin/CoinWarmStartDual.hpp -include/coin/CoinWarmStartPrimalDual.hpp -include/coin/CoinWarmStartVector.hpp -include/coin/Coin_C_defines.h include/coin/Idiot.hpp include/coin/OsiAuxInfo.hpp include/coin/OsiBranchingObject.hpp @@ -127,169 +67,27 @@ include/coin/OsiSolverParameters.hpp include/coin/OsiUnitTests.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/libCoinUtils.so -lib/libCoinUtils.so.3 -lib/libCoinUtils.so.3.11.2 +lib/libClpSolver.so.1.14.6 lib/libOsi.so lib/libOsi.so.1 -lib/libOsi.so.1.13.4 +lib/libOsi.so.1.13.6 lib/libOsiClp.so lib/libOsiClp.so.1 -lib/libOsiClp.so.1.14.3 +lib/libOsiClp.so.1.14.6 lib/libOsiCommonTests.so lib/libOsiCommonTests.so.1 -lib/libOsiCommonTests.so.1.13.4 +lib/libOsiCommonTests.so.1.13.6 libdata/pkgconfig/clp.pc -libdata/pkgconfig/coindatanetlib.pc -libdata/pkgconfig/coindatasample.pc -libdata/pkgconfig/coinutils.pc libdata/pkgconfig/osi-clp.pc libdata/pkgconfig/osi-unittests.pc libdata/pkgconfig/osi.pc -%%DATADIR%%/coin/Data/Netlib/25fv47.mps.gz -%%DATADIR%%/coin/Data/Netlib/80bau3b.mps.gz -%%DATADIR%%/coin/Data/Netlib/adlittle.mps.gz -%%DATADIR%%/coin/Data/Netlib/afiro.mps.gz -%%DATADIR%%/coin/Data/Netlib/agg.mps.gz -%%DATADIR%%/coin/Data/Netlib/agg2.mps.gz -%%DATADIR%%/coin/Data/Netlib/agg3.mps.gz -%%DATADIR%%/coin/Data/Netlib/bandm.mps.gz -%%DATADIR%%/coin/Data/Netlib/beaconfd.mps.gz -%%DATADIR%%/coin/Data/Netlib/blend.mps.gz -%%DATADIR%%/coin/Data/Netlib/bnl1.mps.gz -%%DATADIR%%/coin/Data/Netlib/bnl2.mps.gz -%%DATADIR%%/coin/Data/Netlib/boeing1.mps.gz -%%DATADIR%%/coin/Data/Netlib/boeing2.mps.gz -%%DATADIR%%/coin/Data/Netlib/bore3d.mps.gz -%%DATADIR%%/coin/Data/Netlib/brandy.mps.gz -%%DATADIR%%/coin/Data/Netlib/capri.mps.gz -%%DATADIR%%/coin/Data/Netlib/cycle.mps.gz -%%DATADIR%%/coin/Data/Netlib/czprob.mps.gz -%%DATADIR%%/coin/Data/Netlib/d2q06c.mps.gz -%%DATADIR%%/coin/Data/Netlib/d6cube.mps.gz -%%DATADIR%%/coin/Data/Netlib/degen2.mps.gz -%%DATADIR%%/coin/Data/Netlib/degen3.mps.gz -%%DATADIR%%/coin/Data/Netlib/dfl001.mps.gz -%%DATADIR%%/coin/Data/Netlib/e226.mps.gz -%%DATADIR%%/coin/Data/Netlib/etamacro.mps.gz -%%DATADIR%%/coin/Data/Netlib/fffff800.mps.gz -%%DATADIR%%/coin/Data/Netlib/finnis.mps.gz -%%DATADIR%%/coin/Data/Netlib/fit1d.mps.gz -%%DATADIR%%/coin/Data/Netlib/fit1p.mps.gz -%%DATADIR%%/coin/Data/Netlib/fit2d.mps.gz -%%DATADIR%%/coin/Data/Netlib/fit2p.mps.gz -%%DATADIR%%/coin/Data/Netlib/forplan.mps.gz -%%DATADIR%%/coin/Data/Netlib/ganges.mps.gz -%%DATADIR%%/coin/Data/Netlib/gfrd-pnc.mps.gz -%%DATADIR%%/coin/Data/Netlib/greenbea.mps.gz -%%DATADIR%%/coin/Data/Netlib/greenbeb.mps.gz -%%DATADIR%%/coin/Data/Netlib/grow15.mps.gz -%%DATADIR%%/coin/Data/Netlib/grow22.mps.gz -%%DATADIR%%/coin/Data/Netlib/grow7.mps.gz -%%DATADIR%%/coin/Data/Netlib/israel.mps.gz -%%DATADIR%%/coin/Data/Netlib/kb2.mps.gz -%%DATADIR%%/coin/Data/Netlib/lotfi.mps.gz -%%DATADIR%%/coin/Data/Netlib/maros-r7.mps.gz -%%DATADIR%%/coin/Data/Netlib/maros.mps.gz -%%DATADIR%%/coin/Data/Netlib/modszk1.mps.gz -%%DATADIR%%/coin/Data/Netlib/nesm.mps.gz -%%DATADIR%%/coin/Data/Netlib/perold.mps.gz -%%DATADIR%%/coin/Data/Netlib/pilot.mps.gz -%%DATADIR%%/coin/Data/Netlib/pilot4.mps.gz -%%DATADIR%%/coin/Data/Netlib/pilot87.mps.gz -%%DATADIR%%/coin/Data/Netlib/pilotnov.mps.gz -%%DATADIR%%/coin/Data/Netlib/recipe.mps.gz -%%DATADIR%%/coin/Data/Netlib/sc105.mps.gz -%%DATADIR%%/coin/Data/Netlib/sc205.mps.gz -%%DATADIR%%/coin/Data/Netlib/sc50a.mps.gz -%%DATADIR%%/coin/Data/Netlib/sc50b.mps.gz -%%DATADIR%%/coin/Data/Netlib/scagr25.mps.gz -%%DATADIR%%/coin/Data/Netlib/scagr7.mps.gz -%%DATADIR%%/coin/Data/Netlib/scfxm1.mps.gz -%%DATADIR%%/coin/Data/Netlib/scfxm2.mps.gz -%%DATADIR%%/coin/Data/Netlib/scfxm3.mps.gz -%%DATADIR%%/coin/Data/Netlib/scorpion.mps.gz -%%DATADIR%%/coin/Data/Netlib/scrs8.mps.gz -%%DATADIR%%/coin/Data/Netlib/scsd1.mps.gz -%%DATADIR%%/coin/Data/Netlib/scsd6.mps.gz -%%DATADIR%%/coin/Data/Netlib/scsd8.mps.gz -%%DATADIR%%/coin/Data/Netlib/sctap1.mps.gz -%%DATADIR%%/coin/Data/Netlib/sctap2.mps.gz -%%DATADIR%%/coin/Data/Netlib/sctap3.mps.gz -%%DATADIR%%/coin/Data/Netlib/seba.mps.gz -%%DATADIR%%/coin/Data/Netlib/share1b.mps.gz -%%DATADIR%%/coin/Data/Netlib/share2b.mps.gz -%%DATADIR%%/coin/Data/Netlib/shell.mps.gz -%%DATADIR%%/coin/Data/Netlib/ship04l.mps.gz -%%DATADIR%%/coin/Data/Netlib/ship04s.mps.gz -%%DATADIR%%/coin/Data/Netlib/ship08l.mps.gz -%%DATADIR%%/coin/Data/Netlib/ship08s.mps.gz -%%DATADIR%%/coin/Data/Netlib/ship12l.mps.gz -%%DATADIR%%/coin/Data/Netlib/ship12s.mps.gz -%%DATADIR%%/coin/Data/Netlib/sierra.mps.gz -%%DATADIR%%/coin/Data/Netlib/stair.mps.gz -%%DATADIR%%/coin/Data/Netlib/standata.mps.gz -%%DATADIR%%/coin/Data/Netlib/standgub.mps.gz -%%DATADIR%%/coin/Data/Netlib/standmps.mps.gz -%%DATADIR%%/coin/Data/Netlib/stocfor1.mps.gz -%%DATADIR%%/coin/Data/Netlib/stocfor2.mps.gz -%%DATADIR%%/coin/Data/Netlib/tuff.mps.gz -%%DATADIR%%/coin/Data/Netlib/vtpbase.mps.gz -%%DATADIR%%/coin/Data/Netlib/wood1p.mps.gz -%%DATADIR%%/coin/Data/Netlib/woodw.mps.gz -%%DATADIR%%/coin/Data/Sample/afiro.mps -%%DATADIR%%/coin/Data/Sample/app0110.cor -%%DATADIR%%/coin/Data/Sample/app0110.stoch -%%DATADIR%%/coin/Data/Sample/app0110.time -%%DATADIR%%/coin/Data/Sample/app0110R.cor -%%DATADIR%%/coin/Data/Sample/app0110R.stoch -%%DATADIR%%/coin/Data/Sample/app0110R.time -%%DATADIR%%/coin/Data/Sample/atm_5_10_1.block -%%DATADIR%%/coin/Data/Sample/atm_5_10_1.mps -%%DATADIR%%/coin/Data/Sample/block_milp.dec -%%DATADIR%%/coin/Data/Sample/block_milp.lp -%%DATADIR%%/coin/Data/Sample/brandy.mps -%%DATADIR%%/coin/Data/Sample/bug.cor -%%DATADIR%%/coin/Data/Sample/bug.stoch -%%DATADIR%%/coin/Data/Sample/bug.time -%%DATADIR%%/coin/Data/Sample/conic.mps -%%DATADIR%%/coin/Data/Sample/e226.mps -%%DATADIR%%/coin/Data/Sample/exmip1.5.mps -%%DATADIR%%/coin/Data/Sample/exmip1.lp -%%DATADIR%%/coin/Data/Sample/exmip1.mps -%%DATADIR%%/coin/Data/Sample/finnis.mps -%%DATADIR%%/coin/Data/Sample/galenet.mps -%%DATADIR%%/coin/Data/Sample/galenetbnds.mps -%%DATADIR%%/coin/Data/Sample/hello.mps -%%DATADIR%%/coin/Data/Sample/input.130 -%%DATADIR%%/coin/Data/Sample/lseu.mps -%%DATADIR%%/coin/Data/Sample/nw460.mps -%%DATADIR%%/coin/Data/Sample/p0033.mps -%%DATADIR%%/coin/Data/Sample/p0201.mps -%%DATADIR%%/coin/Data/Sample/p0548.mps -%%DATADIR%%/coin/Data/Sample/pack1.mps -%%DATADIR%%/coin/Data/Sample/retail3.block -%%DATADIR%%/coin/Data/Sample/retail3.mps -%%DATADIR%%/coin/Data/Sample/scOneInt.mps -%%DATADIR%%/coin/Data/Sample/share2qp.mps -%%DATADIR%%/coin/Data/Sample/spec_sections.mps -%%DATADIR%%/coin/Data/Sample/tp3.mps -%%DATADIR%%/coin/Data/Sample/tp4.mps -%%DATADIR%%/coin/Data/Sample/tp5.mps -%%DATADIR%%/coin/Data/Sample/wedding_16.block -%%DATADIR%%/coin/Data/Sample/wedding_16.mps %%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/CoinUtils/AUTHORS -%%DATADIR%%/coin/doc/CoinUtils/LICENSE -%%DATADIR%%/coin/doc/CoinUtils/README -%%DATADIR%%/coin/doc/CoinUtils/coinutils_addlibs.txt %%DATADIR%%/coin/doc/Osi/AUTHORS %%DATADIR%%/coin/doc/Osi/LICENSE %%DATADIR%%/coin/doc/Osi/README 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,