[pkgsrc/trunk]: pkgsrc/benchmarks/netpipe Make compile on Solaris. From Jonat...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9f2ddbb1a5f5
branches:  trunk
changeset: 461728:9f2ddbb1a5f5
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Sep 19 18:14:02 2003 +0000

description:
Make compile on Solaris. From Jonathan Perkin in PR 22860.

diffstat:

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

diffs (76 lines):

diff -r bb16a6696aee -r 9f2ddbb1a5f5 benchmarks/netpipe/Makefile
--- a/benchmarks/netpipe/Makefile       Fri Sep 19 18:11:43 2003 +0000
+++ b/benchmarks/netpipe/Makefile       Fri Sep 19 18:14:02 2003 +0000
@@ -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 @@
 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 -r bb16a6696aee -r 9f2ddbb1a5f5 benchmarks/netpipe/distinfo
--- a/benchmarks/netpipe/distinfo       Fri Sep 19 18:11:43 2003 +0000
+++ b/benchmarks/netpipe/distinfo       Fri Sep 19 18:14:02 2003 +0000
@@ -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 -r bb16a6696aee -r 9f2ddbb1a5f5 benchmarks/netpipe/patches/patch-aa
--- a/benchmarks/netpipe/patches/patch-aa       Fri Sep 19 18:11:43 2003 +0000
+++ b/benchmarks/netpipe/patches/patch-aa       Fri Sep 19 18:14:02 2003 +0000
@@ -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)