From 1dbca7bc7acf11a0e73bab0882bbf8495e25a89b Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Fri, 19 Sep 2003 18:14:02 +0000
Subject: Make compile on Solaris. From Jonathan Perkin in PR 22860.

---
 benchmarks/netpipe/Makefile         | 10 +++++++++-
 benchmarks/netpipe/distinfo         |  4 ++--
 benchmarks/netpipe/patches/patch-aa | 25 +++++++++++++++++++------
 3 files changed, 30 insertions(+), 9 deletions(-)

(limited to 'benchmarks/netpipe')

diff --git a/benchmarks/netpipe/Makefile b/benchmarks/netpipe/Makefile
index 6f1e17d42d4..e4ef0ac2a6d 100644
--- a/benchmarks/netpipe/Makefile
+++ b/benchmarks/netpipe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/07/17 21:24:32 grant Exp $
+# $NetBSD: Makefile,v 1.3 2003/09/19 18:14:02 wiz Exp $
 
 DISTNAME=	netpipe-2.4
 CATEGORIES=	benchmarks net
@@ -8,6 +8,14 @@ MAINTAINER=	thorpej@NetBSD.org
 HOMEPAGE=	http://www.scl.ameslab.gov/netpipe/
 COMMENT=	TCP/PVM/MPI testing and performance measuring tool
 
+.include "../../mk/bsd.prefs.mk"
+
+CFLAGS+=	-DHAVE_GETRUSAGE
+
+.if ${OPSYS} == "SunOS"
+MAKE_ENV+=	EXTRA_LIBS="-lsocket -lnsl"
+.endif
+
 do-install:
 	cd ${WRKSRC} ; \
 	${INSTALL_PROGRAM} NPtcp ${PREFIX}/bin/NPtcp ; \
diff --git a/benchmarks/netpipe/distinfo b/benchmarks/netpipe/distinfo
index b1f4f57b9de..1c32f14aa8e 100644
--- a/benchmarks/netpipe/distinfo
+++ b/benchmarks/netpipe/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/07/28 00:15:12 thorpej Exp $
+$NetBSD: distinfo,v 1.3 2003/09/19 18:14:02 wiz Exp $
 
 SHA1 (netpipe-2.4.tar.gz) = 1d5c795c912dfbf9b48c0a7fc0e751ed521a760b
 Size (netpipe-2.4.tar.gz) = 23009 bytes
-SHA1 (patch-aa) = 2fd35e18c315571f93e8c05b4db974c5593b6680
+SHA1 (patch-aa) = 0cbb01a8fb5efb8d14bbeb7f47a456cce758a8e9
diff --git a/benchmarks/netpipe/patches/patch-aa b/benchmarks/netpipe/patches/patch-aa
index 64e1bdb75d0..d3dd99aa759 100644
--- a/benchmarks/netpipe/patches/patch-aa
+++ b/benchmarks/netpipe/patches/patch-aa
@@ -1,18 +1,31 @@
-$NetBSD: patch-aa,v 1.2 2001/07/28 00:15:13 thorpej Exp $
+$NetBSD: patch-aa,v 1.3 2003/09/19 18:14:03 wiz Exp $
 
---- Makefile.orig	Tue Apr 27 14:03:25 1999
-+++ Makefile	Fri Jul 27 16:20:10 2001
+--- Makefile.orig	Tue Apr 27 22:03:25 1999
++++ Makefile	Fri Sep 19 16:47:27 2003
+@@ -4,7 +4,7 @@
+ #
+ 
+ # 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 -DHAVE_GETRUSAGE
++#CFLAGS    = -O
  # Adjust these for MPI (only used if you have MPI)
  MPI_HOME   = /home/mpich
  MPI_ARCH   = IRIX
-@@ -25,7 +25,7 @@
- EXTRA_LIBS = 
+@@ -22,10 +22,10 @@
+ PVM_HOME   = /home/pvm3
+ PVM_ARCH   = SUN4SOL2
+ # Any extra libraries needed
+-EXTRA_LIBS = 
++#EXTRA_LIBS = 
  #EXTRA_LIBS = -lgcc
  
 -targets:    $(TARGETS)
-- 
cgit v1.2.3