Move "ttcp" package to category "benchmarks".

7 files changed, 1 insertions, 134 deletions

diff --git a/net/Makefile b/net/Makefile
index e58dc8584c5..18154c61409 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.211 2001/04/09 12:25:53 lukem Exp $
+# $NetBSD: Makefile,v 1.212 2001/04/17 11:57:42 tron Exp $
 #
 
 COMMENT=	Networking tools
@@ -149,7 +149,6 @@ SUBDIR+=	tkined
 SUBDIR+=	tn5250
 SUBDIR+=	totd
 SUBDIR+=	trafshow
-SUBDIR+=	ttcp
 SUBDIR+=	ttt
 SUBDIR+=	ucd-snmp
 SUBDIR+=	ucd-snmp-current
diff --git a/net/ttcp/Makefile b/net/ttcp/Makefile
deleted file mode 100644
index 708584b44ee..00000000000
--- a/net/ttcp/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2001/02/17 18:19:48 wiz Exp $
-
-DISTNAME=	ttcp
-PKGNAME=	${DISTNAME}-1.12
-CATEGORIES=	net benchmarks
-MASTER_SITES=	http://www.ccci.com/tools/ttcp/
-EXTRACT_SUFX=	.tar.Z
-
-MAINTAINER=	thorpej@netbsd.org
-HOMEPAGE=	http://www.ccci.com/tools/ttcp/
-COMMENT=	TCP testing and performance measuring tool
-
-.include "../../mk/bsd.prefs.mk"
-
-MANCOMPRESSED_IF_MANZ=	YES
-WRKSRC=			${WRKDIR}
-
-.if (${OPSYS} == SunOS)
-do-build:
-	cd ${WRKSRC} && \
-	${CC} ttcp.c ${CFLAGS} $(LDFLAGS) -lsocket -lnsl -o ttcp && \
-	nroff -man ttcp.1 >ttcp.cat1
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/net/ttcp/distinfo b/net/ttcp/distinfo
deleted file mode 100644
index 51f2de0f7e5..00000000000
--- a/net/ttcp/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1 2001/04/17 11:54:16 agc Exp $
-
-MD5 (ttcp.tar.Z) = 3688ca186d5da6fd83ade7c6a0150b1d
-SHA1 (patch-aa) = 19d81ba1e6bfaf6527eb8fce29f2276c89f9a35e
-SHA1 (patch-ab) = 888878128e67dfb88d9898a27af765334264e6ef
diff --git a/net/ttcp/patches/patch-aa b/net/ttcp/patches/patch-aa
deleted file mode 100644
index 8a81fa7a81b..00000000000
--- a/net/ttcp/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.5 1998/08/07 11:11:02 agc Exp $
-
---- Makefile.orig	Sat Mar  7 13:39:48 1998
-+++ Makefile	Sat Mar  7 13:40:07 1998
-@@ -0,0 +1,9 @@
-+
-+PROG=	ttcp
-+
-+BINDIR=${PREFIX}/bin
-+MANDIR=${PREFIX}/man
-+
-+MANINSTALL=	maninstall catinstall
-+
-+.include <bsd.prog.mk>
diff --git a/net/ttcp/patches/patch-ab b/net/ttcp/patches/patch-ab
deleted file mode 100644
index cd97fd6fc0b..00000000000
--- a/net/ttcp/patches/patch-ab
+++ /dev/null
@@ -1,79 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2000/01/10 01:24:41 wiz Exp $
---- ttcp.c.orig	Fri Aug  6 15:30:21 1999
-+++ ttcp.c	Fri Aug  6 15:30:21 1999
-@@ -55,6 +55,7 @@
- #include <arpa/inet.h>
- #include <netdb.h>
- #include <sys/time.h>		/* struct timeval */
-+#include <stdlib.h>
- 
- #if defined(SYSV)
- #include <sys/times.h>
-@@ -263,7 +264,7 @@
- 	if ( (buf = (char *)malloc(buflen+bufalign)) == (char *)NULL)
- 		err("malloc");
- 	if (bufalign != 0)
--		buf +=(bufalign - ((int)buf % bufalign) + bufoffset) % bufalign;
-+		buf +=(bufalign - ((u_long)buf % bufalign) + bufoffset) % bufalign;
- 
- 	if (trans) {
- 	    fprintf(stdout,
-@@ -285,7 +286,7 @@
- 		err("socket");
- 	mes("socket");
- 
--	if (bind(fd, &sinme, sizeof(sinme)) < 0)
-+	if (bind(fd, (struct sockaddr *)&sinme, sizeof(sinme)) < 0)
- 		err("bind");
- 
- #if defined(SO_SNDBUF) || defined(SO_RCVBUF)
-@@ -326,7 +327,7 @@
- 			mes("nodelay");
- 		}
- #endif
--		if(connect(fd, &sinhim, sizeof(sinhim) ) < 0)
-+		if(connect(fd, (struct sockaddr *)&sinhim, sizeof(sinhim) ) < 0)
- 			err("connect");
- 		mes("connect");
- 	    } else {
-@@ -348,11 +349,11 @@
- 		}
- 		fromlen = sizeof(frominet);
- 		domain = AF_INET;
--		if((fd=accept(fd, &frominet, &fromlen) ) < 0)
-+		if((fd=accept(fd, (struct sockaddr *)&frominet, &fromlen) ) < 0)
- 			err("accept");
- 		{ struct sockaddr_in peer;
- 		  int peerlen = sizeof(peer);
--		  if (getpeername(fd, (struct sockaddr_in *) &peer, 
-+		  if (getpeername(fd, (struct sockaddr *) &peer, 
- 				&peerlen) < 0) {
- 			err("getpeername");
- 		  }
-@@ -752,7 +753,7 @@
- 	int len = sizeof(from);
- 	register int cnt;
- 	if( udp )  {
--		cnt = recvfrom( fd, buf, count, 0, &from, &len );
-+		cnt = recvfrom( fd, buf, count, 0, (struct sockaddr *)&from, &len );
- 		numCalls++;
- 	} else {
- 		if( b_flag )
-@@ -782,7 +783,7 @@
- 	register int cnt;
- 	if( udp )  {
- again:
--		cnt = sendto( fd, buf, count, 0, &sinhim, sizeof(sinhim) );
-+		cnt = sendto( fd, buf, count, 0, (struct sockaddr *)&sinhim, sizeof(sinhim) );
- 		numCalls++;
- 		if( cnt<0 && errno == ENOBUFS )  {
- 			delay(18000);
-@@ -803,7 +804,7 @@
- 
- 	tv.tv_sec = 0;
- 	tv.tv_usec = us;
--	(void)select( 1, (char *)0, (char *)0, (char *)0, &tv );
-+	(void)select( 1, (void *)0, (void *)0, (void *)0, &tv );
- }
- 
- /*
diff --git a/net/ttcp/pkg/DESCR b/net/ttcp/pkg/DESCR
deleted file mode 100644
index 9db116e1eb5..00000000000
--- a/net/ttcp/pkg/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Ttcp (test TCP) times the transmission and reception of data  between two
-systems  using  the UDP or TCP protocols.  It differs from common ``blast''
-tests, which  tend  to  measure  the remote inetd as much as the network
-performance, and which usually do not allow measurements at the remote end
-of a UDP transmission.
diff --git a/net/ttcp/pkg/PLIST b/net/ttcp/pkg/PLIST
deleted file mode 100644
index ae0e886af72..00000000000
--- a/net/ttcp/pkg/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 1998/03/07 13:57:00 tron Exp $
-bin/ttcp
-man/cat1/ttcp.0
-man/man1/ttcp.1