<pre style='margin:0'>
ghosthound pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6a4e6e7733c2252b41a412d98413208902849912">https://github.com/macports/macports-ports/commit/6a4e6e7733c2252b41a412d98413208902849912</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 6a4e6e7 add new conflicts to various wireshark Portfiles.
</span>6a4e6e7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6a4e6e7733c2252b41a412d98413208902849912
</span>Author: Eric Hall <ricci@macports.org>
AuthorDate: Wed May 9 15:04:53 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> add new conflicts to various wireshark Portfiles.
</span>---
net/wireshark/Portfile | 2 +-
net/wireshark22/Portfile | 2 +-
net/wireshark24/Portfile | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/wireshark/Portfile b/net/wireshark/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index deb797f..e538460 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/wireshark/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/wireshark/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ checksums md5 988a4595a4a87dafb3c4870ea40e89b5 \
</span>
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts wireshark-devel wireshark2 wireshark22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts wireshark-devel wireshark2 wireshark22 wireshark24
</span>
patchfiles patch-configure.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/wireshark22/Portfile b/net/wireshark22/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 64b030d..e20f26c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/wireshark22/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/wireshark22/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ checksums sha256 8574a5e1fdec7affae640924bd46c1aed1bd866e02632fa5625e
</span> rmd160 a0164ae5e48de588bcc4df4f3c537dbf83b70cda \
sha1 14ff541e84b43f5cff52fe44cdc1fbbcb8643dd2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts wireshark-devel wireshark wireshark2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts wireshark-devel wireshark wireshark2 wireshark24
</span>
depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/wireshark24/Portfile b/net/wireshark24/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9e20ffe..d4559ca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/wireshark24/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/wireshark24/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,7 @@ checksums sha256 8e965fd282bc0c09e7c4eba5f08a555d0ccf40a7d1544b939e01
</span> sha1 25ba24628acfc12d7541298255f50e8034e694b7 \
size 28851192
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts wireshark-devel wireshark wireshark22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts wireshark-devel wireshark wireshark2 wireshark22
</span>
depends_build-append \
port:pkgconfig
</pre><pre style='margin:0'>
</pre>