<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/854c611b314c3dc1e3050926b05c1da1f47efc6b">https://github.com/macports/macports-ports/commit/854c611b314c3dc1e3050926b05c1da1f47efc6b</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 854c611  freeciv: update to 2.6.0
</span>854c611 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 854c611b314c3dc1e3050926b05c1da1f47efc6b
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Mon Aug 20 20:11:01 2018 -0700

<span style='display:block; white-space:pre;color:#404040;'>    freeciv: update to 2.6.0
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    closes: https://trac.macports.org/ticket/57006
</span>---
 games/freeciv/Portfile                          | 13 +++++--------
 games/freeciv/files/patch-client-options.c.diff | 11 -----------
 2 files changed, 5 insertions(+), 19 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 2616c0c..cfe6ec4 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;'>@@ -3,7 +3,7 @@
</span> PortSystem          1.0
 
 name                freeciv
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             2.5.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             2.6.0
</span> set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          games
 maintainers         nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,8 +20,9 @@ master_sites        sourceforge:project/${name}/Freeciv%20${branch}/${version}/
</span>                     ftp://ftp.freeciv.org/freeciv/stable/
 use_bzip2           yes
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  df6444cca958601b0bf6a87cae8c1dae5d2401b5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  c8a14156562dce2f0a7b96390c2d5a35314f1124c448782a6a47b0c51cfcb302
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  9ffdc49773161cc1396e631db0e28d0ddc911bcc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  7c20399198d6c7d846fed9a69b02e01134ae5340a3ae0f99d1e38063ade6c999 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    51912466
</span> 
 depends_build       port:pkgconfig
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,15 +33,12 @@ depends_lib         port:curl \
</span>                     port:zlib \
                     port:gtk2
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          patch-client-options.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args      --with-readline \
                     --enable-nls --with-libiconv-prefix=${prefix} \
                     --mandir=${prefix}/share/man --with-sdl-prefix=${prefix} \
                     --disable-sdltest
 
 if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision                1
</span>     conflicts               freeciv-x11
     
     platforms               macosx
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +50,7 @@ if {${name} eq ${subport}} {
</span>                             port:libsdl_gfx \
                             port:libsdl_ttf
     
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append   --enable-client=sdl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append   --enable-client=sdl --disable-sdl-mixer
</span>     
     PortGroup               app 1.0
     app.executable          freeciv-sdl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,7 +64,6 @@ if {${name} eq ${subport}} {
</span> }
 
 subport freeciv-x11 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    revision                1
</span>     conflicts               freeciv
     
     platforms               darwin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/freeciv/files/patch-client-options.c.diff b/games/freeciv/files/patch-client-options.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7fd466e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/freeciv/files/patch-client-options.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- client/options.c.orig  2013-09-14 07:02:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ client/options.c       2013-09-18 19:44:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1713,7 +1713,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                          "the sound plugin.  The new plugin won't take "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                          "effect until you restart Freeciv.  Changing this "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                          "is the same as using the -P command-line option."),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--                      COC_SOUND, GUI_STUB, NULL, get_soundplugin_list, NULL),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+                      COC_SOUND, GUI_STUB, "sdl", get_soundplugin_list, NULL),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   GEN_STR_OPTION(default_chat_logfile,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                  N_("The chat log file"),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                  N_("The name of the chat log file."),
</span></pre><pre style='margin:0'>

</pre>