diff -ruN dbench.old/Makefile dbench/Makefile --- dbench.old/Makefile Mon Mar 21 12:01:25 2005 +++ dbench/Makefile Tue Oct 18 11:40:50 2005 @@ -6,19 +6,13 @@ # PORTNAME= dbench -PORTVERSION= 1.3 +PORTVERSION= 3.03 CATEGORIES= benchmarks MASTER_SITES= http://samba.org/ftp/tridge/dbench/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= jmelo@freebsdbrasil.com.br COMMENT= A simulation of the Ziff-Davis netbench benchmark -WRKSRC= ${WRKDIR}/dbench -USE_REINPLACE= yes -MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" -PLIST_FILES= bin/dbench bin/tbench bin/tbench_srv - -do-install: - cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PLIST_FILES:T} ${PREFIX}/bin +HAS_CONFIGURE= yes .include diff -ruN dbench.old/distinfo dbench/distinfo --- dbench.old/distinfo Tue Jan 27 18:51:04 2004 +++ dbench/distinfo Tue Oct 18 10:31:04 2005 @@ -1,2 +1,2 @@ -MD5 (dbench-1.3.tar.gz) = 38d6e6dcb6a4482e3e210f0f9c4050f9 -SIZE (dbench-1.3.tar.gz) = 266746 +MD5 (dbench-3.03.tar.gz) = 8bdfa26c7cb0b400223d9be22d761257 +SIZE (dbench-3.03.tar.gz) = 2076982 diff -ruN dbench.old/files/patch-aa dbench/files/patch-aa --- dbench.old/files/patch-aa Sun Feb 24 00:46:12 2002 +++ dbench/files/patch-aa Wed Dec 31 21:00:00 1969 @@ -1,22 +0,0 @@ -*** 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 -ruN dbench.old/files/patch-ab dbench/files/patch-ab --- dbench.old/files/patch-ab Sun Feb 24 00:46:12 2002 +++ dbench/files/patch-ab Wed Dec 31 21:00:00 1969 @@ -1,52 +0,0 @@ -*** 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 -+ #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 -ruN dbench.old/files/patch-configure dbench/files/patch-configure --- dbench.old/files/patch-configure Wed Dec 31 21:00:00 1969 +++ dbench/files/patch-configure Tue Oct 18 11:19:29 2005 @@ -0,0 +1,11 @@ +--- configure.old Tue Oct 18 11:18:21 2005 ++++ configure Tue Oct 18 11:19:00 2005 +@@ -339,7 +339,7 @@ + bindir='${exec_prefix}/bin' + sbindir='${exec_prefix}/sbin' + libexecdir='${exec_prefix}/libexec' +-datadir='${prefix}/share' ++datadir='${prefix}/share/dbench' + sysconfdir='${prefix}/etc' + sharedstatedir='${prefix}/com' + localstatedir='${prefix}/var' diff -ruN dbench.old/pkg-plist dbench/pkg-plist --- dbench.old/pkg-plist Wed Dec 31 21:00:00 1969 +++ dbench/pkg-plist Tue Oct 18 11:28:10 2005 @@ -0,0 +1,8 @@ +bin/dbench +bin/tbench +bin/tbench_srv +man/dbench.1 +man/tbench.1 +man/tbench_srv.1 +share/dbench/client.txt +@dirrm share/dbench