CVS commit: pkgsrc/benchmarks/bytebench

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Apr 21 16:23:10 UTC 2025

Modified Files:
        pkgsrc/benchmarks/bytebench: distinfo
        pkgsrc/benchmarks/bytebench/patches: patch-aa patch-ag

Log Message:
bytebench: remove Interix support


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/benchmarks/bytebench/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/benchmarks/bytebench/patches/patch-aa
cvs rdiff -u -r1.2 -r1.3 pkgsrc/benchmarks/bytebench/patches/patch-ag

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

Modified files:

Index: pkgsrc/benchmarks/bytebench/distinfo
diff -u pkgsrc/benchmarks/bytebench/distinfo:1.16 pkgsrc/benchmarks/bytebench/distinfo:1.17
--- pkgsrc/benchmarks/bytebench/distinfo:1.16   Tue Oct 26 10:02:51 2021
+++ pkgsrc/benchmarks/bytebench/distinfo        Mon Apr 21 16:23:09 2025
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.16 2021/10/26 10:02:51 nia Exp $
+$NetBSD: distinfo,v 1.17 2025/04/21 16:23:09 wiz Exp $
 
 BLAKE2s (unixbench-4.1.0.tgz) = bf26823f6ee38c49a21a0d7193ba9df95535b6c8983754d9bd933198fbc7bfab
 SHA512 (unixbench-4.1.0.tgz) = 4bca36cd2b5425c74aed58b34d2bbc1a4e5db9b9fe0c24946bacc239dc2ef9f643bb088e83c7b4b9682d92328bd3a8c0788855c887334c92f03e0ba9acb09480
 Size (unixbench-4.1.0.tgz) = 63075 bytes
-SHA1 (patch-aa) = e99170aaa9100486ef4e62387a0795dd4372f157
+SHA1 (patch-aa) = 454f70877aeac089451023b05e297148b0087a8d
 SHA1 (patch-ab) = 9e4fdf23a7a665b60ef8b18fe800f9fdbb66fb77
 SHA1 (patch-ac) = ebfb09da84c96f8c6f48293c65a74dcf8a43cff5
 SHA1 (patch-ad) = 3a1b788d9fa51fc168d59d8c87b1f476df2d5f41
 SHA1 (patch-ae) = fbbce3deed7f0421034c1d57b66b1967ad8bddf1
 SHA1 (patch-af) = 725a82ecb5f15ec47dda39d53a16027a0e4a7efd
-SHA1 (patch-ag) = 27014f92b6e15756a0b6b5ae9fdeca9dd7d261cc
+SHA1 (patch-ag) = 78a0f11f2222ff8bbc1a51ccb41b44933edc418c
 SHA1 (patch-dhry__1.c) = d83787bcb0af2c568efe1287ae73ff9d082d83b3

Index: pkgsrc/benchmarks/bytebench/patches/patch-aa
diff -u pkgsrc/benchmarks/bytebench/patches/patch-aa:1.6 pkgsrc/benchmarks/bytebench/patches/patch-aa:1.7
--- pkgsrc/benchmarks/bytebench/patches/patch-aa:1.6    Wed Jan  9 11:24:37 2002
+++ pkgsrc/benchmarks/bytebench/patches/patch-aa        Mon Apr 21 16:23:10 2025
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2002/01/09 11:24:37 jlam Exp $
+$NetBSD: patch-aa,v 1.7 2025/04/21 16:23:10 wiz Exp $
 
---- Run.orig   Wed Jul 28 15:04:47 1999
+--- Run.orig   1999-07-28 22:04:47.000000000 +0000
 +++ Run
-@@ -87,51 +87,50 @@
+@@ -87,51 +87,50 @@ else
        UNAME="uname -a"
  fi
  
@@ -68,12 +68,11 @@ $NetBSD: patch-aa,v 1.6 2002/01/09 11:24
  #
  cat ${BINDIR}/unixbench.logo # display banner
  rm -f ${TIMEACCUM}      # clean out old time accumulation file
-@@ -531,6 +530,8 @@
-       echo "=============================================================="
+@@ -532,5 +531,7 @@ if [ "$runoption" != Q ]; then
        cat $REPORTLOG
  fi
-+
-+rm -rf $TESTDIR
  
++rm -rf $TESTDIR
++
  exit 0
  ########################### Amen ######################

Index: pkgsrc/benchmarks/bytebench/patches/patch-ag
diff -u pkgsrc/benchmarks/bytebench/patches/patch-ag:1.2 pkgsrc/benchmarks/bytebench/patches/patch-ag:1.3
--- pkgsrc/benchmarks/bytebench/patches/patch-ag:1.2    Mon Nov  7 15:46:26 2005
+++ pkgsrc/benchmarks/bytebench/patches/patch-ag        Mon Apr 21 16:23:10 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 2005/11/07 15:46:26 joerg Exp $
+$NetBSD: patch-ag,v 1.3 2025/04/21 16:23:10 wiz Exp $
 
 --- src/fstime.c.orig  1999-07-28 21:47:02.000000000 +0000
 +++ src/fstime.c
@@ -11,23 +11,15 @@ $NetBSD: patch-ag,v 1.2 2005/11/07 15:46
  
  /******************** MAIN ****************************/
  
-@@ -149,13 +149,14 @@ int w_test(void)
+@@ -149,7 +149,6 @@ int w_test(void)
        unsigned long counted = 0L;
        unsigned long tmp;
        long f_blocks;
 -      extern int sigalarm;
  
-+#ifndef __INTERIX
        /* Sync and let it settle */
        sync();
-       sleep(2);
-       sync();
-       sleep(1);
-+#endif
- 
-       signal(SIGALRM,stop_count);
-       sigalarm = 0; /* reset alarm flag */
-@@ -176,6 +177,8 @@ int w_test(void)
+@@ -176,6 +175,8 @@ int w_test(void)
                lseek(f, 0L, 0); /* rewind */
        }
  
@@ -36,24 +28,16 @@ $NetBSD: patch-ag,v 1.2 2005/11/07 15:46
        /* stop clock */
        fprintf(stderr, "%d second sample\n", seconds);
        write_score = counted/((long)seconds * COUNTPERK);
-@@ -191,14 +194,14 @@ int r_test(void)
+@@ -191,8 +192,6 @@ int r_test(void)
  {
        unsigned long counted = 0L;
        unsigned long tmp;
 -      extern int sigalarm;
 -      extern int errno;
  
-+#ifndef __INTERIX
        /* Sync and let it settle */
        sync();
-       sleep(2 + seconds/4);
-       sync();
-       sleep(1 + seconds/4);
-+#endif
- 
-       /* rewind */
-       errno = 0;
-@@ -229,6 +232,8 @@ int r_test(void)
+@@ -229,6 +228,8 @@ int r_test(void)
                        counted += COUNTPERBUF;
        }
  
@@ -62,7 +46,7 @@ $NetBSD: patch-ag,v 1.2 2005/11/07 15:46
        /* stop clock */
        fprintf(stderr, "%d second sample\n", seconds);
        read_score = counted / ((long)seconds * COUNTPERK);
-@@ -244,7 +249,6 @@ int c_test(void)
+@@ -244,7 +245,6 @@ int c_test(void)
  {
        unsigned long counted = 0L;
        unsigned long tmp;
@@ -70,7 +54,7 @@ $NetBSD: patch-ag,v 1.2 2005/11/07 15:46
  
        sync();
        sleep(2 + seconds/4);
-@@ -309,7 +313,6 @@ int c_test(void)
+@@ -309,7 +309,6 @@ int c_test(void)
  
  void stop_count(void)
  {