<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/c12589f56fac0bba08baed18577588f7046b294b">https://github.com/macports/macports-ports/commit/c12589f56fac0bba08baed18577588f7046b294b</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 c12589f net/wireshark3: undo non-maintainer changes and replace with work maintainer had in progress.
</span>c12589f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c12589f56fac0bba08baed18577588f7046b294b
</span>Author: Eric Hall <ricci@macports.org>
AuthorDate: Wed Apr 24 18:04:44 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> net/wireshark3: undo non-maintainer changes and replace with work maintainer had in progress.
</span>---
net/wireshark3/Portfile | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/wireshark3/Portfile b/net/wireshark3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6242a30..1796fc8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/wireshark3/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;'>@@ -61,7 +61,21 @@ configure.args-append \
</span> -DENABLE_ZLIB=OFF \
-DBUILD_wireshark=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant qt5 conflicts no_gui 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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_APPLICATION_BUNDLE=OFF -DENABLE_APPLICATION_BUNDLE=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DBUILD_wireshark=OFF -DBUILD_wireshark=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DENABLE_QT5=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.depends_component qtbase \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtmacextras \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtmultimedia \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtsvg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qttranslations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}/${prefix}/bin/Wireshark.app ${destroot}${applications_dir}/Wireshark.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
variant no_gui conflicts qt5 description {do not build the wireshark GUI} {
## initial settings (above) handle this
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -135,17 +149,6 @@ if {![variant_isset qt5] && ![variant_isset no_gui]} {
</span> default_variants-append +qt5
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.depends_component qtmacextras qtmultimedia qtsvg qttranslations
</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=ON
</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> ## if no python3* variant is specified, add +python37
## XYZZY: it would be better to detect which python3* is already installed and use that...
if {![variant_isset python34] && ![variant_isset python35] && \
</pre><pre style='margin:0'>
</pre>