10 files changed, 36 insertions, 96 deletions

diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index e747068fbf77..22a0579df657 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -6,21 +6,18 @@
 #
 
 PORTNAME=	ethereal
-PORTVERSION=	0.10.12
+PORTVERSION=	0.10.13
 CATEGORIES=	net ipv6
-MASTER_SITES=	ftp://ftp.ethereal.com/pub/ethereal/all-versions/ \
-		ftp://gd.tuwien.ac.at/infosys/security/ethereal/all-versions/ \
-		ftp://ftp.sunet.se/pub/network/monitoring/ethereal/all-versions/ \
-		ftp://ftp.mirrors.wiretapped.net/pub/security/packet-capture/ethereal/all-versions/ \
-		http://www.mirrors.wiretapped.net/pub/security/packet-capture/ethereal/all-versions/
-
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		ftp://ftp.ethereal.com/pub/ethereal/all-versions/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT?=	A powerful network analyzer/capture tool
 
 USE_PERL5_BUILD=yes
 USE_PYTHON_BUILD=yes
 USE_ICONV=	yes
-USE_BZIP2=	yes
+#USE_BZIP2=	yes
 USE_GNOME=	gnometarget
 WANT_GNOME=	yes
 CONFIGURE_ARGS+=	--program-transform-name=""
@@ -79,6 +76,10 @@ CONFIGURE_ARGS+=	--enable-ipv6=yes
 CONFIGURE_ARGS+=	--enable-ipv6=no
 .endif
 
+.if ${OSVERSION} < 600000
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-capture_loop.c
+.endif
+
 .if exists(/usr/include/openssl/crypto.h)
 CONFIGURE_ARGS+=	--with-ssl=/usr
 .endif
