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

Collapse All | Expand All

(-)coinmp/Makefile (-1 / +7 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	CoinMP
8
PORTNAME=	CoinMP
9
PORTVERSION=	1.4.0
9
PORTVERSION=	1.6.0
10
CATEGORIES=	math
10
CATEGORIES=	math
11
MASTER_SITES=	http://www.coin-or.org/download/source/CoinMP/
11
MASTER_SITES=	http://www.coin-or.org/download/source/CoinMP/
12
EXTRACT_SUFX=	.tgz
12
EXTRACT_SUFX=	.tgz
Lines 40-45 Link Here
40
CXXFLAGS+=	-fomit-frame-pointer
40
CXXFLAGS+=	-fomit-frame-pointer
41
.endif
41
.endif
42
42
43
post-install:
44
.ifndef NOPORTDOCS
45
	${MV} ${PREFIX}/share/coin/doc ${DOCSDIR}
46
.endif
47
	${RM} -rf ${PREFIX}/share/coin
48
43
check regression-test test: build
49
check regression-test test: build
44
	@(cd ${WRKSRC};  ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
50
	@(cd ${WRKSRC};  ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
45
	${MAKE_ARGS} test)
51
	${MAKE_ARGS} test)
(-)coinmp/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (CoinMP-1.4.0.tgz) = 93bc015e4affc31a97be8360238ef1e0a8ea7d3fa8b15627a14f13b8b1d5b032
1
SHA256 (CoinMP-1.6.0.tgz) = 33eccad711dcf5a511cd2246267996df5b73d067a14214c1f2fad4bc1aecc971
2
SIZE (CoinMP-1.4.0.tgz) = 11087531
2
SIZE (CoinMP-1.6.0.tgz) = 12400327
(-)coinmp/files/patch-Cbc__src__CbcSolver.cpp (+13 lines)
Line 0 Link Here
1
--- Cbc/src/CbcSolver.cpp.orig	2011-12-23 10:36:33.000000000 -0500
2
+++ Cbc/src/CbcSolver.cpp	2011-12-23 10:41:57.000000000 -0500
3
@@ -1665,10 +1665,6 @@
4
 	    }
5
 	    sprintf(generalPrint + strlen(generalPrint),
6
 		    "Build Date: %s \n", __DATE__);
7
-#ifdef CBC_SVN_REV
8
-	    sprintf(generalPrint + strlen(generalPrint),
9
-		    "Revision Number: %d \n", CBC_SVN_REV);
10
-#endif
11
             generalMessageHandler->message(CLP_GENERAL, generalMessages)
12
             << generalPrint
13
             << CoinMessageEol;
(-)coinmp/files/patch-CoinUtils+src+CoinParam.hpp (-10 lines)
Lines 1-10 Link Here
1
--- CoinUtils/src/CoinParam.hpp.orig	2009-08-16 22:33:13.000000000 -0500
2
+++ CoinUtils/src/CoinParam.hpp	2009-08-16 22:34:23.000000000 -0500
3
@@ -12,6 +12,7 @@
4
 
5
 #include <vector>
6
 #include <string>
7
+#include <cstdio>
8
 
