wireshark24: Use qt5 PG to set dependencies

macports · Apr 21, 2019 · 87033a166468296da058c2cc92de666b53ac1451 · 87033a1
1 parent 52d63c0
commit 87033a166468296da058c2cc92de666b53ac1451
Unified Split

Showing with 22 additions and 21 deletions.

+22 −21 net/wireshark24/Portfile
diff --git a/net/wireshark24/Portfile b/net/wireshark24/Portfile
@@ -5,7 +5,7 @@ PortGroup           cmake 1.0
 
 name                wireshark24
 version             2.4.14
-revision            0
+revision            1
 categories          net
 license             {GPL-2 GPL-3}
 maintainers         darkart.com:opendarwin.org
@@ -62,26 +62,7 @@ configure.args-append \
                     -DENABLE_ZLIB=OFF \
                     -DBUILD_wireshark=OFF
 
-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
-    depends_lib-append      port:qt5-qtmacextras port:qt5-qtmultimedia port:qt5-qtsvg port:qt5-qttranslations
-
-    # 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
-    }
-}
+variant qt5 conflicts no_gui description {Build wireshark with a qt5 GUI} { }
 
 variant no_gui conflicts qt5 description {do not build the wireshark GUI} {
     ## initial settings (above) handle this
@@ -144,6 +125,26 @@ 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/