Index: head/benchmarks/iozone/Makefile =================================================================== --- head/benchmarks/iozone/Makefile (revision 417008) +++ head/benchmarks/iozone/Makefile (revision 417009) @@ -1,43 +1,41 @@ # Created by: jmz # $FreeBSD$ PORTNAME= iozone -PORTVERSION= 3.420 +PORTVERSION= 3.434 CATEGORIES= benchmarks MASTER_SITES= http://www.iozone.org/src/current/ DISTNAME= ${PORTNAME}${PORTVERSION:S/./_/} EXTRACT_SUFX= .tar MAINTAINER= ports@FreeBSD.org COMMENT= Performance Test of Sequential File I/O - -CONFLICTS= iozone-2.* iozone21-* WRKSRC= ${WRKDIR}/${DISTNAME}/src/current MAKEFILE= makefile MAKE_ARGS= ${MAKE_ENV} ALL_TARGET= freebsd MAKE_JOBS_UNSAFE= yes PLIST_FILES= bin/iozone man/man1/iozone.1.gz OPTIONS_DEFINE= SSH THREADS OPTIONS_DEFAULT=SSH THREADS SSH_DESC= Use ssh in distributed measurement THREADS_DESC= Enable threading (uses pthreads) THREADS_LDFLAGS= -lpthread THREADS_CFLAGS_OFF= -DNO_THREADS post-patch-SSH-on: @${REINPLACE_CMD} -e 's|shell\,\"rsh\"|shell\,\"ssh\"|' \ ${WRKSRC}/iozone.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/iozone ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/iozone.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1 .include Index: head/benchmarks/iozone/distinfo =================================================================== --- head/benchmarks/iozone/distinfo (revision 417008) +++ head/benchmarks/iozone/distinfo (revision 417009) @@ -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 Index: head/benchmarks/iozone/files/patch-libbif.c =================================================================== --- head/benchmarks/iozone/files/patch-libbif.c (revision 417008) +++ head/benchmarks/iozone/files/patch-libbif.c (nonexistent) @@ -1,11 +0,0 @@ ---- libbif.c 2012-05-14 23:13:03.000000000 -0700 -+++ libbif.c 2012-05-14 23:13:42.000000000 -0700 -@@ -27,7 +27,7 @@ - #include - #endif - --#if defined(linux) || defined(__DragonFly__) || defined(IOZ_macosx) -+#if defined(linux) || defined(__DragonFly__) || defined(IOZ_macosx) || defined(__FreeBSD__) - #include - #include - #endif Property changes on: head/benchmarks/iozone/files/patch-libbif.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/benchmarks/iozone/files/patch-iozone.c =================================================================== --- head/benchmarks/iozone/files/patch-iozone.c (nonexistent) +++ head/benchmarks/iozone/files/patch-iozone.c (revision 417009) @@ -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 +@@ -23009,7 +23011,7 @@ char *shell; + #ifdef _HPUX_SOURCE + strcpy(shell,"remsh"); + #else +- strcpy(shell,"rsh"); ++ strcpy(shell,"ssh"); + #endif + return; + } Property changes on: head/benchmarks/iozone/files/patch-iozone.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/benchmarks/iozone/files/patch-libasync.c =================================================================== --- head/benchmarks/iozone/files/patch-libasync.c (revision 417008) +++ head/benchmarks/iozone/files/patch-libasync.c (revision 417009) @@ -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 - #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 + #include + #include +-#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 #endif - + #include + #include +-#ifndef bsd4_4 ++#if !defined(bsd4_4) && !defined(__FreeBSD__) + #include + #endif + #ifdef VXFS @@ -119,7 +119,7 @@ #include #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)