<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/88747cfe4d75de1fdbe546338d2faac8100e9a5a">https://github.com/macports/macports-ports/commit/88747cfe4d75de1fdbe546338d2faac8100e9a5a</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 88747cf net/wireshark3: new port net/wireshark, net/wireshark2*: add conflict with net/wireshark3
</span>88747cf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 88747cfe4d75de1fdbe546338d2faac8100e9a5a
</span>Author: Eric Hall <ricci@macports.org>
AuthorDate: Sun Mar 3 19:17:39 2019 -0800
<span style='display:block; white-space:pre;color:#404040;'> net/wireshark3: new port
</span><span style='display:block; white-space:pre;color:#404040;'> net/wireshark, net/wireshark2*: add conflict with net/wireshark3
</span>---
net/wireshark/Portfile | 2 +-
net/wireshark2/Portfile | 2 +-
net/wireshark22/Portfile | 2 +-
net/wireshark24/Portfile | 2 +-
net/{wireshark24 => wireshark3}/Portfile | 36 ++++++----------------
.../files/patch-epan-dissectors-CMakeLists.diff | 14 +++++++++
net/wireshark3/files/patch-ui-CMakeLists.txt.diff | 15 +++++++++
7 files changed, 43 insertions(+), 30 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 e8fcd7c..6e5d980e 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 wireshark24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts wireshark-devel wireshark2 wireshark22 wireshark24 wireshark3
</span>
patchfiles patch-configure.diff
<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 455ae90..45daf54 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;'>@@ -31,7 +31,7 @@ checksums sha256 747b3e7a37414942959f76f198be49dcbcca936bda538c440894
</span> sha1 6d601a140b369618e5ac3acab736a1b8de8d5432 \
size 28420060
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts wireshark-devel wireshark wireshark22 wireshark24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts wireshark-devel wireshark wireshark22 wireshark24 wireshark3
</span>
depends_build-append \
port:pkgconfig
<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 dfee8b1..59b9119 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 wireshark24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts wireshark-devel wireshark wireshark2 wireshark24 wireshark3
</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 fc4c0fb..0719949 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 wireshark2 wireshark22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts wireshark-devel wireshark wireshark2 wireshark22 wireshark3
</span>
depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/wireshark24/Portfile b/net/wireshark3/Portfile
</span>similarity index 78%
copy from net/wireshark24/Portfile
copy to net/wireshark3/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index fc4c0fb..1dd1559 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/wireshark3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,12 +3,11 @@
</span> PortSystem 1.0
PortGroup cmake 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name wireshark24
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.4.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name wireshark3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.0.0
</span> categories net
license {GPL-2 GPL-3}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers darkart.com:opendarwin.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {darkart.com:opendarwin.org @ghosthound}
</span> description Graphical network analyzer and capture tool
homepage https://www.wireshark.org/
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,12 +26,12 @@ 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 bc4f30f5b2e94f3a696fef9de44673cdf402db90aac5299966da647f708f009e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 9211657dc9d58eae871547d90021c376bb52f761 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 c254d850c81d85964aa23d60bb6fdb1373032490 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 30953760
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts wireshark-devel wireshark wireshark2 wireshark22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts wireshark-devel wireshark wireshark2 wireshark22 wireshark24
</span>
depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +55,6 @@ configure.args-append \
</span> -DENABLE_LUA=OFF \
-DENABLE_LZ4=ON \
-DENABLE_NETLINK=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_PORTAUDIO=OFF \
</span> -DENABLE_SMI=OFF \
-DENABLE_SNAPPY=OFF \
-DENABLE_ZLIB=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,15 +67,6 @@ variant qt5 conflicts no_gui description {Build wireshark with a qt5 GUI} {
</span> configure.args-append -DENABLE_QT5=ON
depends_lib-append port:qt5-qtmacextras port:qt5-qtmultimedia port:qt5-qtsvg port:qt5-qttranslations
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ln -s ${prefix}/bin/dumpcap ${destroot}/${prefix}/bin/wireshark.app/Contents/MacOS/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # file mkdir ${destroot}/${prefix}/bin/wireshark.app/Contents/PlugIns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ln -s ${prefix}/lib/wireshark/plugins/${version} ${destroot}/${prefix}/bin/wireshark.app/Contents/PlugIns/wireshark
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # file copy ${worksrcpath}/packaging/macosx/Resources ${destroot}/${prefix}/bin/wireshark.app/Contents/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # file delete ${destroot}/${prefix}/bin/wireshark.app/Contents/Info.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # file copy ${worksrcpath}/packaging/macosx/Info.plist ${destroot}/${prefix}/bin/wireshark.app/Contents/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # move ${destroot}/${prefix}/bin/wireshark.app ${destroot}${applications_dir}/Wireshark.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # }
</span> post-destroot {
move ${destroot}/${prefix}/bin/Wireshark.app ${destroot}${applications_dir}/Wireshark.app
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,11 +81,6 @@ variant adns conflicts cares description {use adns library for async. dns resolu
</span> depends_lib-append port:adns
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant portaudio description {Build with PortAudio support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DENABLE_PORTAUDIO=OFF -DENABLE_PORTAUDIO=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:portaudio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant zlib description {Build with zlib compression support} {
configure.args-replace -DENABLE_ZLIB=OFF -DENABLE_ZLIB=ON
depends_lib-append port:zlib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,7 +122,7 @@ variant geoip description {Build with GeoIP support} {
</span> depends_lib-append port:libgeoip
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +portaudio +zlib +libsmi +gnutls +libgcrypt +cares +geoip +kerberos5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +zlib +libsmi +gnutls +libgcrypt +cares +geoip +kerberos5
</span>
if {![variant_isset qt5] && ![variant_isset no_gui]} {
default_variants-append +qt5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -150,7 +134,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/wireshark3/files/patch-epan-dissectors-CMakeLists.diff b/net/wireshark3/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/wireshark3/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/wireshark3/files/patch-ui-CMakeLists.txt.diff b/net/wireshark3/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/wireshark3/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>