Index: head/math/gambit/Makefile =================================================================== --- head/math/gambit/Makefile (revision 486381) +++ head/math/gambit/Makefile (revision 486382) @@ -1,29 +1,28 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= gambit -DISTVERSION= 15.1.1 -PORTREVISION= 1 +DISTVERSION= 16.0.1 CATEGORIES= math MASTER_SITES= SF/${PORTNAME}/${PORTNAME}${PORTVERSION:R:R}/${PORTVERSION} MAINTAINER= yuri@FreeBSD.org COMMENT= Library of tools for doing computation in game theory LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= compiler:c++11-lib +USES= compiler:c++11-lib gnome GNU_CONFIGURE= yes USE_GNOME= gtk20 USE_WX= 3.0 USE_CXXSTD= c++11 WX_CONF_ARGS= absolute post-install: ${INSTALL_DATA} ${WRKSRC}/gambit.desktop \ ${STAGEDIR}${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/src/gui/bitmaps/gambit.xpm \ ${STAGEDIR}${PREFIX}/share/pixmaps .include Index: head/math/gambit/distinfo =================================================================== --- head/math/gambit/distinfo (revision 486381) +++ head/math/gambit/distinfo (revision 486382) @@ -1,3 +1,3 @@ -TIMESTAMP = 1531253300 -SHA256 (gambit-15.1.1.tar.gz) = 7ede51739dc868242886815bb875307f5e11bb3789f22c546d3c83194fe75a1c -SIZE (gambit-15.1.1.tar.gz) = 1777714 +TIMESTAMP = 1543682971 +SHA256 (gambit-16.0.1.tar.gz) = dbec0fc8c4cd3ad6b6a898a1330407fd7aa1bbac31ed94b6e96aa7e7196185f5 +SIZE (gambit-16.0.1.tar.gz) = 1802541 Index: head/math/gambit/files/patch-src_libgambit_matrix.cc =================================================================== --- head/math/gambit/files/patch-src_libgambit_matrix.cc (revision 486381) +++ head/math/gambit/files/patch-src_libgambit_matrix.cc (nonexistent) @@ -1,18 +0,0 @@ ---- 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 &, Property changes on: head/math/gambit/files/patch-src_libgambit_matrix.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/gambit/files/patch-src-labenski-src_sheet.cpp =================================================================== --- head/math/gambit/files/patch-src-labenski-src_sheet.cpp (revision 486381) +++ head/math/gambit/files/patch-src-labenski-src_sheet.cpp (nonexistent) @@ -1,14 +0,0 @@ ---- src/labenski/src/sheet.cpp.orig 2013-06-24 11:57:48.000000000 +0200 -+++ src/labenski/src/sheet.cpp 2013-06-24 12:00:50.000000000 +0200 -@@ -7098,9 +7098,9 @@ - wxPrintf(wxT("COUNT MISMATCH ERROR! \n")); - - for (size_t n = 0; n < wxMin(ans.GetCount(), res.GetCount()); n++) -- if (ans[n] != res[n]) wxPrintf(wxT("Error in item %u\n"), n); -+ if (ans[n] != res[n]) wxPrintf(wxT("Error in item %zu\n"), n); - -- wxPrintf(msg + wxT("\n")); -+ wxPrintf("%s\n", msg.ToAscii()); - } - - #define CSVT1(str, a1) { wxArrayString ar; ar.Add(wxT(a1)); CSV_TEST(wxT(str), ar, ParseLine(wxT(str))); } Property changes on: head/math/gambit/files/patch-src-labenski-src_sheet.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/gambit/files/patch-library_src_linalg_btableau.cc =================================================================== --- head/math/gambit/files/patch-library_src_linalg_btableau.cc (nonexistent) +++ head/math/gambit/files/patch-library_src_linalg_btableau.cc (revision 486382) @@ -0,0 +1,18 @@ +--- library/src/linalg/btableau.cc.orig 2018-12-01 17:24:33 UTC ++++ library/src/linalg/btableau.cc +@@ -24,8 +24,7 @@ + #include "gambit/matrix.imp" + #include "gambit/linalg/btableau.imp" + +-using namespace Gambit; +-using namespace Gambit::linalg; ++namespace Gambit::linalg { + + template class BaseTableau; + template class BaseTableau; +@@ -33,4 +32,4 @@ template class BaseTableau; + template class TableauInterface; + template class TableauInterface; + +- ++} Property changes on: head/math/gambit/files/patch-library_src_linalg_btableau.cc ___________________________________________________________________ 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/gambit/files/patch-library_src_linalg_lemketab.cc =================================================================== --- head/math/gambit/files/patch-library_src_linalg_lemketab.cc (nonexistent) +++ head/math/gambit/files/patch-library_src_linalg_lemketab.cc (revision 486382) @@ -0,0 +1,13 @@ +--- library/src/linalg/lemketab.cc.orig 2018-12-01 17:13:48 UTC ++++ library/src/linalg/lemketab.cc +@@ -22,7 +22,9 @@ + + #include "gambit/linalg/lemketab.imp" + +-using namespace Gambit::linalg; ++namespace Gambit::linalg { + + template class LemkeTableau; + template class LemkeTableau; ++ ++} Property changes on: head/math/gambit/files/patch-library_src_linalg_lemketab.cc ___________________________________________________________________ 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/gambit/files/patch-library_src_linalg_lhtab.cc =================================================================== --- head/math/gambit/files/patch-library_src_linalg_lhtab.cc (nonexistent) +++ head/math/gambit/files/patch-library_src_linalg_lhtab.cc (revision 486382) @@ -0,0 +1,17 @@ +--- library/src/linalg/lhtab.cc.orig 2018-12-01 17:29:54 UTC ++++ library/src/linalg/lhtab.cc +@@ -22,12 +22,11 @@ + + #include "gambit/linalg/lhtab.imp" + +-using namespace Gambit; +-using namespace Gambit::linalg; ++namespace Gambit::linalg { + + template class LHTableau; + template class LHTableau; + +- ++} + + Property changes on: head/math/gambit/files/patch-library_src_linalg_lhtab.cc ___________________________________________________________________ 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/gambit/files/patch-library_src_linalg_lptab.cc =================================================================== --- head/math/gambit/files/patch-library_src_linalg_lptab.cc (nonexistent) +++ head/math/gambit/files/patch-library_src_linalg_lptab.cc (revision 486382) @@ -0,0 +1,14 @@ +--- library/src/linalg/lptab.cc.orig 2017-05-12 11:07:26 UTC ++++ library/src/linalg/lptab.cc +@@ -22,8 +22,9 @@ + + #include "gambit/linalg/lptab.imp" + +-using namespace Gambit; +-using namespace Gambit::linalg; ++namespace Gambit::linalg { + + template class LPTableau; + template class LPTableau; ++ ++} Property changes on: head/math/gambit/files/patch-library_src_linalg_lptab.cc ___________________________________________________________________ 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/gambit/files/patch-library_src_linalg_ludecomp.cc =================================================================== --- head/math/gambit/files/patch-library_src_linalg_ludecomp.cc (nonexistent) +++ head/math/gambit/files/patch-library_src_linalg_ludecomp.cc (revision 486382) @@ -0,0 +1,17 @@ +--- library/src/linalg/ludecomp.cc.orig 2017-05-12 11:07:26 UTC ++++ library/src/linalg/ludecomp.cc +@@ -22,11 +22,12 @@ + + #include "gambit/linalg/ludecomp.imp" + +-using namespace Gambit; +-using namespace Gambit::linalg; ++namespace Gambit::linalg { + + template class EtaMatrix; + template class LUdecomp; + + template class EtaMatrix; + template class LUdecomp; ++ ++} Property changes on: head/math/gambit/files/patch-library_src_linalg_ludecomp.cc ___________________________________________________________________ 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/gambit/files/patch-library_src_matrix.cc =================================================================== --- head/math/gambit/files/patch-library_src_matrix.cc (nonexistent) +++ head/math/gambit/files/patch-library_src_matrix.cc (revision 486382) @@ -0,0 +1,18 @@ +--- library/src/matrix.cc.orig 2018-12-01 16:51:25 UTC ++++ library/src/matrix.cc +@@ -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 &, Property changes on: head/math/gambit/files/patch-library_src_matrix.cc ___________________________________________________________________ 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/gambit/files/patch-src_tools_enumpoly_pelqhull.cc =================================================================== --- head/math/gambit/files/patch-src_tools_enumpoly_pelqhull.cc (revision 486381) +++ head/math/gambit/files/patch-src_tools_enumpoly_pelqhull.cc (revision 486382) @@ -1,29 +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 @@ +--- src/tools/enumpoly/pelqhull.cc.orig 2016-06-30 09:03:18 UTC ++++ src/tools/enumpoly/pelqhull.cc +@@ -2792,7 +2792,7 @@ void qh_allstatA (void) { /* 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 @@ +@@ -2831,7 +2831,7 @@ void qh_allstatB (void) { 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 @@ +@@ -2946,7 +2946,7 @@ void qh_allstatF(void) { 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); Index: head/math/gambit/pkg-plist =================================================================== --- head/math/gambit/pkg-plist (revision 486381) +++ head/math/gambit/pkg-plist (revision 486382) @@ -1,59 +1,59 @@ bin/gambit bin/gambit-convert bin/gambit-enummixed bin/gambit-enumpoly bin/gambit-enumpure bin/gambit-gnm bin/gambit-ipa bin/gambit-lcp bin/gambit-liap bin/gambit-logit bin/gambit-lp bin/gambit-simpdiv -include/libagg/GrayComposition.h include/libagg/agg.h include/libagg/bagg.h include/libagg/gameagg.h include/libagg/gamebagg.h +include/libagg/gray.h include/libagg/proj_func.h include/libagg/trie_map.h include/libagg/trie_map.imp -include/libgambit/GrayComposition.h include/libgambit/agg.h include/libgambit/array.h include/libgambit/bagg.h include/libgambit/behav.h include/libgambit/behav.imp include/libgambit/behavitr.h include/libgambit/behavspt.h include/libgambit/dvector.h include/libgambit/dvector.imp include/libgambit/function.h +include/libgambit/gambit.h include/libgambit/game.h include/libgambit/gameagg.h include/libgambit/gamebagg.h +include/libgambit/gray.h include/libgambit/integer.h -include/libgambit/libgambit.h include/libgambit/list.h include/libgambit/matrix.h include/libgambit/matrix.imp include/libgambit/mixed.h include/libgambit/mixed.imp include/libgambit/number.h include/libgambit/proj_func.h include/libgambit/pvector.h include/libgambit/pvector.imp include/libgambit/rational.h include/libgambit/recarray.h include/libgambit/shared_ptr.h include/libgambit/sqmatrix.h include/libgambit/sqmatrix.imp include/libgambit/stratitr.h include/libgambit/stratspt.h include/libgambit/tinyxml.h include/libgambit/trie_map.h include/libgambit/trie_map.imp include/libgambit/vector.h include/libgambit/vector.imp share/applications/gambit.desktop share/pixmaps/gambit.xpm