From 33092bd54a1bfc8cc6eb4be03713902dc1a4dced Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Sun, 23 Jan 2000 03:29:56 +0000
Subject: [PATCH] - move install target into netpipe's own Makefile - make
 netpipe respect CC and CFLAGS - improve patch-aa a bit

---
 benchmarks/netpipe/Makefile         |  9 +-------
 benchmarks/netpipe/patches/patch-aa | 18 +++++++++++----
 benchmarks/netpipe/patches/patch-ab | 34 +++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 12 deletions(-)
 create mode 100644 benchmarks/netpipe/patches/patch-ab

diff --git a/benchmarks/netpipe/Makefile b/benchmarks/netpipe/Makefile
index ef16e7fc0ae..3f643ef32cc 100644
--- a/benchmarks/netpipe/Makefile
+++ b/benchmarks/netpipe/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1999/11/30 02:12:48 kevlo Exp $
+# $OpenBSD: Makefile,v 1.4 2000/01/23 03:29:56 brad Exp $
 # $FreeBSD: Makefile,v 1.2 1999/03/03 03:48:56 jkoshy Exp $
 
 DISTNAME=	netpipe-2.3
@@ -8,11 +8,4 @@ MASTER_SITES=	ftp://ftp.scl.ameslab.gov/pub/netpipe/ \
 
 MAINTAINER=	brad@openbsd.org
 
-ALL_TARGET=	NPtcp
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/NPtcp ${PREFIX}/bin/NPtcp
-	@${LN} -fs ${PREFIX}/bin/NPtcp ${PREFIX}/bin/netpipe
-	${INSTALL_DATA} ${WRKSRC}/netpipe.1 ${PREFIX}/man/man1/netpipe.1
-
 .include <bsd.port.mk>
diff --git a/benchmarks/netpipe/patches/patch-aa b/benchmarks/netpipe/patches/patch-aa
index 121e06b577d..74231e00880 100644
--- a/benchmarks/netpipe/patches/patch-aa
+++ b/benchmarks/netpipe/patches/patch-aa
@@ -1,11 +1,21 @@
---- netpipe.h.orig	Thu Mar 18 23:15:21 1999
-+++ netpipe.h	Thu Mar 18 23:16:33 1999
-@@ -37,8 +37,10 @@
+--- 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>
+ #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 @@
  #define  MAXINT             2147483647
  
  #define     ABS(x)     (((x) < 0)?(-(x)):(x))
-+#ifndef __OpenBSD__
++#ifndef MIN
  #define     MIN(x,y)   (((x) < (y))?(x):(y))
++#endif
++#ifndef MAX
  #define     MAX(x,y)   (((x) > (y))?(x):(y))
 +#endif
  
diff --git a/benchmarks/netpipe/patches/patch-ab b/benchmarks/netpipe/patches/patch-ab
new file mode 100644
index 00000000000..71564ca7d95
--- /dev/null
+++ b/benchmarks/netpipe/patches/patch-ab
@@ -0,0 +1,34 @@
+--- Makefile.orig	Wed Oct 28 09:42:43 1998
++++ Makefile	Sat Jan 22 22:25:43 2000
+@@ -3,8 +3,6 @@
+ # $Id: patch-ab,v 1.1 2000/01/23 03:29:56 brad Exp $
+ #
+ 
+-# Default C compiler: must be an ANSI C compiler
+-CC         = cc
+ # File names for the main source files
+ DRIV_SRC   = netpipe.c
+ DRIV_OBJ   = netpipe.o
+@@ -13,7 +11,6 @@
+ TARGETS    = NPtcp
+ # If you have TCP, MPI and PVM
+ #TARGETS    = NPtcp NPmpi NPpvm
+-CFLAGS	   = -O
+ # Adjust these for MPI (only used if you have MPI)
+ MPI_HOME   = /home/mpich
+ MPI_ARCH   = IRIX
+@@ -31,7 +28,14 @@
+ # This section of the Makefile is for compiling the binaries
+ #
+ 
++all:	NPtcp
++
+ TCP:	NPtcp
++
++install:
++	$(BSD_INSTALL_PROGRAM) NPtcp ${PREFIX}/bin
++	$(BSD_INSTALL_MAN) netpipe.1 ${PREFIX}/man/man1
++	@ln -sf ${PREFIX}/bin/NPtcp ${PREFIX}/bin/netpipe
+ 
+ NPtcp:	NPtcp.o TCP.o
+ 	$(CC) $(CFLAGS) NPtcp.o TCP.o  -o NPtcp $(EXTRA_LIBS)