net/wireshark3: undo non-maintainer changes and replace with work mai…

…ntainer had in progress.

net/wireshark3/Portfile

@@ -61,7 +61,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
@@ -135,17 +149,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 {
-        move ${destroot}/${prefix}/bin/Wireshark.app ${destroot}${applications_dir}/Wireshark.app
-    }
-}
-
 ## 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] && \