<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/609e5504735073ca5629b7f7b65075a650e26d51">https://github.com/macports/macports-ports/commit/609e5504735073ca5629b7f7b65075a650e26d51</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 609e550 wireshark2: Update to 2.6.1 resolves https://trac.macports.org/ticket/56454
</span>609e550 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 609e5504735073ca5629b7f7b65075a650e26d51
</span>Author: Eric Hall <eric+git@darkart.com>
AuthorDate: Thu May 24 17:33:20 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> wireshark2: Update to 2.6.1
</span><span style='display:block; white-space:pre;color:#404040;'> resolves https://trac.macports.org/ticket/56454
</span>---
net/wireshark2/Portfile | 20 ++++++++++++++------
.../files/patch-epan-dissectors-CMakeLists.diff | 14 ++++++++++++++
net/wireshark2/files/patch-ui-CMakeLists.txt.diff | 15 +++++++++++++++
3 files changed, 43 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/wireshark2/Portfile b/net/wireshark2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 06c81a7..d9de4a8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/wireshark2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/wireshark2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup cmake 1.0
name wireshark2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.4.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.6.1
</span> revision 0
categories net
license {GPL-2 GPL-3}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,10 +27,10 @@ distfiles wireshark-${version}${extract.suffix}
</span>
worksrcdir wireshark-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 8e965fd282bc0c09e7c4eba5f08a555d0ccf40a7d1544b939e01b90bc893d5fe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 4d58798dfbb5a6567a731e0d6308e1dca3c859ee \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 25ba24628acfc12d7541298255f50e8034e694b7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 28851192
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 ab6e5bbc3464c956347b8671ce8397950ad5daff3bf9964c967d495f4ddbcd88 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a7f187de0c44b801b51e8b72df41681bbc1835f8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 a0cf45d99ab9a42e087af150cbdec08650b9977a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 28386244
</span>
conflicts wireshark-devel wireshark wireshark22 wireshark24
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,6 +42,14 @@ depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> port:libpcap \
port:lz4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## patches "patch-epan-dissectors-CMakeLists.diff" and "patch-ui-CMakeLists.txt.diff" are from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## commit 8815ac76db2e10f5ac0dd7d2f2dd434e2796acce as suggested in:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14722
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-epan-dissectors-CMakeLists.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ui-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
-DCMAKE_INSTALL_RPATH:STRING="${prefix}/lib" \
-DCMAKE_INSTALL_NAME_DIR:STRING="${prefix}/lib" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -150,7 +158,7 @@ post-destroot {
</span> xinstall -d ${destroot}${prefix}/include/wireshark/epan/dissectors/
xinstall -d ${destroot}${prefix}/include/wireshark/epan/ftypes/
xinstall -d ${destroot}${prefix}/include/wireshark/wiretap/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath}/ config.h register.h ${destroot}${prefix}/include/wireshark/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 -W ${worksrcpath}/ config.h ${destroot}${prefix}/include/wireshark/
</span> xinstall -m 644 {*}[glob ${worksrcpath}/epan/*.h] ${destroot}${prefix}/include/wireshark/epan/
xinstall -m 644 {*}[glob ${worksrcpath}/epan/crypt/*.h] ${destroot}${prefix}/include/wireshark/epan/crypt/
xinstall -m 644 {*}[glob ${worksrcpath}/epan/dfilter/*.h] ${destroot}${prefix}/include/wireshark/epan/dfilter/
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/wireshark2/files/patch-epan-dissectors-CMakeLists.diff b/net/wireshark2/files/patch-epan-dissectors-CMakeLists.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..902a790
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/wireshark2/files/patch-epan-dissectors-CMakeLists.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ff8b3c6365..5a4fa25fce 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- epan/dissectors/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ epan/dissectors/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1888,8 +1888,7 @@ set(ALL_DISSECTOR_SRC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_executable(make-dissectors make-dissectors.c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# wsutil is only required for glib-compat.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_link_libraries(make-dissectors ${GLIB2_LIBRARIES} wsutil)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_link_libraries(make-dissectors ${GLIB2_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_dependencies(make-dissectors copy_cli_dlls)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/wireshark2/files/patch-ui-CMakeLists.txt.diff b/net/wireshark2/files/patch-ui-CMakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d2b5f12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/wireshark2/files/patch-ui-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index effbead495..f258d62f04 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ui/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ui/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -82,8 +82,7 @@ set_target_properties(ui PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_executable(make-taps make-taps.c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# wsutil is only required for glib-compat.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_link_libraries(make-taps ${GLIB2_LIBRARIES} wsutil)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_link_libraries(make-taps ${GLIB2_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (HTML_HELP_COMPILER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions(-DHHC_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>