[pkgsrc/trunk]: pkgsrc/benchmarks/nttcp Make compile on Solaris. From Jonatha...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bb16a6696aee
branches:  trunk
changeset: 461727:bb16a6696aee
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Sep 19 18:11:43 2003 +0000

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

diffstat:

 benchmarks/nttcp/Makefile         |   8 +++++++-
 benchmarks/nttcp/distinfo         |   4 ++--
 benchmarks/nttcp/patches/patch-aa |  28 +++++++++++++++-------------
 3 files changed, 24 insertions(+), 16 deletions(-)

diffs (89 lines):

diff -r d1699f6a998e -r bb16a6696aee benchmarks/nttcp/Makefile
--- a/benchmarks/nttcp/Makefile Fri Sep 19 18:08:14 2003 +0000
+++ b/benchmarks/nttcp/Makefile Fri Sep 19 18:11:43 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/07/17 21:24:33 grant Exp $
+# $NetBSD: Makefile,v 1.3 2003/09/19 18:11:43 wiz Exp $
 
 DISTNAME=      nttcp-1.47
 CATEGORIES=    benchmarks net
@@ -8,6 +8,12 @@
 HOMEPAGE=      http://www.leo.org/~elmar/nttcp/
 COMMENT=       New TCP testing and performance measuring tool
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+MAKE_ENV+=     LIB="-lsocket -lnsl"
+.endif
+
 do-install:
        cd ${WRKSRC} ; \
        ${INSTALL_PROGRAM} nttcp ${PREFIX}/bin/nttcp ; \
diff -r d1699f6a998e -r bb16a6696aee benchmarks/nttcp/distinfo
--- a/benchmarks/nttcp/distinfo Fri Sep 19 18:08:14 2003 +0000
+++ b/benchmarks/nttcp/distinfo Fri Sep 19 18:11:43 2003 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2002/08/21 06:36:35 simonb Exp $
+$NetBSD: distinfo,v 1.3 2003/09/19 18:11:44 wiz Exp $
 
 SHA1 (nttcp-1.47.tar.gz) = 28de7d65074e7546babdfa42b3b88fd8baa2be88
 Size (nttcp-1.47.tar.gz) = 25693 bytes
-SHA1 (patch-aa) = 4865a0daf25b1ebbbb7e3e01014c50b9c16558a6
+SHA1 (patch-aa) = 1699c1fbaaa703fbda32325a2fe395c9018af459
 SHA1 (patch-ab) = f684e6de0fa6df8f28a6372d5dd0bf8e1eee896f
diff -r d1699f6a998e -r bb16a6696aee benchmarks/nttcp/patches/patch-aa
--- a/benchmarks/nttcp/patches/patch-aa Fri Sep 19 18:08:14 2003 +0000
+++ b/benchmarks/nttcp/patches/patch-aa Fri Sep 19 18:11:43 2003 +0000
@@ -1,13 +1,18 @@
-$NetBSD: patch-aa,v 1.2 2002/08/21 06:36:35 simonb Exp $
+$NetBSD: patch-aa,v 1.3 2003/09/19 18:11:45 wiz Exp $
 
---- Makefile.orig      Mon Dec 18 21:17:20 2000
-+++ Makefile
-@@ -108,8 +108,16 @@
+--- Makefile.orig      Mon Dec 18 10:17:20 2000
++++ Makefile   Fri Sep 19 16:31:34 2003
+@@ -108,13 +108,13 @@
  #DBG= -Wall -g
  #INC= 
  
 -# For FreeBSD
 -ARCH= -DFreeBSD
+-LIB=
+-OPT=  -O2
+-CC=   cc
+-DBG=  
+-INC=  
 +## For FreeBSD
 +#ARCH=        -DFreeBSD
 +#LIB=
@@ -15,13 +20,10 @@
 +#CC=  cc
 +#DBG= 
 +#INC= 
-+
-+# For NetBSD
-+ARCH= 
- LIB=
- OPT=  -O2
- CC=   cc
-@@ -151,9 +159,12 @@
+ 
+ ## For SGI IRIX 5.3, 6.2 (cc or gcc)
+ #ARCH=
+@@ -151,10 +151,13 @@
  VERSION=      1.47
  #prefix=              /usr/local/dist/DIR/nttcp-$(VERSION)
  #prefix=              /usr/local
@@ -30,8 +32,8 @@
 +prefix=               ${PREFIX}
  CFLAGS =      $(ARCH) $(DBG) $(DEF) $(INC) $(OPT) -DVERSION=\"$(VERSION)\"
  LFLAGS =      $(DBG) 
-+
+ 
 +all:          nttcp
- 
++
  nttcp:                nttcp.o support.o
                $(CC) $(LFLAGS) nttcp.o -o nttcp support.o $(LIB)