Skip to content

/ macports-ports

Permalink
Browse files
Loading status checks…

net/wireshark2, net/wireshark22, net/wireshark24: undo non-maintainer… 

… changes and replace with work maintainer had in progress
  • Loading branch information
@ghosthound
ghosthound committed Apr 25, 2019
1 parent c12589f commit 58ef41b5df0c59adc0e3fd93e82a047477380960
Unified Split
Showing with 45 additions and 63 deletions.
  1. +15 −21 net/wireshark2/Portfile
  2. +15 −21 net/wireshark22/Portfile
  3. +15 −21 net/wireshark24/Portfile
36 net/wireshark2/Portfile
View file
@@ -68,7 +68,21 @@ configure.args-append \
patchfiles-append patch-wireshark2-luafix-001.diff
patchfiles-append patch-wireshark2-luafix-002.diff

variant qt5 conflicts no_gui description {Build wireshark with a qt5 GUI} { }
variant qt5 conflicts no_gui description {Build wireshark with a qt5 GUI} {
PortGroup qt5 1.0
configure.args-replace -DENABLE_APPLICATION_BUNDLE=OFF -DENABLE_APPLICATION_BUNDLE=ON
configure.args-replace -DBUILD_wireshark=OFF -DBUILD_wireshark=ON
configure.args-append -DENABLE_QT5=ON
qt5.depends_component qtbase \
qtmacextras \
qtmultimedia \
qtsvg \
qttranslations

post-destroot {
move ${destroot}/${prefix}/bin/Wireshark.app ${destroot}${applications_dir}/Wireshark.app
}
}

