<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2f3ead52f1329282c0dbc5820c3685b041f24cfa">https://github.com/macports/macports-ports/commit/2f3ead52f1329282c0dbc5820c3685b041f24cfa</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 2f3ead52f13 ufo-ai: new port (version 2.5)
</span>2f3ead52f13 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2f3ead52f1329282c0dbc5820c3685b041f24cfa
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Fri May 12 03:21:39 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> ufo-ai: new port (version 2.5)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/67240
</span>---
games/ufo-ai/Portfile | 105 +++++++++++++++++++++++++++++++++
games/ufo-ai/files/patch-bug-5336.diff | 20 +++++++
games/ufo-ai/files/patch-bug-5345.diff | 62 +++++++++++++++++++
3 files changed, 187 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/ufo-ai/Portfile b/games/ufo-ai/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..54f3778d864
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/ufo-ai/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,105 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name ufo-ai
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://ufoai.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UFO: Alien Invasion is a squad-based tactical strategy game in the \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tradition of the old X-COM PC games.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories games
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+installs_libs no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2 MIT public-domain permissive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {gmail.com:herby.gillot @herbygillot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge:ufoai
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ufoai-${version}-source
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles ${distname}${extract.suffix}:gamesrc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ufoai-${version}-data.tar:gamedata
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 4a60a9f69c7b046378719ca0ae7d0c83da75de06 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0c7cc3bc9efeb276f71cbe6ee8ff7c76f98d183de79f1a069fa63059cf182a8f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 24239539 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ufoai-${version}-data.tar \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b4a758b2267865cfd35e3cedb62aa2ad04204bb2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5e706a424aff6a2ea30a4c798129d6304e897387eadf808528129b512b7dcdb0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1277143040
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gawk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:grep \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gsed \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:include/AL/al.h:openal-soft \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl2_mixer \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl2_ttf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtheora \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p7zip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python27 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:XviD \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${workpath}/gamedata
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "/usr/bin/tar -C gamedata -xf ${distpath}/ufoai-${version}-data.tar"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-bug-5345.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-bug-5336.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set game_share_dir ${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --datadir=${game_share_dir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --target-os=darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target all lang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Install binaries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach gamebin {ufo ufo2map ufoded ufomodel ufoslicer} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0775 ${worksrcpath}/${gamebin} ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Install game data
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${game_share_dir}/base
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy {*}[glob ${workpath}/gamedata/base/*] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${game_share_dir}/base/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy {*}[glob ${worksrcpath}/base/*] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${game_share_dir}/base/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "Run ${prefix}/bin/ufo to start UFO: Alien Invasion"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/ufo-ai/files/patch-bug-5336.diff b/games/ufo-ai/files/patch-bug-5336.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..066498a2735
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/ufo-ai/files/patch-bug-5336.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+commit c334125fbbb7994d6bcab8ecf735bf19a2ef1444
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Martin Gerhardy <martin.gerhardy@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed Jun 25 11:06:25 2014 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * hopefully fixed bug #5336 (active c++11 for mac only to fix a compile problem until we sort out the windows build chain issues)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Compile error on Mac OS 10.9: src/client/cl_http.cpp:192:53: error: cannot pass object of non-POD type 'std::__1::nullptr_t' through variadic function
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/build/platforms/darwin.mk b/build/platforms/darwin.mk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 89a20a5806..8dee5e3138 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/build/platforms/darwin.mk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/build/platforms/darwin.mk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,6 +4,7 @@ SO_LDFLAGS = -dynamiclib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SO_LIBS := -ldl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS += -D_BSD_SOURCE -D_XOPEN_SOURCE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CXXFLAGS += -std=c++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS += -framework IOKit -framework Foundation -framework Cocoa -headerpad_max_install_names
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ### most mac users will have their additional libs and headers under /opt/local
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/ufo-ai/files/patch-bug-5345.diff b/games/ufo-ai/files/patch-bug-5345.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a4306909aeb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/ufo-ai/files/patch-bug-5345.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,62 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From ebcf1fed873f1a75487acedf106f03b299bf8b7e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Martin Gerhardy <martin.gerhardy@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 20 Oct 2013 20:02:48 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] * fixed c++11 warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/client/battlescape/cl_particle.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/client/battlescape/cl_particle.cpp b/src/client/battlescape/cl_particle.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 58d9211631..2e092cce21 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/client/battlescape/cl_particle.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/client/battlescape/cl_particle.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -138,7 +138,7 @@ static char const* const pc_strings[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CASSERT(lengthof(pc_strings) == PC_NUM_PTLCMDS);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /** @brief particle commands parameter and types */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static const int pc_types[PC_NUM_PTLCMDS] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const unsigned int pc_types[PC_NUM_PTLCMDS] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ V_UNTYPED, V_UNTYPED, V_UNTYPED,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.0 (Apple Git-136)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 79495daac64362202abce00379f899069d1ca1a5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Martin Gerhardy <martin.gerhardy@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 8 Jun 2014 17:21:58 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] * fixed narrowing compile error with clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* case value evaluates to -1, which cannot be narrowed to type 'GLenum' (aka 'unsigned int')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/client/renderer/r_state.cpp | 6 ++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/client/renderer/r_state.cpp b/src/client/renderer/r_state.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 71d966f542..d03a52cf11 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/client/renderer/r_state.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/client/renderer/r_state.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -147,7 +147,8 @@ void R_UseMaterial (const material_t* material)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void R_BindArray (GLenum target, GLenum type, const void* array)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- switch (target) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const int v = static_cast<int>(target);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ switch (v) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case GL_VERTEX_ARRAY:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glVertexPointer(COMPONENTS_VERTEX_ARRAY3D, type, 0, array);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -180,7 +181,8 @@ void R_BindArray (GLenum target, GLenum type, const void* array)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void R_BindDefaultArray (GLenum target)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- switch (target) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const int v = static_cast<int>(target);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ switch (v) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case GL_VERTEX_ARRAY:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ R_BindArray(target, GL_FLOAT, r_state.vertex_array_3d);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.37.0 (Apple Git-136)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>