diff options
| author | Ganael LAPLANCHE <martymac@FreeBSD.org> | 2013-11-06 08:22:49 +0000 |
|---|---|---|
| committer | Ganael LAPLANCHE <martymac@FreeBSD.org> | 2013-11-06 08:22:49 +0000 |
| commit | 1155855415297f613dec9a3884275f803ec7e7cb (patch) | |
| tree | 4e7720c37e946d9a0626582db96ba9ff73524e1d /benchmarks/bonnie++ | |
| parent | 0bc353dd240f0c8b9ddd311eb62316586cbf9a22 (diff) | |
| download | ports-1155855415297f613dec9a3884275f803ec7e7cb.tar.gz ports-1155855415297f613dec9a3884275f803ec7e7cb.zip | |
- Fix build with clang [1]
- Fix wrong shebang in bon_csv2txt.in
- Enable staging
PR: ports/183432 [1]
Submitted by: Kenji Rikitake <kenji@k2r.org> [1]
Notes
Notes:
svn path=/head/; revision=332956
Diffstat (limited to 'benchmarks/bonnie++')
| -rw-r--r-- | benchmarks/bonnie++/Makefile | 13 | ||||
| -rw-r--r-- | benchmarks/bonnie++/files/patch-Makefile.in | 35 | ||||
| -rw-r--r-- | benchmarks/bonnie++/pkg-plist | 6 |
3 files changed, 45 insertions, 9 deletions
diff --git a/benchmarks/bonnie++/Makefile b/benchmarks/bonnie++/Makefile index 2454ce35958c..050fdcddea28 100644 --- a/benchmarks/bonnie++/Makefile +++ b/benchmarks/bonnie++/Makefile @@ -3,6 +3,7 @@ PORTNAME= bonnie++ PORTVERSION= 1.97 +PORTREVISION= 1 CATEGORIES= benchmarks MASTER_SITES= http://www.coker.com.au/bonnie++/experimental/ EXTRACT_SUFX= .tgz @@ -13,15 +14,15 @@ COMMENT= Performance Test of Filesystem I/O LICENSE= GPLv2 GNU_CONFIGURE= yes +USE_GCC= yes -WRKSRC= ${WRKDIR}/${PORTNAME}-1.97.1 +USES= shebangfix +SHEBANG_FILES= bon_csv2txt.in -MAN1= bon_csv2html.1 bon_csv2txt.1 generate_randfile.1 -MAN8= bonnie++.8 getc_putc.8 zcav.8 +WRKSRC= ${WRKDIR}/${PORTNAME}-1.97.1 PORTDOCS= readme.html -NO_STAGE= yes .include <bsd.port.options.mk> post-patch: @@ -32,8 +33,8 @@ post-patch: post-install: .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/readme.html ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/readme.html ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/benchmarks/bonnie++/files/patch-Makefile.in b/benchmarks/bonnie++/files/patch-Makefile.in index 4d0fae265af5..ccf166eea47b 100644 --- a/benchmarks/bonnie++/files/patch-Makefile.in +++ b/benchmarks/bonnie++/files/patch-Makefile.in @@ -1,5 +1,34 @@ ---- Makefile.in.orig Tue Jan 7 22:40:11 2003 -+++ Makefile.in Tue Feb 25 17:21:00 2003 -@@ -12 +12 @@ +--- Makefile.in.orig 2008-12-30 22:04:25.000000000 +0100 ++++ Makefile.in 2013-11-05 05:59:48.000000000 +0100 +@@ -9,7 +9,7 @@ + eprefix=@exec_prefix@ + #MORE_WARNINGS=-Weffc++ + WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wwrite-strings -pedantic -ffor-scope -Wcast-align -Wsign-compare -Wpointer-arith -Wwrite-strings -Wformat-security -Wswitch-enum -Winit-self $(MORE_WARNINGS) -CFLAGS=-O2 @debug@ -DNDEBUG $(WFLAGS) $(MORECFLAGS) +CFLAGS=${CXXFLAGS} -DNDEBUG $(WFLAGS) $(MORECFLAGS) + CXX=@CXX@ $(CFLAGS) + LINK=@CXX@ + THREAD_LFLAGS=@thread_ldflags@ +@@ -52,15 +52,15 @@ + $(LINK) generate_randfile.o -o generate_randfile + + install-bin: $(EXE) $(EXES) +- mkdir -p $(eprefix)/bin $(eprefix)/sbin +- @INSTALL_PROGRAM@ @stripping@ $(EXES) $(eprefix)/sbin +- @INSTALL_PROGRAM@ @stripping@ $(EXE) $(eprefix)/bin +- @INSTALL_SCRIPT@ $(SCRIPTS) $(eprefix)/bin ++ mkdir -p $(DESTDIR)$(eprefix)/bin $(DESTDIR)$(eprefix)/sbin ++ @INSTALL_PROGRAM@ @stripping@ $(EXES) $(DESTDIR)$(eprefix)/sbin ++ @INSTALL_PROGRAM@ @stripping@ $(EXE) $(DESTDIR)$(eprefix)/bin ++ @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 $(DESTDIR)@mandir@/man1 $(DESTDIR)@mandir@/man8 ++ @INSTALL_DATA@ $(MAN1) $(DESTDIR)@mandir@/man1 ++ @INSTALL_DATA@ $(MAN8) $(DESTDIR)@mandir@/man8 + + %.o: %.cpp + $(CXX) -c $< diff --git a/benchmarks/bonnie++/pkg-plist b/benchmarks/bonnie++/pkg-plist index ec516038e3f3..88fafa5a9b66 100644 --- a/benchmarks/bonnie++/pkg-plist +++ b/benchmarks/bonnie++/pkg-plist @@ -5,3 +5,9 @@ sbin/bonnie++ sbin/getc_putc sbin/getc_putc_helper sbin/zcav +man/man1/bon_csv2html.1.gz +man/man1/bon_csv2txt.1.gz +man/man1/generate_randfile.1.gz +man/man8/bonnie++.8.gz +man/man8/getc_putc.8.gz +man/man8/zcav.8.gz |