Update iozone to lastest stable (3.09), addresses pkg/10020.

The change-list is huge (src/Changes.txt in the distribution) and users
probably should upgrade since the previous version was ancient.

6 files changed, 93 insertions, 24 deletions

diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index 62d7ec29495..c21d02fc80f 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -1,32 +1,27 @@
-# $NetBSD: Makefile,v 1.8 2000/03/16 12:16:52 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2000/05/02 15:17:45 pooka Exp $
 
-DISTNAME=		iozone
-PKGNAME=		iozone-1.14b
+DISTNAME=		iozone3_9
+PKGNAME=		iozone-3.09
 CATEGORIES=		benchmarks
-MASTER_SITES=		ftp://ftp.bme.hu/pub/OS/Linux/tsx-11/sources/test_suites/
-EXTRACT_SUFX=		.tar.Z
+MASTER_SITES=		http://www.iozone.org/src/stable/
+EXTRACT_SUFX=		.tar
 
 MAINTAINER=		root@garbled.net
+HOMEPAGE=		http://www.iozone.org/
 
-NO_WRKSUBDIR=		yes
+WRKSRC=			${WRKDIR}/src
+MAKEFILE=		makefile
 
-do-build:
-	(cd ${WRKDIR} &&					\
-	case `uname -s` in					\
-	SunOS)							\
-		${CC} -O2 -DSYSTYPE_SYSV -o iozone iozone.c ;;	\
-	NetBSD)							\
-		${CC} -O2 -o iozone iozone.c ;;			\
-	esac)
+.include "../../mk/bsd.prefs.mk"
+
+.if (${OPSYS} == "NetBSD")
+  ALL_TARGET=		NetBSD
+.elif (${OPSYS} == "SunOS")
+  ALL_TARGET=		Solaris
+.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/iozone ${PREFIX}/bin
-
-benchmark:
-	@(cd ${WRKSRC}; ./iozone 100 | tee iozone.out)
-
-results:
-	-@${MKDIR} /tmp/benches/`domainname`
-	-@${CP} ${WRKSRC}/iozone.out /tmp/benches/`domainname`/iozone.`uname`-`uname -m`-`uname -r`.`hostname`
+	${INSTALL_MAN} ${WRKSRC}/iozone.1 ${PREFIX}/man/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/iozone/files/md5 b/benchmarks/iozone/files/md5
index 69ce8b79e3b..24a488383e7 100644
--- a/benchmarks/iozone/files/md5
+++ b/benchmarks/iozone/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1 1998/08/30 17:41:46 garbled Exp $
+$NetBSD: md5,v 1.2 2000/05/02 15:17:46 pooka Exp $
 
-MD5 (iozone.tar.Z) = d08cb98c3092dab920f1afa2b34dc96d
+MD5 (iozone3_9.tar) = 5b81151f0d8a2abd737af53f7f60f348
diff --git a/benchmarks/iozone/files/patch-sum b/benchmarks/iozone/files/patch-sum
new file mode 100644
index 00000000000..9908132e5f1
--- /dev/null
+++ b/benchmarks/iozone/files/patch-sum
@@ -0,0 +1,4 @@
+$NetBSD: patch-sum,v 1.1 2000/05/02 15:17:47 pooka Exp $
+
+MD5 (patch-aa) = 1ff601947a7d3c66c4ee3e6526b35e0e
+MD5 (patch-ab) = 6c08479fba2d6b722e41701c4b47f3ef
diff --git a/benchmarks/iozone/patches/patch-aa b/benchmarks/iozone/patches/patch-aa
new file mode 100644
index 00000000000..4d0af51da7b
--- /dev/null
+++ b/benchmarks/iozone/patches/patch-aa
@@ -0,0 +1,53 @@
+$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
+ 
+ 
+ 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
+ 
+ iozone_openbsd.o: iozone.c libbif.c
diff --git a/benchmarks/iozone/patches/patch-ab b/benchmarks/iozone/patches/patch-ab
new file mode 100644
index 00000000000..b6b73bb94d1
--- /dev/null
+++ b/benchmarks/iozone/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1 2000/05/02 15:17:47 pooka Exp $
+
+--- iozone.c.orig	Wed Sep 15 00:38:16 1999
++++ iozone.c	Tue May  2 17:23:53 2000
+@@ -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
diff --git a/benchmarks/iozone/pkg/PLIST b/benchmarks/iozone/pkg/PLIST
index 6f9e8f9223b..5cbfad3361f 100644
--- a/benchmarks/iozone/pkg/PLIST
+++ b/benchmarks/iozone/pkg/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 1998/08/30 17:41:46 garbled Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/05/02 15:17:48 pooka Exp $
 bin/iozone
+man/man1/iozone.1