 @@ -1,179 +1,181 @@
-$NetBSD: patch-ab,v 1.8 2005/12/21 11:49:51 tron Exp $
+$NetBSD: patch-ab,v 1.9 2013/12/17 15:05:23 tron Exp $
 Fix build.
 --- ttcp.c.orig	1997-02-27 21:30:23.000000000 +0000
 +++ ttcp.c	2005-12-21 11:40:39.000000000 +0000
 @@ -44,17 +44,19 @@
  /* #define BSD41a */
  /* #define SYSV */	/* required on SGI IRIX releases before 3.3 */
 -#include <stdio.h>
 -#include <signal.h>
 -#include <ctype.h>
 -#include <errno.h>
  #include <sys/types.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
  #include <netinet/tcp.h>
  #include <arpa/inet.h>
 +#include <stdio.h>
 +#include <signal.h>
 +#include <ctype.h>
 +#include <errno.h>
  #include <netdb.h>
  #include <sys/time.h>		/* struct timeval */
 +#include <stdlib.h>
 +#include <string.h>
  #if defined(SYSV)
  #include <sys/times.h>
 @@ -71,7 +73,8 @@
  struct sockaddr_in sinhim;
  struct sockaddr_in frominet;
 -int domain, fromlen;
 +int domain;
 +socklen_t fromlen;
  int fd;				/* fd of network socket */
  int buflen = 8 * 1024;		/* length of buffer */
 @@ -99,7 +102,6 @@
  int touchdata = 0;		/* access data after reading */
  struct hostent *addr;
 -extern int errno;
  extern int optind;
  extern char *optarg;
 @@ -151,7 +153,7 @@
  int argc;
  char **argv;
+ {
 -	unsigned long addr_tmp;
 +	in_addr_t addr_tmp;
  	int c;
  	if (argc < 2) goto usage;
 @@ -263,29 +265,30 @@
  	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,
 +	    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(stderr, ", sockbufsize=%d", sockbufsize);
   	    fprintf(stdout, "  %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)
 +	sinme.sin_family = AF_INET;
 +	if (bind(fd, (struct sockaddr *)&sinme, sizeof(sinme)) < 0)
  		err("bind");
  #if defined(SO_SNDBUF) || defined(SO_RCVBUF)
 @@ -326,7 +329,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 +351,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,
 +		  socklen_t peerlen = sizeof(peer);
 +		  if (getpeername(fd, (struct sockaddr *) &peer,
  				&peerlen) < 0) {
  			err("getpeername");
+ 		  }
 @@ -412,25 +415,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,
 .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);
 @@ -749,10 +752,10 @@
  int count;
+ {
  	struct sockaddr_in from;
 -	int len = sizeof(from);
 +	socklen_t 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 +785,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 +806,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 );
+ }
  /*

 @@ -1,39 +1,40 @@
-# $NetBSD: Makefile,v 1.20 2012/09/11 22:37:15 asau Exp $
+# $NetBSD: Makefile,v 1.21 2013/12/17 15:05:23 tron Exp $
 DISTNAME=	ttcp
 PKGNAME=	${DISTNAME}-1.12
 PKGREVISION=	2
 CATEGORIES=	benchmarks net
-MASTER_SITES=	ftp://ftp.ptb.de/pub/benchmarks/
+#MASTER_SITES=	ftp://ftp.ptb.de/pub/benchmarks/
 EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.ccci.com/tools/ttcp/
 COMMENT=	TCP testing and performance measuring tool
 LICENSE=	public-domain
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_BSD_MAKEFILE=	yes
 USE_TOOLS+=		nroff
 MAKE_ENV+=		NOGCCERROR=yes
 WRKSRC=			${WRKDIR}
 .include "../../mk/bsd.prefs.mk"
 MANCOMPRESSED_IF_MANZ=	YES
 #.if (${OPSYS} == Darwin)
 #CFLAGS+=	"-Din_addr_t=\"unsigned long\""
 #MAKE_FLAGS+=	CFLAGS=${CFLAGS:Q}
 #.endif
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
 .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"

 @@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2007/01/18 11:28:00 rillig Exp $
+$NetBSD: distinfo,v 1.12 2013/12/17 15:05:23 tron Exp $
 SHA1 (ttcp.tar.Z) = 33a60af208eff3dc9ae745060f44b24c4e74aa7e
 RMD160 (ttcp.tar.Z) = b5cb1a8efe0f716d25d58a4950f35bac47b17668
 Size (ttcp.tar.Z) = 18163 bytes
-SHA1 (patch-aa) = 4ef0fe369d4836a4de758a4cd62fda4785a471b7
+SHA1 (patch-aa) = 96e3a9136bae4057682d2b3cfea2ec8c8bb21eaa
-SHA1 (patch-ab) = a4419e0ee02a8b6d30ac13913f45fc9f5f9d7746
+SHA1 (patch-ab) = 265c19e05e22ce9fff7596b7b1efca0c07a7f4e0

 @@ -1,8 +1,10 @@
-$NetBSD: patch-aa,v 1.3 2007/01/18 11:28:00 rillig Exp $
+$NetBSD: patch-aa,v 1.4 2013/12/17 15:05:23 tron Exp $
 Fix build.
 --- Makefile.orig	Tue Mar 26 16:19:05 2002
 +++ Makefile
 @@ -0,0 +1,3 @@
 +PROG=	ttcp
++
 +.include <bsd.prog.mk>