From owner-svn-ports-head@FreeBSD.ORG Fri Jul 11 15:05:40 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A6F4BDDD; Fri, 11 Jul 2014 15:05:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 86B8E22B0; Fri, 11 Jul 2014 15:05:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6BF5eOL024435; Fri, 11 Jul 2014 15:05:40 GMT (envelope-from pi@svn.freebsd.org) Received: (from pi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6BF5dU9024432; Fri, 11 Jul 2014 15:05:39 GMT (envelope-from pi@svn.freebsd.org) Message-Id: <201407111505.s6BF5dU9024432@svn.freebsd.org> From: Kurt Jaeger Date: Fri, 11 Jul 2014 15:05:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361545 - head/math/coinmp X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jul 2014 15:05:40 -0000 Author: pi Date: Fri Jul 11 15:05:39 2014 New Revision: 361545 URL: http://svnweb.freebsd.org/changeset/ports/361545 QAT: https://qat.redports.org/buildarchive/r361545/ Log: math/coinmp: 1.7.2 -> 1.7.6 - Update to 1.7.6 - Convert to USES=libtool and remove USE_AUTOTOOLS=libtool - Use clang instead of gcc - Fix pkg-plist - Take maintainership PR: 187487 Submitted by: Carlos Jacobo Puga Medina (cpm@fbsd.es) Modified: head/math/coinmp/Makefile head/math/coinmp/distinfo head/math/coinmp/pkg-plist Modified: head/math/coinmp/Makefile ============================================================================== --- head/math/coinmp/Makefile Fri Jul 11 14:43:22 2014 (r361544) +++ head/math/coinmp/Makefile Fri Jul 11 15:05:39 2014 (r361545) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= CoinMP -PORTVERSION= 1.7.2 +PORTVERSION= 1.7.6 CATEGORIES= math MASTER_SITES= http://www.coin-or.org/download/source/CoinMP/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= cpm@fbsd.es COMMENT= Optimization library with support for COIN-OR CLP, CBC, and CGL LICENSE= CPL @@ -16,10 +16,10 @@ LICENSE_PERMS= dist-mirror dist-sell pkg CONFLICTS= clp-[0-9]* -USES= pkgconfig tar:tgz -USE_AUTOTOOLS= libtool +GNU_CONFIGURE= yes +USES= libtool pkgconfig tar:tgz USE_LDCONFIG= yes -USE_GCC= any +INSTALL_TARGET= install-strip CONFIGURE_ARGS+= PKG_CONFIG_PATH=${STAGEDIR}${PREFIX}/libdata/pkgconfig OPTIONS_DEFINE= DEBUG DOCS @@ -52,11 +52,6 @@ post-patch:: @${REINPLACE_CMD} -e 's|$$(DESTDIR)$$(addlibsdir)|$$(addlibsdir)|g' \ ${WRKSRC}/CoinMP/Makefile.in -pre-build: -.for dir in Cbc Cgl Clp CoinMP CoinUtils Osi - ${CP} ${LTMAIN} ${WRKSRC}/${dir} -.endfor - post-install: ${MV} ${STAGEDIR}${PREFIX}/share/coin/doc ${STAGEDIR}${DOCSDIR} ${RM} -rf ${STAGEDIR}${PREFIX}/share/coin Modified: head/math/coinmp/distinfo ============================================================================== --- head/math/coinmp/distinfo Fri Jul 11 14:43:22 2014 (r361544) +++ head/math/coinmp/distinfo Fri Jul 11 15:05:39 2014 (r361545) @@ -1,2 +1,2 @@ -SHA256 (CoinMP-1.7.2.tgz) = 908878c80d342cde99f77db46331b74c937c9e44806c5b80c9bdd2139dd8518f -SIZE (CoinMP-1.7.2.tgz) = 9609347 +SHA256 (CoinMP-1.7.6.tgz) = 86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f +SIZE (CoinMP-1.7.6.tgz) = 10343849 Modified: head/math/coinmp/pkg-plist ============================================================================== --- head/math/coinmp/pkg-plist Fri Jul 11 14:43:22 2014 (r361544) +++ head/math/coinmp/pkg-plist Fri Jul 11 15:05:39 2014 (r361545) @@ -1,29 +1,62 @@ bin/cbc bin/clp +include/coin/CbcBranchActual.hpp include/coin/CbcBranchAllDifferent.hpp +include/coin/CbcBranchBase.hpp +include/coin/CbcBranchCut.hpp include/coin/CbcBranchDecision.hpp include/coin/CbcBranchDefaultDecision.hpp +include/coin/CbcBranchDynamic.hpp +include/coin/CbcBranchLotsize.hpp include/coin/CbcBranchToFixLots.hpp include/coin/CbcBranchingObject.hpp include/coin/CbcClique.hpp include/coin/CbcCompare.hpp +include/coin/CbcCompareActual.hpp +include/coin/CbcCompareBase.hpp include/coin/CbcCompareDefault.hpp include/coin/CbcCompareDepth.hpp include/coin/CbcCompareEstimate.hpp include/coin/CbcCompareObjective.hpp +include/coin/CbcConfig.h include/coin/CbcConsequence.hpp +include/coin/CbcCountRowCut.hpp +include/coin/CbcCutGenerator.hpp include/coin/CbcCutModifier.hpp include/coin/CbcCutSubsetModifier.hpp include/coin/CbcDummyBranchingObject.hpp +include/coin/CbcEventHandler.hpp +include/coin/CbcFathom.hpp +include/coin/CbcFathomDynamicProgramming.hpp +include/coin/CbcFeasibilityBase.hpp include/coin/CbcFixVariable.hpp include/coin/CbcFollowOn.hpp include/coin/CbcFullNodeInfo.hpp include/coin/CbcGeneral.hpp include/coin/CbcGeneralDepth.hpp +include/coin/CbcHeuristic.hpp include/coin/CbcHeuristicDINS.hpp +include/coin/CbcHeuristicDive.hpp +include/coin/CbcHeuristicDiveCoefficient.hpp +include/coin/CbcHeuristicDiveFractional.hpp +include/coin/CbcHeuristicDiveGuided.hpp +include/coin/CbcHeuristicDiveLineSearch.hpp +include/coin/CbcHeuristicDivePseudoCost.hpp +include/coin/CbcHeuristicDiveVectorLength.hpp +include/coin/CbcHeuristicFPump.hpp +include/coin/CbcHeuristicGreedy.hpp +include/coin/CbcHeuristicLocal.hpp +include/coin/CbcHeuristicPivotAndFix.hpp include/coin/CbcHeuristicRENS.hpp +include/coin/CbcHeuristicRINS.hpp +include/coin/CbcHeuristicRandRound.hpp include/coin/CbcHeuristicVND.hpp +include/coin/CbcLinked.hpp +include/coin/CbcMessage.hpp +include/coin/CbcMipStartIO.hpp +include/coin/CbcModel.hpp include/coin/CbcNWay.hpp +include/coin/CbcNode.hpp include/coin/CbcNodeInfo.hpp include/coin/CbcObject.hpp include/coin/CbcObjectUpdateData.hpp @@ -34,15 +67,51 @@ include/coin/CbcSOS.hpp include/coin/CbcSimpleInteger.hpp include/coin/CbcSimpleIntegerDynamicPseudoCost.hpp include/coin/CbcSimpleIntegerPseudoCost.hpp +include/coin/CbcSolver.hpp +include/coin/CbcStrategy.hpp include/coin/CbcSubProblem.hpp -include/coin/ClpConfig.h -include/coin/Clp_C_Interface.h +include/coin/CbcTree.hpp +include/coin/CbcTreeLocal.hpp +include/coin/Cbc_C_Interface.h +include/coin/Cgl012cut.hpp +include/coin/CglAllDifferent.hpp +include/coin/CglClique.hpp +include/coin/CglConfig.h +include/coin/CglCutGenerator.hpp +include/coin/CglDuplicateRow.hpp +include/coin/CglFlowCover.hpp +include/coin/CglGMI.hpp +include/coin/CglGMIParam.hpp +include/coin/CglGomory.hpp +include/coin/CglKnapsackCover.hpp +include/coin/CglLandP.hpp +include/coin/CglLandPValidator.hpp +include/coin/CglLiftAndProject.hpp +include/coin/CglMessage.hpp +include/coin/CglMixedIntegerRounding.hpp +include/coin/CglMixedIntegerRounding2.hpp +include/coin/CglOddHole.hpp +include/coin/CglParam.hpp +include/coin/CglPreProcess.hpp +include/coin/CglProbing.hpp +include/coin/CglRedSplit.hpp +include/coin/CglRedSplit2.hpp +include/coin/CglRedSplit2Param.hpp +include/coin/CglRedSplitParam.hpp +include/coin/CglResidualCapacity.hpp +include/coin/CglSimpleRounding.hpp +include/coin/CglStored.hpp +include/coin/CglTreeInfo.hpp +include/coin/CglTwomir.hpp +include/coin/CglZeroHalf.hpp +include/coin/ClpAmplObjective.hpp include/coin/ClpCholeskyBase.hpp include/coin/ClpCholeskyDense.hpp +include/coin/ClpConfig.h include/coin/ClpConstraint.hpp +include/coin/ClpConstraintAmpl.hpp include/coin/ClpConstraintLinear.hpp include/coin/ClpConstraintQuadratic.hpp -include/coin/ClpNode.hpp include/coin/ClpDualRowDantzig.hpp include/coin/ClpDualRowPivot.hpp include/coin/ClpDualRowSteepest.hpp @@ -59,42 +128,43 @@ 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/ClpParameters.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/Clp_C_Interface.h include/coin/CoinAlloc.hpp -include/coin/CoinUtilsConfig.h -include/coin/Coin_C_defines.h 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/CoinSimpFactorization.hpp -include/coin/CoinDenseFactorization.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/CoinMP.h +include/coin/CoinMPConfig.h include/coin/CoinMessage.hpp include/coin/CoinMessageHandler.hpp include/coin/CoinModel.hpp -include/coin/CoinStructuredModel.hpp include/coin/CoinModelUseful.hpp include/coin/CoinMpsIO.hpp include/coin/CoinOslFactorization.hpp @@ -112,6 +182,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 @@ -122,137 +193,77 @@ include/coin/CoinPresolveZeros.hpp include/coin/CoinSearchTree.hpp include/coin/CoinShallowPackedVector.hpp include/coin/CoinSignal.hpp +include/coin/CoinSimpFactorization.hpp include/coin/CoinSmartPtr.hpp include/coin/CoinSnapshot.hpp include/coin/CoinSort.hpp +include/coin/CoinStructuredModel.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/CoinWarmStartVector.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/OsiConfig.h include/coin/OsiAuxInfo.hpp include/coin/OsiBranchingObject.hpp +include/coin/OsiCbcSolverInterface.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/OsiRowCut.hpp -include/coin/OsiRowCutDebugger.hpp -include/coin/OsiCbcSolverInterface.hpp -include/coin/OsiClpSolverInterface.hpp include/coin/OsiUnitTests.hpp -include/coin/CglClique.hpp -include/coin/CglMixedIntegerRounding.hpp -include/coin/CglDuplicateRow.hpp -include/coin/CglMixedIntegerRounding2.hpp -include/coin/CglTwomir.hpp -include/coin/CglKnapsackCover.hpp -include/coin/CglSimpleRounding.hpp -include/coin/CglLiftAndProject.hpp -include/coin/CglFlowCover.hpp -include/coin/CglPreProcess.hpp -include/coin/CglLandP.hpp -include/coin/CglLandPValidator.hpp -include/coin/CglProbing.hpp -include/coin/CglOddHole.hpp -include/coin/CglGomory.hpp -include/coin/CglAllDifferent.hpp -include/coin/CglResidualCapacity.hpp -include/coin/CglRedSplit.hpp -include/coin/CglRedSplitParam.hpp -include/coin/CglConfig.h -include/coin/CglCutGenerator.hpp -include/coin/CglMessage.hpp -include/coin/CglStored.hpp -include/coin/CglParam.hpp -include/coin/CglTreeInfo.hpp -include/coin/CbcConfig.h -include/coin/Cbc_C_Interface.h -include/coin/CbcBranchActual.hpp -include/coin/CbcBranchBase.hpp -include/coin/CbcBranchDynamic.hpp -include/coin/CbcBranchLotsize.hpp -include/coin/CbcBranchCut.hpp -include/coin/CbcCompareActual.hpp -include/coin/CbcCompareBase.hpp -include/coin/CbcCutGenerator.hpp -include/coin/CbcFathom.hpp -include/coin/CbcEventHandler.hpp -include/coin/CbcFeasibilityBase.hpp -include/coin/CbcHeuristic.hpp -include/coin/CbcHeuristicDive.hpp -include/coin/CbcHeuristicDiveCoefficient.hpp -include/coin/CbcHeuristicDiveFractional.hpp -include/coin/CbcHeuristicDiveGuided.hpp -include/coin/CbcHeuristicDiveLineSearch.hpp -include/coin/CbcHeuristicDivePseudoCost.hpp -include/coin/CbcHeuristicDiveVectorLength.hpp -include/coin/CbcHeuristicFPump.hpp -include/coin/CbcHeuristicGreedy.hpp -include/coin/CbcHeuristicLocal.hpp -include/coin/CbcHeuristicPivotAndFix.hpp -include/coin/CbcHeuristicRandRound.hpp -include/coin/CbcHeuristicRINS.hpp -include/coin/CbcMessage.hpp -include/coin/CbcModel.hpp -include/coin/CbcNode.hpp -include/coin/CbcStrategy.hpp -include/coin/CbcSolver.hpp -include/coin/CbcTree.hpp -include/coin/CbcLinked.hpp -include/coin/CbcTreeLocal.hpp -include/coin/ClpConstraintAmpl.hpp -include/coin/ClpAmplObjective.hpp -include/coin/CoinMPConfig.h -include/coin/CoinMP.h -lib/libCbc.la lib/libCbc.so -lib/libCbc.so.10 -lib/libCbcSolver.la +lib/libCbc.so.3 +lib/libCbc.so.3.8.8 lib/libCbcSolver.so -lib/libCbcSolver.so.10 -lib/libCgl.la +lib/libCbcSolver.so.3 +lib/libCbcSolver.so.3.8.8 lib/libCgl.so -lib/libCgl.so.8 -lib/libClp.la +lib/libCgl.so.1 +lib/libCgl.so.1.8.5 lib/libClp.so -lib/libClp.so.12 -lib/libCoinMP.la +lib/libClp.so.1 +lib/libClp.so.1.12.6 lib/libCoinMP.so -lib/libCoinMP.so.8 -lib/libCoinUtils.la +lib/libCoinMP.so.1 +lib/libCoinMP.so.1.7.6 lib/libCoinUtils.so -lib/libCoinUtils.so.11 -lib/libOsi.la +lib/libCoinUtils.so.3 +lib/libCoinUtils.so.3.9.11 lib/libOsi.so -lib/libOsi.so.11 -lib/libOsiCbc.la +lib/libOsi.so.1 +lib/libOsi.so.1.11.5 lib/libOsiCbc.so -lib/libOsiCbc.so.10 -lib/libOsiClp.la +lib/libOsiCbc.so.3 +lib/libOsiCbc.so.3.8.8 lib/libOsiClp.so -lib/libOsiClp.so.12 -lib/libOsiCommonTests.la +lib/libOsiClp.so.1 +lib/libOsiClp.so.1.12.6 lib/libOsiCommonTests.so -lib/libOsiCommonTests.so.11 -libdata/pkgconfig/coindatasample.pc -libdata/pkgconfig/clp.pc -libdata/pkgconfig/osi-clp.pc +lib/libOsiCommonTests.so.1 +lib/libOsiCommonTests.so.1.11.5 libdata/pkgconfig/cbc.pc libdata/pkgconfig/cgl.pc -libdata/pkgconfig/osi.pc -libdata/pkgconfig/coinutils.pc +libdata/pkgconfig/clp.pc +libdata/pkgconfig/coindatasample.pc libdata/pkgconfig/coinmp.pc +libdata/pkgconfig/coinutils.pc libdata/pkgconfig/osi-cbc.pc +libdata/pkgconfig/osi-clp.pc libdata/pkgconfig/osi-unittests.pc -@dirrm include/coin +libdata/pkgconfig/osi.pc +@dirrmtry include/coin