<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/87033a166468296da058c2cc92de666b53ac1451">https://github.com/macports/macports-ports/commit/87033a166468296da058c2cc92de666b53ac1451</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 87033a166468296da058c2cc92de666b53ac1451
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sun Apr 21 06:03:54 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> wireshark24: Use qt5 PG to set dependencies
</span>---
net/wireshark24/Portfile | 43 ++++++++++++++++++++++---------------------
1 file changed, 22 insertions(+), 21 deletions(-)
<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 dc422a2..d599a33 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;'>@@ -5,7 +5,7 @@ PortGroup cmake 1.0
</span>
name wireshark24
version 2.4.14
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories net
license {GPL-2 GPL-3}
maintainers darkart.com:opendarwin.org
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,26 +62,7 @@ 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:#ffe0e0;'>- PortGroup qt5 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=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:qt5-qtmacextras port:qt5-qtmultimedia port:qt5-qtsvg port:qt5-qttranslations
</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:#e0ffe0;'>+variant qt5 conflicts no_gui description {Build wireshark with a qt5 GUI} { }
</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;'>@@ -144,6 +125,26 @@ if {![variant_isset qt5] && ![variant_isset no_gui]} {
</span> default_variants-append +qt5
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.depends_component qtmacextras qtmultimedia qtsvg qttranslations
</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;'>+ # post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ln -s ${prefix}/bin/dumpcap ${destroot}/${prefix}/bin/wireshark.app/Contents/MacOS/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # file mkdir ${destroot}/${prefix}/bin/wireshark.app/Contents/PlugIns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ln -s ${prefix}/lib/wireshark/plugins/${version} ${destroot}/${prefix}/bin/wireshark.app/Contents/PlugIns/wireshark
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # file copy ${worksrcpath}/packaging/macosx/Resources ${destroot}/${prefix}/bin/wireshark.app/Contents/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # file delete ${destroot}/${prefix}/bin/wireshark.app/Contents/Info.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # file copy ${worksrcpath}/packaging/macosx/Info.plist ${destroot}/${prefix}/bin/wireshark.app/Contents/
</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;'>+ 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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
xinstall -d ${destroot}${prefix}/include/wireshark/epan/crypt/
xinstall -d ${destroot}${prefix}/include/wireshark/epan/dfilter/
</pre><pre style='margin:0'>
</pre>