3 files changed, 31 insertions, 19 deletions

diff --git a/math/coinmp/Makefile b/math/coinmp/Makefile
index 3d647922260f..023042f12962 100644
--- a/math/coinmp/Makefile
+++ b/math/coinmp/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	CoinMP
-PORTVERSION=	1.7.6
-PORTREVISION=	1
+PORTVERSION=	1.8.0
 CATEGORIES=	math
 MASTER_SITES=	http://www.coin-or.org/download/source/CoinMP/
 
@@ -20,8 +19,8 @@ CONFLICTS=	clp-[0-9]*
 GNU_CONFIGURE=	yes
 USES=	libtool pkgconfig tar:tgz
 USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS+=	PKG_CONFIG_PATH=${STAGEDIR}${PREFIX}/libdata/pkgconfig
+CXXFLAGS+=	-ffast-math
 
 OPTIONS_DEFINE=	DEBUG DOCS GLPK
 
@@ -39,20 +38,28 @@ LIB_DEPENDS+=	libglpk.so:${PORTSDIR}/math/glpk
 CONFIGURE_ARGS+=	--disable-glpk-libcheck
 .endif
 
-CXXFLAGS+=	-ffast-math
 .if ${PORT_OPTIONS:MDEBUG}
 CXXFLAGS+=	-fomit-frame-pointer
 .endif
 
+STRIP_FILES=	libCoinUtils libOsi libOsiClp libOsiCommonTests libClp libClpSolver \
+		libCgl libCbc libCbcSolver libOsiCbc libCoinMP
+
 post-patch::
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
 		-e 's|$$(DESTDIR)$$(addlibsdir)|$$(addlibsdir)|g' \
-		-e 's|addlibs_DATA = examples/Makefile examples/example.c||g'
+		-e 's|addlibs_DATA = examples/Makefile examples/example.c||g' \
+		-e 's|DocInstallDir = $$(datadir)/coin/doc/$$(PACKAGE_NAME)|DocInstallDir = $$(datadir)/doc/CoinMP/$$(PACKAGE_NAME)|' \
+		-e 's|	$$(MAKE) $$(AM_MAKEFLAGS) install-data-hook||'
+	${REINPLACE_CMD} -e 's|datacoin_DATA = $$(EXAMPLE_FILES)|datacoin_DATA = |' \
+		-e 's|datacoindir = $$(datadir)/coin/Data/Sample|datacoindir = |' ${WRKSRC}/Data/Sample/Makefile.in
+	${REINPLACE_CMD} -e 's|addlibsdir = $$(DESTDIR)$$(datadir)/coin/doc/CoinMP|addlibsdir = |' ${WRKSRC}/CoinMP/Makefile.in
 
 post-install:
-	${MV} ${STAGEDIR}${PREFIX}/share/coin/doc ${STAGEDIR}${DOCSDIR}
-	${RM} -rf ${STAGEDIR}${PREFIX}/share/coin
+.for filename in ${STRIP_FILES}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${filename}.so.*
+.endfor
 
 check regression-test test: build
 	@(cd ${WRKSRC};  ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
diff --git a/math/coinmp/distinfo b/math/coinmp/distinfo
index 133ae9097d6d..f488a2dde953 100644
--- a/math/coinmp/distinfo
+++ b/math/coinmp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (CoinMP-1.7.6.tgz) = 86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f
-SIZE (CoinMP-1.7.6.tgz) = 10343849
+SHA256 (CoinMP-1.8.0.tgz) = 4f17c221ca9a38a692ebf53497bf2630be258581583e911955b269c0cc88b627
+SIZE (CoinMP-1.8.0.tgz) = 10619577
diff --git a/math/coinmp/pkg-plist b/math/coinmp/pkg-plist
index f94d2bf6af39..60b5cbaa5267 100644
--- a/math/coinmp/pkg-plist
+++ b/math/coinmp/pkg-plist
@@ -36,6 +36,7 @@ include/coin/CbcGeneral.hpp
 include/coin/CbcGeneralDepth.hpp
 include/coin/CbcHeuristic.hpp
 include/coin/CbcHeuristicDINS.hpp
+include/coin/CbcHeuristicDW.hpp
 include/coin/CbcHeuristicDive.hpp
 include/coin/CbcHeuristicDiveCoefficient.hpp
 include/coin/CbcHeuristicDiveFractional.hpp
@@ -190,6 +191,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
@@ -228,34 +230,37 @@ include/coin/OsiSolverParameters.hpp
 include/coin/OsiUnitTests.hpp
 lib/libCbc.so
 lib/libCbc.so.3
-lib/libCbc.so.3.8.8
+lib/libCbc.so.3.9.2
 lib/libCbcSolver.so
 lib/libCbcSolver.so.3
-lib/libCbcSolver.so.3.8.8
+lib/libCbcSolver.so.3.9.2
 lib/libCgl.so
 lib/libCgl.so.1
-lib/libCgl.so.1.8.5
+lib/libCgl.so.1.9.2
 lib/libClp.so
 lib/libClp.so.1
-lib/libClp.so.1.12.6
+lib/libClp.so.1.13.3
+lib/libClpSolver.so
+lib/libClpSolver.so.1
+lib/libClpSolver.so.1.13.3
 lib/libCoinMP.so
 lib/libCoinMP.so.1
-lib/libCoinMP.so.1.7.6
+lib/libCoinMP.so.1.8.0
 lib/libCoinUtils.so
 lib/libCoinUtils.so.3
-lib/libCoinUtils.so.3.9.11
+lib/libCoinUtils.so.3.10.3
 lib/libOsi.so
 lib/libOsi.so.1
-lib/libOsi.so.1.11.5
+lib/libOsi.so.1.12.2
 lib/libOsiCbc.so
 lib/libOsiCbc.so.3
-lib/libOsiCbc.so.3.8.8
+lib/libOsiCbc.so.3.9.2
 lib/libOsiClp.so
 lib/libOsiClp.so.1
-lib/libOsiClp.so.1.12.6
+lib/libOsiClp.so.1.13.3
 lib/libOsiCommonTests.so
 lib/libOsiCommonTests.so.1
-lib/libOsiCommonTests.so.1.11.5
+lib/libOsiCommonTests.so.1.12.2
 libdata/pkgconfig/cbc.pc
 libdata/pkgconfig/cgl.pc
 libdata/pkgconfig/clp.pc