9
 /*! \class CoinParam
10
     \brief A base class for `keyword value' command line parameters.
(-)coinmp/pkg-plist (-96 / +119 lines)
Lines 1-8 Link Here
1
bin/cbc
1
bin/cbc
2
bin/clp
2
bin/clp
3
include/coin/CbcBranchAllDifferent.hpp
4
include/coin/CbcBranchDecision.hpp
5
include/coin/CbcBranchDefaultDecision.hpp
6
include/coin/CbcBranchToFixLots.hpp
7
include/coin/CbcBranchingObject.hpp
8
include/coin/CbcClique.hpp
9
include/coin/CbcCompare.hpp
10
include/coin/CbcCompareDefault.hpp
11
include/coin/CbcCompareDepth.hpp
12
include/coin/CbcCompareEstimate.hpp
13
include/coin/CbcCompareObjective.hpp
14
include/coin/CbcConsequence.hpp
15
include/coin/CbcCutModifier.hpp
16
include/coin/CbcCutSubsetModifier.hpp
17
include/coin/CbcDummyBranchingObject.hpp
18
include/coin/CbcFixVariable.hpp
19
include/coin/CbcFollowOn.hpp
20
include/coin/CbcFullNodeInfo.hpp
21
include/coin/CbcGeneral.hpp
22
include/coin/CbcGeneralDepth.hpp
23
include/coin/CbcHeuristicDINS.hpp
24
include/coin/CbcHeuristicRENS.hpp
25
include/coin/CbcHeuristicVND.hpp
26
include/coin/CbcNWay.hpp
27
include/coin/CbcNodeInfo.hpp
28
include/coin/CbcObject.hpp
29
include/coin/CbcObjectUpdateData.hpp
30
include/coin/CbcOrClpParam.cpp
31
include/coin/CbcOrClpParam.hpp
32
include/coin/CbcPartialNodeInfo.hpp
33
include/coin/CbcSOS.hpp
34
include/coin/CbcSimpleInteger.hpp
35
include/coin/CbcSimpleIntegerDynamicPseudoCost.hpp
36
include/coin/CbcSimpleIntegerPseudoCost.hpp
37
include/coin/CbcSubProblem.hpp
38
include/coin/ClpConfig.h
39
include/coin/Clp_C_Interface.h
40
include/coin/ClpCholeskyBase.hpp
41
include/coin/ClpCholeskyDense.hpp
42
include/coin/ClpConstraint.hpp
43
include/coin/ClpConstraintLinear.hpp
44
include/coin/ClpConstraintQuadratic.hpp
45
include/coin/ClpNode.hpp
46
include/coin/ClpDualRowDantzig.hpp
47
include/coin/ClpDualRowPivot.hpp
48
include/coin/ClpDualRowSteepest.hpp
49
include/coin/ClpDummyMatrix.hpp
50
include/coin/ClpDynamicExampleMatrix.hpp
51
include/coin/ClpDynamicMatrix.hpp
52
include/coin/ClpEventHandler.hpp
53
include/coin/ClpFactorization.hpp
54
include/coin/ClpGubDynamicMatrix.hpp
55
include/coin/ClpGubMatrix.hpp
56
include/coin/ClpInterior.hpp
57
include/coin/ClpLinearObjective.hpp
58
include/coin/ClpMatrixBase.hpp
59
include/coin/ClpMessage.hpp
60
include/coin/ClpModel.hpp
61
include/coin/ClpNetworkMatrix.hpp
62
include/coin/ClpNonLinearCost.hpp
63
include/coin/ClpObjective.hpp
64
include/coin/ClpPackedMatrix.hpp
65
include/coin/ClpPdcoBase.hpp
66
include/coin/ClpPlusMinusOneMatrix.hpp
67
include/coin/ClpParameters.hpp
68
include/coin/ClpPresolve.hpp
69
include/coin/ClpPrimalColumnDantzig.hpp
70
include/coin/ClpPrimalColumnPivot.hpp
71
include/coin/ClpPrimalColumnSteepest.hpp
72
include/coin/ClpQuadraticObjective.hpp
73
include/coin/ClpSimplex.hpp
74
include/coin/ClpSimplexNonlinear.hpp
75
include/coin/ClpSimplexOther.hpp
76
include/coin/ClpSimplexPrimal.hpp
77
include/coin/ClpSolve.hpp
3
include/coin/CoinAlloc.hpp
78
include/coin/CoinAlloc.hpp
4
include/coin/CoinUtilsConfig.h
79
include/coin/CoinUtilsConfig.h
5
include/coin/config_coinutils.h
6
include/coin/Coin_C_defines.h
80
include/coin/Coin_C_defines.h
7
include/coin/CoinBuild.hpp
81
include/coin/CoinBuild.hpp
8
include/coin/CoinDenseVector.hpp
82
include/coin/CoinDenseVector.hpp
Lines 23-28 Link Here
23
include/coin/CoinStructuredModel.hpp
97
include/coin/CoinStructuredModel.hpp
24
include/coin/CoinModelUseful.hpp
98
include/coin/CoinModelUseful.hpp
25
include/coin/CoinMpsIO.hpp
99
include/coin/CoinMpsIO.hpp
100
include/coin/CoinOslFactorization.hpp
26
include/coin/CoinPackedMatrix.hpp
101
include/coin/CoinPackedMatrix.hpp
27
include/coin/CoinPackedVector.hpp
102
include/coin/CoinPackedVector.hpp
28
include/coin/CoinPackedVectorBase.hpp
103
include/coin/CoinPackedVectorBase.hpp
Lines 58-110 Link Here
58
include/coin/CoinWarmStartVector.hpp
133
include/coin/CoinWarmStartVector.hpp
59
include/coin/CoinWarmStartDual.hpp
134
include/coin/CoinWarmStartDual.hpp
60
include/coin/CoinWarmStartPrimalDual.hpp
135
include/coin/CoinWarmStartPrimalDual.hpp
61
include/coin/config_clp.h
62
include/coin/ClpConfig.h
63
include/coin/Clp_C_Interface.h
64
include/coin/ClpCholeskyBase.hpp
65
include/coin/ClpCholeskyDense.hpp
66
include/coin/ClpCholeskyWssmp.hpp
67
include/coin/ClpConstraint.hpp
68
include/coin/ClpConstraintLinear.hpp
69
include/coin/ClpConstraintQuadratic.hpp
70
include/coin/ClpNode.hpp
71
include/coin/ClpDualRowDantzig.hpp
72
include/coin/ClpDualRowPivot.hpp
73
include/coin/ClpDualRowSteepest.hpp
74
include/coin/ClpDummyMatrix.hpp
75
include/coin/ClpDynamicExampleMatrix.hpp
76
include/coin/ClpDynamicMatrix.hpp
77
include/coin/ClpEventHandler.hpp
78
include/coin/ClpFactorization.hpp
79
include/coin/ClpGubDynamicMatrix.hpp
80
include/coin/ClpGubMatrix.hpp
81
include/coin/ClpInterior.hpp
82
include/coin/ClpLinearObjective.hpp
83
include/coin/ClpMatrixBase.hpp
84
include/coin/ClpMessage.hpp
85
include/coin/ClpModel.hpp
86
include/coin/ClpNetworkMatrix.hpp
87
include/coin/ClpNonLinearCost.hpp
88
include/coin/ClpObjective.hpp
89
include/coin/ClpPackedMatrix.hpp
90
include/coin/ClpPdcoBase.hpp
91
include/coin/ClpPlusMinusOneMatrix.hpp
92
include/coin/ClpParameters.hpp
93
include/coin/ClpPresolve.hpp
94
include/coin/ClpPrimalColumnDantzig.hpp
95
include/coin/ClpPrimalColumnPivot.hpp
96
include/coin/ClpPrimalColumnSteepest.hpp
97
include/coin/ClpQuadraticObjective.hpp
98
include/coin/ClpSimplex.hpp
99
include/coin/ClpSimplexDual.hpp
100
include/coin/ClpSimplexNonlinear.hpp
101
include/coin/ClpSimplexOther.hpp
102
include/coin/ClpSimplexPrimal.hpp
103
include/coin/ClpSolve.hpp
104
include/coin/CbcOrClpParam.hpp
105
include/coin/CbcOrClpParam.cpp
106
include/coin/Idiot.hpp
136
include/coin/Idiot.hpp
107
include/coin/config_osi.h
108
include/coin/OsiConfig.h
137
include/coin/OsiConfig.h
109
include/coin/OsiAuxInfo.hpp
138
include/coin/OsiAuxInfo.hpp
110
include/coin/OsiBranchingObject.hpp
139
include/coin/OsiBranchingObject.hpp
Lines 113-119 Link Here
113
include/coin/OsiCollections.hpp
142
include/coin/OsiCollections.hpp
114
include/coin/OsiCut.hpp
143
include/coin/OsiCut.hpp
115
include/coin/OsiCuts.hpp
144
include/coin/OsiCuts.hpp
116
include/coin/OsiOpbdpSolve.hpp
117
include/coin/OsiPresolve.hpp
145
include/coin/OsiPresolve.hpp
118
include/coin/OsiSolverBranch.hpp
146
include/coin/OsiSolverBranch.hpp
119
include/coin/OsiSolverInterface.hpp
147
include/coin/OsiSolverInterface.hpp
Lines 121-128 Link Here
121
include/coin/OsiRowCut.hpp
149
include/coin/OsiRowCut.hpp
122
include/coin/OsiRowCutDebugger.hpp
150
include/coin/OsiRowCutDebugger.hpp
123
include/coin/OsiCbcSolverInterface.hpp
151
include/coin/OsiCbcSolverInterface.hpp
124
include/coin/OsiClpParamMap.hpp
125
include/coin/OsiClpSolverInterface.hpp
152
include/coin/OsiClpSolverInterface.hpp
153
include/coin/OsiUnitTests.hpp
126
include/coin/CglClique.hpp
154
include/coin/CglClique.hpp
127
include/coin/CglMixedIntegerRounding.hpp
155
include/coin/CglMixedIntegerRounding.hpp
128
include/coin/CglDuplicateRow.hpp
156
include/coin/CglDuplicateRow.hpp
Lines 134-140 Link Here
134
include/coin/CglFlowCover.hpp
162
include/coin/CglFlowCover.hpp
135
include/coin/CglPreProcess.hpp
163
include/coin/CglPreProcess.hpp
136
include/coin/CglLandP.hpp
164
include/coin/CglLandP.hpp
137
include/coin/CglLandPSimplex.hpp
138
include/coin/CglLandPValidator.hpp
165
include/coin/CglLandPValidator.hpp
139
include/coin/CglProbing.hpp
166
include/coin/CglProbing.hpp
140
include/coin/CglOddHole.hpp
167
include/coin/CglOddHole.hpp
Lines 143-156 Link Here
143
include/coin/CglResidualCapacity.hpp
170
include/coin/CglResidualCapacity.hpp
144
include/coin/CglRedSplit.hpp
171
include/coin/CglRedSplit.hpp
145
include/coin/CglRedSplitParam.hpp
172
include/coin/CglRedSplitParam.hpp
146
include/coin/config_cgl.h
147
include/coin/CglConfig.h
173
include/coin/CglConfig.h
148
include/coin/CglCutGenerator.hpp
174
include/coin/CglCutGenerator.hpp
149
include/coin/CglMessage.hpp
175
include/coin/CglMessage.hpp
150
include/coin/CglStored.hpp
176
include/coin/CglStored.hpp
151
include/coin/CglParam.hpp
177
include/coin/CglParam.hpp
152
include/coin/CglTreeInfo.hpp
178
include/coin/CglTreeInfo.hpp
153
include/coin/config_cbc.h
154
include/coin/CbcConfig.h
179
include/coin/CbcConfig.h
155
include/coin/Cbc_C_Interface.h
180
include/coin/Cbc_C_Interface.h
156
include/coin/CbcBranchActual.hpp
181
include/coin/CbcBranchActual.hpp
Lines 188-255 Link Here
188
include/coin/CbcTreeLocal.hpp
213
include/coin/CbcTreeLocal.hpp
189
include/coin/ClpConstraintAmpl.hpp
214
include/coin/ClpConstraintAmpl.hpp
190
include/coin/ClpAmplObjective.hpp
215
include/coin/ClpAmplObjective.hpp
191
include/coin/config_coinmp.h
192
include/coin/CoinMPConfig.h
216
include/coin/CoinMPConfig.h
193
include/coin/CoinMP.h
217
include/coin/CoinMP.h
194
@dirrm include/coin
218
@dirrm include/coin
195
share/doc/coin/CoinMP/README
196
share/doc/coin/CoinMP/AUTHORS
197
share/doc/coin/CoinMP/LICENSE
198
share/doc/coin/CoinMP/coinmp_addlibs.txt
199
share/doc/coin/CoinMP/examples/Makefile
200
share/doc/coin/CoinMP/examples/example.c
201
@dirrm share/doc/coin/CoinMP/examples
202
@dirrm share/doc/coin/CoinMP
203
share/doc/coin/Cbc/README
204
share/doc/coin/Cbc/AUTHORS
205
share/doc/coin/Cbc/LICENSE
206
share/doc/coin/Cbc/cbc_addlibs.txt
207
@dirrm share/doc/coin/Cbc
208
share/doc/coin/Cgl/README
209
share/doc/coin/Cgl/AUTHORS
210
share/doc/coin/Cgl/LICENSE
211
share/doc/coin/Cgl/cgl_addlibs.txt
212
@dirrm share/doc/coin/Cgl
213
share/doc/coin/Clp/AUTHORS
214
share/doc/coin/Clp/LICENSE
215
share/doc/coin/Clp/README
216
share/doc/coin/Clp/clp_addlibs.txt
217
@dirrm share/doc/coin/Clp
218
share/doc/coin/CoinUtils/AUTHORS
219
share/doc/coin/CoinUtils/LICENSE
220
share/doc/coin/CoinUtils/README
221
share/doc/coin/CoinUtils/coinutils_addlibs.txt
222
@dirrm share/doc/coin/CoinUtils
223
share/doc/coin/Osi/README
224
share/doc/coin/Osi/AUTHORS
225
share/doc/coin/Osi/LICENSE
226
share/doc/coin/Osi/osi_addlibs.txt
227
@dirrm share/doc/coin/Osi
228
@dirrm share/doc/coin
229
lib/libCbc.la
219
lib/libCbc.la
230
lib/libCbc.so
220
lib/libCbc.so
231
lib/libCbc.so.0
221
lib/libCbc.so.10
232
lib/libCbcSolver.la
222
lib/libCbcSolver.la
233
lib/libCbcSolver.so
223
lib/libCbcSolver.so
234
lib/libCbcSolver.so.0
224
lib/libCbcSolver.so.10
235
lib/libCgl.la
225
lib/libCgl.la
236
lib/libCgl.so
226
lib/libCgl.so
237
lib/libCgl.so.0
227
lib/libCgl.so.8
238
lib/libClp.la
228
lib/libClp.la
239
lib/libClp.so
229
lib/libClp.so
240
lib/libClp.so.0
230
lib/libClp.so.12
241
lib/libCoinMP.la
231
lib/libCoinMP.la
242
lib/libCoinMP.so
232
lib/libCoinMP.so
243
lib/libCoinMP.so.0
233
lib/libCoinMP.so.7
244
lib/libCoinUtils.la
234
lib/libCoinUtils.la
245
lib/libCoinUtils.so
235
lib/libCoinUtils.so
246
lib/libCoinUtils.so.0
236
lib/libCoinUtils.so.11
247
lib/libOsi.la
237
lib/libOsi.la
248
lib/libOsi.so
238
lib/libOsi.so
249
lib/libOsi.so.0
239
lib/libOsi.so.11
250
lib/libOsiCbc.la
240
lib/libOsiCbc.la
251
lib/libOsiCbc.so
241
lib/libOsiCbc.so
252
lib/libOsiCbc.so.0
242
lib/libOsiCbc.so.10
253
lib/libOsiClp.la
243
lib/libOsiClp.la
254
lib/libOsiClp.so
244
lib/libOsiClp.so
255
lib/libOsiClp.so.0
245
lib/libOsiClp.so.12
246
%%PORTDOCS%%%%DOCSDIR%%/Cbc/README
247
%%PORTDOCS%%%%DOCSDIR%%/Cbc/AUTHORS
248
%%PORTDOCS%%%%DOCSDIR%%/Cbc/LICENSE
249
%%PORTDOCS%%%%DOCSDIR%%/Cbc/cbc_addlibs.txt
250
%%PORTDOCS%%@dirrm %%DOCSDIR%%/Cbc
251
%%PORTDOCS%%%%DOCSDIR%%/Cgl/README
252
%%PORTDOCS%%%%DOCSDIR%%/Cgl/AUTHORS
253
%%PORTDOCS%%%%DOCSDIR%%/Cgl/LICENSE
254
%%PORTDOCS%%%%DOCSDIR%%/Cgl/cgl_addlibs.txt
255
%%PORTDOCS%%@dirrm %%DOCSDIR%%/Cgl
256
%%PORTDOCS%%%%DOCSDIR%%/Clp/AUTHORS
257
%%PORTDOCS%%%%DOCSDIR%%/Clp/LICENSE
258
%%PORTDOCS%%%%DOCSDIR%%/Clp/README
259
%%PORTDOCS%%%%DOCSDIR%%/Clp/clp_addlibs.txt
260
%%PORTDOCS%%@dirrm %%DOCSDIR%%/Clp
261
%%PORTDOCS%%%%DOCSDIR%%/CoinMP/README
262
%%PORTDOCS%%%%DOCSDIR%%/CoinMP/AUTHORS
263
%%PORTDOCS%%%%DOCSDIR%%/CoinMP/LICENSE
264
%%PORTDOCS%%%%DOCSDIR%%/CoinMP/coinmp_addlibs.txt
265
%%PORTDOCS%%%%DOCSDIR%%/CoinMP/Makefile
266
%%PORTDOCS%%%%DOCSDIR%%/CoinMP/example.c
267
%%PORTDOCS%%@dirrm %%DOCSDIR%%/CoinMP
268
%%PORTDOCS%%%%DOCSDIR%%/CoinUtils/AUTHORS
269
%%PORTDOCS%%%%DOCSDIR%%/CoinUtils/LICENSE
270
%%PORTDOCS%%%%DOCSDIR%%/CoinUtils/README
271
%%PORTDOCS%%%%DOCSDIR%%/CoinUtils/coinutils_addlibs.txt
272
%%PORTDOCS%%@dirrm %%DOCSDIR%%/CoinUtils
273
%%PORTDOCS%%%%DOCSDIR%%/Osi/README
274
%%PORTDOCS%%%%DOCSDIR%%/Osi/AUTHORS
275
%%PORTDOCS%%%%DOCSDIR%%/Osi/LICENSE
276
%%PORTDOCS%%%%DOCSDIR%%/Osi/osi_addlibs.txt
277
%%PORTDOCS%%@dirrm %%DOCSDIR%%/Osi
278
%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 163681