diff --git a/net/ethereal/distinfo b/net/ethereal/distinfo
index 8c86d3c78784..e1df3eeb4f0e 100644
--- a/net/ethereal/distinfo
+++ b/net/ethereal/distinfo
@@ -1,2 +1,2 @@
-MD5 (ethereal-0.10.12.tar.bz2) = 372b60e6eca14b7e1cf3e789207027f7
-SIZE (ethereal-0.10.12.tar.bz2) = 7749174
+MD5 (ethereal-0.10.13.tar.gz) = cae316aea6bb7113382adb3526fab899
+SIZE (ethereal-0.10.13.tar.gz) = 10115596
diff --git a/net/ethereal/files/patch-capture_loop.c b/net/ethereal/files/extra-patch-capture_loop.c
index 55b53f795033..55b53f795033 100644
--- a/net/ethereal/files/patch-capture_loop.c
+++ b/net/ethereal/files/extra-patch-capture_loop.c
diff --git a/net/ethereal/files/patch-epan_radius_dict.l b/net/ethereal/files/patch-epan_radius_dict.l
deleted file mode 100644
index 73a6919f632b..000000000000
--- a/net/ethereal/files/patch-epan_radius_dict.l
+++ /dev/null
@@ -1,36 +0,0 @@
---- epan/radius_dict.l.orig	Wed Jul 27 14:45:25 2005
-+++ epan/radius_dict.l	Wed Jul 27 14:46:35 2005
-@@ -65,7 +65,7 @@
- 	static gchar* attr_vendor = NULL;
- 	static gchar* vendor_name = NULL;
- 	static gchar* value_repr = NULL;
--	static gboolean encrypt = FALSE;
-+	static gboolean rad_encrypt = FALSE;
- 	static gboolean has_tag = FALSE;
- 	static gchar* current_vendor = NULL;
- 	
-@@ -97,7 +97,7 @@
- <VENDOR_W_NAME>[0-9]+   { add_vendor(vendor_name,strtol(yytext,NULL,10)); BEGIN OUT; }
- <VENDOR_W_NAME>0x[0-9a-f]+   { add_vendor(vendor_name,strtol(yytext,NULL,16)); BEGIN OUT; }
- 
--<ATTR>[0-9a-z_-]+					{ attr_name = g_strdup(yytext); encrypt = FALSE; has_tag = FALSE; BEGIN ATTR_W_NAME; }
-+<ATTR>[0-9a-z_-]+					{ attr_name = g_strdup(yytext); rad_encrypt = FALSE; has_tag = FALSE; BEGIN ATTR_W_NAME; }
- <ATTR_W_NAME>[0-9]+					{ attr_id = g_strdup(yytext);  BEGIN ATTR_W_ID;}
- <ATTR_W_NAME>0x[0-9a-f]+			{ attr_id = g_strdup_printf("%u",(int)strtoul(yytext,NULL,16)); BEGIN ATTR_W_ID;}
- <ATTR_W_ID>integer					{ attr_type = radius_integer;  BEGIN ATTR_W_TYPE; }
-@@ -109,11 +109,11 @@
- <ATTR_W_ID>ifid						{ attr_type = radius_ifid;  BEGIN ATTR_W_TYPE; }
- <ATTR_W_ID>[0-9a-z_-]+				{ attr_type = radius_octets;  BEGIN ATTR_W_TYPE; }
- <ATTR_W_TYPE>has_tag[,]?			{ has_tag = TRUE; attr_vendor = NULL;  BEGIN ATTR_W_VENDOR; }
--<ATTR_W_TYPE>encrypt=1[,]?			{ encrypt=TRUE;  attr_vendor = NULL;  BEGIN ATTR_W_VENDOR; }
-+<ATTR_W_TYPE>rad_encrypt=1[,]?			{ rad_encrypt=TRUE;  attr_vendor = NULL;  BEGIN ATTR_W_VENDOR; }
- <ATTR_W_TYPE>[,0-9a-z_-]+=([^\n]+)	{ /* ignore other parameters */  attr_vendor = NULL;  BEGIN ATTR_W_VENDOR; }
--<ATTR_W_TYPE>[0-9a-z_-]+			{ attr_vendor = g_strdup(yytext);  add_attribute(attr_name,attr_id,attr_type,attr_vendor,encrypt,has_tag); attr_vendor = NULL;  BEGIN OUT; }
--<ATTR_W_TYPE>\n						{ add_attribute(attr_name,attr_id,attr_type,current_vendor ? g_strdup(current_vendor) : NULL ,encrypt,has_tag); linenums[include_stack_ptr]++;  BEGIN OUT; }
--<ATTR_W_VENDOR>\n					{ add_attribute(attr_name,attr_id,attr_type,attr_vendor,encrypt,has_tag); linenums[include_stack_ptr]++; BEGIN OUT; };
-+<ATTR_W_TYPE>[0-9a-z_-]+			{ attr_vendor = g_strdup(yytext);  add_attribute(attr_name,attr_id,attr_type,attr_vendor,rad_encrypt,has_tag); attr_vendor = NULL;  BEGIN OUT; }
-+<ATTR_W_TYPE>\n						{ add_attribute(attr_name,attr_id,attr_type,current_vendor ? g_strdup(current_vendor) : NULL ,rad_encrypt,has_tag); linenums[include_stack_ptr]++;  BEGIN OUT; }
-+<ATTR_W_VENDOR>\n					{ add_attribute(attr_name,attr_id,attr_type,attr_vendor,rad_encrypt,has_tag); linenums[include_stack_ptr]++; BEGIN OUT; };
- 
- <VALUE>[0-9a-z-]+					{ attr_name = g_strdup(yytext); BEGIN VALUE_W_ATTR; }
- <VALUE_W_ATTR>[^[:blank:]]+			{ value_repr = g_strdup(yytext); BEGIN VALUE_W_NAME; }
diff --git a/net/ethereal/pkg-plist b/net/ethereal/pkg-plist
index 98cd564f9c95..19843cb8192a 100644
--- a/net/ethereal/pkg-plist
+++ b/net/ethereal/pkg-plist
@@ -33,7 +33,6 @@ lib/ethereal/plugins/%%PORTVERSION%%/rudp.so
 lib/ethereal/plugins/%%PORTVERSION%%/stats_tree.so
 lib/ethereal/plugins/%%PORTVERSION%%/tango.so
 lib/ethereal/plugins/%%PORTVERSION%%/v5ua.so
