Update this pkg to 3.56. Changes are mostly bugfixes, available at:

http://www.iozone.org/src/current/Changes.txt

I have patched the source however, to allow use of the pread/prwite
tests, via the -E extension mode.  Also, the benchmark target has been fixed.

4 files changed, 158 insertions, 94 deletions

diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index 05075c34d2c..232dd7df60d 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2001/06/04 23:10:35 jtb Exp $
+# $NetBSD: Makefile,v 1.15 2001/07/16 22:04:54 garbled Exp $
 
-DISTNAME=		iozone3_9
-PKGNAME=		iozone-3.09
+DISTNAME=		iozone3_56
+PKGNAME=		iozone-3.56
 CATEGORIES=		benchmarks
-MASTER_SITES=		http://www.iozone.org/src/stable/
+MASTER_SITES=		http://www.iozone.org/src/current/
 EXTRACT_SUFX=		.tar
 
 MAINTAINER=		root@garbled.net
@@ -12,25 +12,25 @@ COMMENT=		Benchmark for file read and write speed
 
 RESTRICTED=		"Publication of derivative works not allowed"
 
-WRKSRC=			${WRKDIR}/src
+WRKSRC=			${WRKDIR}/src/current
 MAKEFILE=		makefile
 
 .include "../../mk/bsd.prefs.mk"
 
 .if (${OPSYS} == "NetBSD")
-  ALL_TARGET=		NetBSD
+  ALL_TARGET=		netbsd
 .elif (${OPSYS} == "SunOS")
   ALL_TARGET=		Solaris
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/iozone ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/iozone.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKDIR}/docs/iozone.1 ${PREFIX}/man/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/IOzone
 	${INSTALL_DATA} ${WRKDIR}/docs/IOzone_ps.gz ${PREFIX}/share/doc/IOzone
 
 benchmark:
-	@(cd ${WRKSRC}; ./iozone 100 | tee iozone.out)
+	@(cd ${WRKSRC}; ./iozone -Ea | tee iozone.out)
 
 results:
 	@${MKDIR} /tmp/benches/`domainname`
diff --git a/benchmarks/iozone/distinfo b/benchmarks/iozone/distinfo
index 5893ebbed14..3a908aeca70 100644
--- a/benchmarks/iozone/distinfo
+++ b/benchmarks/iozone/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 09:13:26 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/07/16 22:04:55 garbled Exp $
 
-SHA1 (iozone3_9.tar) = f562737db5e3fd0c7d56d716ccfe3eec79450817
-Size (iozone3_9.tar) = 604160 bytes
-SHA1 (patch-aa) = 04b0cfe6d6c6598566f384201933946f2e06ff1e
-SHA1 (patch-ab) = 825fab79c8a6d298efc7cbae11dcbb335dfa0bd0
+SHA1 (iozone3_56.tar) = 360485a61c7477332414e77f1b989128d9eab075
+Size (iozone3_56.tar) = 1013760 bytes
+SHA1 (patch-aa) = 5075a54d837e084a5eebec7df768943160e3da0e
+SHA1 (patch-ab) = a0c468b83751c4bde2aea6b0dd5e0ff6a2376dc0
diff --git a/benchmarks/iozone/patches/patch-aa b/benchmarks/iozone/patches/patch-aa
index 4d0af51da7b..a656bac9ca2 100644
--- a/benchmarks/iozone/patches/patch-aa
+++ b/benchmarks/iozone/patches/patch-aa
@@ -1,53 +1,126 @@
-$NetBSD: patch-aa,v 1.1 2000/05/02 15:17:47 pooka Exp $
-
---- makefile.orig	Wed Sep 15 00:38:17 1999
-+++ makefile	Tue May  2 17:11:25 2000
-@@ -6,7 +6,7 @@
- #
- # Supports:	hpux, hpux_no_ansi, hpux-10.1, hpux_no_ansi-10.1,
- #		sppux, sppux-10.1, ghpux, sppux, 
--#		convex, FreeBSD, OpenBSD
-+#		convex, FreeBSD, OpenBSD, NetBSD
+$NetBSD: patch-aa,v 1.2 2001/07/16 22:04:55 garbled Exp $
+--- iozone.c.orig	Wed Jul  4 03:21:12 2001
++++ iozone.c	Mon Jul 16 11:58:10 2001
+@@ -307,9 +307,17 @@
+ #endif
  
+ #ifdef HAVE_PREAD
++#ifndef __NetBSD__
+ #include <sys/puio.h>
+ #define PVECMAX 16
+ struct piovec piov[PVECMAX];
++#else
++#include <sys/uio.h>
++#define piov_base iov_base
++#define piov_len iov_len
++#define PVECMAX 16
++struct iovec piov[PVECMAX];
++#endif
+ #endif
  
