Date: Sun, 28 Jul 2024 14:03:58 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d3dfac6f1848 - main - games/palomino: attempt to unbreak and thus undeprecate the port Message-ID: <202407281403.46SE3w0l007490@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=d3dfac6f1848d1564fae3876e593013232abdac6 commit d3dfac6f1848d1564fae3876e593013232abdac6 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2024-07-28 14:02:04 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2024-07-28 14:02:04 +0000 games/palomino: attempt to unbreak and thus undeprecate the port Drop explicit types from the `std::make_pair' template argument lists when they inhibit type deduction and compiler thus cannot find viable candidate function template. While here, shorten one regex which was making the line overly long so it did not fit standard terminal width. --- games/palomino/Makefile | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/games/palomino/Makefile b/games/palomino/Makefile index e806426174c8..7d2609bae5a7 100644 --- a/games/palomino/Makefile +++ b/games/palomino/Makefile @@ -15,9 +15,6 @@ WWW= https://www.palomino3d.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE_GNU_GPL_2.txt -BROKEN= fails to compile: no matching function for call to 'make_pair' -DEPRECATED= Abandonware, unmaintained and fails to build -EXPIRATION_DATE=2024-08-21 LIB_DEPENDS= libosg.so:graphics/osg34 @@ -64,7 +61,7 @@ post-patch: @${REINPLACE_CMD} -e 's|string sDataDir|&="${DATADIR}/data/"|'\ ${WRKSRC}/src/base/conf.cc - @${REINPLACE_CMD} -e '/LUABIND_SCRIPTS_DIR/ s|"scripts"|"${DATADIR}/scripts"|' \ + @${REINPLACE_CMD} -e '/LUABIND_SCRIPTS_DIR/ s|scripts|${DATADIR}/&|' \ ${WRKSRC}/src/lua_bind/defs.hh @${REINPLACE_CMD} -e 's|doc/html/|${DOCSDIR}/|' ${WRKSRC}/src/gui/gui.cc @@ -77,6 +74,19 @@ post-patch: ${WRKSRC}/src/hud/hud.hh \ ${WRKSRC}/src/hud/hud_text.cc + @${REINPLACE_CMD} -e '/std::make_pair/ s,<.*>,,' \ + ${WRKSRC}/src/collision/collision.cc \ + ${WRKSRC}/src/fx/image_cache.cc \ + ${WRKSRC}/src/graph/model_cache.cc \ + ${WRKSRC}/src/hud/font.cc \ + ${WRKSRC}/src/lua_bind/lua.cc \ + ${WRKSRC}/src/object/dyna.cc \ + ${WRKSRC}/src/sky/sky.cc \ + ${WRKSRC}/src/sky/sky_dome.cc \ + ${WRKSRC}/src/sky/sky_dome.hh \ + ${WRKSRC}/src/sky/sun.hh \ + ${WRKSRC}/src/sound/sound_base.cc + post-patch-SDL-off: @${REINPLACE_CMD} -e '/COMPILE_WITH_SDL/ d' ${WRKSRC}/CMakeLists.txt
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407281403.46SE3w0l007490>