Index: head/math/ogdf/Makefile =================================================================== --- head/math/ogdf/Makefile (revision 463297) +++ head/math/ogdf/Makefile (revision 463298) @@ -1,60 +1,61 @@ # Created by: Pietro Cerutti # $FreeBSD$ PORTNAME= ogdf PORTVERSION= 2015.05 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= http://www.ogdf.net/lib/exe/fetch.php/tech: DISTNAME= ${PORTNAME}.v${PORTVERSION} MAINTAINER= woodsb02@FreeBSD.org COMMENT= C++ class library for the automatic layout of diagrams LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE_GPL_v2.txt LICENSE_FILE_GPLv3= ${WRKSRC}/LICENSE_GPL_v3.txt USES= compiler:features gmake python:2.7,build zip USE_LDCONFIG= yes LDFLAGS+= -L${LOCALBASE}/lib FETCH_BEFORE_ARGS= -o ${PORTNAME}.v${PORTVERSION}.zip WRKSRC= ${WRKDIR}/${PORTNAME:tu} OPTIONS_DEFINE= COIN OPTIONS_DEFAULT= COIN OPTIONS_SUB= yes COIN_DESC= Build with COIN solvers COIN_USE= coin=true COIN_CONFLICTS_INSTALL= CoinMP .include .if ${COMPILER_FEATURES:Mc++11} STDCPP11= -std=c++11 .endif post-patch: @${REINPLACE_CMD} -e '\ s|%%CXX%%|${CXX}|g; \ s|%%CXXFLAGS%%|${CXXFLAGS}|g; \ s|%%LOCALBASE%%|${LOCALBASE}|g; \ s|%%USE_COIN%%|${USE_COIN}|g' \ ${WRKSRC}/makeMakefile.config @${REINPLACE_CMD} -e '\ s|%%STDCPP11%%|${STDCPP11}|g' \ ${WRKSRC}/makeMakefile.py do-configure: cd ${WRKSRC} && ${PYTHON_CMD} makeMakefile.py post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libOGDF.so .if ${PORT_OPTIONS:MCOIN} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libCOIN.so .endif .include Index: head/math/ogdf/files/patch-include_coin_CglLandPUtils.hpp =================================================================== --- head/math/ogdf/files/patch-include_coin_CglLandPUtils.hpp (nonexistent) +++ head/math/ogdf/files/patch-include_coin_CglLandPUtils.hpp (revision 463298) @@ -0,0 +1,17 @@ +In file included from CglLandPSimplex.cpp:11: +In file included from ./CglLandPSimplex.hpp:31: +./CglLandPUtils.hpp:88:25: error: reinterpret_cast from 'nullptr_t' to 'OsiRowCut *' is not allowed + cuts_.resize(i, reinterpret_cast (NULL)); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +--- include/coin/CglLandPUtils.hpp.orig 2015-05-29 15:36:11 UTC ++++ include/coin/CglLandPUtils.hpp +@@ -85,7 +85,7 @@ struct Cuts + /** resize vector.*/ + void resize(unsigned int i) + { +- cuts_.resize(i, reinterpret_cast (NULL)); ++ cuts_.resize(i, static_cast (NULL)); + } + private: + /** Stores the number of cuts.*/ Property changes on: head/math/ogdf/files/patch-include_coin_CglLandPUtils.hpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/ogdf/files/patch-src_coin_Clp_ClpModel.cpp =================================================================== --- head/math/ogdf/files/patch-src_coin_Clp_ClpModel.cpp (nonexistent) +++ head/math/ogdf/files/patch-src_coin_Clp_ClpModel.cpp (revision 463298) @@ -0,0 +1,15 @@ +ClpModel.cpp:3848:24: error: reinterpret_cast from 'nullptr_t' to 'const char *' is not allowed + reinterpret_cast (NULL) /*integrality*/, + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +--- src/coin/Clp/ClpModel.cpp.orig 2015-05-29 15:36:41 UTC ++++ src/coin/Clp/ClpModel.cpp +@@ -3619,7 +3619,7 @@ ClpModel::writeMps(const char *filename, + writer.setMpsData(*(matrix_->getPackedMatrix()), COIN_DBL_MAX, + getColLower(), getColUpper(), + objective, +- reinterpret_cast (NULL) /*integrality*/, ++ static_cast (NULL) /*integrality*/, + getRowLower(), getRowUpper(), + columnNames, rowNames); + // Pass in array saying if each variable integer Property changes on: head/math/ogdf/files/patch-src_coin_Clp_ClpModel.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/ogdf/files/patch-src_coin_OsiClp_OsiClpSolverInterface.cpp =================================================================== --- head/math/ogdf/files/patch-src_coin_OsiClp_OsiClpSolverInterface.cpp (nonexistent) +++ head/math/ogdf/files/patch-src_coin_OsiClp_OsiClpSolverInterface.cpp (revision 463298) @@ -0,0 +1,15 @@ +OsiClpSolverInterface.cpp:1451:50: error: reinterpret_cast from 'nullptr_t' to 'int *' is not allowed + messagesPointer->setDetailMessages(100,10000,reinterpret_cast (NULL)); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +--- src/coin/OsiClp/OsiClpSolverInterface.cpp.orig 2015-05-29 15:36:45 UTC ++++ src/coin/OsiClp/OsiClpSolverInterface.cpp +@@ -1422,7 +1422,7 @@ OsiClpSolverInterface::setupForRepeatedUse(int senseOf + if (stopPrinting) { + CoinMessages * messagesPointer = modelPtr_->messagesPointer(); + // won't even build messages +- messagesPointer->setDetailMessages(100,10000,reinterpret_cast (NULL)); ++ messagesPointer->setDetailMessages(100,10000,static_cast (NULL)); + } + #endif + } Property changes on: head/math/ogdf/files/patch-src_coin_OsiClp_OsiClpSolverInterface.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property