Add DragonFly, fix errno.

3 files changed, 21 insertions, 19 deletions

diff --git a/benchmarks/nettest/distinfo b/benchmarks/nettest/distinfo
index 5d438080351..6fd942b9a1b 100644
--- a/benchmarks/nettest/distinfo
+++ b/benchmarks/nettest/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2005/02/22 21:16:36 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/12/13 15:12:59 joerg 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) = dcff390511f8eb33326f04ecc41f0a40f5c411a8
+SHA1 (patch-aa) = 17f5b23a2813e46fa710e6fd810d5c6e7d9cb7b4
 SHA1 (patch-ab) = e96227451fce253cd77491cfa2214fa49651af15
 SHA1 (patch-ac) = a76e6ce16d984b811cc861d445289dec0d48f40b
-SHA1 (patch-ad) = 86f02549dd061b5eacf51d3202429271e2223d1a
+SHA1 (patch-ad) = fa86a0ba0ddd9e7c8f432800e0d098971c7f6674
diff --git a/benchmarks/nettest/patches/patch-aa b/benchmarks/nettest/patches/patch-aa
index 44eb4badeb6..84b57924465 100644
--- a/benchmarks/nettest/patches/patch-aa
+++ b/benchmarks/nettest/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2004/08/22 23:30:18 jschauma Exp $
+$NetBSD: patch-aa,v 1.4 2005/12/13 15:12:59 joerg Exp $
 
---- Makefile.orig	1992-11-05 17:03:14.000000000 -0500
-+++ Makefile	2004-08-22 18:59:36.000000000 -0400
-@@ -3,10 +3,8 @@
+--- Makefile.orig	1992-11-05 22:03:14.000000000 +0000
++++ Makefile
+@@ -3,10 +3,8 @@ MAKE=make
  FILES=README Makefile nettest.h nettest.c nettestd.c nettest.8
  
  all:
@@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.3 2004/08/22 23:30:18 jschauma 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 @@
+@@ -33,6 +31,24 @@ unicos60 unicos61:
  		DEFINES="-DWAIT3CODE -DNO_ISO" \
  		LIBS="" OPT="-O"
  
@@ -31,7 +31,7 @@ $NetBSD: patch-aa,v 1.3 2004/08/22 23:30:18 jschauma Exp $
 +		DEFINES="-DWAIT3CODE -DNAMEDPIPES -DNO_ISO" \
 +		LIBS="" OPT="-O"
 +
-+NetBSD:
++DragonFly NetBSD:
 +	$(MAKE) objs \
 +		INCLUDE="" \
 +		DEFINES="-DWAIT3CODE -DBSD44 -DNAMEDPIPES -DNO_ISO -DNONVOID_SETPGRP" \
diff --git a/benchmarks/nettest/patches/patch-ad b/benchmarks/nettest/patches/patch-ad
index 065a087e176..d51a510f8d5 100644
--- a/benchmarks/nettest/patches/patch-ad
+++ b/benchmarks/nettest/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2004/08/22 23:27:16 jschauma Exp $
+$NetBSD: patch-ad,v 1.4 2005/12/13 15:12:59 joerg Exp $
 
---- nettestd.c.orig	1992-11-05 16:52:58.000000000 -0500
-+++ nettestd.c	2004-08-22 19:25:48.000000000 -0400
-@@ -107,7 +107,12 @@
+--- nettestd.c.orig	1992-11-05 21:52:58.000000000 +0000
++++ nettestd.c
+@@ -107,7 +107,12 @@ union {
  } name;
  int namesize;
  
@@ -16,7 +16,7 @@ $NetBSD: patch-ad,v 1.3 2004/08/22 23:27:16 jschauma Exp $
  int (*rfunc)() = read;
  
  main(argc, argv)
-@@ -271,7 +276,11 @@
+@@ -271,7 +276,11 @@ char **argv;
  # endif
  #endif
  	if (daemon) {
@@ -28,7 +28,7 @@ $NetBSD: patch-ad,v 1.3 2004/08/22 23:27:16 jschauma Exp $
  			perror("setpgrp");
  		if ((c = open(_PATH_TTY, O_RDWR)) >= 0) {
  			(void)ioctl(c, TIOCNOTTY, (char *)0);
-@@ -416,7 +425,7 @@
+@@ -416,7 +425,7 @@ char **argv;
  			    )
  			error("setsockopt (IP_OPTIONS)");
  #endif
@@ -37,7 +37,7 @@ $NetBSD: patch-ad,v 1.3 2004/08/22 23:27:16 jschauma Exp $
  			error("bind");
  			exit(1);
  		}
-@@ -447,10 +456,10 @@
+@@ -447,12 +456,11 @@ register int s;
  #endif
  	listen(s, 5);
  
@@ -48,9 +48,11 @@ $NetBSD: patch-ad,v 1.3 2004/08/22 23:27:16 jschauma Exp $
 -		s2 = accept(s, (char *)&name, &namesize);
 +		s2 = accept(s, (struct sockaddr *)&name, &namesize);
  		if (s2 < 0) {
- 			extern int errno;
+-			extern int errno;
  			if (errno == EINTR)
-@@ -707,7 +716,9 @@
+ 				continue;
+ 			error("accept");
+@@ -707,7 +715,9 @@ int s;
  		inmsg.msg_iovlen = 1;
  		inmsg.msg_name = (caddr_t)&name.d_inet;
  		inmsg.msg_control = (caddr_t)control;
@@ -60,7 +62,7 @@ $NetBSD: patch-ad,v 1.3 2004/08/22 23:27:16 jschauma Exp $
  		errmsg = "recvmsg";
  	} else
  #endif /* CMSG_DATA */
-@@ -723,7 +734,7 @@
+@@ -723,7 +733,7 @@ int s;
  #endif
  		{
  			namesize = sizeof(name.d_inet);