[pkgsrc/trunk]: pkgsrc/benchmarks/dbench Explicitly specify to Makefile.in th...

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/16fd56eb505c
branches:  trunk
changeset: 500526:16fd56eb505c
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Mon Oct 10 08:35:54 2005 +0000

description:
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.

diffstat:

 benchmarks/dbench/Makefile         |   5 ++---
 benchmarks/dbench/distinfo         |   3 ++-
 benchmarks/dbench/patches/patch-ab |  21 +++++++++++++++++++++
 3 files changed, 25 insertions(+), 4 deletions(-)

diffs (58 lines):

diff -r 699f01267c6b -r 16fd56eb505c benchmarks/dbench/Makefile
--- a/benchmarks/dbench/Makefile        Mon Oct 10 08:33:24 2005 +0000
+++ b/benchmarks/dbench/Makefile        Mon Oct 10 08:35:54 2005 +0000
@@ -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 @@
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
 GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --mandir=${PREFIX}/man/man1
 
 .include "../../mk/bsd.prefs.mk"
 
diff -r 699f01267c6b -r 16fd56eb505c benchmarks/dbench/distinfo
--- a/benchmarks/dbench/distinfo        Mon Oct 10 08:33:24 2005 +0000
+++ b/benchmarks/dbench/distinfo        Mon Oct 10 08:35:54 2005 +0000
@@ -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 -r 699f01267c6b -r 16fd56eb505c benchmarks/dbench/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/benchmarks/dbench/patches/patch-ab        Mon Oct 10 08:35:54 2005 +0000
@@ -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