pkg/52490: benchmarks/bonnie++ is ancient

[heas%shrubbery.net@localhost]

>Number:         52490
>Category:       pkg
>Synopsis:       benchmarks/bonnie++ is ancient
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Aug 16 23:05:00 +0000 2017
>Originator:     heasley
>Release:        HEAD
>Organization:
NTT
>Environment:
>Description:
benchmarks/bonnie++ is ancient and a co-worker claims the author has suggested on his blog that the current pkgsrc version not be used.  The head is in a subdirectory of the normal release area.
>How-To-Repeat:

>Fix:
here's a diff that appears to work:

Index: Makefile
===================================================================    
RCS file: /cvsroot/pkgsrc/benchmarks/bonnie++/Makefile,v
retrieving revision 1.32
diff -d -u -4 -r1.32 Makefile
--- Makefile    9 Jul 2016 06:37:50 -0000       1.32
+++ Makefile    16 Aug 2017 21:51:36 -0000
@@ -1,11 +1,11 @@
 # $NetBSD: Makefile,v 1.32 2016/07/09 06:37:50 wiz Exp $
 #

-DISTNAME=      bonnie++-1.03e
-PKGREVISION=   6
+DISTNAME=      bonnie++-1.97.3
+PKGREVISION=   1
 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@localhost
 HOMEPAGE=      http://www.coker.com.au/bonnie++/
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/benchmarks/bonnie++/PLIST,v
retrieving revision 1.5
diff -d -u -4 -r1.5 PLIST
--- PLIST       14 Jun 2009 17:33:11 -0000      1.5
+++ PLIST       16 Aug 2017 21:51:36 -0000
@@ -1,10 +1,15 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:33:11 joerg Exp $
+@comment $NetBSD$
 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
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/benchmarks/bonnie++/distinfo,v   
retrieving revision 1.10
diff -d -u -4 -r1.10 distinfo
--- distinfo    3 Nov 2015 00:25:49 -0000       1.10
+++ distinfo    16 Aug 2017 21:51:36 -0000
@@ -1,10 +1,7 @@
 $NetBSD: distinfo,v 1.10 2015/11/03 00:25:49 agc Exp $

-SHA1 (bonnie++-1.03e.tgz) = cf172c262fea075a83df12d5bde337bacba78ea6
-RMD160 (bonnie++-1.03e.tgz) = c7dfdd5826ef1033f1cae168ee9c1fe07877a10f
-SHA512 (bonnie++-1.03e.tgz) = 7ddb3ab9687acf1685497c6cd823c10501d282f192358ac26038e259b
b5e35d2ac9fe666a3d5aa33949cd62919fcb6f05b38ecf97a195bf46b5b23b3a0025122
-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) = 44de20b5e46aeaf7f7214766b3c555b8799138f6fd92f87fe9b7dfa6
f19815c629d6122c2ef4e4d98a5528dbfcd4c70b3b850eeba05739f6dd20251bf8d7c893
+Size (bonnie++-1.97.3.tgz) = 100166 bytes
+SHA1 (patch-ab) = ff04e53fb456be781f4e0751ab5776bf8c1b5c0d
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/benchmarks/bonnie++/patches/patch-ab,v
retrieving revision 1.4
diff -d -u -4 -r1.4 patch-ab
--- patches/patch-ab    20 Jun 2008 01:09:08 -0000      1.4
+++ patches/patch-ab    16 Aug 2017 21:51:36 -0000
@@ -1,25 +1,45 @@
-$NetBSD: patch-ab,v 1.4 2008/06/20 01:09:08 joerg Exp $
+$NetBSD$
  
---- 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
 -      mkdir -p @mandir@/man1 @mandir@/man8
@@ -28,6 +48,6 @@
 +      mkdir -p @mandir@/man1 ${DESTDIR}@mandir@/man8
 +      @INSTALL_DATA@ $(MAN1) ${DESTDIR}@mandir@/man1
 +      @INSTALL_DATA@ $(MAN8) ${DESTDIR}@mandir@/man8

- %.o: %.cpp %.h bonnie.h port.h
+ %.o: %.cpp
        $(CXX) -c $<