(upstream) update 3.04 to 4.0, changes unknown.

(pkgsrc)
 - Add comment on patches picked from cvs log
 - Add ${LDFLAGS} on patch-ab for Makefile.in

5 files changed, 56 insertions, 17 deletions

diff --git a/benchmarks/dbench/Makefile b/benchmarks/dbench/Makefile
index 8cea8ffb88f..def29b3eaa4 100644
--- a/benchmarks/dbench/Makefile
+++ b/benchmarks/dbench/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.16 2014/10/09 14:05:58 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2014/12/12 06:45:34 mef Exp $
 
-DISTNAME=	dbench-3.04
-PKGREVISION=	1
+DISTNAME=	dbench-4.0
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://samba.org/ftp/tridge/dbench/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://samba.org/ftp/tridge/dbench/README
 COMMENT=	Simulation of the Ziff-Davis netbench benchmark
+LICENSE=	gnu-gpl-v3
 
-GNU_CONFIGURE=		yes
+GNU_CONFIGURE=	yes
+USE_TOOLS=	autoconf
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -29,7 +30,11 @@ SUBST_SED.path=		-e 's|/usr/share/|${PREFIX}/share/|g'
 
 INSTALLATION_DIRS=	share/doc/dbench
 
+pre-configure:
+	(cd ${WRKSRC}; autoconf)
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/dbench
 
+.include "../../devel/popt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/dbench/distinfo b/benchmarks/dbench/distinfo
index f686e67f989..11934f8c727 100644
--- a/benchmarks/dbench/distinfo
+++ b/benchmarks/dbench/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2012/01/23 09:39:52 wiz Exp $
+$NetBSD: distinfo,v 1.13 2014/12/12 06:45:34 mef Exp $
 
-SHA1 (dbench-3.04.tar.gz) = 09d7b647663ddc3e5617956dedd1aa6a4da2d840
-RMD160 (dbench-3.04.tar.gz) = 707f396aec21e6c6c79a6b93217e9503356cefea
-Size (dbench-3.04.tar.gz) = 2078197 bytes
-SHA1 (patch-aa) = f808137abe6b88add704ffbbaaa7684b84a5900c
-SHA1 (patch-ab) = 8d17f83c86ef9b733f6970454f3321a8afdac600
-SHA1 (patch-ac) = b60ff204f1f2a1f30976a8c2a51f19e0633e4bf5
+SHA1 (dbench-4.0.tar.gz) = 34492fa9d9686052e9b85bd3deedc2bbf6cef626
+RMD160 (dbench-4.0.tar.gz) = bff2f721eb47868a1e34d4d4691817f0a6f037d8
+Size (dbench-4.0.tar.gz) = 2055359 bytes
+SHA1 (patch-aa) = 3e523784ef4d1f2a3d4bd94ee22b29c604e3721a
+SHA1 (patch-ab) = 83e77ea062793e29a0417c1473214e617799c1c1
+SHA1 (patch-ac) = 2f1990b22f047d6b66521c4a25f5aeddc6aa24f8
diff --git a/benchmarks/dbench/patches/patch-aa b/benchmarks/dbench/patches/patch-aa
index 3cd4ddaf848..cd52096ed84 100644
--- a/benchmarks/dbench/patches/patch-aa
+++ b/benchmarks/dbench/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2012/01/23 09:39:52 wiz Exp $
+$NetBSD: patch-aa,v 1.7 2014/12/12 06:45:34 mef Exp $
+
+Add Darwin and DragonFly support
 
 --- fileio.c.orig	2004-12-13 02:47:59.000000000 +0000
 +++ fileio.c
diff --git a/benchmarks/dbench/patches/patch-ab b/benchmarks/dbench/patches/patch-ab
index 391ef6f7f40..72e70dbe787 100644
--- a/benchmarks/dbench/patches/patch-ab
+++ b/benchmarks/dbench/patches/patch-ab
@@ -1,7 +1,15 @@
-$NetBSD: patch-ab,v 1.6 2008/05/01 13:17:55 obache Exp $
+$NetBSD: patch-ab,v 1.7 2014/12/12 06:45:34 mef Exp $
 
---- Makefile.in.orig	2005-11-08 03:40:41.000000000 +0000
-+++ Makefile.in
+Correction to man path
+
+and Fix followig problem
+=> Checking for missing run-time search paths in dbench-4.0
+ERROR: bin/dbench: missing library: libpopt.so.0
+ERROR: bin/tbench: missing library: libpopt.so.0
+ERROR: bin/tbench_srv: missing library: libpopt.so.0
+
+--- Makefile.in.orig	2008-02-18 09:49:25.000000000 +0900
++++ Makefile.in	2014-12-12 15:25:46.000000000 +0900
 @@ -6,7 +6,7 @@ VPATH=@srcdir@
  prefix=@prefix@
  exec_prefix=@exec_prefix@
@@ -10,4 +18,21 @@ $NetBSD: patch-ab,v 1.6 2008/05/01 13:17:55 obache Exp $
 +mandir=@mandir@/man1
  datadir=@datadir@
  INSTALLCMD=@INSTALL@
- LIBS=@LIBS@
+ LIBS=@LIBS@ -lpopt
+@@ -22,13 +22,13 @@ SRV_OBJS = util.o tbench_srv.o socklib.o
+ all: dbench tbench tbench_srv
+ 
+ dbench: $(DB_OBJS)
+-	$(CC) -o $@ $(DB_OBJS) $(LIBS)
++	$(CC) -o $@ ${LDFLAGS} $(DB_OBJS) $(LIBS)
+ 
+ tbench: $(TB_OBJS)
+-	$(CC) -o $@ $(TB_OBJS) $(LIBS)
++	$(CC) -o $@ ${LDFLAGS} $(TB_OBJS) $(LIBS)
+ 
+ tbench_srv: $(SRV_OBJS)
+-	$(CC) -o $@ $(SRV_OBJS) $(LIBS)
++	$(CC) -o $@ ${LDFLAGS} $(SRV_OBJS) $(LIBS)
+ 
+ # Careful here: don't install client.txt over itself.
+ install: all
diff --git a/benchmarks/dbench/patches/patch-ac b/benchmarks/dbench/patches/patch-ac
index fb425e1c669..330ea045134 100644
--- a/benchmarks/dbench/patches/patch-ac
+++ b/benchmarks/dbench/patches/patch-ac
@@ -1,4 +1,11 @@
-$NetBSD: patch-ac,v 1.2 2006/03/16 23:00:08 minskim Exp $
+$NetBSD: patch-ac,v 1.3 2014/12/12 06:45:34 mef Exp $
+
+Make this package build on Darwin.  getxattr(2) and setxattr(2) on Darwin
+require additional arguments related to the resource fork attribute.
+
+Use O_FSYNC instead of O_SYNC on DragonFly. Disable extattr_get_file
+on DragonFly, the semantic is different and it isn't very useful
+in the current form.
 
 --- system.c.orig	2004-12-12 17:37:43.000000000 -0800
 +++ system.c