diff --git a/games/golly/Makefile b/games/golly/Makefile index 90f3561634fb..c3deb76b8c4b 100644 --- a/games/golly/Makefile +++ b/games/golly/Makefile @@ -1,54 +1,52 @@ PORTNAME= golly -DISTVERSION= 4.3 -PORTREVISION= 2 +DISTVERSION= 5.0 DISTVERSIONSUFFIX= -src CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= eduardo@FreeBSD.org COMMENT= Conway's Game of Life and other cellular automata WWW= https://golly.sourceforge.net/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/../docs/License.html USES= gl gmake localbase python sdl USE_GL= gl USE_SDL= sdl2 USE_WX= 3.2 MAKEFILE= makefile-gtk BINARY_ALIAS= g++=${CC} python3=${PYTHON_CMD} wx-config=${WX_CONFIG} DESKTOP_ENTRIES= "Golly" \ "${COMMENT}" \ "${PREFIX}/share/pixmaps/golly.xpm" \ "${PREFIX}/bin/golly" \ "Education;" \ "" PATCH_WRKSRC= ${WRKSRC}/.. WRKSRC_SUBDIR= gui-wx PLIST_FILES= bin/bgolly \ bin/golly \ share/pixmaps/golly.xpm PORTDATA= Help Patterns Rules Scripts pre-build: @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' \ ${WRKSRC}/wxmain.cpp ${WRKSRC}/wxhelp.cpp - @${RMDIR} ${WRKSRC}/../Scripts/Python/glife/__pycache__ # There is no install target at makefile-gtk do-install: ${INSTALL_PROGRAM} ${WRKSRC}/../golly ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/../bgolly ${STAGEDIR}${PREFIX}/bin (cd ${WRKSRC}/.. && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR}) @${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKSRC}/icons/appicon.xpm \ ${STAGEDIR}${PREFIX}/share/pixmaps/golly.xpm .include diff --git a/games/golly/distinfo b/games/golly/distinfo index 129b584e5c00..7cf2752b4d45 100644 --- a/games/golly/distinfo +++ b/games/golly/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1716366217 -SHA256 (golly-4.3-src.tar.gz) = 51d2478063e7ec50cde2b61381f3c1028604e45182e374cff0e14199822a081d -SIZE (golly-4.3-src.tar.gz) = 15488205 +TIMESTAMP = 1761551670 +SHA256 (golly-5.0-src.tar.gz) = 5835cde428153f9b840ba94a4359e5cb26eb302e7ac01a097cd7f5a5c8303611 +SIZE (golly-5.0-src.tar.gz) = 17940916 diff --git a/games/golly/files/patch-gui-wx_wxhelp.cpp b/games/golly/files/patch-gui-wx_wxhelp.cpp index 4ec34bc65615..065adde4da19 100644 --- a/games/golly/files/patch-gui-wx_wxhelp.cpp +++ b/games/golly/files/patch-gui-wx_wxhelp.cpp @@ -1,22 +1,22 @@ Set DATADIR url to Help pages ---- gui-wx/wxhelp.cpp.orig 2022-04-19 11:02:31 UTC +--- gui-wx/wxhelp.cpp.orig 2025-07-07 22:49:26 UTC +++ gui-wx/wxhelp.cpp -@@ -168,7 +168,7 @@ long whenactive; // when help window beca +@@ -177,7 +177,7 @@ long whenactive; // when help window beca long whenactive; // when help window became active (elapsed millisecs) -const wxString helphome = _("Help/index.html"); // contents page +const wxString helphome = _("%%DATADIR%%/Help/index.html"); // contents page wxString currhelp = helphome; // current help file const wxString lexicon_name = _("lexicon"); // name of lexicon layer -@@ -1322,7 +1322,7 @@ void ShowAboutBox() +@@ -1338,7 +1338,7 @@ void ShowAboutBox() #ifdef __WXMAC__ - html->SetFontSizes(helpfontsize); + html->SetFontSizes(13); // must be a fixed size (not helpfontsize) #endif - html->CheckAndLoad(_("Help/about.html")); + html->CheckAndLoad(_("%%DATADIR%%/Help/about.html")); // avoid HtmlView::OnSize calling CheckAndLoad again html->canreload = false; diff --git a/games/golly/files/patch-gui-wx_wxmain.cpp b/games/golly/files/patch-gui-wx_wxmain.cpp index 6a379c8678c1..7d9e42f541b3 100644 --- a/games/golly/files/patch-gui-wx_wxmain.cpp +++ b/games/golly/files/patch-gui-wx_wxmain.cpp @@ -1,56 +1,56 @@ Set DATADIR url to Help pages ---- gui-wx/wxmain.cpp.orig 2021-01-23 03:06:47 UTC +--- gui-wx/wxmain.cpp.orig 2025-09-26 02:31:41 UTC +++ gui-wx/wxmain.cpp -@@ -1446,29 +1446,29 @@ void MainFrame::OnMenu(wxCommandEvent& event) +@@ -1410,29 +1410,29 @@ void MainFrame::OnMenu(wxCommandEvent& event) case ID_TILE: ToggleTileLayers(); break; // Help menu - case ID_HELP_INDEX: ShowHelp(_("Help/index.html")); break; - case ID_HELP_INTRO: ShowHelp(_("Help/intro.html")); break; - case ID_HELP_TIPS: ShowHelp(_("Help/tips.html")); break; - case ID_HELP_ALGOS: ShowHelp(_("Help/algos.html")); break; - case ID_HELP_LEXICON: ShowHelp(_("Help/Lexicon/lex.htm")); break; - case ID_HELP_ARCHIVES: ShowHelp(_("Help/archives.html")); break; - case ID_HELP_LUA: ShowHelp(_("Help/lua.html")); break; - case ID_HELP_OVERLAY: ShowHelp(_("Help/overlay.html")); break; - case ID_HELP_PYTHON: ShowHelp(_("Help/python.html")); break; + case ID_HELP_INDEX: ShowHelp(_("%%DATADIR%%/Help/index.html")); break; + case ID_HELP_INTRO: ShowHelp(_("%%DATADIR%%/Help/intro.html")); break; + case ID_HELP_TIPS: ShowHelp(_("%%DATADIR%%/Help/tips.html")); break; + case ID_HELP_ALGOS: ShowHelp(_("%%DATADIR%%/Help/algos.html")); break; + case ID_HELP_LEXICON: ShowHelp(_("%%DATADIR%%/Help/Lexicon/lex.htm")); break; + case ID_HELP_ARCHIVES: ShowHelp(_("%%DATADIR%%/Help/archives.html")); break; + case ID_HELP_LUA: ShowHelp(_("%%DATADIR%%/Help/lua.html")); break; + case ID_HELP_OVERLAY: ShowHelp(_("%%DATADIR%%/Help/overlay.html")); break; + case ID_HELP_PYTHON: ShowHelp(_("%%DATADIR%%/Help/python.html")); break; case ID_HELP_KEYBOARD: ShowHelp(SHOW_KEYBOARD_SHORTCUTS); break; - case ID_HELP_MOUSE: ShowHelp(_("Help/mouse.html")); break; - case ID_HELP_FILE: ShowHelp(_("Help/file.html")); break; - case ID_HELP_EDIT: ShowHelp(_("Help/edit.html")); break; - case ID_HELP_CONTROL: ShowHelp(_("Help/control.html")); break; - case ID_HELP_VIEW: ShowHelp(_("Help/view.html")); break; - case ID_HELP_LAYER: ShowHelp(_("Help/layer.html")); break; - case ID_HELP_HELP: ShowHelp(_("Help/help.html")); break; - case ID_HELP_REFS: ShowHelp(_("Help/refs.html")); break; - case ID_HELP_FORMATS: ShowHelp(_("Help/formats.html")); break; - case ID_HELP_BOUNDED: ShowHelp(_("Help/bounded.html")); break; - case ID_HELP_PROBLEMS: ShowHelp(_("Help/problems.html")); break; - case ID_HELP_CHANGES: ShowHelp(_("Help/changes.html")); break; - case ID_HELP_CREDITS: ShowHelp(_("Help/credits.html")); break; + case ID_HELP_MOUSE: ShowHelp(_("%%DATADIR%%/Help/mouse.html")); break; + case ID_HELP_FILE: ShowHelp(_("%%DATADIR%%/Help/file.html")); break; + case ID_HELP_EDIT: ShowHelp(_("%%DATADIR%%/Help/edit.html")); break; + case ID_HELP_CONTROL: ShowHelp(_("%%DATADIR%%/Help/control.html")); break; + case ID_HELP_VIEW: ShowHelp(_("%%DATADIR%%/Help/view.html")); break; + case ID_HELP_LAYER: ShowHelp(_("%%DATADIR%%/Help/layer.html")); break; + case ID_HELP_HELP: ShowHelp(_("%%DATADIR%%/Help/help.html")); break; + case ID_HELP_REFS: ShowHelp(_("%%DATADIR%%/Help/refs.html")); break; + case ID_HELP_FORMATS: ShowHelp(_("%%DATADIR%%/Help/formats.html")); break; + case ID_HELP_BOUNDED: ShowHelp(_("%%DATADIR%%/Help/bounded.html")); break; + case ID_HELP_PROBLEMS: ShowHelp(_("%%DATADIR%%/Help/problems.html")); break; + case ID_HELP_CHANGES: ShowHelp(_("%%DATADIR%%/Help/changes.html")); break; + case ID_HELP_CREDITS: ShowHelp(_("%%DATADIR%%/Help/credits.html")); break; case ID_HELP_BUTT: ShowHelp(wxEmptyString); break; case wxID_ABOUT: ShowAboutBox(); break;