- update to 1.6.0

- respect NOPORTDOCS

PR:		ports/163681
Submitted by:	Pedro Giffuni <giffunip@tutopia.com> (maintainer)

5 files changed, 161 insertions, 109 deletions

diff --git a/math/coinmp/Makefile b/math/coinmp/Makefile
index 8c41ec0d7a7a..21619fb1028c 100644
--- a/math/coinmp/Makefile
+++ b/math/coinmp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	CoinMP
-PORTVERSION=	1.4.0
+PORTVERSION=	1.6.0
 CATEGORIES=	math
 MASTER_SITES=	http://www.coin-or.org/download/source/CoinMP/
 EXTRACT_SUFX=	.tgz
@@ -40,6 +40,19 @@ CXXFLAGS+=	-ffast-math
 CXXFLAGS+=	-fomit-frame-pointer
 .endif
 
+post-patch::
+	@${REINPLACE_CMD} -E -e \
+		's:\$$\(libdir\)/pkgconfig:${PREFIX}/libdata/pkgconfig:' \
+		${WRKSRC}/Clp/Makefile.in ${WRKSRC}/Osi/Makefile.in \
+		${WRKSRC}/Cbc/Makefile.in ${WRKSRC}/Cgl/Makefile.in \
+		${WRKSRC}/CoinUtils/Makefile.in ${WRKSRC}/CoinMP/Makefile.in
+
+post-install:
+.ifndef NOPORTDOCS
+	${MV} ${PREFIX}/share/coin/doc ${DOCSDIR}
+.endif
+	${RM} -rf ${PREFIX}/share/coin
+
 check regression-test test: build
 	@(cd ${WRKSRC};  ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
 	${MAKE_ARGS} test)
