<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/a7ae74d06c208feaeba35b3c06053eee1de643e2">https://github.com/macports/macports-ports/commit/a7ae74d06c208feaeba35b3c06053eee1de643e2</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 a7ae74d06c2 warzone2100: use MacPorts discord-rpc
</span>a7ae74d06c2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a7ae74d06c208feaeba35b3c06053eee1de643e2
</span>Author: jasonliu-- <jasonliu--@users.noreply.github.com>
AuthorDate: Fri Sep 1 19:41:40 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> warzone2100: use MacPorts discord-rpc
</span>---
games/warzone2100/Portfile | 33 +++++++++++++++++++++++++++++++--
1 file changed, 31 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/warzone2100/Portfile b/games/warzone2100/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 91334b4f49f..2e20c11cf49 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/warzone2100/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/warzone2100/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +39,7 @@ if {$subport eq ${name}} {
</span> PortGroup legacysupport 1.1
github.setup Warzone2100 ${name} 4.3.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 4
</span> github.tarball_from releases
distname ${name}_src
use_xz yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,6 +64,7 @@ if {$subport eq ${name}} {
</span> port:sqlitecpp \
port:re2 \
port:${port_libfmt} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:discord-rpc \
</span> port:libpng \
port:libsdl2 \
port:openal-soft \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,10 +103,16 @@ if {$subport eq ${name}} {
</span> legacysupport.use_mp_libcxx yes
post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The source code resets the CMAKE_MODULE_PATH, instead of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # adding to the list. This causes CMake to not be able to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # find any packages that are available through MacPorts Cmake.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s/^set.\(CMAKE_MODULE_PATH.*PROJECT_SOURCE_DIR.*cmake\)/list(PREPEND \1/} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Prevent the upstream source from trying to compile these as
# internal libraries, since we have made them available as
# dependencies through MacPorts.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dep [list utf8proc fmt SQLiteCpp] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dep [list utf8proc fmt discord-rpc SQLiteCpp] {
</span> reinplace -E \
"/add_subdirectory.$dep/,/set_property.*$dep/d" \
${worksrcpath}/3rdparty/CMakeLists.txt
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,6 +133,22 @@ if {$subport eq ${name}} {
</span> ${worksrcpath}/src/CMakeLists.txt \
${worksrcpath}/lib/netplay/CMakeLists.txt
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "/if.ENABLE_DISCORD/a\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \\ find_package(DiscordRPC)\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/3rdparty/CMakeLists.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/CMakeLists.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/integrations/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s/\(TARGET discord-rpc\)/DiscordRPC_FOUND OR \1/} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/CMakeLists.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/integrations/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach re [list \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {/target_include_directories.*3rdparty/s/".*"/"${DiscordRPC_INCLUDE_DIR}"/} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {/target_link_libraries.*discord-rpc/s/discord-rpc/"${DiscordRPC_LIBRARY}"/} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace $re ${worksrcpath}/src/integrations/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> reinplace {/include_directories.*glm/d} \
${worksrcpath}/CMakeLists.txt
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -254,6 +277,12 @@ if {$subport eq "${name}-music"} {
</span>
default_variants +high
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset high] && ![variant_isset standard]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "You must install this port with one of the audio quality variants selected!"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "No audio quality variant selected"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> use_configure no
build {}
destroot {
</pre><pre style='margin:0'>
</pre>