summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2007-01-18 11:16:56 +0000
committerrillig <rillig@pkgsrc.org>2007-01-18 11:16:56 +0000
commit77d70bb9e772cd59334d2c9bb6cbe70f1180c874 (patch)
tree65d2d31341de52f61cc910429613ea2987921bb3
parent777113885f3235c29acc6343e1e1b3763476b33a (diff)
downloadpkgsrc-77d70bb9e772cd59334d2c9bb6cbe70f1180c874.tar.gz
Fixed PKGMANDIR.
-rw-r--r--benchmarks/bonnie/Makefile5
-rw-r--r--benchmarks/bonnie/distinfo4
-rw-r--r--benchmarks/bonnie/patches/patch-aa18
3 files changed, 12 insertions, 15 deletions
diff --git a/benchmarks/bonnie/Makefile b/benchmarks/bonnie/Makefile
index 541f3c21e6e..81b976b04fb 100644
--- a/benchmarks/bonnie/Makefile
+++ b/benchmarks/bonnie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2007/01/07 09:13:47 rillig Exp $
+# $NetBSD: Makefile,v 1.30 2007/01/18 11:16:56 rillig Exp $
DISTNAME= bonnie
PKGNAME= bonnie-2.06
@@ -18,8 +18,7 @@ NO_CONFIGURE= yes
WRKSRC= ${WRKDIR}
USE_TOOLS+= expr
-MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} BINMODE=${BINMODE}
-MAKE_ENV+= MANOWN=${MANOWN} MANGRP=${MANGRP} MANMODE=${MANMODE}
+USE_BSD_MAKEFILE= yes
MANCOMPRESSED_IF_MANZ= yes
INSTALLATION_DIRS= bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
diff --git a/benchmarks/bonnie/distinfo b/benchmarks/bonnie/distinfo
index d232cda87f2..3940589dcd2 100644
--- a/benchmarks/bonnie/distinfo
+++ b/benchmarks/bonnie/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2006/04/12 10:55:49 drochner Exp $
+$NetBSD: distinfo,v 1.8 2007/01/18 11:16:56 rillig Exp $
SHA1 (bonnie.tar.gz) = f435ae56903883c8e3e011eb989783c8410f5ee3
RMD160 (bonnie.tar.gz) = 677446fde3f53e2afc2b5f1d76af2555a4779d88
Size (bonnie.tar.gz) = 7140 bytes
-SHA1 (patch-aa) = 33ac03e1c70bba2aedf0482e23c16cf19956b47e
+SHA1 (patch-aa) = e81766946655b43fbd6a7c1dc23e32987827d399
SHA1 (patch-ab) = 927415c66b7c03897aa4cbee07cd54c242272148
SHA1 (patch-ac) = 355c9bbb4f13cf8b2d092c17f0cb4f7bc0a31a9e
diff --git a/benchmarks/bonnie/patches/patch-aa b/benchmarks/bonnie/patches/patch-aa
index e597739111c..cb65803854b 100644
--- a/benchmarks/bonnie/patches/patch-aa
+++ b/benchmarks/bonnie/patches/patch-aa
@@ -1,20 +1,18 @@
-$NetBSD: patch-aa,v 1.4 2001/07/16 22:50:48 garbled Exp $
---- Makefile.orig Wed Aug 28 18:45:37 1996
-+++ Makefile Mon Jul 16 15:45:20 2001
-@@ -1,11 +1,8 @@
+$NetBSD: patch-aa,v 1.5 2007/01/18 11:16:56 rillig Exp $
+
+--- Makefile.orig 1996-08-29 03:45:37.000000000 +0200
++++ Makefile 2007-01-18 12:14:33.000000000 +0100
+@@ -1,11 +1,3 @@
-CFLAGS = -O $(SYSFLAGS)
-+PROG= bonnie
++PROG= bonnie
-bsd:
- @echo 'Options are "make bsd" and "make SysV" - the default is "bsd".'
- @echo 'If you get messages about missing functions, try "make SysV."'
- make Bonnie
-+BINDIR=${PREFIX}/bin
-+MANDIR=${PREFIX}/man
-
+-
-SysV:
- make Bonnie 'SYSFLAGS=-DSysV'
-+MANINSTALL= maninstall catinstall
-
+-
-Bonnie:
+.include <bsd.prog.mk>