[112219] trunk/dports/net/wireshark

[ricci at macports.org]

Revision: 112219
          https://trac.macports.org/changeset/112219
Author:   ricci at macports.org
Date:     2013-10-15 10:02:44 -0700 (Tue, 15 Oct 2013)
Log Message:
-----------
wireshark:
  upgrade to 1.10.2
  add patch to fix compilation error as suggested in #40620

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

Added Paths:
-----------
    trunk/dports/net/wireshark/files/patch-epan-dissectors-packet-gluster.h.diff

Modified: trunk/dports/net/wireshark/Portfile
===================================================================
--- trunk/dports/net/wireshark/Portfile	2013-10-15 13:45:20 UTC (rev 112218)
+++ trunk/dports/net/wireshark/Portfile	2013-10-15 17:02:44 UTC (rev 112219)
@@ -2,8 +2,8 @@
 
 PortSystem 1.0
 name		wireshark
-version		1.10.0
-revision	1
+version		1.10.2
+revision	0
 categories	net
 license		{GPL-2 GPL-3}
 maintainers	darkart.com:opendarwin.org
@@ -19,15 +19,16 @@
 master_sites	http://www.wireshark.org/download/src/			\
 		http://www.wireshark.org/download/src/all-versions/
 
-checksums           md5     72e51cd33fd33c7044a41c2ab51ad7af \
-                    sha1    c78a5d5e589edc8ebc702eb00a284ccbca7721bc \
-                    rmd160  924e8d94275c1512b9624d009d69fefa8626b5b2
+checksums           md5     cd7fedd0a67df5ad4905fd356efdc1e8 \
+                    sha1    1f8f877f17dea23e1cf2bafeef0f71323df43521 \
+                    rmd160  675d1fb55d5b40432deb3187f5e87036f377e5df
 
 use_bzip2	yes
 
 conflicts	wireshark-devel
 
-patchfiles	patch-configure.diff
+patchfiles	patch-configure.diff \
+			patch-epan-dissectors-packet-gluster.h.diff
 
 depends_build 		\
 		port:pkgconfig

Added: trunk/dports/net/wireshark/files/patch-epan-dissectors-packet-gluster.h.diff
===================================================================
--- trunk/dports/net/wireshark/files/patch-epan-dissectors-packet-gluster.h.diff	                        (rev 0)
+++ trunk/dports/net/wireshark/files/patch-epan-dissectors-packet-gluster.h.diff	2013-10-15 17:02:44 UTC (rev 112219)
@@ -0,0 +1,33 @@
+--- epan/dissectors/packet-gluster.h.orig	2013-04-22 11:05:17.000000000 -0700
++++ epan/dissectors/packet-gluster.h	2013-10-15 09:22:03.000000000 -0700
+@@ -355,17 +355,19 @@
+ };
+ 
+ /* dir-entry types from libglusterfs/src/compat.h */
+-enum gluster_entry_types {
+-	DT_UNKNOWN = 0,
+-	DT_FIFO = 1,
+-	DT_CHR = 2,
+-	DT_DIR = 4,
+-	DT_BLK = 6,
+-	DT_REG = 8,
+-	DT_LNK = 10,
+-	DT_SOCK = 12,
+-	DT_WHT = 14
+-};
++/*
++ * enum gluster_entry_types {
++ * 	DT_UNKNOWN = 0,
++ * 	DT_FIFO = 1,
++ * 	DT_CHR = 2,
++ * 	DT_DIR = 4,
++ * 	DT_BLK = 6,
++ * 	DT_REG = 8,
++ * 	DT_LNK = 10,
++ * 	DT_SOCK = 12,
++ * 	DT_WHT = 14
++ * };
++ */
+ 
+ 
+ /* LOCKING operators come from libglusterfs/src/glusterfs.h */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131015/fa4174c8/attachment.html>