4 files changed, 205 insertions, 36 deletions

diff --git a/math/clp/Makefile b/math/clp/Makefile
index 2432715ede4d..cf84655b9210 100644
--- a/math/clp/Makefile
+++ b/math/clp/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Clp
-PORTVERSION=	1.12.1
-PORTREVISION=	4
+PORTVERSION=	1.16.8
 CATEGORIES=	math
 MASTER_SITES=	http://www.coin-or.org/download/source/Clp/ \
 		http://www.mavetju.org/download/adopted/
@@ -11,19 +10,27 @@ MASTER_SITES=	http://www.coin-or.org/download/source/Clp/ \
 MAINTAINER=	co9co9@gmail.com
 COMMENT=	Linear Programming Solver
 
-LIB_DEPENDS=	liblapack.so:${PORTSDIR}/math/lapack
+LICENSE=	EPL
 
-USES=		fortran libtool tar:tgz
-CXXFLAGS+=	-ffast-math -fomit-frame-pointer
+USES=		blaslapack fortran libtool tar:tgz pathfix
+CXXFLAGS+=	-ffast-math
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+TEST_TARGET=	unitTest
+TEST_WRKSRC=	${WRKSRC}/Clp
 
 CONFIGURE_ENV+=	${MAKE_ENV}
-CONFIGURE_ARGS=	--with-blas="-L${LOCALBASE}/lib -lblas"		\
-		--with-lapack="-L${LOCALBASE}/lib -llapack"
+CONFIGURE_ARGS=	--with-lapack-lib="${LAPACKLIB} -L${LOCALBASE}/lib" \
+		--with-blas-lib="${BLASLIB} -L${LOCALBASE}/lib" \
+		--datadir=${DATADIR}
 
-regression-test: build
-	(cd ${WRKSRC}/Clp && ${MAKE} unitTest )
+OPTIONS_DEFINE=	DEBUG
+PORTDOCS=	*
+
+DEBUG_CXXFLAGS=	-fomit-frame-pointer
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 
 .include <bsd.port.mk>
diff --git a/math/clp/distinfo b/math/clp/distinfo
index 5176e509dc11..358a82dbd283 100644
--- a/math/clp/distinfo
+++ b/math/clp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Clp-1.12.1.tgz) = 46747193085ea87e2790cca1c9b9fe26e1cc4f4bbb49c3b144389f105241b08f
-SIZE (Clp-1.12.1.tgz) = 7343383
+SHA256 (Clp-1.16.8.tgz) = 1441f7eb163cfdc16e0cbb67893075ddbee23b62216d9b828e90ab879eb0d178
+SIZE (Clp-1.16.8.tgz) = 9955546
diff --git a/math/clp/files/patch-CoinUtils+src+CoinParam.hpp b/math/clp/files/patch-CoinUtils+src+CoinParam.hpp
deleted file mode 100644
index 9e661a50e12c..000000000000
--- a/math/clp/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/clp/pkg-plist b/math/clp/pkg-plist
index 75794aa35425..4496666d139d 100644
--- a/math/clp/pkg-plist
+++ b/math/clp/pkg-plist
@@ -1,8 +1,8 @@
 bin/clp
+include/coin/CbcOrClpParam.cpp
 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
@@ -36,6 +36,7 @@ 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
@@ -74,6 +75,7 @@ include/coin/CoinPresolveForcing.hpp
 include/coin/CoinPresolveImpliedFree.hpp
 include/coin/CoinPresolveIsolated.hpp
 include/coin/CoinPresolveMatrix.hpp
+include/coin/CoinPresolveMonitor.hpp
 include/coin/CoinPresolvePsdebug.hpp
 include/coin/CoinPresolveSingleton.hpp
 include/coin/CoinPresolveSubst.hpp
@@ -81,6 +83,7 @@ include/coin/CoinPresolveTighten.hpp
 include/coin/CoinPresolveTripleton.hpp
 include/coin/CoinPresolveUseless.hpp
 include/coin/CoinPresolveZeros.hpp
+include/coin/CoinRational.hpp
 include/coin/CoinSearchTree.hpp
 include/coin/CoinShallowPackedVector.hpp
 include/coin/CoinSignal.hpp
@@ -100,19 +103,188 @@ 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
+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/OsiConfig.h
+include/coin/OsiCut.hpp
+include/coin/OsiCuts.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/OsiUnitTests.hpp
 lib/libClp.so
