author: Joe Marcus Clarke <marcus@FreeBSD.org> 2006-07-18 05:03:53 +0000
committer: Joe Marcus Clarke <marcus@FreeBSD.org> 2006-07-18 05:03:53 +0000
commit: a69db4b2a0cc19923f24ac9b55d645cf1db6d8da (patch)
tree: 98a19e9c31aaa1c2bdbd027c050a89254d4bc9a6
parent: d50c601e45debeee371b18341da87d51ac8a74b5 (diff)
21 files changed, 112 insertions, 990 deletions
diff --git a/net/Makefile b/net/Makefile
index 7eb24155c562..35b86b5c439c 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -116,8 +116,6 @@
     SUBDIR += entitymib
     SUBDIR += erlang_xmlrpc
     SUBDIR += etherboot
-    SUBDIR += ethereal
-    SUBDIR += ethereal-lite
     SUBDIR += etunnel
     SUBDIR += findmtu
     SUBDIR += flowgrep
@@ -746,8 +744,6 @@
     SUBDIR += tdetect
     SUBDIR += telnetx
     SUBDIR += telserv
-    SUBDIR += tethereal
-    SUBDIR += tethereal-lite
     SUBDIR += thcrut
     SUBDIR += throttled
     SUBDIR += tightvnc
@@ -767,6 +763,8 @@
     SUBDIR += trickle
     SUBDIR += tridiavnc
     SUBDIR += tsclient
+    SUBDIR += tshark
+    SUBDIR += tshark-lite
     SUBDIR += tsocks
     SUBDIR += tspc2
     SUBDIR += ttlscan
@@ -800,6 +798,8 @@
     SUBDIR += warppipe
     SUBDIR += whois
     SUBDIR += widentd
+    SUBDIR += wireshark
+    SUBDIR += wireshark-lite
     SUBDIR += wistumbler2
     SUBDIR += wmlj
     SUBDIR += wmnd
