Update tcpdump/libpcap ports for new releases 3.8.3/0.8.3. Reset PORTREVISION.

Update radiotap patches as radiotap is not yet in tcpdump release branch
due to endianness issues.

11 files changed, 32 insertions, 32 deletions

diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile
index ee7da5efc89d..a7543648d1c3 100644
--- a/net/libpcap/Makefile
+++ b/net/libpcap/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	libpcap
-PORTVERSION=	0.8.1
-PORTREVISION=	352
+PORTVERSION=	0.8.3
+PORTREVISION=	0
 CATEGORIES=	net
-MASTER_SITES=	http://www.tcpdump.org/beta/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-351
+MASTER_SITES=	http://www.tcpdump.org/release/
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	bms@FreeBSD.org
 COMMENT=	Ubiquitous network traffic capture library
diff --git a/net/libpcap/distinfo b/net/libpcap/distinfo
index 6243d10703c6..adf83ff8012b 100644
--- a/net/libpcap/distinfo
+++ b/net/libpcap/distinfo
@@ -1,2 +1,2 @@
-MD5 (libpcap-0.8.1-351.tar.gz) = 7e40804221dfa9d10a41f129b9edf3b4
-SIZE (libpcap-0.8.1-351.tar.gz) = 286836
+MD5 (libpcap-0.8.3.tar.gz) = 56a9d4615d8354fcfe8cff8c8443c77b
+SIZE (libpcap-0.8.3.tar.gz) = 302551
diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile
index e5adf275c924..b80741ff18c3 100644
--- a/net/tcpdump/Makefile
+++ b/net/tcpdump/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	tcpdump
-PORTVERSION=	3.8.1
-PORTREVISION=	351
+PORTVERSION=	3.8.3
+PORTREVISION=	0
 CATEGORIES=	net
-MASTER_SITES=	http://www.tcpdump.org/beta/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-351
+MASTER_SITES=	http://www.tcpdump.org/release/
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	bms@FreeBSD.org
 COMMENT=	Ubiquitous network traffic analysis tool
diff --git a/net/tcpdump/distinfo b/net/tcpdump/distinfo
index 003e2c009ada..b6239aac01c5 100644
--- a/net/tcpdump/distinfo
+++ b/net/tcpdump/distinfo
@@ -1,2 +1,2 @@
-MD5 (tcpdump-3.8.1-351.tar.gz) = d4dad7a6e4728e23238fc01b18b2c866
-SIZE (tcpdump-3.8.1-351.tar.gz) = 527473
+MD5 (tcpdump-3.8.3.tar.gz) = 30645001f4b97019677cad88d3811904
+SIZE (tcpdump-3.8.3.tar.gz) = 567116
diff --git a/net/tcpdump/files/extra-patch-Makefile.in b/net/tcpdump/files/extra-patch-Makefile.in
index 05d73d0c186c..5f69c1f012ca 100644
--- a/net/tcpdump/files/extra-patch-Makefile.in
+++ b/net/tcpdump/files/extra-patch-Makefile.in
@@ -1,13 +1,13 @@
---- Makefile.in.orig	Mon Oct 27 10:13:45 2003
-+++ Makefile.in	Wed Dec 10 18:59:23 2003
+--- Makefile.in.orig	Sun Mar 28 22:25:02 2004
++++ Makefile.in	Wed Mar 31 01:04:18 2004
 @@ -65,7 +65,7 @@
  	@rm -f $@
  	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
  
--CSRC =	addrtoname.c gmpls.c gmt2local.c machdep.c parsenfsfh.c \
-+CSRC =	addrtoname.c cpack.c gmpls.c gmt2local.c machdep.c parsenfsfh.c \
- 	print-802_11.c print-ah.c print-arcnet.c print-aodv.c \
- 	print-arp.c print-ascii.c print-atalk.c print-atm.c \
+-CSRC =	addrtoname.c gmpls.c gmt2local.c machdep.c oui.c parsenfsfh.c \
++CSRC =	addrtoname.c cpack.c gmpls.c gmt2local.c machdep.c oui.c parsenfsfh.c \
+ 	print-802_11.c print-ap1394.c print-ah.c print-arcnet.c \
+ 	print-aodv.c print-arp.c print-ascii.c print-atalk.c print-atm.c \
  	print-beep.c print-bfd.c print-bgp.c print-bootp.c print-cdp.c \
 @@ -95,7 +95,7 @@
  # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
