math/coinmp: 1.8.0 -> 1.8.1

- Minor fixes

PR:		199430
Submitted by:	Carlos Jacobo Puga Medina <cpm@fbsd.es> (maintainer)

6 files changed, 31 insertions, 30 deletions

diff --git a/math/coinmp/Makefile b/math/coinmp/Makefile
index 023042f12962..8f4e4712ad5f 100644
--- a/math/coinmp/Makefile
+++ b/math/coinmp/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	CoinMP
-PORTVERSION=	1.8.0
+PORTVERSION=	1.8.1
 CATEGORIES=	math
 MASTER_SITES=	http://www.coin-or.org/download/source/CoinMP/
 
 MAINTAINER=	cpm@fbsd.es
-COMMENT=	Optimization library with support for COIN-OR CLP, CBC, and CGL
+COMMENT=	Optimization library with support for COIN-OR, CLP, CBC and CGL
 
 LICENSE=	CPL
 LICENSE_NAME=	Common Public License, Version 1.0
@@ -62,7 +62,7 @@ post-install:
 .endfor
 
 check regression-test test: build
-	@(cd ${WRKSRC};  ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
 	${MAKE_ARGS} test)
 
 .include <bsd.port.mk>
diff --git a/math/coinmp/distinfo b/math/coinmp/distinfo
index f488a2dde953..e3ac2a24e8ad 100644
--- a/math/coinmp/distinfo
+++ b/math/coinmp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (CoinMP-1.8.0.tgz) = 4f17c221ca9a38a692ebf53497bf2630be258581583e911955b269c0cc88b627
-SIZE (CoinMP-1.8.0.tgz) = 10619577
+SHA256 (CoinMP-1.8.1.tgz) = 2be92d64a515d9cf0194c1cda4e1ec0b55512f88ce5a7cf1254ffc89e20608d7
+SIZE (CoinMP-1.8.1.tgz) = 10632857
diff --git a/math/coinmp/files/patch-Cbc__src__CbcEventHandler.hpp b/math/coinmp/files/patch-Cbc__src__CbcEventHandler.hpp
deleted file mode 100644
index cb88e0dbbbef..000000000000
--- a/math/coinmp/files/patch-Cbc__src__CbcEventHandler.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- Cbc/src/CbcEventHandler.hpp.orig	2007-08-10 12:18:20.000000000 -0400
-+++ Cbc/src/CbcEventHandler.hpp	2011-07-29 06:16:23.000000000 -0400
-@@ -43,6 +43,7 @@
- */
- 
- #include <map>
-+#include <cstddef>
- 
- /* May well already be declared, but can't hurt. */
- 
diff --git a/math/coinmp/files/patch-Cbc__src__CbcSolver.cpp b/math/coinmp/files/patch-Cbc__src__CbcSolver.cpp
index 55748e8cf725..164f1838af04 100644
--- a/math/coinmp/files/patch-Cbc__src__CbcSolver.cpp
+++ b/math/coinmp/files/patch-Cbc__src__CbcSolver.cpp
@@ -1,7 +1,6 @@
-This looks like a gcc 4.2.1 bug.
---- Cbc/src/CbcSolver.cpp.orig	2011-12-23 10:36:33.000000000 -0500
-+++ Cbc/src/CbcSolver.cpp	2011-12-23 10:41:57.000000000 -0500
-@@ -1665,10 +1665,6 @@
+--- Cbc/src/CbcSolver.cpp.orig	2011-12-23 05:36:33 UTC
++++ Cbc/src/CbcSolver.cpp
+@@ -1876,10 +1876,6 @@ int CbcMain1 (int argc, const char *argv
  	    }
  	    sprintf(generalPrint + strlen(generalPrint),
  		    "Build Date: %s \n", __DATE__);
diff --git a/math/coinmp/files/patch-CoinUtils_src_CoinSignal.hpp b/math/coinmp/files/patch-CoinUtils_src_CoinSignal.hpp
new file mode 100644
index 000000000000..9915cd79ee09
--- /dev/null
+++ b/math/coinmp/files/patch-CoinUtils_src_CoinSignal.hpp
@@ -0,0 +1,11 @@
+--- CoinUtils/src/CoinSignal.hpp.orig	2015-04-15 15:07:42 UTC
++++ CoinUtils/src/CoinSignal.hpp
+@@ -44,7 +44,7 @@
+ //-----------------------------------------------------------------------------
+ 
+ #if defined(__FreeBSD__) && defined(__GNUC__)
+-   typedef __decltype(SIG_DFL) CoinSighandler_t;
++   typedef typeof(SIG_DFL) CoinSighandler_t;
+ #  define CoinSighandler_t_defined
+ #endif
+ 
diff --git a/math/coinmp/pkg-plist b/math/coinmp/pkg-plist
index 60b5cbaa5267..b984a5e583d0 100644
--- a/math/coinmp/pkg-plist
+++ b/math/coinmp/pkg-plist
@@ -63,6 +63,7 @@ include/coin/CbcObject.hpp
 include/coin/CbcObjectUpdateData.hpp
 include/coin/CbcOrClpParam.cpp
 include/coin/CbcOrClpParam.hpp
+include/coin/CbcParam.hpp
 include/coin/CbcPartialNodeInfo.hpp
 include/coin/CbcSOS.hpp
 include/coin/CbcSimpleInteger.hpp
@@ -230,37 +231,37 @@ include/coin/OsiSolverParameters.hpp
 include/coin/OsiUnitTests.hpp
 lib/libCbc.so
 lib/libCbc.so.3
-lib/libCbc.so.3.9.2
+lib/libCbc.so.3.9.4
 lib/libCbcSolver.so
 lib/libCbcSolver.so.3
-lib/libCbcSolver.so.3.9.2
+lib/libCbcSolver.so.3.9.4
 lib/libCgl.so
 lib/libCgl.so.1
-lib/libCgl.so.1.9.2
+lib/libCgl.so.1.9.4
 lib/libClp.so
 lib/libClp.so.1
-lib/libClp.so.1.13.3
+lib/libClp.so.1.13.6
 lib/libClpSolver.so
 lib/libClpSolver.so.1
-lib/libClpSolver.so.1.13.3
+lib/libClpSolver.so.1.13.6
 lib/libCoinMP.so
 lib/libCoinMP.so.1
-lib/libCoinMP.so.1.8.0
+lib/libCoinMP.so.1.8.1
 lib/libCoinUtils.so
 lib/libCoinUtils.so.3
-lib/libCoinUtils.so.3.10.3
+lib/libCoinUtils.so.3.10.6
 lib/libOsi.so
 lib/libOsi.so.1
-lib/libOsi.so.1.12.2
+lib/libOsi.so.1.12.4
 lib/libOsiCbc.so
 lib/libOsiCbc.so.3
-lib/libOsiCbc.so.3.9.2
+lib/libOsiCbc.so.3.9.4
 lib/libOsiClp.so
 lib/libOsiClp.so.1
-lib/libOsiClp.so.1.13.3
+lib/libOsiClp.so.1.13.6
 lib/libOsiCommonTests.so
 lib/libOsiCommonTests.so.1
-lib/libOsiCommonTests.so.1.12.2
+lib/libOsiCommonTests.so.1.12.4
 libdata/pkgconfig/cbc.pc
 libdata/pkgconfig/cgl.pc
 libdata/pkgconfig/clp.pc