svn commit: r417009 - in head/benchmarks/iozone: . files

[Baptiste Daroussin]

Author: bapt
Date: Fri Jun 17 13:13:21 2016
New Revision: 417009
URL: https://svnweb.freebsd.org/changeset/ports/417009

Log:
  Update to 3.434
  
  Sponsored by:	Gandi.net

Added:
  head/benchmarks/iozone/files/patch-iozone.c   (contents, props changed)
Deleted:
  head/benchmarks/iozone/files/patch-libbif.c
Modified:
  head/benchmarks/iozone/Makefile
  head/benchmarks/iozone/distinfo
  head/benchmarks/iozone/files/patch-libasync.c

Modified: head/benchmarks/iozone/Makefile
==============================================================================
--- head/benchmarks/iozone/Makefile	Fri Jun 17 13:00:15 2016	(r417008)
+++ head/benchmarks/iozone/Makefile	Fri Jun 17 13:13:21 2016	(r417009)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	iozone
-PORTVERSION=	3.420
+PORTVERSION=	3.434
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://www.iozone.org/src/current/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/./_/}
@@ -11,8 +11,6 @@ EXTRACT_SUFX=	.tar
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Performance Test of Sequential File I/O
 
-CONFLICTS=	iozone-2.* iozone21-*
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/src/current
 
 MAKEFILE=	makefile

Modified: head/benchmarks/iozone/distinfo
==============================================================================
--- head/benchmarks/iozone/distinfo	Fri Jun 17 13:00:15 2016	(r417008)
+++ head/benchmarks/iozone/distinfo	Fri Jun 17 13:13:21 2016	(r417009)
@@ -1,2 +1,3 @@
-SHA256 (iozone3_420.tar) = f793cc68e86aea5c93fb3010f4088653138a610c3b14047b2314ab6a1f8d5b8e
-SIZE (iozone3_420.tar) = 1832960
+TIMESTAMP = 1466168535
+SHA256 (iozone3_434.tar) = 2c388d9db393a5505b31eca38951883744c69745f687f3c7df5185b4681d462a
+SIZE (iozone3_434.tar) = 1843200

Added: head/benchmarks/iozone/files/patch-iozone.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/benchmarks/iozone/files/patch-iozone.c	Fri Jun 17 13:13:21 2016	(r417009)
@@ -0,0 +1,27 @@
+--- iozone.c.orig	2015-10-20 14:12:13 UTC
++++ iozone.c
+@@ -360,6 +360,7 @@ typedef off_t off64_t;
+ #ifndef SCO_Unixware_gcc
+ #ifndef UWIN
+ #ifndef __DragonFly__
++#ifndef __FreeBSD__
+ typedef long long off64_t;
+ #endif
+ #endif
+@@ -369,6 +370,7 @@ typedef long long off64_t;
+ #endif
+ #endif
+ #endif
++#endif
+ 
+ #ifdef __AIX__
+ #include <fcntl.h>
+@@ -23009,7 +23011,7 @@ char *shell;
+ #ifdef _HPUX_SOURCE
+ 	strcpy(shell,"remsh");
+ #else
+-	strcpy(shell,"rsh");
++	strcpy(shell,"ssh");
+ #endif
+ 	return;
+ }	

Modified: head/benchmarks/iozone/files/patch-libasync.c
==============================================================================
--- head/benchmarks/iozone/files/patch-libasync.c	Fri Jun 17 13:00:15 2016	(r417008)
+++ head/benchmarks/iozone/files/patch-libasync.c	Fri Jun 17 13:13:21 2016	(r417009)
@@ -1,20 +1,36 @@
---- libasync.c	2012-05-14 23:13:13.000000000 -0700
-+++ libasync.c	2012-05-14 23:14:27.000000000 -0700
-@@ -109,7 +109,7 @@
- #include <sys/fs/vx_ioctl.h>
- #endif
+--- libasync.c.orig	2015-10-20 14:12:13 UTC
++++ libasync.c
+@@ -96,13 +96,13 @@
  
--#if defined(OSFV5) || defined(linux)
-+#if defined(OSFV5) || defined(linux) || defined(__FreeBSD__)
- #include <string.h>
+ #include <sys/types.h>
+ #include <aio.h>
+-#if defined(solaris) || defined(linux) || defined(SCO_Unixware_gcc) || defined(__NetBSD__)
++#if defined(solaris) || defined(linux) || defined(SCO_Unixware_gcc) || defined(__NetBSD__) || defined(__FreeBSD__)
+ #else
+ #include <sys/timers.h>
  #endif
- 
+ #include <sys/errno.h>
+ #include <unistd.h>
+-#ifndef bsd4_4
++#if !defined(bsd4_4) && !defined(__FreeBSD__)
+ #include <malloc.h>
+ #endif
+ #ifdef VXFS
 @@ -119,7 +119,7 @@
  #include <stdlib.h>
  #endif
  
--#if (defined(solaris) && defined(__LP64__)) || defined(__s390x__) || defined(FreeBSD)
-+#if (defined(solaris) && defined(__LP64__)) || defined(__s390x__) || defined(__FreeBSD__)
+-#if (defined(solaris) && defined(__LP64__)) || defined(__s390x__) || defined(FreeBSD) || defined(__NetBSD__)
++#if (defined(solaris) && defined(__LP64__)) || defined(__s390x__) || defined(__FreeBSD__) || defined(__NetBSD__)
  /* If we are building for 64-bit Solaris, all functions that return pointers
   * must be declared before they are used; otherwise the compiler will assume
   * that they return ints and the top 32 bits of the pointer will be lost,
+@@ -135,7 +135,7 @@
+ void mbcopy(char *source, char *dest, size_t len);
+ 
+ 
+-#if !defined(solaris) && !defined(off64_t) && !defined(_OFF64_T) && !defined(__off64_t_defined) && !defined(SCO_Unixware_gcc)
++#if !defined(solaris) && !defined(off64_t) && !defined(_OFF64_T) && !defined(__off64_t_defined) && !defined(SCO_Unixware_gcc) && !defined(__FreeBSD__)
+ typedef long long off64_t;
+ #endif
+ #if defined(OSFV5)