On Sun, Nov 06, 2011 at 03:13:49PM +0000, Rodolfo Gouveia wrote: > On Sun, Nov 06, 2011 at 02:05:33PM +0100, Ingo Schwarze wrote: > > Rodolfo Gouveia wrote on Sun, Nov 06, 2011 at 12:23:41PM +0000: > > > If USE_GROFF=Yes I get these errors with 'make package': > > > ===> Building package for bonnie++-1.96 > > > Create /usr/ports/packages/amd64/all/bonnie++-1.96.tgz > > > Weird subject line in .../cat1/bon_csv2html.0: > > > > Those are makewhatis(8) errors. > > > > Brad is right, removing USE_GROFF helps here because makewhatis(8) > > can more easily make head and tail of busted source code than of > > the rendered page generated from busted source code. > > I see ... I'll just take it out atm then. > > Here's the new version.
After speaking to Rodolfo off list and taking a look at bonnie++ a bit further I noticed some other things that needed fixing and I cleaned up what he had and the port a bit. Here is an updated diff. Index: Makefile =================================================================== RCS file: /home/cvs/ports/benchmarks/bonnie++/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- Makefile 18 Oct 2010 16:57:46 -0000 1.5 +++ Makefile 9 Nov 2011 18:30:18 -0000 @@ -2,29 +2,26 @@ 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> +HOMEPAGE= http://www.coker.com.au/bonnie++/ -# GPL +# GPLv2 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c m stdc++ -NO_REGRESS= Yes -USE_GMAKE= Yes -USE_GROFF = Yes -MAKE_FLAGS= CXX="${CXX} ${CXXFLAGS}" +WANTLIB= c m pthread stdc++ + +USE_GMAKE= Yes +CONFIGURE_STYLE= autoconf dest +AUTOCONF_VERSION= 2.61 -CONFIGURE_STYLE=gnu dest +NO_REGRESS= Yes post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bonnie++ Index: distinfo =================================================================== RCS file: /home/cvs/ports/benchmarks/bonnie++/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 5 Apr 2007 15:37:45 -0000 1.3 +++ distinfo 8 Nov 2011 17:25:20 -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-Makefile_in =================================================================== RCS file: patches/patch-Makefile_in diff -N patches/patch-Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-Makefile_in 8 Nov 2011 17:48:32 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- Makefile.in.orig Tue Nov 8 12:42:48 2011 ++++ Makefile.in Tue Nov 8 12:43:36 2011 +@@ -9,7 +9,7 @@ prefix=@prefix@ + 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+=@debug@ -DNDEBUG $(WFLAGS) $(MORECFLAGS) + CXX=@CXX@ $(CFLAGS) + LINK=@CXX@ + THREAD_LFLAGS=@thread_ldflags@ 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 9 Nov 2011 18:13:11 -0000 @@ -0,0 +1,40 @@ +$OpenBSD$ +--- configure.in.orig Fri Jul 3 21:23:53 2009 ++++ configure.in Wed Nov 9 13:09:27 2011 +@@ -60,7 +60,7 @@ if [[ -n "$snprintf" ]]; then + snprintf="#define NO_SNPRINTF" + fi + +-AC_CHECK_HEADERS(algorithm algo.h algo) ++AC_CHECK_HEADERS(algorithm algo) + + AC_SUBST(linux_pthread) + AC_TRY_COMPILE([#define _GNU_SOURCE +@@ -72,19 +72,19 @@ if [[ -n "$linux_pthread" ]]; then + linux_pthread="#define LINUX_PTHREAD" + fi + +-LDFLAGS=-lpthread ++thread_ldflags="-pthread" + AC_SUBST(thread_ldflags) +-AC_TRY_LINK([#include <pthread.h> +-void * thread_func(void * param) { return NULL; } +-] , [pthread_t thread_info; +- pthread_attr_t attr; +- pthread_create(&thread_info, &attr, &thread_func, NULL);] +- , thread_ldflags="-lpthread" +- , thread_ldflags="-pthread") + + AC_SUBST(large_file) + AC_TRY_RUN([#ifndef _LARGEFILE64_SOURCE + #define _LARGEFILE64_SOURCE ++#endif ++#ifdef BSD ++#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> 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 9 Nov 2011 18:13:29 -0000 @@ -0,0 +1,22 @@ +$OpenBSD$ +--- port.h.in.orig Tue Dec 23 19:16:16 2008 ++++ port.h.in Wed Nov 9 13:12:54 2011 +@@ -37,10 +37,18 @@ + typedef struct timeval TIMEVAL_TYPE; + + #ifdef _LARGEFILE64_SOURCE ++#ifdef BSD ++#define O_LARGEFILE 0 ++#define OFF_TYPE off_t ++#define file_lseek lseek ++#define file_creat creat ++#define file_open open ++#else + #define OFF_TYPE off64_t + #define file_lseek lseek64 + #define file_creat creat64 + #define file_open open64 ++#endif + #else + #define OFF_TYPE off_t + #define file_lseek lseek Index: patches/patch-sync_cpp =================================================================== RCS file: patches/patch-sync_cpp diff -N patches/patch-sync_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-sync_cpp 9 Nov 2011 18:26:14 -0000 @@ -0,0 +1,9 @@ +$OpenBSD$ +--- sync.cpp.orig Wed Nov 9 13:24:48 2011 ++++ sync.cpp Wed Nov 9 13:25:22 2011 +@@ -1,4 +1,5 @@ + #include "port.h" ++#include <sys/types.h> + #include "semaphore.h" + #include "sync.h" + #include <stdio.h> Index: pkg/PLIST =================================================================== RCS file: /home/cvs/ports/benchmarks/bonnie++/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 8 Aug 2004 09:26:31 -0000 1.2 +++ pkg/PLIST 8 Nov 2011 17:25:20 -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 -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
