Changes 3.7.1:

Release 3.7 adds support for OpenFabrics infiniband verbs module (NPibv),
and should work with the OFED-1.1 or OFED-1.2 release. It has been tested
on IBM eHCA hardware as well as Mellanox pci-express infiniband adapters.
The openfabrics verbs support is currently lacking any support for the
connection manager, and all connections are set up via TCP sockets.

3 files changed, 21 insertions, 44 deletions

diff --git a/benchmarks/netpipe/Makefile b/benchmarks/netpipe/Makefile
index eb207c67dc6..99504b761e9 100644
--- a/benchmarks/netpipe/Makefile
+++ b/benchmarks/netpipe/Makefile
@@ -1,23 +1,23 @@
-# $NetBSD: Makefile,v 1.10 2008/03/03 00:51:44 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2010/10/16 10:15:56 adam Exp $
 
-DISTNAME=	NetPIPE_2.4
-PKGNAME=	netpipe-2.4
+DISTNAME=	NetPIPE-3.7.1
+PKGNAME=	netpipe-3.7.1
 CATEGORIES=	benchmarks net
 MASTER_SITES=	http://www.scl.ameslab.gov/netpipe/code/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.scl.ameslab.gov/netpipe/
 COMMENT=	TCP/PVM/MPI testing and performance measuring tool
+LICENSE=	gnu-gpl-v2
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=		${WRKDIR}/netpipe-2.4
+MAKE_FILE=	makefile
+CFLAGS+=	-DHAVE_GETRUSAGE
 
 .include "../../mk/bsd.prefs.mk"
 
-CFLAGS+=	-DHAVE_GETRUSAGE
-
 .if ${OPSYS} == "SunOS"
 MAKE_ENV+=	EXTRA_LIBS="-lsocket -lnsl"
 .endif
@@ -25,9 +25,8 @@ MAKE_ENV+=	EXTRA_LIBS="-lsocket -lnsl"
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	cd ${WRKSRC} && ${INSTALL_PROGRAM} NPtcp \
-		${DESTDIR}${PREFIX}/bin/NPtcp
-	cd ${WRKSRC} && ${INSTALL_MAN} netpipe.1 \
+	${INSTALL_PROGRAM} ${WRKSRC}/NPtcp ${DESTDIR}${PREFIX}/bin/NPtcp
+	${INSTALL_MAN} ${WRKSRC}/dox/netpipe.1 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/netpipe.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/netpipe/distinfo b/benchmarks/netpipe/distinfo
index bcf7d43b4eb..64eca7283be 100644
--- a/benchmarks/netpipe/distinfo
+++ b/benchmarks/netpipe/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/02/22 21:16:36 agc Exp $
+$NetBSD: distinfo,v 1.6 2010/10/16 10:15:56 adam Exp $
 
-SHA1 (NetPIPE_2.4.tar.gz) = 1d5c795c912dfbf9b48c0a7fc0e751ed521a760b
-RMD160 (NetPIPE_2.4.tar.gz) = a7316d7151b5eb48a6ddc4fd48c8ecfc207df9a4
-Size (NetPIPE_2.4.tar.gz) = 23009 bytes
-SHA1 (patch-aa) = 0cbb01a8fb5efb8d14bbeb7f47a456cce758a8e9
+SHA1 (NetPIPE-3.7.1.tar.gz) = d90750d48c8a152ff8d61734413cdd2135c79986
+RMD160 (NetPIPE-3.7.1.tar.gz) = 4b4b5566518573c053f1b1d6c99530652065590c
+Size (NetPIPE-3.7.1.tar.gz) = 385521 bytes
+SHA1 (patch-aa) = 3014446c7b46f3bce3ca96070a97d652bb983bc3
diff --git a/benchmarks/netpipe/patches/patch-aa b/benchmarks/netpipe/patches/patch-aa
index d3dd99aa759..47520d51184 100644
--- a/benchmarks/netpipe/patches/patch-aa
+++ b/benchmarks/netpipe/patches/patch-aa
@@ -1,35 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2003/09/19 18:14:03 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2010/10/16 10:15:57 adam Exp $
 
---- Makefile.orig	Tue Apr 27 22:03:25 1999
-+++ Makefile	Fri Sep 19 16:47:27 2003
-@@ -4,7 +4,7 @@
+--- makefile.orig	2010-10-14 09:16:46.000000000 +0000
++++ makefile
+@@ -20,8 +20,6 @@
  #
+ ########################################################################
  
- # Default C compiler: must be an ANSI C compiler
 -CC         = cc
-+#CC         = cc
- # File names for the main source files
- DRIV_SRC   = netpipe.c
- DRIV_OBJ   = netpipe.o
-@@ -13,7 +13,7 @@
- TARGETS    = NPtcp
- # If you have TCP, MPI and PVM
- #TARGETS    = NPtcp NPmpi NPpvm
--CFLAGS	   = -O
-+#CFLAGS    = -O
- # Adjust these for MPI (only used if you have MPI)
- MPI_HOME   = /home/mpich
- MPI_ARCH   = IRIX
-@@ -22,10 +22,10 @@
- PVM_HOME   = /home/pvm3
- PVM_ARCH   = SUN4SOL2
- # Any extra libraries needed
--EXTRA_LIBS = 
-+#EXTRA_LIBS = 
- #EXTRA_LIBS = -lgcc
+-CFLAGS     = -O -g
+ SRC        = ./src
  
--targets:    $(TARGETS)
-+all:    $(TARGETS)
- 
- #
- # This section of the Makefile is for compiling the binaries
+ # For MPI, mpicc will set up the proper include and library paths