Attachment #99116 for bug #138132

View | Details | Raw Unified | Return to bug 138132
Collapse All | Expand All

Lines 7-16 Link Here

(-)bonnie++/Makefile (-2 / +1 lines)
7	#	7	#
8		8
9	PORTNAME= bonnie++	9	PORTNAME= bonnie++
10	PORTVERSION= 1.93.04 # a=01, b=02, c=03, ..., z=26, etc...	10	PORTVERSION= 1.96
11	CATEGORIES= benchmarks	11	CATEGORIES= benchmarks
12	MASTER_SITES= http://www.coker.com.au/bonnie++/experimental/	12	MASTER_SITES= http://www.coker.com.au/bonnie++/experimental/
13	DISTNAME= ${PORTNAME}-1.93d
14	EXTRACT_SUFX= .tgz	13	EXTRACT_SUFX= .tgz
15		14
16	MAINTAINER= ganael.laplanche@martymac.com	15	MAINTAINER= ganael.laplanche@martymac.com

Lines 1-3 Link Here

(-)bonnie++/distinfo (-3 / +3 lines)
1	MD5 (bonnie++-1.93d.tgz) = 7725dcd5230a412dc3619eacc1cf6609	1	MD5 (bonnie++-1.96.tgz) = 7b8594559f00887d2865de1838328b35
2	SHA256 (bonnie++-1.93d.tgz) = 68992f83eb72df15ab5db9d475ed30b371979f3c8b31d9ac8d21639f3aea96ca	2	SHA256 (bonnie++-1.96.tgz) = 9c9d87bf09ac5a42a915ceeb9d8bb8358c0ca4642d86b85ed48ca5f15ee3456c
3	SIZE (bonnie++-1.93d.tgz) = 123637	3	SIZE (bonnie++-1.96.tgz) = 105183

Lines 1-9 Link Here

(-)bonnie++/files/patch-bonnie++.8 (-9 lines)
1	--- bonnie++.8.orig Sun Sep 9 16:25:02 2001
2	+++ bonnie++.8 Sun Sep 9 16:25:43 2001
3	@@ -194,4 +194,5 @@
4
5	.SH "SEE ALSO"
6	.BR bon_csv2html (1),
7	-.BR bon_csv2txt (1)
8	+.BR bon_csv2txt (1) ,
9	+.BR zcav (8)




--- getc_putc.cpp.orig	Sun Dec  9 06:50:24 2001
+++ getc_putc.cpp	Wed Mar  5 14:32:58 2003
@@ -17,6 +17,12 @@
 #include "duration.h"
 #include "getc_putc.h"
 
