[87444] trunk/dports/benchmarks/bonniexx
takanori at macports.org
takanori at macports.org
Mon Nov 21 17:01:28 PST 2011
Revision: 87444
http://trac.macports.org/changeset/87444
Author: takanori at macports.org
Date: 2011-11-21 17:01:22 -0800 (Mon, 21 Nov 2011)
Log Message:
-----------
bonniexx: version 1.96 (#32070)
Modified Paths:
--------------
trunk/dports/benchmarks/bonniexx/Portfile
trunk/dports/benchmarks/bonniexx/files/patch-bonnie++.cpp
trunk/dports/benchmarks/bonniexx/files/patch-zcav.8
Added Paths:
-----------
trunk/dports/benchmarks/bonniexx/files/patch-bonnie.h.in.diff
trunk/dports/benchmarks/bonniexx/files/patch-port.h.in
trunk/dports/benchmarks/bonniexx/files/patch-zcav.cpp
trunk/dports/benchmarks/bonniexx/files/patch-zcav_io.cpp
Removed Paths:
-------------
trunk/dports/benchmarks/bonniexx/files/patch-bonnie++.8
trunk/dports/benchmarks/bonniexx/files/patch-getc_putc.cpp
Modified: trunk/dports/benchmarks/bonniexx/Portfile
===================================================================
--- trunk/dports/benchmarks/bonniexx/Portfile 2011-11-21 23:15:42 UTC (rev 87443)
+++ trunk/dports/benchmarks/bonniexx/Portfile 2011-11-22 01:01:22 UTC (rev 87444)
@@ -3,7 +3,7 @@
PortSystem 1.0
name bonniexx
-version 1.93c
+version 1.96
categories benchmarks
maintainers mac.com:lomion
description Disk and FS performance tester
@@ -16,27 +16,32 @@
that a single number can be useful when comparing \
such things.
platforms darwin
+license GPL-2
homepage http://www.coker.com.au/bonnie++/
master_sites http://www.coker.com.au/bonnie++/experimental/
-checksums sha1 85f670f5b82accb62ca2cff82e94cbbaefd5aedb
+checksums rmd160 f2bbcfb6b17b2baa0d268046aa8a994f6b41bfee
distname bonnie++-${version}
extract.suffix .tgz
patchfiles patch-Makefile.in \
- patch-bonnie++.8 \
patch-bonnie++.cpp \
- patch-getc_putc.cpp \
- patch-zcav.8
+ patch-bonnie.h.in.diff \
+ patch-port.h.in \
+ patch-zcav.8 \
+ patch-zcav.cpp \
+ patch-zcav_io.cpp
pre-patch {
reinplace "s|/usr/share/|${prefix}/share/|g" ${worksrcpath}/bonnie++.8 \
}
destroot { xinstall -m 755 -d "${destroot}${prefix}/bin" \
+ "${destroot}${prefix}/sbin" \
"${destroot}${prefix}/share/man/man1" \
"${destroot}${prefix}/share/man/man8" \
"${destroot}${prefix}/share/doc/bonnie++"
- xinstall -m 755 -W ${worksrcpath} bonnie++ zcav bon_csv2html bon_csv2txt ${destroot}${prefix}/bin
- xinstall -m 644 -W ${worksrcpath} bon_csv2html.1 bon_csv2txt.1 ${destroot}${prefix}/share/man/man1
- xinstall -m 644 -W ${worksrcpath} bonnie++.8 zcav.8 ${destroot}${prefix}/share/man/man8
- xinstall -m 644 ${worksrcpath}/readme.html ${destroot}${prefix}/share/doc/bonnie++
+ xinstall -m 755 -W ${worksrcpath} bon_csv2html generate_randfile ${destroot}${prefix}/bin
+ xinstall -m 755 -W ${worksrcpath} bonnie++ zcav getc_putc getc_putc_helper ${destroot}${prefix}/sbin
+ xinstall -m 644 -W ${worksrcpath} bon_csv2html.1 bon_csv2txt.1 generate_randfile.1 ${destroot}${prefix}/share/man/man1
+ xinstall -m 644 -W ${worksrcpath} bonnie++.8 zcav.8 getc_putc.8 ${destroot}${prefix}/share/man/man8
+ xinstall -m 644 -W ${worksrcpath} README-2.00 README.txt changelog.txt copyright.txt credits.txt readme.html ${destroot}${prefix}/share/doc/bonnie++
}
Deleted: trunk/dports/benchmarks/bonniexx/files/patch-bonnie++.8
===================================================================
--- trunk/dports/benchmarks/bonniexx/files/patch-bonnie++.8 2011-11-21 23:15:42 UTC (rev 87443)
+++ trunk/dports/benchmarks/bonniexx/files/patch-bonnie++.8 2011-11-22 01:01:22 UTC (rev 87444)
@@ -1,9 +0,0 @@
---- bonnie++.8.orig Sun Sep 9 16:25:02 2001
-+++ bonnie++.8 Sun Sep 9 16:25:43 2001
-@@ -194,4 +194,5 @@
-
- .SH "SEE ALSO"
- .BR bon_csv2html (1),
--.BR bon_csv2txt (1)
-+.BR bon_csv2txt (1) ,
-+.BR zcav (8)
Modified: trunk/dports/benchmarks/bonniexx/files/patch-bonnie++.cpp
===================================================================
--- trunk/dports/benchmarks/bonniexx/files/patch-bonnie++.cpp 2011-11-21 23:15:42 UTC (rev 87443)
+++ trunk/dports/benchmarks/bonniexx/files/patch-bonnie++.cpp 2011-11-22 01:01:22 UTC (rev 87444)
@@ -1,8 +1,6 @@
-$FreeBSD: /repoman/r/pcvs/ports/benchmarks/bonnie++/files/patch-bonnie++.cpp,v 1.3 2003/12/21 03:19:28 petef Exp $
-
---- bonnie++.cpp.orig Mon Aug 25 17:08:46 2003
-+++ bonnie++.cpp Mon Aug 25 17:08:46 2003
-@@ -322,11 +322,7 @@
+--- bonnie++.cpp.orig 2009-07-03 11:38:14.000000000 +0900
++++ bonnie++.cpp 2011-11-22 08:42:45.000000000 +0900
+@@ -294,11 +294,7 @@
{
char *sbuf = _strdup(optarg);
char *size = strtok(sbuf, ":");
@@ -14,7 +12,7 @@
size = strtok(NULL, "");
if(size)
{
-@@ -411,15 +407,6 @@
+@@ -384,15 +380,6 @@
if(file_size % 1024 > 512)
file_size = file_size + 1024 - (file_size % 1024);
}
@@ -30,7 +28,7 @@
globals.byte_io_size = __min(file_size, globals.byte_io_size);
globals.byte_io_size = __max(0, globals.byte_io_size);
-@@ -503,14 +490,6 @@
+@@ -465,14 +452,6 @@
&& (directory_max_size < directory_min_size || directory_max_size < 0
|| directory_min_size < 0) )
usage();
Added: trunk/dports/benchmarks/bonniexx/files/patch-bonnie.h.in.diff
===================================================================
--- trunk/dports/benchmarks/bonniexx/files/patch-bonnie.h.in.diff (rev 0)
+++ trunk/dports/benchmarks/bonniexx/files/patch-bonnie.h.in.diff 2011-11-22 01:01:22 UTC (rev 87444)
@@ -0,0 +1,11 @@
+--- bonnie.h.in.orig 2009-07-03 12:39:33.000000000 +0900
++++ bonnie.h.in 2011-11-22 09:33:23.000000000 +0900
+@@ -22,7 +22,7 @@
+ // data includes index to which directory (6 bytes) and terminating '\0' for
+ // the name and pointer to file name
+ #define MaxDataPerFile (MaxNameLen + 6 + 1 + sizeof(void *))
+-#define MinTime (0.5)
++#define MinTime (0.01)
+ #define Seeks (8192)
+ #define UpdateSeek (10)
+ #define SeekProcCount (5)
Deleted: trunk/dports/benchmarks/bonniexx/files/patch-getc_putc.cpp
===================================================================
--- trunk/dports/benchmarks/bonniexx/files/patch-getc_putc.cpp 2011-11-21 23:15:42 UTC (rev 87443)
+++ trunk/dports/benchmarks/bonniexx/files/patch-getc_putc.cpp 2011-11-22 01:01:22 UTC (rev 87444)
@@ -1,11 +0,0 @@
---- getc_putc.cpp.org 2006-11-26 00:02:44.000000000 -0800
-+++ getc_putc.cpp 2006-11-26 00:03:50.000000000 -0800
-@@ -16,6 +16,8 @@
-
- #include "duration.h"
- #include "getc_putc.h"
-+#include <sys/param.h>
-+#define min MIN
-
- static void usage()
- {
Added: trunk/dports/benchmarks/bonniexx/files/patch-port.h.in
===================================================================
--- trunk/dports/benchmarks/bonniexx/files/patch-port.h.in (rev 0)
+++ trunk/dports/benchmarks/bonniexx/files/patch-port.h.in 2011-11-22 01:01:22 UTC (rev 87444)
@@ -0,0 +1,21 @@
+--- port.h.in.orig 2009-08-21 18:45:50.068536643 +0000
++++ port.h.in 2009-08-21 18:45:58.564755017 +0000
+@@ -3,18 +3,8 @@
+
+ #include "conf.h"
+
+-#ifndef HAVE_MIN_MAX
+-#if defined(HAVE_ALGO_H) || defined(HAVE_ALGO)
+-#ifdef HAVE_ALGO
+-#include <algo>
+-#else
+-#include <algo.h>
+-#endif
+-#else
+ #define min(XX,YY) ((XX) < (YY) ? (XX) : (YY))
+ #define max(XX,YY) ((XX) > (YY) ? (XX) : (YY))
+-#endif
+-#endif
+
+ @semun@
+ @bool@
Modified: trunk/dports/benchmarks/bonniexx/files/patch-zcav.8
===================================================================
--- trunk/dports/benchmarks/bonniexx/files/patch-zcav.8 2011-11-21 23:15:42 UTC (rev 87443)
+++ trunk/dports/benchmarks/bonniexx/files/patch-zcav.8 2011-11-22 01:01:22 UTC (rev 87444)
@@ -1,8 +1,8 @@
---- zcav.8.orig Sun Sep 9 16:26:11 2001
-+++ zcav.8 Sun Sep 9 16:26:33 2001
-@@ -72,6 +72,9 @@
- parameter, just a different way to specify it for compatibility with other
- programs.
+--- zcav.8.orig 2009-08-21 07:13:21.319089995 +0000
++++ zcav.8 2009-08-21 07:14:03.189181585 +0000
+@@ -95,6 +95,9 @@
+ .B \-w
+ write zero blocks to the disk instead of reading from the disk - will destroy data!
+.SH "SEE ALSO"
+.BR bonnie++ (8)
Added: trunk/dports/benchmarks/bonniexx/files/patch-zcav.cpp
===================================================================
--- trunk/dports/benchmarks/bonniexx/files/patch-zcav.cpp (rev 0)
+++ trunk/dports/benchmarks/bonniexx/files/patch-zcav.cpp 2011-11-22 01:01:22 UTC (rev 87444)
@@ -0,0 +1,34 @@
+--- zcav.cpp.orig 2009-08-24 07:31:32.060913886 +0000
++++ zcav.cpp 2009-08-24 07:33:16.257389975 +0000
+@@ -15,9 +15,7 @@
+ , "Usage: zcav [-b block-size[:chunk-size]] [-c count]\n"
+ " [-r [start offset:]end offset] [-w]\n"
+ " [-u uid-to-use:gid-to-use] [-g gid-to-use]\n"
+-#ifdef _LARGEFILE64_SOURCE
+ " [-s skip rate]\n"
+-#endif
+ " [-l log-file] [-f] file-name\n"
+ " [-l log-file [-f] file-name]...\n"
+ "\n"
+@@ -186,9 +184,7 @@
+ const char *log = "-";
+ const char *file = "";
+ while(-1 != (c = getopt(argc, argv, "-c:b:f:l:r:w"
+-#ifdef _LARGEFILE64_SOURCE
+ "s:"
+-#endif
+ "u:g:")) )
+ {
+ switch(char(c))
+@@ -225,11 +221,9 @@
+ }
+ }
+ break;
+-#ifdef _LARGEFILE64_SOURCE
+ case 's':
+ mz.setSkipRate(atoi(optarg));
+ break;
+-#endif
+ case 'g':
+ if(groupName)
+ usage();
Added: trunk/dports/benchmarks/bonniexx/files/patch-zcav_io.cpp
===================================================================
--- trunk/dports/benchmarks/bonniexx/files/patch-zcav_io.cpp (rev 0)
+++ trunk/dports/benchmarks/bonniexx/files/patch-zcav_io.cpp 2011-11-22 01:01:22 UTC (rev 87444)
@@ -0,0 +1,33 @@
+--- zcav_io.cpp.orig 2009-08-24 07:36:02.677798155 +0000
++++ zcav_io.cpp 2009-08-24 07:36:40.688614055 +0000
+@@ -83,7 +83,6 @@
+ for(int loops = 0; !exiting && loops < max_loops; loops++)
+ {
+ int i = 0;
+-#ifdef _LARGEFILE64_SOURCE
+ if(start_offset)
+ {
+ OFF_TYPE real_offset = OFF_TYPE(start_offset) * OFF_TYPE(m_block_size) * OFF_TYPE(1<<20);
+@@ -96,7 +95,6 @@
+ i = start_offset;
+ }
+ else
+-#endif
+ if(lseek(m_fd, 0, SEEK_SET))
+ {
+ fprintf(stderr, "Can't lseek().\n");
+@@ -224,14 +222,12 @@
+ // Read/write a block of data
+ double ZcavRead::access_data(int skip)
+ {
+-#ifdef _LARGEFILE64_SOURCE
+ if(skip)
+ {
+ OFF_TYPE real_offset = OFF_TYPE(skip) * OFF_TYPE(m_block_size) * OFF_TYPE(1<<20);
+ if(file_lseek(m_fd, real_offset, SEEK_CUR) == OFF_TYPE(-1))
+ return -1.0;
+ }
+-#endif
+
+ m_dur.start();
+ for(int i = 0; i < m_block_size; i+= m_chunk_size)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111121/9ad5db6c/attachment.html>
More information about the macports-changes
mailing list