diff --git a/math/coinmp/distinfo b/math/coinmp/distinfo
index 0a7dcc909c5c..ce8f3175c3f9 100644
--- a/math/coinmp/distinfo
+++ b/math/coinmp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (CoinMP-1.4.0.tgz) = 93bc015e4affc31a97be8360238ef1e0a8ea7d3fa8b15627a14f13b8b1d5b032
-SIZE (CoinMP-1.4.0.tgz) = 11087531
+SHA256 (CoinMP-1.6.0.tgz) = 33eccad711dcf5a511cd2246267996df5b73d067a14214c1f2fad4bc1aecc971
+SIZE (CoinMP-1.6.0.tgz) = 12400327
diff --git a/math/coinmp/files/patch-Cbc__src__CbcSolver.cpp b/math/coinmp/files/patch-Cbc__src__CbcSolver.cpp
new file mode 100644
index 000000000000..55748e8cf725
--- /dev/null
+++ b/math/coinmp/files/patch-Cbc__src__CbcSolver.cpp
@@ -0,0 +1,14 @@
+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 @@
+ 	    }
+ 	    sprintf(generalPrint + strlen(generalPrint),
+ 		    "Build Date: %s \n", __DATE__);
+-#ifdef CBC_SVN_REV
+-	    sprintf(generalPrint + strlen(generalPrint),
+-		    "Revision Number: %d \n", CBC_SVN_REV);
+-#endif
+             generalMessageHandler->message(CLP_GENERAL, generalMessages)
+             << generalPrint
+             << CoinMessageEol;
diff --git a/math/coinmp/files/patch-CoinUtils+src+CoinParam.hpp b/math/coinmp/files/patch-CoinUtils+src+CoinParam.hpp
deleted file mode 100644
index 9e661a50e12c..000000000000
--- a/math/coinmp/files/patch-CoinUtils+src+CoinParam.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- CoinUtils/src/CoinParam.hpp.orig	2009-08-16 22:33:13.000000000 -0500
-+++ CoinUtils/src/CoinParam.hpp	2009-08-16 22:34:23.000000000 -0500
-@@ -12,6 +12,7 @@
- 
- #include <vector>
- #include <string>
-+#include <cstdio>
- 
- /*! \class CoinParam
-     \brief A base class for `keyword value' command line parameters.
diff --git a/math/coinmp/pkg-plist b/math/coinmp/pkg-plist
index 1baa02c5615a..113ee1306b48 100644
--- a/math/coinmp/pkg-plist
+++ b/math/coinmp/pkg-plist
@@ -1,8 +1,82 @@
 bin/cbc
 bin/clp
+include/coin/CbcBranchAllDifferent.hpp
+include/coin/CbcBranchDecision.hpp
+include/coin/CbcBranchDefaultDecision.hpp
+include/coin/CbcBranchToFixLots.hpp
+include/coin/CbcBranchingObject.hpp
+include/coin/CbcClique.hpp
+include/coin/CbcCompare.hpp
+include/coin/CbcCompareDefault.hpp
+include/coin/CbcCompareDepth.hpp
+include/coin/CbcCompareEstimate.hpp
+include/coin/CbcCompareObjective.hpp
+include/coin/CbcConsequence.hpp
+include/coin/CbcCutModifier.hpp
+include/coin/CbcCutSubsetModifier.hpp
+include/coin/CbcDummyBranchingObject.hpp
+include/coin/CbcFixVariable.hpp
+include/coin/CbcFollowOn.hpp
+include/coin/CbcFullNodeInfo.hpp
+include/coin/CbcGeneral.hpp
+include/coin/CbcGeneralDepth.hpp
+include/coin/CbcHeuristicDINS.hpp
+include/coin/CbcHeuristicRENS.hpp
+include/coin/CbcHeuristicVND.hpp
+include/coin/CbcNWay.hpp
+include/coin/CbcNodeInfo.hpp
+include/coin/CbcObject.hpp
+include/coin/CbcObjectUpdateData.hpp
+include/coin/CbcOrClpParam.cpp
+include/coin/CbcOrClpParam.hpp
+include/coin/CbcPartialNodeInfo.hpp
+include/coin/CbcSOS.hpp
+include/coin/CbcSimpleInteger.hpp
+include/coin/CbcSimpleIntegerDynamicPseudoCost.hpp
+include/coin/CbcSimpleIntegerPseudoCost.hpp
+include/coin/CbcSubProblem.hpp
+include/coin/ClpConfig.h
+include/coin/Clp_C_Interface.h
+include/coin/ClpCholeskyBase.hpp
+include/coin/ClpCholeskyDense.hpp
+include/coin/ClpConstraint.hpp
+include/coin/ClpConstraintLinear.hpp
+include/coin/ClpConstraintQuadratic.hpp
+include/coin/ClpNode.hpp
+include/coin/ClpDualRowDantzig.hpp
+include/coin/ClpDualRowPivot.hpp
+include/coin/ClpDualRowSteepest.hpp
+include/coin/ClpDummyMatrix.hpp
+include/coin/ClpDynamicExampleMatrix.hpp
+include/coin/ClpDynamicMatrix.hpp
+include/coin/ClpEventHandler.hpp
+include/coin/ClpFactorization.hpp
+include/coin/ClpGubDynamicMatrix.hpp
+include/coin/ClpGubMatrix.hpp
+include/coin/ClpInterior.hpp
+include/coin/ClpLinearObjective.hpp
+include/coin/ClpMatrixBase.hpp
+include/coin/ClpMessage.hpp
+include/coin/ClpModel.hpp
+include/coin/ClpNetworkMatrix.hpp
+include/coin/ClpNonLinearCost.hpp
+include/coin/ClpObjective.hpp
+include/coin/ClpPackedMatrix.hpp
+include/coin/ClpPdcoBase.hpp
+include/coin/ClpPlusMinusOneMatrix.hpp
+include/coin/ClpParameters.hpp
+include/coin/ClpPresolve.hpp
+include/coin/ClpPrimalColumnDantzig.hpp
+include/coin/ClpPrimalColumnPivot.hpp
+include/coin/ClpPrimalColumnSteepest.hpp
+include/coin/ClpQuadraticObjective.hpp
+include/coin/ClpSimplex.hpp
+include/coin/ClpSimplexNonlinear.hpp
+include/coin/ClpSimplexOther.hpp
+include/coin/ClpSimplexPrimal.hpp
+include/coin/ClpSolve.hpp
 include/coin/CoinAlloc.hpp
 include/coin/CoinUtilsConfig.h
-include/coin/config_coinutils.h
 include/coin/Coin_C_defines.h
 include/coin/CoinBuild.hpp
 include/coin/CoinDenseVector.hpp
@@ -23,6 +97,7 @@ include/coin/CoinModel.hpp
 include/coin/CoinStructuredModel.hpp
 include/coin/CoinModelUseful.hpp
 include/coin/CoinMpsIO.hpp
+include/coin/CoinOslFactorization.hpp
 include/coin/CoinPackedMatrix.hpp
 include/coin/CoinPackedVector.hpp
 include/coin/CoinPackedVectorBase.hpp
@@ -58,53 +133,7 @@ include/coin/CoinWarmStartBasis.hpp
 include/coin/CoinWarmStartVector.hpp
 include/coin/CoinWarmStartDual.hpp
 include/coin/CoinWarmStartPrimalDual.hpp
-include/coin/config_clp.h
-include/coin/ClpConfig.h
-include/coin/Clp_C_Interface.h
-include/coin/ClpCholeskyBase.hpp
-include/coin/ClpCholeskyDense.hpp
-include/coin/ClpCholeskyWssmp.hpp
-include/coin/ClpConstraint.hpp
-include/coin/ClpConstraintLinear.hpp
-include/coin/ClpConstraintQuadratic.hpp
-include/coin/ClpNode.hpp
-include/coin/ClpDualRowDantzig.hpp
-include/coin/ClpDualRowPivot.hpp
-include/coin/ClpDualRowSteepest.hpp
-include/coin/ClpDummyMatrix.hpp
-include/coin/ClpDynamicExampleMatrix.hpp
-include/coin/ClpDynamicMatrix.hpp
-include/coin/ClpEventHandler.hpp
-include/coin/ClpFactorization.hpp
-include/coin/ClpGubDynamicMatrix.hpp
-include/coin/ClpGubMatrix.hpp
-include/coin/ClpInterior.hpp
-include/coin/ClpLinearObjective.hpp
-include/coin/ClpMatrixBase.hpp
-include/coin/ClpMessage.hpp
-include/coin/ClpModel.hpp
-include/coin/ClpNetworkMatrix.hpp
-include/coin/ClpNonLinearCost.hpp
-include/coin/ClpObjective.hpp
-include/coin/ClpPackedMatrix.hpp
-include/coin/ClpPdcoBase.hpp
-include/coin/ClpPlusMinusOneMatrix.hpp
-include/coin/ClpParameters.hpp
-include/coin/ClpPresolve.hpp
-include/coin/ClpPrimalColumnDantzig.hpp
-include/coin/ClpPrimalColumnPivot.hpp
-include/coin/ClpPrimalColumnSteepest.hpp
-include/coin/ClpQuadraticObjective.hpp
-include/coin/ClpSimplex.hpp
-include/coin/ClpSimplexDual.hpp
-include/coin/ClpSimplexNonlinear.hpp
-include/coin/ClpSimplexOther.hpp
-include/coin/ClpSimplexPrimal.hpp
-include/coin/ClpSolve.hpp
-include/coin/CbcOrClpParam.hpp
-include/coin/CbcOrClpParam.cpp
 include/coin/Idiot.hpp
-include/coin/config_osi.h
 include/coin/OsiConfig.h
 include/coin/OsiAuxInfo.hpp
 include/coin/OsiBranchingObject.hpp
@@ -113,7 +142,6 @@ include/coin/OsiColCut.hpp
 include/coin/OsiCollections.hpp
 include/coin/OsiCut.hpp
 include/coin/OsiCuts.hpp
-include/coin/OsiOpbdpSolve.hpp
 include/coin/OsiPresolve.hpp
 include/coin/OsiSolverBranch.hpp
 include/coin/OsiSolverInterface.hpp
@@ -121,8 +149,8 @@ include/coin/OsiSolverParameters.hpp
 include/coin/OsiRowCut.hpp
 include/coin/OsiRowCutDebugger.hpp
 include/coin/OsiCbcSolverInterface.hpp
-include/coin/OsiClpParamMap.hpp
 include/coin/OsiClpSolverInterface.hpp
+include/coin/OsiUnitTests.hpp
 include/coin/CglClique.hpp
 include/coin/CglMixedIntegerRounding.hpp
 include/coin/CglDuplicateRow.hpp
@@ -134,7 +162,6 @@ include/coin/CglLiftAndProject.hpp
 include/coin/CglFlowCover.hpp
 include/coin/CglPreProcess.hpp
 include/coin/CglLandP.hpp
-include/coin/CglLandPSimplex.hpp
 include/coin/CglLandPValidator.hpp
 include/coin/CglProbing.hpp
 include/coin/CglOddHole.hpp
@@ -143,14 +170,12 @@ include/coin/CglAllDifferent.hpp
 include/coin/CglResidualCapacity.hpp
 include/coin/CglRedSplit.hpp
 include/coin/CglRedSplitParam.hpp
-include/coin/config_cgl.h
 include/coin/CglConfig.h
 include/coin/CglCutGenerator.hpp
 include/coin/CglMessage.hpp
 include/coin/CglStored.hpp
 include/coin/CglParam.hpp
 include/coin/CglTreeInfo.hpp
-include/coin/config_cbc.h
 include/coin/CbcConfig.h
 include/coin/Cbc_C_Interface.h
 include/coin/CbcBranchActual.hpp
@@ -188,68 +213,78 @@ include/coin/CbcLinked.hpp
 include/coin/CbcTreeLocal.hpp
 include/coin/ClpConstraintAmpl.hpp
 include/coin/ClpAmplObjective.hpp
-include/coin/config_coinmp.h
 include/coin/CoinMPConfig.h
 include/coin/CoinMP.h
 @dirrm include/coin
-share/doc/coin/CoinMP/README
-share/doc/coin/CoinMP/AUTHORS
-share/doc/coin/CoinMP/LICENSE
-share/doc/coin/CoinMP/coinmp_addlibs.txt
-share/doc/coin/CoinMP/examples/Makefile
-share/doc/coin/CoinMP/examples/example.c
-@dirrm share/doc/coin/CoinMP/examples
-@dirrm share/doc/coin/CoinMP
-share/doc/coin/Cbc/README
-share/doc/coin/Cbc/AUTHORS
-share/doc/coin/Cbc/LICENSE
-share/doc/coin/Cbc/cbc_addlibs.txt
-@dirrm share/doc/coin/Cbc
-share/doc/coin/Cgl/README
-share/doc/coin/Cgl/AUTHORS
-share/doc/coin/Cgl/LICENSE
-share/doc/coin/Cgl/cgl_addlibs.txt
-@dirrm share/doc/coin/Cgl
-share/doc/coin/Clp/AUTHORS
-share/doc/coin/Clp/LICENSE
-share/doc/coin/Clp/README
-share/doc/coin/Clp/clp_addlibs.txt
-@dirrm share/doc/coin/Clp
-share/doc/coin/CoinUtils/AUTHORS
-share/doc/coin/CoinUtils/LICENSE
-share/doc/coin/CoinUtils/README
-share/doc/coin/CoinUtils/coinutils_addlibs.txt
-@dirrm share/doc/coin/CoinUtils
-share/doc/coin/Osi/README
-share/doc/coin/Osi/AUTHORS
-share/doc/coin/Osi/LICENSE
-share/doc/coin/Osi/osi_addlibs.txt
-@dirrm share/doc/coin/Osi
-@dirrm share/doc/coin
 lib/libCbc.la
 lib/libCbc.so
-lib/libCbc.so.0
+lib/libCbc.so.10
 lib/libCbcSolver.la
 lib/libCbcSolver.so
-lib/libCbcSolver.so.0
+lib/libCbcSolver.so.10
 lib/libCgl.la
 lib/libCgl.so
-lib/libCgl.so.0
+lib/libCgl.so.8
 lib/libClp.la
 lib/libClp.so
-lib/libClp.so.0
+lib/libClp.so.12
 lib/libCoinMP.la
 lib/libCoinMP.so
-lib/libCoinMP.so.0
+lib/libCoinMP.so.7
 lib/libCoinUtils.la
 lib/libCoinUtils.so
-lib/libCoinUtils.so.0
+lib/libCoinUtils.so.11
 lib/libOsi.la
 lib/libOsi.so
-lib/libOsi.so.0
+lib/libOsi.so.11
 lib/libOsiCbc.la
 lib/libOsiCbc.so
-lib/libOsiCbc.so.0
+lib/libOsiCbc.so.10
 lib/libOsiClp.la
 lib/libOsiClp.so
-lib/libOsiClp.so.0
+lib/libOsiClp.so.12
+lib/libOsiCommonTests.la
+lib/libOsiCommonTests.so
+lib/libOsiCommonTests.so.11
+%%PORTDOCS%%%%DOCSDIR%%/Cbc/README
+%%PORTDOCS%%%%DOCSDIR%%/Cbc/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/Cbc/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/Cbc/cbc_addlibs.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Cbc
+%%PORTDOCS%%%%DOCSDIR%%/Cgl/README
+%%PORTDOCS%%%%DOCSDIR%%/Cgl/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/Cgl/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/Cgl/cgl_addlibs.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Cgl
+%%PORTDOCS%%%%DOCSDIR%%/Clp/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/Clp/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/Clp/README
+%%PORTDOCS%%%%DOCSDIR%%/Clp/clp_addlibs.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Clp
+%%PORTDOCS%%%%DOCSDIR%%/CoinMP/README
+%%PORTDOCS%%%%DOCSDIR%%/CoinMP/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/CoinMP/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/CoinMP/coinmp_addlibs.txt
+%%PORTDOCS%%%%DOCSDIR%%/CoinMP/Makefile
+%%PORTDOCS%%%%DOCSDIR%%/CoinMP/example.c
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/CoinMP
+%%PORTDOCS%%%%DOCSDIR%%/CoinUtils/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/CoinUtils/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/CoinUtils/README
+%%PORTDOCS%%%%DOCSDIR%%/CoinUtils/coinutils_addlibs.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/CoinUtils
+%%PORTDOCS%%%%DOCSDIR%%/Osi/README
+%%PORTDOCS%%%%DOCSDIR%%/Osi/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/Osi/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/Osi/osi_addlibs.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Osi
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+libdata/pkgconfig/clp.pc
+libdata/pkgconfig/osi-clp.pc
+libdata/pkgconfig/cbc.pc
+libdata/pkgconfig/cgl.pc
+libdata/pkgconfig/osi.pc
+libdata/pkgconfig/coinutils.pc
+libdata/pkgconfig/coinmp.pc
+libdata/pkgconfig/osi-cbc.pc
+libdata/pkgconfig/osi-unittests.pc