Attachment #207131 for bug #210855




# $FreeBSD$

PORTNAME=	bonnie++
PORTVERSION=	1.98
CATEGORIES=	benchmarks
MASTER_SITES=	https://www.coker.com.au/bonnie++/



LICENSE=	GPLv2

USES=	shebangfix tar:tgz

USES=	shebangfix tar:tgz
SHEBANG_FILES=	bon_csv2txt.in

GNU_CONFIGURE=	yes

OPTIONS_DEFINE=	DOCS


Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1482419750	1	TIMESTAMP = 1567423456
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




--- Makefile.in.orig	2008-12-30 21:04:25 UTC
+++ Makefile.in
@@ -9,7 +9,7 @@ prefix=@prefix@
 eprefix=@exec_prefix@
 #MORE_WARNINGS=-Weffc++
 WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wwrite-strings -pedantic -ffor-scope -Wcast-align -Wsign-compare -Wpointer-arith -Wwrite-strings -Wformat-security -Wswitch-enum -Winit-self $(MORE_WARNINGS)
-CFLAGS=-O2 @debug@ -DNDEBUG $(WFLAGS) $(MORECFLAGS)
+CFLAGS=${CXXFLAGS} -DNDEBUG $(WFLAGS) $(MORECFLAGS)
 CXX=@CXX@ $(CFLAGS)
 LINK=@CXX@
 THREAD_LFLAGS=@thread_ldflags@
@@ -52,15 +52,15 @@ generate_randfile: generate_randfile.o
 	$(LINK) generate_randfile.o -o generate_randfile
 
 install-bin: $(EXE) $(EXES)
-	mkdir -p $(eprefix)/bin $(eprefix)/sbin
-	@INSTALL_PROGRAM@ @stripping@ $(EXES) $(eprefix)/sbin
-	@INSTALL_PROGRAM@ @stripping@ $(EXE) $(eprefix)/bin
-	@INSTALL_SCRIPT@ $(SCRIPTS) $(eprefix)/bin
+	mkdir -p $(DESTDIR)$(eprefix)/bin $(DESTDIR)$(eprefix)/sbin
+	@INSTALL_PROGRAM@ @stripping@ $(EXES) $(DESTDIR)$(eprefix)/sbin
+	@INSTALL_PROGRAM@ @stripping@ $(EXE) $(DESTDIR)$(eprefix)/bin
+	@INSTALL_SCRIPT@ $(SCRIPTS) $(DESTDIR)$(eprefix)/bin
 
 install: install-bin
-	mkdir -p @mandir@/man1 @mandir@/man8
-	@INSTALL_DATA@ $(MAN1) @mandir@/man1
-	@INSTALL_DATA@ $(MAN8) @mandir@/man8
+	mkdir -p $(DESTDIR)@mandir@/man1 $(DESTDIR)@mandir@/man8
+	@INSTALL_DATA@ $(MAN1) $(DESTDIR)@mandir@/man1
+	@INSTALL_DATA@ $(MAN8) $(DESTDIR)@mandir@/man8
 
 %.o: %.cpp
 	$(CXX) -c $<

Line 0 Link Here

(-)files/patch-bon_time.cpp (+11 lines)
	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




--- bonnie++.cpp.orig	2019-09-02 11:40:29 UTC
+++ bonnie++.cpp
@@ -298,11 +298,6 @@ int main(int argc, char *argv[])
       {
         char *sbuf = _strdup(optarg);
         char *size = strtok(sbuf, ":");
-#ifdef _LARGEFILE64_SOURCE
-        file_size = size_from_str(size, "gt");
-#else
-        file_size = size_from_str(size, "g");
-#endif
         char * chunk_size = strtok(NULL, ":");
         if(chunk_size)
         {
@@ -384,15 +380,6 @@
     if(file_size % 1024 > 512)
       file_size = file_size + 1024 - (file_size % 1024);
   }
-#ifndef _LARGEFILE64_SOURCE
-  if(file_size == 2048)
-    file_size = 2047;
-  if(file_size > 2048)
-  {
-    fprintf(stderr, "Large File Support not present, can't do %dM.\n", file_size);
-    usage();
-  }
-#endif
   globals.byte_io_size = min(file_size, globals.byte_io_size);
   globals.byte_io_size = max(0, globals.byte_io_size);
 
@@ -465,14 +452,6 @@
      && (directory_max_size < directory_min_size || directory_max_size < 0
      || directory_min_size < 0) )
     usage();