-lib/ethereal/plugins/%%PORTVERSION%%/xml.so
 lib/libethereal.a
 lib/libethereal.so
 lib/libethereal.so.0
@@ -51,6 +50,10 @@ lib/libwiretap.so.0
 %%DATADIR%%/diameter/mobileipv4.xml
 %%DATADIR%%/diameter/nasreq.xml
 %%DATADIR%%/diameter/sunping.xml
+%%DATADIR%%/dtds/dc.dtd
+%%DATADIR%%/dtds/itunes.dtd
+%%DATADIR%%/dtds/rss.dtd
+%%DATADIR%%/dtds/smil.dtd
 %%DATADIR%%/editcap.html
 %%DATADIR%%/ethereal-filter.html
 %%DATADIR%%/ethereal.html
@@ -87,6 +90,7 @@ lib/libwiretap.so.0
 %%DATADIR%%/radius/dictionary.columbia_university
 %%DATADIR%%/radius/dictionary.compat
 %%DATADIR%%/radius/dictionary.cosine
+%%DATADIR%%/radius/dictionary.ericsson
 %%DATADIR%%/radius/dictionary.erx
 %%DATADIR%%/radius/dictionary.extreme
 %%DATADIR%%/radius/dictionary.foundry
@@ -131,6 +135,7 @@ lib/libwiretap.so.0
 @dirrm lib/ethereal/plugins
 @dirrm lib/ethereal
 @dirrm %%DATADIR%%/radius
-@dirrm %%DATADIR%%/diameter
 @dirrm %%DATADIR%%/help
+@dirrm %%DATADIR%%/dtds
+@dirrm %%DATADIR%%/diameter
 @dirrm %%DATADIR%%
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index e747068fbf77..22a0579df657 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -6,21 +6,18 @@
 #
 
 PORTNAME=	ethereal
-PORTVERSION=	0.10.12
+PORTVERSION=	0.10.13
 CATEGORIES=	net ipv6
-MASTER_SITES=	ftp://ftp.ethereal.com/pub/ethereal/all-versions/ \
-		ftp://gd.tuwien.ac.at/infosys/security/ethereal/all-versions/ \
-		ftp://ftp.sunet.se/pub/network/monitoring/ethereal/all-versions/ \
-		ftp://ftp.mirrors.wiretapped.net/pub/security/packet-capture/ethereal/all-versions/ \
-		http://www.mirrors.wiretapped.net/pub/security/packet-capture/ethereal/all-versions/
-
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		ftp://ftp.ethereal.com/pub/ethereal/all-versions/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT?=	A powerful network analyzer/capture tool
 
 USE_PERL5_BUILD=yes
 USE_PYTHON_BUILD=yes
 USE_ICONV=	yes
-USE_BZIP2=	yes
+#USE_BZIP2=	yes
 USE_GNOME=	gnometarget
 WANT_GNOME=	yes
 CONFIGURE_ARGS+=	--program-transform-name=""
@@ -79,6 +76,10 @@ CONFIGURE_ARGS+=	--enable-ipv6=yes
 CONFIGURE_ARGS+=	--enable-ipv6=no
 .endif
 
