CVS commit: pkgsrc/benchmarks/ttcp

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Tue Oct  7 03:56:39 UTC 2025

Modified Files:
        pkgsrc/benchmarks/ttcp: distinfo
        pkgsrc/benchmarks/ttcp/patches: patch-ab

Log Message:
Fix build with GCC 14: add missing types mostly.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/benchmarks/ttcp/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/benchmarks/ttcp/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/benchmarks/ttcp/distinfo
diff -u pkgsrc/benchmarks/ttcp/distinfo:1.16 pkgsrc/benchmarks/ttcp/distinfo:1.17
--- pkgsrc/benchmarks/ttcp/distinfo:1.16        Tue Oct 26 10:02:56 2021
+++ pkgsrc/benchmarks/ttcp/distinfo     Tue Oct  7 03:56:38 2025
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2021/10/26 10:02:56 nia Exp $
+$NetBSD: distinfo,v 1.17 2025/10/07 03:56:38 mrg Exp $
 
 BLAKE2s (ttcp.tar.Z) = fe18886043572d131fe3d1fadde58d5a858ff353a4e596a8df078e433dd50a03
 SHA512 (ttcp.tar.Z) = 15b988b3ec701fa1edd5d4020cc2207c180bf0ee3fb221459e8061f3fb704082cb1e6d2b18c9c80b22e1e7c0f44de6ba33f2d1e5b5ad7400a0eb4b2838e14e13
 Size (ttcp.tar.Z) = 18163 bytes
 SHA1 (patch-aa) = 96e3a9136bae4057682d2b3cfea2ec8c8bb21eaa
-SHA1 (patch-ab) = 5d04ee46ae5bb015c8834e18fe2f2e301c5059b4
+SHA1 (patch-ab) = 4068c223a1b353c12933d15f66c6944d00638cb2

Index: pkgsrc/benchmarks/ttcp/patches/patch-ab
diff -u pkgsrc/benchmarks/ttcp/patches/patch-ab:1.10 pkgsrc/benchmarks/ttcp/patches/patch-ab:1.11
--- pkgsrc/benchmarks/ttcp/patches/patch-ab:1.10        Sat Jul  4 16:11:53 2015
+++ pkgsrc/benchmarks/ttcp/patches/patch-ab     Tue Oct  7 03:56:39 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.10 2015/07/04 16:11:53 bsiegert Exp $
+$NetBSD: patch-ab,v 1.11 2025/10/07 03:56:39 mrg Exp $
 
 Fix build.
 
---- ttcp.c.orig        1997-02-27 21:30:23.000000000 +0000
-+++ ttcp.c
-@@ -44,17 +44,19 @@ static char RCSid[] = "ttcp.c $Revision:
+--- ttcp.c.orig        1997-02-27 13:30:23.000000000 -0800
++++ ttcp.c     2025-09-29 15:13:42.037611645 -0700
+@@ -44,17 +44,20 @@ static char RCSid[] = "ttcp.c $Revision:
  /* #define BSD41a */
  /* #define SYSV */    /* required on SGI IRIX releases before 3.3 */
  
@@ -25,10 +25,11 @@ Fix build.
  #include <sys/time.h>         /* struct timeval */
 +#include <stdlib.h>
 +#include <string.h>
++#include <unistd.h>
  
  #if defined(SYSV)
  #include <sys/times.h>
-@@ -71,7 +73,8 @@ struct sockaddr_in sinme;
+@@ -71,7 +74,8 @@ struct sockaddr_in sinme;
  struct sockaddr_in sinhim;
  struct sockaddr_in frominet;
  
@@ -38,7 +39,7 @@ Fix build.
  int fd;                               /* fd of network socket */
  
  int buflen = 8 * 1024;                /* length of buffer */
-@@ -99,7 +102,6 @@ char fmt = 'K';                     /* output format: k = 
+@@ -99,7 +103,6 @@ char fmt = 'K';                     /* output format: k = 
  int touchdata = 0;            /* access data after reading */
  
  struct hostent *addr;
