diff --git a/math/cgl/Makefile b/math/cgl/Makefile index ba00f97b613a..3f31e2c86e09 100644 --- a/math/cgl/Makefile +++ b/math/cgl/Makefile @@ -1,34 +1,35 @@ PORTNAME= cgl DISTVERSIONPREFIX= releases/ -DISTVERSION= 0.60.3 -PORTREVISION= 2 +DISTVERSION= 0.60.4 CATEGORIES= math PKGNAMEPREFIX= coin-or- MAINTAINER= yuri@FreeBSD.org COMMENT= Collection of cut generators for COIN-OR packages that use cuts LICENSE= EPL LICENSE_FILE= ${WRKSRC}/Cgl/LICENSE LIB_DEPENDS= libcoinasl.so:math/asl \ libblas.so:math/blas \ libcoinmetis.so:math/ipopt \ libCoinUtils.so:math/coinutils \ libClp.so:math/clp \ libopenblas.so:math/openblas \ libOsi.so:math/osi USES= compiler:c++11-lang gmake libtool pkgconfig USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= coin-or GH_PROJECT= Cgl GNU_CONFIGURE= yes +TEST_TARGET= test + post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libCgl.so.* .include diff --git a/math/cgl/distinfo b/math/cgl/distinfo index 4d607f9ffbcb..721e3e5f5726 100644 --- a/math/cgl/distinfo +++ b/math/cgl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1580542171 -SHA256 (coin-or-Cgl-releases-0.60.3_GH0.tar.gz) = cfeeedd68feab7c0ce377eb9c7b61715120478f12c4dd0064b05ad640e20f3fb -SIZE (coin-or-Cgl-releases-0.60.3_GH0.tar.gz) = 1267590 +TIMESTAMP = 1642112941 +SHA256 (coin-or-Cgl-releases-0.60.4_GH0.tar.gz) = 57db498a0b7e1f3614ca061a93b23dc7e65017f092457c7366fa7d78397b5657 +SIZE (coin-or-Cgl-releases-0.60.4_GH0.tar.gz) = 1277287 diff --git a/math/cgl/files/patch-Cgl_src_CglLandP_CglLandPUtils.hpp b/math/cgl/files/patch-Cgl_src_CglLandP_CglLandPUtils.hpp deleted file mode 100644 index f10ff52b59d4..000000000000 --- a/math/cgl/files/patch-Cgl_src_CglLandP_CglLandPUtils.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- Cgl/src/CglLandP/CglLandPUtils.hpp.orig 2018-04-16 07:09:23 UTC -+++ Cgl/src/CglLandP/CglLandPUtils.hpp -@@ -85,7 +85,7 @@ struct Cuts - /** resize vector.*/ - void resize(unsigned int i) - { -- cuts_.resize(i, reinterpret_cast (NULL)); -+ cuts_.resize(i, nullptr); // workaround for clang-6 - } - private: - /** Stores the number of cuts.*/ diff --git a/math/cgl/pkg-descr b/math/cgl/pkg-descr index c69be1cf9a04..4bb9223b346e 100644 --- a/math/cgl/pkg-descr +++ b/math/cgl/pkg-descr @@ -1,5 +1,5 @@ Collection of cut generators that can be used with other COIN-OR packages that make use of cuts, such as, among others, the linear solver Clp or the mixed integer linear programming solvers Cbc or BCP. -WWW: https://projects.coin-or.org/Cgl +WWW: https://github.com/coin-or/Cgl diff --git a/math/cgl/pkg-plist b/math/cgl/pkg-plist index 60133d87c05d..119c7e29a3fb 100644 --- a/math/cgl/pkg-plist +++ b/math/cgl/pkg-plist @@ -1,39 +1,38 @@ 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 lib/libCgl.so lib/libCgl.so.1 -lib/libCgl.so.1.10.3 +lib/libCgl.so.1.10.4 libdata/pkgconfig/cgl.pc share/coin/doc/Cgl/AUTHORS share/coin/doc/Cgl/LICENSE -share/coin/doc/Cgl/README share/coin/doc/Cgl/cgl_addlibs.txt