-#ifndef _LARGEFILE64_SOURCE
-  if(file_size > (1 << (31 - 20 + globals.io_chunk_bits)) )
-  {
-    fprintf(stderr
-   , "The small chunk size and large IO size make this test impossible in 32bit.\n");
-    usage();
-  }
-#endif
   if(file_size && globals.ram && (file_size * concurrency) < (globals.ram * 2) )
   {
     fprintf(stderr




bin/bon_csv2html
bin/bon_csv2txt
bin/generate_randfile
sbin/bonnie++
sbin/getc_putc
sbin/getc_putc_helper
sbin/zcav
man/man1/bon_csv2html.1.gz
man/man1/bon_csv2txt.1.gz
man/man1/generate_randfile.1.gz
man/man8/bonnie++.8.gz
man/man8/getc_putc.8.gz
man/man8/zcav.8.gz

Return to bug 210855

Lines 2-8 Link Here

(-)Makefile (-4 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
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-22 Link Here
11		11
12	LICENSE= GPLv2	12	LICENSE= GPLv2
13		13
14	GNU_CONFIGURE= yes	14	USES= shebangfix tar:tgz
15		15
16	USES= shebangfix tar:tgz
17	SHEBANG_FILES= bon_csv2txt.in	16	SHEBANG_FILES= bon_csv2txt.in
18		17
19	PORTDOCS= readme.html	18	GNU_CONFIGURE= yes
20		19
21	OPTIONS_DEFINE= DOCS	20	OPTIONS_DEFINE= DOCS
22		21

Lines 1-34 Link Here

(-)files/patch-Makefile.in (-34 lines)
1	--- Makefile.in.orig 2008-12-30 21:04:25 UTC
2	+++ Makefile.in
3	@@ -9,7 +9,7 @@ prefix=@prefix@
4	eprefix=@exec_prefix@
5	#MORE_WARNINGS=-Weffc++
6	WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wwrite-strings -pedantic -ffor-scope -Wcast-align -Wsign-compare -Wpointer-arith -Wwrite-strings -Wformat-security -Wswitch-enum -Winit-self $(MORE_WARNINGS)
7	-CFLAGS=-O2 @debug@ -DNDEBUG $(WFLAGS) $(MORECFLAGS)
8	+CFLAGS=${CXXFLAGS} -DNDEBUG $(WFLAGS) $(MORECFLAGS)
9	CXX=@CXX@ $(CFLAGS)
10	LINK=@CXX@
11	THREAD_LFLAGS=@thread_ldflags@
12	@@ -52,15 +52,15 @@ generate_randfile: generate_randfile.o
13	$(LINK) generate_randfile.o -o generate_randfile
14
15	install-bin: $(EXE) $(EXES)
16	- mkdir -p $(eprefix)/bin $(eprefix)/sbin
17	- @INSTALL_PROGRAM@ @stripping@ $(EXES) $(eprefix)/sbin
18	- @INSTALL_PROGRAM@ @stripping@ $(EXE) $(eprefix)/bin
19	- @INSTALL_SCRIPT@ $(SCRIPTS) $(eprefix)/bin
20	+ mkdir -p $(DESTDIR)$(eprefix)/bin $(DESTDIR)$(eprefix)/sbin
21	+ @INSTALL_PROGRAM@ @stripping@ $(EXES) $(DESTDIR)$(eprefix)/sbin
22	+ @INSTALL_PROGRAM@ @stripping@ $(EXE) $(DESTDIR)$(eprefix)/bin
23	+ @INSTALL_SCRIPT@ $(SCRIPTS) $(DESTDIR)$(eprefix)/bin
24
25	install: install-bin
26	- mkdir -p @mandir@/man1 @mandir@/man8
27	- @INSTALL_DATA@ $(MAN1) @mandir@/man1
28	- @INSTALL_DATA@ $(MAN8) @mandir@/man8
29	+ mkdir -p $(DESTDIR)@mandir@/man1 $(DESTDIR)@mandir@/man8
30	+ @INSTALL_DATA@ $(MAN1) $(DESTDIR)@mandir@/man1
31	+ @INSTALL_DATA@ $(MAN8) $(DESTDIR)@mandir@/man8
32
33	%.o: %.cpp
34	$(CXX) -c $<

Lines 1-45 Link Here

(-)files/patch-bonnie++.cpp (-37 / +6 lines)
1	--- bonnie++.cpp.orig 2016-06-30 09:41:41.000000000 +0000	1	--- bonnie++.cpp.orig 2019-09-02 11:40:29 UTC
2	+++ bonnie++.cpp 2016-10-18 19:52:40.381679719 +0000	2	+++ bonnie++.cpp
3	@@ -294,11 +294,7 @@	3	@@ -298,11 +298,6 @@ int main(int argc, char *argv[])
4	{	4	{
5	char *sbuf = _strdup(optarg);	5	char *sbuf = _strdup(optarg);
6	char *size = strtok(sbuf, ":");	6	char *size = strtok(sbuf, ":");
7	-#ifdef _LARGEFILE64_SOURCE	7	-#ifdef _LARGEFILE64_SOURCE
8	file_size = size_from_str(size, "gt");	8	- file_size = size_from_str(size, "gt");
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 @@
16	if(file_size % 1024 > 512)
17	file_size = file_size + 1024 - (file_size % 1024);
18	}
19	-#ifndef _LARGEFILE64_SOURCE
20	- if(file_size == 2048)
21	- file_size = 2047;
22	- if(file_size > 2048)
23	- {
24	- fprintf(stderr, "Large File Support not present, can't do %dM.\n", file_size);
25	- usage();
26	- }
27	-#endif
28	globals.byte_io_size = min(file_size, globals.byte_io_size);
29	globals.byte_io_size = max(0, globals.byte_io_size);
30
31	@@ -465,14 +452,6 @@
32	&& (directory_max_size < directory_min_size \|\| directory_max_size < 0
33	\|\| directory_min_size < 0) )
34	usage();
35	-#ifndef _LARGEFILE64_SOURCE
36	- if(file_size > (1 << (31 - 20 + globals.io_chunk_bits)) )
37	- {
38	- fprintf(stderr
39	- , "The small chunk size and large IO size make this test impossible in 32bit.\n");
40	- usage();
41	- }
42	-#endif
43	if(file_size && globals.ram && (file_size * concurrency) < (globals.ram * 2) )
44	{
45	fprintf(stderr

Lines 1-13 Link Here

(-)pkg-plist (-13 lines)
1	bin/bon_csv2html
2	bin/bon_csv2txt
3	bin/generate_randfile
4	sbin/bonnie++
5	sbin/getc_putc
6	sbin/getc_putc_helper
7	sbin/zcav
8	man/man1/bon_csv2html.1.gz
9	man/man1/bon_csv2txt.1.gz
10	man/man1/generate_randfile.1.gz
11	man/man8/bonnie++.8.gz
12	man/man8/getc_putc.8.gz
13	man/man8/zcav.8.gz