<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d95986d52be7a65f148d226c332cb4c01b823063">https://github.com/macports/macports-ports/commit/d95986d52be7a65f148d226c332cb4c01b823063</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 d95986d freeciv: update dependencies etc
</span>d95986d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d95986d52be7a65f148d226c332cb4c01b823063
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Nov 24 17:01:00 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> freeciv: update dependencies etc
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Use SDL2 on newer OS versions
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove gtk2 dependency when not building gtk2 client
</span><span style='display:block; white-space:pre;color:#404040;'> * Enable sqlite3 database support
</span><span style='display:block; white-space:pre;color:#404040;'> * Add other libs that are linked to directly
</span><span style='display:block; white-space:pre;color:#404040;'> * Disable silent build rules
</span><span style='display:block; white-space:pre;color:#404040;'> * Clean up configure options
</span>---
games/freeciv/Portfile | 78 +++++++++++++++++++++++++++++++++-----------------
1 file changed, 52 insertions(+), 26 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/freeciv/Portfile b/games/freeciv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 58e2425..c8e819ab 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/freeciv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/freeciv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,38 +26,64 @@ checksums rmd160 9ffdc49773161cc1396e631db0e28d0ddc911bcc \
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:curl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:bzip2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span> port:libiconv \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl_mixer \
</span> port:readline \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:sqlite3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xz \
</span> port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-readline \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-nls --with-libiconv-prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --mandir=${prefix}/share/man --with-sdl-prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-sdltest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-fcdb=sqlite3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-readline \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-gtktest \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-sdltest \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-sdl2test \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-sdl2framework
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} > 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libsdl2_mixer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-sdl-mixer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libsdl_mixer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-sdl-mixer=sdl1.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span> conflicts freeciv-x11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platforms macosx
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:freetype \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libpng \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsdl_image \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:freetype
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-fcmp=cli
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup app 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} > 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # SDL2 support is said to be still experimental, but SDL1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # doesn't work properly on newer OS versions (window contents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # are just completely white).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libsdl2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl2_gfx \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl2_image \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl2_ttf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-client=sdl2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ app.executable freeciv-sdl2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libsdl \
</span> port:libsdl_gfx \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsdl_image \
</span> port:libsdl_ttf
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-client=sdl --disable-sdl-mixer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup app 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-client=sdl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ app.executable freeciv-sdl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- app.executable freeciv-sdl
</span> app.icon data/icons/128x128/freeciv-client.png
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type regex
livecheck.url http://www.freeciv.org/download.html
livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,13 +92,13 @@ if {${name} eq ${subport}} {
</span> }
subport freeciv-x11 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span> conflicts freeciv
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:gettext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append --enable-client=gtk2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-gtktest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-fcmp=gtk2
</span> }
</pre><pre style='margin:0'>
</pre>