View | Details | Raw Unified | Return to bug 210854 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-3 / +3 lines)
Lines 2-8 Link Here
2
# $FreeBSD: head/Makefile 451953 2017-10-13 08:09:19Z bapt $
2
# $FreeBSD: head/Makefile 451953 2017-10-13 08:09:19Z bapt $
3
3
4
PORTNAME=	bonnie++
4
PORTNAME=	bonnie++
5
PORTVERSION=	1.97.3
5
PORTVERSION=	1.98
6
CATEGORIES=	benchmarks
6
CATEGORIES=	benchmarks
7
MASTER_SITES=	https://www.coker.com.au/bonnie++/
7
MASTER_SITES=	https://www.coker.com.au/bonnie++/
8
8
Lines 11-19 Link Here
11
11
12
LICENSE=	GPLv2
12
LICENSE=	GPLv2
13
13
14
GNU_CONFIGURE=	yes
15
16
USES=	shebangfix tar:tgz
14
USES=	shebangfix tar:tgz
15
16
GNU_CONFIGURE=	yes
17
SHEBANG_FILES=	bon_csv2txt.in
17
SHEBANG_FILES=	bon_csv2txt.in
18
18
19
PORTDOCS=	readme.html
19
PORTDOCS=	readme.html
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1482419750
1
TIMESTAMP = 1567440456
2
SHA256 (bonnie++-1.97.3.tgz) = e27b386ae0dc054fa7b530aab6bdead7aea6337a864d1f982bc9ebacb320746e
2
SHA256 (bonnie++-1.98.tgz) = 6e0bcbc08b78856fd998dd7bcb352d4615a99c26c2dc83d5b8345b102bad0b04
3
SIZE (bonnie++-1.97.3.tgz) = 100166
3
SIZE (bonnie++-1.98.tgz) = 100339
(-)files/patch-bon_time.cpp (+11 lines)
Line 0 Link Here
1
--- bon_time.cpp.orig	2019-09-02 11:43:11 UTC
2
+++ bon_time.cpp
3
@@ -146,7 +146,7 @@ int BonTimer::print_stat(tests_t test, i
4
         }
5
         else
6
         {
7
-          fprintf(m_fp, " %5d", stat);
8
+          fprintf(m_fp, " %5f", stat);
9
         }
10
       }
11
       else
(-)files/patch-bonnie++.cpp (-7 / +7 lines)
Lines 1-6 Link Here
1
--- bonnie++.cpp.orig	2016-06-30 09:41:41.000000000 +0000
1
--- bonnie++.cpp.orig	2019-09-02 18:10:39.852145000 +0200
2
+++ bonnie++.cpp	2016-10-18 19:52:40.381679719 +0000
2
+++ bonnie++.cpp	2019-09-02 18:12:18.027222000 +0200
3
@@ -294,11 +294,7 @@
3
@@ -298,11 +298,7 @@
4
       {
4
       {
5
         char *sbuf = _strdup(optarg);
5
         char *sbuf = _strdup(optarg);
6
         char *size = strtok(sbuf, ":");
6
         char *size = strtok(sbuf, ":");
Lines 9-18 Link Here
9
-#else
9
-#else
10
-        file_size = size_from_str(size, "g");
10
-        file_size = size_from_str(size, "g");
11
-#endif
11
-#endif
12
         size = strtok(NULL, "");
12
         char * chunk_size = strtok(NULL, ":");
13
         if(size)
13
         if(chunk_size)
14
         {
14
         {
15
@@ -384,15 +380,6 @@
15
@@ -398,15 +394,6 @@
16
     if(file_size % 1024 > 512)
16
     if(file_size % 1024 > 512)
17
       file_size = file_size + 1024 - (file_size % 1024);
17
       file_size = file_size + 1024 - (file_size % 1024);
18
   }
18
   }
Lines 28-34 Link Here
28
   globals.byte_io_size = min(file_size, globals.byte_io_size);
28
   globals.byte_io_size = min(file_size, globals.byte_io_size);
29
   globals.byte_io_size = max(0, globals.byte_io_size);
29
   globals.byte_io_size = max(0, globals.byte_io_size);
30
 
30
 
31
@@ -465,14 +452,6 @@
31
@@ -479,14 +466,6 @@
32
      && (directory_max_size < directory_min_size || directory_max_size < 0
32
      && (directory_max_size < directory_min_size || directory_max_size < 0
33
      || directory_min_size < 0) )
33
      || directory_min_size < 0) )
34
     usage();
34
     usage();
(-)getc_putc_helper.cpp (-1 / +1 lines)
Lines 45-51 int main(int argc, char *argv[]) Link Here
45
    return 1;
45
    return 1;
46
  }
46
  }
47
  fflush(NULL);
47
  fflush(NULL);
48
  TEST_FUNC_READ("getc() no thread", if( (c = getc(fp)) == EOF), res[1]);
48
  TEST_FUNC_READ("getc() no thread", if( (c = getc(fp)) == (unsigned char)EOF), res[1]);
49
  if(fseek(fp, 0, SEEK_SET) != 0)
49
  if(fseek(fp, 0, SEEK_SET) != 0)
50
  {
50
  {
51
    fprintf(stderr, "Can't seek.\n");
51
    fprintf(stderr, "Can't seek.\n");
(-)getc_putc.cpp (-2 / +2 lines)
Lines 206-212 int main(int argc, char *argv[]) Link Here
206
    return 1;
206
    return 1;
207
  }
207
  }
208
  fflush(NULL);
208
  fflush(NULL);
209
  TEST_FUNC_READ("getc()", if( (c = getc(fp)) == EOF), res[Getc]);
209
  TEST_FUNC_READ("getc()", if( (c = getc(fp)) == (unsigned char)EOF), res[Getc]);
210
  if(fseek(fp, 0, SEEK_SET) != 0)
210
  if(fseek(fp, 0, SEEK_SET) != 0)
211
  {
211
  {
212
    fprintf(stderr, "Can't seek.\n");
212
    fprintf(stderr, "Can't seek.\n");
Lines 221-227 int main(int argc, char *argv[]) Link Here
221
    return 1;
221
    return 1;
222
  }
222
  }
223
  fflush(NULL);
223
  fflush(NULL);
224
  TEST_FUNC_READ("getc_unlocked()", if( (c = getc_unlocked(fp)) == EOF), res[GetcUnlocked]);
224
  TEST_FUNC_READ("getc_unlocked()", if( (c = getc_unlocked(fp)) == (unsigned char)EOF), res[GetcUnlocked]);
225
225
226
  if(!quiet)
226
  if(!quiet)
227
    printf("done\n");
227
    printf("done\n");

Return to bug 210854