cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

math/clp: Remove bundled osi project in favor of math/osi dependency

Browse Source 
This fixes file conflict between math/clp and math/osi.
This commit is contained in:
Yuri Victorovich 2021-05-12 08:57:54 -07:00
parent 32ca8c877e
commit 975c4836a6
3 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
math/clp/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= Clp
DISTVERSION= 1.17.3
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= math
MASTER_SITES= https://www.coin-or.org/download/source/${PORTNAME}/
PKGNAMEPREFIX= coin-or-
@ -16,7 +16,8 @@ BUILD_DEPENDS= coin-or-Data-Sample>0:math/coin-or-data-sample \
coin-or-Data-Netlib>0:math/coin-or-data-netlib
LIB_DEPENDS= libcoinasl.so:math/asl \
libcoinmumps.so:math/ipopt \
libCoinUtils.so:math/coinutils
libCoinUtils.so:math/coinutils \
libOsi.so:math/osi
RUN_DEPENDS= coin-or-Data-Sample>0:math/coin-or-data-sample \
coin-or-Data-Netlib>0:math/coin-or-data-netlib
@ -28,6 +29,7 @@ INSTALL_TARGET= install-strip
CONFIGURE_ARGS= --with-lapack-lib="${LAPACKLIB} -L${LOCALBASE}/lib" \
--with-blas-lib="${BLASLIB} -L${LOCALBASE}/lib" \
--with-osi-incdir="${LOCALBASE}/include/coin" --with-osi-lib="${LOCALBASE}/lib/libOsi.so" \
--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" \

27
math/clp/pkg-plist
View File

@ -50,46 +50,19 @@ include/coin/ClpSimplexPrimal.hpp
include/coin/ClpSolve.hpp
include/coin/Clp_C_Interface.h
include/coin/Idiot.hpp
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.1
lib/libClp.so.1.14.3
lib/libClpSolver.so
lib/libClpSolver.so.1
lib/libClpSolver.so.1.14.3
lib/libOsi.so
lib/libOsi.so.1
lib/libOsi.so.1.13.4
lib/libOsiClp.so
lib/libOsiClp.so.1
lib/libOsiClp.so.1.14.3
lib/libOsiCommonTests.so
lib/libOsiCommonTests.so.1
lib/libOsiCommonTests.so.1.13.4
libdata/pkgconfig/clp.pc
libdata/pkgconfig/osi-clp.pc
libdata/pkgconfig/osi-unittests.pc
libdata/pkgconfig/osi.pc
%%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/Osi/AUTHORS
%%DATADIR%%/coin/doc/Osi/LICENSE
%%DATADIR%%/coin/doc/Osi/README
%%DATADIR%%/coin/doc/Osi/osi_addlibs.txt

3
math/highs/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= highs
DISTVERSION= g20210408
PORTREVISION= 1
CATEGORIES= math
PKGNAMEPREFIX= coin-or-
@ -11,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN_i386= undefined reference to fmax, see https://github.com/ERGO-Code/HiGHS/issues/505
LIB_DEPENDS= libOsi.so:math/clp
LIB_DEPENDS= libOsi.so:math/osi
USES= blaslapack cmake compiler:c++11-lang pkgconfig