5 files changed, 3 insertions, 47 deletions

diff --git a/net/tcptrace/Makefile b/net/tcptrace/Makefile
index 3c9d9aecc695..a6482e921b78 100644
--- a/net/tcptrace/Makefile
+++ b/net/tcptrace/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	tcptrace
-PORTVERSION=	5.2.1
+PORTVERSION=	6.0.0b2
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.tcptrace.org/download/
-DISTNAME=	tcptrace.5.2.1
+DISTNAME=	tcptrace.${PORTVERSION}
 
 MAINTAINER=	fenner@FreeBSD.org
 
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/tcptrace_5.2.1
 ALL_TARGET=	tcptrace
 
 MAN1=		tcptrace.1
diff --git a/net/tcptrace/distinfo b/net/tcptrace/distinfo
index 5f32717967d8..6f3a89c42df8 100644
--- a/net/tcptrace/distinfo
+++ b/net/tcptrace/distinfo
@@ -1 +1 @@
-MD5 (tcptrace.5.2.1.tar.gz) = 2f182bede17f3be0f5d0ba9736463149
+MD5 (tcptrace.6.0.0b2.tar.gz) = 4d84b7ad0aeb94449b62e1dd77f0ea68
diff --git a/net/tcptrace/files/patch-aa b/net/tcptrace/files/patch-aa
deleted file mode 100644
index a308c6d804b6..000000000000
--- a/net/tcptrace/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Thu Jan 20 18:41:25 2000
-+++ Makefile.in	Thu Jan 20 18:42:01 2000
-@@ -179,7 +179,7 @@
- # easily.
- #
- filt_parser.c: filt_parser.y filter.h
--	bison -vd -p filtyy filt_parser.y -o filt_parser.c
-+	byacc -vd -p filtyy -o filt_parser.c filt_parser.y
- 	cp filt_parser.c flex_bison
- 	cp filt_parser.h flex_bison
- filt_scanner.c: filt_scanner.l filter.h filt_parser.h
diff --git a/net/tcptrace/files/patch-ab b/net/tcptrace/files/patch-ab
index 5b80baf8eda3..31de76718aa8 100644
--- a/net/tcptrace/files/patch-ab
+++ b/net/tcptrace/files/patch-ab
@@ -1,15 +1,6 @@
 /usr/bin/diff --ignore-matching-lines=.*{$Id:|$Header:}.* -u tcptrace.h.orig tcptrace.h
 --- tcptrace.h.orig	Fri Mar  9 17:30:34 2001
 +++ tcptrace.h	Fri Mar  9 17:31:08 2001
-@@ -485,7 +485,7 @@
- 
- /* external routine decls */
- double sqrt(double x);
--char *ether_ntoa(struct ether_addr *e);
-+char *shawn_ether_ntoa(struct ether_addr *e);
- void free(void *);
- int finite(double);
- 
 @@ -681,7 +680,9 @@
  #define IPTOS_CE	0x01	/* Experienced Congestion */
  
diff --git a/net/tcptrace/files/patch-ac b/net/tcptrace/files/patch-ac
deleted file mode 100644
index e9f23879ff75..000000000000
--- a/net/tcptrace/files/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
-/usr/bin/diff --ignore-matching-lines=.*{$Id:|$Header:}.* -u print.c.orig print.c
---- print.c.orig	Fri Mar  9 17:33:16 2001
-+++ print.c	Fri Mar  9 17:34:12 2001
-@@ -110,8 +110,8 @@
- printeth_packet(
-     struct ether_header *pep)
- {
--    printf("\tETH Srce: %s\n", ether_ntoa((struct ether_addr *)&pep->ether_shost));
--    printf("\tETH Dest: %s\n", ether_ntoa((struct ether_addr *)&pep->ether_dhost));
-+    printf("\tETH Srce: %s\n", shawn_ether_ntoa((struct ether_addr *)&pep->ether_shost));
-+    printf("\tETH Dest: %s\n", shawn_ether_ntoa((struct ether_addr *)&pep->ether_dhost));
- 
-     printf(
- 	hex?"\t    Type: 0x%x %s\n":"\t    Type: %d %s\n",
-@@ -708,7 +708,7 @@
- /* and it messes up my cross-platform testing.  I'll just do it the */
- /* "one true" way!  :-)  */
- char *
--ether_ntoa (struct ether_addr *e)
-+shawn_ether_ntoa (struct ether_addr *e)
- {
-     unsigned char *pe;
-     static char buf[30];