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

[Ganael LAPLANCHE]

Author: martymac
Date: Wed Nov 28 08:26:47 2012
New Revision: 307891
URL: http://svnweb.freebsd.org/changeset/ports/307891

Log:
  - Update to 1.97
  - Use $PTHREAD_LIBS instead of -lpthread
  
  Feature safe: yes

Added:
  head/benchmarks/bonnie++/files/patch-configure   (contents, props changed)
Modified:
  head/benchmarks/bonnie++/Makefile   (contents, props changed)
  head/benchmarks/bonnie++/distinfo   (contents, props changed)

Modified: head/benchmarks/bonnie++/Makefile
==============================================================================
--- head/benchmarks/bonnie++/Makefile	Wed Nov 28 08:08:35 2012	(r307890)
+++ head/benchmarks/bonnie++/Makefile	Wed Nov 28 08:26:47 2012	(r307891)
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	bonnie++
-PORTVERSION=	1.96
-PORTREVISION=	1
+PORTVERSION=	1.97
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://www.coker.com.au/bonnie++/experimental/
 EXTRACT_SUFX=	.tgz
@@ -20,6 +19,8 @@ LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
 
+WRKSRC=	${WRKDIR}/${PORTNAME}-1.97.1
+
 MAN1=	bon_csv2html.1 bon_csv2txt.1 generate_randfile.1
 MAN8=	bonnie++.8 getc_putc.8 zcav.8
 
@@ -27,14 +28,16 @@ PORTDOCS=	readme.html
 
 .include <bsd.port.options.mk>
 
-pre-patch:
-	@${REINPLACE_CMD} -e \
+post-patch:
+	@${REINPLACE_CMD} \
 		's|/usr/share/|${PREFIX}/share/|g' ${WRKSRC}/bonnie++.8
+	@${REINPLACE_CMD} \
+		's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/readme.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/readme.html ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Modified: head/benchmarks/bonnie++/distinfo
==============================================================================
--- head/benchmarks/bonnie++/distinfo	Wed Nov 28 08:08:35 2012	(r307890)
+++ head/benchmarks/bonnie++/distinfo	Wed Nov 28 08:26:47 2012	(r307891)
@@ -1,2 +1,2 @@
-SHA256 (bonnie++-1.96.tgz) = 9c9d87bf09ac5a42a915ceeb9d8bb8358c0ca4642d86b85ed48ca5f15ee3456c
-SIZE (bonnie++-1.96.tgz) = 105183
+SHA256 (bonnie++-1.97.tgz) = 44f5a05937648a6526ba99354555d7d15f2dd392e55d3436f6746da6f6c35982
+SIZE (bonnie++-1.97.tgz) = 102604

Added: head/benchmarks/bonnie++/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/benchmarks/bonnie++/files/patch-configure	Wed Nov 28 08:26:47 2012	(r307891)
@@ -0,0 +1,23 @@
+--- configure.orig	2011-01-18 22:36:19.000000000 +0100
++++ configure	2012-11-27 17:10:24.000000000 +0100
+@@ -3925,7 +3925,7 @@
+    linux_pthread="#define LINUX_PTHREAD"
+ fi
+ 
+-LDFLAGS=-lpthread
++LDFLAGS=%%PTHREAD_LIBS%%
+ 
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+@@ -3944,10 +3944,7 @@
+ }
+ _ACEOF
+ if ac_fn_cxx_try_link "$LINENO"; then :
+-  thread_ldflags="-lpthread"
+-
+-else
+-  thread_ldflags="-pthread"
++  thread_ldflags="%%PTHREAD_LIBS%%"
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext