Changes 2.1:

* unknown

5 files changed, 27 insertions, 50 deletions

diff --git a/benchmarks/dbench/Makefile b/benchmarks/dbench/Makefile
index 682fbb35db7..8fb9fee037b 100644
--- a/benchmarks/dbench/Makefile
+++ b/benchmarks/dbench/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2004/10/28 16:43:14 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.7 2004/11/10 15:32:33 adam Exp $
 
-DISTNAME=	dbench-1.3
+DISTNAME=	dbench-2.1
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://samba.org/ftp/tridge/dbench/
 
@@ -11,8 +10,6 @@ COMMENT=	Simulation of the Ziff-Davis netbench benchmark
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-WRKSRC=		${WRKDIR}/dbench
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
@@ -26,6 +23,6 @@ do-install:
 	${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/client.txt
+	${INSTALL_DATA} ${WRKSRC}/client_*.txt ${PREFIX}/share/dbench/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/dbench/PLIST b/benchmarks/dbench/PLIST
index 2ff7f9080e8..3f3078a3e8d 100644
--- a/benchmarks/dbench/PLIST
+++ b/benchmarks/dbench/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/07/17 15:11:44 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/11/10 15:32:33 adam Exp $
 bin/dbench
 bin/tbench
 bin/tbench_srv
-share/dbench/client.txt
+share/dbench/client_oplocks.txt
+share/dbench/client_plain.txt
 @dirrm share/dbench
diff --git a/benchmarks/dbench/distinfo b/benchmarks/dbench/distinfo
index c731aa21d47..5bbbebd7c6e 100644
--- a/benchmarks/dbench/distinfo
+++ b/benchmarks/dbench/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2003/09/19 18:08:14 wiz Exp $
+$NetBSD: distinfo,v 1.3 2004/11/10 15:32:33 adam Exp $
 
-SHA1 (dbench-1.3.tar.gz) = b46f72ac0a81acf7a0f368e20e5d83ee3932a35a
-Size (dbench-1.3.tar.gz) = 266746 bytes
-SHA1 (patch-aa) = 1c34848d3ce3294a1ae228243ff6fcae8a874826
-SHA1 (patch-ab) = 63d2fd91fcd1e282179ba10c9d6ae06e89f6b945
+SHA1 (dbench-2.1.tar.gz) = 13331f549fb4c5f32069ec6b660e4b171ca64572
+Size (dbench-2.1.tar.gz) = 701293 bytes
+SHA1 (patch-ab) = 136d72277d3698a0b7638c1ac4661aa22028cf05
diff --git a/benchmarks/dbench/patches/patch-aa b/benchmarks/dbench/patches/patch-aa
deleted file mode 100644
index 502dbd713a1..00000000000
--- a/benchmarks/dbench/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/07/17 15:11:44 agc Exp $
-
---- child.c	2003/07/17 14:48:57	1.1
-+++ child.c	2003/07/17 14:51:22
-@@ -29,16 +29,18 @@
- 
- int line_count=0;
- 
--char *client_filename = "client.txt";
-+char *client_filename = PREFIX "/share/dbench/" "client.txt";
- 
- 
- static int sigsegv(int sig)
- {
- 	char line[200];
- 	printf("segv at line %d\n", line_count);
-+#ifdef __linux__
- 	sprintf(line, "/usr/X11R6/bin/xterm -e gdb /proc/%d/exe %d", 
- 		getpid(), getpid());
- 	system(line);
-+#endif
- 	exit(1);
- }
- 
diff --git a/benchmarks/dbench/patches/patch-ab b/benchmarks/dbench/patches/patch-ab
index b4790828245..1036d470675 100644
--- a/benchmarks/dbench/patches/patch-ab
+++ b/benchmarks/dbench/patches/patch-ab
@@ -1,20 +1,24 @@
-$NetBSD: patch-ab,v 1.2 2003/09/19 18:08:16 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2004/11/10 15:32:33 adam Exp $
 
---- Makefile.orig	Mon Sep 10 05:21:01 2001
-+++ Makefile	Fri Sep 19 16:06:02 2003
-@@ -1,8 +1,8 @@
- VERSION = 1.2.01
+--- 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 
--CPPFLAGS = "-DVERSION=\"$(VERSION)\""
-+#CC = gcc
-+#CFLAGS = -O2 -Wall 
-+CPPFLAGS = "-DVERSION=\"$(VERSION)\"" -DPREFIX='"${PREFIX}"'
+-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
-@@ -11,13 +11,13 @@
+@@ -15,13 +14,13 @@ SRV_OBJS = util.o tbench_srv.o socklib.o
  all: dbench tbench tbench_srv
  
  dbench: $(DB_OBJS)
@@ -29,5 +33,5 @@ $NetBSD: patch-ab,v 1.2 2003/09/19 18:08:16 wiz Exp $
 -	$(CC) -o $@ $(SRV_OBJS)
 +	$(CC) -o $@ $(SRV_OBJS) $(TB_LDFLAGS)
  
- clean:
- 	rm -f *.o *~ dbench tbench tbench_srv
+ # Careful here: don't install client.txt over itself.
+ install: all