Hi there,
I send this in March but didn't go through.
Changes:
 - removed maintainer (per his request)
 - USE_GROFF=no because there are errors with the man pages
 - this version implements big file support but uses 
   off64_t, creat64, open64, etc from linux so there are some
   patches too


Index: Makefile
===================================================================
RCS file: /cvs/ports/benchmarks/bonnie++/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile    18 Oct 2010 16:57:46 -0000      1.5
+++ Makefile    5 Nov 2011 23:47:08 -0000
@@ -2,16 +2,13 @@
 
 COMMENT=       enhanced performance test of filesystem I/O
 
-DISTNAME=      bonnie++-1.03a
+DISTNAME=      bonnie++-1.96
 CATEGORIES=    benchmarks
 
 HOMEPAGE=      http://www.coker.com.au/bonnie++/
-MASTER_SITES=  ${HOMEPAGE} \
-               ftp://gd.tuwien.ac.at/opsys/linux/sf/b/bonnie/
+MASTER_SITES=  http://www.coker.com.au/bonnie++/experimental/
 EXTRACT_SUFX=  .tgz
 
-MAINTAINER=    Martin Reindl <mar...@openbsd.org>
-
 # GPL
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=    Yes
@@ -21,7 +18,7 @@
 
 NO_REGRESS=    Yes
 USE_GMAKE=      Yes
-USE_GROFF =    Yes
+USE_GROFF =    No
 MAKE_FLAGS=    CXX="${CXX} ${CXXFLAGS}"
 
 CONFIGURE_STYLE=gnu dest
Index: distinfo
===================================================================
RCS file: /cvs/ports/benchmarks/bonnie++/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo    5 Apr 2007 15:37:45 -0000       1.3
+++ distinfo    5 Nov 2011 23:47:08 -0000
@@ -1,5 +1,5 @@
-MD5 (bonnie++-1.03a.tgz) = ALHu5/mLaPp2LE77OzTKoQ==
-RMD160 (bonnie++-1.03a.tgz) = l4glvKfPQ/VgWRLCanHyOv1QB0s=
-SHA1 (bonnie++-1.03a.tgz) = tRm3mgD7cUXVEyCrw81Gysp/8Fs=
-SHA256 (bonnie++-1.03a.tgz) = LRxrLP3BfWNI8l8IMOH6XBwd0/AUyv90AFKUye1qDL8=
-SIZE (bonnie++-1.03a.tgz) = 76207
+MD5 (bonnie++-1.96.tgz) = e4WUVZ8AiH0oZd4YODKLNQ==
+RMD160 (bonnie++-1.96.tgz) = 8rvPtrF7K6oNJoBGqoqZT2tBv+4=
+SHA1 (bonnie++-1.96.tgz) = JKDj3k3Jj5BWVPUe9nMrG3ZuE3g=
+SHA256 (bonnie++-1.96.tgz) = nJ2HvwmsWkKpFc7rnYu4NYwMpGQthrhe1Iyl8V7jRWw=
+SIZE (bonnie++-1.96.tgz) = 105183
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure     5 Nov 2011 23:47:08 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- configure.orig     Sat Jul  4 02:23:57 2009
++++ configure  Thu Feb 17 10:54:47 2011
+@@ -4383,6 +4383,13 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #ifndef _LARGEFILE64_SOURCE
+ #define _LARGEFILE64_SOURCE
+ #endif
++#ifdef __OpenBSD__
++#define O_LARGEFILE 0
++#define off64_t off_t
++#define lseek64 lseek
++#define creat64 creat
++#define open64  open
++#endif
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
Index: patches/patch-configure.orig
===================================================================
RCS file: patches/patch-configure.orig
diff -N patches/patch-configure.orig
Index: patches/patch-configure_in
===================================================================
RCS file: patches/patch-configure_in
diff -N patches/patch-configure_in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure_in  5 Nov 2011 23:47:08 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- configure.in.orig  Sat Jul  4 02:23:53 2009
++++ configure.in       Thu Feb 17 10:54:47 2011
+@@ -86,6 +86,13 @@ AC_SUBST(large_file)
+ AC_TRY_RUN([#ifndef _LARGEFILE64_SOURCE
+ #define _LARGEFILE64_SOURCE
+ #endif
++#ifdef __OpenBSD__
++#define O_LARGEFILE 0
++#define off64_t off_t
++#define lseek64 lseek
++#define creat64 creat
++#define open64  open
++#endif
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
Index: patches/patch-configure_in.orig
===================================================================
RCS file: patches/patch-configure_in.orig
diff -N patches/patch-configure_in.orig
Index: patches/patch-port_h
===================================================================
RCS file: patches/patch-port_h
diff -N patches/patch-port_h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-port_h        5 Nov 2011 23:47:08 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- port.h.orig        Sun Jan 23 18:58:51 2011
++++ port.h     Sun Jan 23 18:58:30 2011
+@@ -48,6 +48,13 @@ typedef struct timeval TIMEVAL_TYPE;
+ #define file_open open
+ #endif
+ 
++#ifdef __OpenBSD__
++#define OFF_TYPE off_t
++#define file_lseek lseek
++#define file_creat creat
++#define file_open open
++#endif
++
+ typedef int FILE_TYPE;
+ #define __min min
+ #define __max max
Index: patches/patch-port_h.orig
===================================================================
RCS file: patches/patch-port_h.orig
diff -N patches/patch-port_h.orig
Index: patches/patch-port_h_in
===================================================================
RCS file: patches/patch-port_h_in
diff -N patches/patch-port_h_in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-port_h_in     5 Nov 2011 23:47:08 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+--- port.h.in.orig     Wed Dec 24 00:16:16 2008
++++ port.h.in  Thu Feb 17 10:54:47 2011
+@@ -48,6 +48,14 @@ typedef struct timeval TIMEVAL_TYPE;
+ #define file_open open
+ #endif
+ 
++#ifdef __OpenBSD__
++#define O_LARGEFILE 0
++#define off64_t off_t
++#define lseek64 lseek
++#define creat64 creat
++#define open64  open
++#endif
++
+ typedef int FILE_TYPE;
+ #define __min min
+ #define __max max
Index: patches/patch-port_h_in.orig
===================================================================
RCS file: patches/patch-port_h_in.orig
diff -N patches/patch-port_h_in.orig
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/benchmarks/bonnie++/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST   8 Aug 2004 09:26:31 -0000       1.2
+++ pkg/PLIST   5 Nov 2011 23:47:08 -0000
@@ -1,11 +1,16 @@
 @comment $OpenBSD: PLIST,v 1.2 2004/08/08 09:26:31 xsa Exp $
-bin/bon_csv2html
+@bin bin/bon_csv2html
 bin/bon_csv2txt
+@bin bin/generate_randfile
 @man man/man1/bon_csv2html.1
 @man man/man1/bon_csv2txt.1
+@man man/man1/generate_randfile.1
 @man man/man8/bonnie++.8
+@man man/man8/getc_putc.8
 @man man/man8/zcav.8
-sbin/bonnie++
-sbin/zcav
+@bin sbin/bonnie++
+@bin sbin/getc_putc
+@bin sbin/getc_putc_helper
+@bin sbin/zcav
 share/doc/bonnie++/
 share/doc/bonnie++/readme.html

Reply via email to