CVS commit: pkgsrc/benchmarks/fio

["Sebastian Wiedenroth" <wiedi%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiedi
Date:           Mon Jun 26 13:48:50 UTC 2017

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

Log Message:
add support for PKGMANDIR


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/benchmarks/fio/distinfo
cvs rdiff -u -r1.2 -r1.3 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/distinfo
diff -u pkgsrc/benchmarks/fio/distinfo:1.3 pkgsrc/benchmarks/fio/distinfo:1.4
--- pkgsrc/benchmarks/fio/distinfo:1.3  Thu May 18 07:20:22 2017
+++ pkgsrc/benchmarks/fio/distinfo      Mon Jun 26 13:48:50 2017
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2017/05/18 07:20:22 fhajny Exp $
+$NetBSD: distinfo,v 1.4 2017/06/26 13:48:50 wiedi 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) = a5f33d182599e06dbaad7f0a22f3180b0715076c
+SHA1 (patch-Makefile) = 96d6822ae7da3a07d4eea264fad8a4d90da3e43f

Index: pkgsrc/benchmarks/fio/patches/patch-Makefile
diff -u pkgsrc/benchmarks/fio/patches/patch-Makefile:1.2 pkgsrc/benchmarks/fio/patches/patch-Makefile:1.3
--- pkgsrc/benchmarks/fio/patches/patch-Makefile:1.2    Thu May 18 07:20:22 2017
+++ pkgsrc/benchmarks/fio/patches/patch-Makefile        Mon Jun 26 13:48:50 2017
@@ -1,11 +1,26 @@
-$NetBSD: patch-Makefile,v 1.2 2017/05/18 07:20:22 fhajny Exp $
+$NetBSD: patch-Makefile,v 1.3 2017/06/26 13:48:50 wiedi 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-04-04 14:30:59.000000000 +0000
 +++ Makefile
-@@ -318,8 +318,8 @@ override CFLAGS += -DFIO_VERSION='"$(FIO
+@@ -293,13 +293,8 @@ endif
+ prefix = $(INSTALL_PREFIX)
+ bindir = $(prefix)/bin
+ 
+-ifeq ($(CONFIG_TARGET_OS), Darwin)
+-mandir = /usr/share/man
+-sharedir = /usr/share/fio
+-else
+-mandir = $(prefix)/man
++mandir = $(prefix)/$(PKGMANDIR)
+ sharedir = $(prefix)/share/fio
+-endif
+ 
+ all: $(PROGS) $(T_TEST_PROGS) $(SCRIPTS) FORCE
+ 
+@@ -318,8 +313,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 +31,7 @@ supported on all Unix systems).
        @rm -f $*.d.tmp
  
  ifdef CONFIG_ARITHMETIC
-@@ -357,8 +357,8 @@ init.o: init.c FIO-VERSION-FILE
+@@ -357,8 +352,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,7 +42,7 @@ supported on all Unix systems).
        @rm -f $*.d.tmp
  
  gcompat.o: gcompat.c gcompat.h
-@@ -452,12 +452,13 @@ test: fio
+@@ -452,12 +447,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