fio: Update to 2.17

Changelog:
Not available

diff --git a/fio/Makefile b/fio/Makefile
index 0a195c157c519dc83fd8beb289101b56c7e5c492..ddd5ed6e9d7d2f7f3e07a5492bd8a60dd06efe91 100644 (file)
--- a/fio/Makefile
+++ b/fio/Makefile
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.3 2015/08/16 21:18:25 leot1990 Exp $
 
-DISTNAME=      fio-2.2.9
-PKGREVISION=   2
+DISTNAME=      fio-2.17
 CATEGORIES=    benchmarks
 MASTER_SITES=  http://brick.kernel.dk/snaps/
 
@@ -16,15 +15,12 @@ USE_TOOLS+= bash gmake lex yacc
 DOCDIR=                ${PREFIX}/share/doc/fio
 EGDIR=         ${PREFIX}/share/examples/fio
 
-SUBST_CLASSES+=                makefile
-SUBST_STAGE.makefile=  pre-build
-SUBST_MESSAGE.makefile=        Fixing paths in Makefile
-SUBST_FILES.makefile=  Makefile
-SUBST_SED.makefile=    -E -e 's,^(prefix =).*,\1 ${PREFIX},'
-SUBST_SED.makefile+=   -E -e 's,^(mandir =).*,\1 ${PREFIX}/${PKGMANDIR},'
-SUBST_SED.makefile+=   -E -e 's,^(sharedir =).*,\1 ${PREFIX}/share/fio,'
+CONFIGURE_ARGS+=       --prefix=${PREFIX}
 
 REPLACE_BASH+=         tools/genfio
+REPLACE_PYTHON+=       tools/fio_latency2csv.py
+REPLACE_PYTHON+=       tools/fiologparser.py
+REPLACE_PYTHON+=       tools/hist/fiologparser_hist.py
 REPLACE_PYTHON+=       tools/plot/fio2gnuplot
 
 INSTALLATION_DIRS=     ${DOCDIR} ${EGDIR}

diff --git a/fio/PLIST b/fio/PLIST
index 1dd694d659101243bd0056e1d4eac770dc2c8b12..08c3ca7167ce3cf032c7a0dd248d7698bf522467 100644 (file)
--- a/fio/PLIST
+++ b/fio/PLIST
@@ -1,17 +1,25 @@
-@comment $NetBSD: PLIST,v 1.2 2015/08/16 21:18:25 leot1990 Exp $
+@comment $NetBSD$
 bin/fio
 bin/fio-dedupe
 bin/fio-genzipf
+bin/fio-verify-state
 bin/fio2gnuplot
 bin/fio_generate_plots
+bin/fio_latency2csv.py
+bin/fiologparser.py
+bin/fiologparser_hist.py
 bin/genfio
 man/man1/fio.1
 man/man1/fio2gnuplot.1
 man/man1/fio_generate_plots.1
+man/man1/fiologparser_hist.py.1
 share/doc/fio/HOWTO
 share/examples/fio/1mbs_clients.fio
 share/examples/fio/aio-read.fio
+share/examples/fio/backwards-read.fio
+share/examples/fio/basic-verify.fio
 share/examples/fio/cpuio.fio
+share/examples/fio/dev-dax.fio
 share/examples/fio/disk-zone-profile.fio
 share/examples/fio/e4defrag.fio
 share/examples/fio/e4defrag2.fio
@@ -23,6 +31,7 @@ share/examples/fio/fsx.fio
 share/examples/fio/fusion-aw-sync.fio
 share/examples/fio/gfapi.fio
 share/examples/fio/iometer-file-access-server.fio
+share/examples/fio/jesd219.fio
 share/examples/fio/latency-profile.fio
 share/examples/fio/libhdfs.fio
 share/examples/fio/mtd.fio
@@ -30,13 +39,18 @@ share/examples/fio/netio.fio
 share/examples/fio/netio_multicast.fio
 share/examples/fio/null.fio
 share/examples/fio/numa.fio
+share/examples/fio/pmemblk.fio
+share/examples/fio/poisson-rate-submission.fio
+share/examples/fio/rand-zones.fio
 share/examples/fio/rbd.fio
 share/examples/fio/rdmaio-client.fio
 share/examples/fio/rdmaio-server.fio
 share/examples/fio/ssd-steadystate.fio
 share/examples/fio/ssd-test.fio
