svn commit: r520588 - in head/math/cbc: . files

[Yuri Victorovich]

Author: yuri
Date: Sat Dec 21 22:58:54 2019
New Revision: 520588
URL: https://svnweb.freebsd.org/changeset/ports/520588

Log:
  math/cbc: Update 2.9.9 -> 2.10.3

Modified:
  head/math/cbc/Makefile
  head/math/cbc/distinfo
  head/math/cbc/files/patch-Cbc_src_CbcModel.cpp
  head/math/cbc/pkg-plist

Modified: head/math/cbc/Makefile
==============================================================================
--- head/math/cbc/Makefile	Sat Dec 21 22:58:50 2019	(r520587)
+++ head/math/cbc/Makefile	Sat Dec 21 22:58:54 2019	(r520588)
@@ -2,9 +2,9 @@
 
 PORTNAME=	cbc
 DISTVERSIONPREFIX=	releases/
-DISTVERSION=	2.9.9
-PORTREVISION=	4
+DISTVERSION=	2.10.3
 CATEGORIES=	math
+PKGNAMEPREFIX=	coin-or-
 
 MAINTAINER=	yuri at FreeBSD.org
 COMMENT=	Coin-or Branch and Cut: mixed integer programming solver

Modified: head/math/cbc/distinfo
==============================================================================
--- head/math/cbc/distinfo	Sat Dec 21 22:58:50 2019	(r520587)
+++ head/math/cbc/distinfo	Sat Dec 21 22:58:54 2019	(r520588)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522614939
-SHA256 (coin-or-Cbc-releases-2.9.9_GH0.tar.gz) = 3760fa9fe24fe3390c8b3d5f03583a62652d9b159aef9b0b609e4948ef1b8f29
-SIZE (coin-or-Cbc-releases-2.9.9_GH0.tar.gz) = 1658623
+TIMESTAMP = 1576962809
+SHA256 (coin-or-Cbc-releases-2.10.3_GH0.tar.gz) = 944c1f717e653aa04f4d6c775aa91d749ab5990d6ee9c3e4f76b9df5bc6e2a8d
+SIZE (coin-or-Cbc-releases-2.10.3_GH0.tar.gz) = 1637904

Modified: head/math/cbc/files/patch-Cbc_src_CbcModel.cpp
==============================================================================
--- head/math/cbc/files/patch-Cbc_src_CbcModel.cpp	Sat Dec 21 22:58:50 2019	(r520587)
+++ head/math/cbc/files/patch-Cbc_src_CbcModel.cpp	Sat Dec 21 22:58:54 2019	(r520588)
@@ -1,11 +1,11 @@
---- Cbc/src/CbcModel.cpp.orig	2018-04-16 07:45:54 UTC
+--- Cbc/src/CbcModel.cpp.orig	2019-12-21 21:30:53 UTC
 +++ Cbc/src/CbcModel.cpp
-@@ -5338,7 +5338,7 @@ void CbcModel::branchAndBound(int doStat
-         OsiClpSolverInterface * clpSolver
-         = dynamic_cast<OsiClpSolverInterface *> (solver_);
-         if (clpSolver)
--            clpSolver->setFakeObjective(reinterpret_cast<double *> (NULL));
-+            clpSolver->setFakeObjective((double*)nullptr);
-     }
+@@ -5417,7 +5417,7 @@ void CbcModel::branchAndBound(int doStatistics)
+     OsiClpSolverInterface *clpSolver
+       = dynamic_cast< OsiClpSolverInterface * >(solver_);
+     if (clpSolver)
+-      clpSolver->setFakeObjective(reinterpret_cast< double * >(NULL));
++      clpSolver->setFakeObjective((double*)nullptr);
+   }
  #endif
-     moreSpecialOptions_ = saveMoreSpecialOptions;
+   moreSpecialOptions_ = saveMoreSpecialOptions;

Modified: head/math/cbc/pkg-plist
==============================================================================
--- head/math/cbc/pkg-plist	Sat Dec 21 22:58:50 2019	(r520587)
+++ head/math/cbc/pkg-plist	Sat Dec 21 22:58:54 2019	(r520588)
@@ -77,13 +77,13 @@ include/coin/ClpConstraintAmpl.hpp
 include/coin/OsiCbcSolverInterface.hpp
 lib/libCbc.so
 lib/libCbc.so.3
-lib/libCbc.so.3.9.9
+lib/libCbc.so.3.10.3
 lib/libCbcSolver.so
 lib/libCbcSolver.so.3
-lib/libCbcSolver.so.3.9.9
+lib/libCbcSolver.so.3.10.3
 lib/libOsiCbc.so
 lib/libOsiCbc.so.3
-lib/libOsiCbc.so.3.9.9
+lib/libOsiCbc.so.3.10.3
 libdata/pkgconfig/cbc.pc
 libdata/pkgconfig/osi-cbc.pc
 share/coin/doc/Cbc/AUTHORS