From 1c7e874f5b4fe54307ab3e80275dd3e6bc705071 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Tue, 11 Mar 2003 12:42:04 +0000
Subject: Update to 3.163: Fixup for systems that do not have O_DIRECT.
 Simplify the prototype for do_compute()

---
 benchmarks/iozone/Makefile         |  6 +++---
 benchmarks/iozone/distinfo         |  7 +++----
 benchmarks/iozone/patches/patch-aa | 37 -------------------------------------
 3 files changed, 6 insertions(+), 44 deletions(-)
 delete mode 100644 benchmarks/iozone/patches/patch-aa

(limited to 'benchmarks/iozone')

diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index 6ec9a7293b4..a4180dde379 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2003/03/10 11:06:49 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2003/03/11 12:42:04 wiz Exp $
 
-DISTNAME=		iozone3_161
-PKGNAME=		iozone-3.161
+DISTNAME=		iozone3_163
+PKGNAME=		iozone-3.163
 CATEGORIES=		benchmarks
 MASTER_SITES=		http://www.iozone.org/src/current/
 EXTRACT_SUFX=		.tar
diff --git a/benchmarks/iozone/distinfo b/benchmarks/iozone/distinfo
index 5554a019997..0739f123d6d 100644
--- a/benchmarks/iozone/distinfo
+++ b/benchmarks/iozone/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.4 2003/03/10 11:06:50 wiz Exp $
+$NetBSD: distinfo,v 1.5 2003/03/11 12:42:04 wiz Exp $
 
-SHA1 (iozone3_161.tar) = 9920b4b06761800783ad2b795c157f9249852e34
-Size (iozone3_161.tar) = 1372160 bytes
-SHA1 (patch-aa) = 1ddc60958a4017dc6bdf546215d2970e336aa604
+SHA1 (iozone3_163.tar) = 19ec4317325f8c6b15617592fda8c95904cb1f4f
+Size (iozone3_163.tar) = 1372160 bytes
diff --git a/benchmarks/iozone/patches/patch-aa b/benchmarks/iozone/patches/patch-aa
deleted file mode 100644
index 457219bb5d6..00000000000
--- a/benchmarks/iozone/patches/patch-aa
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/03/10 11:06:50 wiz Exp $
-
---- iozone.c.orig	Mon Mar  3 20:44:39 2003
-+++ iozone.c
-@@ -831,7 +831,7 @@ void purgeit();			/* Purge on chip cache
- void throughput_test();		/* Multi process throughput 	  */
- void multi_throughput_test();	/* Multi process throughput 	  */
- void prepage();			/* Pre-fault user buffer	  */
--#if defined(linux) || defined(solaris) || defined(__AIX__) || defined(OSFV5) || defined(UWIN) || defined(Windows) || defined(__APPLE__) || defined(OSFV4) || defined(IRIX) || defined(IRIX64) || defined(__FreeBSD__)
-+#ifdef HAVE_ANSIC_C
- float do_compute(float);	/* compute cycle simulation       */
- #else
- float do_compute();		/* compute cycle simulation       */
-@@ -15024,6 +15024,7 @@ int flag, prot;
- 		 * a file that is opened with O_DIRECT 
- 		 */
- 	 	file_flags=fcntl(fd,F_GETFL);
-+#if 0
- 	 	if((file_flags & O_DIRECT) !=0)
- 	 	{
- 	 		recs=filebytes/reclen;
-@@ -15038,6 +15039,7 @@ int flag, prot;
- 			}
- 	 	}
- 		else
-+#else
- 		{
- 			/* Save time, just seek out and touch at the end */
- 		 	I_LSEEK(fd,(filebytes-reclen),SEEK_SET);
-@@ -15048,6 +15050,7 @@ int flag, prot;
- 				exit(181);
- 			}
- 		}
-+#endif
- 	 	free(stmp);
- 	 	I_LSEEK(fd,0,SEEK_SET);
- #endif
-- 
cgit v1.2.3