3 files changed, 120 insertions, 101 deletions

diff --git a/math/clp/Makefile b/math/clp/Makefile
index 2ccb34bb491b..c1c68e2e376d 100644
--- a/math/clp/Makefile
+++ b/math/clp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Clp
-PORTVERSION=	1.6.0
+PORTVERSION=	1.7.4
 CATEGORIES=	math
 MASTER_SITES=	http://www.coin-or.org/download/source/Clp/ \
 		http://www.mavetju.org/download/adopted/
@@ -17,7 +17,7 @@ COMMENT=	Linear Programming Solver
 
 LIB_DEPENDS=	lapack.4:${PORTSDIR}/math/lapack
 .ifdef WITH_GMPL
-LIB_DEPENDS+=	glpk.9:${PORTSDIR}/math/glpk
+LIB_DEPENDS+=	glpk.13:${PORTSDIR}/math/glpk
 .endif
 
 USE_FORTRAN=	yes
@@ -29,8 +29,11 @@ CONFIGURE_ENV+=	${MAKE_ENV}
 CONFIGURE_ARGS=	--with-blas="-L${LOCALBASE}/lib -lblas"		\
 		--with-lapack="-L${LOCALBASE}/lib -llapack"
 .ifdef WITH_GMPL
-CONFIGURE_ARGS+=--with-gmpl-incdir=${LOCALBASE}/include/gmpl	\
+CONFIGURE_ARGS+=--with-gmpl-incdir=${LOCALBASE}/include	\
 		--with-gmpl-lib="-L${LOCALBASE}/lib -lglpk"
 .endif
 
+regression-test:
+	(cd ${WRKSRC}/Clp && ${MAKE} unitTest )
+
 .include <bsd.port.mk>
diff --git a/math/clp/distinfo b/math/clp/distinfo
index bcdd48da83c9..3ea1a0334a84 100644
--- a/math/clp/distinfo
+++ b/math/clp/distinfo
@@ -1,3 +1,3 @@
-MD5 (Clp-1.6.0.tgz) = 07295a5d25d33a50c32dcceb87cd3f7c
-SHA256 (Clp-1.6.0.tgz) = 6c17e2bc6dbe27be1a537299dcc21fe499bdfe078036ae73a9141b93b8351ee1
-SIZE (Clp-1.6.0.tgz) = 3103536
+MD5 (Clp-1.7.4.tgz) = 05e1c18a1f44e0a78031536f0996760a
+SHA256 (Clp-1.7.4.tgz) = 08b49c99dcf06ba457e94f5f056f2c4be7e32f1783481f053dfaf9a253c3597b
+SIZE (Clp-1.7.4.tgz) = 3186618
diff --git a/math/clp/pkg-plist b/math/clp/pkg-plist
index c818f2207e1a..ab48af07ef57 100644
--- a/math/clp/pkg-plist
+++ b/math/clp/pkg-plist
@@ -1,99 +1,115 @@
 bin/clp
