[125488] trunk/dports/net/wireshark/Portfile

[ricci at macports.org]

Revision: 125488
          https://trac.macports.org/changeset/125488
Author:   ricci at macports.org
Date:     2014-09-18 13:21:16 -0700 (Thu, 18 Sep 2014)
Log Message:
-----------
wireshark:
	upgrade to 1.12.1 (resolves #44907)
	add qt variant

Modified Paths:
--------------
    trunk/dports/net/wireshark/Portfile

Modified: trunk/dports/net/wireshark/Portfile
===================================================================
--- trunk/dports/net/wireshark/Portfile	2014-09-18 18:56:36 UTC (rev 125487)
+++ trunk/dports/net/wireshark/Portfile	2014-09-18 20:21:16 UTC (rev 125488)
@@ -2,7 +2,7 @@
 
 PortSystem 1.0
 name		wireshark
-version		1.10.8
+version		1.12.1
 revision	0
 categories	net
 license		{GPL-2 GPL-3}
@@ -19,9 +19,9 @@
 master_sites	http://www.wireshark.org/download/src/			\
 		http://www.wireshark.org/download/src/all-versions/
 
-checksums           md5     510dc3b063785549b41ebc748ac21055 \
-                    sha1    aa6067ce91637506504c8b954caf75ac98742152 \
-                    rmd160  5c2aab7477ab2f9b5f966fe5f973ff5619c242f9
+checksums           md5     14b3e3d8979d1eb27ff085bb5f400e67 \
+                    sha1    e1508ea25ccf077c5a7fa2af3b88f3ae199f77fb \
+                    rmd160  4ea802ca677dedf6fcff75a74e32c5f5289c0aed
 
 use_bzip2	yes
 
@@ -62,8 +62,11 @@
 
 configure.ldflags-append "-Wl,-search_paths_first"
 
-default_variants +adns +gnutls +libgcrypt +ipv6 +lua +libsmi +geoip +rtp +ssl +x11
+default_variants +adns +gnutls +libgcrypt +ipv6 +lua +libsmi +geoip +rtp +ssl
 
+if {![variant_isset qt]} {
+	default_variants	+x11
+}
 
 ## 1.10.0 doesn't include python options in configure
 ## if {[variant_isset no_python]} {
@@ -159,6 +162,15 @@
 ## 	configure.args-append	--without-python
 ## }
 
+variant qt description {use qt for the GUI} conflicts x11	{
+## qt 5.3.1 doesn't work at this point, wireshark needs to be adjusted for Qt 5.
+##	depends_lib-append		port:qt5-mac
+	depends_lib-append		port:qt4-mac
+	configure.args-delete	--disable-wireshark
+	configure.args-append	--with-qt=yes
+	configure.args-append	--with-gtk2=no
+	configure.args-append	--with-gtk3=no
+}
 variant rtp description {add rtp support} {
 	configure.args-delete   --without-portaudio
 	configure.args-append   --with-portaudio=${prefix}
@@ -170,9 +182,13 @@
 	depends_lib-append		port:openssl
 }
 
-variant x11	{
-	depends_lib-append		port:gtk2
+## variant x11 conflicts qt	{
+variant x11 description {use X11 (gtk3) for GUI} conflicts qt	{
+	depends_lib-append		port:gtk3
 	configure.args-delete	--disable-wireshark
+	configure.args-append	--with-qt=no
+	configure.args-append	--with-gtk2=no
+	configure.args-append	--with-gtk3=yes
 }
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140918/ce7326e2/attachment.html>