From nobody@FreeBSD.org  Mon Aug 24 11:50:05 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D6A14106568E
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 24 Aug 2009 11:50:05 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id C55598FC1C
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 24 Aug 2009 11:50:05 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n7OBo5OO047178
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 24 Aug 2009 11:50:05 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n7OBo5JL047177;
	Mon, 24 Aug 2009 11:50:05 GMT
	(envelope-from nobody)
Message-Id: <200908241150.n7OBo5JL047177@www.freebsd.org>
Date: Mon, 24 Aug 2009 11:50:05 GMT
From: Ganael Laplanche <ganael.laplanche@martymac.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Port update: benchmarks/bonnie++ - Update to v1.9.6
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         138132
>Category:       ports
>Synopsis:       Port update: benchmarks/bonnie++ - Update to v1.9.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 24 12:00:07 UTC 2009
>Closed-Date:    Wed Aug 26 16:04:55 UTC 2009
>Last-Modified:  Wed Aug 26 16:10:13 UTC 2009
>Originator:     Ganael Laplanche
>Release:        8-CURRENT
>Organization:
http://contribs.martymac.com
>Environment:
FreeBSD laptop.martymac.com 8.0-BETA2 FreeBSD 8.0-BETA2 #2: Mon Aug 10 12:19:58 UTC 2009     martymac@laptop.martymac.com:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
This patch updates benchmarks/bonnie++ to v1.9.6.

See sources' changelog for detailed change log.


>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -aurN bonnie++.orig/Makefile bonnie++/Makefile
--- bonnie++.orig/Makefile	2009-08-20 17:10:04.129593285 +0000
+++ bonnie++/Makefile	2009-08-20 17:10:35.769006675 +0000
@@ -7,10 +7,9 @@
 #
 
 PORTNAME=	bonnie++