variant no_gui conflicts qt5 description {do not build the wireshark GUI} {
## initial settings (above) handle this
@@ -131,26 +145,6 @@ if {![variant_isset qt5] && ![variant_isset no_gui]} {
default_variants-append +qt5
}

if {[variant_isset qt5]} {
PortGroup qt5 1.0
qt5.depends_component qtmacextras qtmultimedia qtsvg qttranslations
configure.args-replace -DENABLE_APPLICATION_BUNDLE=OFF -DENABLE_APPLICATION_BUNDLE=ON
configure.args-replace -DBUILD_wireshark=OFF -DBUILD_wireshark=ON
configure.args-append -DENABLE_QT5=ON
# post-destroot {
# ln -s ${prefix}/bin/dumpcap ${destroot}/${prefix}/bin/wireshark.app/Contents/MacOS/
# file mkdir ${destroot}/${prefix}/bin/wireshark.app/Contents/PlugIns
# ln -s ${prefix}/lib/wireshark/plugins/${version} ${destroot}/${prefix}/bin/wireshark.app/Contents/PlugIns/wireshark
# file copy ${worksrcpath}/packaging/macosx/Resources ${destroot}/${prefix}/bin/wireshark.app/Contents/
# file delete ${destroot}/${prefix}/bin/wireshark.app/Contents/Info.plist
# file copy ${worksrcpath}/packaging/macosx/Info.plist ${destroot}/${prefix}/bin/wireshark.app/Contents/
# move ${destroot}/${prefix}/bin/wireshark.app ${destroot}${applications_dir}/Wireshark.app
# }
post-destroot {
move ${destroot}/${prefix}/bin/Wireshark.app ${destroot}${applications_dir}/Wireshark.app
}
}

post-destroot {
xinstall -d ${destroot}${prefix}/include/wireshark/epan/crypt/
xinstall -d ${destroot}${prefix}/include/wireshark/epan/dfilter/
36 net/wireshark22/Portfile
View file
@@ -78,7 +78,21 @@ variant qt4 conflicts no_gui qt5 gtk2 gtk3 description {Build wireshark with a q
}
}

variant qt5 conflicts no_gui qt4 gtk2 gtk3 description {Build wireshark with a qt5 GUI} { }
variant qt5 conflicts no_gui qt4 gtk2 gtk3 description {Build wireshark with a qt5 GUI} {
PortGroup qt5 1.0
configure.args-replace -DENABLE_APPLICATION_BUNDLE=OFF -DENABLE_APPLICATION_BUNDLE=ON
configure.args-replace -DBUILD_wireshark=OFF -DBUILD_wireshark=ON
configure.args-append -DENABLE_QT5=ON
qt5.depends_component qtbase \
qtmacextras \
qtmultimedia \
qtsvg \
qttranslations

post-destroot {
move ${destroot}/${prefix}/bin/Wireshark.app ${destroot}${applications_dir}/Wireshark.app
}
}

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
@@ -172,26 +186,6 @@ if {![variant_isset qt4] && ![variant_isset qt5] && ![variant_isset gtk2] && ![v
default_variants-append +qt5
}

if {[variant_isset qt5]} {
PortGroup qt5 1.0
qt5.depends_component qtmacextras qtmultimedia qtsvg qttranslations
configure.args-replace -DENABLE_APPLICATION_BUNDLE=OFF -DENABLE_APPLICATION_BUNDLE=ON
configure.args-replace -DBUILD_wireshark=OFF -DBUILD_wireshark=ON
configure.args-append -DENABLE_QT5=ON
# post-destroot {
# ln -s ${prefix}/bin/dumpcap ${destroot}/${prefix}/bin/wireshark.app/Contents/MacOS/
# file mkdir ${destroot}/${prefix}/bin/wireshark.app/Contents/PlugIns
# ln -s ${prefix}/lib/wireshark/plugins/${version} ${destroot}/${prefix}/bin/wireshark.app/Contents/PlugIns/wireshark
# file copy ${worksrcpath}/packaging/macosx/Resources ${destroot}/${prefix}/bin/wireshark.app/Contents/
# file delete ${destroot}/${prefix}/bin/wireshark.app/Contents/Info.plist
# file copy ${worksrcpath}/packaging/macosx/Info.plist ${destroot}/${prefix}/bin/wireshark.app/Contents/
# move ${destroot}/${prefix}/bin/wireshark.app ${destroot}${applications_dir}/Wireshark.app
# }
post-destroot {
move ${destroot}/${prefix}/bin/Wireshark.app ${destroot}${applications_dir}/Wireshark.app
}
}

post-destroot {
xinstall -d ${destroot}${prefix}/include/wireshark/epan/crypt/
xinstall -d ${destroot}${prefix}/include/wireshark/epan/dfilter/
36 net/wireshark24/Portfile
View file
@@ -62,7 +62,21 @@ configure.args-append \
-DENABLE_ZLIB=OFF \
-DBUILD_wireshark=OFF

variant qt5 conflicts no_gui description {Build wireshark with a qt5 GUI} { }
variant qt5 conflicts no_gui description {Build wireshark with a qt5 GUI} {
PortGroup qt5 1.0
configure.args-replace -DENABLE_APPLICATION_BUNDLE=OFF -DENABLE_APPLICATION_BUNDLE=ON
configure.args-replace -DBUILD_wireshark=OFF -DBUILD_wireshark=ON
configure.args-append -DENABLE_QT5=ON
qt5.depends_component qtbase \
qtmacextras \
qtmultimedia \
qtsvg \
qttranslations

post-destroot {
move ${destroot}/${prefix}/bin/Wireshark.app ${destroot}${applications_dir}/Wireshark.app
}
}

variant no_gui conflicts qt5 description {do not build the wireshark GUI} {
## initial settings (above) handle this
@@ -125,26 +139,6 @@ if {![variant_isset qt5] && ![variant_isset no_gui]} {
default_variants-append +qt5
}

if {[variant_isset qt5]} {
PortGroup qt5 1.0
qt5.depends_component qtmacextras qtmultimedia qtsvg qttranslations
configure.args-replace -DENABLE_APPLICATION_BUNDLE=OFF -DENABLE_APPLICATION_BUNDLE=ON
configure.args-replace -DBUILD_wireshark=OFF -DBUILD_wireshark=ON
configure.args-append -DENABLE_QT5=ON
# post-destroot {
# ln -s ${prefix}/bin/dumpcap ${destroot}/${prefix}/bin/wireshark.app/Contents/MacOS/
# file mkdir ${destroot}/${prefix}/bin/wireshark.app/Contents/PlugIns
# ln -s ${prefix}/lib/wireshark/plugins/${version} ${destroot}/${prefix}/bin/wireshark.app/Contents/PlugIns/wireshark
# file copy ${worksrcpath}/packaging/macosx/Resources ${destroot}/${prefix}/bin/wireshark.app/Contents/
# file delete ${destroot}/${prefix}/bin/wireshark.app/Contents/Info.plist
# file copy ${worksrcpath}/packaging/macosx/Info.plist ${destroot}/${prefix}/bin/wireshark.app/Contents/
# move ${destroot}/${prefix}/bin/wireshark.app ${destroot}${applications_dir}/Wireshark.app
# }
post-destroot {
move ${destroot}/${prefix}/bin/Wireshark.app ${destroot}${applications_dir}/Wireshark.app
}
}

post-destroot {
xinstall -d ${destroot}${prefix}/include/wireshark/epan/crypt/
xinstall -d ${destroot}${prefix}/include/wireshark/epan/dfilter/

0 comments on commit 58ef41b

Please sign in to comment.
You can’t perform that action at this time.