svn commit: r487134 - head/math/coinutils
Yuri Victorovich
yuri at FreeBSD.org
Mon Dec 10 07:50:46 UTC 2018
Author: yuri
Date: Mon Dec 10 07:50:44 2018
New Revision: 487134
URL: https://svnweb.freebsd.org/changeset/ports/487134
Log:
math/coinutils: Use COIN-OR data ports as dependencies instead of installing them here; Remove dysfunctional glpk dependency
Modified:
head/math/coinutils/Makefile
head/math/coinutils/pkg-plist
Modified: head/math/coinutils/Makefile
==============================================================================
--- head/math/coinutils/Makefile Mon Dec 10 07:43:53 2018 (r487133)
+++ head/math/coinutils/Makefile Mon Dec 10 07:50:44 2018 (r487134)
@@ -2,6 +2,7 @@
PORTNAME= CoinUtils
DISTVERSION= 2.10.14
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= https://www.coin-or.org/download/source/${PORTNAME}/
PKGNAMEPREFIX= coin-or-
@@ -12,18 +13,20 @@ COMMENT= Utilities for COIN-OR project
LICENSE= EPL
LICENSE_FILE= ${WRKSRC}/CoinUtils/LICENSE
-LIB_DEPENDS= libblas.so:math/blas \
- libglpk.so:math/glpk \
- libopenblas.so:math/openblas
+BUILD_DEPENDS= coin-or-Data-Sample>0:math/coin-or-data-sample \
+ coin-or-Data-Netlib>0:math/coin-or-data-netlib
+LIB_DEPENDS= libopenblas.so:math/openblas
+RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= fortran gmake libtool localbase:ldflags pkgconfig zip
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-blas-lib="-lopenblas" --with-lapack-lib="-lopenblas" --with-glpk-lib="-lglpk"
+CONFIGURE_ARGS= --with-blas-lib="-lopenblas" --with-lapack-lib="-lopenblas" \
+ --with-sample-datadir="${LOCALBASE}/share/coin/Data/Sample" \
+ --with-netlib-datadir="${LOCALBASE}/share/coin/Data/Netlib"
+ # doesn't link with the optional dependency glpk: https://github.com/coin-or/CoinUtils/issues/7
USE_LDCONFIG= yes
-DATADIR= ${PREFIX}/share/coin
-
post-install:
- @${RM} ${STAGEDIR}${DATADIR}/doc/CoinUtils/LICENSE
+ @${RM} -r ${STAGEDIR}${PREFIX}/share/coin
.include <bsd.port.mk>
Modified: head/math/coinutils/pkg-plist
==============================================================================
--- head/math/coinutils/pkg-plist Mon Dec 10 07:43:53 2018 (r487133)
+++ head/math/coinutils/pkg-plist Mon Dec 10 07:50:44 2018 (r487134)
@@ -61,49 +61,4 @@ include/coin/Coin_C_defines.h
lib/libCoinUtils.so
lib/libCoinUtils.so.3
lib/libCoinUtils.so.3.10.14
-libdata/pkgconfig/coindatasample.pc
libdata/pkgconfig/coinutils.pc
-%%DATADIR%%/Data/Sample/afiro.mps
-%%DATADIR%%/Data/Sample/app0110.cor
-%%DATADIR%%/Data/Sample/app0110.stoch
-%%DATADIR%%/Data/Sample/app0110.time
-%%DATADIR%%/Data/Sample/app0110R.cor
-%%DATADIR%%/Data/Sample/app0110R.stoch
-%%DATADIR%%/Data/Sample/app0110R.time
-%%DATADIR%%/Data/Sample/atm_5_10_1.block
-%%DATADIR%%/Data/Sample/atm_5_10_1.mps
-%%DATADIR%%/Data/Sample/block_milp.dec
-%%DATADIR%%/Data/Sample/block_milp.lp
-%%DATADIR%%/Data/Sample/brandy.mps
-%%DATADIR%%/Data/Sample/bug.cor
-%%DATADIR%%/Data/Sample/bug.stoch
-%%DATADIR%%/Data/Sample/bug.time
-%%DATADIR%%/Data/Sample/conic.mps
-%%DATADIR%%/Data/Sample/e226.mps
-%%DATADIR%%/Data/Sample/exmip1.5.mps
-%%DATADIR%%/Data/Sample/exmip1.lp
-%%DATADIR%%/Data/Sample/exmip1.mps
-%%DATADIR%%/Data/Sample/finnis.mps
-%%DATADIR%%/Data/Sample/galenet.mps
-%%DATADIR%%/Data/Sample/galenetbnds.mps
-%%DATADIR%%/Data/Sample/hello.mps
-%%DATADIR%%/Data/Sample/input.130
-%%DATADIR%%/Data/Sample/lseu.mps
-%%DATADIR%%/Data/Sample/nw460.mps
-%%DATADIR%%/Data/Sample/p0033.mps
-%%DATADIR%%/Data/Sample/p0201.mps
-%%DATADIR%%/Data/Sample/p0548.mps
-%%DATADIR%%/Data/Sample/pack1.mps
-%%DATADIR%%/Data/Sample/retail3.block
-%%DATADIR%%/Data/Sample/retail3.mps
-%%DATADIR%%/Data/Sample/scOneInt.mps
-%%DATADIR%%/Data/Sample/share2qp.mps
-%%DATADIR%%/Data/Sample/spec_sections.mps
-%%DATADIR%%/Data/Sample/tp3.mps
-%%DATADIR%%/Data/Sample/tp4.mps
-%%DATADIR%%/Data/Sample/tp5.mps
-%%DATADIR%%/Data/Sample/wedding_16.block
-%%DATADIR%%/Data/Sample/wedding_16.mps
-%%DATADIR%%/doc/CoinUtils/AUTHORS
-%%DATADIR%%/doc/CoinUtils/README
-%%DATADIR%%/doc/CoinUtils/coinutils_addlibs.txt
More information about the svn-ports-all
mailing list