From 255c5ccedf9c55b46a4bcfef667d9027c26b64e4 Mon Sep 17 00:00:00 2001 From: bsiegert Date: Tue, 22 Aug 2017 18:51:44 +0000 Subject: Update bonnie++ to 1.97.3. Fifteen years' worth of changes. From PR pkg/52490. --- benchmarks/bonnie++/Makefile | 7 +++--- benchmarks/bonnie++/PLIST | 7 +++++- benchmarks/bonnie++/distinfo | 15 +++++------- benchmarks/bonnie++/patches/patch-aa | 15 ------------ benchmarks/bonnie++/patches/patch-ab | 44 ++++++++++++++++++++++++++---------- benchmarks/bonnie++/patches/patch-ac | 27 ---------------------- benchmarks/bonnie++/patches/patch-ad | 14 ------------ 7 files changed, 47 insertions(+), 82 deletions(-) delete mode 100644 benchmarks/bonnie++/patches/patch-aa delete mode 100644 benchmarks/bonnie++/patches/patch-ac delete mode 100644 benchmarks/bonnie++/patches/patch-ad (limited to 'benchmarks') diff --git a/benchmarks/bonnie++/Makefile b/benchmarks/bonnie++/Makefile index 701c9fb6624..18feb4523a7 100644 --- a/benchmarks/bonnie++/Makefile +++ b/benchmarks/bonnie++/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.32 2016/07/09 06:37:50 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2017/08/22 18:51:44 bsiegert Exp $ # -DISTNAME= bonnie++-1.03e -PKGREVISION= 6 +DISTNAME= bonnie++-1.97.3 CATEGORIES= benchmarks -MASTER_SITES= http://www.coker.com.au/bonnie++/ +MASTER_SITES= http://www.coker.com.au/bonnie++/experimental/ EXTRACT_SUFX= .tgz MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/benchmarks/bonnie++/PLIST b/benchmarks/bonnie++/PLIST index 40e6d635953..83f26d6c303 100644 --- a/benchmarks/bonnie++/PLIST +++ b/benchmarks/bonnie++/PLIST @@ -1,10 +1,15 @@ -@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:33:11 joerg Exp $ +@comment $NetBSD: PLIST,v 1.6 2017/08/22 18:51:44 bsiegert Exp $ bin/bon_csv2html bin/bon_csv2txt +bin/generate_randfile man/man1/bon_csv2html.1 man/man1/bon_csv2txt.1 +man/man1/generate_randfile.1 man/man8/bonnie++.8 +man/man8/getc_putc.8 man/man8/zcav.8 sbin/bonnie++ +sbin/getc_putc +sbin/getc_putc_helper sbin/zcav share/doc/bonnie++/readme.html diff --git a/benchmarks/bonnie++/distinfo b/benchmarks/bonnie++/distinfo index a5c9686c448..c8c2bcebda3 100644 --- a/benchmarks/bonnie++/distinfo +++ b/benchmarks/bonnie++/distinfo @@ -1,10 +1,7 @@ -$NetBSD: distinfo,v 1.10 2015/11/03 00:25:49 agc Exp $ +$NetBSD: distinfo,v 1.11 2017/08/22 18:51:44 bsiegert Exp $ -SHA1 (bonnie++-1.03e.tgz) = cf172c262fea075a83df12d5bde337bacba78ea6 -RMD160 (bonnie++-1.03e.tgz) = c7dfdd5826ef1033f1cae168ee9c1fe07877a10f -SHA512 (bonnie++-1.03e.tgz) = 7ddb3ab9687acf1685497c6cd823c10501d282f192358ac26038e259bb5e35d2ac9fe666a3d5aa33949cd62919fcb6f05b38ecf97a195bf46b5b23b3a0025122 -Size (bonnie++-1.03e.tgz) = 80956 bytes -SHA1 (patch-aa) = 2edc5fb589af0d8fbeaba89e3fd38f01a6115090 -SHA1 (patch-ab) = 3e4b04443a0fd413722819943df502172f6cab1f -SHA1 (patch-ac) = fdefe448f39136f2975add1abbf1dcb3aaa93b2b -SHA1 (patch-ad) = ca1a3515bfa39539bbc3cd571328e1ef530b4f76 +SHA1 (bonnie++-1.97.3.tgz) = 47ce25f21146a63bb007ba94e26adb49c4c15de7 +RMD160 (bonnie++-1.97.3.tgz) = 227f0e6b8e643bdd120e013c4f9f35426b3a7475 +SHA512 (bonnie++-1.97.3.tgz) = 44de20b5e46aeaf7f7214766b3c555b8799138f6fd92f87fe9b7dfa6f19815c629d6122c2ef4e4d98a5528dbfcd4c70b3b850eeba05739f6dd20251bf8d7c893 +Size (bonnie++-1.97.3.tgz) = 100166 bytes +SHA1 (patch-ab) = ff04e53fb456be781f4e0751ab5776bf8c1b5c0d diff --git a/benchmarks/bonnie++/patches/patch-aa b/benchmarks/bonnie++/patches/patch-aa deleted file mode 100644 index 723b83a5a0b..00000000000 --- a/benchmarks/bonnie++/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2003/03/10 10:00:38 wiz Exp $ - ---- bonnie++.cpp.orig Tue Dec 3 14:40:35 2002 -+++ bonnie++.cpp -@@ -42,6 +42,10 @@ - #include - #include - -+#ifndef SA_SIGINFO -+#define SA_SIGINFO 0x0040 -+#endif -+ - #ifdef AIX_MEM_SIZE - #include - #include diff --git a/benchmarks/bonnie++/patches/patch-ab b/benchmarks/bonnie++/patches/patch-ab index 708814b0784..7cfb0daad34 100644 --- a/benchmarks/bonnie++/patches/patch-ab +++ b/benchmarks/bonnie++/patches/patch-ab @@ -1,24 +1,44 @@ -$NetBSD: patch-ab,v 1.4 2008/06/20 01:09:08 joerg Exp $ +$NetBSD: patch-ab,v 1.5 2017/08/22 18:51:44 bsiegert Exp $ ---- Makefile.in.orig 2002-10-13 20:26:36.000000000 +0000 +--- Makefile.in.orig 2008-12-30 21:04:25.000000000 +0000 +++ Makefile.in -@@ -27,20 +27,20 @@ ZCAVOBJS=$(ZCAVSRC:.cpp=.o) - ALLOBJS=$(BONOBJS) $(ZCAVOBJS) +@@ -12,7 +12,7 @@ WFLAGS=-Wall -W -Wshadow -Wpointer-arith + CFLAGS=-O2 @debug@ -DNDEBUG $(WFLAGS) $(MORECFLAGS) + CXX=@CXX@ $(CFLAGS) + LINK=@CXX@ +-THREAD_LFLAGS=@thread_ldflags@ ++THREAD_LDFLAGS=@thread_ldflags@ - bonnie++: bonnie++.cpp $(BONOBJS) -- $(CXX) bonnie++.cpp -o bonnie++ $(BONOBJS) $(LFLAGS) -+ $(CXX) bonnie++.cpp -o bonnie++ $(BONOBJS) $(LDFLAGS) + INSTALL=@INSTALL@ + INSTALL_PROGRAM=@INSTALL_PROGRAM@ +@@ -34,13 +34,13 @@ GETCHSRC=getc_putc_helper.cpp duration.c + GETCHOBJS=$(GETCHSRC:.cpp=.o) - zcav: zcav.cpp $(ZCAVOBJS) -- $(CXX) zcav.cpp -o zcav $(ZCAVOBJS) $(LFLAGS) -+ $(CXX) zcav.cpp -o zcav $(ZCAVOBJS) $(LDFLAGS) + bonnie++: $(BONOBJS) +- $(LINK) -o bonnie++ $(BONOBJS) $(THREAD_LFLAGS) ++ $(LINK) -o bonnie++ $(BONOBJS) $(THREAD_LDFLAGS) - install-bin: $(EXES) + zcav: $(ZCAVOBJS) +- $(LINK) -o zcav $(ZCAVOBJS) $(THREAD_LFLAGS) ++ $(LINK) -o zcav $(ZCAVOBJS) $(THREAD_LDFLAGS) + + getc_putc: $(GETCOBJS) getc_putc_helper +- $(LINK) -o getc_putc $(GETCOBJS) $(THREAD_LFLAGS) ++ $(LINK) -o getc_putc $(GETCOBJS) $(THREAD_LDFLAGS) + + getc_putc_helper: $(GETCHOBJS) + $(CXX) -o getc_putc_helper $(GETCHOBJS) +@@ -52,15 +52,15 @@ generate_randfile: generate_randfile.o + $(LINK) generate_randfile.o -o generate_randfile + + install-bin: $(EXE) $(EXES) - mkdir -p $(eprefix)/bin $(eprefix)/sbin - @INSTALL_PROGRAM@ @stripping@ $(EXES) $(eprefix)/sbin +- @INSTALL_PROGRAM@ @stripping@ $(EXE) $(eprefix)/bin - @INSTALL_SCRIPT@ $(SCRIPTS) $(eprefix)/bin + mkdir -p $(eprefix)/bin ${DESTDIR}$(eprefix)/sbin + @INSTALL_PROGRAM@ @stripping@ $(EXES) ${DESTDIR}$(eprefix)/sbin ++ @INSTALL_PROGRAM@ @stripping@ $(EXE) ${DESTDIR}$(eprefix)/bin + @INSTALL_SCRIPT@ $(SCRIPTS) ${DESTDIR}$(eprefix)/bin install: install-bin @@ -29,5 +49,5 @@ $NetBSD: patch-ab,v 1.4 2008/06/20 01:09:08 joerg Exp $ + @INSTALL_DATA@ $(MAN1) ${DESTDIR}@mandir@/man1 + @INSTALL_DATA@ $(MAN8) ${DESTDIR}@mandir@/man8 - %.o: %.cpp %.h bonnie.h port.h + %.o: %.cpp $(CXX) -c $< diff --git a/benchmarks/bonnie++/patches/patch-ac b/benchmarks/bonnie++/patches/patch-ac deleted file mode 100644 index d7d019ed70e..00000000000 --- a/benchmarks/bonnie++/patches/patch-ac +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2011/01/02 17:45:06 jdolecek Exp $ - ---- bon_io.cpp.orig 2011-01-02 17:27:11.000000000 +0000 -+++ bon_io.cpp -@@ -318,7 +318,9 @@ CFileOp::CFileOp(BonTimer &timer, int fi - , m_isopen(false) - , m_name(NULL) - , m_sync(use_sync) -+#ifdef O_DIRECT - , m_use_direct_io(use_direct_io) -+#endif - , m_chunk_bits(chunk_bits) - , m_chunk_size(1 << m_chunk_bits) - , m_chunks_per_file(Unit / m_chunk_size * IOFileSize) -@@ -393,10 +395,12 @@ int CFileOp::m_open(CPCCHAR base_name, i - createFlag = OPEN_ACTION_CREATE_IF_NEW | OPEN_ACTION_REPLACE_IF_EXISTS; - #else - flags = O_RDWR | O_CREAT | O_EXCL; -+#ifdef O_DIRECT - if(m_use_direct_io) - { - flags |= O_DIRECT; - } -+#endif /* O_DIRECT */ - #endif - } - else diff --git a/benchmarks/bonnie++/patches/patch-ad b/benchmarks/bonnie++/patches/patch-ad deleted file mode 100644 index fc0577515d6..00000000000 --- a/benchmarks/bonnie++/patches/patch-ad +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2011/01/02 17:45:06 jdolecek Exp $ - ---- bon_io.h.orig 2011-01-02 17:28:45.000000000 +0000 -+++ bon_io.h -@@ -33,7 +33,9 @@ private: - bool m_isopen; - char *m_name; - bool m_sync; -+#ifdef O_DIRECT - bool m_use_direct_io; -+#endif - const int m_chunk_bits, m_chunk_size; - int m_chunks_per_file, m_total_chunks; - int m_last_file_chunks; -- cgit v1.2.3