<pre style='margin:0'>
Kurt Hindenburg (kurthindenburg) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ad6ec8114f17da63e71e338445ef85c883478b11">https://github.com/macports/macports-ports/commit/ad6ec8114f17da63e71e338445ef85c883478b11</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ad6ec81 bonniexx: update to 1.97.3
</span>ad6ec81 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ad6ec8114f17da63e71e338445ef85c883478b11
</span>Author: Kurt Hindenburg <khindenburg@macports.org>
AuthorDate: Sat Jan 14 20:33:44 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> bonniexx: update to 1.97.3
</span>---
benchmarks/bonniexx/Portfile | 34 +++++++++---------
benchmarks/bonniexx/files/patch-bonnie++.cpp | 8 ++---
benchmarks/bonniexx/files/patch-minmax.diff | 53 ----------------------------
benchmarks/bonniexx/files/patch-port.h.in | 21 -----------
4 files changed, 20 insertions(+), 96 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/benchmarks/bonniexx/Portfile b/benchmarks/bonniexx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ec7b8d3..b3bffd1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/benchmarks/bonniexx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/benchmarks/bonniexx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortSystem 1.0
name bonniexx
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.97
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.97.3
</span> categories benchmarks
maintainers nomaintainer
description Disk and FS performance tester
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,37 +17,34 @@ long_description Bonnie++ is a benchmark suite that is aimed at \
</span> such things.
platforms darwin
license GPL-2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> homepage http://www.coker.com.au/bonnie++/
master_sites http://www.coker.com.au/bonnie++/experimental/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 24686785edb60afec7ac1f880627cdfe570c4ca6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 227f0e6b8e643bdd120e013c4f9f35426b3a7475 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e27b386ae0dc054fa7b530aab6bdead7aea6337a864d1f982bc9ebacb320746e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> distname bonnie++-${version}
extract.suffix .tgz
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles patch-Makefile.in \
patch-bonnie++.cpp \
patch-bonnie.h.in.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-port.h.in \
</span> patch-zcav.8 \
patch-zcav.cpp \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-zcav_io.cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-minmax.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-zcav_io.cpp
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${distname}.1
</span>
pre-patch {
reinplace "s|/usr/share/|${prefix}/share/|g" ${worksrcpath}/bonnie++.8
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d "${destroot}${prefix}/bin" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${destroot}${prefix}/sbin" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${destroot}${prefix}/share/man/man1" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${destroot}${prefix}/share/man/man8" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${destroot}${prefix}/share/doc/bonnie++"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -W ${worksrcpath} bon_csv2html generate_randfile ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -W ${worksrcpath} bonnie++ zcav getc_putc getc_putc_helper ${destroot}${prefix}/sbin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} bon_csv2html.1 bon_csv2txt.1 generate_randfile.1 ${destroot}${prefix}/share/man/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} bonnie++.8 zcav.8 getc_putc.8 ${destroot}${prefix}/share/man/man8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} README-2.00 README.txt changelog.txt copyright.txt credits.txt readme.html ${destroot}${prefix}/share/doc/bonnie++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.destdir prefix=${destroot}${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set docdir ${destroot}${prefix}/share/doc/bonnie++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 -W ${worksrcpath} README-2.00 README.txt changelog.txt copyright.txt credits.txt readme.html ${docdir}
</span> }
notes "
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/benchmarks/bonniexx/files/patch-bonnie++.cpp b/benchmarks/bonniexx/files/patch-bonnie++.cpp
</span><span style='display:block; white-space:pre;color:#808080;'>index 8acfed7..1ce0f3f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/benchmarks/bonniexx/files/patch-bonnie++.cpp
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/benchmarks/bonniexx/files/patch-bonnie++.cpp
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- bonnie++.cpp.orig 2009-07-03 11:38:14.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ bonnie++.cpp 2011-11-22 08:42:45.000000000 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- bonnie++.cpp 2016-12-12 21:37:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ bonnie++.cpp 2017-01-14 19:35:45.000000000 -0500
</span> @@ -294,11 +294,7 @@
{
char *sbuf = _strdup(optarg);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,8 +25,8 @@
</span> - usage();
- }
-#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- globals.byte_io_size = __min(file_size, globals.byte_io_size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- globals.byte_io_size = __max(0, globals.byte_io_size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ globals.byte_io_size = min(file_size, globals.byte_io_size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ globals.byte_io_size = max(0, globals.byte_io_size);
</span>
@@ -465,14 +452,6 @@
&& (directory_max_size < directory_min_size || directory_max_size < 0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/benchmarks/bonniexx/files/patch-minmax.diff b/benchmarks/bonniexx/files/patch-minmax.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ab1a89a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/benchmarks/bonniexx/files/patch-minmax.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,53 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- bonnie++.cpp.orig 2014-11-24 11:57:57.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ bonnie++.cpp 2014-11-24 11:59:50.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,7 +73,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void set_io_chunk_size(int size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { delete m_buf; pa_new(size, m_buf, m_buf_pa); m_io_chunk_size = size; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void set_file_chunk_size(int size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { delete m_buf; m_buf = new char[__max(size, m_io_chunk_size)]; m_file_chunk_size = size; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { delete m_buf; m_buf = new char[max(size, m_io_chunk_size)]; m_file_chunk_size = size; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Return the page-aligned version of the local buffer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *buf() { return m_buf_pa; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -138,7 +138,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- , m_buf(NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- , m_buf_pa(NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pa_new(__max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pa_new(max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SetName(".");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -380,8 +380,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(file_size % 1024 > 512)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file_size = file_size + 1024 - (file_size % 1024);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- globals.byte_io_size = __min(file_size, globals.byte_io_size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- globals.byte_io_size = __max(0, globals.byte_io_size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ globals.byte_io_size = min(file_size, globals.byte_io_size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ globals.byte_io_size = max(0, globals.byte_io_size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(machine == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- duration.cpp.orig 2014-11-24 12:02:36.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ duration.cpp 2014-11-24 12:02:39.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,7 +38,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- getTime(&tv);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ret = tv - m_start;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_max = __max(m_max, ret);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_max = max(m_max, ret);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ret;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- port.h.in.orig 2014-11-24 11:59:19.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ port.h.in 2014-11-24 11:59:28.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,8 +39,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef int FILE_TYPE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define __min min
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define __max max
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef unsigned int UINT;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef unsigned long ULONG;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef const char * PCCHAR;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/benchmarks/bonniexx/files/patch-port.h.in b/benchmarks/bonniexx/files/patch-port.h.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cce0fa0..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/benchmarks/bonniexx/files/patch-port.h.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- port.h.in.orig 2009-08-21 18:45:50.068536643 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ port.h.in 2009-08-21 18:45:58.564755017 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,18 +3,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "conf.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef HAVE_MIN_MAX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(HAVE_ALGO_H) || defined(HAVE_ALGO)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef HAVE_ALGO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <algo>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <algo.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define min(XX,YY) ((XX) < (YY) ? (XX) : (YY))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define max(XX,YY) ((XX) > (YY) ? (XX) : (YY))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @semun@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @bool@
</span></pre><pre style='margin:0'>
</pre>