-include/CbcOrClpParam.hpp
-include/ClpCholeskyBase.hpp
-include/ClpCholeskyDense.hpp
-include/ClpCholeskyWssmp.hpp
-include/ClpConfig.h
-include/ClpConstraint.hpp
-include/ClpConstraintLinear.hpp
-include/ClpConstraintQuadratic.hpp
-include/ClpDualRowDantzig.hpp
-include/ClpDualRowPivot.hpp
-include/ClpDualRowSteepest.hpp
-include/ClpDynamicExampleMatrix.hpp
-include/ClpDynamicMatrix.hpp
-include/ClpEventHandler.hpp
-include/ClpFactorization.hpp
-include/ClpGubDynamicMatrix.hpp
-include/ClpGubMatrix.hpp
-include/ClpInterior.hpp
-include/ClpLinearObjective.hpp
-include/ClpMatrixBase.hpp
-include/ClpMessage.hpp
-include/ClpModel.hpp
-include/ClpNetworkMatrix.hpp
-include/ClpNonLinearCost.hpp
-include/ClpObjective.hpp
-include/ClpPackedMatrix.hpp
-include/ClpParameters.hpp
-include/ClpPlusMinusOneMatrix.hpp
-include/ClpPresolve.hpp
-include/ClpPrimalColumnDantzig.hpp
-include/ClpPrimalColumnPivot.hpp
-include/ClpPrimalColumnSteepest.hpp
-include/ClpQuadraticObjective.hpp
-include/ClpSimplex.hpp
-include/ClpSimplexNonlinear.hpp
-include/ClpSimplexOther.hpp
-include/ClpSimplexPrimal.hpp
-include/ClpSolve.hpp
-include/Clp_C_Interface.h
-include/CoinBuild.hpp
-include/CoinDenseVector.hpp
-include/CoinDistance.hpp
-include/CoinError.hpp
-include/CoinFactorization.hpp
-include/CoinFileIO.hpp
-include/CoinFinite.hpp
-include/CoinFloatEqual.hpp
-include/CoinHelperFunctions.hpp
-include/CoinIndexedVector.hpp
-include/CoinLpIO.hpp
-include/CoinMessage.hpp
-include/CoinMessageHandler.hpp
-include/CoinModel.hpp
-include/CoinModelUseful.hpp
-include/CoinMpsIO.hpp
-include/CoinPackedMatrix.hpp
-include/CoinPackedVector.hpp
-include/CoinPackedVectorBase.hpp
-include/CoinParam.hpp
-include/CoinPragma.hpp
-include/CoinPresolveDoubleton.hpp
-include/CoinPresolveDual.hpp
-include/CoinPresolveDupcol.hpp
-include/CoinPresolveEmpty.hpp
-include/CoinPresolveFixed.hpp
-include/CoinPresolveForcing.hpp
-include/CoinPresolveImpliedFree.hpp
-include/CoinPresolveIsolated.hpp
-include/CoinPresolveMatrix.hpp
-include/CoinPresolvePsdebug.hpp
-include/CoinPresolveSingleton.hpp
-include/CoinPresolveSubst.hpp
-include/CoinPresolveTighten.hpp
-include/CoinPresolveTripleton.hpp
-include/CoinPresolveUseless.hpp
-include/CoinPresolveZeros.hpp
-include/CoinSearchTree.hpp
-include/CoinShallowPackedVector.hpp
-include/CoinSignal.hpp
-include/CoinSmartPtr.hpp
-include/CoinSnapshot.hpp
-include/CoinSort.hpp
-include/CoinTime.hpp
-include/CoinTypes.hpp
-include/CoinUtility.hpp
-include/CoinUtilsConfig.h
-include/CoinWarmStart.hpp
-include/CoinWarmStartBasis.hpp
-include/CoinWarmStartDual.hpp
-include/Coin_C_defines.h
-include/Idiot.hpp
-include/config_clp.h
-include/config_coinutils.h
-lib/clp_addlibs.txt
-lib/coinutils_addlibs.txt
+include/coin/CbcOrClpParam.hpp
+include/coin/ClpCholeskyBase.hpp
+include/coin/ClpCholeskyDense.hpp
+include/coin/ClpCholeskyWssmp.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/ClpInterior.hpp
+include/coin/ClpLinearObjective.hpp
+include/coin/ClpMatrixBase.hpp
+include/coin/ClpMessage.hpp
+include/coin/ClpModel.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/ClpPdcoBase.hpp
+include/coin/ClpPlusMinusOneMatrix.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/Clp_C_Interface.h
+include/coin/CoinAlloc.hpp
+include/coin/CoinBuild.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/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/CoinSmartPtr.hpp
+include/coin/CoinSnapshot.hpp
+include/coin/CoinSort.hpp
+include/coin/CoinTime.hpp
+include/coin/CoinTypes.hpp
+include/coin/CoinUtility.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/config_clp.h
+include/coin/config_coinutils.h
+@dirrm include/coin
+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
+@dirrm share/doc/coin
 lib/libClp.la
 lib/libClp.so
 lib/libClp.so.0