View | Details | Raw Unified | Return to bug 87620
Collapse All | Expand All

(-)dbench/Makefile (-9 / +3 lines)
Lines 6-24 Link Here
6
#
6
#
7
7
8
PORTNAME=	dbench
8
PORTNAME=	dbench
9
PORTVERSION=	1.3
9
PORTVERSION=	3.03
10
CATEGORIES=	benchmarks
10
CATEGORIES=	benchmarks
11
MASTER_SITES=	http://samba.org/ftp/tridge/dbench/
11
MASTER_SITES=	http://samba.org/ftp/tridge/dbench/
12
12
13
MAINTAINER=	ports@FreeBSD.org
13
MAINTAINER=	jmelo@freebsdbrasil.com.br
14
COMMENT=	A simulation of the Ziff-Davis netbench benchmark
14
COMMENT=	A simulation of the Ziff-Davis netbench benchmark
15
15
16
WRKSRC=		${WRKDIR}/dbench
16
HAS_CONFIGURE=	yes
17
USE_REINPLACE=	yes
18
MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
19
PLIST_FILES=	bin/dbench bin/tbench bin/tbench_srv
20
21
do-install:
22
	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PLIST_FILES:T} ${PREFIX}/bin
23
17
24
.include <bsd.port.mk>
18
.include <bsd.port.mk>
(-)dbench/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
MD5 (dbench-1.3.tar.gz) = 38d6e6dcb6a4482e3e210f0f9c4050f9
1
MD5 (dbench-3.03.tar.gz) = 8bdfa26c7cb0b400223d9be22d761257
2
SIZE (dbench-1.3.tar.gz) = 266746
2
SIZE (dbench-3.03.tar.gz) = 2076982
(-)dbench/files/patch-aa (-22 lines)
Lines 1-22 Link Here
1
*** dbench.h.orig	Fri Jan  5 06:49:41 2001
2
--- dbench.h	Sun Feb 17 02:06:34 2002
3
***************
4
*** 42,49 ****
5
  #define MSG_WAITALL 0x100
6
  #endif
7
  
8
  #define MIN(x,y) ((x)<(y)?(x):(y))
9
! 
10
  #define TCP_PORT 7003
11
  #define TCP_OPTIONS "TCP_NODELAY SO_REUSEADDR"
12
  
13
--- 42,50 ----
14
  #define MSG_WAITALL 0x100
15
  #endif
16
  
17
+ #ifndef MIN
18
  #define MIN(x,y) ((x)<(y)?(x):(y))
19
! #endif /* MIN */
20
  #define TCP_PORT 7003
21
  #define TCP_OPTIONS "TCP_NODELAY SO_REUSEADDR"
22
  
(-)dbench/files/patch-ab (-52 lines)
Lines 1-52 Link Here
1
*** fileio.c.orig	Mon Sep 10 08:21:01 2001
2
--- fileio.c	Sun Feb 17 02:06:34 2002
3
***************
4
*** 18,23 ****
5
--- 18,27 ----
6
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
7
  */
8
  
9
+ #if (defined(__unix__) || defined(unix)) && !defined(USG)
10
+ #include <sys/param.h>
11
+ #endif
12
+ 
13
  #include "dbench.h"
14
  
15
  #define MAX_FILES 1000
16
***************
17
*** 58,64 ****
18
--- 62,73 ----
19
  		       copy_name,
20
  		       strerror(errno));
21
  	} else {
22
+ #ifdef	BSD
23
+ 		if (fsync(dir_fd) == -1) {
24
+ #else
25
  		if (fdatasync(dir_fd) == -1) {
26
+ #endif /* BSD */
27
+ 
28
  			printf("datasync directory \"%s\" failed: %s\n",
29
  			       copy_name,
30
  			       strerror(errno));
31
***************
32
*** 111,118 ****
33
  	if (size == 0) flags |= O_TRUNC;
34
  
35
  	if (sync_open)
36
  		flags |= O_SYNC;
37
! 	
38
  	fd = open(fname, flags, 0600);
39
  	if (fd == -1) {
40
  		printf("(%d) open %s failed for handle %d (%s)\n", 
41
--- 120,130 ----
42
  	if (size == 0) flags |= O_TRUNC;
43
  
44
  	if (sync_open)
45
+ #ifdef	BSD
46
+ 		flags |= O_FSYNC;
47
+ #else
48
  		flags |= O_SYNC;
49
! #endif /* BSD */	
50
  	fd = open(fname, flags, 0600);
51
  	if (fd == -1) {
52
  		printf("(%d) open %s failed for handle %d (%s)\n", 
(-)dbench/files/patch-configure (+11 lines)
Line 0 Link Here
1
--- configure.old	Tue Oct 18 11:18:21 2005
2
+++ configure	Tue Oct 18 11:19:00 2005
3
@@ -339,7 +339,7 @@
4
 bindir='${exec_prefix}/bin'
5
 sbindir='${exec_prefix}/sbin'
6
 libexecdir='${exec_prefix}/libexec'
7
-datadir='${prefix}/share'
8
+datadir='${prefix}/share/dbench'
9
 sysconfdir='${prefix}/etc'
10
 sharedstatedir='${prefix}/com'
11
 localstatedir='${prefix}/var'
(-)dbench/pkg-plist (+8 lines)
Line 0 Link Here
1
bin/dbench
2
bin/tbench
3
bin/tbench_srv
4
man/dbench.1
5
man/tbench.1
6
man/tbench_srv.1
7
share/dbench/client.txt
8
@dirrm share/dbench

Return to bug 87620