- all:  
-@@ -29,6 +29,7 @@
- 	@echo "\t->   IRIX                 (32bit)   <-"
- 	@echo "\t->   IRIX64               (64bit)   <-"
- 	@echo "\t->   linux                (32bit)   <-"
-+	@echo "\t->   NetBSD               (32bit)   <-"
- 	@echo "\t->   openbsd              (32bit)   <-"
- 	@echo "\t->   OSFV3                (64bit)   <-"
- 	@echo "\t->   OSFV4                (64bit)   <-"
-@@ -208,6 +209,15 @@
- freebsd: iozone_freebsd.o libbif.o
- 	cc -O -Dunix -DHAVE_ANSIC_C -DNO_THREADS -DSHARED_MEM \
- 		iozone_freebsd.o libbif.o -o iozone
-+
-+#
-+# GNU C compiler NetBSD build with no threads, no largefiles, no async I/O
-+#
-+
-+NetBSD: iozone_netbsd.o libbif.o
-+	cc -O -Dunix -DHAVE_ANSIC_C -DNO_THREADS -DSHARED_MEM \
-+		iozone_netbsd.o libbif.o -o iozone
-+
- #
- # GNU C compiler OpenBSD build with no threads, no largefiles, no async I/O
- #
-@@ -459,6 +469,15 @@
- 	cc -c -O -Dunix -Dbsd4_2 -DHAVE_ANSIC_C -DNO_THREADS \
- 		-DSHARED_MEM iozone.c -o iozone_freebsd.o
- 	cc -c -O -Dunix -Dbsd4_2 -DHAVE_ANSIC_C -DNO_THREADS \
-+		-DSHARED_MEM libbif.c -o libbif.o
-+
-+iozone_netbsd.o: iozone.c libbif.c
-+	@echo ""
-+	@echo "Build Iozone for NetBSD"
-+	@echo ""
-+	cc -c -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS \
-+		-DSHARED_MEM iozone.c -o iozone_netbsd.o
-+	cc -c -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS \
- 		-DSHARED_MEM libbif.c -o libbif.o
+ struct child_stats {
+@@ -393,7 +401,11 @@
+ #ifdef HAVE_PREAD
+ #include <sys/times.h>
+ #define CONTROL_STRING1 "%16lld%8ld%8ld%8ld%8ld%8ld%8ld%8ld%8ld%8ld%8ld%8ld%8ld%9ld%9ld%8ld%10ld%9ld%10ld%9ld%10ld%10ld%9ld\n"
++#ifdef HAVE_PREADV
+ #define CONTROL_STRING2 "%16s%8s%8s%8s%8s%10s%8s%8s%8s%8s%8s%9s%9s%8s%9s%8s%9s%7s%10s%10s%10s%9s%9s\n"
++#else
++#define CONTROL_STRING2 "%16s%8s%8s%8s%8s%10s%8s%8s%8s%8s%8s%9s%9s%8s%9s%8s%9s%7s%10s\n"
++#endif
+ #define CONTROL_STRING3 "%16s%8s%8s%8s%8s%10s%8s%8s%8s%8s%8s%9s%9s%8s%9s\n"
+ #define CONTROL_STRING4 "%16s%8s%8s%8s%8s%10s\n"
+ #else
+@@ -452,9 +464,11 @@
+ void read_stride_perf_test();	/* read with stride test	  */
+ #ifdef HAVE_PREAD
+ void pread_perf_test();		/* pread/re-pread test		  */
+-void preadv_perf_test();	/* preadv/re-preadv test	  */
+ void pwrite_perf_test();	/* pwrite/re-pwrite test	  */
++#ifdef HAVE_PREADV
++void preadv_perf_test();	/* preadv/re-preadv test	  */
+ void pwritev_perf_test();	/* pwritev/re-pwritev test	  */
++#endif
+ #endif /* HAVE_PREAD */
+ void store_dvalue();		/* Store doubles array 		  */
+ void dump_excel();
+@@ -538,9 +552,12 @@
+ #ifdef HAVE_PREAD
+ 			,
+ 			pwrite_perf_test,
+-			pread_perf_test,
++			pread_perf_test
++#ifdef HAVE_PREADV
++			,
+ 			pwritev_perf_test,
+ 			preadv_perf_test
++#endif
+ #endif /* HAVE_PREAD */
+ 	};
  
