2 files changed, 135 insertions, 135 deletions

diff --git a/math/ogdf/Makefile b/math/ogdf/Makefile
index 584afd26f54a..abd12ea91a51 100644
--- a/math/ogdf/Makefile
+++ b/math/ogdf/Makefile
@@ -15,6 +15,8 @@ LICENSE_COMB=		dual
 LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSE_GPL_v2.txt
 LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSE_GPL_v3.txt
 
+CONFLICTS_INSTALL=	CoinMP-[0-9]*
+
 USES=		cmake compiler:c++11-lang zip
 USE_LDCONFIG=	yes
 CMAKE_ARGS=	-DBUILD_SHARED_LIBS:BOOL=ON \
@@ -24,8 +26,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME:tu}
 
 OPTIONS_DEFINE=	EXAMPLES
 
-PLIST_SUB+=	COIN=""
-
 post-install:
 	@${RMDIR} ${STAGEDIR}${PREFIX}/include/ogdf/lib/minisat/doc
 
diff --git a/math/ogdf/pkg-plist b/math/ogdf/pkg-plist
index c0dd78e1d995..691ae04ff3e6 100644
--- a/math/ogdf/pkg-plist
+++ b/math/ogdf/pkg-plist
@@ -1,135 +1,135 @@
-%%COIN%%include/coin/ClpCholeskyBase.hpp
-%%COIN%%include/coin/ClpCholeskyDense.hpp
-%%COIN%%include/coin/ClpCholeskyMumps.hpp
-%%COIN%%include/coin/ClpCholeskyTaucs.hpp
-%%COIN%%include/coin/ClpCholeskyUfl.hpp
-%%COIN%%include/coin/ClpCholeskyWssmp.hpp
-%%COIN%%include/coin/ClpCholeskyWssmpKKT.hpp
-%%COIN%%include/coin/ClpConfig.h
-%%COIN%%include/coin/ClpConstraint.hpp
-%%COIN%%include/coin/ClpConstraintLinear.hpp
-%%COIN%%include/coin/ClpConstraintQuadratic.hpp
-%%COIN%%include/coin/ClpDualRowDantzig.hpp
-%%COIN%%include/coin/ClpDualRowPivot.hpp
-%%COIN%%include/coin/ClpDualRowSteepest.hpp
-%%COIN%%include/coin/ClpDummyMatrix.hpp
-%%COIN%%include/coin/ClpDynamicExampleMatrix.hpp
-%%COIN%%include/coin/ClpDynamicMatrix.hpp
-%%COIN%%include/coin/ClpEventHandler.hpp
-%%COIN%%include/coin/ClpFactorization.hpp
-%%COIN%%include/coin/ClpGubDynamicMatrix.hpp
-%%COIN%%include/coin/ClpGubMatrix.hpp
-%%COIN%%include/coin/ClpHelperFunctions.hpp
-%%COIN%%include/coin/ClpInterior.hpp
-%%COIN%%include/coin/ClpLinearObjective.hpp
-%%COIN%%include/coin/ClpLsqr.hpp
-%%COIN%%include/coin/ClpMatrixBase.hpp
-%%COIN%%include/coin/ClpMessage.hpp
-%%COIN%%include/coin/ClpModel.hpp
-%%COIN%%include/coin/ClpNetworkBasis.hpp
-%%COIN%%include/coin/ClpNetworkMatrix.hpp
-%%COIN%%include/coin/ClpNode.hpp
-%%COIN%%include/coin/ClpNonLinearCost.hpp
-%%COIN%%include/coin/ClpObjective.hpp
-%%COIN%%include/coin/ClpPackedMatrix.hpp
-%%COIN%%include/coin/ClpParameters.hpp
-%%COIN%%include/coin/ClpPdco.hpp
-%%COIN%%include/coin/ClpPdcoBase.hpp
-%%COIN%%include/coin/ClpPlusMinusOneMatrix.hpp
-%%COIN%%include/coin/ClpPredictorCorrector.hpp
-%%COIN%%include/coin/ClpPresolve.hpp
-%%COIN%%include/coin/ClpPrimalColumnDantzig.hpp
-%%COIN%%include/coin/ClpPrimalColumnPivot.hpp
-%%COIN%%include/coin/ClpPrimalColumnSteepest.hpp
-%%COIN%%include/coin/ClpQuadraticObjective.hpp
-%%COIN%%include/coin/ClpSimplex.hpp
-%%COIN%%include/coin/ClpSimplexDual.hpp
-%%COIN%%include/coin/ClpSimplexNonlinear.hpp
-%%COIN%%include/coin/ClpSimplexOther.hpp
-%%COIN%%include/coin/ClpSimplexPrimal.hpp
-%%COIN%%include/coin/ClpSolve.hpp
-%%COIN%%include/coin/CoinAlloc.hpp
-%%COIN%%include/coin/CoinBuild.hpp
-%%COIN%%include/coin/CoinDenseFactorization.hpp
-%%COIN%%include/coin/CoinDenseVector.hpp
-%%COIN%%include/coin/CoinDistance.hpp
-%%COIN%%include/coin/CoinError.hpp
-%%COIN%%include/coin/CoinFactorization.hpp
-%%COIN%%include/coin/CoinFileIO.hpp
-%%COIN%%include/coin/CoinFinite.hpp
-%%COIN%%include/coin/CoinFloatEqual.hpp
-%%COIN%%include/coin/CoinHelperFunctions.hpp
-%%COIN%%include/coin/CoinIndexedVector.hpp
-%%COIN%%include/coin/CoinLpIO.hpp
-%%COIN%%include/coin/CoinMessage.hpp
-%%COIN%%include/coin/CoinMessageHandler.hpp
-%%COIN%%include/coin/CoinModel.hpp
-%%COIN%%include/coin/CoinModelUseful.hpp
-%%COIN%%include/coin/CoinMpsIO.hpp
-%%COIN%%include/coin/CoinOslC.h
-%%COIN%%include/coin/CoinOslFactorization.hpp
-%%COIN%%include/coin/CoinPackedMatrix.hpp
-%%COIN%%include/coin/CoinPackedVector.hpp
-%%COIN%%include/coin/CoinPackedVectorBase.hpp
-%%COIN%%include/coin/CoinParam.hpp
-%%COIN%%include/coin/CoinPragma.hpp
-%%COIN%%include/coin/CoinPresolveDoubleton.hpp
-%%COIN%%include/coin/CoinPresolveDual.hpp
-%%COIN%%include/coin/CoinPresolveDupcol.hpp
-%%COIN%%include/coin/CoinPresolveEmpty.hpp
-%%COIN%%include/coin/CoinPresolveFixed.hpp
-%%COIN%%include/coin/CoinPresolveForcing.hpp
-%%COIN%%include/coin/CoinPresolveImpliedFree.hpp
-%%COIN%%include/coin/CoinPresolveIsolated.hpp
-%%COIN%%include/coin/CoinPresolveMatrix.hpp
-%%COIN%%include/coin/CoinPresolvePsdebug.hpp
-%%COIN%%include/coin/CoinPresolveSingleton.hpp
-%%COIN%%include/coin/CoinPresolveSubst.hpp
-%%COIN%%include/coin/CoinPresolveTighten.hpp
-%%COIN%%include/coin/CoinPresolveTripleton.hpp
-%%COIN%%include/coin/CoinPresolveUseless.hpp
-%%COIN%%include/coin/CoinPresolveZeros.hpp
-%%COIN%%include/coin/CoinSearchTree.hpp
-%%COIN%%include/coin/CoinShallowPackedVector.hpp
-%%COIN%%include/coin/CoinSignal.hpp
-%%COIN%%include/coin/CoinSimpFactorization.hpp
-%%COIN%%include/coin/CoinSnapshot.hpp
-%%COIN%%include/coin/CoinSort.hpp
-%%COIN%%include/coin/CoinStructuredModel.hpp
-%%COIN%%include/coin/CoinTime.hpp
-%%COIN%%include/coin/CoinTypes.hpp
-%%COIN%%include/coin/CoinUtilsConfig.h
-%%COIN%%include/coin/CoinWarmStart.hpp
-%%COIN%%include/coin/CoinWarmStartBasis.hpp
-%%COIN%%include/coin/CoinWarmStartDual.hpp
-%%COIN%%include/coin/CoinWarmStartPrimalDual.hpp
-%%COIN%%include/coin/CoinWarmStartVector.hpp
-%%COIN%%include/coin/Coin_C_defines.h
-%%COIN%%include/coin/Idiot.hpp
-%%COIN%%include/coin/MyEventHandler.hpp
-%%COIN%%include/coin/MyMessageHandler.hpp
-%%COIN%%include/coin/OsiAuxInfo.hpp
-%%COIN%%include/coin/OsiBranchingObject.hpp
-%%COIN%%include/coin/OsiChooseVariable.hpp
-%%COIN%%include/coin/OsiClpSolverInterface.hpp
-%%COIN%%include/coin/OsiColCut.hpp
-%%COIN%%include/coin/OsiCollections.hpp
-%%COIN%%include/coin/OsiCpxSolverInterface.hpp
-%%COIN%%include/coin/OsiCut.hpp
-%%COIN%%include/coin/OsiCuts.hpp
-%%COIN%%include/coin/OsiGrbSolverInterface.hpp
-%%COIN%%include/coin/OsiPresolve.hpp
-%%COIN%%include/coin/OsiRowCut.hpp
-%%COIN%%include/coin/OsiRowCutDebugger.hpp
-%%COIN%%include/coin/OsiSolverBranch.hpp
-%%COIN%%include/coin/OsiSolverInterface.hpp
-%%COIN%%include/coin/OsiSolverParameters.hpp
-%%COIN%%include/coin/config.h
-%%COIN%%include/coin/config_clp_default.h
-%%COIN%%include/coin/config_coinutils_default.h
-%%COIN%%include/coin/config_default.h
-%%COIN%%include/coin/configall_system.h
-%%COIN%%include/coin/configall_system_msc.h
+include/coin/ClpCholeskyBase.hpp
+include/coin/ClpCholeskyDense.hpp
+include/coin/ClpCholeskyMumps.hpp
+include/coin/ClpCholeskyTaucs.hpp
+include/coin/ClpCholeskyUfl.hpp
+include/coin/ClpCholeskyWssmp.hpp
+include/coin/ClpCholeskyWssmpKKT.hpp
+include/coin/ClpConfig.h
+include/coin/ClpConstraint.hpp
+include/coin/ClpConstraintLinear.hpp
+include/coin/ClpConstraintQuadratic.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/ClpHelperFunctions.hpp
+include/coin/ClpInterior.hpp
+include/coin/ClpLinearObjective.hpp
+include/coin/ClpLsqr.hpp
+include/coin/ClpMatrixBase.hpp
+include/coin/ClpMessage.hpp
+include/coin/ClpModel.hpp
+include/coin/ClpNetworkBasis.hpp
+include/coin/ClpNetworkMatrix.hpp
+include/coin/ClpNode.hpp
+include/coin/ClpNonLinearCost.hpp
+include/coin/ClpObjective.hpp
+include/coin/ClpPackedMatrix.hpp
+include/coin/ClpParameters.hpp
+include/coin/ClpPdco.hpp
+include/coin/ClpPdcoBase.hpp
+include/coin/ClpPlusMinusOneMatrix.hpp
+include/coin/ClpPredictorCorrector.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/CoinAlloc.hpp
+include/coin/CoinBuild.hpp
+include/coin/CoinDenseFactorization.hpp
+include/coin/CoinDenseVector.hpp
+include/coin/CoinDistance.hpp
+include/coin/CoinError.hpp
+include/coin/CoinFactorization.hpp
+include/coin/CoinFileIO.hpp
+include/coin/CoinFinite.hpp
+include/coin/CoinFloatEqual.hpp
+include/coin/CoinHelperFunctions.hpp
+include/coin/CoinIndexedVector.hpp
+include/coin/CoinLpIO.hpp
+include/coin/CoinMessage.hpp
+include/coin/CoinMessageHandler.hpp
+include/coin/CoinModel.hpp
+include/coin/CoinModelUseful.hpp
+include/coin/CoinMpsIO.hpp
+include/coin/CoinOslC.h
+include/coin/CoinOslFactorization.hpp
+include/coin/CoinPackedMatrix.hpp
+include/coin/CoinPackedVector.hpp
+include/coin/CoinPackedVectorBase.hpp
+include/coin/CoinParam.hpp
+include/coin/CoinPragma.hpp
+include/coin/CoinPresolveDoubleton.hpp
+include/coin/CoinPresolveDual.hpp
+include/coin/CoinPresolveDupcol.hpp
+include/coin/CoinPresolveEmpty.hpp
+include/coin/CoinPresolveFixed.hpp
+include/coin/CoinPresolveForcing.hpp
+include/coin/CoinPresolveImpliedFree.hpp
+include/coin/CoinPresolveIsolated.hpp
+include/coin/CoinPresolveMatrix.hpp
+include/coin/CoinPresolvePsdebug.hpp
+include/coin/CoinPresolveSingleton.hpp
+include/coin/CoinPresolveSubst.hpp
+include/coin/CoinPresolveTighten.hpp
+include/coin/CoinPresolveTripleton.hpp
+include/coin/CoinPresolveUseless.hpp
+include/coin/CoinPresolveZeros.hpp
+include/coin/CoinSearchTree.hpp
+include/coin/CoinShallowPackedVector.hpp
+include/coin/CoinSignal.hpp
+include/coin/CoinSimpFactorization.hpp
+include/coin/CoinSnapshot.hpp
+include/coin/CoinSort.hpp
+include/coin/CoinStructuredModel.hpp
+include/coin/CoinTime.hpp
+include/coin/CoinTypes.hpp
+include/coin/CoinUtilsConfig.h
+include/coin/CoinWarmStart.hpp
+include/coin/CoinWarmStartBasis.hpp
+include/coin/CoinWarmStartDual.hpp
+include/coin/CoinWarmStartPrimalDual.hpp
+include/coin/CoinWarmStartVector.hpp
+include/coin/Coin_C_defines.h
+include/coin/Idiot.hpp
+include/coin/MyEventHandler.hpp
+include/coin/MyMessageHandler.hpp
+include/coin/OsiAuxInfo.hpp
+include/coin/OsiBranchingObject.hpp
+include/coin/OsiChooseVariable.hpp
+include/coin/OsiClpSolverInterface.hpp
+include/coin/OsiColCut.hpp
+include/coin/OsiCollections.hpp
+include/coin/OsiCpxSolverInterface.hpp
+include/coin/OsiCut.hpp
+include/coin/OsiCuts.hpp
+include/coin/OsiGrbSolverInterface.hpp
+include/coin/OsiPresolve.hpp
+include/coin/OsiRowCut.hpp
+include/coin/OsiRowCutDebugger.hpp
+include/coin/OsiSolverBranch.hpp
+include/coin/OsiSolverInterface.hpp
+include/coin/OsiSolverParameters.hpp
+include/coin/config.h
+include/coin/config_clp_default.h
+include/coin/config_coinutils_default.h
+include/coin/config_default.h
+include/coin/configall_system.h
+include/coin/configall_system_msc.h
 include/ogdf/augmentation/AugmentationModule.h
 include/ogdf/augmentation/DfsMakeBiconnected.h
 include/ogdf/augmentation/PlanarAugmentation.h
@@ -738,7 +738,7 @@ lib/cmake/OGDF/CoinTargets.cmake
 lib/cmake/OGDF/OgdfTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/OGDF/OgdfTargets.cmake
 lib/cmake/OGDF/ogdf-config.cmake
-%%COIN%%lib/libCOIN.so
+lib/libCOIN.so
 lib/libOGDF.so
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/gen-acyclic-graph.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/manual.cpp