git: 5fa0bb8eded5 - main - math/highs: Update 1.4.1 → 1.4.2

The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5fa0bb8eded5056d393c3a187c0661648faddebd

commit 5fa0bb8eded5056d393c3a187c0661648faddebd
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-02-05 21:02:01 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-02-05 21:04:13 +0000

    math/highs: Update 1.4.1 → 1.4.2
    
    Reported by:    portscout
---
 math/highs/Makefile  | 7 +++----
 math/highs/distinfo  | 6 +++---
 math/highs/pkg-plist | 7 ++++++-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/math/highs/Makefile b/math/highs/Makefile
index 6823817ba1cf..f3dc6e291f88 100644
--- a/math/highs/Makefile
+++ b/math/highs/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	highs
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.4.1
+DISTVERSION=	1.4.2
 CATEGORIES=	math
 PKGNAMEPREFIX=	coin-or-
 
@@ -11,8 +11,7 @@ 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
 
@@ -25,7 +24,7 @@ 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 <bsd.port.mk>
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
@@ -4,6 +4,7 @@ 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
@@ -130,7 +131,11 @@ 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