Attachment 207097 Details for Bug 210855 – svn-diff-bonnie++

[patch] svn-diff-bonnie++

svn-diff-bonnie++ (text/plain), 6.39 KB, created by Walter Schwarzenfeld on 2019-09-02 11:59:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2019-09-02 11:59:15 UTC

Size: 6.39 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 510776)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	bonnie++
>-PORTVERSION=	1.97.3
>+PORTVERSION=	1.98
> CATEGORIES=	benchmarks
> MASTER_SITES=	https://www.coker.com.au/bonnie++/
> 
>@@ -16,7 +16,7 @@
> USES=	shebangfix tar:tgz
> SHEBANG_FILES=	bon_csv2txt.in
> 
>-PORTDOCS=	readme.html
>+#PORTDOCS=	readme.html
> 
> OPTIONS_DEFINE=	DOCS
> 
>@@ -28,4 +28,5 @@
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/readme.html ${STAGEDIR}${DOCSDIR}
> 
>+
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 510776)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1482419750
>-SHA256 (bonnie++-1.97.3.tgz) = e27b386ae0dc054fa7b530aab6bdead7aea6337a864d1f982bc9ebacb320746e
>-SIZE (bonnie++-1.97.3.tgz) = 100166
>+TIMESTAMP = 1567423456
>+SHA256 (bonnie++-1.98.tgz) = 6e0bcbc08b78856fd998dd7bcb352d4615a99c26c2dc83d5b8345b102bad0b04
>+SIZE (bonnie++-1.98.tgz) = 100339
>Index: files/patch-Makefile.in
>===================================================================
>--- files/patch-Makefile.in	(revision 510776)
>+++ files/patch-Makefile.in	(nonexistent)
>@@ -1,34 +0,0 @@
>---- 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 $<
>
>Property changes on: files/patch-Makefile.in
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-bon_time.cpp
>===================================================================
>--- files/patch-bon_time.cpp	(nonexistent)
>+++ files/patch-bon_time.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- bon_time.cpp.orig	2019-09-02 11:43:11 UTC
>++++ bon_time.cpp
>+@@ -146,7 +146,7 @@ int BonTimer::print_stat(tests_t test, i
>+         }
>+         else
>+         {
>+-          fprintf(m_fp, " %5d", stat);
>++          fprintf(m_fp, " %5f", stat);
>+         }
>+       }
>+       else
>
>Property changes on: files/patch-bon_time.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-bonnie++.cpp
>===================================================================
>--- files/patch-bonnie++.cpp	(revision 510776)
>+++ files/patch-bonnie++.cpp	(working copy)
>@@ -1,45 +1,14 @@
>---- bonnie++.cpp.orig	2016-06-30 09:41:41.000000000 +0000
>-+++ bonnie++.cpp	2016-10-18 19:52:40.381679719 +0000
>-@@ -294,11 +294,7 @@
>+--- 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");
>+-        file_size = size_from_str(size, "gt");
> -#else
> -        file_size = size_from_str(size, "g");
> -#endif
>-         size = strtok(NULL, "");
>-         if(size)
>+         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
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 510776)
>+++ pkg-plist	(nonexistent)
>@@ -1,13 +0,0 @@
>-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
>
>Property changes on: pkg-plist
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 210855: 207097 | 207131 | 207156 | 207172 | 207173 | 207198 | 207210