+.if ${OSVERSION} < 600000
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-capture_loop.c
+.endif
+
 .if exists(/usr/include/openssl/crypto.h)
 CONFIGURE_ARGS+=	--with-ssl=/usr
 .endif
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index 8c86d3c78784..e1df3eeb4f0e 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,2 +1,2 @@
-MD5 (ethereal-0.10.12.tar.bz2) = 372b60e6eca14b7e1cf3e789207027f7
-SIZE (ethereal-0.10.12.tar.bz2) = 7749174
+MD5 (ethereal-0.10.13.tar.gz) = cae316aea6bb7113382adb3526fab899
+SIZE (ethereal-0.10.13.tar.gz) = 10115596
diff --git a/net/wireshark/files/patch-capture_loop.c b/net/wireshark/files/extra-patch-capture_loop.c
index 55b53f795033..55b53f795033 100644
--- a/net/wireshark/files/patch-capture_loop.c
+++ b/net/wireshark/files/extra-patch-capture_loop.c
diff --git a/net/wireshark/files/patch-epan_radius_dict.l b/net/wireshark/files/patch-epan_radius_dict.l
deleted file mode 100644
index 73a6919f632b..000000000000
--- a/net/wireshark/files/patch-epan_radius_dict.l
+++ /dev/null
@@ -1,36 +0,0 @@
---- epan/radius_dict.l.orig	Wed Jul 27 14:45:25 2005
-+++ epan/radius_dict.l	Wed Jul 27 14:46:35 2005
-@@ -65,7 +65,7 @@
- 	static gchar* attr_vendor = NULL;
- 	static gchar* vendor_name = NULL;
- 	static gchar* value_repr = NULL;
--	static gboolean encrypt = FALSE;
-+	static gboolean rad_encrypt = FALSE;
- 	static gboolean has_tag = FALSE;
- 	static gchar* current_vendor = NULL;
- 	
-@@ -97,7 +97,7 @@
- <VENDOR_W_NAME>[0-9]+   { add_vendor(vendor_name,strtol(yytext,NULL,10)); BEGIN OUT; }
- <VENDOR_W_NAME>0x[0-9a-f]+   { add_vendor(vendor_name,strtol(yytext,NULL,16)); BEGIN OUT; }
- 
--<ATTR>[0-9a-z_-]+					{ attr_name = g_strdup(yytext); encrypt = FALSE; has_tag = FALSE; BEGIN ATTR_W_NAME; }
-+<ATTR>[0-9a-z_-]+					{ attr_name = g_strdup(yytext); rad_encrypt = FALSE; has_tag = FALSE; BEGIN ATTR_W_NAME; }
- <ATTR_W_NAME>[0-9]+					{ attr_id = g_strdup(yytext);  BEGIN ATTR_W_ID;}
- <ATTR_W_NAME>0x[0-9a-f]+			{ attr_id = g_strdup_printf("%u",(int)strtoul(yytext,NULL,16)); BEGIN ATTR_W_ID;}
- <ATTR_W_ID>integer					{ attr_type = radius_integer;  BEGIN ATTR_W_TYPE; }
-@@ -109,11 +109,11 @@
- <ATTR_W_ID>ifid						{ attr_type = radius_ifid;  BEGIN ATTR_W_TYPE; }
- <ATTR_W_ID>[0-9a-z_-]+				{ attr_type = radius_octets;  BEGIN ATTR_W_TYPE; }
- <ATTR_W_TYPE>has_tag[,]?			{ has_tag = TRUE; attr_vendor = NULL;  BEGIN ATTR_W_VENDOR; }
--<ATTR_W_TYPE>encrypt=1[,]?			{ encrypt=TRUE;  attr_vendor = NULL;  BEGIN ATTR_W_VENDOR; }
-+<ATTR_W_TYPE>rad_encrypt=1[,]?			{ rad_encrypt=TRUE;  attr_vendor = NULL;  BEGIN ATTR_W_VENDOR; }
- <ATTR_W_TYPE>[,0-9a-z_-]+=([^\n]+)	{ /* ignore other parameters */  attr_vendor = NULL;  BEGIN ATTR_W_VENDOR; }
--<ATTR_W_TYPE>[0-9a-z_-]+			{ attr_vendor = g_strdup(yytext);  add_attribute(attr_name,attr_id,attr_type,attr_vendor,encrypt,has_tag); attr_vendor = NULL;  BEGIN OUT; }
--<ATTR_W_TYPE>\n						{ add_attribute(attr_name,attr_id,attr_type,current_vendor ? g_strdup(current_vendor) : NULL ,encrypt,has_tag); linenums[include_stack_ptr]++;  BEGIN OUT; }
--<ATTR_W_VENDOR>\n					{ add_attribute(attr_name,attr_id,attr_type,attr_vendor,encrypt,has_tag); linenums[include_stack_ptr]++; BEGIN OUT; };
-+<ATTR_W_TYPE>[0-9a-z_-]+			{ attr_vendor = g_strdup(yytext);  add_attribute(attr_name,attr_id,attr_type,attr_vendor,rad_encrypt,has_tag); attr_vendor = NULL;  BEGIN OUT; }
-+<ATTR_W_TYPE>\n						{ add_attribute(attr_name,attr_id,attr_type,current_vendor ? g_strdup(current_vendor) : NULL ,rad_encrypt,has_tag); linenums[include_stack_ptr]++;  BEGIN OUT; }
-+<ATTR_W_VENDOR>\n					{ add_attribute(attr_name,attr_id,attr_type,attr_vendor,rad_encrypt,has_tag); linenums[include_stack_ptr]++; BEGIN OUT; };
- 
- <VALUE>[0-9a-z-]+					{ attr_name = g_strdup(yytext); BEGIN VALUE_W_ATTR; }
- <VALUE_W_ATTR>[^[:blank:]]+			{ value_repr = g_strdup(yytext); BEGIN VALUE_W_NAME; }
diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist
index 98cd564f9c95..19843cb8192a 100644
--- a/net/wireshark/pkg-plist
+++ b/net/wireshark/pkg-plist
@@ -33,7 +33,6 @@ lib/ethereal/plugins/%%PORTVERSION%%/rudp.so
 lib/ethereal/plugins/%%PORTVERSION%%/stats_tree.so
 lib/ethereal/plugins/%%PORTVERSION%%/tango.so
 lib/ethereal/plugins/%%PORTVERSION%%/v5ua.so
