4 files changed, 15 insertions, 32 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 6c3575ad8ef3..03d505f4f769 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	wireshark
-PORTVERSION=	1.4.7
-PORTREVISION=	1
+PORTVERSION=	1.6.0
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.wireshark.org/download/src/ \
     		http://wireshark.osmirror.nl/download/src/ \
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index 29aff631af4a..7d8d0652a7d5 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,2 +1,2 @@
-SHA256 (wireshark-1.4.7.tar.bz2) = 6671a185d3cd5222a04b6c425d2ef70b84e50ebf50ace9738ae772e87bf492c1
-SIZE (wireshark-1.4.7.tar.bz2) = 20515206
+SHA256 (wireshark-1.6.0.tar.bz2) = 63a5fb15c4cf43495553a0568ecbab69ea94e4d189a75bc1297f6d090a92cdf7
+SIZE (wireshark-1.6.0.tar.bz2) = 21820220
diff --git a/net/wireshark/files/patch-configure b/net/wireshark/files/patch-configure
index c7eca24bc610..38269b3e5cb9 100644
--- a/net/wireshark/files/patch-configure
+++ b/net/wireshark/files/patch-configure
@@ -1,23 +1,5 @@
 --- configure.orig	2010-08-29 18:20:30.000000000 -0400
 +++ configure	2010-09-04 17:19:07.000000000 -0400
-@@ -18072,7 +18072,7 @@ $as_echo_n "checking whether we should t
- # Check whether --enable-warnings-as-errors was given.
- if test "${enable_warnings_as_errors+set}" = set; then :
-   enableval=$enable_warnings_as_errors;
--  if test "x$GCC" = "xyes" -a "x$enableval" == "xyes" -a "x$wireshark_extra_gcc_flags" != "xyes"; then
-+  if test "x$GCC" = "xyes" -a "x$enableval" = "xyes" -a "x$wireshark_extra_gcc_flags" != "xyes"; then
-     with_warnings_as_errors="yes"
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-@@ -19660,7 +19660,7 @@ fi
- 
- 	fi
- 
--	if test x$have_ige_mac == x
-+	if test x$have_ige_mac = x
- 	then
- 		#
- 		# Not found - check for the old integration functions in
 @@ -22487,7 +22487,7 @@ $as_echo "yes" >&6; }
  	  #
  	  CFLAGS="$CFLAGS -I$krb5_dir/include"
diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist
index 1c9f1648d7d1..8a7fd35f7823 100644
--- a/net/wireshark/pkg-plist
+++ b/net/wireshark/pkg-plist
@@ -11,13 +11,13 @@ bin/tshark
 %%TEXT2PCAP%%
 lib/libwireshark.la
 lib/libwireshark.so
-lib/libwireshark.so.0
+lib/libwireshark.so.1
 lib/libwiretap.la
 lib/libwiretap.so
-lib/libwiretap.so.0
+lib/libwiretap.so.1
 lib/libwsutil.la
 lib/libwsutil.so
-lib/libwsutil.so.0
+lib/libwsutil.so.1
 lib/wireshark/plugins/%%PORTVERSION%%/asn1.la
 lib/wireshark/plugins/%%PORTVERSION%%/asn1.so
 lib/wireshark/plugins/%%PORTVERSION%%/coseventcomm.la
@@ -96,13 +96,6 @@ lib/wireshark/plugins/%%PORTVERSION%%/wimaxasncp.so
 %%DATADIR%%/dtds/xcap-error.dtd
 %%DATADIR%%/editcap.html
 %%LUA%%%%DATADIR%%/init.lua
-%%DATADIR%%/services
-%%DATADIR%%/smi_modules
-%%DATADIR%%/tpncp/tpncp.dat
-%%DATADIR%%/wimaxasncp/dictionary.dtd
-%%DATADIR%%/wimaxasncp/dictionary.xml
-%%DATADIR%%/wireshark-filter.html
-%%DATADIR%%/wireshark.html
 %%DATADIR%%/help/capture_filters.txt
 %%DATADIR%%/help/capturing.txt
 %%DATADIR%%/help/display_filters.txt
@@ -114,6 +107,7 @@ lib/wireshark/plugins/%%PORTVERSION%%/wimaxasncp.so
 %%DATADIR%%/ipmap.html
 %%DATADIR%%/manuf
 %%DATADIR%%/mergecap.html
+%%DATADIR%%/pdml2html.xsl
 %%DATADIR%%/radius/README.radius_dictionary
 %%DATADIR%%/radius/dictionary
 %%DATADIR%%/radius/dictionary.3com
@@ -149,6 +143,7 @@ lib/wireshark/plugins/%%PORTVERSION%%/wimaxasncp.so
 %%DATADIR%%/radius/dictionary.cosine
 %%DATADIR%%/radius/dictionary.dhcp
 %%DATADIR%%/radius/dictionary.digium
+%%DATADIR%%/radius/dictionary.eltex
 %%DATADIR%%/radius/dictionary.epygi
 %%DATADIR%%/radius/dictionary.ericsson
 %%DATADIR%%/radius/dictionary.erx
@@ -245,8 +240,15 @@ lib/wireshark/plugins/%%PORTVERSION%%/wimaxasncp.so
 %%DATADIR%%/radius/dictionary.zyxel
 %%DATADIR%%/randpkt.html
 %%DATADIR%%/rawshark.html
+%%DATADIR%%/services
+%%DATADIR%%/smi_modules
 %%DATADIR%%/tshark.html
 %%DATADIR%%/text2pcap.html
+%%DATADIR%%/tpncp/tpncp.dat
+%%DATADIR%%/wimaxasncp/dictionary.dtd
+%%DATADIR%%/wimaxasncp/dictionary.xml
+%%DATADIR%%/wireshark-filter.html
+%%DATADIR%%/wireshark.html
 %%DATADIR%%/ws.css
 @dirrm lib/wireshark/plugins/%%PORTVERSION%%
 @dirrm lib/wireshark/plugins