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

[ricci at macports.org]

Revision: 127426
          https://trac.macports.org/changeset/127426
Author:   ricci at macports.org
Date:     2014-10-27 21:24:51 -0700 (Mon, 27 Oct 2014)
Log Message:
-----------
wireshark:
	revert to using gtk2 by default as some were seeing issues with various icons, see #45647
	add gtk3 support as a variant

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

Modified: trunk/dports/net/wireshark/Portfile
===================================================================
--- trunk/dports/net/wireshark/Portfile	2014-10-28 02:28:34 UTC (rev 127425)
+++ trunk/dports/net/wireshark/Portfile	2014-10-28 04:24:51 UTC (rev 127426)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name		wireshark
 version		1.12.1
-revision	0
+revision	1
 categories	net
 license		{GPL-2 GPL-3}
 maintainers	darkart.com:opendarwin.org
@@ -64,7 +64,7 @@
 
 default_variants +adns +gnutls +libgcrypt +ipv6 +lua +libsmi +geoip +rtp +ssl
 
-if {![variant_isset qt]} {
+if {![variant_isset qt] && ![variant_isset gtk3]} {
 	default_variants	+x11
 }
 
@@ -162,7 +162,7 @@
 ## 	configure.args-append	--without-python
 ## }
 
-variant qt description {use qt for the GUI} conflicts x11	{
+variant qt description {use qt for the GUI} conflicts x11 gtk3	{
 ## 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
@@ -183,7 +183,15 @@
 }
 
 ## variant x11 conflicts qt	{
-variant x11 description {use X11 (gtk3) for GUI} conflicts qt	{
+variant x11 description {use X11 (gtk2) for GUI} conflicts qt gtk3	{
+	depends_lib-append		port:gtk2
+	configure.args-delete	--disable-wireshark
+	configure.args-append	--with-qt=no
+	configure.args-append	--with-gtk2=yes
+	configure.args-append	--with-gtk3=no
+}
+
+variant gtk3 description {use X11 (gtk3) for GUI} conflicts qt x11	{
 	depends_lib-append		port:gtk3
 	configure.args-delete	--disable-wireshark
 	configure.args-append	--with-qt=no
@@ -194,3 +202,7 @@
 
 #
 ##EOF
+
+
+#
+##EOF
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141027/f4e14091/attachment.html>