-lib/ethereal/plugins/%%PORTVERSION%%/xml.so
 lib/libethereal.a
 lib/libethereal.so
 lib/libethereal.so.0
@@ -51,6 +50,10 @@ lib/libwiretap.so.0
 %%DATADIR%%/diameter/mobileipv4.xml
 %%DATADIR%%/diameter/nasreq.xml
 %%DATADIR%%/diameter/sunping.xml
+%%DATADIR%%/dtds/dc.dtd
+%%DATADIR%%/dtds/itunes.dtd
+%%DATADIR%%/dtds/rss.dtd
+%%DATADIR%%/dtds/smil.dtd
 %%DATADIR%%/editcap.html
 %%DATADIR%%/ethereal-filter.html
 %%DATADIR%%/ethereal.html
@@ -87,6 +90,7 @@ lib/libwiretap.so.0
 %%DATADIR%%/radius/dictionary.columbia_university
 %%DATADIR%%/radius/dictionary.compat
 %%DATADIR%%/radius/dictionary.cosine
+%%DATADIR%%/radius/dictionary.ericsson
 %%DATADIR%%/radius/dictionary.erx
 %%DATADIR%%/radius/dictionary.extreme
 %%DATADIR%%/radius/dictionary.foundry
@@ -131,6 +135,7 @@ lib/libwiretap.so.0
 @dirrm lib/ethereal/plugins
 @dirrm lib/ethereal
 @dirrm %%DATADIR%%/radius
-@dirrm %%DATADIR%%/diameter
 @dirrm %%DATADIR%%/help
+@dirrm %%DATADIR%%/dtds
+@dirrm %%DATADIR%%/diameter
 @dirrm %%DATADIR%%