+share/examples/fio/steadystate.fio
 share/examples/fio/surface-scan.fio
 share/examples/fio/tiobench-example.fio
+share/examples/fio/waitfor.fio
 share/examples/fio/zipf.fio
 share/fio/graph2D.gpm
 share/fio/graph3D.gpm

diff --git a/fio/distinfo b/fio/distinfo
index f3bf87b39b69b277d273ab727456c8790b803336..0838fd25a3dd9ea9af6035d4e468e7acde108e82 100644 (file)
--- a/fio/distinfo
+++ b/fio/distinfo
@@ -1,6 +1,7 @@
 $NetBSD: distinfo,v 1.2 2015/07/16 08:57:32 leot1990 Exp $
 
-SHA1 (fio-2.2.9.tar.gz) = 6ef5a7c522aed5d70388cf04d9d80c38bd44e391
-RMD160 (fio-2.2.9.tar.gz) = 05aa3d50dcd15bd06e762472414b70027000a53e
-Size (fio-2.2.9.tar.gz) = 580852 bytes
-SHA1 (patch-Makefile) = 7a3030a951f2cfccb365750063031fd389bc3de7
+SHA1 (fio-2.17.tar.gz) = 52419c2b9b566e279b75bbeaee6ea3915782fe0d
+RMD160 (fio-2.17.tar.gz) = 3a888562c002720f2db15a3885c710ce99149bd1
+SHA512 (fio-2.17.tar.gz) = a5ebf27d6d4e1ef1458e0db08308640ee88b62283a12ae40b9f3629164531b2dac3a172d0357f9a2661faa0a9755e04421415a320402bc1503a2a7d3271eee3a
+Size (fio-2.17.tar.gz) = 664471 bytes
+SHA1 (patch-Makefile) = 63b4abb38bd36fa7c65224fbe440938b63cde3c6

diff --git a/fio/patches/patch-Makefile b/fio/patches/patch-Makefile
index a6a7df273b279dac1def7916e52de522af8e348e..35a7ccce9cb52a0c03dc682b125f5f8411048914 100644 (file)
--- a/fio/patches/patch-Makefile
+++ b/fio/patches/patch-Makefile
@@ -3,16 +3,27 @@ $NetBSD: patch-Makefile,v 1.2 2015/07/16 08:57:32 leot1990 Exp $
 Convert the fmt(1) command to a tr(1) one (the fmt(1) old syntax command is not
 supported on all Unix systems).
 
---- Makefile.orig      2015-07-16 08:17:54.000000000 +0000
+--- Makefile.orig      2017-01-17 15:51:31.000000000 +0000
 +++ Makefile
-@@ -276,8 +276,8 @@ override CFLAGS += -DFIO_VERSION='"$(FIO
-       @$(CC) -MM $(CFLAGS) $(CPPFLAGS) $*.c > $*.d
+@@ -319,8 +319,8 @@ override CFLAGS += -DFIO_VERSION='"$(FIO
+       @$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(SRCDIR)/$*.c > $*.d
        @mv -f $*.d $*.d.tmp
        @sed -e 's|.*:|$*.o:|' < $*.d.tmp > $*.d
--      @sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -1 | \
+-      @sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -w 1 | \
 -              sed -e 's/^ *//' -e 's/$$/:/' >> $*.d
 +      @sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | tr -cs "[:graph:]" "\n" | \
 +              sed -e 's/^ *//' -e '/^$$/ d' -e 's/$$/:/' >> $*.d
        @rm -f $*.d.tmp
  
  ifdef CONFIG_ARITHMETIC
+@@ -358,8 +358,8 @@ init.o: init.c FIO-VERSION-FILE
+       @$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(SRCDIR)/$*.c > $*.d
+       @mv -f $*.d $*.d.tmp
+       @sed -e 's|.*:|$*.o:|' < $*.d.tmp > $*.d
+-      @sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -w 1 | \
+-              sed -e 's/^ *//' -e 's/$$/:/' >> $*.d
++      @sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | tr -cs "[:graph:]" "\n" | \
++              sed -e 's/^ *//' -e '/^$$/ d' -e 's/$$/:/' >> $*.d
+       @rm -f $*.d.tmp
+ 
+ gcompat.o: gcompat.c gcompat.h