Changes 3.263:

* Change the default pattern. Samba is trying to cheat by
  special casing IOZONE.tmp, and the pattern of 0xA5.
* Make the default pattern random, and based on Iozone version.
  This is to prevent the hack from Richard Sharpe (in Samba)
  from special casing Iozone, and lying to the user.
* bug fix in pattern gen.
* Add -+Z  old data set mode.
* Add -+X  constant data for short circuit testing only.
* Multi-node changes for new options. (-+Z and -+X)
* Add -+K flag for Sony.
* Move -+K outside of Windows only.
* Simplify percentage calculation
* Add error checking for -f and -F in the wrong modes.
* Bug fix for pbuffer allocation on remote clients.
* Check for max_rec_size when using ranges. -r -r -r
* Fix for Debian user bug. -r 1m -n 1m -g 2m gave bogus error.
* Bug fix for -k used in conjunction with -t and content validation.

3 files changed, 17 insertions, 17 deletions

diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index c4989378334..16f835f8116 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2006/05/02 13:53:18 gdt Exp $
+# $NetBSD: Makefile,v 1.34 2006/07/13 13:42:12 adam Exp $
 
-DISTNAME=	iozone3_248
-PKGNAME=	iozone-3.248
+DISTNAME=	iozone3_263
+PKGNAME=	iozone-3.263
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://www.iozone.org/src/current/
 EXTRACT_SUFX=	.tar
@@ -49,10 +49,10 @@ do-install:
 		${PREFIX}/share/doc/IOzone
 
 benchmark:
-	@(cd ${WRKSRC}; ./iozone -Ea | tee iozone.out)
+	cd ${WRKSRC}; ./iozone -Ea | ${TEE} iozone.out
 
 results:
-	@${MKDIR} /tmp/benches/`domainname`
-	-@${CP} ${WRKSRC}/iozone.out /tmp/benches/`domainname`/iozone.`uname`-`uname -m`-`uname -r`.`hostname`
+	${MKDIR} /tmp/benches/`domainname`
+	${CP} ${WRKSRC}/iozone.out /tmp/benches/`domainname`/iozone.`uname`-`uname -m`-`uname -r`.`hostname`
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/iozone/distinfo b/benchmarks/iozone/distinfo
index 4a31cf054f8..4a8964e1ede 100644
--- a/benchmarks/iozone/distinfo
+++ b/benchmarks/iozone/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2005/12/13 14:25:01 joerg Exp $
+$NetBSD: distinfo,v 1.15 2006/07/13 13:42:12 adam Exp $
 
-SHA1 (iozone3_248.tar) = 86887e1af83f35aaf10e7e91d702f425ec9ee0f7
-RMD160 (iozone3_248.tar) = 90458276913289d0e5bae42df086f7baf1f0cd67
-Size (iozone3_248.tar) = 1474560 bytes
+SHA1 (iozone3_263.tar) = bc62e049f793da74b5c3776779b597aaeaddd30b
+RMD160 (iozone3_263.tar) = 5288c764c9ea09d8f8dbed47c4c9e2a5955b4bed
+Size (iozone3_263.tar) = 1505280 bytes
 SHA1 (patch-aa) = 1cdc9b4d965c7ee07fe0e5c64d7a2150a5beb8af
-SHA1 (patch-ab) = 15d49b2a927ce914c4e429fc71d3356237ce61c4
+SHA1 (patch-ab) = 05c28c7a99e4346a41542647b0bac9186b0e3c8f
diff --git a/benchmarks/iozone/patches/patch-ab b/benchmarks/iozone/patches/patch-ab
index ce0ccf38629..144bb692077 100644
--- a/benchmarks/iozone/patches/patch-ab
+++ b/benchmarks/iozone/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2005/12/13 14:25:01 joerg Exp $
+$NetBSD: patch-ab,v 1.6 2006/07/13 13:42:13 adam Exp $
 
---- iozone.c.orig	2005-12-13 14:04:05.000000000 +0000
+--- iozone.c.orig	2006-04-11 23:42:46.000000000 +0200
 +++ iozone.c
 @@ -61,12 +61,7 @@
  #include <Windows.h>
@@ -15,7 +15,7 @@ $NetBSD: patch-ab,v 1.5 2005/12/13 14:25:01 joerg Exp $
  #endif
  
  
-@@ -251,15 +246,15 @@ THISVERSION,
+@@ -257,15 +252,15 @@ THISVERSION,
  #include <unistd.h>
  
  #include <fcntl.h>
@@ -34,7 +34,7 @@ $NetBSD: patch-ab,v 1.5 2005/12/13 14:25:01 joerg Exp $
  #ifndef O_SYNC
  #define O_SYNC O_FSYNC
  #endif
-@@ -296,25 +291,18 @@ THISVERSION,
+@@ -302,25 +297,18 @@ THISVERSION,
  #define MAP_FAILED -1
  #endif
  
@@ -67,7 +67,7 @@ $NetBSD: patch-ab,v 1.5 2005/12/13 14:25:01 joerg Exp $
  
  #ifdef __AIX__
  #include <fcntl.h>
-@@ -325,7 +313,7 @@ typedef long long off64_t;
+@@ -331,7 +319,7 @@ typedef long long off64_t;
  #endif
  
  #ifdef unix
@@ -76,7 +76,7 @@ $NetBSD: patch-ab,v 1.5 2005/12/13 14:25:01 joerg Exp $
  #include <sys/time.h>
  #endif
  #include <sys/times.h>
-@@ -357,7 +345,7 @@ typedef long long off64_t;
+@@ -363,7 +351,7 @@ typedef long long off64_t;
  #define MS_ASYNC 0
  #endif