From c268481174082e4ffe2a8e152b7890b4a3f7e976 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Mon, 13 Apr 2015 19:18:36 +0000 Subject: [PATCH] Fix build with c++11 --- math/gambit/Makefile | 1 + .../files/patch-src_libgambit_matrix.cc | 18 ++++++++++++ .../patch-src_tools_enumpoly_pelqhull.cc | 29 +++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 math/gambit/files/patch-src_libgambit_matrix.cc create mode 100644 math/gambit/files/patch-src_tools_enumpoly_pelqhull.cc diff --git a/math/gambit/Makefile b/math/gambit/Makefile index 4aa9f734b695..d093bfca4034 100644 --- a/math/gambit/Makefile +++ b/math/gambit/Makefile @@ -10,6 +10,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Library of tools for doing computation in game theory LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING USES= compiler:c++11-lib USE_GNOME= gtk20 diff --git a/math/gambit/files/patch-src_libgambit_matrix.cc b/math/gambit/files/patch-src_libgambit_matrix.cc new file mode 100644 index 000000000000..8139197f2499 --- /dev/null +++ b/math/gambit/files/patch-src_libgambit_matrix.cc @@ -0,0 +1,18 @@ +--- src/libgambit/matrix.cc.orig 2014-06-06 16:33:54.000000000 +0400 ++++ src/libgambit/matrix.cc 2015-04-13 21:39:08.802909000 +0300 +@@ -25,11 +25,15 @@ + + using namespace Gambit; + ++namespace Gambit { ++ + template class Matrix; + template class Matrix; + template class Matrix; + template class Matrix; + ++} ++ + template Vector Gambit::operator*(const Vector &, + const Matrix &); + template Vector Gambit::operator*(const Vector &, diff --git a/math/gambit/files/patch-src_tools_enumpoly_pelqhull.cc b/math/gambit/files/patch-src_tools_enumpoly_pelqhull.cc new file mode 100644 index 000000000000..3259dd1b445a --- /dev/null +++ b/math/gambit/files/patch-src_tools_enumpoly_pelqhull.cc @@ -0,0 +1,29 @@ +--- src/tools/enumpoly/pelqhull.cc.orig 2014-05-27 12:07:04.000000000 +0400 ++++ src/tools/enumpoly/pelqhull.cc 2015-04-13 20:35:03.596285000 +0300 +@@ -2792,7 +2792,7 @@ + + /* zdef_(type,name,doc,average) */ + zzdef_(zdoc, Zdoc2, "precision statistics", -1); +- zdef_(zinc, Znewvertex, reinterpret_cast(NULL), -1); ++ zdef_(zinc, Znewvertex, static_cast(NULL), -1); + zdef_(wadd, Wnewvertex, "ave. distance of a new vertex to a facet (not 0s)", Znewvertex); + zdef_(wmax, Wnewvertexmax, "max. distance of a new vertex to a facet", -1); + zdef_(wmax, Wvertexmax, "max. distance of an output vertex to a facet", -1); +@@ -2831,7 +2831,7 @@ + zzdef_(zinc, Zsetplane, "facets created altogether", -1); + zdef_(zinc, Ztotridges, "ridges created altogether", -1); + zdef_(zinc, Zpostfacets, "facets before post merge", -1); +- zdef_(zinc, Zangle, reinterpret_cast(NULL), -1); ++ zdef_(zinc, Zangle, static_cast(NULL), -1); + zdef_(wadd, Wangle, "average angle (cosine) for all ridges", Zangle); + zdef_(wmax, Wanglemax, "maximum angle (cosine) of a ridge", -1); + zdef_(wmin, Wanglemin, "minimum angle (cosine) of a ridge", -1); +@@ -2946,7 +2946,7 @@ + zdef_(zinc, Zintersect, "intersections found redundant vertices", -1); + zdef_(zadd, Zintersecttot, " ave. number found per vertex", Zintersect); + zdef_(zmax, Zintersectmax, " max. found for a vertex", -1); +- zdef_(zinc, Zvertexridge, reinterpret_cast(NULL), -1); ++ zdef_(zinc, Zvertexridge, static_cast(NULL), -1); + zdef_(zadd, Zvertexridgetot, " ave. number of ridges per tested vertex", Zvertexridge); + zdef_(zmax, Zvertexridgemax, " max. number of ridges per tested vertex", -1); +