summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--benchmarks/iozone/Makefile7
-rw-r--r--benchmarks/iozone/distinfo13
-rw-r--r--benchmarks/iozone/patches/patch-ab8
-rw-r--r--benchmarks/iozone/patches/patch-ac14
4 files changed, 22 insertions, 20 deletions
diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index 587064e8d89..4b6b96674f1 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2014/10/09 14:05:59 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2014/12/09 13:53:13 mef Exp $
-DISTNAME= iozone3_408
-PKGNAME= iozone-3.408
-PKGREVISION= 4
+DISTNAME= iozone3_429
+PKGNAME= ${DISTNAME:S/3_/-3-/}
CATEGORIES= benchmarks
MASTER_SITES= http://www.iozone.org/src/current/
EXTRACT_SUFX= .tar
diff --git a/benchmarks/iozone/distinfo b/benchmarks/iozone/distinfo
index adb6cade021..ad14a91309f 100644
--- a/benchmarks/iozone/distinfo
+++ b/benchmarks/iozone/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.20 2012/06/07 15:57:20 asau Exp $
+$NetBSD: distinfo,v 1.21 2014/12/09 13:53:13 mef Exp $
-SHA1 (iozone3_408.tar) = 3dc56a251949151d12fc033f179cb6852abc71de
-RMD160 (iozone3_408.tar) = c9caa3f02f0404d3b4a3a7c7fad040439bfff8f1
-Size (iozone3_408.tar) = 1822720 bytes
-SHA1 (patch-aa) = e209a364cdeca38c3995fbaebde3758bdd74e582
-SHA1 (patch-ab) = 8af7a97fb4c8bfc39320b03b1b5c63acff5a3be7
-SHA1 (patch-ac) = a7df47dca37d33e2658b27c4888294ad541fd1b2
+SHA1 (iozone3_429.tar) = 13b74ba397530ff2f117bac3d1d7dec81dcc66d2
+RMD160 (iozone3_429.tar) = c945becef75f89eb7eba0e12e6959ae6dcdf6514
+Size (iozone3_429.tar) = 1832960 bytes
+SHA1 (patch-ab) = fdd36fead26811aa830df5fac35b79a9b62ed1f0
+SHA1 (patch-ac) = 6a02e13f3441a76709fbe8ba064555b650f9bd1c
diff --git a/benchmarks/iozone/patches/patch-ab b/benchmarks/iozone/patches/patch-ab
index 86c637216b9..2074a6c2f25 100644
--- a/benchmarks/iozone/patches/patch-ab
+++ b/benchmarks/iozone/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.11 2012/06/07 15:57:20 asau Exp $
+$NetBSD: patch-ab,v 1.12 2014/12/09 13:53:13 mef Exp $
+
+Add NetBSD, DragonFly, including correction of typo
--- iozone.c.orig 2012-05-10 05:14:12.000000000 +0000
+++ iozone.c
@@ -6,8 +8,8 @@ $NetBSD: patch-ab,v 1.11 2012/06/07 15:57:20 asau Exp $
#include <windows.h>
#include <errno.h>
#else
--#if defined(linux) || defined(solaris) || defined(macosx) || defined(__AIX__) || defined(FreeBSD) || defined(_HPUX_SOURCE) || defined(__OpenBSD__) || defined(__DragonFly__)
-+#if defined(linux) || defined(solaris) || defined(macosx) || defined(__AIX__) || defined(__FreeBSD__) || defined(_HPUX_SOURCE) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+-#if defined(linux) || defined(solaris) || defined(IOZ_macosx) || defined(__AIX__) || defined(FreeBSD) || defined(_HPUX_SOURCE) || defined(__OpenBSD__) || defined(__DragonFly__)
++#if defined(linux) || defined(solaris) || defined(IOZ_macosx) || defined(__AIX__) || defined(__FreeBSD__) || defined(_HPUX_SOURCE) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
#include <errno.h>
#else
extern int errno; /* imported for errors */
diff --git a/benchmarks/iozone/patches/patch-ac b/benchmarks/iozone/patches/patch-ac
index cbe15108317..435f01f13ca 100644
--- a/benchmarks/iozone/patches/patch-ac
+++ b/benchmarks/iozone/patches/patch-ac
@@ -1,8 +1,10 @@
-$NetBSD: patch-ac,v 1.1 2008/08/25 19:35:30 bjs Exp $
+$NetBSD: patch-ac,v 1.2 2014/12/09 13:53:13 mef Exp $
---- libbif.c.orig 2008-07-17 11:07:10.000000000 -0400
-+++ libbif.c
-@@ -20,11 +20,11 @@
+Add NetBSD
+
+--- libbif.c.orig 2014-08-12 04:39:14.000000000 +0900
++++ libbif.c 2014-12-09 22:18:29.000000000 +0900
+@@ -23,11 +23,11 @@
#include <sys/fcntl.h>
#endif
@@ -11,8 +13,8 @@ $NetBSD: patch-ac,v 1.1 2008/08/25 19:35:30 bjs Exp $
#include <string.h>
#endif
--#if defined(linux) || defined(__DragonFly__) || defined(macosx)
-+#if defined(linux) || defined(__DragonFly__) || defined(macosx) || defined(__NetBSD__)
+-#if defined(linux) || defined(__DragonFly__) || defined(IOZ_macosx)
++#if defined(linux) || defined(__DragonFly__) || defined(IOZ_macosx) || defined(__NetBSD__)
#include <unistd.h>
#include <stdlib.h>
#endif