Update to tcptrace 4.1.3, and make the package work on NetBSD.

6 files changed, 10 insertions, 67 deletions

diff --git a/net/tcptrace/Makefile b/net/tcptrace/Makefile
index a2e4125bf99..a18738d9dca 100644
--- a/net/tcptrace/Makefile
+++ b/net/tcptrace/Makefile
@@ -1,16 +1,20 @@
+#	$NetBSD: Makefile,v 1.2 1997/12/14 22:42:57 thorpej Exp $
+#
 # New ports collection makefile for:	tcptrace
-# Version required:	4.0.2
+# Version required:	4.1.3
 # Date created:		3 March 1997
 # Whom:			fenner
 #
 # Id: Makefile,v 1.3 1997/07/19 19:43:36 fenner Exp
 #
 
-DISTNAME=	tcptrace-4.0.2
+DISTNAME=	tcptrace-4.1.3
 CATEGORIES=	net
-MASTER_SITES=	http://jarok.cs.ohiou.edu/software/tcptrace/files/4.0.2/
+MASTER_SITES=	http://jarok.cs.ohiou.edu/software/tcptrace/files/4.1.3/
 DISTFILES=	tcptrace.tar.gz
 
+GNU_CONFIGURE=	yes
+
 MAINTAINER=	fenner@FreeBSD.ORG
 
 WRKSRC=		${WRKDIR}/tcptrace
@@ -18,7 +22,7 @@ ALL_TARGET=	tcptrace
 
 DOCFILES=	COPYRIGHT README README.tput_graphs
 
-post-install:
+install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tcptrace ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/tcptrace
diff --git a/net/tcptrace/files/md5 b/net/tcptrace/files/md5
index 84f3f61af98..3433b6b4eb8 100644
--- a/net/tcptrace/files/md5
+++ b/net/tcptrace/files/md5
@@ -1 +1 @@
-MD5 (tcptrace.tar.gz) = 6e23d8585ba8c939cac4863fd7e39876
+MD5 (tcptrace.tar.gz) = 30a1638b8c92f64623cdf1867a543b6f
diff --git a/net/tcptrace/patches/patch-aa b/net/tcptrace/patches/patch-aa
deleted file mode 100644
index 39c56268534..00000000000
--- a/net/tcptrace/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile.orig	Wed Jul 16 14:55:15 1997
-+++ Makefile	Wed Jul 16 14:58:25 1997
-@@ -38,8 +38,9 @@
- #
- #CFLAGS	= -g -O3 -fno-builtin -Wall ${INCS} ${DEFINES}
- #
--CFLAGS	= -g -O3 -fno-builtin -Wall ${INCS} ${DEFINES}
-+#CFLAGS	= -g -O3 -fno-builtin -Wall ${INCS} ${DEFINES}
- 
-+CFLAGS += -fno-builtin ${INCS} ${DEFINES}
- 
- # for profiling (under Solaris 5.2)
- #CFLAGS	+= -pg
-@@ -68,7 +69,7 @@
- # for general Unix boxes (I hope)
- # LDLIBS = -lpcap -lm
- #
--LDLIBS = -lnsl -lsocket -lm -lpcap
-+LDLIBS = -lpcap -lm
- 
- 
- 
-@@ -86,6 +87,7 @@
- tcptrace: ${OFILES}
- 	${CC} ${LDFLAGS} ${CFLAGS} ${OFILES} -o tcptrace ${LDLIBS}
- 
-+install:	tcptrace
- 
- #
- # obvious dependencies
diff --git a/net/tcptrace/patches/patch-ab b/net/tcptrace/patches/patch-ab
deleted file mode 100644
index 0c77ba1c752..00000000000
--- a/net/tcptrace/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
---- missing.c.orig	Sat Jul 19 12:27:08 1997
-+++ missing.c	Sat Jul 19 12:28:53 1997
-@@ -5,7 +5,14 @@
- #include <stdio.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <sys/time.h>
- #include <net/if.h>
-+#if __FreeBSD__ >= 2
-+#include <osreldate.h>
-+#if __FreeBSD_version >= 300000
-+#include <net/if_var.h>
-+#endif          
-+#endif
- #include <netinet/in.h>
- #include <netinet/if_ether.h>
- 
diff --git a/net/tcptrace/patches/patch-ac b/net/tcptrace/patches/patch-ac
deleted file mode 100644
index dcf713683cc..00000000000
--- a/net/tcptrace/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
---- tcptrace.h.orig	Wed Jul 16 08:39:54 1997
-+++ tcptrace.h	Wed Jul 16 15:00:27 1997
-@@ -38,6 +38,12 @@
- #include <sys/time.h>
- #include <sys/socket.h>
- #include <net/if.h>
-+#if __FreeBSD__ >= 2
-+#include <osreldate.h>
-+#if __FreeBSD_version >= 300000
-+#include <net/if_var.h>
-+#endif
-+#endif          
- #include <netinet/in.h>
- #include <netinet/in_systm.h>
- #include <arpa/inet.h>
diff --git a/net/tcptrace/pkg/PLIST b/net/tcptrace/pkg/PLIST
index 3dfba5bbe47..8ecde0d27af 100644
--- a/net/tcptrace/pkg/PLIST
+++ b/net/tcptrace/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $NetBSD: PLIST,v 1.2 1997/12/14 22:43:10 thorpej Exp $
 bin/tcptrace
 share/doc/tcptrace/COPYRIGHT
 share/doc/tcptrace/README