[REPOCOPY WAITING] ports/net/nttcp and ports/net/ttcp appear miscategorized

    Julian Elischer suggested a new category "net/benchmarks" because
    he believes that too many ports are listed under net/.  Checking
    into it, I noticed that these two ports are described as
    benchmarking programs.  In the Porters' Handbook, the net
    category is described as "miscellaneous networking software".
    The benchmarks category seems more specific so I feel that it
    is preferable.

PR:		ports/39095
Submitted by:	Trevor Johnson <trevor@jpj.net>

11 files changed, 0 insertions, 368 deletions

diff --git a/net/Makefile b/net/Makefile
index 1f0b5b111105..f28d6d5f8a38 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -420,7 +420,6 @@
     SUBDIR += ntop
     SUBDIR += ntp
     SUBDIR += ntp-devel
-    SUBDIR += nttcp
     SUBDIR += nvnet
     SUBDIR += nylon
     SUBDIR += obnc
@@ -740,7 +739,6 @@
     SUBDIR += tridiavnc
     SUBDIR += tsclient
     SUBDIR += tsocks
-    SUBDIR += ttcp
     SUBDIR += ttlscan
     SUBDIR += ttt
     SUBDIR += tund
diff --git a/net/nttcp/Makefile b/net/nttcp/Makefile
deleted file mode 100644
index 3b5ee3b308ef..000000000000
--- a/net/nttcp/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# New ports collection makefile for:   nttcp
-# Date created:        11 Nov 1998
-# Whom:                Bill Fumerola <billf@chc-chimes.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	nttcp
-PORTVERSION=	1.47
-CATEGORIES=	net benchmarks
-MASTER_SITES=	http://www.leo.org/~bartel/nttcp/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	billf
-
-MAINTAINER=	billf@FreeBSD.org
-COMMENT=	A client/server program for testing network performance
-
-ALL_TARGET=	nttcp
-MAN1=		nttcp.1
-USE_GMAKE=	yes
-MAKE_ENV+=	OPT="${CFLAGS}"
-
-do-install:
-
-	${INSTALL_PROGRAM} ${WRKSRC}/nttcp ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/nttcp.1 ${PREFIX}/man/man1/
-
-.include <bsd.port.mk>
diff --git a/net/nttcp/distinfo b/net/nttcp/distinfo
deleted file mode 100644
index 2996a471a29e..000000000000
--- a/net/nttcp/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (nttcp-1.47.tar.gz) = 05cc30409e6f2cb8cfdf40334d1dcd77
diff --git a/net/nttcp/files/patch-aa b/net/nttcp/files/patch-aa
deleted file mode 100644
index 2692f87414dd..000000000000
--- a/net/nttcp/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.orig	Mon Dec 18 19:17:20 2000
-+++ Makefile	Mon Jan 29 12:26:51 2001
-@@ -111,8 +111,8 @@
- # For FreeBSD
- ARCH=	-DFreeBSD
- LIB=
--OPT=	-O2
--CC=	cc
-+#OPT=	-O2
-+#CC=	cc
- DBG=	
- INC=	
- 
diff --git a/net/nttcp/pkg-descr b/net/nttcp/pkg-descr
deleted file mode 100644
index a9fce2550164..000000000000
--- a/net/nttcp/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-This program is a much more convient version of the ttcp program.
-It uses inetd (or simulates its behaviour) to start off the remote
-side program which will send/receive data. Both sides measure the time
-and number of bytes transfered. The local side will print the measures.
-The format of the output can be specified on the commandline.
-
-WWW: http://www.leo.org/~bartel/nttcp/
-
-Bill Fumerola <billf@chc-chimes.com>
diff --git a/net/nttcp/pkg-plist b/net/nttcp/pkg-plist
deleted file mode 100644
index e64420d1b349..000000000000
--- a/net/nttcp/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/nttcp
diff --git a/net/ttcp/Makefile b/net/ttcp/Makefile
deleted file mode 100644
index 39d86ec414ae..000000000000
--- a/net/ttcp/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# New ports collection makefile for: ttcp
-# Date created:			Tue Jun  1 22:58:13 PDT 1999
-# Whom:				mharo@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ttcp
-PORTVERSION=	1.12
-CATEGORIES=	net benchmarks
-MASTER_SITES=	ftp://ftp.sgi.com/sgi/src/ttcp/
-DISTFILES=	ttcp.c ttcp.1 README
-
-MAINTAINER=	mharo@FreeBSD.org
-COMMENT=	Benchmarking tool for analysing TCP and UDP performance
-
-EXTRACT_ONLY=	#none
-NO_WRKSUBDIR=	yes
-MAN1=		ttcp.1
-
-post-extract:
-	${CP} ${DISTDIR}/ttcp.c ${WRKSRC}/
-	${CP} ${DISTDIR}/ttcp.1 ${WRKSRC}/
-	${CP} ${DISTDIR}/README ${WRKSRC}/
-
-do-build:
-	${CC} ${CFLAGS} -o ${WRKSRC}/ttcp ${WRKSRC}/ttcp.c
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ttcp ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/ttcp.1 ${PREFIX}/man/man1
-	${MKDIR} ${PREFIX}/share/doc/ttcp
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ttcp/
-
-.include <bsd.port.mk>
diff --git a/net/ttcp/distinfo b/net/ttcp/distinfo
deleted file mode 100644
index 980bbb75dedb..000000000000
--- a/net/ttcp/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (ttcp.c) = 3d1b75f6116cc246a4def9788ce58c26
-MD5 (ttcp.1) = 01d3a511a05dc8a0669f30c15ebaae82
-MD5 (README) = 6b1e5ff6247a9f284f3b58eb651b37a9
diff --git a/net/ttcp/files/patch-aa b/net/ttcp/files/patch-aa
deleted file mode 100644
index 80ebfdb8e6e6..000000000000
--- a/net/ttcp/files/patch-aa
+++ /dev/null
@@ -1,257 +0,0 @@
---- ttcp.c.orig	Thu Oct 18 12:26:35 2001
-+++ ttcp.c	Thu Oct 18 12:31:00 2001
-@@ -55,6 +55,9 @@
- #include <arpa/inet.h>
- #include <netdb.h>
- #include <sys/time.h>		/* struct timeval */
-+#include <unistd.h>
-+#include <string.h>
-+#include <stdlib.h>
- 
- #if defined(SYSV)
- #include <sys/times.h>
-@@ -133,7 +136,7 @@
- 
- void err();
- void mes();
--int pattern();
-+void pattern();
- void prep_timer();
- double read_timer();
- int Nread();
-@@ -147,6 +150,7 @@
- {
- }
- 
-+int
- main(argc,argv)
- int argc;
- char **argv;
-@@ -249,6 +253,7 @@
- #endif /* cray */
- 		}
- 		sinhim.sin_port = htons(port);
-+		sinme.sin_family = AF_INET;     /* Solaris needs this */
- 		sinme.sin_port = 0;		/* free choice */
- 	} else {
- 		/* rcvr */
-@@ -263,29 +268,31 @@
- 	if ( (buf = (char *)malloc(buflen+bufalign)) == (char *)NULL)
- 		err("malloc");
- 	if (bufalign != 0)
--		buf +=(bufalign - ((int)buf % bufalign) + bufoffset) % bufalign;
-+		buf += (bufalign
-+			-((unsigned long)buf % bufalign)
-+			+ bufoffset) % bufalign;
- 
- 	if (trans) {
--	    fprintf(stdout,
-+	    fprintf(stderr,
- 	    "ttcp-t: buflen=%d, nbuf=%d, align=%d/%d, port=%d",
- 		buflen, nbuf, bufalign, bufoffset, port);
-  	    if (sockbufsize)
-- 		fprintf(stdout, ", sockbufsize=%d", sockbufsize);
-- 	    fprintf(stdout, "  %s  -> %s\n", udp?"udp":"tcp", host);
-+ 		fprintf(stderr, ", sockbufsize=%d", sockbufsize);
-+ 	    fprintf(stderr, "  %s  -> %s\n", udp?"udp":"tcp", host);
- 	} else {
--	    fprintf(stdout,
-+	    fprintf(stderr,
-  	    "ttcp-r: buflen=%d, nbuf=%d, align=%d/%d, port=%d",
-  		buflen, nbuf, bufalign, bufoffset, port);
-  	    if (sockbufsize)
-- 		fprintf(stdout, ", sockbufsize=%d", sockbufsize);
-- 	    fprintf(stdout, "  %s\n", udp?"udp":"tcp");
-+ 		fprintf(stderr, ", sockbufsize=%d", sockbufsize);
-+ 	    fprintf(stderr, "  %s\n", udp?"udp":"tcp");
- 	}
- 
- 	if ((fd = socket(AF_INET, udp?SOCK_DGRAM:SOCK_STREAM, 0)) < 0)
- 		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 +333,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 +355,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");
- 		  }
-@@ -412,25 +419,25 @@
- 	}
- 	if( cput <= 0.0 )  cput = 0.001;
- 	if( realt <= 0.0 )  realt = 0.001;
--	fprintf(stdout,
-+	fprintf(stderr,
- 		"ttcp%s: %.0f bytes in %.2f real seconds = %s/sec +++\n",
- 		trans?"-t":"-r",
- 		nbytes, realt, outfmt(nbytes/realt));
- 	if (verbose) {
--	    fprintf(stdout,
-+	    fprintf(stderr,
- 		"ttcp%s: %.0f bytes in %.2f CPU seconds = %s/cpu sec\n",
- 		trans?"-t":"-r",
- 		nbytes, cput, outfmt(nbytes/cput));
- 	}
--	fprintf(stdout,
-+	fprintf(stderr,
- 		"ttcp%s: %d I/O calls, msec/call = %.2f, calls/sec = %.2f\n",
- 		trans?"-t":"-r",
- 		numCalls,
- 		1024.0 * realt/((double)numCalls),
- 		((double)numCalls)/realt);
--	fprintf(stdout,"ttcp%s: %s\n", trans?"-t":"-r", stats);
-+	fprintf(stderr,"ttcp%s: %s\n", trans?"-t":"-r", stats);
- 	if (verbose) {
--	    fprintf(stdout,
-+	    fprintf(stderr,
- 		"ttcp%s: buffer address %#x\n",
- 		trans?"-t":"-r",
- 		buf);
-@@ -459,6 +466,7 @@
- 	fprintf(stderr,"ttcp%s: %s\n", trans?"-t":"-r", s);
- }
- 
-+void
- pattern( cp, cnt )
- register char *cp;
- register int cnt;
-@@ -614,13 +622,13 @@
- 
- 		case 'U':
- 			tvsub(&tdiff, &r1->ru_utime, &r0->ru_utime);
--			sprintf(outp,"%d.%01d", tdiff.tv_sec, tdiff.tv_usec/100000);
-+			sprintf(outp,"%ld.%01ld", tdiff.tv_sec, tdiff.tv_usec/100000);
- 			END(outp);
- 			break;
- 
- 		case 'S':
- 			tvsub(&tdiff, &r1->ru_stime, &r0->ru_stime);
--			sprintf(outp,"%d.%01d", tdiff.tv_sec, tdiff.tv_usec/100000);
-+			sprintf(outp,"%ld.%01ld", tdiff.tv_sec, tdiff.tv_usec/100000);
- 			END(outp);
- 			break;
- 
-@@ -642,49 +650,49 @@
- 			break;
- 
- 		case 'X':
--			sprintf(outp,"%d", t == 0 ? 0 : (r1->ru_ixrss-r0->ru_ixrss)/t);
-+			sprintf(outp,"%ld", t == 0 ? 0 : (r1->ru_ixrss-r0->ru_ixrss)/t);
- 			END(outp);
- 			break;
- 
- 		case 'D':
--			sprintf(outp,"%d", t == 0 ? 0 :
-+			sprintf(outp,"%ld", t == 0 ? 0 :
- 			    (r1->ru_idrss+r1->ru_isrss-(r0->ru_idrss+r0->ru_isrss))/t);
- 			END(outp);
- 			break;
- 
- 		case 'K':
--			sprintf(outp,"%d", t == 0 ? 0 :
-+			sprintf(outp,"%ld", t == 0 ? 0 :
- 			    ((r1->ru_ixrss+r1->ru_isrss+r1->ru_idrss) -
- 			    (r0->ru_ixrss+r0->ru_idrss+r0->ru_isrss))/t);
- 			END(outp);
- 			break;
- 
- 		case 'M':
--			sprintf(outp,"%d", r1->ru_maxrss/2);
-+			sprintf(outp,"%ld", r1->ru_maxrss/2);
- 			END(outp);
- 			break;
- 
- 		case 'F':
--			sprintf(outp,"%d", r1->ru_majflt-r0->ru_majflt);
-+			sprintf(outp,"%ld", r1->ru_majflt-r0->ru_majflt);
- 			END(outp);
- 			break;
- 
- 		case 'R':
--			sprintf(outp,"%d", r1->ru_minflt-r0->ru_minflt);
-+			sprintf(outp,"%ld", r1->ru_minflt-r0->ru_minflt);
- 			END(outp);
- 			break;
- 
- 		case 'I':
--			sprintf(outp,"%d", r1->ru_inblock-r0->ru_inblock);
-+			sprintf(outp,"%ld", r1->ru_inblock-r0->ru_inblock);
- 			END(outp);
- 			break;
- 
- 		case 'O':
--			sprintf(outp,"%d", r1->ru_oublock-r0->ru_oublock);
-+			sprintf(outp,"%ld", r1->ru_oublock-r0->ru_oublock);
- 			END(outp);
- 			break;
- 		case 'C':
--			sprintf(outp,"%d+%d", r1->ru_nvcsw-r0->ru_nvcsw,
-+			sprintf(outp,"%ld+%ld", r1->ru_nvcsw-r0->ru_nvcsw,
- 				r1->ru_nivcsw-r0->ru_nivcsw );
- 			END(outp);
- 			break;
-@@ -743,6 +751,7 @@
- /*
-  *			N R E A D
-  */
-+int
- Nread( fd, buf, count )
- int fd;
- void *buf;
-@@ -752,7 +761,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 )
-@@ -774,6 +783,7 @@
- /*
-  *			N W R I T E
-  */
-+int
- Nwrite( fd, buf, count )
- int fd;
- void *buf;
-@@ -782,7 +792,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 +813,7 @@
- 
- 	tv.tv_sec = 0;
- 	tv.tv_usec = us;
--	(void)select( 1, (char *)0, (char *)0, (char *)0, &tv );
-+	(void)select( 1, NULL, NULL, NULL, &tv );
- }
- 
- /*
diff --git a/net/ttcp/pkg-descr b/net/ttcp/pkg-descr
deleted file mode 100644
index 9aec29eb0316..000000000000
--- a/net/ttcp/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-TTCP is a benchmarking tool for determining TCP and UDP performance 
-between 2 systems.
-
-The program was created at the US Army Ballistics Research Lab (BRL)
-and is in the public domain. Feel free to distribute this program
-but please do leave the credit notices in the source and man page intact.
-
-How to get TCP performance numbers:
-
-	receiver				sender
-
-host1%  ttcp -r -s			host2% ttcp -t -s host1
-
--n and -l options change the number and size of the buffers.
-
-WWW:	http://ftp.arl.mil/~mike/ttcp.html
diff --git a/net/ttcp/pkg-plist b/net/ttcp/pkg-plist
deleted file mode 100644
index 5d2266f36ebd..000000000000
--- a/net/ttcp/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/ttcp
-share/doc/ttcp/README
-@dirrm share/doc/ttcp