Fix build on SunOS.

6 files changed, 27 insertions, 9 deletions

diff --git a/benchmarks/bonnie/Makefile b/benchmarks/bonnie/Makefile
index 6c36d48ec58..e9113b870e1 100644
--- a/benchmarks/bonnie/Makefile
+++ b/benchmarks/bonnie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2010/04/01 06:59:19 obache Exp $
+# $NetBSD: Makefile,v 1.36 2012/01/12 15:13:15 hans Exp $
 
 DISTNAME=	bonnie
 PKGNAME=	bonnie-2.06
@@ -23,6 +23,7 @@ USE_BSD_MAKEFILE=	yes
 MANCOMPRESSED_IF_MANZ=	yes
 
 CFLAGS.Linux+=	-D_FILE_OFFSET_BITS=64
+CFLAGS.SunOS+=	-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
 
diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index c860b4d1bce..fe2bebc1f18 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2011/12/02 15:31:44 hauke Exp $
+# $NetBSD: Makefile,v 1.43 2012/01/12 15:11:37 hans Exp $
 
 DISTNAME=	iozone3_397
 PKGNAME=	iozone-3.397
@@ -21,6 +21,8 @@ WRKSRC=			${WRKDIR}/${DISTNAME}/src/current
 MAKE_FILE=		makefile
 USE_TOOLS+=		tee perl
 
+CPPFLAGS.SunOS+=	-Dsolaris
+
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(OPSYS:M*BSD) || ${OPSYS} == "Linux" || ${OPSYS} == "DragonFly"
diff --git a/benchmarks/netpipe/distinfo b/benchmarks/netpipe/distinfo
index 64eca7283be..5729d78778a 100644
--- a/benchmarks/netpipe/distinfo
+++ b/benchmarks/netpipe/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2010/10/16 10:15:56 adam Exp $
+$NetBSD: distinfo,v 1.7 2012/01/12 15:15:09 hans Exp $
 
 SHA1 (NetPIPE-3.7.1.tar.gz) = d90750d48c8a152ff8d61734413cdd2135c79986
 RMD160 (NetPIPE-3.7.1.tar.gz) = 4b4b5566518573c053f1b1d6c99530652065590c
 Size (NetPIPE-3.7.1.tar.gz) = 385521 bytes
-SHA1 (patch-aa) = 3014446c7b46f3bce3ca96070a97d652bb983bc3
+SHA1 (patch-aa) = 3ee3b74f5eb99b115b6aa73a0e4d6e54312c2132
diff --git a/benchmarks/netpipe/patches/patch-aa b/benchmarks/netpipe/patches/patch-aa
index 47520d51184..0fb19ce878c 100644
--- a/benchmarks/netpipe/patches/patch-aa
+++ b/benchmarks/netpipe/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2010/10/16 10:15:57 adam Exp $
+$NetBSD: patch-aa,v 1.5 2012/01/12 15:15:09 hans Exp $
 
 --- makefile.orig	2010-10-14 09:16:46.000000000 +0000
 +++ makefile
@@ -11,3 +11,12 @@ $NetBSD: patch-aa,v 1.4 2010/10/16 10:15:57 adam Exp $
  SRC        = ./src
  
  # For MPI, mpicc will set up the proper include and library paths
+@@ -81,7 +79,7 @@ clean:
+ 
+ 
+ tcp: $(SRC)/tcp.c $(SRC)/netpipe.c $(SRC)/netpipe.h 
+-	$(CC) $(CFLAGS) $(SRC)/netpipe.c $(SRC)/tcp.c -DTCP -o NPtcp -I$(SRC)
++	$(CC) $(CFLAGS) $(SRC)/netpipe.c $(SRC)/tcp.c -DTCP -o NPtcp -I$(SRC) ${EXTRA_LIBS}
+ 
+ tcp6: $(SRC)/tcp.c $(SRC)/netpipe.c $(SRC)/netpipe.h 
+ 	$(CC) $(CFLAGS) $(SRC)/netpipe.c $(SRC)/tcp6.c -DTCP6 \
diff --git a/benchmarks/nettest/distinfo b/benchmarks/nettest/distinfo
index 564316f97ab..f099b5942de 100644
--- a/benchmarks/nettest/distinfo
+++ b/benchmarks/nettest/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2006/06/22 15:00:51 joerg Exp $
+$NetBSD: distinfo,v 1.9 2012/01/12 15:21:05 hans Exp $
 
 SHA1 (nettest.92.11.09.tar.Z) = 745408751115784f8f5dc63b16428eb1404d6c5e
 RMD160 (nettest.92.11.09.tar.Z) = dadf2688c5d57dc019df7267f35089e70a92bd79
 Size (nettest.92.11.09.tar.Z) = 35068 bytes
-SHA1 (patch-aa) = 17f5b23a2813e46fa710e6fd810d5c6e7d9cb7b4
+SHA1 (patch-aa) = 9f697c7dd4d7d146e2ad6927236bdb34faf2ec73
 SHA1 (patch-ab) = e96227451fce253cd77491cfa2214fa49651af15
 SHA1 (patch-ac) = 7c6f6abf3012c81d8898c4ef21936e0e89d108dd
 SHA1 (patch-ad) = bbae628cc8cb7a38f89f912d8682dc100fceeabc
diff --git a/benchmarks/nettest/patches/patch-aa b/benchmarks/nettest/patches/patch-aa
index 84b57924465..58ea2d2f4c7 100644
--- a/benchmarks/nettest/patches/patch-aa
+++ b/benchmarks/nettest/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2005/12/13 15:12:59 joerg Exp $
+$NetBSD: patch-aa,v 1.5 2012/01/12 15:21:05 hans Exp $
 
 --- Makefile.orig	1992-11-05 22:03:14.000000000 +0000
 +++ Makefile
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.4 2005/12/13 15:12:59 joerg Exp $
  	else \
  		echo You must specify what machine you are on,;\
  		echo e.g. \"make sun\", \"make cray2\", \"make pyramid\", \"make xmp\";\
-@@ -33,6 +31,24 @@ unicos60 unicos61:
+@@ -33,6 +31,30 @@ unicos60 unicos61:
  		DEFINES="-DWAIT3CODE -DNO_ISO" \
  		LIBS="" OPT="-O"
  
@@ -31,6 +31,12 @@ $NetBSD: patch-aa,v 1.4 2005/12/13 15:12:59 joerg Exp $
 +		DEFINES="-DWAIT3CODE -DNAMEDPIPES -DNO_ISO" \
 +		LIBS="" OPT="-O"
 +
++SunOS:
++	$(MAKE) objs \
++		INCLUDE="-I." \
++		DEFINES="-DSYSV -DWAIT3CODE -DNAMEDPIPES -DNO_ISO" \
++		LIBS="-lsocket -lnsl" OPT="-O"
++
 +DragonFly NetBSD:
 +	$(MAKE) objs \
 +		INCLUDE="" \