View | Details | Raw Unified | Return to bug 199430 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/ports/math/coinmp/Makefile (-3 / +3 lines)
Lines 2-13 Link Here
2
# $FreeBSD: head/math/coinmp/Makefile 378905 2015-02-13 01:01:35Z brd $
2
# $FreeBSD: head/math/coinmp/Makefile 378905 2015-02-13 01:01:35Z brd $
3
3
4
PORTNAME=	CoinMP
4
PORTNAME=	CoinMP
5
PORTVERSION=	1.8.0
5
PORTVERSION=	1.8.1
6
CATEGORIES=	math
6
CATEGORIES=	math
7
MASTER_SITES=	http://www.coin-or.org/download/source/CoinMP/
7
MASTER_SITES=	http://www.coin-or.org/download/source/CoinMP/
8
8
9
MAINTAINER=	cpm@fbsd.es
9
MAINTAINER=	cpm@fbsd.es
10
COMMENT=	Optimization library with support for COIN-OR CLP, CBC, and CGL
10
COMMENT=	Optimization library with support for COIN-OR, CLP, CBC and CGL
11
11
12
LICENSE=	CPL
12
LICENSE=	CPL
13
LICENSE_NAME=	Common Public License, Version 1.0
13
LICENSE_NAME=	Common Public License, Version 1.0
Lines 62-68 Link Here
62
.endfor
62
.endfor
63
63
64
check regression-test test: build
64
check regression-test test: build
65
	@(cd ${WRKSRC};  ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
65
	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
66
	${MAKE_ARGS} test)
66
	${MAKE_ARGS} test)
67
67
68
.include <bsd.port.mk>
68
.include <bsd.port.mk>
(-)/usr/ports/math/coinmp/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (CoinMP-1.8.0.tgz) = 4f17c221ca9a38a692ebf53497bf2630be258581583e911955b269c0cc88b627
1
SHA256 (CoinMP-1.8.1.tgz) = 2be92d64a515d9cf0194c1cda4e1ec0b55512f88ce5a7cf1254ffc89e20608d7
2
SIZE (CoinMP-1.8.0.tgz) = 10619577
2
SIZE (CoinMP-1.8.1.tgz) = 10632857
(-)/usr/ports/math/coinmp/files/patch-Cbc__src__CbcEventHandler.hpp (-10 lines)
Lines 1-10 Link Here
1
--- Cbc/src/CbcEventHandler.hpp.orig	2007-08-10 12:18:20.000000000 -0400
2
+++ Cbc/src/CbcEventHandler.hpp	2011-07-29 06:16:23.000000000 -0400
3
@@ -43,6 +43,7 @@
4
 */
5
 
6
 #include <map>
7
+#include <cstddef>
8
 
9
 /* May well already be declared, but can't hurt. */
10
 
(-)/usr/ports/math/coinmp/files/patch-Cbc__src__CbcSolver.cpp (-4 / +3 lines)
Lines 1-7 Link Here
1
This looks like a gcc 4.2.1 bug.
1
--- Cbc/src/CbcSolver.cpp.orig	2015-04-15 13:45:08 UTC
2
--- Cbc/src/CbcSolver.cpp.orig	2011-12-23 10:36:33.000000000 -0500
2
+++ Cbc/src/CbcSolver.cpp
3
+++ Cbc/src/CbcSolver.cpp	2011-12-23 10:41:57.000000000 -0500
3
@@ -1876,10 +1876,6 @@ int CbcMain1 (int argc, const char *argv
4
@@ -1665,10 +1665,6 @@
5
 	    }
4
 	    }
6
 	    sprintf(generalPrint + strlen(generalPrint),
5
 	    sprintf(generalPrint + strlen(generalPrint),
7
 		    "Build Date: %s \n", __DATE__);
6
 		    "Build Date: %s \n", __DATE__);
(-)/usr/ports/math/coinmp/files/patch-CoinUtils_src_CoinSignal.hpp (+11 lines)
Line 0 Link Here
1
--- CoinUtils/src/CoinSignal.hpp.orig	2015-04-15 15:07:42 UTC
2
+++ CoinUtils/src/CoinSignal.hpp
3
@@ -44,7 +44,7 @@
4
 //-----------------------------------------------------------------------------
5
 
