svn commit: r352485 - in head/benchmarks/bonnie++: . files

[Ganael LAPLANCHE]

Author: martymac
Date: Mon Apr 28 11:39:52 2014
New Revision: 352485
URL: http://svnweb.freebsd.org/changeset/ports/352485
QAT: https://qat.redports.org/buildarchive/r352485/

Log:
  - Remove GCC dependency
  - Fix several compilation warnings
  
  PR:		ports/188678
  Submitted by:	Matthew Rezny <matthew at reztek.cz>

Added:
  head/benchmarks/bonnie++/files/patch-bonnie.h.in   (contents, props changed)
  head/benchmarks/bonnie++/files/patch-duration.cpp   (contents, props changed)
  head/benchmarks/bonnie++/files/patch-rand.h   (contents, props changed)
Modified:
  head/benchmarks/bonnie++/Makefile
  head/benchmarks/bonnie++/files/patch-port.h.in

Modified: head/benchmarks/bonnie++/Makefile
==============================================================================
--- head/benchmarks/bonnie++/Makefile	Mon Apr 28 11:39:24 2014	(r352484)
+++ head/benchmarks/bonnie++/Makefile	Mon Apr 28 11:39:52 2014	(r352485)
@@ -14,7 +14,6 @@ COMMENT=	Performance Test of Filesystem 
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
-USE_GCC=	any
 
 USES=	shebangfix
 SHEBANG_FILES=	bon_csv2txt.in

Added: head/benchmarks/bonnie++/files/patch-bonnie.h.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/benchmarks/bonnie++/files/patch-bonnie.h.in	Mon Apr 28 11:39:52 2014	(r352485)
@@ -0,0 +1,20 @@
+--- bonnie.h.in.orig    2009-08-21 18:45:50.068536643 +0000
++++ bonnie.h.in 2009-08-21 18:45:58.564755017 +0000
+@@ -1,8 +1,6 @@
+ #ifndef BONNIE
+ #define BONNIE
+ 
+-using namespace std;
+-
+ #define BON_VERSION "@version@"
+ #define CSV_VERSION "@csv_version@"
+ 
+@@ -12,6 +10,8 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ 
++using namespace std;
++
+ typedef FILE *PFILE;
+ 
+ #define SemKey 4711

Added: head/benchmarks/bonnie++/files/patch-duration.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/benchmarks/bonnie++/files/patch-duration.cpp	Mon Apr 28 11:39:52 2014	(r352485)
@@ -0,0 +1,17 @@
+--- duration.cpp.orig   2009-08-21 18:45:50.068536643 +0000
++++ duration.cpp        2009-08-21 18:45:58.564755017 +0000
+@@ -1,5 +1,3 @@
+-using namespace std;
+-
+ #include <stdlib.h>
+ 
+ #include "duration.h"
+@@ -20,6 +18,8 @@
+ #endif
+ #endif
+ 
++using namespace std;
++
+ Duration_Base::Duration_Base()
+  : m_start(0.0)
+  , m_max(0.0)

Modified: head/benchmarks/bonnie++/files/patch-port.h.in
==============================================================================
--- head/benchmarks/bonnie++/files/patch-port.h.in	Mon Apr 28 11:39:24 2014	(r352484)
+++ head/benchmarks/bonnie++/files/patch-port.h.in	Mon Apr 28 11:39:52 2014	(r352485)
@@ -1,21 +1,35 @@
 --- port.h.in.orig	2009-08-21 18:45:50.068536643 +0000
 +++ port.h.in	2009-08-21 18:45:58.564755017 +0000
-@@ -3,18 +3,8 @@
- 
+@@ -4,12 +4,12 @@
  #include "conf.h"
  
--#ifndef HAVE_MIN_MAX
+ #ifndef HAVE_MIN_MAX
 -#if defined(HAVE_ALGO_H) || defined(HAVE_ALGO)
 -#ifdef HAVE_ALGO
--#include <algo>
++#if defined(HAVE_ALGORITHM)
++#include <algorithm>
++#elif defined(HAVE_ALGO)
+ #include <algo>
 -#else
--#include <algo.h>
++#elif defined(HAVE_ALGO_H)
+ #include <algo.h>
 -#endif
--#else
+ #else
  #define min(XX,YY) ((XX) < (YY) ? (XX) : (YY))
  #define max(XX,YY) ((XX) > (YY) ? (XX) : (YY))
+@@ -19,14 +19,7 @@
+ @semun@
+ @bool@
+ @snprintf@
+-#ifndef _LARGEFILE64_SOURCE
+- at large_file@
 -#endif
+-#ifdef _LARGEFILE64_SOURCE
+-#define OFF_T_PRINTF "%lld"
+-#else
+-#define OFF_T_PRINTF "%d"
 -#endif
++#define OFF_T_PRINTF "%ld"
  
- @semun@
- @bool@
+ #if @true_false@
+ #define false 0

Added: head/benchmarks/bonnie++/files/patch-rand.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/benchmarks/bonnie++/files/patch-rand.h	Mon Apr 28 11:39:52 2014	(r352485)
@@ -0,0 +1,15 @@
+--- rand.h.orig 2009-08-21 18:45:50.068536643 +0000
++++ rand.h      2009-08-21 18:45:58.564755017 +0000
+@@ -1,11 +1,11 @@
+ #ifndef RAND_H
+ #define RAND_H
+ 
+-using namespace std;
+ #include "port.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string>
++using namespace std;
+ 
+ class Rand
+ {