From 54f50c520788bd63bf0af96cef473df90b36fefa Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Sun, 25 Feb 2018 23:43:34 +0000 Subject: [PATCH] math/gambit: Unbroke the port. Port changes: * Added the patch to avoid permissions problem. Reported it upstream: https://github.com/gambitproject/gambit/issues/229 * Took maintainership. * Removed USE_LDCONFIG (not needed). Approved by: tcberner (mentor, implicit) --- math/gambit/Makefile | 8 ++------ math/gambit/files/patch-src_tools_logit_logbehav.imp | 11 +++++++++++ 2 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 math/gambit/files/patch-src_tools_logit_logbehav.imp diff --git a/math/gambit/Makefile b/math/gambit/Makefile index f40729f9dbfa..47dc9e86f0b9 100644 --- a/math/gambit/Makefile +++ b/math/gambit/Makefile @@ -7,22 +7,18 @@ PORTREVISION= 2 CATEGORIES= math MASTER_SITES= SF/${PORTNAME}/${PORTNAME}${PORTVERSION:R:R}/${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= yuri@FreeBSD.org COMMENT= Library of tools for doing computation in game theory LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_armv6= fails to compile: 'm_number' is a private member of 'Gambit::GamePlayerRep' -BROKEN_armv7= fails to compile: 'm_number' is a private member of 'Gambit::GamePlayerRep' - USES= compiler:c++11-lib +GNU_CONFIGURE= yes USE_GNOME= gtk20 USE_WX= 3.0 USE_CXXSTD= c++11 WX_CONF_ARGS= absolute -GNU_CONFIGURE= yes -USE_LDCONFIG= yes post-install: ${INSTALL_DATA} ${WRKSRC}/gambit.desktop \ diff --git a/math/gambit/files/patch-src_tools_logit_logbehav.imp b/math/gambit/files/patch-src_tools_logit_logbehav.imp new file mode 100644 index 000000000000..7e04e8fe92f6 --- /dev/null +++ b/math/gambit/files/patch-src_tools_logit_logbehav.imp @@ -0,0 +1,11 @@ +--- src/tools/logit/logbehav.imp.orig 2018-02-25 23:16:35 UTC ++++ src/tools/logit/logbehav.imp +@@ -269,7 +269,7 @@ void LogBehavProfile::GetPayoff(GameT + } + + if (node->children.Length()) { +- int pl = node->infoset->m_player->m_number, iset = node->infoset->m_number; ++ int pl = node->infoset->m_player->GetNumber(), iset = node->infoset->GetNumber(); // fixes the build problem, see https://github.com/gambitproject/gambit/issues/229 + if (pl == 0) { + // chance player + for (int act = 1; act <= node->NumChildren(); act++) {