From a13b0d6f8e024ef82254d7557cbd964c079e6f41 Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Fri, 25 Aug 2000 00:11:42 +0000
Subject: [PATCH] upgrade to netpipe 2.4; -- From: jason@

---
 benchmarks/netpipe/Makefile                        | 12 ++++++------
 benchmarks/netpipe/files/md5                       |  6 +++---
 .../netpipe/patches/{patch-aa => patch-netpipe.h}  | 14 +++++++-------
 3 files changed, 16 insertions(+), 16 deletions(-)
 rename benchmarks/netpipe/patches/{patch-aa => patch-netpipe.h} (76%)

diff --git a/benchmarks/netpipe/Makefile b/benchmarks/netpipe/Makefile
index 75f387f73e1..6efd65cf508 100644
--- a/benchmarks/netpipe/Makefile
+++ b/benchmarks/netpipe/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2000/04/08 20:37:25 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2000/08/25 00:11:42 brad Exp $
 # $FreeBSD: Makefile,v 1.2 1999/03/03 03:48:56 jkoshy Exp $
 
-DISTNAME=	netpipe-2.3
+DISTNAME=	netpipe-2.4
 CATEGORIES=	benchmarks net
-MASTER_SITES=	ftp://ftp.scl.ameslab.gov/pub/netpipe/ \
-		http://people.freebsd.org/~jkoshy/PORTS/
+NEED_VERSION=	1.320
+MASTER_SITES=	ftp://ftp.scl.ameslab.gov/pub/netpipe/
 
 MAINTAINER=	brad@openbsd.org
 
@@ -12,8 +12,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-MAKE_FLAGS=		CC='${CC}' CFLAGS='${CFLAGS}'
-FAKE=			Yes
+
+MAKE_FLAGS=	CC="${CC}" CFLAGS="${CFLAGS} -DHAVE_GETRUSAGE"
 
 ALL_TARGET=	NPtcp
 
diff --git a/benchmarks/netpipe/files/md5 b/benchmarks/netpipe/files/md5
index 000ea5ff65c..9bc6558d994 100644
--- a/benchmarks/netpipe/files/md5
+++ b/benchmarks/netpipe/files/md5
@@ -1,3 +1,3 @@
-MD5 (netpipe-2.3.tar.gz) = cf166ac7ccab491cd68ef75e0e6f466d
-RMD160 (netpipe-2.3.tar.gz) = 40074a5f71567c7c4ad373839af436eaf6d42491
-SHA1 (netpipe-2.3.tar.gz) = 7ae6372899a38b1dea1f46b57549da5413f38609
+MD5 (netpipe-2.4.tar.gz) = 0a3a868a122b526a7adeea08ca3422ee
+RMD160 (netpipe-2.4.tar.gz) = a7316d7151b5eb48a6ddc4fd48c8ecfc207df9a4
+SHA1 (netpipe-2.4.tar.gz) = 1d5c795c912dfbf9b48c0a7fc0e751ed521a760b
diff --git a/benchmarks/netpipe/patches/patch-aa b/benchmarks/netpipe/patches/patch-netpipe.h
similarity index 76%
rename from benchmarks/netpipe/patches/patch-aa
rename to benchmarks/netpipe/patches/patch-netpipe.h
index 74231e00880..eb49bc19e3c 100644
--- a/benchmarks/netpipe/patches/patch-aa
+++ b/benchmarks/netpipe/patches/patch-netpipe.h
@@ -1,14 +1,14 @@
---- netpipe.h.orig	Wed Oct 28 09:42:43 1998
-+++ netpipe.h	Sat Jan 22 22:20:35 2000
-@@ -19,6 +19,7 @@
- #include <stdio.h>
+--- netpipe.h.orig	Thu Aug 24 19:59:51 2000
++++ netpipe.h	Thu Aug 24 20:00:40 2000
+@@ -20,6 +20,7 @@
+ #include <stdlib.h>         /* malloc(3) */
  #include <string.h>
  #include <sys/types.h>
 +#include <sys/param.h>
  #include <sys/time.h>       /* struct timeval */
- #include <stdlib.h>         /* malloc(3) */
- 
-@@ -37,8 +38,12 @@
+ #ifdef HAVE_GETRUSAGE
+ #include <sys/resource.h>
+@@ -38,8 +39,12 @@
  #define  MAXINT             2147483647
  
  #define     ABS(x)     (((x) < 0)?(-(x)):(x))