-lib/libClp.so.0
-lib/libClp.so.0.0.0
+lib/libClp.so.1
+lib/libClp.so.1.13.8
+lib/libClpSolver.so
+lib/libClpSolver.so.1
+lib/libClpSolver.so.1.13.8
 lib/libCoinUtils.so
-lib/libCoinUtils.so.0
-lib/libCoinUtils.so.0.0.0
-share/doc/coin/Clp/AUTHORS
-share/doc/coin/Clp/LICENSE
-share/doc/coin/Clp/README
-share/doc/coin/Clp/clp_addlibs.txt
-share/doc/coin/CoinUtils/AUTHORS
-share/doc/coin/CoinUtils/LICENSE
-share/doc/coin/CoinUtils/README
-share/doc/coin/CoinUtils/coinutils_addlibs.txt
+lib/libCoinUtils.so.3
+lib/libCoinUtils.so.3.10.10
+lib/libOsi.so
+lib/libOsi.so.1
+lib/libOsi.so.1.12.6
+lib/libOsiClp.so
+lib/libOsiClp.so.1
+lib/libOsiClp.so.1.13.8
+lib/libOsiCommonTests.so
+lib/libOsiCommonTests.so.1
+lib/libOsiCommonTests.so.1.12.6
+libdata/pkgconfig/clp.pc
+libdata/pkgconfig/coindatanetlib.pc
+libdata/pkgconfig/coindatasample.pc
+libdata/pkgconfig/coinutils.pc
+libdata/pkgconfig/osi-clp.pc
+libdata/pkgconfig/osi-unittests.pc
+libdata/pkgconfig/osi.pc
+%%DATADIR%%/coin/Data/Netlib/25fv47.mps.gz
+%%DATADIR%%/coin/Data/Netlib/80bau3b.mps.gz
+%%DATADIR%%/coin/Data/Netlib/adlittle.mps.gz
+%%DATADIR%%/coin/Data/Netlib/afiro.mps.gz
+%%DATADIR%%/coin/Data/Netlib/agg.mps.gz
+%%DATADIR%%/coin/Data/Netlib/agg2.mps.gz
+%%DATADIR%%/coin/Data/Netlib/agg3.mps.gz
+%%DATADIR%%/coin/Data/Netlib/bandm.mps.gz
+%%DATADIR%%/coin/Data/Netlib/beaconfd.mps.gz
+%%DATADIR%%/coin/Data/Netlib/blend.mps.gz
+%%DATADIR%%/coin/Data/Netlib/bnl1.mps.gz
+%%DATADIR%%/coin/Data/Netlib/bnl2.mps.gz
+%%DATADIR%%/coin/Data/Netlib/boeing1.mps.gz
+%%DATADIR%%/coin/Data/Netlib/boeing2.mps.gz
+%%DATADIR%%/coin/Data/Netlib/bore3d.mps.gz
+%%DATADIR%%/coin/Data/Netlib/brandy.mps.gz
+%%DATADIR%%/coin/Data/Netlib/capri.mps.gz
+%%DATADIR%%/coin/Data/Netlib/cycle.mps.gz
+%%DATADIR%%/coin/Data/Netlib/czprob.mps.gz
+%%DATADIR%%/coin/Data/Netlib/d2q06c.mps.gz
+%%DATADIR%%/coin/Data/Netlib/d6cube.mps.gz
+%%DATADIR%%/coin/Data/Netlib/degen2.mps.gz
+%%DATADIR%%/coin/Data/Netlib/degen3.mps.gz
+%%DATADIR%%/coin/Data/Netlib/dfl001.mps.gz
+%%DATADIR%%/coin/Data/Netlib/e226.mps.gz
+%%DATADIR%%/coin/Data/Netlib/etamacro.mps.gz
+%%DATADIR%%/coin/Data/Netlib/fffff800.mps.gz
+%%DATADIR%%/coin/Data/Netlib/finnis.mps.gz
+%%DATADIR%%/coin/Data/Netlib/fit1d.mps.gz
+%%DATADIR%%/coin/Data/Netlib/fit1p.mps.gz
+%%DATADIR%%/coin/Data/Netlib/fit2d.mps.gz
+%%DATADIR%%/coin/Data/Netlib/fit2p.mps.gz
+%%DATADIR%%/coin/Data/Netlib/forplan.mps.gz
+%%DATADIR%%/coin/Data/Netlib/ganges.mps.gz
+%%DATADIR%%/coin/Data/Netlib/gfrd-pnc.mps.gz
+%%DATADIR%%/coin/Data/Netlib/greenbea.mps.gz
+%%DATADIR%%/coin/Data/Netlib/greenbeb.mps.gz
+%%DATADIR%%/coin/Data/Netlib/grow15.mps.gz
+%%DATADIR%%/coin/Data/Netlib/grow22.mps.gz
+%%DATADIR%%/coin/Data/Netlib/grow7.mps.gz
+%%DATADIR%%/coin/Data/Netlib/israel.mps.gz
+%%DATADIR%%/coin/Data/Netlib/kb2.mps.gz
+%%DATADIR%%/coin/Data/Netlib/lotfi.mps.gz
+%%DATADIR%%/coin/Data/Netlib/maros-r7.mps.gz
+%%DATADIR%%/coin/Data/Netlib/maros.mps.gz
+%%DATADIR%%/coin/Data/Netlib/modszk1.mps.gz
+%%DATADIR%%/coin/Data/Netlib/nesm.mps.gz
+%%DATADIR%%/coin/Data/Netlib/perold.mps.gz
+%%DATADIR%%/coin/Data/Netlib/pilot.mps.gz
+%%DATADIR%%/coin/Data/Netlib/pilot4.mps.gz
+%%DATADIR%%/coin/Data/Netlib/pilot87.mps.gz
+%%DATADIR%%/coin/Data/Netlib/pilotnov.mps.gz
+%%DATADIR%%/coin/Data/Netlib/recipe.mps.gz
+%%DATADIR%%/coin/Data/Netlib/sc105.mps.gz
+%%DATADIR%%/coin/Data/Netlib/sc205.mps.gz
+%%DATADIR%%/coin/Data/Netlib/sc50a.mps.gz
+%%DATADIR%%/coin/Data/Netlib/sc50b.mps.gz
+%%DATADIR%%/coin/Data/Netlib/scagr25.mps.gz
+%%DATADIR%%/coin/Data/Netlib/scagr7.mps.gz
+%%DATADIR%%/coin/Data/Netlib/scfxm1.mps.gz
+%%DATADIR%%/coin/Data/Netlib/scfxm2.mps.gz
+%%DATADIR%%/coin/Data/Netlib/scfxm3.mps.gz
+%%DATADIR%%/coin/Data/Netlib/scorpion.mps.gz
+%%DATADIR%%/coin/Data/Netlib/scrs8.mps.gz
+%%DATADIR%%/coin/Data/Netlib/scsd1.mps.gz
+%%DATADIR%%/coin/Data/Netlib/scsd6.mps.gz
+%%DATADIR%%/coin/Data/Netlib/scsd8.mps.gz
+%%DATADIR%%/coin/Data/Netlib/sctap1.mps.gz
+%%DATADIR%%/coin/Data/Netlib/sctap2.mps.gz
+%%DATADIR%%/coin/Data/Netlib/sctap3.mps.gz
+%%DATADIR%%/coin/Data/Netlib/seba.mps.gz
+%%DATADIR%%/coin/Data/Netlib/share1b.mps.gz
+%%DATADIR%%/coin/Data/Netlib/share2b.mps.gz
+%%DATADIR%%/coin/Data/Netlib/shell.mps.gz
+%%DATADIR%%/coin/Data/Netlib/ship04l.mps.gz
+%%DATADIR%%/coin/Data/Netlib/ship04s.mps.gz
+%%DATADIR%%/coin/Data/Netlib/ship08l.mps.gz
+%%DATADIR%%/coin/Data/Netlib/ship08s.mps.gz
+%%DATADIR%%/coin/Data/Netlib/ship12l.mps.gz
+%%DATADIR%%/coin/Data/Netlib/ship12s.mps.gz
+%%DATADIR%%/coin/Data/Netlib/sierra.mps.gz
+%%DATADIR%%/coin/Data/Netlib/stair.mps.gz
+%%DATADIR%%/coin/Data/Netlib/standata.mps.gz
+%%DATADIR%%/coin/Data/Netlib/standgub.mps.gz
+%%DATADIR%%/coin/Data/Netlib/standmps.mps.gz
+%%DATADIR%%/coin/Data/Netlib/stocfor1.mps.gz
+%%DATADIR%%/coin/Data/Netlib/stocfor2.mps.gz
+%%DATADIR%%/coin/Data/Netlib/tuff.mps.gz
+%%DATADIR%%/coin/Data/Netlib/vtpbase.mps.gz
+%%DATADIR%%/coin/Data/Netlib/wood1p.mps.gz
+%%DATADIR%%/coin/Data/Netlib/woodw.mps.gz
+%%DATADIR%%/coin/Data/Sample/afiro.mps
+%%DATADIR%%/coin/Data/Sample/app0110.cor
+%%DATADIR%%/coin/Data/Sample/app0110.stoch
+%%DATADIR%%/coin/Data/Sample/app0110.time
+%%DATADIR%%/coin/Data/Sample/app0110R.cor
+%%DATADIR%%/coin/Data/Sample/app0110R.stoch
+%%DATADIR%%/coin/Data/Sample/app0110R.time
+%%DATADIR%%/coin/Data/Sample/atm_5_10_1.block
+%%DATADIR%%/coin/Data/Sample/atm_5_10_1.mps
+%%DATADIR%%/coin/Data/Sample/block_milp.dec
+%%DATADIR%%/coin/Data/Sample/block_milp.lp
+%%DATADIR%%/coin/Data/Sample/brandy.mps
+%%DATADIR%%/coin/Data/Sample/bug.cor
+%%DATADIR%%/coin/Data/Sample/bug.stoch
+%%DATADIR%%/coin/Data/Sample/bug.time
+%%DATADIR%%/coin/Data/Sample/conic.mps
+%%DATADIR%%/coin/Data/Sample/e226.mps
+%%DATADIR%%/coin/Data/Sample/exmip1.5.mps
+%%DATADIR%%/coin/Data/Sample/exmip1.lp
+%%DATADIR%%/coin/Data/Sample/exmip1.mps
+%%DATADIR%%/coin/Data/Sample/finnis.mps
+%%DATADIR%%/coin/Data/Sample/galenet.mps
+%%DATADIR%%/coin/Data/Sample/galenetbnds.mps
+%%DATADIR%%/coin/Data/Sample/hello.mps
+%%DATADIR%%/coin/Data/Sample/input.130
+%%DATADIR%%/coin/Data/Sample/lseu.mps
+%%DATADIR%%/coin/Data/Sample/nw460.mps
+%%DATADIR%%/coin/Data/Sample/p0033.mps
+%%DATADIR%%/coin/Data/Sample/p0201.mps
+%%DATADIR%%/coin/Data/Sample/p0548.mps
+%%DATADIR%%/coin/Data/Sample/pack1.mps
+%%DATADIR%%/coin/Data/Sample/retail3.block
+%%DATADIR%%/coin/Data/Sample/retail3.mps
+%%DATADIR%%/coin/Data/Sample/scOneInt.mps
+%%DATADIR%%/coin/Data/Sample/share2qp.mps
+%%DATADIR%%/coin/Data/Sample/spec_sections.mps
+%%DATADIR%%/coin/Data/Sample/tp3.mps
+%%DATADIR%%/coin/Data/Sample/tp4.mps
+%%DATADIR%%/coin/Data/Sample/tp5.mps
+%%DATADIR%%/coin/Data/Sample/wedding_16.block
+%%DATADIR%%/coin/Data/Sample/wedding_16.mps
+%%DATADIR%%/coin/doc/Clp/AUTHORS
+%%DATADIR%%/coin/doc/Clp/LICENSE
+%%DATADIR%%/coin/doc/Clp/README
+%%DATADIR%%/coin/doc/Clp/clp_addlibs.txt
+%%DATADIR%%/coin/doc/CoinUtils/AUTHORS
+%%DATADIR%%/coin/doc/CoinUtils/LICENSE
+%%DATADIR%%/coin/doc/CoinUtils/README
+%%DATADIR%%/coin/doc/CoinUtils/coinutils_addlibs.txt
+%%DATADIR%%/coin/doc/Osi/AUTHORS
+%%DATADIR%%/coin/doc/Osi/LICENSE
+%%DATADIR%%/coin/doc/Osi/README
+%%DATADIR%%/coin/doc/Osi/osi_addlibs.txt