Changes 3.03:

* Many improvements

4 files changed, 14 insertions, 57 deletions

diff --git a/benchmarks/dbench/Makefile b/benchmarks/dbench/Makefile
index 8fb9fee037b..83cfec5f1ed 100644
--- a/benchmarks/dbench/Makefile
+++ b/benchmarks/dbench/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2004/11/10 15:32:33 adam Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/12 09:55:57 adam Exp $
 
-DISTNAME=	dbench-2.1
+DISTNAME=	dbench-3.03
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://samba.org/ftp/tridge/dbench/
 
@@ -10,19 +10,13 @@ COMMENT=	Simulation of the Ziff-Davis netbench benchmark
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/man/man1
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
 MAKE_ENV+=	DB_LDFLAGS="-lrt" TB_LDFLAGS="-lsocket -lnsl"
 .endif
 
-INSTALLATION_DIRS=	bin
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/dbench ${PREFIX}/bin/dbench
-	${INSTALL_PROGRAM} ${WRKSRC}/tbench ${PREFIX}/bin/tbench
-	${INSTALL_PROGRAM} ${WRKSRC}/tbench_srv ${PREFIX}/bin/tbench_srv
-	${INSTALL_DATA_DIR} ${PREFIX}/share/dbench
-	${INSTALL_DATA} ${WRKSRC}/client_*.txt ${PREFIX}/share/dbench/
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/dbench/PLIST b/benchmarks/dbench/PLIST
index 3f3078a3e8d..167c8acb408 100644
--- a/benchmarks/dbench/PLIST
+++ b/benchmarks/dbench/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2004/11/10 15:32:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/07/12 09:55:57 adam Exp $
 bin/dbench
 bin/tbench
 bin/tbench_srv
-share/dbench/client_oplocks.txt
-share/dbench/client_plain.txt
-@dirrm share/dbench
+man/man1/dbench.1
+man/man1/tbench.1
+man/man1/tbench_srv.1
+share/client.txt
diff --git a/benchmarks/dbench/distinfo b/benchmarks/dbench/distinfo
index 76323e2da08..e41aab1a8a9 100644
--- a/benchmarks/dbench/distinfo
+++ b/benchmarks/dbench/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/03/25 15:44:38 minskim Exp $
+$NetBSD: distinfo,v 1.6 2005/07/12 09:55:57 adam Exp $
 
-SHA1 (dbench-2.1.tar.gz) = 13331f549fb4c5f32069ec6b660e4b171ca64572
-RMD160 (dbench-2.1.tar.gz) = 436ed94b99e8098b7bc1f1aaa7fdcaba36cf6be4
-Size (dbench-2.1.tar.gz) = 701293 bytes
+SHA1 (dbench-3.03.tar.gz) = 9261e6c3d800ee6822be579ac37a9d531a03e4c2
+RMD160 (dbench-3.03.tar.gz) = 1fc311e3d598f25b96448002006a94e24ae8424a
+Size (dbench-3.03.tar.gz) = 2076982 bytes
 SHA1 (patch-aa) = d31fca72a9b733f6e6540b75a8acc9da44fe74d8
-SHA1 (patch-ab) = 136d72277d3698a0b7638c1ac4661aa22028cf05
diff --git a/benchmarks/dbench/patches/patch-ab b/benchmarks/dbench/patches/patch-ab
deleted file mode 100644
index 1036d470675..00000000000
--- a/benchmarks/dbench/patches/patch-ab
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2004/11/10 15:32:33 adam Exp $
-
---- Makefile.orig	2003-10-16 01:59:00.000000000 +0000
-+++ Makefile
-@@ -1,12 +1,11 @@
- VERSION=2.1
- 
--DESTDIR=/usr/local
-+DESTDIR=${PREFIX}
- BINDIR=$(DESTDIR)/bin/
- MANDIR=$(DESTDIR)/man/man1/
--DATADIR=./
-+DATADIR=$(DESTDIR)/share/dbench/
- 
--CC = gcc
--CFLAGS = -O2 -Wall -DVERSION=\"$(VERSION)\" -DDATADIR=\"$(DATADIR)\"
-+CPPFLAGS = -DVERSION=\"$(VERSION)\" -DDATADIR=\"$(DATADIR)\"
- 
- DB_OBJS = fileio.o util.o dbench.o child.o
- TB_OBJS = sockio.o util.o dbench.o child.o socklib.o
-@@ -15,13 +14,13 @@ SRV_OBJS = util.o tbench_srv.o socklib.o
- all: dbench tbench tbench_srv
- 
- dbench: $(DB_OBJS)
--	$(CC) -o $@ $(DB_OBJS)
-+	$(CC) -o $@ $(DB_OBJS) $(DB_LDFLAGS)
- 
- tbench: $(TB_OBJS)
--	$(CC) -o $@ $(TB_OBJS)
-+	$(CC) -o $@ $(TB_OBJS) $(TB_LDFLAGS)
- 
- tbench_srv: $(SRV_OBJS)
--	$(CC) -o $@ $(SRV_OBJS)
-+	$(CC) -o $@ $(SRV_OBJS) $(TB_LDFLAGS)
- 
- # Careful here: don't install client.txt over itself.
- install: all