diff options
| author | joerg <joerg@pkgsrc.org> | 2008-06-20 01:09:05 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2008-06-20 01:09:05 +0000 |
| commit | 80f8f7c3b3aa5f5f64de1111703eed75cf2b333b (patch) | |
| tree | bb388f6b2532587595653e67cce25229ed050cb8 /benchmarks | |
| parent | df12796d2c7ff30316099a62cbdf43f49006d442 (diff) | |
| download | pkgsrc-80f8f7c3b3aa5f5f64de1111703eed75cf2b333b.tar.gz | |
Add DESTDIR support.
Diffstat (limited to 'benchmarks')
| -rw-r--r-- | benchmarks/bonnie++/Makefile | 7 | ||||
| -rw-r--r-- | benchmarks/bonnie++/distinfo | 4 | ||||
| -rw-r--r-- | benchmarks/bonnie++/patches/patch-ab | 24 |
3 files changed, 26 insertions, 9 deletions
diff --git a/benchmarks/bonnie++/Makefile b/benchmarks/bonnie++/Makefile index aee7fdd8e34..20f90072da8 100644 --- a/benchmarks/bonnie++/Makefile +++ b/benchmarks/bonnie++/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2008/05/21 15:26:07 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2008/06/20 01:09:08 joerg Exp $ # DISTNAME= bonnie++-1.03c @@ -11,17 +11,18 @@ HOMEPAGE= http://www.coker.com.au/bonnie++/ COMMENT= Enhanced performance Test of Filesystem I/O PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir USE_LANGUAGES= c c++ GNU_CONFIGURE= YES USE_TOOLS+= gmake perl:run tee REPLACE_PERL+= bon_csv2txt.in bon_csv2html.in -INSTALLATION_DIRS= share/doc/bonnie++ +INSTALLATION_DIRS= bin share/doc/bonnie++ ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 # todo: patch bonnie++.8 to point to correct path to readme.html post-install: - ${INSTALL_DATA} ${WRKSRC}/readme.html ${PREFIX}/share/doc/bonnie++/ + ${INSTALL_DATA} ${WRKSRC}/readme.html ${DESTDIR}${PREFIX}/share/doc/bonnie++/ .PHONY: benchmark benchmark: build diff --git a/benchmarks/bonnie++/distinfo b/benchmarks/bonnie++/distinfo index fa5bf9f8d1d..0c04c27b4ea 100644 --- a/benchmarks/bonnie++/distinfo +++ b/benchmarks/bonnie++/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2008/05/21 15:26:07 wiz Exp $ +$NetBSD: distinfo,v 1.7 2008/06/20 01:09:08 joerg Exp $ SHA1 (bonnie++-1.03c.tgz) = 90d0118f8a35c7b27b75020f991d891648003baa RMD160 (bonnie++-1.03c.tgz) = e430fbfaeb8f288794fd3be44233fca068850a35 Size (bonnie++-1.03c.tgz) = 80630 bytes SHA1 (patch-aa) = 2edc5fb589af0d8fbeaba89e3fd38f01a6115090 -SHA1 (patch-ab) = 447e4d5f85b0591145667966ab63e1a2eac2c8c3 +SHA1 (patch-ab) = 3e4b04443a0fd413722819943df502172f6cab1f diff --git a/benchmarks/bonnie++/patches/patch-ab b/benchmarks/bonnie++/patches/patch-ab index ba96d7f465b..708814b0784 100644 --- a/benchmarks/bonnie++/patches/patch-ab +++ b/benchmarks/bonnie++/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.3 2003/10/31 11:17:19 gavan Exp $ +$NetBSD: patch-ab,v 1.4 2008/06/20 01:09:08 joerg Exp $ ---- Makefile.in.orig 2002-10-13 21:26:36.000000000 +0100 +--- Makefile.in.orig 2002-10-13 20:26:36.000000000 +0000 +++ Makefile.in -@@ -27,10 +27,10 @@ ZCAVOBJS=$(ZCAVSRC:.cpp=.o) +@@ -27,20 +27,20 @@ ZCAVOBJS=$(ZCAVSRC:.cpp=.o) ALLOBJS=$(BONOBJS) $(ZCAVOBJS) bonnie++: bonnie++.cpp $(BONOBJS) @@ -14,4 +14,20 @@ $NetBSD: patch-ab,v 1.3 2003/10/31 11:17:19 gavan Exp $ + $(CXX) zcav.cpp -o zcav $(ZCAVOBJS) $(LDFLAGS) install-bin: $(EXES) - mkdir -p $(eprefix)/bin $(eprefix)/sbin +- mkdir -p $(eprefix)/bin $(eprefix)/sbin +- @INSTALL_PROGRAM@ @stripping@ $(EXES) $(eprefix)/sbin +- @INSTALL_SCRIPT@ $(SCRIPTS) $(eprefix)/bin ++ mkdir -p $(eprefix)/bin ${DESTDIR}$(eprefix)/sbin ++ @INSTALL_PROGRAM@ @stripping@ $(EXES) ${DESTDIR}$(eprefix)/sbin ++ @INSTALL_SCRIPT@ $(SCRIPTS) ${DESTDIR}$(eprefix)/bin + + install: install-bin +- mkdir -p @mandir@/man1 @mandir@/man8 +- @INSTALL_DATA@ $(MAN1) @mandir@/man1 +- @INSTALL_DATA@ $(MAN8) @mandir@/man8 ++ mkdir -p @mandir@/man1 ${DESTDIR}@mandir@/man8 ++ @INSTALL_DATA@ $(MAN1) ${DESTDIR}@mandir@/man1 ++ @INSTALL_DATA@ $(MAN8) ${DESTDIR}@mandir@/man8 + + %.o: %.cpp %.h bonnie.h port.h + $(CXX) -c $< |