From a88bfac568e8fdcec91b6dcd1e82fd688db54798 Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme>
Date: Mon, 10 Oct 2005 08:35:54 +0000
Subject: Explicitly specify to Makefile.in the directory on which the manpages
 will be installed, otherwise as --mandir now defaults to
 ${PREFIX}/${PKGMANDIR}, they won't be installed into the correct location.

Bump PKGREVISION.
---
 benchmarks/dbench/Makefile         |  5 ++---
 benchmarks/dbench/distinfo         |  3 ++-
 benchmarks/dbench/patches/patch-ab | 21 +++++++++++++++++++++
 3 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 benchmarks/dbench/patches/patch-ab

(limited to 'benchmarks')

diff --git a/benchmarks/dbench/Makefile b/benchmarks/dbench/Makefile
index 5cb8c649b5d..b38a33645a4 100644
--- a/benchmarks/dbench/Makefile
+++ b/benchmarks/dbench/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2005/09/25 10:40:18 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2005/10/10 08:35:54 xtraeme Exp $
 
 DISTNAME=	dbench-3.03
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://samba.org/ftp/tridge/dbench/
 
@@ -12,7 +12,6 @@ COMMENT=	Simulation of the Ziff-Davis netbench benchmark
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--mandir=${PREFIX}/man/man1
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/benchmarks/dbench/distinfo b/benchmarks/dbench/distinfo
index d88b153dd60..90d33b3529e 100644
--- a/benchmarks/dbench/distinfo
+++ b/benchmarks/dbench/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2005/09/25 10:40:18 rillig Exp $
+$NetBSD: distinfo,v 1.8 2005/10/10 08:35:54 xtraeme Exp $
 
 SHA1 (dbench-3.03.tar.gz) = 9261e6c3d800ee6822be579ac37a9d531a03e4c2
 RMD160 (dbench-3.03.tar.gz) = 1fc311e3d598f25b96448002006a94e24ae8424a
 Size (dbench-3.03.tar.gz) = 2076982 bytes
 SHA1 (patch-aa) = b2a134ef7650bef60551972f5c3c0209d6d41112
+SHA1 (patch-ab) = 5a26819bffe3a20c31e88846d327e3af92144833
diff --git a/benchmarks/dbench/patches/patch-ab b/benchmarks/dbench/patches/patch-ab
new file mode 100644
index 00000000000..5c5f986bb8c
--- /dev/null
+++ b/benchmarks/dbench/patches/patch-ab
@@ -0,0 +1,21 @@
+$NetBSD: patch-ab,v 1.5 2005/10/10 08:35:54 xtraeme Exp $
+
+--- Makefile.in.orig	2005-10-10 10:26:24.000000000 +0200
++++ Makefile.in	2005-10-10 10:26:46.000000000 +0200
+@@ -32,12 +32,12 @@
+ 
+ # Careful here: don't install client.txt over itself.
+ install: all
+-	${INSTALLCMD} -d $(bindir) $(datadir) $(mandir)
++	${INSTALLCMD} -d $(bindir) $(datadir) $(mandir)/man1
+ 	${INSTALLCMD} dbench tbench tbench_srv $(bindir)
+ 	${INSTALLCMD} client.txt $(datadir)
+-	${INSTALLCMD} -m644 dbench.1 $(mandir)
+-	ln -sf dbench.1 $(mandir)/tbench.1
+-	ln -sf dbench.1 $(mandir)/tbench_srv.1
++	${INSTALLCMD} -m644 dbench.1 $(mandir)/man1
++	ln -sf dbench.1 $(mandir)/man1/tbench.1
++	ln -sf dbench.1 $(mandir)/man1/tbench_srv.1
+ 
+ clean:
+ 	rm -f *.o *~ dbench tbench tbench_srv
-- 
cgit v1.2.3