From dcf237cb8201849cc142532387c7cf71325f610a Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Mon, 25 Nov 2013 01:13:08 -0700
Subject: [PATCH] Convert bonnie++ to working recipe

---
 app-benchmarks/bonnie++/bonnie++-1.03e.recipe | 83 ++++++++++++++-----
 .../bonnie++/patches/bonnie++-1.03e.patch     | 24 ------
 2 files changed, 60 insertions(+), 47 deletions(-)
 delete mode 100644 app-benchmarks/bonnie++/patches/bonnie++-1.03e.patch

diff --git a/app-benchmarks/bonnie++/bonnie++-1.03e.recipe b/app-benchmarks/bonnie++/bonnie++-1.03e.recipe
index d6ecb6b1a..f9bd39b0d 100644
--- a/app-benchmarks/bonnie++/bonnie++-1.03e.recipe
+++ b/app-benchmarks/bonnie++/bonnie++-1.03e.recipe
@@ -1,27 +1,64 @@
-DESCRIPTION="Multi-producer-multi-consumer signal dispatching mechanism in python"
-HOMEPAGE="http://www.coker.com.au/bonnie++/"
-SRC_URI="http://www.coker.com.au/bonnie++/bonnie++-1.03e.tgz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="750aa5b5051263a99c6c195888c74968"
-BUILD()
-{
-        cd bonnie++-1.03e
-        COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-        COMMON_BIN=`finddir B_COMMON_BIN_DIRECTORY`
-        ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--mandir=$COMMON_DOCS/man \
-		--bindir=$COMMON_BIN \
-		--sbindir=$COMMON_BIN
-        make
-}
-INSTALL()
-{
-        cd bonnie++-1.03e
-        make install DESTDIR=${DESTDIR}
+SUMMARY="Bonnie++ is a benchmark and test suite for filesystems"
+DESCRIPTION="
+Bonnie++ is a benchmark suite that is aimed at performing a number of
+simple tests of hard drive and file system performance. Then you can
+decide which test is important and decide how to compare different
+systems after running it. I have no plans to ever have it produce a
+single number, because I don't think that a single number can be
+useful when comparing such things.
 
-}
+The main program tests database type access to a single file (or a set
+of files if you wish to test more than 1G of storage), and it tests
+creation, reading, and deleting of small files which can simulate the
+usage of programs such as Squid, INN, or Maildir format email.
+
+The ZCAV program which I initially released as a seperate package
+tests the performance of different zones of a hard drive. It does not
+write any data (so you can use it on full file systems). It can show
+why comparing the speed of Windows at the start of a hard drive to
+Linux at the end of the hard drive (typical dual-boot scenario) isn't
+a valid comparison.
+"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1990, Tim Bray
 	1999, Russell Coker"
+HOMEPAGE="http://www.coker.com.au/bonnie++/"
+SRC_URI="http://www.coker.com.au/bonnie++/bonnie++-1.03e.tgz"
+REVISION="1"
+CHECKSUM_MD5="750aa5b5051263a99c6c195888c74968"
+ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
+
+PROVIDES="
+	bonnie++ = $portVersion
+	cmd:bonnie++ = $portVersion
+	cmd:zcav = $portVersion
+	cmd:bon_csv2html = $portVersion
+	cmd:bon_csv2txt = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:g++
+	"
+
+BUILD()
+{
+	runConfigure ./configure \
+	--sbindir=$binDir
+	make
+}
+
+INSTALL()
+{
+	make install
+	mv $prefix/sbin/* $binDir
+	rm -rf $prefix/sbin
+}
diff --git a/app-benchmarks/bonnie++/patches/bonnie++-1.03e.patch b/app-benchmarks/bonnie++/patches/bonnie++-1.03e.patch
deleted file mode 100644
index 4ec05bf8c..000000000
--- a/app-benchmarks/bonnie++/patches/bonnie++-1.03e.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN bonnie++-1.03e/Makefile.in bonnie++-1.03e-haiku/Makefile.in
---- bonnie++-1.03e/Makefile.in	2002-10-13 20:26:36.041418752 +0000
-+++ bonnie++-1.03e-haiku/Makefile.in	2011-01-04 12:23:13.153616384 +0000
-@@ -33,14 +33,14 @@
- 	$(CXX) zcav.cpp -o zcav $(ZCAVOBJS) $(LFLAGS)
- 
- install-bin: $(EXES)
--	mkdir -p $(eprefix)/bin $(eprefix)/sbin
--	@INSTALL_PROGRAM@ @stripping@ $(EXES) $(eprefix)/sbin
--	@INSTALL_SCRIPT@ $(SCRIPTS) $(eprefix)/bin
-+	mkdir -p $(DESTDIR)$(eprefix)/bin $(DESTDIR)$(eprefix)/sbin
-+	@INSTALL_PROGRAM@ @stripping@ $(EXES) $(DESTDIR)$(eprefix)/sbin
-+	@INSTALL_SCRIPT@ $(SCRIPTS) $(DESTDIR)$(eprefix)/bin
- 
- install: install-bin
--	mkdir -p @mandir@/man1 @mandir@/man8
--	@INSTALL_DATA@ $(MAN1) @mandir@/man1
--	@INSTALL_DATA@ $(MAN8) @mandir@/man8
-+	mkdir -p $(DESTDIR)@mandir@/man1 $(DESTDIR)@mandir@/man8
-+	@INSTALL_DATA@ $(MAN1) $(DESTDIR)@mandir@/man1
-+	@INSTALL_DATA@ $(MAN8) $(DESTDIR)@mandir@/man8
- 
- %.o: %.cpp %.h bonnie.h port.h
- 	$(CXX) -c $<