diff --git a/net/tcpdump/files/extra-patch-cpack.c b/net/tcpdump/files/extra-patch-cpack.c
index df8ba5e8f07a..b646ce9ed5b3 100644
--- a/net/tcpdump/files/extra-patch-cpack.c
+++ b/net/tcpdump/files/extra-patch-cpack.c
@@ -1,5 +1,5 @@
---- cpack.c.orig	Wed Dec 10 18:44:31 2003
-+++ cpack.c	Thu Aug 14 01:25:27 2003
+--- cpack.c.orig	Wed Mar 31 01:03:41 2004
++++ cpack.c	Wed Mar 31 01:03:41 2004
 @@ -0,0 +1,181 @@
 +/*-
 + * Copyright (c) 2003, 2004 David Young.  All rights reserved.
diff --git a/net/tcpdump/files/extra-patch-cpack.h b/net/tcpdump/files/extra-patch-cpack.h
index 026a7686e234..9832261f5c8d 100644
--- a/net/tcpdump/files/extra-patch-cpack.h
+++ b/net/tcpdump/files/extra-patch-cpack.h
@@ -1,5 +1,5 @@
---- cpack.h.orig	Wed Dec 10 18:44:34 2003
-+++ cpack.h	Tue Nov 25 04:08:43 2003
+--- cpack.h.orig	Wed Mar 31 01:03:41 2004
++++ cpack.h	Wed Mar 31 01:03:41 2004
 @@ -0,0 +1,53 @@
 +/*-
 + * Copyright (c) 2003, 2004 David Young.  All rights reserved.
diff --git a/net/tcpdump/files/extra-patch-extract.h b/net/tcpdump/files/extra-patch-extract.h
index 143a27c6fd36..1accfcbab2c5 100644
--- a/net/tcpdump/files/extra-patch-extract.h
+++ b/net/tcpdump/files/extra-patch-extract.h
@@ -1,5 +1,5 @@
 --- extract.h.orig	Wed Dec 11 07:13:51 2002
-+++ extract.h	Wed Dec 10 18:45:34 2003
++++ extract.h	Wed Mar 31 01:03:41 2004
 @@ -96,3 +96,12 @@
  		     (u_int32_t)*((const u_int8_t *)(p) + 2) << 16 | \
  		     (u_int32_t)*((const u_int8_t *)(p) + 1) << 8 | \
diff --git a/net/tcpdump/files/extra-patch-ieee802_11_radio.h b/net/tcpdump/files/extra-patch-ieee802_11_radio.h
index 7b229b0a2313..ae2132628418 100644
--- a/net/tcpdump/files/extra-patch-ieee802_11_radio.h
+++ b/net/tcpdump/files/extra-patch-ieee802_11_radio.h
@@ -1,7 +1,7 @@
---- ieee802_11_radio.h.orig	Wed Dec 10 18:44:53 2003
-+++ ieee802_11_radio.h	Sun Nov 30 04:54:28 2003
+--- ieee802_11_radio.h.orig	Wed Mar 31 01:03:41 2004
++++ ieee802_11_radio.h	Wed Mar 31 01:03:41 2004
 @@ -0,0 +1,201 @@
-+/* $FreeBSD: /tmp/pcvs/ports/net/tcpdump/files/Attic/extra-patch-ieee802_11_radio.h,v 1.1 2003-12-11 14:03:35 bms Exp $ */
++/* $FreeBSD: /tmp/pcvs/ports/net/tcpdump/files/Attic/extra-patch-ieee802_11_radio.h,v 1.2 2004-03-31 00:14:06 bms Exp $ */
 +/* $NetBSD: ieee80211_radiotap.h,v 1.3 2003/11/16 09:02:42 dyoung Exp $ */
 +/* $Header$ */
 +
diff --git a/net/tcpdump/files/extra-patch-print-802_11.c b/net/tcpdump/files/extra-patch-print-802_11.c
index fecd4dbbd1a0..571adc13b29d 100644
--- a/net/tcpdump/files/extra-patch-print-802_11.c
+++ b/net/tcpdump/files/extra-patch-print-802_11.c
@@ -1,5 +1,5 @@
---- print-802_11.c.orig	Tue Jul 22 18:36:57 2003
-+++ print-802_11.c	Wed Dec 10 18:56:16 2003
+--- print-802_11.c.orig	Wed Dec 10 09:52:33 2003
++++ print-802_11.c	Wed Mar 31 01:03:41 2004
 @@ -41,15 +41,20 @@
  
  #include "extract.h"
@@ -23,7 +23,7 @@
  		sep = " "; \
  	} \
  	if (p.rates.length != 0) \
-@@ -924,9 +929,194 @@
+@@ -919,9 +924,194 @@
  	return ieee802_11_print(p, h->len, h->caplen);
  }
  
@@ -218,7 +218,7 @@
  	u_int32_t caphdr_len;
  
  	caphdr_len = EXTRACT_32BITS(p + 4);
-@@ -977,7 +1167,7 @@
+@@ -972,7 +1162,7 @@
  	}
  
  	if (EXTRACT_32BITS(p) == WLANCAP_MAGIC_COOKIE_V1)
diff --git a/net/tcpdump/files/extra-patch-tcpdump.c b/net/tcpdump/files/extra-patch-tcpdump.c
index 27a98224c6f6..348eaa29bb46 100644
--- a/net/tcpdump/files/extra-patch-tcpdump.c
+++ b/net/tcpdump/files/extra-patch-tcpdump.c
@@ -1,5 +1,5 @@
---- tcpdump.c.orig	Wed Dec 10 19:04:45 2003
-+++ tcpdump.c	Wed Dec 10 19:09:25 2003
+--- tcpdump.c.orig	Wed Mar 17 19:47:48 2004
++++ tcpdump.c	Wed Mar 31 01:03:41 2004
 @@ -69,6 +69,12 @@
  #include "gmt2local.h"
  #include "pcap-missing.h"