<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/58ef41b5df0c59adc0e3fd93e82a047477380960">https://github.com/macports/macports-ports/commit/58ef41b5df0c59adc0e3fd93e82a047477380960</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 58ef41b net/wireshark2, net/wireshark22, net/wireshark24: undo non-maintainer changes and replace with work maintainer had in progress
</span>58ef41b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 58ef41b5df0c59adc0e3fd93e82a047477380960
</span>Author: Eric Hall <ricci@macports.org>
AuthorDate: Wed Apr 24 18:53:40 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> net/wireshark2, net/wireshark22, net/wireshark24: undo non-maintainer changes and replace with work maintainer had in progress
</span>---
net/wireshark2/Portfile | 36 +++++++++++++++---------------------
net/wireshark22/Portfile | 36 +++++++++++++++---------------------
net/wireshark24/Portfile | 36 +++++++++++++++---------------------
3 files changed, 45 insertions(+), 63 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 52eeb90..606632c 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;'>@@ -68,7 +68,21 @@ configure.args-append \
</span> patchfiles-append patch-wireshark2-luafix-001.diff
patchfiles-append patch-wireshark2-luafix-002.diff
<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;'>@@ -131,26 +145,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;'>- # 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> post-destroot {
xinstall -d ${destroot}${prefix}/include/wireshark/epan/crypt/
xinstall -d ${destroot}${prefix}/include/wireshark/epan/dfilter/
<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 22b6fc6..0f01853 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;'>@@ -78,7 +78,21 @@ 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 gtk2 gtk3 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 gtk2 conflicts no_gui qt4 qt5 gtk3 description {Build wireshark with a gtk2 GUI} {
configure.args-replace -DBUILD_wireshark_gtk=OFF -DBUILD_wireshark_gtk=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -172,26 +186,6 @@ if {![variant_isset qt4] && ![variant_isset qt5] && ![variant_isset gtk2] && ![v
</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;'>- # 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> post-destroot {
xinstall -d ${destroot}${prefix}/include/wireshark/epan/crypt/
xinstall -d ${destroot}${prefix}/include/wireshark/epan/dfilter/
<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 d599a33..980e330 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;'>@@ -62,7 +62,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;'>@@ -125,26 +139,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;'>- # 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> post-destroot {
xinstall -d ${destroot}${prefix}/include/wireshark/epan/crypt/
xinstall -d ${destroot}${prefix}/include/wireshark/epan/dfilter/
</pre><pre style='margin:0'>
</pre>