Add dbench 1.3, a simulation of the Ziff-Davis netbench benchmark.

PR:		35055
Submitted by:	Andrew Shevtsov <nyxo@dnuc.polyn.kiae.su>

8 files changed, 109 insertions, 0 deletions

diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index 7f844bd18b8c..bff9824dedbd 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -4,6 +4,7 @@
     SUBDIR += bonnie
     SUBDIR += bonnie++
     SUBDIR += bytebench
+    SUBDIR += dbench
     SUBDIR += dbs
     SUBDIR += iozone
     SUBDIR += iozone21
diff --git a/benchmarks/dbench/Makefile b/benchmarks/dbench/Makefile
new file mode 100644
index 000000000000..f70dc13c8bd6
--- /dev/null
+++ b/benchmarks/dbench/Makefile
@@ -0,0 +1,25 @@
+# New ports collection makefile for:	dbench
+# Date created:		18 Febrary 2002
+# Whom:			Andrew Shevtsov <nyxo@dnuc.polyn.kiae.su>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	dbench
+PORTVERSION=	1.3
+CATEGORIES=	benchmarks
+MASTER_SITES=	ftp://samba.org/pub/tridge/dbench/
+
+MAINTAINER=	nyxo@dnuc.polyn.kiae.su
+
+WRKSRC=		${WRKDIR}/dbench
+
+post-patch:
+	@${PERL} -pi -e 's/^CFLAGS.+//g' ${WRKSRC}/Makefile
+
+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
+
+.include <bsd.port.mk>
diff --git a/benchmarks/dbench/distinfo b/benchmarks/dbench/distinfo
new file mode 100644
index 000000000000..327a9bbbc499
--- /dev/null
+++ b/benchmarks/dbench/distinfo
@@ -0,0 +1 @@
+MD5 (dbench-1.3.tar.gz) = 38d6e6dcb6a4482e3e210f0f9c4050f9
diff --git a/benchmarks/dbench/files/patch-aa b/benchmarks/dbench/files/patch-aa
new file mode 100644
index 000000000000..eee67cada756
--- /dev/null
+++ b/benchmarks/dbench/files/patch-aa
@@ -0,0 +1,22 @@
+*** dbench.h.orig	Fri Jan  5 06:49:41 2001
+--- dbench.h	Sun Feb 17 02:06:34 2002
+***************
+*** 42,49 ****
+  #define MSG_WAITALL 0x100
+  #endif
+  
+  #define MIN(x,y) ((x)<(y)?(x):(y))
+! 
+  #define TCP_PORT 7003
+  #define TCP_OPTIONS "TCP_NODELAY SO_REUSEADDR"
+  
+--- 42,50 ----
+  #define MSG_WAITALL 0x100
+  #endif
+  
++ #ifndef MIN
+  #define MIN(x,y) ((x)<(y)?(x):(y))
+! #endif /* MIN */
+  #define TCP_PORT 7003
+  #define TCP_OPTIONS "TCP_NODELAY SO_REUSEADDR"
+  
diff --git a/benchmarks/dbench/files/patch-ab b/benchmarks/dbench/files/patch-ab
new file mode 100644
index 000000000000..1f313beb5a5c
--- /dev/null
+++ b/benchmarks/dbench/files/patch-ab
@@ -0,0 +1,52 @@
+*** fileio.c.orig	Mon Sep 10 08:21:01 2001
+--- fileio.c	Sun Feb 17 02:06:34 2002
+***************
+*** 18,23 ****
+--- 18,27 ----
+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+  
++ #if (defined(__unix__) || defined(unix)) && !defined(USG)
++ #include <sys/param.h>
++ #endif
++ 
+  #include "dbench.h"
+  
+  #define MAX_FILES 1000
+***************
+*** 58,64 ****
+--- 62,73 ----
+  		       copy_name,
+  		       strerror(errno));
+  	} else {
++ #ifdef	BSD
++ 		if (fsync(dir_fd) == -1) {
++ #else
+  		if (fdatasync(dir_fd) == -1) {
++ #endif /* BSD */
++ 
+  			printf("datasync directory \"%s\" failed: %s\n",
+  			       copy_name,
+  			       strerror(errno));
+***************
+*** 111,118 ****
+  	if (size == 0) flags |= O_TRUNC;
+  
+  	if (sync_open)
+  		flags |= O_SYNC;
+! 	
+  	fd = open(fname, flags, 0600);
+  	if (fd == -1) {
+  		printf("(%d) open %s failed for handle %d (%s)\n", 
+--- 120,130 ----
+  	if (size == 0) flags |= O_TRUNC;
+  
+  	if (sync_open)
++ #ifdef	BSD
++ 		flags |= O_FSYNC;
++ #else
+  		flags |= O_SYNC;
+! #endif /* BSD */	
+  	fd = open(fname, flags, 0600);
+  	if (fd == -1) {
+  		printf("(%d) open %s failed for handle %d (%s)\n", 
diff --git a/benchmarks/dbench/pkg-comment b/benchmarks/dbench/pkg-comment
new file mode 100644
index 000000000000..6ada121de20d
--- /dev/null
+++ b/benchmarks/dbench/pkg-comment
@@ -0,0 +1 @@
+A simulation of the Ziff-Davis netbench benchmark
diff --git a/benchmarks/dbench/pkg-descr b/benchmarks/dbench/pkg-descr
new file mode 100644
index 000000000000..0fb9fdea5e3d
--- /dev/null
+++ b/benchmarks/dbench/pkg-descr
@@ -0,0 +1,4 @@
+Dbench is a filesystem benchmark that generates load patterns similar to those
+of the commercial Netbench benchmark, but without requiring a lab of Windows
+load generators to run. It is now considered a de-facto standard for generating
+load on the Linux VFS.
diff --git a/benchmarks/dbench/pkg-plist b/benchmarks/dbench/pkg-plist
new file mode 100644
index 000000000000..f8db3ffe1665
--- /dev/null
+++ b/benchmarks/dbench/pkg-plist
@@ -0,0 +1,3 @@
+bin/dbench
+bin/tbench
+bin/tbench_srv