+#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) || defined(__ia64__)
+/* Work around for: line 168, no matching function for call to `min(long unsigned int, unsigned int)' */
+#include <sys/param.h>
+#define min MIN
+#endif
+
 static void usage()
 {
   fprintf(stderr, "usage:\n"

Line 0 Link Here

(-)bonnie++/files/patch-port.h.in (+21 lines)
	1	--- port.h.in.orig 2009-08-21 18:45:50.068536643 +0000
	2	+++ port.h.in 2009-08-21 18:45:58.564755017 +0000
	3	@@ -3,18 +3,8 @@
	4
	5	#include "conf.h"
	6
	7	-#ifndef HAVE_MIN_MAX
	8	-#if defined(HAVE_ALGO_H) \|\| defined(HAVE_ALGO)
	9	-#ifdef HAVE_ALGO
	10	-#include <algo>
	11	-#else
	12	-#include <algo.h>
	13	-#endif
	14	-#else
	15	#define min(XX,YY) ((XX) < (YY) ? (XX) : (YY))
	16	#define max(XX,YY) ((XX) > (YY) ? (XX) : (YY))
	17	-#endif
	18	-#endif
	19
	20	@semun@
	21	@bool@

Lines 1-8 Link Here

(-)bonnie++/files/patch-zcav.8 (-5 / +5 lines)
1	--- zcav.8.orig Sun Sep 9 16:26:11 2001	1	--- zcav.8.orig 2009-08-21 07:13:21.319089995 +0000
2	+++ zcav.8 Sun Sep 9 16:26:33 2001	2	+++ zcav.8 2009-08-21 07:14:03.189181585 +0000
3	@@ -72,6 +72,9 @@	3	@@ -95,6 +95,9 @@
4	parameter, just a different way to specify it for compatibility with other	4	.B \-w
5	programs.	5	write zero blocks to the disk instead of reading from the disk - will destroy data!
6		6
7	+.SH "SEE ALSO"	7	+.SH "SEE ALSO"
8	+.BR bonnie++ (8)	8	+.BR bonnie++ (8)




--- 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();




--- 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)

Lines 1-4 Link Here

(-)bonnie++/pkg-plist (-1 lines)
1	@comment $FreeBSD: ports/benchmarks/bonnie++/pkg-plist,v 1.6 2008/02/25 11:10:31 miwi Exp $
2	bin/bon_csv2html	1	bin/bon_csv2html
3	bin/bon_csv2txt	2	bin/bon_csv2txt
4	bin/generate_randfile	3	bin/generate_randfile

Return to bug 138132

Lines 1-15 Link Here

(-)bonnie++/files/patch-getc_putc.cpp (-15 lines)
1	--- getc_putc.cpp.orig Sun Dec 9 06:50:24 2001
2	+++ getc_putc.cpp Wed Mar 5 14:32:58 2003
3	@@ -17,6 +17,12 @@
4	#include "duration.h"
5	#include "getc_putc.h"
6
7	+#if defined(__alpha__) \|\| defined(__sparc64__) \|\| defined(__amd64__) \|\| defined(__ia64__)
8	+/* Work around for: line 168, no matching function for call to `min(long unsigned int, unsigned int)' */
9	+#include <sys/param.h>
10	+#define min MIN
11	+#endif
12	+
13	static void usage()
14	{
15	fprintf(stderr, "usage:\n"

Line 0 Link Here

(-)bonnie++/files/patch-zcav.cpp (+34 lines)
	1	--- zcav.cpp.orig 2009-08-24 07:31:32.060913886 +0000
	2	+++ zcav.cpp 2009-08-24 07:33:16.257389975 +0000
	3	@@ -15,9 +15,7 @@
	4	, "Usage: zcav [-b block-size[:chunk-size]] [-c count]\n"
	5	" [-r [start offset:]end offset] [-w]\n"
	6	" [-u uid-to-use:gid-to-use] [-g gid-to-use]\n"
	7	-#ifdef _LARGEFILE64_SOURCE
	8	" [-s skip rate]\n"
	9	-#endif
	10	" [-l log-file] [-f] file-name\n"
	11	" [-l log-file [-f] file-name]...\n"
	12	"\n"
	13	@@ -186,9 +184,7 @@
	14	const char *log = "-";
	15	const char *file = "";
	16	while(-1 != (c = getopt(argc, argv, "-c:b:f:l:r:w"
	17	-#ifdef _LARGEFILE64_SOURCE
	18	"s:"
	19	-#endif
	20	"u:g:")) )
	21	{
	22	switch(char(c))
	23	@@ -225,11 +221,9 @@
	24	}
	25	}
	26	break;
	27	-#ifdef _LARGEFILE64_SOURCE
	28	case 's':
	29	mz.setSkipRate(atoi(optarg));
	30	break;
	31	-#endif
	32	case 'g':
	33	if(groupName)
	34	usage();

Line 0 Link Here

(-)bonnie++/files/patch-zcav_io.cpp (+33 lines)
	1	--- zcav_io.cpp.orig 2009-08-24 07:36:02.677798155 +0000
	2	+++ zcav_io.cpp 2009-08-24 07:36:40.688614055 +0000
	3	@@ -83,7 +83,6 @@
	4	for(int loops = 0; !exiting && loops < max_loops; loops++)
	5	{
	6	int i = 0;
	7	-#ifdef _LARGEFILE64_SOURCE
	8	if(start_offset)
	9	{
	10	OFF_TYPE real_offset = OFF_TYPE(start_offset) * OFF_TYPE(m_block_size) * OFF_TYPE(1<<20);
	11	@@ -96,7 +95,6 @@
	12	i = start_offset;
	13	}
	14	else
	15	-#endif
	16	if(lseek(m_fd, 0, SEEK_SET))
	17	{
	18	fprintf(stderr, "Can't lseek().\n");
	19	@@ -224,14 +222,12 @@
	20	// Read/write a block of data
	21	double ZcavRead::access_data(int skip)
	22	{
	23	-#ifdef _LARGEFILE64_SOURCE
	24	if(skip)
	25	{
	26	OFF_TYPE real_offset = OFF_TYPE(skip) * OFF_TYPE(m_block_size) * OFF_TYPE(1<<20);
	27	if(file_lseek(m_fd, real_offset, SEEK_CUR) == OFF_TYPE(-1))
	28	return -1.0;
	29	}
	30	-#endif
	31
	32	m_dur.start();
	33	for(int i = 0; i < m_block_size; i+= m_chunk_size)