<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/51db8facde996b526873e4945a035b9cb9ed411e">https://github.com/macports/macports-ports/commit/51db8facde996b526873e4945a035b9cb9ed411e</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 51db8fa Move wireshark2 to wireshark22 Copy wireshark22 to wireshark2 and update to wireshark 2.4.1 Update wireshark/Portfile to add "wireshark22" as a conflict.
</span>51db8fa is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 51db8facde996b526873e4945a035b9cb9ed411e
</span>Author: Eric Hall <eric+git@darkart.com>
AuthorDate: Tue Aug 29 15:29:17 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> Move wireshark2 to wireshark22
</span><span style='display:block; white-space:pre;color:#404040;'> Copy wireshark22 to wireshark2 and update to wireshark 2.4.1
</span><span style='display:block; white-space:pre;color:#404040;'> Update wireshark/Portfile to add "wireshark22" as a conflict.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Resolves #54500
</span>---
net/wireshark/Portfile | 2 +-
net/wireshark2/Portfile | 52 ++++++--------------------------
net/{wireshark2 => wireshark22}/Portfile | 4 +--
3 files changed, 13 insertions(+), 45 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 f6b9868..ecc2319 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
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts wireshark-devel wireshark2 wireshark22
</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 0330e8f..30fd940 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.2.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.4.1
</span> revision 0
categories net
license {GPL-2 GPL-3}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,17 +21,17 @@ long_description A network analyzer that lets you capture and \
</span> master_sites https://www.wireshark.org/download/src/ \
https://www.wireshark.org/download/src/all-versions/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span>
distfiles wireshark-${version}${extract.suffix}
worksrcdir wireshark-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 c8b32c0e7d44a277e737c53d9d142ad3fe4265338f25a7fd8c891f58a7633fc2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 d8e0860b02d9dc2019f5c759b53330c12b18f73e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 9a2331260ed04d44438ce6ba54e50a03f6bb42ef
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 02ddbcf9b10f9dfa1e36eec00fe00cb5b5ce8e07203843baf056ac7909911fcd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 4e47f79741fe09ed404e03ab51be617abc3ae3d5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 2a52aeefba0a45747b1e4593c82c6efc33aa4182
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts wireshark-devel wireshark
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts wireshark-devel wireshark wireshark22
</span>
depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,10 +55,9 @@ configure.args-append \
</span> -DENABLE_PORTAUDIO=OFF \
-DENABLE_SMI=OFF \
-DENABLE_ZLIB=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_wireshark_gtk=OFF \
</span> -DBUILD_wireshark=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant qt4 conflicts no_gui qt5 gtk2 gtk3 description {Build wireshark with a qt4 GUI} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant qt4 conflicts no_gui qt5 description {Build wireshark with a qt4 GUI} {
</span> PortGroup qt4 1.0
configure.args-replace -DENABLE_APPLICATION_BUNDLE=OFF -DENABLE_APPLICATION_BUNDLE=ON
configure.args-replace -DBUILD_wireshark=OFF -DBUILD_wireshark=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +77,7 @@ variant qt4 conflicts no_gui qt5 gtk2 gtk3 description {Build wireshark with a q
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant qt5 conflicts no_gui qt4 gtk2 gtk3 description {Build wireshark with a qt5 GUI} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant qt5 conflicts no_gui qt4 description {Build wireshark with a qt5 GUI} {
</span> PortGroup qt5 1.0
configure.args-replace -DENABLE_APPLICATION_BUNDLE=OFF -DENABLE_APPLICATION_BUNDLE=ON
configure.args-replace -DBUILD_wireshark=OFF -DBUILD_wireshark=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,38 +98,7 @@ variant qt5 conflicts no_gui qt4 gtk2 gtk3 description {Build wireshark with a q
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gtk2 conflicts no_gui qt4 qt5 gtk3 description {Build wireshark with a gtk2 GUI} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DBUILD_wireshark_gtk=OFF -DBUILD_wireshark_gtk=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_GTK3=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:gtk2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # file mkdir ${destroot}/${applications_dir}/Wireshark.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ln -s ${prefix}/bin/wireshark-gtk ${destroot}/${applications_dir}/Wireshark.app/Contents/MacOS/Wireshark
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ln -s ${prefix}/bin/dumpcap ${destroot}/${applications_dir}/Wireshark.app/Contents/MacOS/dumpcap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # file mkdir ${destroot}/${applications_dir}/Wireshark.app/Contents/PlugIns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ln -s ${prefix}/lib/wireshark/plugins/${version} ${destroot}/${applications_dir}/Wireshark.app/Contents/PlugIns/wireshark
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # file copy ${worksrcpath}/packaging/macosx/Resources ${destroot}/${applications_dir}/Wireshark.app/Contents/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # file copy ${worksrcpath}/packaging/macosx/Info.plist ${destroot}/${applications_dir}/Wireshark.app/Contents/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gtk3 conflicts no_gui qt4 qt5 gtk2 description {Build wireshark with a gtk3 GUI} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DBUILD_wireshark_gtk=OFF -DBUILD_wireshark_gtk=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_GTK3=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:gtk3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:adwaita-icon-theme
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${destroot}/${applications_dir}/Wireshark.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/bin/wireshark-gtk ${destroot}/${applications_dir}/Wireshark.app/Contents/MacOS/Wireshark
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/bin/dumpcap ${destroot}/${applications_dir}/Wireshark.app/Contents/MacOS/dumpcap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${destroot}/${applications_dir}/Wireshark.app/Contents/PlugIns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/lib/wireshark/plugins/${version} ${destroot}/${applications_dir}/Wireshark.app/Contents/PlugIns/wireshark
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/packaging/macosx/Resources ${destroot}/${applications_dir}/Wireshark.app/Contents/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/packaging/macosx/Info.plist ${destroot}/${applications_dir}/Wireshark.app/Contents/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant no_gui conflicts qt4 qt5 gtk2 gtk3 description {do not build the wireshark GUI} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant no_gui conflicts qt4 qt5 description {do not build the wireshark GUI} {
</span> ## initial settings (above) handle this
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -187,7 +155,7 @@ variant geoip description {Build with GeoIP support} {
</span>
default_variants +portaudio +zlib +libsmi +gnutls +libgcrypt +cares +geoip +kerberos5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset qt4] && ![variant_isset qt5] && ![variant_isset gtk2] && ![variant_isset gtk3] && ![variant_isset no_gui]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset qt4] && ![variant_isset qt5] && ![variant_isset no_gui]} {
</span> default_variants-append +qt5
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/wireshark2/Portfile b/net/wireshark22/Portfile
</span>similarity index 99%
copy from net/wireshark2/Portfile
copy to net/wireshark22/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index 0330e8f..2494075 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/wireshark22/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
PortGroup cmake 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name wireshark2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name wireshark22
</span> version 2.2.9
revision 0
categories net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ checksums sha256 c8b32c0e7d44a277e737c53d9d142ad3fe4265338f25a7fd8c89
</span> rmd160 d8e0860b02d9dc2019f5c759b53330c12b18f73e \
sha1 9a2331260ed04d44438ce6ba54e50a03f6bb42ef
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts wireshark-devel wireshark
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts wireshark-devel wireshark wireshark2
</span>
depends_build-append \
port:pkgconfig
</pre><pre style='margin:0'>
</pre>