Ticket #52837: Portfile-wireshark2.diff

Portfile

@@ -5 +5 @@
 PortGroup           cmake 1.0
 
 name                wireshark2
-version             2.0.5
+version             2.2.1
 revision            0
 categories          net
 license             {GPL-2 GPL-3}
@@ -28 +28 @@
 
 worksrcdir          wireshark-${version}
 
-checksums           sha256  0ce0241330828973f5b4efee422a3760cab8ce0b41e7721c4b9fd185be1bb10b \
-                    rmd160  6b6755986c23fd195ddda9344d340a132439420c \
-                    sha1    ab77c632d8babf731bf0ecac0876fe3ff2923d04
+checksums           sha256  900e22af04c8b35e0d02a25a360ab1fb7cfe5ac18fc48a9afd75a7103e569149 \
+                    rmd160  46214dad4b4ac3b9f1f3f8fc95192d0cc1e3377d \
+                    sha1    fe07ab3582f39111ce5c78f5de6f44a8667000ac
 
 conflicts           wireshark-devel wireshark
 
@@ -74 +74 @@
     #     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
+    }
 }
 
 variant qt5 conflicts no_gui qt4 gtk2 gtk3 description {Build wireshark with a qt5 GUI} {
@@ -102 +105 @@
     configure.args-append   -DENABLE_GTK3=OFF
     depends_lib-append      port:gtk2
     
-    post-destroot {
-            file mkdir ${destroot}/${applications_dir}/Wireshark.app/Contents/MacOS
-            ln -s ${prefix}/bin/wireshark-gtk ${destroot}/${applications_dir}/Wireshark.app/Contents/MacOS/Wireshark
-            ln -s ${prefix}/bin/dumpcap ${destroot}/${applications_dir}/Wireshark.app/Contents/MacOS/dumpcap
-            file mkdir ${destroot}/${applications_dir}/Wireshark.app/Contents/PlugIns
-            ln -s ${prefix}/lib/wireshark/plugins/${version} ${destroot}/${applications_dir}/Wireshark.app/Contents/PlugIns/wireshark
-            file copy ${worksrcpath}/packaging/macosx/Resources ${destroot}/${applications_dir}/Wireshark.app/Contents/
-            file copy ${worksrcpath}/packaging/macosx/Info.plist ${destroot}/${applications_dir}/Wireshark.app/Contents/
-    }
+    # post-destroot {
+    #        file mkdir ${destroot}/${applications_dir}/Wireshark.app/Contents/MacOS
+    #        ln -s ${prefix}/bin/wireshark-gtk ${destroot}/${applications_dir}/Wireshark.app/Contents/MacOS/Wireshark
+    #        ln -s ${prefix}/bin/dumpcap ${destroot}/${applications_dir}/Wireshark.app/Contents/MacOS/dumpcap
+    #        file mkdir ${destroot}/${applications_dir}/Wireshark.app/Contents/PlugIns
+    #        ln -s ${prefix}/lib/wireshark/plugins/${version} ${destroot}/${applications_dir}/Wireshark.app/Contents/PlugIns/wireshark
+    #        file copy ${worksrcpath}/packaging/macosx/Resources ${destroot}/${applications_dir}/Wireshark.app/Contents/
+    #        file copy ${worksrcpath}/packaging/macosx/Info.plist ${destroot}/${applications_dir}/Wireshark.app/Contents/
+    # }
 }
 variant gtk3 conflicts no_gui qt4 qt5 gtk2 description {Build wireshark with a gtk3 GUI} {
     configure.args-replace  -DBUILD_wireshark_gtk=OFF -DBUILD_wireshark_gtk=ON
@@ -195 +198 @@
     xinstall -d ${destroot}${prefix}/include/wireshark/epan/dissectors/
     xinstall -d ${destroot}${prefix}/include/wireshark/epan/ftypes/
     xinstall -d ${destroot}${prefix}/include/wireshark/wiretap/
-    xinstall -m 644 -W ${worksrcpath}/ color.h config.h register.h ${destroot}${prefix}/include/wireshark/
+    xinstall -m 644 -W ${worksrcpath}/ config.h register.h ${destroot}${prefix}/include/wireshark/
     xinstall -m 644 {*}[glob ${worksrcpath}/epan/*.h] ${destroot}${prefix}/include/wireshark/epan/
     xinstall -m 644 {*}[glob ${worksrcpath}/epan/crypt/*.h] ${destroot}${prefix}/include/wireshark/epan/crypt/
     xinstall -m 644 {*}[glob ${worksrcpath}/epan/dfilter/*.h] ${destroot}${prefix}/include/wireshark/epan/dfilter/