<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ba5a3e5df9708462e22108f995d4e88ae71660a8">https://github.com/macports/macports-ports/commit/ba5a3e5df9708462e22108f995d4e88ae71660a8</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 ba5a3e5 openttd: Update to 1.10.1
</span>ba5a3e5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ba5a3e5df9708462e22108f995d4e88ae71660a8
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Sat May 9 22:49:36 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> openttd: Update to 1.10.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> openttd-opengfx: Update to 0.6.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Modernize all URLs.
</span>---
games/openttd/Portfile | 40 ++++++++++++++--------------
games/openttd/files/patch-name_conflict.diff | 12 ++++-----
2 files changed, 26 insertions(+), 26 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/openttd/Portfile b/games/openttd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ea484c3..de4afdc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/openttd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/openttd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,13 +13,13 @@ maintainers {cal @neverpanic} openmaintainer
</span> if {${name} eq ${subport}} {
PortGroup cxx11 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 1.9.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 f8f6c2d99cc741522615c35269e3f8f38943cfab \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f9ff8c255145a1dd617798a9413179cc740a0cc91709455990880a15eeb7564a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6666860
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 1.10.1
</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;'>+ checksums rmd160 d5549e42fc8c79af68f22c4bb5660724e4d6d588 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0d22a3c50f7a321f4f211594f4987ac16c381e8e3e40f116848e63e91e7fbb9b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6741548
</span>
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,8 +30,8 @@ if {${name} eq ${subport}} {
</span> mimic the original game as closely as possible while extending it with new \
features.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- homepage http://www.openttd.org/en/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites https://proxy.binaries.openttd.org/openttd-releases/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ homepage https://www.openttd.org/en/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites https://cdn.openttd.org/openttd-releases/${version}
</span> distfiles openttd-${version}-source.tar.xz
use_xz yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,10 +85,10 @@ if {${name} eq ${subport}} {
</span> }
subport openttd-opengfx {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 0.5.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 7c5f7180f806d520593565e3a0243975d2317183 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c648d56c41641f04e48873d83f13f089135909cc55342a91ed27c5c1683f0dfe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3548368
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 0.6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 6ef0cbd399b3a4e117a70e723c072ed694b7517f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d419c0f5f22131de15f66ebefde464df3b34eb10e0645fe218c59cbc26c20774 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3551230
</span>
supported_archs noarch
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,13 +99,13 @@ subport openttd-opengfx {
</span> graphics so that OpenTTD can be shipped finally fully functional \
without the need for additional downloads.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- homepage http://dev.openttdcoop.org/projects/opengfx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites https://binaries.openttd.org/extra/opengfx/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ homepage https://github.com/OpenTTD/OpenGFX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites https://cdn.openttd.org/opengfx-releases/${version}
</span> distfiles opengfx-${version}-all.zip
worksrcdir opengfx-${version}
use_zip yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # for some reason, the opengfx-0.5.0-all.zip file contains a tarball
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # for some reason, the opengfx-${version}-all.zip file contains a tarball
</span> post-extract {
system -W ${workpath} "tar xf opengfx-${version}.tar"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -143,8 +143,8 @@ subport openttd-opensfx {
</span> so that OpenTTD can be shipped finally fully functional without the \
need for non-free files.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- homepage http://dev.openttdcoop.org/projects/opensfx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites https://binaries.openttd.org/extra/opensfx/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ homepage https://github.com/OpenTTD/OpenSFX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites https://cdn.openttd.org/opensfx-releases/${version}
</span> distfiles opensfx-${version}-all.zip
worksrcdir opensfx-${version}
use_zip yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -181,8 +181,8 @@ subport openttd-openmsx {
</span> so that OpenTTD can be shipped finally fully functional without the \
need for non-free files.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- homepage http://dev.openttdcoop.org/projects/openmsx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites https://binaries.openttd.org/extra/openmsx/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ homepage https://github.com/OpenTTD/OpenMSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites https://cdn.openttd.org/openmsx-releases/${version}
</span> distfiles openmsx-${version}-all.zip
worksrcdir openmsx-${version}
use_zip yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/openttd/files/patch-name_conflict.diff b/games/openttd/files/patch-name_conflict.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index cd6dcb9..103331b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/openttd/files/patch-name_conflict.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/openttd/files/patch-name_conflict.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/string.cpp.orig 2019-07-07 13:57:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/string.cpp 2019-10-04 03:42:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,10 +33,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./src/string.cpp.orig 2020-04-13 21:02:12.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./src/string.cpp 2020-05-09 22:43:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,10 +31,6 @@
</span> #include "os/windows/string_uniscribe.h"
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,12 +8,12 @@
</span> -#include "os/macosx/string_osx.h"
-#endif
-
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef WITH_ICU_SORT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef WITH_ICU_I18N
</span> /* Required by strnatcmp. */
#include <unicode/ustring.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,6 +40,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,6 +38,10 @@
</span> #include "gfx_func.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* WITH_ICU_SORT */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* WITH_ICU_I18N */
</span>
+#if defined(WITH_COCOA)
+#include "os/macosx/string_osx.h"
</pre><pre style='margin:0'>
</pre>