[pkgsrc/trunk]: pkgsrc/sysutils/socket Use waitpid() on Interix (has no wait3...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e0ef09b94dbc
branches:  trunk
changeset: 521946:e0ef09b94dbc
user:      tv <tv%pkgsrc.org@localhost>
date:      Tue Nov 28 16:48:31 2006 +0000

description:
Use waitpid() on Interix (has no wait3()).

diffstat:

 sysutils/socket/distinfo         |   4 ++--
 sysutils/socket/patches/patch-ai |  19 +++++++++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diffs (46 lines):

diff -r 343510333fd9 -r e0ef09b94dbc sysutils/socket/distinfo
--- a/sysutils/socket/distinfo  Tue Nov 28 16:46:16 2006 +0000
+++ b/sysutils/socket/distinfo  Tue Nov 28 16:48:31 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2006/01/25 02:12:10 joerg Exp $
+$NetBSD: distinfo,v 1.9 2006/11/28 16:48:31 tv Exp $
 
 SHA1 (socket-1.1.tar.gz) = 1ada9bc6d949c303734030b3a34e2d6f0544d1db
 RMD160 (socket-1.1.tar.gz) = 9a697cbdc807223f48229caa3349cba216b5ffc0
@@ -11,4 +11,4 @@
 SHA1 (patch-af) = b40a7bbd22a6773816eb0e52403d67317979451d
 SHA1 (patch-ag) = e106aac5b193a43ab208b648deadf173a78a6d6d
 SHA1 (patch-ah) = 232f359d1c6256266d1dff9c98891ce591ebc13b
-SHA1 (patch-ai) = 855c15e6b25ec96e740933be0310366afbce4ec8
+SHA1 (patch-ai) = 7bd6114d85d3c62791b29d521f07e3ea77a736d7
diff -r 343510333fd9 -r e0ef09b94dbc sysutils/socket/patches/patch-ai
--- a/sysutils/socket/patches/patch-ai  Tue Nov 28 16:46:16 2006 +0000
+++ b/sysutils/socket/patches/patch-ai  Tue Nov 28 16:48:31 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.3 2006/01/25 02:12:10 joerg Exp $
+$NetBSD: patch-ai,v 1.4 2006/11/28 16:48:31 tv Exp $
 
---- utils.c.orig       1992-09-09 14:31:16.000000000 +0000
+--- utils.c.orig       1992-09-09 10:31:16.000000000 -0400
 +++ utils.c
 @@ -18,6 +18,7 @@ Please read the file COPYRIGHT for furth
  #include <signal.h>
@@ -43,3 +43,18 @@
            sigvec(i, &svec, NULL) ;
  #else
            signal(i, exitsig) ;
+@@ -173,12 +176,12 @@ char *prog ;
+ void wait_for_children()
+ {
+     int wret, status ;
+-#ifndef ISC
++#if !defined(ISC) && !defined(__INTERIX)
+     struct rusage rusage ;
+ #endif
+ 
+     /* Just do a wait, forget result */
+-#ifndef ISC
++#if !defined(ISC) && !defined(__INTERIX)
+     while ((wret = wait3(&status, WNOHANG, &rusage)) > 0) ;
+ #else
+     while ((wret = waitpid(-1, &status, WNOHANG)) > 0) ;