<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/72f47100c11cfcd4e988b251eb3aa896616dab76">https://github.com/macports/macports-ports/commit/72f47100c11cfcd4e988b251eb3aa896616dab76</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 72f47100c11cfcd4e988b251eb3aa896616dab76
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Jul 26 21:56:25 2020 +1000

<span style='display:block; white-space:pre;color:#404040;'>    2Pong: fix ambiguous C++, mark broken on 10.14+
</span>---
 games/2Pong/Portfile           | 12 +++++++++++-
 games/2Pong/files/net.cpp.diff | 28 ++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/2Pong/Portfile b/games/2Pong/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ab4e0596b1e..ce5a751904b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/2Pong/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/2Pong/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,12 +27,22 @@ depends_lib             port:libsdl \
</span>                         port:zlib \
                         port:libxml2
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} >= 18} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Builds but fails to run on 10.14+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # "Unable to obtain graphics context for NSWindow (Mojave behavior)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        return -code error "$name does not work on macOS 10.14 and later"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    known_fail  yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-extract {
     copy ${filespath}/${name}.in ${workpath}/${name}
 }
 
 patchfiles              patch-Makefile.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        patch-defs.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        patch-defs.h.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        net.cpp.diff
</span> 
 post-patch {
     reinplace "s|@PREFIX@|${prefix}|g" ${workpath}/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/2Pong/files/net.cpp.diff b/games/2Pong/files/net.cpp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6447ce59921
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/2Pong/files/net.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/net.cpp.orig       2005-05-12 09:03:37.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/net.cpp    2020-07-26 21:47:07.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,12 +42,12 @@ void UpdateClient(Game *game,Ball * ball
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   out->len=17;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   out->data[0]=balls[1].GetX()/3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   out->data[1]=balls[1].GetY()/3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  out->data[2]=abs(balls[1].GetVelocity().x*25);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  out->data[3]=abs(balls[1].GetVelocity().y*25);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  out->data[2]=abs((int)(balls[1].GetVelocity().x*25));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  out->data[3]=abs((int)(balls[1].GetVelocity().y*25));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   out->data[4]=balls[2].GetX()/3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   out->data[5]=balls[2].GetY()/3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  out->data[6]=abs(balls[2].GetVelocity().x*25);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  out->data[7]=abs(balls[2].GetVelocity().y*25);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  out->data[6]=abs((int)(balls[2].GetVelocity().x*25));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  out->data[7]=abs((int)(balls[2].GetVelocity().y*25));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   out->data[8]=paddles[1].GetY()/3;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   out->data[9]=paddles[0].GetPoints();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   out->data[10]=paddles[1].GetPoints();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,7 +57,7 @@ void UpdateClient(Game *game,Ball * ball
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   out->data[14]=sign(balls[1].GetVelocity().y);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   out->data[15]=sign(balls[2].GetVelocity().x);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   out->data[16]=sign(balls[2].GetVelocity().y);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  out->data[17]=abs(paddles[1].GetVelocity().y);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  out->data[17]=abs((int)paddles[1].GetVelocity().y);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   out->data[18]=sign(paddles[1].GetVelocity().y);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   SDLNet_UDP_Send(sock, channel, out);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   SDLNet_FreePacket(out);
</span></pre><pre style='margin:0'>

</pre>