diff --git a/math/couenne/Makefile b/math/couenne/Makefile index 99be2e8d6b7a..ed0986eb2d67 100644 --- a/math/couenne/Makefile +++ b/math/couenne/Makefile @@ -1,35 +1,36 @@ PORTNAME= couenne DISTVERSIONPREFIX= releases/ DISTVERSION= 0.5.8 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= math PKGNAMEPREFIX= coin-or- MAINTAINER= yuri@FreeBSD.org COMMENT= Convex Over and Under Envelopes for NonliNear Estimation LICENSE= EPL LICENSE_FILE= ${WRKSRC}/Couenne/LICENSE BUILD_DEPENDS= ${LOCALBASE}/lib/libnauty.a:math/nauty LIB_DEPENDS= libbonmin.so:math/bonmin \ libCbc.so:math/cbc \ libCgl.so:math/cgl \ libClp.so:math/clp \ + libcoinasl.so:math/asl \ libCoinUtils.so:math/coinutils \ libipopt.so:math/ipopt \ libopenblas.so:math/openblas USES= blaslapack:netlib fortran gmake libtool pkgconfig USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= coin-or GH_PROJECT= Couenne GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-nauty-incdir=${LOCALBASE}/include/nauty --with-nauty-lib=${LOCALBASE}/lib/libnauty.a INSTALL_TARGET= install-strip .include diff --git a/math/couenne/files/patch-Couenne_src_readnl_readnl.cpp b/math/couenne/files/patch-Couenne_src_readnl_readnl.cpp new file mode 100644 index 000000000000..6f5585b14f0e --- /dev/null +++ b/math/couenne/files/patch-Couenne_src_readnl_readnl.cpp @@ -0,0 +1,22 @@ +- workaround for the 'filename' macro name clash: https://github.com/coin-or-tools/ThirdParty-ASL/issues/4 + +--- Couenne/src/readnl/readnl.cpp.orig 2021-05-03 20:42:36 UTC ++++ Couenne/src/readnl/readnl.cpp +@@ -10,6 +10,8 @@ + + #include "asl.h" + ++#undef filename ++ + // Added to avoid compiler issues with gcc 6.2.1 --- see https://github.com/JuliaOpt/CoinOptServices.jl/issues/27#issuecomment-290960312 + #undef strtod + +@@ -60,7 +62,7 @@ void createCommonExpr (CouenneProblem *p, const ASL *a + // Reads a MINLP from an AMPL .nl file through the ASL methods + int CouenneProblem::readnl (const ASL *asl) { + +- problemName_ = filename; ++ problemName_ = asl->i.filename_; //filename; + + // number of defined variables (aka common expressions) + ndefined_ = como + comc + comb + como1 + comc1; diff --git a/math/couenne/pkg-plist b/math/couenne/pkg-plist index 3cf3e6a2eddb..9938131cefc5 100644 --- a/math/couenne/pkg-plist +++ b/math/couenne/pkg-plist @@ -1,93 +1,97 @@ +bin/couenne include/coin/BonCouenneInfo.hpp include/coin/BonCouenneInterface.hpp include/coin/BonCouenneSetup.hpp include/coin/BonInitHeuristic.hpp include/coin/BonNlpHeuristic.hpp include/coin/CouExpr.hpp include/coin/CouenneAggrProbing.hpp include/coin/CouenneBTPerfIndicator.hpp include/coin/CouenneBab.hpp include/coin/CouenneBranchingObject.hpp include/coin/CouenneChooseStrong.hpp include/coin/CouenneChooseVariable.hpp include/coin/CouenneComplBranchingObject.hpp include/coin/CouenneComplObject.hpp include/coin/CouenneConfig.h include/coin/CouenneCrossConv.hpp include/coin/CouenneCutGenerator.hpp include/coin/CouenneDepGraph.hpp include/coin/CouenneDisjCuts.hpp include/coin/CouenneDomain.hpp include/coin/CouenneExprAbs.hpp include/coin/CouenneExprAux.hpp include/coin/CouenneExprBCos.hpp include/coin/CouenneExprBDiv.hpp include/coin/CouenneExprBMul.hpp include/coin/CouenneExprBSin.hpp include/coin/CouenneExprBound.hpp include/coin/CouenneExprClone.hpp include/coin/CouenneExprConst.hpp include/coin/CouenneExprCopy.hpp include/coin/CouenneExprCos.hpp include/coin/CouenneExprDiv.hpp include/coin/CouenneExprExp.hpp include/coin/CouenneExprGroup.hpp include/coin/CouenneExprHess.hpp include/coin/CouenneExprIVar.hpp include/coin/CouenneExprIf.hpp include/coin/CouenneExprInv.hpp include/coin/CouenneExprJac.hpp include/coin/CouenneExprLog.hpp include/coin/CouenneExprMax.hpp include/coin/CouenneExprMin.hpp include/coin/CouenneExprMul.hpp include/coin/CouenneExprNorm.hpp include/coin/CouenneExprOp.hpp include/coin/CouenneExprOpp.hpp include/coin/CouenneExprPWLinear.hpp include/coin/CouenneExprPow.hpp include/coin/CouenneExprQuad.hpp include/coin/CouenneExprSin.hpp include/coin/CouenneExprStore.hpp include/coin/CouenneExprSub.hpp include/coin/CouenneExprSum.hpp include/coin/CouenneExprTrilinear.hpp include/coin/CouenneExprUnary.hpp include/coin/CouenneExprVar.hpp include/coin/CouenneExpression.hpp include/coin/CouenneFeasPump.hpp include/coin/CouenneFixPoint.hpp include/coin/CouenneFunTriplets.hpp include/coin/CouenneGlobalCutOff.hpp include/coin/CouenneJournalist.hpp include/coin/CouenneLQelems.hpp include/coin/CouenneMINLPInterface.hpp include/coin/CouenneMatrix.hpp include/coin/CouenneObject.hpp include/coin/CouenneOrbitBranchingObj.hpp include/coin/CouenneOrbitObj.hpp include/coin/CouennePSDcon.hpp include/coin/CouennePrecisions.hpp include/coin/CouenneProblem.hpp include/coin/CouenneProblemElem.hpp include/coin/CouenneProjections.hpp include/coin/CouenneRecordBestSol.hpp include/coin/CouenneRootQ.hpp include/coin/CouenneSOSObject.hpp include/coin/CouenneSdpCuts.hpp include/coin/CouenneSolverInterface.hpp include/coin/CouenneTNLP.hpp include/coin/CouenneThreeWayBranchObj.hpp include/coin/CouenneTwoImplied.hpp include/coin/CouenneTypes.hpp include/coin/CouenneVTObject.hpp include/coin/CouenneVarObject.hpp include/coin/Nauty.h lib/libCouenne.so lib/libCouenne.so.1 lib/libCouenne.so.1.4.8 +lib/libCouenneReadnl.so +lib/libCouenneReadnl.so.1 +lib/libCouenneReadnl.so.1.4.8 libdata/pkgconfig/couenne.pc share/coin/doc/Couenne/AUTHORS share/coin/doc/Couenne/LICENSE share/coin/doc/Couenne/README share/coin/doc/Couenne/couenne_addlibs.txt