diff --git a/net/ethereal-lite/Makefile b/net/ethereal-lite/Makefile
deleted file mode 100644
index 2fa4c2fa57be..000000000000
--- a/net/ethereal-lite/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# Ports collection makefile for:   ethereal-lite
-# Date created:        20 March 2004
-# Whom:                Bill Fumerola <billf@mu.org>
-#
-# $FreeBSD$
-#
-
-LITE=		yes
-PORTREVISION?=	3
-PKGNAMESUFFIX=	-lite
-
-MASTERDIR=	${.CURDIR}/../ethereal
-COMMENT=        A powerful network analyzer/capture tool (lite package)
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
deleted file mode 100644
index f9f24f214944..000000000000
--- a/net/ethereal/Makefile
+++ /dev/null
@@ -1,124 +0,0 @@
-# New ports collection makefile for:   ethereal
-# Date created:        10 August 1998
-# Whom:                Bill Fumerola <billf@chc-chimes.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ethereal
-PORTVERSION=	0.99.0
-PORTREVISION?=	3
-CATEGORIES=	net ipv6
-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_GCC=	3.4+
-USE_GNOME=	gnometarget
-WANT_GNOME=	yes
-USE_OPENSSL=	yes
-CONFIGURE_ENV=	MIBDIRS="/dev/null"
-CONFIGURE_ARGS+=	--program-transform-name="" \
-			--with-ssl=/usr
-MAKE_ENV=	MIBDIRS="/dev/null"
-INSTALLS_SHLIB=	yes
-
-.for x in capinfos editcap idl2eth mergecap text2pcap
-.if defined(LITE)
-PLIST_SUB+=		${x:U}="@comment $x not installed"
-CONFIGURE_ARGS+=	--enable-$x=no
-.else
-PLIST_SUB+=		${x:U}=bin/$x
-MAN1+=			$x.1
-.endif
-.endfor
-
-.for x in dftest randpkt
-.if defined(LITE)
-PLIST_SUB+=	${x:U}="@comment $x not installed"
-CONFIGURE_ARGS+=	--enable-$x=no
-.else
-PLIST_SUB+=	${x:U}=bin/$x
-.endif
-.endfor
-
-.if !defined(WITHOUT_X11)
-USE_X_PREFIX=	yes
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_X11)
-MAN1+=		ethereal.1
-PLIST_SUB+=	ETHEREAL=bin/ethereal
-.if defined(WITHOUT_GTK2)
-USE_GNOME+=	gtk12
-CONFIGURE_ARGS+=	--disable-gtk2
-.else
-USE_GNOME+=	gtk20
-.endif
-.else
-PLIST_SUB+=	ETHEREAL="@comment ethereal not built"
-USE_GNOME+=	glib12
-CONFIGURE_ARGS+=	--enable-ethereal=no \
-			--disable-gtktest \
-			--with-gtk-prefix=/nonexistent \
-			--disable-gtk2
-.endif
-
-GNU_CONFIGURE=	yes
-LIBTOOLFILES=	configure wiretap/configure
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
-
-.if ${OSVERSION} >= 400014 && !defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=	--enable-ipv6=yes
-.else
-CONFIGURE_ARGS+=	--enable-ipv6=no
-.endif
-
-.if ${OSVERSION} < 504103
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-capture_loop.h
-.endif
-
-# XXX - untested
-.if defined(WITH_THREADS)
-CONFIGURE_ARGS+=	--enable-threads
-.endif
-
-.if !defined(WITHOUT_PCRE) && !defined(LITE)
-LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
-CONFIGURE_ARGS+=	--with-pcre=${LOCALBASE}/lib
-.else
-CONFIGURE_ARGS+=	--with-pcre=no
-.endif
-
-.if !defined(WITHOUT_SNMP) && !defined(LITE)
-LIB_DEPENDS+=	netsnmp.9:${PORTSDIR}/net-mgmt/net-snmp
-CONFIGURE_ARGS+=	--with-net-snmp=${LOCALBASE}/bin/net-snmp-config
-.else
-CONFIGURE_ARGS+=	--enable-snmp=no --with-ucd-snmp=no --with-net-snmp=no
-.endif
-
-.if !defined(WITHOUT_ADNS) && !defined(LITE)
-LIB_DEPENDS+=	adns.1:${PORTSDIR}/dns/adns
-CONFIGURE_ARGS+=	--with-adns=${LOCALBASE}/lib
-.else
-CONFIGURE_ARGS+=	--with-adns=no
-.endif
-
-.if exists(${LOCALBASE}/lib/libgnutls.so) || defined(WITH_GNUTLS)
-LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls
-CONFIGURE_ARGS+=	--with-libgnutls-prefix=${LOCALBASE}
-.endif
-
-MAN1+=	dumpcap.1 tethereal.1
-MAN4+=	ethereal-filter.4
-
-.include <bsd.port.post.mk>
diff --git a/net/ethereal/distinfo b/net/ethereal/distinfo
deleted file mode 100644
index d40b51ecb138..000000000000
--- a/net/ethereal/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (ethereal-0.99.0.tar.gz) = 92490abe23df1b2078579c512c788f9d
-SHA256 (ethereal-0.99.0.tar.gz) = 2aa3030064783c2390d177ba6ad7f784d0c813895197a67f33f5d3e04690635a
-SIZE (ethereal-0.99.0.tar.gz) = 11284145
diff --git a/net/ethereal/files/extra-patch-capture_loop.h b/net/ethereal/files/extra-patch-capture_loop.h
deleted file mode 100644
index 157b80dba806..000000000000
--- a/net/ethereal/files/extra-patch-capture_loop.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- capture_loop.h.orig	Sat Dec 31 01:44:43 2005
-+++ capture_loop.h	Sat Dec 31 01:45:19 2005
-@@ -68,7 +68,7 @@ extern void capture_loop_stop(void);
-  * XXX - the various BSDs appear to define BSD in <sys/param.h>; we don't
-  * want to include it if it's not present on this platform, however.
-  */
--#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && \
-+#if !defined(__NetBSD__) && !defined(__OpenBSD__) && \
-     !defined(__bsdi__) && !defined(__APPLE__) && !defined(_WIN32) && \
-     !defined(__CYGWIN__)
- # define MUST_DO_SELECT
diff --git a/net/ethereal/files/patch-configure b/net/ethereal/files/patch-configure
deleted file mode 100644
index 87b2baa4bdda..000000000000
--- a/net/ethereal/files/patch-configure
+++ /dev/null
@@ -1,81 +0,0 @@
---- configure.orig	Wed May  4 17:32:34 2005
-+++ configure	Sat May  7 21:07:38 2005
-@@ -21806,6 +21806,7 @@
-   else
-     GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
-     GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
-+    GLIB_LIBS="-liconv $GLIB_LIBS"
-     glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
-            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-     glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
-@@ -21816,7 +21817,7 @@
-       ac_save_CFLAGS="$CFLAGS"
-       ac_save_LIBS="$LIBS"
-       CFLAGS="$CFLAGS $GLIB_CFLAGS"
--      LIBS="$GLIB_LIBS $LIBS"
-+      LIBS="$GLIB_LIBS -liconv $LIBS"
-       rm -f conf.glibtest
-       if test "$cross_compiling" = yes; then
-   echo $ac_n "cross compiling; assumed OK... $ac_c"
-@@ -22452,6 +22453,7 @@
-   else
-     GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
-     GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
-+    GLIB_LIBS="-liconv $GLIB_LIBS"
-     glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
-            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-     glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
-@@ -22462,7 +22464,7 @@
-       ac_save_CFLAGS="$CFLAGS"
-       ac_save_LIBS="$LIBS"
-       CFLAGS="$CFLAGS $GLIB_CFLAGS"
--      LIBS="$GLIB_LIBS $LIBS"
-+      LIBS="$GLIB_LIBS -liconv $LIBS"
-       rm -f conf.glibtest
-       if test "$cross_compiling" = yes; then
-   echo $ac_n "cross compiling; assumed OK... $ac_c"
-@@ -22683,7 +22685,7 @@
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GLIB_CFLAGS"
--LIBS="$GLIB_LIBS $LIBS"
-+LIBS="$GLIB_LIBS -liconv $LIBS"
- if test "$cross_compiling" = yes; then
-   echo $ac_n "cross compiling; assumed OK... $ac_c"
-     ac_cv_glib_supports_modules=yes
-@@ -27560,7 +27562,7 @@
- 	  #
- 	  CFLAGS="$CFLAGS -I$krb5_dir/include"
- 	  CPPFLAGS="$CPPFLAGS -I$krb5_dir/include"
--	  ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/'`
-+	  ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | tr "[:lower:]" "[:upper:]" sed 's/^.*heimdal.*$/HEIMDAL/'`
- 	  ac_mit_version=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'`
- 	  ac_krb5_version="$ac_heimdal_version$ac_mit_version"
- 	  if test "x$ac_krb5_version" = "xHEIMDAL"
-@@ -27618,7 +27620,7 @@
- 
- 	  if test -x "$KRB5_CONFIG"
- 	  then
--	    KRB5_FLAGS=`"$KRB5_CONFIG" --cflags`
-+	    KRB5_FLAGS=`"$KRB5_CONFIG" --cflags | sed -e 's/@INCLUDE_des@//g'`
- 	    KRB5_LIBS=`"$KRB5_CONFIG" --libs`
- 	    CFLAGS="$CFLAGS $KRB5_FLAGS"
- 	    CPPFLAGS="$CPPFLAGS $KRB5_FLAGS"
-@@ -29121,7 +29123,7 @@
- 
- 
- ac_save_LIBS="$LIBS"
--LIBS="$GLIB_LIBS $LIBS"
-+LIBS="$GLIB_LIBS -liconv $LIBS"
- G_ASCII_STRTOULL_C=""
- G_ASCII_STRTOULL_O=""
- G_ASCII_STRTOULL_LO=""
-@@ -30094,7 +30096,7 @@
- #
- # The plugin dissectors reside in ./plugins/PROTO/
- #
--PLUGIN_LIBS="-L../../epan -lethereal $GLIB_LIBS"
-+PLUGIN_LIBS="-L../../epan -lethereal -liconv $GLIB_LIBS"
- 
- 
- #
diff --git a/net/ethereal/files/patch-epan_dissectors_packet-diameter.c b/net/ethereal/files/patch-epan_dissectors_packet-diameter.c
deleted file mode 100644
index 4fc63bb0d227..000000000000
--- a/net/ethereal/files/patch-epan_dissectors_packet-diameter.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- epan/dissectors/packet-diameter.c.orig	Thu May 12 03:07:06 2005
-+++ epan/dissectors/packet-diameter.c	Thu May 12 02:54:14 2005
-@@ -2022,13 +2022,13 @@
- 		  { "Flags", "diameter.flags", FT_UINT8, BASE_HEX, NULL, 0x0,
- 		    "", HFILL }},
- 		{ &hf_diameter_flags_request,
--		  { "Request", "diameter.flags.request", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_R,
-+		  { "Request ", "diameter.flags.request", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_R,
- 			"", HFILL }},
- 		{ &hf_diameter_flags_proxyable,
--		  { "Proxyable", "diameter.flags.proxyable", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_P,
-+		  { "Proxyable ", "diameter.flags.proxyable", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_P,
- 			"", HFILL }},
- 		{ &hf_diameter_flags_error,
--		  { "Error","diameter.flags.error", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_E,
-+		  { "Error ","diameter.flags.error", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_E,
- 			"", HFILL }},
- 		{ &hf_diameter_flags_T,
- 		  { "T(Potentially re-transmitted message)","diameter.flags.T", FT_BOOLEAN, 8, TFS(&flags_set_truth),DIAM_FLAGS_T,
diff --git a/net/ethereal/files/patch-epan_dissectors_packet-radiotap.c b/net/ethereal/files/patch-epan_dissectors_packet-radiotap.c
deleted file mode 100644
index f66df6cb6f14..000000000000
--- a/net/ethereal/files/patch-epan_dissectors_packet-radiotap.c
+++ /dev/null
@@ -1,198 +0,0 @@
---- epan/dissectors/packet-radiotap.c.orig	Mon Apr 17 14:46:52 2006
-+++ epan/dissectors/packet-radiotap.c	Fri Apr 28 19:21:24 2006
-@@ -382,7 +382,7 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
-     proto_item *ti = NULL;
-     int offset;
-     guint32 version, pad;
--    guint32 length;
-+    guint length, length_remaining;
-     guint32 rate, freq, flags;
-     gint8 dbm;
-     guint8 db, rflags;
-@@ -416,11 +416,13 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 	ti = proto_tree_add_uint(radiotap_tree, hf_radiotap_length,
- 	    tvb, offset + 2, 2, length);
-     }
-+    length_remaining = length;
-+
-     /*
-      * FIXME: This only works if there is exactly 1 it_present
-      *        field in the header
-      */
--    if (length < sizeof(struct ieee80211_radiotap_header)) {
-+    if (length_remaining < sizeof(struct ieee80211_radiotap_header)) {
- 	/*
- 	 * Radiotap header is shorter than the fixed-length portion
- 	 * plus one "present" bitset.
-@@ -435,7 +437,7 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 	present_tree = proto_item_add_subtree(pt, ett_radiotap_present);
-     }
-     offset += sizeof(struct ieee80211_radiotap_header);
--    length -= sizeof(struct ieee80211_radiotap_header);
-+    length_remaining -= sizeof(struct ieee80211_radiotap_header);
- 
-     rflags = 0;
-     for (; present; present = next_present) {
-@@ -447,7 +449,7 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 
- 	switch (bit) {
- 	case IEEE80211_RADIOTAP_FLAGS:
--	    if (length < 1)
-+	    if (length_remaining < 1)
- 		break;
- 	    rflags = tvb_get_guint8(tvb, offset);
- 	    if (tree) {
-@@ -459,13 +461,12 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 			tvb, 0, 0, (rflags&IEEE80211_RADIOTAP_F_DATAPAD) != 0);
- 	    }
- 	    offset++;
--	    length--;
-+	    length_remaining--;
- 	    /* XXX CFP, WEP, FRAG */
- 	    break;
- 	case IEEE80211_RADIOTAP_RATE:
--	    if (length < 1)
-+	    if (length_remaining < 1)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    rate = tvb_get_guint8(tvb, offset) & 0x7f;
- 	    if (check_col(pinfo->cinfo, COL_TX_RATE)) {
- 		col_add_fstr(pinfo->cinfo, COL_TX_RATE, "%d.%d",
-@@ -477,12 +478,11 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 			"Data Rate: %d.%d Mb/s", rate / 2, rate & 1 ? 5 : 0);
- 	    }
- 	    offset++;
--	    length--;
-+	    length_remaining--;
- 	    break;
- 	case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
--	    if (length < 1)
-+	    if (length_remaining < 1)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    dbm = (gint8) tvb_get_guint8(tvb, offset);
- 	    if (check_col(pinfo->cinfo, COL_RSSI)) {
- 		col_add_fstr(pinfo->cinfo, COL_RSSI, "%d dBm", dbm);
-@@ -494,12 +494,11 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 					  "SSI Signal: %d dBm", dbm);
- 	    }
- 	    offset++;
--	    length--;
-+	    length_remaining--;
- 	    break;
- 	case IEEE80211_RADIOTAP_DB_ANTSIGNAL:
--	    if (length < 1)
-+	    if (length_remaining < 1)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    db = tvb_get_guint8(tvb, offset);
- 	    if (check_col(pinfo->cinfo, COL_RSSI)) {
- 		col_add_fstr(pinfo->cinfo, COL_RSSI, "%u dB", db);
-@@ -511,12 +510,11 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 					   "SSI Signal: %u dB", db);
- 	    }
- 	    offset++;
--	    length--;
-+	    length_remaining--;
- 	    break;
- 	case IEEE80211_RADIOTAP_DBM_ANTNOISE:
--	    if (length < 1)
-+	    if (length_remaining < 1)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    dbm = (gint8) tvb_get_guint8(tvb, offset);
- 	    if (tree) {
- 		proto_tree_add_int_format(radiotap_tree,
-@@ -525,12 +523,11 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 					  "SSI Noise: %d dBm", dbm);
- 	    }
- 	    offset++;
--	    length--;
-+	    length_remaining--;
- 	    break;
- 	case IEEE80211_RADIOTAP_DB_ANTNOISE:
--	    if (length < 1)
-+	    if (length_remaining < 1)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    db = tvb_get_guint8(tvb, offset);
- 	    if (tree) {
- 		proto_tree_add_uint_format(radiotap_tree,
-@@ -539,34 +536,31 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 					   "SSI Noise: %u dB", db);
- 	    }
- 	    offset++;
--	    length--;
-+	    length_remaining--;
- 	    break;
- 	case IEEE80211_RADIOTAP_ANTENNA:
--	    if (length < 1)
-+	    if (length_remaining < 1)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    if (tree) {
- 		proto_tree_add_uint(radiotap_tree, hf_radiotap_antenna,
- 				   tvb, offset, 1, tvb_get_guint8(tvb, offset));
- 	    }
- 	    offset++;
--	    length--;
-+	    length_remaining--;
- 	    break;
- 	case IEEE80211_RADIOTAP_DBM_TX_POWER:
--	    if (length < 1)
-+	    if (length_remaining < 1)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    if (tree) {
- 		proto_tree_add_int(radiotap_tree, hf_radiotap_txpower,
- 				   tvb, offset, 1, tvb_get_guint8(tvb, offset));
- 	    }
- 	    offset++;
--	    length--;
-+	    length_remaining--;
- 	    break;
- 	case IEEE80211_RADIOTAP_CHANNEL:
--	    if (length < 4)
-+	    if (length_remaining < 4)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    if (tree) {
- 		freq = tvb_get_letohs(tvb, offset);
- 		flags = tvb_get_letohs(tvb, offset+2);
-@@ -577,31 +571,29 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 			tvb, offset+2, 2, flags);
- 	    }
- 	    offset+=4;
--	    length-=4;
-+	    length_remaining-=4;
- 	    break;
- 	case IEEE80211_RADIOTAP_FHSS:
- 	case IEEE80211_RADIOTAP_LOCK_QUALITY:
- 	case IEEE80211_RADIOTAP_TX_ATTENUATION:
- 	case IEEE80211_RADIOTAP_DB_TX_ATTENUATION:
--	    if (length < 2)
-+	    if (length_remaining < 2)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- #if 0
- 	    tvb_get_letohs(tvb, offset);
- #endif
- 	    offset+=2;
--	    length-=2;
-+	    length_remaining-=2;
- 	    break;
- 	case IEEE80211_RADIOTAP_TSFT:
--	    if (length < 8)
-+	    if (length_remaining < 8)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    if (tree) {
- 		proto_tree_add_uint64(radiotap_tree, hf_radiotap_mactime,
- 				tvb, offset, 8, tvb_get_letoh64(tvb, offset));
- 	    }
- 	    offset+=8;
--	    length-=8;
-+	    length_remaining-=8;
- 	    break;
- 	default:
- 	    /*
diff --git a/net/ethereal/files/patch-wiretap_configure b/net/ethereal/files/patch-wiretap_configure
deleted file mode 100644
index 420db3bf111d..000000000000
--- a/net/ethereal/files/patch-wiretap_configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- wiretap/configure.orig	Sat May  7 21:04:37 2005
-+++ wiretap/configure	Sat May  7 21:05:31 2005
-@@ -20092,7 +20092,7 @@
-       ac_save_CFLAGS="$CFLAGS"
-       ac_save_LIBS="$LIBS"
-       CFLAGS="$CFLAGS $GLIB_CFLAGS"
--      LIBS="$GLIB_LIBS $LIBS"
-+      LIBS="$GLIB_LIBS -liconv $LIBS"
-       rm -f conf.glibtest
-       if test "$cross_compiling" = yes; then
-   echo $ac_n "cross compiling; assumed OK... $ac_c"
-@@ -20206,7 +20206,7 @@
-   if test "x$no_glib" = x ; then
-      echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--     CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS"
-+     CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS -liconv $GLIB_LIBS"
-   else
-      echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
diff --git a/net/ethereal/pkg-descr b/net/ethereal/pkg-descr
deleted file mode 100644
index fd7658ffd4b6..000000000000
--- a/net/ethereal/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-A network analyzer that lets you capture and interactively browse the
-contents of Ethernet frames. Packet data can be read from a file, or
-live from a local network interface. 
-
-WWW: http://www.ethereal.com/
-
-Bill Fumerola <billf@chc-chimes.com>
diff --git a/net/ethereal/pkg-plist b/net/ethereal/pkg-plist
deleted file mode 100644
index 1c22f5efccfb..000000000000
--- a/net/ethereal/pkg-plist
+++ /dev/null
@@ -1,173 +0,0 @@
-%%CAPINFOS%%
-%%DFTEST%%
-bin/dumpcap
-%%EDITCAP%%
-%%ETHEREAL%%
-%%IDL2ETH%%
-%%MERGECAP%%
-%%RANDPKT%%
-bin/tethereal
-%%TEXT2PCAP%%
-lib/ethereal/plugins/%%PORTVERSION%%/acn.la
-lib/ethereal/plugins/%%PORTVERSION%%/acn.so
-lib/ethereal/plugins/%%PORTVERSION%%/agentx.la
-lib/ethereal/plugins/%%PORTVERSION%%/agentx.so
-lib/ethereal/plugins/%%PORTVERSION%%/artnet.la
-lib/ethereal/plugins/%%PORTVERSION%%/artnet.so
-lib/ethereal/plugins/%%PORTVERSION%%/asn1.la
-lib/ethereal/plugins/%%PORTVERSION%%/asn1.so
-lib/ethereal/plugins/%%PORTVERSION%%/ciscosm.la
-lib/ethereal/plugins/%%PORTVERSION%%/ciscosm.so
-lib/ethereal/plugins/%%PORTVERSION%%/coseventcomm.la
-lib/ethereal/plugins/%%PORTVERSION%%/coseventcomm.so
-lib/ethereal/plugins/%%PORTVERSION%%/cosnaming.la
-lib/ethereal/plugins/%%PORTVERSION%%/cosnaming.so
-lib/ethereal/plugins/%%PORTVERSION%%/docsis.la
-lib/ethereal/plugins/%%PORTVERSION%%/docsis.so
-lib/ethereal/plugins/%%PORTVERSION%%/enttec.la
-lib/ethereal/plugins/%%PORTVERSION%%/enttec.so
-lib/ethereal/plugins/%%PORTVERSION%%/gryphon.la
-lib/ethereal/plugins/%%PORTVERSION%%/gryphon.so
-lib/ethereal/plugins/%%PORTVERSION%%/h223.la
-lib/ethereal/plugins/%%PORTVERSION%%/h223.so
-lib/ethereal/plugins/%%PORTVERSION%%/irda.la
-lib/ethereal/plugins/%%PORTVERSION%%/irda.so
-lib/ethereal/plugins/%%PORTVERSION%%/lwres.la
-lib/ethereal/plugins/%%PORTVERSION%%/lwres.so
-lib/ethereal/plugins/%%PORTVERSION%%/mate.la
-lib/ethereal/plugins/%%PORTVERSION%%/mate.so
-lib/ethereal/plugins/%%PORTVERSION%%/megaco.la
-lib/ethereal/plugins/%%PORTVERSION%%/megaco.so
-lib/ethereal/plugins/%%PORTVERSION%%/mgcp.la
-lib/ethereal/plugins/%%PORTVERSION%%/mgcp.so
-lib/ethereal/plugins/%%PORTVERSION%%/opsi.la
-lib/ethereal/plugins/%%PORTVERSION%%/opsi.so
-lib/ethereal/plugins/%%PORTVERSION%%/parlay.la
-lib/ethereal/plugins/%%PORTVERSION%%/parlay.so
-lib/ethereal/plugins/%%PORTVERSION%%/pcli.la
-lib/ethereal/plugins/%%PORTVERSION%%/pcli.so
-lib/ethereal/plugins/%%PORTVERSION%%/profinet.la
-lib/ethereal/plugins/%%PORTVERSION%%/profinet.so
-lib/ethereal/plugins/%%PORTVERSION%%/rdm.la
-lib/ethereal/plugins/%%PORTVERSION%%/rdm.so
-lib/ethereal/plugins/%%PORTVERSION%%/rlm.la
-lib/ethereal/plugins/%%PORTVERSION%%/rlm.so
-lib/ethereal/plugins/%%PORTVERSION%%/rtnet.la
-lib/ethereal/plugins/%%PORTVERSION%%/rtnet.so
-lib/ethereal/plugins/%%PORTVERSION%%/rudp.la
-lib/ethereal/plugins/%%PORTVERSION%%/rudp.so
-lib/ethereal/plugins/%%PORTVERSION%%/stats_tree.la
-lib/ethereal/plugins/%%PORTVERSION%%/stats_tree.so
-lib/ethereal/plugins/%%PORTVERSION%%/tango.la
-lib/ethereal/plugins/%%PORTVERSION%%/tango.so
-lib/ethereal/plugins/%%PORTVERSION%%/v5ua.la
-lib/ethereal/plugins/%%PORTVERSION%%/v5ua.so
-lib/libethereal.la
-lib/libethereal.so
-lib/libethereal.so.0
-lib/libwiretap.la
-lib/libwiretap.so
-lib/libwiretap.so.0
-%%DATADIR%%/AUTHORS-SHORT
-%%DATADIR%%/capinfos.html
-%%DATADIR%%/cfilters
-%%DATADIR%%/colorfilters
-%%DATADIR%%/dfilters
-%%DATADIR%%/dumpcap.html
-%%DATADIR%%/diameter/TGPPSh.xml
-%%DATADIR%%/diameter/chargecontrol.xml
-%%DATADIR%%/diameter/dictionary.dtd
-%%DATADIR%%/diameter/dictionary.xml
-%%DATADIR%%/diameter/imscxdx.xml
-%%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
-%%DATADIR%%/help/capture_filters.txt
-%%DATADIR%%/help/capturing.txt
-%%DATADIR%%/help/display_filters.txt
-%%DATADIR%%/help/faq.txt
-%%DATADIR%%/help/getting_started.txt
-%%DATADIR%%/help/overview.txt
-%%DATADIR%%/help/toc
-%%DATADIR%%/idl2eth.html
-%%DATADIR%%/manuf
-%%DATADIR%%/mergecap.html
-%%DATADIR%%/radius/dictionary
-%%DATADIR%%/radius/dictionary.3com
-%%DATADIR%%/radius/dictionary.3gpp
-%%DATADIR%%/radius/dictionary.3gpp2
-%%DATADIR%%/radius/dictionary.acc
-%%DATADIR%%/radius/dictionary.alcatel
-%%DATADIR%%/radius/dictionary.alteon
-%%DATADIR%%/radius/dictionary.altiga
-%%DATADIR%%/radius/dictionary.aptis
-%%DATADIR%%/radius/dictionary.ascend
-%%DATADIR%%/radius/dictionary.bay
-%%DATADIR%%/radius/dictionary.bintec
-%%DATADIR%%/radius/dictionary.bristol
-%%DATADIR%%/radius/dictionary.cablelabs
-%%DATADIR%%/radius/dictionary.cabletron
-%%DATADIR%%/radius/dictionary.cisco
-%%DATADIR%%/radius/dictionary.cisco.bbsm
-%%DATADIR%%/radius/dictionary.cisco.vpn3000
-%%DATADIR%%/radius/dictionary.cisco.vpn5000
-%%DATADIR%%/radius/dictionary.colubris
-%%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
-%%DATADIR%%/radius/dictionary.freeradius
-%%DATADIR%%/radius/dictionary.gandalf
-%%DATADIR%%/radius/dictionary.garderos
-%%DATADIR%%/radius/dictionary.gemtek
-%%DATADIR%%/radius/dictionary.itk
-%%DATADIR%%/radius/dictionary.juniper
-%%DATADIR%%/radius/dictionary.karlnet
-%%DATADIR%%/radius/dictionary.livingston
-%%DATADIR%%/radius/dictionary.localweb
-%%DATADIR%%/radius/dictionary.merit
-%%DATADIR%%/radius/dictionary.microsoft
-%%DATADIR%%/radius/dictionary.mikrotik
-%%DATADIR%%/radius/dictionary.navini
-%%DATADIR%%/radius/dictionary.netscreen
-%%DATADIR%%/radius/dictionary.nokia
-%%DATADIR%%/radius/dictionary.nomadix
-%%DATADIR%%/radius/dictionary.propel
-%%DATADIR%%/radius/dictionary.quintum
-%%DATADIR%%/radius/dictionary.redback
-%%DATADIR%%/radius/dictionary.redcreek
-%%DATADIR%%/radius/dictionary.shasta
-%%DATADIR%%/radius/dictionary.shiva
-%%DATADIR%%/radius/dictionary.sonicwall
-%%DATADIR%%/radius/dictionary.springtide
-%%DATADIR%%/radius/dictionary.t_systems_nova
-%%DATADIR%%/radius/dictionary.telebit
-%%DATADIR%%/radius/dictionary.trapeze
-%%DATADIR%%/radius/dictionary.tunnel
-%%DATADIR%%/radius/dictionary.unisphere
-%%DATADIR%%/radius/dictionary.unix
-%%DATADIR%%/radius/dictionary.usr
-%%DATADIR%%/radius/dictionary.valemount
-%%DATADIR%%/radius/dictionary.versanet
-%%DATADIR%%/radius/dictionary.wispr
-%%DATADIR%%/radius/dictionary.xedia
-%%DATADIR%%/tethereal.html
-%%DATADIR%%/text2pcap.html
-@dirrm lib/ethereal/plugins/%%PORTVERSION%%
-@dirrm lib/ethereal/plugins
-@dirrm lib/ethereal
-@dirrm %%DATADIR%%/radius
-@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%/dtds
-@dirrm %%DATADIR%%/diameter
-@dirrm %%DATADIR%%
diff --git a/net/tethereal-lite/Makefile b/net/tethereal-lite/Makefile
deleted file mode 100644
index f83d5e3916cf..000000000000
--- a/net/tethereal-lite/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# New ports collection makefile for:   tethereal-lite
-# Date created:        20 March 2004
-# Whom:                Bill Fumerola <billf@mu.org>
-#
-# $FreeBSD$
-#
-
-LITE=		yes
-PKGNAMESUFFIX=	-lite
-
-MASTERDIR=	${.CURDIR}/../tethereal
-COMMENT=        A powerful network analyzer/capture tool (lite package)
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/tethereal/Makefile b/net/tethereal/Makefile
deleted file mode 100644
index 64e7f0216b31..000000000000
--- a/net/tethereal/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# New ports collection makefile for:   tethereal
-# Date created:        4 February 2002
-# Whom:                Bill Fumerola <billf@mu.org>
-# A slave of ports collection makefile for:   ethereal
-# Date created:        10 August 1998
-# Whom:                Bill Fumerola <billf@chc-chimes.com>
-#
-# $FreeBSD$
-#
-
-PKGNAMEPREFIX=	t
-CATEGORIES=	net ipv6
-
-MASTERDIR=	${.CURDIR}/../ethereal
-
-WITHOUT_X11=	yes
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/tshark-lite/Makefile b/net/tshark-lite/Makefile
index f83d5e3916cf..f180efc95a03 100644
--- a/net/tshark-lite/Makefile
+++ b/net/tshark-lite/Makefile
@@ -8,7 +8,7 @@
 LITE=		yes
 PKGNAMESUFFIX=	-lite
 
-MASTERDIR=	${.CURDIR}/../tethereal
+MASTERDIR=	${.CURDIR}/../tshark
 COMMENT=        A powerful network analyzer/capture tool (lite package)
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/tshark/Makefile b/net/tshark/Makefile
index 64e7f0216b31..3c235d9f81de 100644
--- a/net/tshark/Makefile
+++ b/net/tshark/Makefile
@@ -8,10 +8,10 @@
 # $FreeBSD$
 #
 
-PKGNAMEPREFIX=	t
+PORTNAME=	tshark
 CATEGORIES=	net ipv6
 
-MASTERDIR=	${.CURDIR}/../ethereal
+MASTERDIR=	${.CURDIR}/../wireshark
 
 WITHOUT_X11=	yes
 
diff --git a/net/wireshark-lite/Makefile b/net/wireshark-lite/Makefile
index 2fa4c2fa57be..5c82bf152fea 100644
--- a/net/wireshark-lite/Makefile
+++ b/net/wireshark-lite/Makefile
@@ -6,10 +6,10 @@
 #
 
 LITE=		yes
-PORTREVISION?=	3
+PORTREVISION?=	0
 PKGNAMESUFFIX=	-lite
 
-MASTERDIR=	${.CURDIR}/../ethereal
+MASTERDIR=	${.CURDIR}/../wireshark
 COMMENT=        A powerful network analyzer/capture tool (lite package)
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index f9f24f214944..a0583cc27005 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -5,13 +5,11 @@
 # $FreeBSD$
 #
 
-PORTNAME=	ethereal
-PORTVERSION=	0.99.0
-PORTREVISION?=	3
+PORTNAME?=	wireshark
+PORTVERSION=	0.99.2
+PORTREVISION?=	0
 CATEGORIES=	net ipv6
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		ftp://ftp.ethereal.com/pub/ethereal/all-versions/
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://www.wireshark.org/download/src/
 
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT?=	A powerful network analyzer/capture tool
@@ -30,7 +28,7 @@ CONFIGURE_ARGS+=	--program-transform-name="" \
 MAKE_ENV=	MIBDIRS="/dev/null"
 INSTALLS_SHLIB=	yes
 
-.for x in capinfos editcap idl2eth mergecap text2pcap
+.for x in capinfos editcap idl2wrs mergecap text2pcap
 .if defined(LITE)
 PLIST_SUB+=		${x:U}="@comment $x not installed"
 CONFIGURE_ARGS+=	--enable-$x=no
@@ -50,14 +48,14 @@ PLIST_SUB+=	${x:U}=bin/$x
 .endfor
 
 .if !defined(WITHOUT_X11)
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_X11)
-MAN1+=		ethereal.1
-PLIST_SUB+=	ETHEREAL=bin/ethereal
+MAN1+=		wireshark.1
+PLIST_SUB+=	WIRESHARK=bin/wireshark
 .if defined(WITHOUT_GTK2)
 USE_GNOME+=	gtk12
 CONFIGURE_ARGS+=	--disable-gtk2
@@ -65,9 +63,9 @@ CONFIGURE_ARGS+=	--disable-gtk2
 USE_GNOME+=	gtk20
 .endif
 .else
-PLIST_SUB+=	ETHEREAL="@comment ethereal not built"
+PLIST_SUB+=	WIRESHARK="@comment wireshark not built"
 USE_GNOME+=	glib12
-CONFIGURE_ARGS+=	--enable-ethereal=no \
+CONFIGURE_ARGS+=	--enable-wireshark=no \
 			--disable-gtktest \
 			--with-gtk-prefix=/nonexistent \
 			--disable-gtk2
@@ -115,10 +113,10 @@ CONFIGURE_ARGS+=	--with-adns=no
 
 .if exists(${LOCALBASE}/lib/libgnutls.so) || defined(WITH_GNUTLS)
 LIB_DEPENDS+=	gnutls.13:${PORTSDIR}/security/gnutls
-CONFIGURE_ARGS+=	--with-libgnutls-prefix=${LOCALBASE}
+CONFIGURE_ARGS+=--with-libgnutls-prefix=${LOCALBASE}
 .endif
 
-MAN1+=	dumpcap.1 tethereal.1
-MAN4+=	ethereal-filter.4
+MAN1+=	dumpcap.1 tshark.1
+MAN4+=	wireshark-filter.4
 
 .include <bsd.port.post.mk>
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index d40b51ecb138..6d2e607a9e45 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,3 +1,3 @@
-MD5 (ethereal-0.99.0.tar.gz) = 92490abe23df1b2078579c512c788f9d
-SHA256 (ethereal-0.99.0.tar.gz) = 2aa3030064783c2390d177ba6ad7f784d0c813895197a67f33f5d3e04690635a
-SIZE (ethereal-0.99.0.tar.gz) = 11284145
+MD5 (wireshark-0.99.2.tar.gz) = 46d3b7c9766960fb34782c2078c50d13
+SHA256 (wireshark-0.99.2.tar.gz) = ef2f857fd8d1001890b86834dc3275214f7717fa6948c27829f6575d9b8023bf
+SIZE (wireshark-0.99.2.tar.gz) = 12358081
diff --git a/net/wireshark/files/patch-configure b/net/wireshark/files/patch-configure
index 87b2baa4bdda..ea1bda2c8ac6 100644
--- a/net/wireshark/files/patch-configure
+++ b/net/wireshark/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Wed May  4 17:32:34 2005
-+++ configure	Sat May  7 21:07:38 2005
-@@ -21806,6 +21806,7 @@
+--- configure.orig	Tue Jul 18 00:20:03 2006
++++ configure	Tue Jul 18 00:19:03 2006
+@@ -22210,6 +22210,7 @@ echo $ECHO_N "checking for GLIB - versio
    else
      GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
      GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
@@ -8,7 +8,7 @@
      glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
      glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
-@@ -21816,7 +21817,7 @@
+@@ -22220,7 +22221,7 @@ echo $ECHO_N "checking for GLIB - versio
        ac_save_CFLAGS="$CFLAGS"
        ac_save_LIBS="$LIBS"
        CFLAGS="$CFLAGS $GLIB_CFLAGS"
@@ -17,7 +17,7 @@
        rm -f conf.glibtest
        if test "$cross_compiling" = yes; then
    echo $ac_n "cross compiling; assumed OK... $ac_c"
-@@ -22452,6 +22453,7 @@
+@@ -22854,6 +22855,7 @@ echo $ECHO_N "checking for GLIB - versio
    else
      GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
      GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
@@ -25,16 +25,15 @@
      glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
      glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
-@@ -22462,7 +22464,7 @@
-       ac_save_CFLAGS="$CFLAGS"
+@@ -22865,6 +22867,7 @@ echo $ECHO_N "checking for GLIB - versio
        ac_save_LIBS="$LIBS"
        CFLAGS="$CFLAGS $GLIB_CFLAGS"
--      LIBS="$GLIB_LIBS $LIBS"
+       LIBS="$GLIB_LIBS $LIBS"
 +      LIBS="$GLIB_LIBS -liconv $LIBS"
        rm -f conf.glibtest
        if test "$cross_compiling" = yes; then
    echo $ac_n "cross compiling; assumed OK... $ac_c"
-@@ -22683,7 +22685,7 @@
+@@ -23084,7 +23087,7 @@ echo $ECHO_N "checking whether GLib supp
  ac_save_CFLAGS="$CFLAGS"
  ac_save_LIBS="$LIBS"
  CFLAGS="$CFLAGS $GLIB_CFLAGS"
@@ -43,7 +42,7 @@
  if test "$cross_compiling" = yes; then
    echo $ac_n "cross compiling; assumed OK... $ac_c"
      ac_cv_glib_supports_modules=yes
-@@ -27560,7 +27562,7 @@
+@@ -28684,7 +28687,7 @@ echo "${ECHO_T}yes" >&6
  	  #
  	  CFLAGS="$CFLAGS -I$krb5_dir/include"
  	  CPPFLAGS="$CPPFLAGS -I$krb5_dir/include"
@@ -52,7 +51,7 @@
  	  ac_mit_version=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'`
  	  ac_krb5_version="$ac_heimdal_version$ac_mit_version"
  	  if test "x$ac_krb5_version" = "xHEIMDAL"
-@@ -27618,7 +27620,7 @@
+@@ -28742,7 +28745,7 @@ fi
  
  	  if test -x "$KRB5_CONFIG"
  	  then
@@ -61,7 +60,7 @@
  	    KRB5_LIBS=`"$KRB5_CONFIG" --libs`
  	    CFLAGS="$CFLAGS $KRB5_FLAGS"
  	    CPPFLAGS="$CPPFLAGS $KRB5_FLAGS"
-@@ -29121,7 +29123,7 @@
+@@ -30342,7 +30345,7 @@ fi
  
  
  ac_save_LIBS="$LIBS"
@@ -70,12 +69,12 @@
  G_ASCII_STRTOULL_C=""
  G_ASCII_STRTOULL_O=""
  G_ASCII_STRTOULL_LO=""
-@@ -30094,7 +30096,7 @@
+@@ -31509,7 +31512,7 @@ fi
  #
  # The plugin dissectors reside in ./plugins/PROTO/
  #
--PLUGIN_LIBS="-L../../epan -lethereal $GLIB_LIBS"
-+PLUGIN_LIBS="-L../../epan -lethereal -liconv $GLIB_LIBS"
+-PLUGIN_LIBS="-L../../epan -lwireshark $GLIB_LIBS"
++PLUGIN_LIBS="-L../../epan -lwireshark -liconv $GLIB_LIBS"
  
  
  #
diff --git a/net/wireshark/files/patch-epan_dissectors_packet-radiotap.c b/net/wireshark/files/patch-epan_dissectors_packet-radiotap.c
deleted file mode 100644
index f66df6cb6f14..000000000000
--- a/net/wireshark/files/patch-epan_dissectors_packet-radiotap.c
+++ /dev/null
@@ -1,198 +0,0 @@
---- epan/dissectors/packet-radiotap.c.orig	Mon Apr 17 14:46:52 2006
-+++ epan/dissectors/packet-radiotap.c	Fri Apr 28 19:21:24 2006
-@@ -382,7 +382,7 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
-     proto_item *ti = NULL;
-     int offset;
-     guint32 version, pad;
--    guint32 length;
-+    guint length, length_remaining;
-     guint32 rate, freq, flags;
-     gint8 dbm;
-     guint8 db, rflags;
-@@ -416,11 +416,13 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 	ti = proto_tree_add_uint(radiotap_tree, hf_radiotap_length,
- 	    tvb, offset + 2, 2, length);
-     }
-+    length_remaining = length;
-+
-     /*
-      * FIXME: This only works if there is exactly 1 it_present
-      *        field in the header
-      */
--    if (length < sizeof(struct ieee80211_radiotap_header)) {
-+    if (length_remaining < sizeof(struct ieee80211_radiotap_header)) {
- 	/*
- 	 * Radiotap header is shorter than the fixed-length portion
- 	 * plus one "present" bitset.
-@@ -435,7 +437,7 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 	present_tree = proto_item_add_subtree(pt, ett_radiotap_present);
-     }
-     offset += sizeof(struct ieee80211_radiotap_header);
--    length -= sizeof(struct ieee80211_radiotap_header);
-+    length_remaining -= sizeof(struct ieee80211_radiotap_header);
- 
-     rflags = 0;
-     for (; present; present = next_present) {
-@@ -447,7 +449,7 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 
- 	switch (bit) {
- 	case IEEE80211_RADIOTAP_FLAGS:
--	    if (length < 1)
-+	    if (length_remaining < 1)
- 		break;
- 	    rflags = tvb_get_guint8(tvb, offset);
- 	    if (tree) {
-@@ -459,13 +461,12 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 			tvb, 0, 0, (rflags&IEEE80211_RADIOTAP_F_DATAPAD) != 0);
- 	    }
- 	    offset++;
--	    length--;
-+	    length_remaining--;
- 	    /* XXX CFP, WEP, FRAG */
- 	    break;
- 	case IEEE80211_RADIOTAP_RATE:
--	    if (length < 1)
-+	    if (length_remaining < 1)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    rate = tvb_get_guint8(tvb, offset) & 0x7f;
- 	    if (check_col(pinfo->cinfo, COL_TX_RATE)) {
- 		col_add_fstr(pinfo->cinfo, COL_TX_RATE, "%d.%d",
-@@ -477,12 +478,11 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 			"Data Rate: %d.%d Mb/s", rate / 2, rate & 1 ? 5 : 0);
- 	    }
- 	    offset++;
--	    length--;
-+	    length_remaining--;
- 	    break;
- 	case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
--	    if (length < 1)
-+	    if (length_remaining < 1)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    dbm = (gint8) tvb_get_guint8(tvb, offset);
- 	    if (check_col(pinfo->cinfo, COL_RSSI)) {
- 		col_add_fstr(pinfo->cinfo, COL_RSSI, "%d dBm", dbm);
-@@ -494,12 +494,11 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 					  "SSI Signal: %d dBm", dbm);
- 	    }
- 	    offset++;
--	    length--;
-+	    length_remaining--;
- 	    break;
- 	case IEEE80211_RADIOTAP_DB_ANTSIGNAL:
--	    if (length < 1)
-+	    if (length_remaining < 1)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    db = tvb_get_guint8(tvb, offset);
- 	    if (check_col(pinfo->cinfo, COL_RSSI)) {
- 		col_add_fstr(pinfo->cinfo, COL_RSSI, "%u dB", db);
-@@ -511,12 +510,11 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 					   "SSI Signal: %u dB", db);
- 	    }
- 	    offset++;
--	    length--;
-+	    length_remaining--;
- 	    break;
- 	case IEEE80211_RADIOTAP_DBM_ANTNOISE:
--	    if (length < 1)
-+	    if (length_remaining < 1)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    dbm = (gint8) tvb_get_guint8(tvb, offset);
- 	    if (tree) {
- 		proto_tree_add_int_format(radiotap_tree,
-@@ -525,12 +523,11 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 					  "SSI Noise: %d dBm", dbm);
- 	    }
- 	    offset++;
--	    length--;
-+	    length_remaining--;
- 	    break;
- 	case IEEE80211_RADIOTAP_DB_ANTNOISE:
--	    if (length < 1)
-+	    if (length_remaining < 1)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    db = tvb_get_guint8(tvb, offset);
- 	    if (tree) {
- 		proto_tree_add_uint_format(radiotap_tree,
-@@ -539,34 +536,31 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 					   "SSI Noise: %u dB", db);
- 	    }
- 	    offset++;
--	    length--;
-+	    length_remaining--;
- 	    break;
- 	case IEEE80211_RADIOTAP_ANTENNA:
--	    if (length < 1)
-+	    if (length_remaining < 1)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    if (tree) {
- 		proto_tree_add_uint(radiotap_tree, hf_radiotap_antenna,
- 				   tvb, offset, 1, tvb_get_guint8(tvb, offset));
- 	    }
- 	    offset++;
--	    length--;
-+	    length_remaining--;
- 	    break;
- 	case IEEE80211_RADIOTAP_DBM_TX_POWER:
--	    if (length < 1)
-+	    if (length_remaining < 1)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    if (tree) {
- 		proto_tree_add_int(radiotap_tree, hf_radiotap_txpower,
- 				   tvb, offset, 1, tvb_get_guint8(tvb, offset));
- 	    }
- 	    offset++;
--	    length--;
-+	    length_remaining--;
- 	    break;
- 	case IEEE80211_RADIOTAP_CHANNEL:
--	    if (length < 4)
-+	    if (length_remaining < 4)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    if (tree) {
- 		freq = tvb_get_letohs(tvb, offset);
- 		flags = tvb_get_letohs(tvb, offset+2);
-@@ -577,31 +571,29 @@ dissect_radiotap(tvbuff_t *tvb, packet_i
- 			tvb, offset+2, 2, flags);
- 	    }
- 	    offset+=4;
--	    length-=4;
-+	    length_remaining-=4;
- 	    break;
- 	case IEEE80211_RADIOTAP_FHSS:
- 	case IEEE80211_RADIOTAP_LOCK_QUALITY:
- 	case IEEE80211_RADIOTAP_TX_ATTENUATION:
- 	case IEEE80211_RADIOTAP_DB_TX_ATTENUATION:
--	    if (length < 2)
-+	    if (length_remaining < 2)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- #if 0
- 	    tvb_get_letohs(tvb, offset);
- #endif
- 	    offset+=2;
--	    length-=2;
-+	    length_remaining-=2;
- 	    break;
- 	case IEEE80211_RADIOTAP_TSFT:
--	    if (length < 8)
-+	    if (length_remaining < 8)
- 		break;
--	    rflags = tvb_get_guint8(tvb, offset);
- 	    if (tree) {
- 		proto_tree_add_uint64(radiotap_tree, hf_radiotap_mactime,
- 				tvb, offset, 8, tvb_get_letoh64(tvb, offset));
- 	    }
- 	    offset+=8;
--	    length-=8;
-+	    length_remaining-=8;
- 	    break;
- 	default:
- 	    /*
diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist
index 1c22f5efccfb..5b5c5009d2cd 100644
--- a/net/wireshark/pkg-plist
+++ b/net/wireshark/pkg-plist
@@ -2,69 +2,71 @@
 %%DFTEST%%
 bin/dumpcap
 %%EDITCAP%%
-%%ETHEREAL%%
-%%IDL2ETH%%
+%%WIRESHARK%%
+%%IDL2WRS%%
 %%MERGECAP%%
 %%RANDPKT%%
-bin/tethereal
+bin/tshark
 %%TEXT2PCAP%%
-lib/ethereal/plugins/%%PORTVERSION%%/acn.la
-lib/ethereal/plugins/%%PORTVERSION%%/acn.so
-lib/ethereal/plugins/%%PORTVERSION%%/agentx.la
-lib/ethereal/plugins/%%PORTVERSION%%/agentx.so
-lib/ethereal/plugins/%%PORTVERSION%%/artnet.la
-lib/ethereal/plugins/%%PORTVERSION%%/artnet.so
-lib/ethereal/plugins/%%PORTVERSION%%/asn1.la
-lib/ethereal/plugins/%%PORTVERSION%%/asn1.so
-lib/ethereal/plugins/%%PORTVERSION%%/ciscosm.la
-lib/ethereal/plugins/%%PORTVERSION%%/ciscosm.so
-lib/ethereal/plugins/%%PORTVERSION%%/coseventcomm.la
-lib/ethereal/plugins/%%PORTVERSION%%/coseventcomm.so
-lib/ethereal/plugins/%%PORTVERSION%%/cosnaming.la
-lib/ethereal/plugins/%%PORTVERSION%%/cosnaming.so
-lib/ethereal/plugins/%%PORTVERSION%%/docsis.la
-lib/ethereal/plugins/%%PORTVERSION%%/docsis.so
-lib/ethereal/plugins/%%PORTVERSION%%/enttec.la
-lib/ethereal/plugins/%%PORTVERSION%%/enttec.so
-lib/ethereal/plugins/%%PORTVERSION%%/gryphon.la
-lib/ethereal/plugins/%%PORTVERSION%%/gryphon.so
-lib/ethereal/plugins/%%PORTVERSION%%/h223.la
-lib/ethereal/plugins/%%PORTVERSION%%/h223.so
-lib/ethereal/plugins/%%PORTVERSION%%/irda.la
-lib/ethereal/plugins/%%PORTVERSION%%/irda.so
-lib/ethereal/plugins/%%PORTVERSION%%/lwres.la
-lib/ethereal/plugins/%%PORTVERSION%%/lwres.so
-lib/ethereal/plugins/%%PORTVERSION%%/mate.la
-lib/ethereal/plugins/%%PORTVERSION%%/mate.so
-lib/ethereal/plugins/%%PORTVERSION%%/megaco.la
-lib/ethereal/plugins/%%PORTVERSION%%/megaco.so
-lib/ethereal/plugins/%%PORTVERSION%%/mgcp.la
-lib/ethereal/plugins/%%PORTVERSION%%/mgcp.so
-lib/ethereal/plugins/%%PORTVERSION%%/opsi.la
-lib/ethereal/plugins/%%PORTVERSION%%/opsi.so
-lib/ethereal/plugins/%%PORTVERSION%%/parlay.la
-lib/ethereal/plugins/%%PORTVERSION%%/parlay.so
-lib/ethereal/plugins/%%PORTVERSION%%/pcli.la
-lib/ethereal/plugins/%%PORTVERSION%%/pcli.so
-lib/ethereal/plugins/%%PORTVERSION%%/profinet.la
-lib/ethereal/plugins/%%PORTVERSION%%/profinet.so
-lib/ethereal/plugins/%%PORTVERSION%%/rdm.la
-lib/ethereal/plugins/%%PORTVERSION%%/rdm.so
-lib/ethereal/plugins/%%PORTVERSION%%/rlm.la
-lib/ethereal/plugins/%%PORTVERSION%%/rlm.so
-lib/ethereal/plugins/%%PORTVERSION%%/rtnet.la
-lib/ethereal/plugins/%%PORTVERSION%%/rtnet.so
-lib/ethereal/plugins/%%PORTVERSION%%/rudp.la
-lib/ethereal/plugins/%%PORTVERSION%%/rudp.so
-lib/ethereal/plugins/%%PORTVERSION%%/stats_tree.la
-lib/ethereal/plugins/%%PORTVERSION%%/stats_tree.so
-lib/ethereal/plugins/%%PORTVERSION%%/tango.la
-lib/ethereal/plugins/%%PORTVERSION%%/tango.so
-lib/ethereal/plugins/%%PORTVERSION%%/v5ua.la
-lib/ethereal/plugins/%%PORTVERSION%%/v5ua.so
-lib/libethereal.la
-lib/libethereal.so
-lib/libethereal.so.0
+lib/wireshark/plugins/%%PORTVERSION%%/acn.la
+lib/wireshark/plugins/%%PORTVERSION%%/acn.so
+lib/wireshark/plugins/%%PORTVERSION%%/agentx.la
+lib/wireshark/plugins/%%PORTVERSION%%/agentx.so
+lib/wireshark/plugins/%%PORTVERSION%%/artnet.la
+lib/wireshark/plugins/%%PORTVERSION%%/artnet.so
+lib/wireshark/plugins/%%PORTVERSION%%/asn1.la
+lib/wireshark/plugins/%%PORTVERSION%%/asn1.so
+lib/wireshark/plugins/%%PORTVERSION%%/ciscosm.la
+lib/wireshark/plugins/%%PORTVERSION%%/ciscosm.so
+lib/wireshark/plugins/%%PORTVERSION%%/coseventcomm.la
+lib/wireshark/plugins/%%PORTVERSION%%/coseventcomm.so
+lib/wireshark/plugins/%%PORTVERSION%%/cosnaming.la
+lib/wireshark/plugins/%%PORTVERSION%%/cosnaming.so
+lib/wireshark/plugins/%%PORTVERSION%%/docsis.la
+lib/wireshark/plugins/%%PORTVERSION%%/docsis.so
+lib/wireshark/plugins/%%PORTVERSION%%/enttec.la
+lib/wireshark/plugins/%%PORTVERSION%%/enttec.so
+lib/wireshark/plugins/%%PORTVERSION%%/gryphon.la
+lib/wireshark/plugins/%%PORTVERSION%%/gryphon.so
+lib/wireshark/plugins/%%PORTVERSION%%/h223.la
+lib/wireshark/plugins/%%PORTVERSION%%/h223.so
+lib/wireshark/plugins/%%PORTVERSION%%/irda.la
+lib/wireshark/plugins/%%PORTVERSION%%/irda.so
+lib/wireshark/plugins/%%PORTVERSION%%/lwres.la
+lib/wireshark/plugins/%%PORTVERSION%%/lwres.so
+lib/wireshark/plugins/%%PORTVERSION%%/mate.la
+lib/wireshark/plugins/%%PORTVERSION%%/mate.so
+lib/wireshark/plugins/%%PORTVERSION%%/megaco.la
+lib/wireshark/plugins/%%PORTVERSION%%/megaco.so
+lib/wireshark/plugins/%%PORTVERSION%%/mgcp.la
+lib/wireshark/plugins/%%PORTVERSION%%/mgcp.so
+lib/wireshark/plugins/%%PORTVERSION%%/opsi.la
+lib/wireshark/plugins/%%PORTVERSION%%/opsi.so
+lib/wireshark/plugins/%%PORTVERSION%%/parlay.la
+lib/wireshark/plugins/%%PORTVERSION%%/parlay.so
+lib/wireshark/plugins/%%PORTVERSION%%/pcli.la
+lib/wireshark/plugins/%%PORTVERSION%%/pcli.so
+lib/wireshark/plugins/%%PORTVERSION%%/profinet.la
+lib/wireshark/plugins/%%PORTVERSION%%/profinet.so
+lib/wireshark/plugins/%%PORTVERSION%%/rdm.la
+lib/wireshark/plugins/%%PORTVERSION%%/rdm.so
+lib/wireshark/plugins/%%PORTVERSION%%/rlm.la
+lib/wireshark/plugins/%%PORTVERSION%%/rlm.so
+lib/wireshark/plugins/%%PORTVERSION%%/rtnet.la
+lib/wireshark/plugins/%%PORTVERSION%%/rtnet.so
+lib/wireshark/plugins/%%PORTVERSION%%/rudp.la
+lib/wireshark/plugins/%%PORTVERSION%%/rudp.so
+lib/wireshark/plugins/%%PORTVERSION%%/sbus.la
+lib/wireshark/plugins/%%PORTVERSION%%/sbus.so
+lib/wireshark/plugins/%%PORTVERSION%%/stats_tree.la
+lib/wireshark/plugins/%%PORTVERSION%%/stats_tree.so
+lib/wireshark/plugins/%%PORTVERSION%%/tango.la
+lib/wireshark/plugins/%%PORTVERSION%%/tango.so
+lib/wireshark/plugins/%%PORTVERSION%%/v5ua.la
+lib/wireshark/plugins/%%PORTVERSION%%/v5ua.so
+lib/libwireshark.la
+lib/libwireshark.so
+lib/libwireshark.so.0
 lib/libwiretap.la
 lib/libwiretap.so
 lib/libwiretap.so.0
@@ -84,11 +86,15 @@ lib/libwiretap.so.0
 %%DATADIR%%/diameter/sunping.xml
 %%DATADIR%%/dtds/dc.dtd
 %%DATADIR%%/dtds/itunes.dtd
+%%DATADIR%%/dtds/pocsettings.dtd
+%%DATADIR%%/dtds/presence.dtd
+%%DATADIR%%/dtds/reginfo.dtd
 %%DATADIR%%/dtds/rss.dtd
 %%DATADIR%%/dtds/smil.dtd
+%%DATADIR%%/dtds/watcherinfo.dtd
 %%DATADIR%%/editcap.html
-%%DATADIR%%/ethereal-filter.html
-%%DATADIR%%/ethereal.html
+%%DATADIR%%/wireshark-filter.html
+%%DATADIR%%/wireshark.html
 %%DATADIR%%/help/capture_filters.txt
 %%DATADIR%%/help/capturing.txt
 %%DATADIR%%/help/display_filters.txt
@@ -96,7 +102,7 @@ lib/libwiretap.so.0
 %%DATADIR%%/help/getting_started.txt
 %%DATADIR%%/help/overview.txt
 %%DATADIR%%/help/toc
-%%DATADIR%%/idl2eth.html
+%%DATADIR%%/idl2wrs.html
 %%DATADIR%%/manuf
 %%DATADIR%%/mergecap.html
 %%DATADIR%%/radius/dictionary
@@ -161,11 +167,11 @@ lib/libwiretap.so.0
 %%DATADIR%%/radius/dictionary.versanet
 %%DATADIR%%/radius/dictionary.wispr
 %%DATADIR%%/radius/dictionary.xedia
-%%DATADIR%%/tethereal.html
+%%DATADIR%%/tshark.html
 %%DATADIR%%/text2pcap.html
-@dirrm lib/ethereal/plugins/%%PORTVERSION%%
-@dirrm lib/ethereal/plugins
-@dirrm lib/ethereal
+@dirrm lib/wireshark/plugins/%%PORTVERSION%%
+@dirrm lib/wireshark/plugins
+@dirrm lib/wireshark
 @dirrm %%DATADIR%%/radius
 @dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%/dtds
author	Joe Marcus Clarke <marcus@FreeBSD.org>	2006-07-18 05:03:53 +0000
committer	Joe Marcus Clarke <marcus@FreeBSD.org>	2006-07-18 05:03:53 +0000
commit	a69db4b2a0cc19923f24ac9b55d645cf1db6d8da (patch)
tree	98a19e9c31aaa1c2bdbd027c050a89254d4bc9a6
parent	d50c601e45debeee371b18341da87d51ac8a74b5 (diff)