From owner-svn-ports-all@freebsd.org Mon Dec 10 07:50:46 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 38B581314DF0; Mon, 10 Dec 2018 07:50:46 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D4DCF6BFBA; Mon, 10 Dec 2018 07:50:45 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B5CAA1D0CF; Mon, 10 Dec 2018 07:50:45 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBA7ojOk045186; Mon, 10 Dec 2018 07:50:45 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBA7ojsA045184; Mon, 10 Dec 2018 07:50:45 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201812100750.wBA7ojsA045184@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Mon, 10 Dec 2018 07:50:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487134 - head/math/coinutils X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: head/math/coinutils X-SVN-Commit-Revision: 487134 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D4DCF6BFBA X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.97)[-0.970,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-0.99)[-0.991,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Dec 2018 07:50:46 -0000 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 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