From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 6 Mar 2008 16:41:49 +0000 (+0000)
Subject: dbench 3.04 update to 4.0 and apply patch to make it compile again
X-Git-Tag: Release-2010-05/1~7551^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fab57528848c104a95662bfb416378d7e50d666;p=openembedded.git

dbench 3.04 update to 4.0 and apply patch to make it compile again
---

diff --git a/packages/dbench/dbench_3.04.bb b/packages/dbench/dbench_4.0.bb
similarity index 70%
rename from packages/dbench/dbench_3.04.bb
rename to packages/dbench/dbench_4.0.bb
index 1f6b703ba8..aade4170ba 100644
--- a/packages/dbench/dbench_3.04.bb
+++ b/packages/dbench/dbench_4.0.bb
@@ -3,10 +3,12 @@ DESCRIPTION_dbench = "Filesystem load benchmark"
 DESCRIPTION_tbench = "TCP load benchmark"
 HOMEPAGE = "http://samba.org/ftp/tridge/dbench/"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r0"
 
-SRC_URI = "http://samba.org/ftp/tridge/dbench/dbench-${PV}.tar.gz \
-           file://destdir.patch;patch=1"
+SRC_URI = "\
+  http://samba.org/ftp/tridge/dbench/dbench-${PV}.tar.gz \
+  file://destdir.patch;patch=1 \
+  file://makefile.patch;patch=1"
 
 inherit autotools
 
diff --git a/packages/dbench/dbench/.mtn2git_empty b/packages/dbench/files/.mtn2git_empty
similarity index 100%
rename from packages/dbench/dbench/.mtn2git_empty
rename to packages/dbench/files/.mtn2git_empty
diff --git a/packages/dbench/dbench/destdir.patch b/packages/dbench/files/destdir.patch
similarity index 100%
rename from packages/dbench/dbench/destdir.patch
rename to packages/dbench/files/destdir.patch
diff --git a/packages/dbench/files/makefile.patch b/packages/dbench/files/makefile.patch
new file mode 100644
index 0000000000..4f57085e41
--- /dev/null
+++ b/packages/dbench/files/makefile.patch
@@ -0,0 +1,13 @@
+Index: dbench-4.0/Makefile.in
+===================================================================
+--- dbench-4.0.orig/Makefile.in
++++ dbench-4.0/Makefile.in
+@@ -35,7 +35,7 @@ install: all
+ 	${INSTALLCMD} -d $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(mandir)
+ 	${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)$(bindir)
+ 	${INSTALLCMD} client.txt $(DESTDIR)$(datadir)
+-	${INSTALLCMD} -m644 dbench.1 $(DESTDIR)$(mandir)
++	${INSTALLCMD} -m 644 dbench.1 $(DESTDIR)$(mandir)
+ 	ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench.1
+ 	ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench_srv.1
+