6
 #if defined(__FreeBSD__) && defined(__GNUC__)
7
-   typedef __decltype(SIG_DFL) CoinSighandler_t;
8
+   typedef typeof(SIG_DFL) CoinSighandler_t;
9
 #  define CoinSighandler_t_defined
10
 #endif
11
 
(-)/usr/ports/math/coinmp/pkg-plist (-11 / +12 lines)
Lines 63-68 Link Here
63
include/coin/CbcObjectUpdateData.hpp
63
include/coin/CbcObjectUpdateData.hpp
64
include/coin/CbcOrClpParam.cpp
64
include/coin/CbcOrClpParam.cpp
65
include/coin/CbcOrClpParam.hpp
65
include/coin/CbcOrClpParam.hpp
66
include/coin/CbcParam.hpp
66
include/coin/CbcPartialNodeInfo.hpp
67
include/coin/CbcPartialNodeInfo.hpp
67
include/coin/CbcSOS.hpp
68
include/coin/CbcSOS.hpp
68
include/coin/CbcSimpleInteger.hpp
69
include/coin/CbcSimpleInteger.hpp
Lines 230-266 Link Here
230
include/coin/OsiUnitTests.hpp
231
include/coin/OsiUnitTests.hpp
231
lib/libCbc.so
232
lib/libCbc.so
232
lib/libCbc.so.3
233
lib/libCbc.so.3
233
lib/libCbc.so.3.9.2
234
lib/libCbc.so.3.9.4
234
lib/libCbcSolver.so
235
lib/libCbcSolver.so
235
lib/libCbcSolver.so.3
236
lib/libCbcSolver.so.3
236
lib/libCbcSolver.so.3.9.2
237
lib/libCbcSolver.so.3.9.4
237
lib/libCgl.so
238
lib/libCgl.so
238
lib/libCgl.so.1
239
lib/libCgl.so.1
239
lib/libCgl.so.1.9.2
240
lib/libCgl.so.1.9.4
240
lib/libClp.so
241
lib/libClp.so
241
lib/libClp.so.1
242
lib/libClp.so.1
242
lib/libClp.so.1.13.3
243
lib/libClp.so.1.13.6
243
lib/libClpSolver.so
244
lib/libClpSolver.so
244
lib/libClpSolver.so.1
245
lib/libClpSolver.so.1
245
lib/libClpSolver.so.1.13.3
246
lib/libClpSolver.so.1.13.6
246
lib/libCoinMP.so
247
lib/libCoinMP.so
247
lib/libCoinMP.so.1
248
lib/libCoinMP.so.1
248
lib/libCoinMP.so.1.8.0
249
lib/libCoinMP.so.1.8.1
249
lib/libCoinUtils.so
250
lib/libCoinUtils.so
250
lib/libCoinUtils.so.3
251
lib/libCoinUtils.so.3
251
lib/libCoinUtils.so.3.10.3
252
lib/libCoinUtils.so.3.10.6
252
lib/libOsi.so
253
lib/libOsi.so
253
lib/libOsi.so.1
254
lib/libOsi.so.1
254
lib/libOsi.so.1.12.2
255
lib/libOsi.so.1.12.4
255
lib/libOsiCbc.so
256
lib/libOsiCbc.so
256
lib/libOsiCbc.so.3
257
lib/libOsiCbc.so.3
257
lib/libOsiCbc.so.3.9.2
258
lib/libOsiCbc.so.3.9.4
258
lib/libOsiClp.so
259
lib/libOsiClp.so
259
lib/libOsiClp.so.1
260
lib/libOsiClp.so.1
260
lib/libOsiClp.so.1.13.3
261
lib/libOsiClp.so.1.13.6
261
lib/libOsiCommonTests.so
262
lib/libOsiCommonTests.so
262
lib/libOsiCommonTests.so.1
263
lib/libOsiCommonTests.so.1
263
lib/libOsiCommonTests.so.1.12.2
264
lib/libOsiCommonTests.so.1.12.4
264
libdata/pkgconfig/cbc.pc
265
libdata/pkgconfig/cbc.pc
265
libdata/pkgconfig/cgl.pc
266
libdata/pkgconfig/cgl.pc
266
libdata/pkgconfig/clp.pc
267
libdata/pkgconfig/clp.pc

Return to bug 199430