-PORTVERSION=	1.93.04		# a=01, b=02, c=03, ..., z=26, etc...
+PORTVERSION=	1.96
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://www.coker.com.au/bonnie++/experimental/
-DISTNAME=	${PORTNAME}-1.93d
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ganael.laplanche@martymac.com
diff -aurN bonnie++.orig/distinfo bonnie++/distinfo
--- bonnie++.orig/distinfo	2009-08-20 17:10:04.137585083 +0000
+++ bonnie++/distinfo	2009-08-20 17:10:37.321985335 +0000
@@ -1,3 +1,3 @@
-MD5 (bonnie++-1.93d.tgz) = 7725dcd5230a412dc3619eacc1cf6609
-SHA256 (bonnie++-1.93d.tgz) = 68992f83eb72df15ab5db9d475ed30b371979f3c8b31d9ac8d21639f3aea96ca
-SIZE (bonnie++-1.93d.tgz) = 123637
+MD5 (bonnie++-1.96.tgz) = 7b8594559f00887d2865de1838328b35
+SHA256 (bonnie++-1.96.tgz) = 9c9d87bf09ac5a42a915ceeb9d8bb8358c0ca4642d86b85ed48ca5f15ee3456c
+SIZE (bonnie++-1.96.tgz) = 105183
diff -aurN bonnie++.orig/files/patch-bonnie++.8 bonnie++/files/patch-bonnie++.8
--- bonnie++.orig/files/patch-bonnie++.8	2009-08-20 17:10:04.106602933 +0000
+++ bonnie++/files/patch-bonnie++.8	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
---- bonnie++.8.orig	Sun Sep  9 16:25:02 2001
-+++ bonnie++.8	Sun Sep  9 16:25:43 2001
-@@ -194,4 +194,5 @@
- 
- .SH "SEE ALSO"
- .BR bon_csv2html (1),
--.BR bon_csv2txt (1)
-+.BR bon_csv2txt (1) ,
-+.BR zcav (8)
diff -aurN bonnie++.orig/files/patch-getc_putc.cpp bonnie++/files/patch-getc_putc.cpp
--- bonnie++.orig/files/patch-getc_putc.cpp	2009-08-20 17:10:04.090592519 +0000
+++ bonnie++/files/patch-getc_putc.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
---- getc_putc.cpp.orig	Sun Dec  9 06:50:24 2001
-+++ getc_putc.cpp	Wed Mar  5 14:32:58 2003
-@@ -17,6 +17,12 @@
- #include "duration.h"
- #include "getc_putc.h"
- 
-+#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) || defined(__ia64__)
-+/* Work around for: line 168, no matching function for call to `min(long unsigned int, unsigned int)' */
-+#include <sys/param.h>
-+#define min MIN
-+#endif
-+
- static void usage()
- {
-   fprintf(stderr, "usage:\n"
diff -aurN bonnie++.orig/files/patch-port.h.in bonnie++/files/patch-port.h.in
--- bonnie++.orig/files/patch-port.h.in	1970-01-01 00:00:00.000000000 +0000
+++ bonnie++/files/patch-port.h.in	2009-08-21 18:46:24.815453639 +0000
@@ -0,0 +1,21 @@
+--- 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 @@
+ 
+ #include "conf.h"
+ 
+-#ifndef HAVE_MIN_MAX
+-#if defined(HAVE_ALGO_H) || defined(HAVE_ALGO)
+-#ifdef HAVE_ALGO
+-#include <algo>
+-#else
+-#include <algo.h>
+-#endif
+-#else
+ #define min(XX,YY) ((XX) < (YY) ? (XX) : (YY))
+ #define max(XX,YY) ((XX) > (YY) ? (XX) : (YY))
+-#endif
+-#endif
+ 
+ @semun@
+ @bool@
diff -aurN bonnie++.orig/files/patch-zcav.8 bonnie++/files/patch-zcav.8
--- bonnie++.orig/files/patch-zcav.8	2009-08-20 17:10:04.080592365 +0000
+++ bonnie++/files/patch-zcav.8	2009-08-21 07:14:23.871640110 +0000
@@ -1,8 +1,8 @@
---- zcav.8.orig	Sun Sep  9 16:26:11 2001
-+++ zcav.8	Sun Sep  9 16:26:33 2001
-@@ -72,6 +72,9 @@
- parameter, just a different way to specify it for compatibility with other
- programs.
+--- zcav.8.orig	2009-08-21 07:13:21.319089995 +0000
++++ zcav.8	2009-08-21 07:14:03.189181585 +0000
+@@ -95,6 +95,9 @@
+ .B \-w
+ write zero blocks to the disk instead of reading from the disk - will destroy data!
  
 +.SH "SEE ALSO"
 +.BR bonnie++ (8)
diff -aurN bonnie++.orig/files/patch-zcav.cpp bonnie++/files/patch-zcav.cpp
--- bonnie++.orig/files/patch-zcav.cpp	1970-01-01 00:00:00.000000000 +0000
+++ bonnie++/files/patch-zcav.cpp	2009-08-24 07:33:42.769286319 +0000
@@ -0,0 +1,34 @@
+--- zcav.cpp.orig	2009-08-24 07:31:32.060913886 +0000
++++ zcav.cpp	2009-08-24 07:33:16.257389975 +0000
+@@ -15,9 +15,7 @@
+        , "Usage: zcav [-b block-size[:chunk-size]] [-c count]\n"
+          "            [-r [start offset:]end offset] [-w]\n"
+          "            [-u uid-to-use:gid-to-use] [-g gid-to-use]\n"
+-#ifdef _LARGEFILE64_SOURCE
+          "            [-s skip rate]\n"
+-#endif
+          "            [-l log-file] [-f] file-name\n"
+          "            [-l log-file [-f] file-name]...\n"
+          "\n"
+@@ -186,9 +184,7 @@
+   const char *log = "-";
+   const char *file = "";
+   while(-1 != (c = getopt(argc, argv, "-c:b:f:l:r:w"
+-#ifdef _LARGEFILE64_SOURCE
+ 				     "s:"
+-#endif
+                                      "u:g:")) )
+   {
+     switch(char(c))
+@@ -225,11 +221,9 @@
+         }
+       }
+       break;
+-#ifdef _LARGEFILE64_SOURCE
+       case 's':
+         mz.setSkipRate(atoi(optarg));
+       break;
+-#endif
+       case 'g':
+         if(groupName)
+           usage();
diff -aurN bonnie++.orig/files/patch-zcav_io.cpp bonnie++/files/patch-zcav_io.cpp
--- bonnie++.orig/files/patch-zcav_io.cpp	1970-01-01 00:00:00.000000000 +0000
+++ bonnie++/files/patch-zcav_io.cpp	2009-08-24 07:37:11.679377965 +0000
@@ -0,0 +1,33 @@
+--- zcav_io.cpp.orig	2009-08-24 07:36:02.677798155 +0000
++++ zcav_io.cpp	2009-08-24 07:36:40.688614055 +0000
+@@ -83,7 +83,6 @@
+   for(int loops = 0; !exiting && loops < max_loops; loops++)
+   {
+     int i = 0;
+-#ifdef _LARGEFILE64_SOURCE
+     if(start_offset)
+     {
+       OFF_TYPE real_offset = OFF_TYPE(start_offset) * OFF_TYPE(m_block_size) * OFF_TYPE(1<<20);
+@@ -96,7 +95,6 @@
+       i = start_offset;
+     }
+     else
+-#endif
+     if(lseek(m_fd, 0, SEEK_SET))
+     {
+       fprintf(stderr, "Can't lseek().\n");
+@@ -224,14 +222,12 @@
+ // Read/write a block of data
+ double ZcavRead::access_data(int skip)
+ {
+-#ifdef _LARGEFILE64_SOURCE
+   if(skip)
+   {
+     OFF_TYPE real_offset = OFF_TYPE(skip) * OFF_TYPE(m_block_size) * OFF_TYPE(1<<20);
+     if(file_lseek(m_fd, real_offset, SEEK_CUR) == OFF_TYPE(-1))
+       return -1.0;
+   }
+-#endif
+ 
+   m_dur.start();
+   for(int i = 0; i < m_block_size; i+= m_chunk_size)
diff -aurN bonnie++.orig/pkg-plist bonnie++/pkg-plist
--- bonnie++.orig/pkg-plist	2009-08-20 17:10:04.144585694 +0000
+++ bonnie++/pkg-plist	2009-08-21 18:49:40.800548114 +0000
@@ -1,4 +1,3 @@
-@comment $FreeBSD: ports/benchmarks/bonnie++/pkg-plist,v 1.6 2008/02/25 11:10:31 miwi Exp $
 bin/bon_csv2html
 bin/bon_csv2txt
 bin/generate_randfile


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Wed Aug 26 16:04:54 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=138132 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/138132: commit references a PR
Date: Wed, 26 Aug 2009 16:04:57 +0000 (UTC)

 miwi        2009-08-26 16:04:49 UTC
 
   FreeBSD ports repository
 
   Modified files:
     benchmarks/bonnie++  Makefile distinfo pkg-plist 
     benchmarks/bonnie++/files patch-zcav.8 
   Added files:
     benchmarks/bonnie++/files patch-port.h.in patch-zcav.cpp 
                               patch-zcav_io.cpp 
   Removed files:
     benchmarks/bonnie++/files patch-bonnie++.8 patch-getc_putc.cpp 
   Log:
   - Update to 138132
   
   PR:             138132
   Submitted by:   Ganael Laplanche <ganael.laplanche@martymac.com> (maintainer)
   
   Revision  Changes    Path
   1.18      +1 -2      ports/benchmarks/bonnie++/Makefile
   1.11      +3 -3      ports/benchmarks/bonnie++/distinfo
   1.2       +0 -9      ports/benchmarks/bonnie++/files/patch-bonnie++.8 (dead)
   1.3       +0 -15     ports/benchmarks/bonnie++/files/patch-getc_putc.cpp (dead)
   1.1       +21 -0     ports/benchmarks/bonnie++/files/patch-port.h.in (new)
   1.2       +5 -5      ports/benchmarks/bonnie++/files/patch-zcav.8
   1.1       +34 -0     ports/benchmarks/bonnie++/files/patch-zcav.cpp (new)
   1.1       +33 -0     ports/benchmarks/bonnie++/files/patch-zcav_io.cpp (new)
   1.7       +0 -1      ports/benchmarks/bonnie++/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
