diff --git a/math/clp/Makefile b/math/clp/Makefile index 2fab3a46b48f..8951df549c13 100644 --- a/math/clp/Makefile +++ b/math/clp/Makefile @@ -1,45 +1,47 @@ # Created by: Robin Schilham PORTNAME= Clp DISTVERSION= 1.17.3 -PORTREVISION= 3 +PORTREVISION= 4 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 \ - libCoinUtils.so:math/coinutils + 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/pkg-plist b/math/clp/pkg-plist index 4620b207105e..02077c26978e 100644 --- a/math/clp/pkg-plist +++ b/math/clp/pkg-plist @@ -1,95 +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/OsiAuxInfo.hpp -include/coin/OsiBranchingObject.hpp -include/coin/OsiChooseVariable.hpp include/coin/OsiClpSolverInterface.hpp -include/coin/OsiColCut.hpp -include/coin/OsiCollections.hpp -include/coin/OsiConfig.h -include/coin/OsiCut.hpp -include/coin/OsiCuts.hpp -include/coin/OsiPresolve.hpp -include/coin/OsiRowCut.hpp -include/coin/OsiRowCutDebugger.hpp -include/coin/OsiSolverBranch.hpp -include/coin/OsiSolverInterface.hpp -include/coin/OsiSolverParameters.hpp -include/coin/OsiUnitTests.hpp lib/libClp.so lib/libClp.so.1 lib/libClp.so.1.14.3 lib/libClpSolver.so lib/libClpSolver.so.1 lib/libClpSolver.so.1.14.3 -lib/libOsi.so -lib/libOsi.so.1 -lib/libOsi.so.1.13.4 lib/libOsiClp.so lib/libOsiClp.so.1 lib/libOsiClp.so.1.14.3 -lib/libOsiCommonTests.so -lib/libOsiCommonTests.so.1 -lib/libOsiCommonTests.so.1.13.4 libdata/pkgconfig/clp.pc libdata/pkgconfig/osi-clp.pc -libdata/pkgconfig/osi-unittests.pc -libdata/pkgconfig/osi.pc %%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/Osi/AUTHORS -%%DATADIR%%/coin/doc/Osi/LICENSE -%%DATADIR%%/coin/doc/Osi/README -%%DATADIR%%/coin/doc/Osi/osi_addlibs.txt diff --git a/math/highs/Makefile b/math/highs/Makefile index 8b79d344b7b2..a1902ae5df05 100644 --- a/math/highs/Makefile +++ b/math/highs/Makefile @@ -1,26 +1,27 @@ PORTNAME= highs DISTVERSION= g20210408 +PORTREVISION= 1 CATEGORIES= math PKGNAMEPREFIX= coin-or- MAINTAINER= yuri@FreeBSD.org COMMENT= Solver for large scale sparse linear programming (LP) problems LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_i386= undefined reference to fmax, see https://github.com/ERGO-Code/HiGHS/issues/505 -LIB_DEPENDS= libOsi.so:math/clp +LIB_DEPENDS= libOsi.so:math/osi USES= blaslapack cmake compiler:c++11-lang pkgconfig USE_GITHUB= yes GH_ACCOUNT= ERGO-Code GH_PROJECT= HiGHS GH_TAGNAME= cfe064e post-install: # see https://github.com/ERGO-Code/HiGHS/issues/502 ${RM} -r ${STAGEDIR}${PREFIX}/external .include