<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/6725f98f7683a8d710c4099c4ce1e6b806701fb7">https://github.com/macports/macports-ports/commit/6725f98f7683a8d710c4099c4ce1e6b806701fb7</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 6725f98 remove building with qt4 resolves #54276 for wireshark2 (2.4.1)
</span>6725f98 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6725f98f7683a8d710c4099c4ce1e6b806701fb7
</span>Author: Eric Hall <eric+git@darkart.com>
AuthorDate: Tue Aug 29 16:00:34 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> remove building with qt4
</span><span style='display:block; white-space:pre;color:#404040;'> resolves #54276 for wireshark2 (2.4.1)
</span>---
net/wireshark2/Portfile | 26 +++-----------------------
1 file changed, 3 insertions(+), 23 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 30fd940..51e8b68 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;'>@@ -57,27 +57,7 @@ configure.args-append \
</span> -DENABLE_ZLIB=OFF \
-DBUILD_wireshark=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant qt4 conflicts no_gui qt5 description {Build wireshark with a qt4 GUI} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DENABLE_APPLICATION_BUNDLE=OFF -DENABLE_APPLICATION_BUNDLE=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace -DBUILD_wireshark=OFF -DBUILD_wireshark=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_QT5=OFF
</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;'>- # 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><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</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><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 qt5 conflicts no_gui qt4 description {Build wireshark with a qt5 GUI} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant qt5 conflicts no_gui 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;'>@@ -98,7 +78,7 @@ variant qt5 conflicts no_gui qt4 description {Build wireshark with a qt5 GUI} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant no_gui conflicts qt4 qt5 description {do not build the wireshark GUI} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant no_gui conflicts qt5 description {do not build the wireshark GUI} {
</span> ## initial settings (above) handle this
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -155,7 +135,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 no_gui]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset qt5] && ![variant_isset no_gui]} {
</span> default_variants-append +qt5
}
</pre><pre style='margin:0'>
</pre>