- iozone_openbsd.o: iozone.c libbif.c
+@@ -5949,6 +5966,7 @@
+ #endif
+ }
+ 
++#ifdef HAVE_PREADV
+ /************************************************************************/
+ /* pwritev_perf_test				        		*/
+ /* pwritev and re-pwritev test						*/
+@@ -5965,7 +5983,11 @@
+ 	double starttime1;
+ 	double pwritevtime[2];
+ 	double compute_val = (double)0;
++#ifndef __NetBSD__
+ 	long long list_off[PVECMAX];
++#else
++	off_t list_off[PVECMAX];
++#endif
+ 	long long numvecs,j,xx;
+ 	unsigned long long pwritevrate[2];
+ 	off64_t filebytes64,i;
+@@ -6091,8 +6113,8 @@
+ 					(caddr_t)(buffer+(xx * reclen));
+ 				if(verify)
+ 					fill_buffer(piov[xx].piov_base,reclen,(long long)pattern,sverify);
+-				piov[xx].piov_len = reclen;
+ 				piov[xx].piov_offset = list_off[xx];
++				piov[xx].piov_len = reclen;
+ 				if(purge)
+ 					purgeit(piov[xx].piov_base,reclen);
+ 			}
+@@ -6361,6 +6383,7 @@
+ 	fflush(stdout);
+ #endif
+ }
++#endif /* PREADV */
+ 
+ /************************************************************************/
+ /* print_header()							*/
+@@ -6419,11 +6442,14 @@
+ 		"pwrite",
+ 		"repwrite",
+ 		"pread",
+-		"repread",
++		"repread"
++#ifdef HAVE_PREADV
++		,
+ 		"pwritev",
+ 		"repwritev",
+ 		"preadv",
+ 		"repreadv"
++#endif
+ 		);
+ 	}else 
+ 	if(RWONLYflag){				/*kcollins 8-21-96*/
+@@ -6779,7 +6805,11 @@
+ #endif
+                 exit(119);
+         }
++#ifndef __NetBSD__
+         addr = (char *)shmat(shmid, 0, SHM_W);
++#else
++	addr = (char *)shmat(shmid, 0, 0);
++#endif
+ #ifdef __LP64__
+         if((long long)addr == (long long)-1)
+ #else
diff --git a/benchmarks/iozone/patches/patch-ab b/benchmarks/iozone/patches/patch-ab
index aa2ec5764c7..43496055492 100644
--- a/benchmarks/iozone/patches/patch-ab
+++ b/benchmarks/iozone/patches/patch-ab
@@ -1,31 +1,22 @@
-$NetBSD: patch-ab,v 1.2 2000/12/14 02:40:20 wiz Exp $
-
---- iozone.c.orig	Tue Sep 14 23:38:16 1999
-+++ iozone.c
-@@ -908,10 +908,10 @@
-                 case 'M':       /* Report machine name and OS */
-                         pi=popen("uname -a", "r");
-                         fread(reply,99,1,pi);
--			m=reply;
--                        while(*m!='\n') /* Strip after new line */
--                                m++;
--                        *m=0;
-+			reply[98] = '\0';
-+			m=strchr(reply, '\n'); /* Strip after new line */
-+                        if (m != NULL)
-+			    *m=0;
-                         printf("\n\tMachine = %s\n",reply);
-                         pclose(pi);
-                         break;
-@@ -6130,7 +6130,11 @@
- #endif
-                 exit(119);
-         }
-+#ifndef __NetBSD__
-         addr = (char *)shmat(shmid, 0, SHM_W);
-+#else
-+        addr = (char *)shmat(shmid, 0, 0);
-+#endif
- #ifdef __LP64__
-         if((long long)addr == (long long)-1)
- #else
+$NetBSD: patch-ab,v 1.3 2001/07/16 22:04:55 garbled Exp $
+--- makefile.orig	Mon Jul 16 02:00:14 2001
++++ makefile	Mon Jul 16 02:01:06 2001
+@@ -320,7 +320,7 @@
+ 
+ netbsd: iozone_netbsd.o  libbif.o
+ 	cc -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS -DSHARED_MEM \
+-		iozone_netbsd.o libbif.o -o iozone
++		-DHAVE_PREAD iozone_netbsd.o libbif.o -o iozone
+ 
+ #
+ #
+@@ -656,7 +656,7 @@
+ 	@echo ""
+ 	@echo "Building iozone NetBSD "
+ 	@echo ""
+-	cc -c -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS \
++	cc -c -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS -DHAVE_PREAD \
+ 		-DSHARED_MEM iozone.c -o iozone_netbsd.o
+-	cc -c -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS \
++	cc -c -O -Dunix -Dbsd4_4 -DHAVE_ANSIC_C -DNO_THREADS -DHAVE_PREAD \
+ 		-DSHARED_MEM libbif.c -o libbif.o