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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/680fcddd39aa67dd34dad63c69018ace0620caaa">https://github.com/macports/macports-ports/commit/680fcddd39aa67dd34dad63c69018ace0620caaa</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 680fcddd39a libshout/libshout2: fix conflict
</span>680fcddd39a is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 680fcddd39aa67dd34dad63c69018ace0620caaa
</span>Author: Eric Gallager <egall@gwmail.gwu.edu>
AuthorDate: Thu Mar 18 22:28:54 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    libshout/libshout2: fix conflict
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * Segregate into different directories
</span><span style='display:block; white-space:pre;color:#404040;'>    * Disable livecheck
</span><span style='display:block; white-space:pre;color:#404040;'>    * Discussion: https://github.com/macports/macports-ports/commit/3b4af0758de1977829ab9aaf6834c5cdb2c08e27
</span>---
 audio/libshout/Portfile  | 11 ++++++++---
 audio/libshout2/Portfile |  1 -
 2 files changed, 8 insertions(+), 4 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/libshout/Portfile b/audio/libshout/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dd036e42a93..c34a0edcd16 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/libshout/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/libshout/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem          1.0
</span> 
 name                libshout
 version             1.0.9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> checksums           rmd160  b2369212c732bff9565602a47a2a68f9fd4f6e98 \
                     sha256  191215b71ca6b5a6e999e91acd699dbbcdf53c5be1d928a25acb395d8442a426 \
                     size    169553
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,6 @@ categories          audio net
</span> platforms           darwin
 license             GPL-2+
 maintainers         nomaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts           libshout2
</span> 
 description         Data and connectivity lib for the icecast server
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,6 +37,12 @@ patchfiles          apple-patches \
</span> # Fix implicit declaration of functions and fix build with ccache.
 use_autoreconf      yes
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args      --enable-shared \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --enable-shared \
</span>                     --enable-static \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --includedir=${prefix}/include/shout1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --libdir=${prefix}/lib/shout1 \
</span>                     --with-pic
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This is an old version, so disable livecheck
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type      none
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/libshout2/Portfile b/audio/libshout2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4a32c4c704d..ae5f709ebe5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/libshout2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/libshout2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,6 @@ categories      audio net
</span> license         LGPL
 platforms       darwin
 maintainers     nomaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts       libshout
</span> 
 description     Data and connectivity lib for the icecast server
 
</pre><pre style='margin:0'>

</pre>