From 40d72f68a6f1c944451b3b8eb97535598abb9154 Mon Sep 17 00:00:00 2001 From: William Grzybowski Date: Mon, 5 Aug 2013 12:49:55 +0000 Subject: math/coinmp: update to 1.7.0 - Update to 1.7.0 [1] - Drop maintainership [1] - Trim COMMENT to fit in the limit - Trim Makefile header - Convert to OptionsNG - Use PORTDOCS instead of pkg-plist PR: ports/181037 [1] Submitted by: Pedro Giffuni (maintainer) --- math/coinmp/Makefile | 27 +++++++++++++-------------- math/coinmp/distinfo | 4 ++-- math/coinmp/pkg-descr | 2 +- math/coinmp/pkg-plist | 39 ++++----------------------------------- 4 files changed, 20 insertions(+), 52 deletions(-) (limited to 'math/coinmp') diff --git a/math/coinmp/Makefile b/math/coinmp/Makefile index 9c794334d165..56eb9cf865e0 100644 --- a/math/coinmp/Makefile +++ b/math/coinmp/Makefile @@ -1,19 +1,14 @@ -# New ports collection makefile for: CoinMP -# Date created: 22 June 2011 -# Whom: Pedro Giffuni -# +# Created by: Pedro Giffuni # $FreeBSD$ -# PORTNAME= CoinMP -PORTVERSION= 1.6.0 -PORTREVISION= 1 +PORTVERSION= 1.7.0 CATEGORIES= math MASTER_SITES= http://www.coin-or.org/download/source/CoinMP/ EXTRACT_SUFX= .tgz -MAINTAINER= giffunip@tutopia.com -COMMENT= Optimization library with support for most of COIN-OR CLP, CBC, and CGL +MAINTAINER= ports@FreeBSD.org +COMMENT= Optimization library with support for COIN-OR CLP, CBC, and CGL LICENSE= CPL LICENSE_NAME= Common Public License, Version 1.0 @@ -25,9 +20,13 @@ CONFLICTS= clp-[0-9]* USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -.include +OPTIONS_DEFINE= DEBUG DOCS -.ifdef WITH_GLPK +PORTDOCS= * + +.include + +.if ${PORT_OPTIONS:MGLPK} BROKEN = the GLPK option requires math/glpk headers that are not currently installed by that port CONFIGURE_ARGS+= --with-gmpl-incdir=${LOCALBASE}/include \ --with-gmpl-lib="-L${LOCALBASE}/lib -lglpk" @@ -37,7 +36,7 @@ CONFIGURE_ARGS+= --disable-glpk-libcheck .endif CXXFLAGS+= -ffast-math -.ifndef WITH_DEBUG +.if ${PORT_OPTIONS:MDEBUG} CXXFLAGS+= -fomit-frame-pointer .endif @@ -54,7 +53,7 @@ pre-build: .endfor post-install: -.ifndef NOPORTDOCS +.if ${PORT_OPTIONS:MDOCS} ${MV} ${PREFIX}/share/coin/doc ${DOCSDIR} .endif ${RM} -rf ${PREFIX}/share/coin @@ -63,4 +62,4 @@ check regression-test test: build @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \ ${MAKE_ARGS} test) -.include +.include diff --git a/math/coinmp/distinfo b/math/coinmp/distinfo index ce8f3175c3f9..8ed901e8aa97 100644 --- a/math/coinmp/distinfo +++ b/math/coinmp/distinfo @@ -1,2 +1,2 @@ -SHA256 (CoinMP-1.6.0.tgz) = 33eccad711dcf5a511cd2246267996df5b73d067a14214c1f2fad4bc1aecc971 -SIZE (CoinMP-1.6.0.tgz) = 12400327 +SHA256 (CoinMP-1.7.0.tgz) = 48bb3e89ed9ebbad1ea71ece575419b3bff81ab2c6257d353cf4c948010d5adb +SIZE (CoinMP-1.7.0.tgz) = 9647250 diff --git a/math/coinmp/pkg-descr b/math/coinmp/pkg-descr index 15d6e187ab05..8450ed409c04 100644 --- a/math/coinmp/pkg-descr +++ b/math/coinmp/pkg-descr @@ -3,4 +3,4 @@ functionality of the CLP (Coin LP), CBC (Coin Branch-and-Cut), and CGL (Cut Generation Library) projects. When compiled for Unix it generates a CoinMP.so library that can be similarly used in other Unix C/C++ projects. -WWW: https://projects.coin-or.org/CoinMP +WWW: https://projects.coin-or.org/CoinMP diff --git a/math/coinmp/pkg-plist b/math/coinmp/pkg-plist index 113ee1306b48..6039e3a2a516 100644 --- a/math/coinmp/pkg-plist +++ b/math/coinmp/pkg-plist @@ -215,7 +215,6 @@ include/coin/ClpConstraintAmpl.hpp include/coin/ClpAmplObjective.hpp include/coin/CoinMPConfig.h include/coin/CoinMP.h -@dirrm include/coin lib/libCbc.la lib/libCbc.so lib/libCbc.so.10 @@ -230,7 +229,7 @@ lib/libClp.so lib/libClp.so.12 lib/libCoinMP.la lib/libCoinMP.so -lib/libCoinMP.so.7 +lib/libCoinMP.so.8 lib/libCoinUtils.la lib/libCoinUtils.so lib/libCoinUtils.so.11 @@ -246,39 +245,7 @@ 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%% +lib/pkgconfig/coindatasample.pc libdata/pkgconfig/clp.pc libdata/pkgconfig/osi-clp.pc libdata/pkgconfig/cbc.pc @@ -288,3 +255,5 @@ libdata/pkgconfig/coinutils.pc libdata/pkgconfig/coinmp.pc libdata/pkgconfig/osi-cbc.pc libdata/pkgconfig/osi-unittests.pc +@dirrm include/coin +@dirrmtry lib/pkgconfig -- cgit v1.2.3