Let configure check for the presence of <sys/wait.h>, in order to provide

a prototype for waitpid() in the theme-switcher capplet.

4 files changed, 47 insertions, 7 deletions

diff --git a/x11/controlcenter/distinfo b/x11/controlcenter/distinfo
index 44476bb4135..5979c934b81 100644
--- a/x11/controlcenter/distinfo
+++ b/x11/controlcenter/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/05/21 05:27:58 tron Exp $
+$NetBSD: distinfo,v 1.3 2002/03/23 04:54:13 fredb Exp $
 
 SHA1 (control-center-1.4.0.1.tar.gz) = f1b8f9103f5be4ba916f629eaf47663427a97a68
 Size (control-center-1.4.0.1.tar.gz) = 3032482 bytes
 SHA1 (patch-aa) = 8ad0921b024aa4c627da302cf694fc9b1e9ac564
-SHA1 (patch-ab) = 7599c281eca514ea998b73793da1cd9b8f7f0e5d
+SHA1 (patch-ab) = 7c5bb9b267dda50de16586dc8074abb9485d8e67
 SHA1 (patch-ac) = f2d952d26c383a47cd6ac8dfc061946bf74b5fbc
+SHA1 (patch-ad) = df1e1ee9ee03a627e3f7b9106b5747648254570e
+SHA1 (patch-ae) = a8c99df3de1831326182f0812c184ba24df153a1
diff --git a/x11/controlcenter/patches/patch-ab b/x11/controlcenter/patches/patch-ab
index 5d4ab8d6ac0..8c8c1650f48 100644
--- a/x11/controlcenter/patches/patch-ab
+++ b/x11/controlcenter/patches/patch-ab
@@ -1,16 +1,25 @@
-$NetBSD: patch-ab,v 1.2 2000/10/18 00:01:12 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2002/03/23 04:54:14 fredb Exp $
 
---- configure.orig	Mon Sep 11 22:00:51 2000
+--- configure.orig	Wed Mar 28 13:46:14 2001
 +++ configure
-@@ -4873,6 +4873,11 @@
+@@ -4007,7 +4007,7 @@
  
+                               
+    for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h string.h \
+-unistd.h sys/param.h
++unistd.h sys/param.h sys/wait.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+@@ -4940,6 +4940,11 @@
  
  
+ 
++
 +# NetBSD: set DATADIRNAME to "share"
 +DATADIRNAME="share"
 +INTLDEPS=
 +INTLLIBS="-lintl"
-+
+ 
  for ac_hdr in dlfcn.h dl.h
  do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
diff --git a/x11/controlcenter/patches/patch-ad b/x11/controlcenter/patches/patch-ad
new file mode 100644
index 00000000000..8d07d1bb574
--- /dev/null
+++ b/x11/controlcenter/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.3 2002/03/23 04:54:14 fredb Exp $
+
+--- config.h.in.orig	Fri Mar 22 22:15:41 2002
++++ config.h.in
+@@ -150,6 +150,9 @@
+ /* Define if you have the <sys/param.h> header file.  */
+ #undef HAVE_SYS_PARAM_H
+ 
++/* Define if you have the <sys/wait.h> header file.  */
++#undef HAVE_SYS_WAIT_H
++
+ /* Define if you have the <unistd.h> header file.  */
+ #undef HAVE_UNISTD_H
+ 
diff --git a/x11/controlcenter/patches/patch-ae b/x11/controlcenter/patches/patch-ae
new file mode 100644
index 00000000000..5a2a1cc425d
--- /dev/null
+++ b/x11/controlcenter/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2002/03/23 04:54:14 fredb Exp $
+
+--- capplets/theme-switcher/main.c.orig	Wed Nov  8 23:11:22 2000
++++ capplets/theme-switcher/main.c
+@@ -4,6 +4,10 @@
+ #include <locale.h>
+ #include "da.h"
+ 
++#ifdef HAVE_SYS_WAIT_H
++#include <sys/wait.h>
++#endif
++
+ #define THEME_SWITCHER_VERSION "0.1"
+ 
+ int