Update this pkg to 2.06. There doesn't seem to be any changelog, nor any

obvious changes, other than the addition of a -html option to generate html
tables for results.

4 files changed, 30 insertions, 102 deletions

diff --git a/benchmarks/bonnie/Makefile b/benchmarks/bonnie/Makefile
index 297892b51da..7a99ff09653 100644
--- a/benchmarks/bonnie/Makefile
+++ b/benchmarks/bonnie/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.17 2001/04/09 11:45:35 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2001/07/16 22:50:47 garbled Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/11/26 23:09:14 jseger Exp
 #
 
-DISTNAME=       Bonnie
-PKGNAME=	bonnie-1.0
+DISTNAME=       bonnie
+PKGNAME=	bonnie-2.06
 CATEGORIES=	benchmarks
-MASTER_SITES=   ftp://ftp0.sunet.se/pub/benchmark/Bonnie/
-EXTRACT_SUFX=   .tar.Z
+MASTER_SITES=   http://www.textuality.com/bonnie/
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	root@garbled.net
 HOMEPAGE=	http://www.textuality.com/bonnie/index.html
 COMMENT=	Performance Test of Filesystem I/O
 
 NO_CONFIGURE=	yes
 
+WRKSRC=		${WRKDIR}
 MANCOMPRESSED_IF_MANZ=	yes
 
 post-extract:
diff --git a/benchmarks/bonnie/distinfo b/benchmarks/bonnie/distinfo
index 75cffd0f8fd..e680b417486 100644
--- a/benchmarks/bonnie/distinfo
+++ b/benchmarks/bonnie/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 09:13:23 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/07/16 22:50:48 garbled Exp $
 
-SHA1 (Bonnie.tar.Z) = 11387dd47cd046413083d4c99e1857bd961de9fe
-Size (Bonnie.tar.Z) = 14202 bytes
-SHA1 (patch-aa) = a66447e5fc512fe211250240cc6627c7bb4ce4cb
-SHA1 (patch-ab) = e2f2294f9c65dac318afb30cf84145eb280353c6
+SHA1 (bonnie.tar.gz) = f435ae56903883c8e3e011eb989783c8410f5ee3
+Size (bonnie.tar.gz) = 7140 bytes
+SHA1 (patch-aa) = 33ac03e1c70bba2aedf0482e23c16cf19956b47e
diff --git a/benchmarks/bonnie/patches/patch-aa b/benchmarks/bonnie/patches/patch-aa
index ce0c29735aa..e597739111c 100644
--- a/benchmarks/bonnie/patches/patch-aa
+++ b/benchmarks/bonnie/patches/patch-aa
@@ -1,73 +1,20 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 10:36:25 agc Exp $
-
---- bonnie.1.orig	Thu Feb 26 23:50:18 1998
-+++ bonnie.1	Thu Feb 26 23:50:18 1998
-@@ -0,0 +1,68 @@
-+.\" The following requests are required for all man pages.
-+.Dd May 18, 1995
-+.Os UNIX
-+.Dt BONNIE 1
-+.Sh NAME
-+.Nm bonnie
-+.Nd Performance Test of Filesystem I/O
-+.Sh SYNOPSIS
-+.Nm bonnie
-+.Op Fl d Ar scratch-dir
-+.Op Fl s Ar size-in-MB
-+.Op Fl m Ar machine-label
-+
-+.Sh DESCRIPTION
-+.Nm Bonnie 
-+tests the speed of file I/O from standard C library calls.
-+It reads and writes 8KB blocks to find the maximum sustained 
-+data rate (usually limited by the drive or controller) and additionally 
-+rewrites the file (better simulating normal operating conditions and 
-+quite dependent on drive and OS optimisations).
-+
-+The per character read and write tests are generally limited by CPU speed
-+only on current generation hardware. It takes some 35 SPECint92 to read
-+or write a file at a rate of 1MB/s using getc() and putc().
-+
-+The seek test results depend on the buffer cache size, since the fraction
-+of disk blocks that fits into the buffer cache will be found without any 
-+disk operation and will contribute zero seek time samples.
-+(See 
-+.Sx BUGS 
-+below.)
-+
-+.Sh OPTIONS
-+.Bl -tag -width indent
-+.It Fl d Ar scratch-dir
-+Specify the directory where the test file gets written. The default 
-+is the current directory. Make sure there is sufficient free space 
-+available on the partition this directory resides in.
-+.It Fl s Ar size-in-MB
-+Specify the size of the test file in MByte. This much space must be 
-+available for the tests to complete.
-+.It Fl m Ar machine-label
-+Specify a label to be written in the first column of the result table.
-+.El
-+
-+.Sh SEE ALSO
-+.Xr iozone 1 ,
-+.Xr iostat 8
-+
-+.Sh AUTHOR
-+.Nm Bonnie
-+was written by Tim Bray <tbray@watsol.waterloo.edu>.
-+
-+.Sh BUGS
-+.Nm Bonnie 
-+tries hard to measure disk performance and not the quality of the 
-+buffer cache implementation. In merged buffer caches common today,
-+the buffer cache size is often only limited by total RAM on an otherwise
-+unloaded system. Be sure to use a file at least twice at large as 
-+available RAM to protect against artificially high results.
-+
-+There is no way to keep the buffer cache from increasing the reported
-+seek rate. This is because the fraction of accesses corresponding to the 
-+amount of the file cached, will be done without seeks.
-+If your buffer cache is half the size of the file used, then half the 
-+requests will be satisfied immediately, and and the seek rate printed 
-+will be twice the actual value. 
-+
+$NetBSD: patch-aa,v 1.4 2001/07/16 22:50:48 garbled Exp $
+--- Makefile.orig	Wed Aug 28 18:45:37 1996
++++ Makefile	Mon Jul 16 15:45:20 2001
+@@ -1,11 +1,8 @@
+-CFLAGS = -O $(SYSFLAGS)
++PROG= bonnie
+ 
+-bsd:	
+-	@echo 'Options are "make bsd" and "make SysV" - the default is "bsd".'
+-	@echo 'If you get messages about missing functions, try "make SysV."'
+-	make Bonnie 
++BINDIR=${PREFIX}/bin
++MANDIR=${PREFIX}/man
+ 
+-SysV:	
+-	make Bonnie 'SYSFLAGS=-DSysV'
++MANINSTALL=   maninstall catinstall
+ 
+-Bonnie:	
++.include <bsd.prog.mk>
diff --git a/benchmarks/bonnie/patches/patch-ab b/benchmarks/bonnie/patches/patch-ab
deleted file mode 100644
index 8ec22dd7911..00000000000
--- a/benchmarks/bonnie/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.5 1998/08/07 10:36:25 agc Exp $
-
---- Makefile.orig	Wed Aug 21 17:19:11 1991
-+++ Makefile	Sat Mar  7 13:36:58 1998
-@@ -1,7 +1,9 @@
- 
--CC = cc
--CFLAGS = -O2
-+PROG=	bonnie
- 
--all:	Bonnie 
-+BINDIR=${PREFIX}/bin
-+MANDIR=${PREFIX}/man
- 
--Bonnie:
-+MANINSTALL=	maninstall catinstall
-+
-+.include <bsd.prog.mk>