Update dbench to 3.04.

Changes is unknown.

While here,
 * install README file mentioned in man page, suggested in PR 38553.
 * move client.txt to subdir noted in man page
 * fix directory of those files in man page.

4 files changed, 36 insertions, 30 deletions

diff --git a/benchmarks/dbench/Makefile b/benchmarks/dbench/Makefile
index 94247027834..be354e1e113 100644
--- a/benchmarks/dbench/Makefile
+++ b/benchmarks/dbench/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:29:01 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2008/05/01 13:17:55 obache Exp $
 
-DISTNAME=	dbench-3.03
-PKGREVISION=	2
+DISTNAME=	dbench-3.04
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://samba.org/ftp/tridge/dbench/
 
@@ -19,4 +18,16 @@ GNU_CONFIGURE=		yes
 MAKE_ENV+=	DB_LDFLAGS="-lrt" TB_LDFLAGS="-lsocket -lnsl"
 .endif
 
+INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX}
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/dbench
+
+SUBST_CLASSES+=		path
+SUBST_STAGE.path=	post-configure
+SUBST_FILES.path=	dbench.1
+SUBST_SED.path=		-e 's|/usr/share/|${PREFIX}/share/|g'
+
+post-install:
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/dbench
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/dbench
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/dbench/PLIST b/benchmarks/dbench/PLIST
index 167c8acb408..a67b02f2362 100644
--- a/benchmarks/dbench/PLIST
+++ b/benchmarks/dbench/PLIST
@@ -1,8 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2005/07/12 09:55:57 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/05/01 13:17:55 obache Exp $
 bin/dbench
 bin/tbench
 bin/tbench_srv
 man/man1/dbench.1
 man/man1/tbench.1
 man/man1/tbench_srv.1
-share/client.txt
+share/dbench/client.txt
+share/doc/dbench/README
+@dirrm share/doc/dbench
+@dirrm share/dbench
diff --git a/benchmarks/dbench/distinfo b/benchmarks/dbench/distinfo
index 01c4f70590b..9bd2a238e0f 100644
--- a/benchmarks/dbench/distinfo
+++ b/benchmarks/dbench/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2006/03/16 23:00:08 minskim Exp $
+$NetBSD: distinfo,v 1.11 2008/05/01 13:17:55 obache Exp $
 
-SHA1 (dbench-3.03.tar.gz) = 9261e6c3d800ee6822be579ac37a9d531a03e4c2
-RMD160 (dbench-3.03.tar.gz) = 1fc311e3d598f25b96448002006a94e24ae8424a
-Size (dbench-3.03.tar.gz) = 2076982 bytes
+SHA1 (dbench-3.04.tar.gz) = 09d7b647663ddc3e5617956dedd1aa6a4da2d840
+RMD160 (dbench-3.04.tar.gz) = 707f396aec21e6c6c79a6b93217e9503356cefea
+Size (dbench-3.04.tar.gz) = 2078197 bytes
 SHA1 (patch-aa) = 462f50ac9d529d788f165556846df88b8d8765c6
-SHA1 (patch-ab) = 5a26819bffe3a20c31e88846d327e3af92144833
+SHA1 (patch-ab) = 8d17f83c86ef9b733f6970454f3321a8afdac600
 SHA1 (patch-ac) = b60ff204f1f2a1f30976a8c2a51f19e0633e4bf5
diff --git a/benchmarks/dbench/patches/patch-ab b/benchmarks/dbench/patches/patch-ab
index 5c5f986bb8c..391ef6f7f40 100644
--- a/benchmarks/dbench/patches/patch-ab
+++ b/benchmarks/dbench/patches/patch-ab
@@ -1,21 +1,13 @@
-$NetBSD: patch-ab,v 1.5 2005/10/10 08:35:54 xtraeme Exp $
+$NetBSD: patch-ab,v 1.6 2008/05/01 13:17:55 obache Exp $
 
---- Makefile.in.orig	2005-10-10 10:26:24.000000000 +0200
-+++ Makefile.in	2005-10-10 10:26:46.000000000 +0200
-@@ -32,12 +32,12 @@
- 
- # Careful here: don't install client.txt over itself.
- install: all
--	${INSTALLCMD} -d $(bindir) $(datadir) $(mandir)
-+	${INSTALLCMD} -d $(bindir) $(datadir) $(mandir)/man1
- 	${INSTALLCMD} dbench tbench tbench_srv $(bindir)
- 	${INSTALLCMD} client.txt $(datadir)
--	${INSTALLCMD} -m644 dbench.1 $(mandir)
--	ln -sf dbench.1 $(mandir)/tbench.1
--	ln -sf dbench.1 $(mandir)/tbench_srv.1
-+	${INSTALLCMD} -m644 dbench.1 $(mandir)/man1
-+	ln -sf dbench.1 $(mandir)/man1/tbench.1
-+	ln -sf dbench.1 $(mandir)/man1/tbench_srv.1
- 
- clean:
- 	rm -f *.o *~ dbench tbench tbench_srv
+--- Makefile.in.orig	2005-11-08 03:40:41.000000000 +0000
++++ Makefile.in
+@@ -6,7 +6,7 @@ VPATH=@srcdir@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
+-mandir=@mandir@
++mandir=@mandir@/man1
+ datadir=@datadir@
+ INSTALLCMD=@INSTALL@
+ LIBS=@LIBS@