diff --git a/math/highs/Makefile b/math/highs/Makefile index 6823817ba1cf..f3dc6e291f88 100644 --- a/math/highs/Makefile +++ b/math/highs/Makefile @@ -1,31 +1,30 @@ PORTNAME= highs DISTVERSIONPREFIX= v -DISTVERSION= 1.4.1 +DISTVERSION= 1.4.2 CATEGORIES= math PKGNAMEPREFIX= coin-or- MAINTAINER= yuri@FreeBSD.org COMMENT= Solver for large scale sparse linear programming (LP) problems WWW= https://github.com/ERGO-Code/HiGHS LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -#LIB_DEPENDS= libOsi.so:math/osi -CONFLICTS_BUILD= coin-or-Osi # see https://github.com/ERGO-Code/HiGHS/issues/675 +LIB_DEPENDS= libOsi.so:math/osi USES= blaslapack cmake:testing compiler:c++11-lang pkgconfig USE_GITHUB= yes GH_ACCOUNT= ERGO-Code GH_PROJECT= HiGHS CMAKE_OFF= BUILD_TESTING post-install: # see https://github.com/ERGO-Code/HiGHS/issues/502 ${RM} -r ${STAGEDIR}${PREFIX}/external +# one test fails, see https://github.com/ERGO-Code/HiGHS/issues/1132 # tests fail to build on i386: undefined reference to fmax, see https://github.com/ERGO-Code/HiGHS/issues/505 -# 2 tests fail: https://github.com/ERGO-Code/HiGHS/issues/525 .include diff --git a/math/highs/distinfo b/math/highs/distinfo index 8593c6285e1c..93b94b251f97 100644 --- a/math/highs/distinfo +++ b/math/highs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1670498067 -SHA256 (ERGO-Code-HiGHS-v1.4.1_GH0.tar.gz) = 9890e02ff2d1607ed4d0708a0f2e3a2dc64da1f4301bb85cf1f2c924aa1fee7b -SIZE (ERGO-Code-HiGHS-v1.4.1_GH0.tar.gz) = 1825363 +TIMESTAMP = 1675623335 +SHA256 (ERGO-Code-HiGHS-v1.4.2_GH0.tar.gz) = 29330e284491143cd53a547c23178221df46423679a98f6684251e65cc384d2b +SIZE (ERGO-Code-HiGHS-v1.4.2_GH0.tar.gz) = 1825192 diff --git a/math/highs/pkg-plist b/math/highs/pkg-plist index ffe1d67f82be..d97fec36b5f7 100644 --- a/math/highs/pkg-plist +++ b/math/highs/pkg-plist @@ -1,136 +1,141 @@ bin/highs include/highs/HConfig.h include/highs/Highs.h include/highs/filereaderlp/builder.hpp include/highs/filereaderlp/model.hpp include/highs/filereaderlp/reader.hpp +include/highs/interfaces/OsiHiGHSSolverInterface.hpp include/highs/interfaces/highs_c_api.h include/highs/io/Filereader.h include/highs/io/FilereaderEms.h include/highs/io/FilereaderLp.h include/highs/io/FilereaderMps.h include/highs/io/HMPSIO.h include/highs/io/HMpsFF.h include/highs/io/HighsIO.h include/highs/io/LoadOptions.h include/highs/ipm/IpxWrapper.h include/highs/lp_data/HConst.h include/highs/lp_data/HStruct.h include/highs/lp_data/HighsAnalysis.h include/highs/lp_data/HighsDebug.h include/highs/lp_data/HighsInfo.h include/highs/lp_data/HighsInfoDebug.h include/highs/lp_data/HighsLp.h include/highs/lp_data/HighsLpSolverObject.h include/highs/lp_data/HighsLpUtils.h include/highs/lp_data/HighsModelUtils.h include/highs/lp_data/HighsOptions.h include/highs/lp_data/HighsRanging.h include/highs/lp_data/HighsRuntimeOptions.h include/highs/lp_data/HighsSolution.h include/highs/lp_data/HighsSolutionDebug.h include/highs/lp_data/HighsSolve.h include/highs/lp_data/HighsStatus.h include/highs/mip/HighsCliqueTable.h include/highs/mip/HighsConflictPool.h include/highs/mip/HighsCutGeneration.h include/highs/mip/HighsCutPool.h include/highs/mip/HighsDebugSol.h include/highs/mip/HighsDomain.h include/highs/mip/HighsDomainChange.h include/highs/mip/HighsDynamicRowMatrix.h include/highs/mip/HighsGFkSolve.h include/highs/mip/HighsImplications.h include/highs/mip/HighsLpAggregator.h include/highs/mip/HighsLpRelaxation.h include/highs/mip/HighsMipSolver.h include/highs/mip/HighsMipSolverData.h include/highs/mip/HighsModkSeparator.h include/highs/mip/HighsNodeQueue.h include/highs/mip/HighsObjectiveFunction.h include/highs/mip/HighsPathSeparator.h include/highs/mip/HighsPrimalHeuristics.h include/highs/mip/HighsPseudocost.h include/highs/mip/HighsRedcostFixing.h include/highs/mip/HighsSearch.h include/highs/mip/HighsSeparation.h include/highs/mip/HighsSeparator.h include/highs/mip/HighsTableauSeparator.h include/highs/mip/HighsTransformedLp.h include/highs/model/HighsHessian.h include/highs/model/HighsHessianUtils.h include/highs/model/HighsModel.h include/highs/parallel/HighsBinarySemaphore.h include/highs/parallel/HighsCacheAlign.h include/highs/parallel/HighsCombinable.h include/highs/parallel/HighsMutex.h include/highs/parallel/HighsParallel.h include/highs/parallel/HighsRaceTimer.h include/highs/parallel/HighsSchedulerConstants.h include/highs/parallel/HighsSpinMutex.h include/highs/parallel/HighsSplitDeque.h include/highs/parallel/HighsTask.h include/highs/parallel/HighsTaskExecutor.h include/highs/presolve/HPresolve.h include/highs/presolve/HPresolveAnalysis.h include/highs/presolve/HighsPostsolveStack.h include/highs/presolve/HighsSymmetry.h include/highs/presolve/ICrash.h include/highs/presolve/ICrashUtil.h include/highs/presolve/ICrashX.h include/highs/presolve/PresolveComponent.h include/highs/qpsolver/perturbation.hpp include/highs/qpsolver/quass.hpp include/highs/qpsolver/scaling.hpp include/highs/qpsolver/vector.hpp include/highs/simplex/HApp.h include/highs/simplex/HEkk.h include/highs/simplex/HEkkDual.h include/highs/simplex/HEkkDualRHS.h include/highs/simplex/HEkkDualRow.h include/highs/simplex/HEkkPrimal.h include/highs/simplex/HSimplex.h include/highs/simplex/HSimplexDebug.h include/highs/simplex/HSimplexNla.h include/highs/simplex/HSimplexReport.h include/highs/simplex/HighsSimplexAnalysis.h include/highs/simplex/SimplexConst.h include/highs/simplex/SimplexStruct.h include/highs/simplex/SimplexTimer.h include/highs/test/DevKkt.h include/highs/test/KktCh2.h include/highs/util/FactorTimer.h include/highs/util/HFactor.h include/highs/util/HFactorConst.h include/highs/util/HFactorDebug.h include/highs/util/HSet.h include/highs/util/HVector.h include/highs/util/HVectorBase.h include/highs/util/HighsCDouble.h include/highs/util/HighsComponent.h include/highs/util/HighsDataStack.h include/highs/util/HighsDisjointSets.h include/highs/util/HighsHash.h include/highs/util/HighsHashTree.h include/highs/util/HighsInt.h include/highs/util/HighsIntegers.h include/highs/util/HighsLinearSumBounds.h include/highs/util/HighsMatrixPic.h include/highs/util/HighsMatrixSlice.h include/highs/util/HighsMatrixUtils.h include/highs/util/HighsRandom.h include/highs/util/HighsRbTree.h include/highs/util/HighsSort.h include/highs/util/HighsSparseMatrix.h include/highs/util/HighsSparseVectorSum.h include/highs/util/HighsSplay.h include/highs/util/HighsTimer.h include/highs/util/HighsUtils.h include/highs/util/stringutil.h lib/cmake/highs/highs-config.cmake lib/cmake/highs/highs-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/highs/highs-targets.cmake +lib/libOsiHighs.so +lib/libOsiHighs.so.1.4 +lib/libOsiHighs.so.1.4.2 lib/libhighs.so lib/libhighs.so.1.4 -lib/libhighs.so.1.4.0 +lib/libhighs.so.1.4.2 libdata/pkgconfig/highs.pc +libdata/pkgconfig/osi-highs.pc