diff --git a/games/openfodder/Makefile b/games/openfodder/Makefile index 3dd7c52b5021..46d04d8e6286 100644 --- a/games/openfodder/Makefile +++ b/games/openfodder/Makefile @@ -1,65 +1,65 @@ PORTNAME= OpenFodder -DISTVERSION= 1.9.0 +DISTVERSION= 1.9.1 CATEGORIES= games MAINTAINER= jbeich@FreeBSD.org COMMENT= Open source port of Cannon Fodder WWW= http://openfodder.com/ LICENSE= BSD3CLAUSE GPLv3+ LGPL21+ MIT ZLIB LICENSE_COMB= multi LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/COPYING.BSD.txt LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYING LICENSE_FILE_LGPL21+ = ${WRKSRC}/COPYING.LGPLv2.1.txt LICENSE_FILE_MIT= ${WRKSRC}/COPYING.MIT.txt LICENSE_FILE_ZLIB= ${WRKSRC}/COPYING.ZLIB.txt USES= compiler:c++14-lang sdl USE_GITHUB= yes USE_SDL= mixer2 GH_TUPLE= ${PORTNAME}:data:1.8.0-1-g070a608:data/Run \ ${PORTNAME}:scripts:dad0473:scripts/Run/Scripts GH_PROJECT= ${PORTNAME:tl} PLIST_FILES= bin/${PORTNAME} \ share/applications/${PORTNAME:tl}.desktop \ share/metainfo/${PORTNAME:tl}.appdata.xml \ share/pixmaps/${PORTNAME:tl}.png PORTDATA= * PORTDOCS= *.md OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's,clang++,${CXX},' \ -e 's/ -ferror-limit=100//' \ -e 's, -I/usr/include[^[:space:]]*,,g' \ -e 's,git log -n 1 --pretty=,${ECHO_CMD} ,' \ -e 's,%%h,${DISTVERSIONFULL},' \ ${WRKSRC}/Makefile @${REINPLACE_CMD} '/Exec/s/${PORTNAME:tl}/${PORTNAME}/' \ ${WRKSRC}/FreeDesktop/*.desktop @${REINPLACE_CMD} 's,/usr/local,${PREFIX},' \ ${WRKSRC}/Source/ResourceMan.cpp do-test: @(cd ${WRKSRC_data} && ${SETENV} ${TEST_ENV} \ ${WRKSRC}/Run/${PORTNAME} --unit-test-headless) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/Run/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin (cd ${WRKSRC}/Run && ${COPYTREE_SHARE} "${PORTDATA}" \ ${STAGEDIR}${DATADIR} "! -name ${PORTNAME} -type f") ${INSTALL_DATA} ${WRKSRC}/FreeDesktop/*.desktop \ ${STAGEDIR}${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/FreeDesktop/*.png \ ${STAGEDIR}${PREFIX}/share/pixmaps ${MKDIR} ${STAGEDIR}${PREFIX}/share/metainfo ${INSTALL_DATA} ${WRKSRC}/FreeDesktop/*.appdata.xml \ ${STAGEDIR}${PREFIX}/share/metainfo do-install-DOCS-on: (cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" \ ${STAGEDIR}${DOCSDIR}) .include diff --git a/games/openfodder/distinfo b/games/openfodder/distinfo index c2af9eb6b78f..95bd919a1492 100644 --- a/games/openfodder/distinfo +++ b/games/openfodder/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1717093925 -SHA256 (OpenFodder-openfodder-1.9.0_GH0.tar.gz) = d6b1dd5ad87f85cd1609c336d595bc74421a646920de40be8b977bb23b363beb -SIZE (OpenFodder-openfodder-1.9.0_GH0.tar.gz) = 1548174 +TIMESTAMP = 1717278152 +SHA256 (OpenFodder-openfodder-1.9.1_GH0.tar.gz) = 470de95782368023910c11e1f355588ae30530a5f0aab2341336a0a81783715c +SIZE (OpenFodder-openfodder-1.9.1_GH0.tar.gz) = 1549120 SHA256 (OpenFodder-data-1.8.0-1-g070a608_GH0.tar.gz) = c55082fece7fdc4fdb41ef5d77b3c73ead7adf967a7f604cb48b88bc67784b66 SIZE (OpenFodder-data-1.8.0-1-g070a608_GH0.tar.gz) = 3351603 SHA256 (OpenFodder-scripts-dad0473_GH0.tar.gz) = 80f33e96acade206203f37bfec325199f748c025f7015b8c59abaecbb984d32d SIZE (OpenFodder-scripts-dad0473_GH0.tar.gz) = 50736 diff --git a/games/openfodder/files/patch-libc++ b/games/openfodder/files/patch-libc++ deleted file mode 100644 index 30065f4edf50..000000000000 --- a/games/openfodder/files/patch-libc++ +++ /dev/null @@ -1,30 +0,0 @@ -https://github.com/OpenFodder/openfodder/issues/90 -https://github.com/OpenFodder/openfodder/commit/79eccbfbca05 - ---- CMakeLists.txt.orig 2024-05-30 18:32:05 UTC -+++ CMakeLists.txt -@@ -17,6 +17,7 @@ find_package(SDL2Mixer REQUIRED) - - find_package(SDL2 REQUIRED) - find_package(SDL2Mixer REQUIRED) -+find_package(Threads REQUIRED) - - # Locate git binary to provide information to the build environment - find_package(Git) -@@ -46,4 +47,4 @@ target_include_directories(openfodder PRIVATE - Source - ${CMAKE_CURRENT_BINARY_DIR}/Source) - --target_link_libraries(openfodder SDL2::SDL2 SDL2_mixer::SDL2_mixer) -+target_link_libraries(openfodder SDL2::SDL2 SDL2_mixer::SDL2_mixer Threads::Threads) ---- Makefile.orig 2024-05-30 18:32:05 UTC -+++ Makefile -@@ -4,7 +4,7 @@ CC = clang++ $(CXXFLAGS) -c -Wall -std=c++14 -ferror-l - DLibs = `sdl2-config --libs` -L/usr/local/lib -lSDL2_mixer - - CC = clang++ $(CXXFLAGS) -c -Wall -std=c++14 -ferror-limit=100 $(pathInc) $(Libs) --LD = clang++ $(LDFLAGS) obj/*.o $(DLibs) -+LD = clang++ $(LDFLAGS) obj/*.o -lpthread $(DLibs) - - all : fodder -