@@ -46,7 +47,12 @@ Fix build.
  extern int optind;
  extern char *optarg;
  
-@@ -151,7 +153,7 @@ main(argc,argv)
+@@ -147,11 +150,11 @@ sigpipe()
+ {
+ }
+ 
+-main(argc,argv)
++int main(argc,argv)
  int argc;
  char **argv;
  {
@@ -55,7 +61,7 @@ Fix build.
        int c;
  
        if (argc < 2) goto usage;
-@@ -263,29 +265,30 @@ char **argv;
+@@ -263,29 +266,30 @@ char **argv;
        if ( (buf = (char *)malloc(buflen+bufalign)) == (char *)NULL)
                err("malloc");
        if (bufalign != 0)
@@ -93,7 +99,7 @@ Fix build.
                err("bind");
  
  #if defined(SO_SNDBUF) || defined(SO_RCVBUF)
-@@ -326,7 +329,7 @@ char **argv;
+@@ -326,7 +330,7 @@ char **argv;
                        mes("nodelay");
                }
  #endif
@@ -102,7 +108,7 @@ Fix build.
                        err("connect");
                mes("connect");
            } else {
-@@ -348,11 +351,11 @@ char **argv;
+@@ -348,11 +352,11 @@ char **argv;
                }
                fromlen = sizeof(frominet);
                domain = AF_INET;
@@ -117,7 +123,7 @@ Fix build.
                                &peerlen) < 0) {
                        err("getpeername");
                  }
-@@ -412,25 +415,25 @@ char **argv;
+@@ -412,25 +416,25 @@ char **argv;
        }
        if( cput <= 0.0 )  cput = 0.001;
        if( realt <= 0.0 )  realt = 0.001;
@@ -148,7 +154,16 @@ Fix build.
                "ttcp%s: buffer address %#x\n",
                trans?"-t":"-r",
                buf);
-@@ -488,13 +491,13 @@ double b;
+@@ -459,7 +463,7 @@ char *s;
+       fprintf(stderr,"ttcp%s: %s\n", trans?"-t":"-r", s);
+ }
+ 
+-pattern( cp, cnt )
++int pattern( cp, cnt )
+ register char *cp;
+ register int cnt;
+ {
+@@ -488,13 +492,13 @@ double b;
            sprintf(obuf, "%.2f MB", b / 1024.0 / 1024.0);
            break;
        case 'g':
@@ -165,7 +180,22 @@ Fix build.
            break;
      }
      return obuf;
-@@ -749,10 +752,10 @@ void *buf;
+@@ -554,6 +558,7 @@ prep_timer()
+ double
+ read_timer(str,len)
+ char *str;
++int len;
+ {
+       struct timeval timedol;
+       struct rusage ru1;
+@@ -743,16 +748,17 @@ register char *cp;
+ /*
+  *                    N R E A D
+  */
++int
+ Nread( fd, buf, count )
+ int fd;
+ void *buf;
  int count;
  {
        struct sockaddr_in from;
@@ -178,7 +208,15 @@ Fix build.
                numCalls++;
        } else {
                if( b_flag )
-@@ -782,7 +785,7 @@ int count;
+@@ -774,6 +780,7 @@ int count;
+ /*
+  *                    N W R I T E
+  */
++int
+ Nwrite( fd, buf, count )
+ int fd;
+ void *buf;
+@@ -782,7 +789,7 @@ int count;
        register int cnt;
        if( udp )  {
  again:
@@ -187,7 +225,14 @@ Fix build.
                numCalls++;
                if( cnt<0 && errno == ENOBUFS )  {
                        delay(18000);
-@@ -803,7 +806,7 @@ delay(us)
+@@ -797,13 +804,13 @@ again:
+ }
+ 
+ void
+-delay(us)
++delay(int us)
+ {
+       struct timeval tv;
  
        tv.tv_sec = 0;
        tv.tv_usec = us;