Hi, ports@ :
Here is a patch to update benchmarks/iozone to 3.487.
It build and run well on amd64-head system.
No other ports depends on it.
Comments? OK?
wen
Index: Makefile
===================================================================
RCS file: /cvs/ports/benchmarks/iozone/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile 14 Jul 2019 02:16:51 -0000 1.49
+++ Makefile 30 Jul 2019 02:05:23 -0000
@@ -2,7 +2,7 @@
COMMENT= performance test of sequential file I/O
-V = 3.465
+V = 3.487
DISTNAME= iozone${V:S/./_/}
PKGNAME= iozone-$V
CATEGORIES= benchmarks
Index: distinfo
===================================================================
RCS file: /cvs/ports/benchmarks/iozone/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo 20 Aug 2017 10:26:27 -0000 1.12
+++ distinfo 30 Jul 2019 02:05:23 -0000
@@ -1,2 +1,2 @@
-SHA256 (iozone3_465.tar) = Lj1ykW59c0CnxQX8DD0oVT/MX/La9B2BE2jlW9TmopM=
-SIZE (iozone3_465.tar) = 1843200
+SHA256 (iozone3_487.tar) = LEiKfM3dYk/VV68W5xRCw2exMdYXjhtAI7vVMrrN2lk=
+SIZE (iozone3_487.tar) = 1873920
Index: patches/patch-src_current_libbif_c
===================================================================
RCS file: /cvs/ports/benchmarks/iozone/patches/patch-src_current_libbif_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_current_libbif_c
--- patches/patch-src_current_libbif_c 31 Oct 2015 11:06:37 -0000 1.2
+++ patches/patch-src_current_libbif_c 30 Jul 2019 02:05:23 -0000
@@ -1,12 +1,14 @@
-$OpenBSD: patch-src_current_libbif_c,v 1.2 2015/10/31 11:06:37 benoit Exp $
---- src/current/libbif.c.orig Tue Oct 20 16:12:13 2015
-+++ src/current/libbif.c Sat Oct 31 11:51:45 2015
+$OpenBSD$
+
+Index: src/current/libbif.c
+--- src/current/libbif.c.orig
++++ src/current/libbif.c
@@ -27,7 +27,7 @@
#include <string.h>
#endif
--#if defined(linux) || defined(__DragonFly__) || defined(IOZ_macosx) ||
defined(__NetBSD__)
-+#if defined(linux) || defined(__DragonFly__) || defined(IOZ_macosx) ||
defined(__NetBSD__) || defined(__OpenBSD__)
+-#if defined(linux) || defined(__DragonFly__) || defined(IOZ_macosx) ||
defined(__NetBSD__) || defined(Windows)
++#if defined(linux) || defined(__DragonFly__) || defined(IOZ_macosx) ||
defined(__NetBSD__) || defined(Windows) || defined(__OpenBSD__)
#include <unistd.h>
#include <stdlib.h>
#endif
Index: patches/patch-src_current_makefile
===================================================================
RCS file: /cvs/ports/benchmarks/iozone/patches/patch-src_current_makefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_current_makefile
--- patches/patch-src_current_makefile 20 Aug 2017 10:26:27 -0000 1.3
+++ patches/patch-src_current_makefile 30 Jul 2019 02:05:23 -0000
@@ -2,7 +2,45 @@ $OpenBSD: patch-src_current_makefile,v 1
Index: src/current/makefile
--- src/current/makefile.orig
+++ src/current/makefile
-@@ -533,7 +533,7 @@ openbsd: iozone_openbsd.o libbif.o fileop_openbsd.o pi
+@@ -227,24 +227,24 @@ linux-arm: iozone_linux-arm.o libbif.o libasync.o
fil
+ #
+
+ android: iozone.c makefile Android.mk Application.mk libbif.c
+-ifeq ($(NDK_ENV_VAR)$(NDKBUILD),)
+- $(warning Your NDK environment is not set)
+- $(warning Either add to your path ndk-bundle or define NDK environement
variable)
+- $(warning ndk-bundle is likely located within you android sdk e.g.
<...>/Android/sdk/ndk-bundle )
+- $(error e.g. export NDK='/home/me/Android/Sdk/ndk-bundle')
+-endif
++#ifeq ($(NDK_ENV_VAR)$(NDKBUILD),)
++# $(warning Your NDK environment is not set)
++# $(warning Either add to your path ndk-bundle or define NDK environement
variable)
++# $(warning ndk-bundle is likely located within you android sdk e.g.
<...>/Android/sdk/ndk-bundle )
++# $(error e.g. export NDK='/home/me/Android/Sdk/ndk-bundle')
++#endif
+ mkdir -p jni
+ ln -sf ../Android.mk ./jni/Android.mk
+ ln -sf ../Application.mk ./jni/Application.mk
+ ln -sf ../iozone.c ./jni/iozone.c
+ ln -sf ../libbif.c ./jni/libbif.c
+-ifeq ($(NDKBUILD),)
+-ifneq ($(NDK_ENV_VAR),)
+- ${NDK}/ndk-build
+-endif
+-else
+- ${NDKBUILD}
+-endif
++#ifeq ($(NDKBUILD),)
++#ifneq ($(NDK_ENV_VAR),)
++# ${NDK}/ndk-build
++#endif
++#else
++# ${NDKBUILD}
++#endif
+
+ #
+ # GNU 'C' compiler Linux build with threads, largefiles, async I/O
+@@ -560,7 +560,7 @@ openbsd: iozone_openbsd.o libbif.o fileop_openbsd.o pi
#
openbsd-threads: iozone_openbsd-threads.o libbif.o
@@ -11,7 +49,7 @@ Index: src/current/makefile
libbif.o -o iozone
#
-@@ -1427,10 +1427,10 @@ iozone_openbsd-threads.o: iozone.c libbif.c
+@@ -1473,10 +1473,10 @@ iozone_openbsd-threads.o: iozone.c libbif.c
@echo ""
@echo "Build iozone for OpenBSD with threads"
@echo ""
