CVS commit: pkgsrc/benchmarks/fio

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Thu May 18 07:20:22 UTC 2017

Modified Files:
        pkgsrc/benchmarks/fio: Makefile distinfo
        pkgsrc/benchmarks/fio/patches: patch-Makefile

Log Message:
Use pkgsrc install scripts. Fixes installation on SunOS. Enable test target.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/benchmarks/fio/Makefile \
    pkgsrc/benchmarks/fio/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/benchmarks/fio/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/benchmarks/fio/Makefile
diff -u pkgsrc/benchmarks/fio/Makefile:1.2 pkgsrc/benchmarks/fio/Makefile:1.3
--- pkgsrc/benchmarks/fio/Makefile:1.2  Wed May  3 00:59:46 2017
+++ pkgsrc/benchmarks/fio/Makefile      Thu May 18 07:20:22 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/05/03 00:59:46 mef Exp $
+# $NetBSD: Makefile,v 1.3 2017/05/18 07:20:22 fhajny Exp $
 
 DISTNAME=      fio-2.19
 CATEGORIES=    benchmarks
@@ -25,6 +25,8 @@ REPLACE_PYTHON+=      tools/plot/fio2gnuplot
 
 INSTALLATION_DIRS=     ${DOCDIR} ${EGDIR}
 
+TEST_TARGET=           test
+
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/HOWTO ${DESTDIR}${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/examples/*.fio ${DESTDIR}${EGDIR}
Index: pkgsrc/benchmarks/fio/distinfo
diff -u pkgsrc/benchmarks/fio/distinfo:1.2 pkgsrc/benchmarks/fio/distinfo:1.3
--- pkgsrc/benchmarks/fio/distinfo:1.2  Wed May  3 00:59:46 2017
+++ pkgsrc/benchmarks/fio/distinfo      Thu May 18 07:20:22 2017
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2017/05/03 00:59:46 mef Exp $
+$NetBSD: distinfo,v 1.3 2017/05/18 07:20:22 fhajny Exp $
 
 SHA1 (fio-2.19.tar.gz) = 05c251899d8aedb3f5dfb2cc6976f2d0f2f2c332
 RMD160 (fio-2.19.tar.gz) = c4d059fece80dd40e1401e48dd149850476e3b51
 SHA512 (fio-2.19.tar.gz) = 92515432401638721793d42a20f1b55a75c50a6304a600c1efa8bb426900ab7d29a3cd11b7e65ce5229a933680c0edbae684d58f02874edf3f384fe5ccd0d727
 Size (fio-2.19.tar.gz) = 681650 bytes
-SHA1 (patch-Makefile) = 63b4abb38bd36fa7c65224fbe440938b63cde3c6
+SHA1 (patch-Makefile) = a5f33d182599e06dbaad7f0a22f3180b0715076c

Index: pkgsrc/benchmarks/fio/patches/patch-Makefile
diff -u pkgsrc/benchmarks/fio/patches/patch-Makefile:1.1 pkgsrc/benchmarks/fio/patches/patch-Makefile:1.2
--- pkgsrc/benchmarks/fio/patches/patch-Makefile:1.1    Sat Feb  4 12:50:23 2017
+++ pkgsrc/benchmarks/fio/patches/patch-Makefile        Thu May 18 07:20:22 2017
@@ -1,11 +1,11 @@
-$NetBSD: patch-Makefile,v 1.1 2017/02/04 12:50:23 ryoon Exp $
+$NetBSD: patch-Makefile,v 1.2 2017/05/18 07:20:22 fhajny 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      2017-01-17 15:51:31.000000000 +0000
+--- Makefile.orig      2017-04-04 14:30:59.000000000 +0000
 +++ Makefile
-@@ -319,8 +319,8 @@ override CFLAGS += -DFIO_VERSION='"$(FIO
+@@ -318,8 +318,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
@@ -16,7 +16,7 @@ supported on all Unix systems).
        @rm -f $*.d.tmp
  
  ifdef CONFIG_ARITHMETIC
-@@ -358,8 +358,8 @@ init.o: init.c FIO-VERSION-FILE
+@@ -357,8 +357,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
@@ -27,3 +27,26 @@ supported on all Unix systems).
        @rm -f $*.d.tmp
  
  gcompat.o: gcompat.c gcompat.h
+@@ -452,12 +452,13 @@ test: fio
+       ./fio --minimal --thread --ioengine=null --runtime=1s --name=nulltest --rw=randrw --iodepth=2 --norandommap --random_generator=tausworthe64 --size=16T --name=verifynulltest --rw=write 
--verify=crc32c --verify_state_save=0 --size=100M
+ 
+ install: $(PROGS) $(SCRIPTS) tools/plot/fio2gnuplot.1 FORCE
+-      $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
+-      $(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir)
+-      $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
+-      $(INSTALL) -m 644 $(SRCDIR)/fio.1 $(DESTDIR)$(mandir)/man1
+-      $(INSTALL) -m 644 $(SRCDIR)/tools/fio_generate_plots.1 $(DESTDIR)$(mandir)/man1
+-      $(INSTALL) -m 644 $(SRCDIR)/tools/plot/fio2gnuplot.1 $(DESTDIR)$(mandir)/man1
+-      $(INSTALL) -m 644 $(SRCDIR)/tools/hist/fiologparser_hist.py.1 $(DESTDIR)$(mandir)/man1
+-      $(INSTALL) -m 755 -d $(DESTDIR)$(sharedir)
+-      $(INSTALL) -m 644 $(SRCDIR)/tools/plot/*gpm $(DESTDIR)$(sharedir)/
++      $(BSD_INSTALL_PROGRAM_DIR) -m 755 -d $(DESTDIR)$(bindir)
++      $(BSD_INSTALL_PROGRAM) $(PROGS) $(DESTDIR)$(bindir)
++      $(BSD_INSTALL_SCRIPT) $(SCRIPTS) $(DESTDIR)$(bindir)
++      $(BSD_INSTALL_MAN_DIR) -m 755 -d $(DESTDIR)$(mandir)/man1
++      $(BSD_INSTALL_MAN) -m 644 $(SRCDIR)/fio.1 $(DESTDIR)$(mandir)/man1
++      $(BSD_INSTALL_MAN) -m 644 $(SRCDIR)/tools/fio_generate_plots.1 $(DESTDIR)$(mandir)/man1
++      $(BSD_INSTALL_MAN) -m 644 $(SRCDIR)/tools/plot/fio2gnuplot.1 $(DESTDIR)$(mandir)/man1
++      $(BSD_INSTALL_MAN) -m 644 $(SRCDIR)/tools/hist/fiologparser_hist.py.1 $(DESTDIR)$(mandir)/man1
++      $(BSD_INSTALL_DATA_DIR) -m 755 -d $(DESTDIR)$(sharedir)
++      $(BSD_INSTALL_DATA) -m 644 $(SRCDIR)/tools/plot/*gpm $(DESTDIR)$(sharedir)/