diff -ruN --exclude=CVS /usr/ports/benchmarks/dbench.orig/Makefile /usr/ports/benchmarks/dbench/Makefile
--- /usr/ports/benchmarks/dbench.orig/Makefile	2010-08-28 06:21:26.000000000 -0700
+++ /usr/ports/benchmarks/dbench/Makefile	2010-08-28 08:44:51.000000000 -0700
@@ -6,18 +6,25 @@
 #
 
 PORTNAME=	dbench
-PORTVERSION=	3.04
-PORTREVISION=	2
+PORTVERSION=	4.0
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://samba.org/ftp/tridge/dbench/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	kimelto@gmail.com
 COMMENT=	A simulation of the Ziff-Davis netbench benchmark
 
+LIB_DEPENDS=	popt:${PORTSDIR}/devel/popt
+
+LICENSE=	GPLv3
+
+CFLAGS+=	-I${LOCALBASE}/include
+USE_AUTOTOOLS=	autoconf:262
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS+=--datadir=${DATADIR}
 
-MAN1=	dbench.1
-MLINKS=	dbench.1 tbench.1 dbench.1 tbench_srv.1
+MAN1=		dbench.1
+MLINKS=		dbench.1 tbench.1 dbench.1 tbench_srv.1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,$$(mandir),$$(mandir)/man1,' \
diff -ruN --exclude=CVS /usr/ports/benchmarks/dbench.orig/distinfo /usr/ports/benchmarks/dbench/distinfo
--- /usr/ports/benchmarks/dbench.orig/distinfo	2010-08-28 06:21:26.000000000 -0700
+++ /usr/ports/benchmarks/dbench/distinfo	2010-08-28 06:26:15.000000000 -0700
@@ -1,3 +1,3 @@
-MD5 (dbench-3.04.tar.gz) = efd0c958da79c1cd941ecd3f63e637ae
-SHA256 (dbench-3.04.tar.gz) = 055e411081ae25fd358dd0f4c1547ee1bd7429bea0f1fad9156a50a09ddd668b
-SIZE (dbench-3.04.tar.gz) = 2078197
+MD5 (dbench-4.0.tar.gz) = 1fe56ff71b9a416f8889d7150ac54da4
+SHA256 (dbench-4.0.tar.gz) = 6001893f34e68a3cfeb5d424e1f2bfef005df96a22d86f35dc770c5bccf3aa8a
+SIZE (dbench-4.0.tar.gz) = 2055359
diff -ruN --exclude=CVS /usr/ports/benchmarks/dbench.orig/files/patch-configure /usr/ports/benchmarks/dbench/files/patch-configure
--- /usr/ports/benchmarks/dbench.orig/files/patch-configure	2010-08-28 06:21:26.000000000 -0700
+++ /usr/ports/benchmarks/dbench/files/patch-configure	1969-12-31 16:00:00.000000000 -0800
@@ -1,11 +0,0 @@
---- configure.orig	Wed Jan 12 23:04:18 2005
-+++ configure	Tue Feb 27 08:31:28 2007
-@@ -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 --exclude=CVS /usr/ports/benchmarks/dbench.orig/pkg-descr /usr/ports/benchmarks/dbench/pkg-descr
--- /usr/ports/benchmarks/dbench.orig/pkg-descr	2010-08-28 06:21:26.000000000 -0700
+++ /usr/ports/benchmarks/dbench/pkg-descr	2010-08-28 06:22:26.000000000 -0700
@@ -2,3 +2,5 @@
 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.
+
+WWW:	http://dbench.samba.org/
diff -ruN --exclude=CVS /usr/ports/benchmarks/dbench.orig/pkg-plist /usr/ports/benchmarks/dbench/pkg-plist
--- /usr/ports/benchmarks/dbench.orig/pkg-plist	2010-08-28 06:21:26.000000000 -0700
+++ /usr/ports/benchmarks/dbench/pkg-plist	2010-08-28 08:20:05.000000000 -0700
@@ -2,4 +2,4 @@
 bin/tbench
 bin/tbench_srv
 %%DATADIR%%/client.txt
-@dirrm share/dbench
+@dirrm %%DATADIR%%