Skip to content

Commit

Permalink
math/clp: Fix file conflicts with math/coin-or-data-sample, math/coin…
Browse files Browse the repository at this point in the history 
…-or-data-netlib, math/coinutils

clp was installing the same files that the above three ports install.
This is because COIN-OR ports are designed to be self-sufficient
and contain and install their own dependencies.

This causes conflicts in the context of a port.

Approved by:	portmgr blanket (bugfix)
  • Loading branch information
@yurivict
yurivict committed May 3, 2021
1 parent 5a9ea1e commit 8c4775a
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 204 deletions.
14 changes: 12 additions & 2 deletions math/clp/Makefile
View file
Expand Up @@ -2,7 +2,7 @@

PORTNAME= Clp
DISTVERSION= 1.17.3
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= http://www.coin-or.org/download/source/${PORTNAME}/ \
http://www.mavetju.org/download/adopted/
Expand All @@ -13,14 +13,24 @@ COMMENT= Linear Programming Solver

LICENSE= EPL

USES= blaslapack compiler:c++11-lang fortran libtool pathfix tar:tgz
BUILD_DEPENDS= coin-or-Data-Sample>0:math/coin-or-data-sample \
coin-or-Data-Netlib>0:math/coin-or-data-netlib
LIB_DEPENDS= libcoinmumps.so:math/ipopt \
libCoinUtils.so:math/coinutils
RUN_DEPENDS= coin-or-Data-Sample>0:math/coin-or-data-sample \
coin-or-Data-Netlib>0:math/coin-or-data-netlib

USES= blaslapack compiler:c++11-lang fortran libtool pathfix pkgconfig tar:tgz
GNU_CONFIGURE= yes
USE_LDCONFIG= yes

INSTALL_TARGET= install-strip

CONFIGURE_ARGS= --with-lapack-lib="${LAPACKLIB} -L${LOCALBASE}/lib" \
--with-blas-lib="${BLASLIB} -L${LOCALBASE}/lib" \
--with-coinutils-incdir="${LOCALBASE}/include/coin" --with-coinutils-lib="${LOCALBASE}/lib/libCoinUtils.so" \
--with-netlib-datadir="${LOCALBASE}/share/coin/Data/Netlib" \
--with-sample-datadir="${LOCALBASE}/share/coin/Data/Sample" \
--datadir=${DATADIR}

TEST_TARGET= unitTest
Expand Down
203 changes: 1 addition & 202 deletions math/clp/pkg-plist
View file
Expand Up @@ -3,6 +3,7 @@ include/coin/CbcOrClpParam.cpp
include/coin/CbcOrClpParam.hpp
include/coin/ClpCholeskyBase.hpp
include/coin/ClpCholeskyDense.hpp
include/coin/ClpCholeskyMumps.hpp
include/coin/ClpCholeskyPardiso.hpp
include/coin/ClpConfig.h
include/coin/ClpConstraint.hpp
Expand Down Expand Up @@ -48,66 +49,6 @@ 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/CoinDenseFactorization.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/CoinOslFactorization.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/CoinPresolveMonitor.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/CoinRational.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/CoinWarmStartDual.hpp
include/coin/CoinWarmStartPrimalDual.hpp
include/coin/CoinWarmStartVector.hpp
include/coin/Coin_C_defines.h
include/coin/Idiot.hpp
include/coin/OsiAuxInfo.hpp
include/coin/OsiBranchingObject.hpp
Expand All @@ -131,9 +72,6 @@ lib/libClp.so.1.14.3
lib/libClpSolver.so
lib/libClpSolver.so.1
lib/libClpSolver.so.1.14.3
lib/libCoinUtils.so
lib/libCoinUtils.so.3
lib/libCoinUtils.so.3.11.2
lib/libOsi.so
lib/libOsi.so.1
lib/libOsi.so.1.13.4
Expand All @@ -144,152 +82,13 @@ lib/libOsiCommonTests.so
lib/libOsiCommonTests.so.1
lib/libOsiCommonTests.so.1.13.4
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
Expand Down

0 comments on commit 8c4775a

Please sign in to comment.