Fix build on current.

Submitted by:	mike

7 files changed, 102 insertions, 0 deletions

diff --git a/cad/ngspice_rework/files/patch-aspice.c b/cad/ngspice_rework/files/patch-aspice.c
new file mode 100644
index 000000000000..03d123c289ab
--- /dev/null
+++ b/cad/ngspice_rework/files/patch-aspice.c
@@ -0,0 +1,11 @@
+--- src/frontend/aspice.c	Tue Jun  4 21:18:04 2002
++++ src/frontend/aspice.c	Tue Jun  4 21:17:32 2002
+@@ -178,6 +178,8 @@
+ 
+ #if defined(__NetBSD__)
+     pid_t status;
++#elif defined(__FreeBSD__)
++    int status;
+ #else
+     union wait status;
+ #endif
diff --git a/chinese/hztty/files/patch-main.c b/chinese/hztty/files/patch-main.c
new file mode 100644
index 000000000000..7171f473e1ed
--- /dev/null
+++ b/chinese/hztty/files/patch-main.c
@@ -0,0 +1,20 @@
+--- main.c.orig	Tue Jun  4 21:56:28 2002
++++ main.c	Tue Jun  4 21:59:33 2002
+@@ -264,7 +264,7 @@
+ static SIGNAL_T
+ finish()
+ {
+-#if defined(SYSV) || defined(POSIX)
++#if defined(BSD) || defined(SYSV) || defined(POSIX)
+ 	int status;
+ #else
+ 	union wait status;
+@@ -272,7 +272,7 @@
+ 	register int pid;
+ 	register int die = 0;
+ 
+-#if defined(SYSV) || defined(POSIX)
++#if defined(BSD) || defined(SYSV) || defined(POSIX)
+ 	while ((pid = waitpid(-1, &status, WNOHANG|WUNTRACED)) > 0)
+ #else
+ 	while ((pid = wait3(&status, WNOHANG|WUNTRACED, (struct rusage *)0))>0)
diff --git a/devel/pmake/files/patch-config.h b/devel/pmake/files/patch-config.h
new file mode 100644
index 000000000000..aa99f119c3d7
--- /dev/null
+++ b/devel/pmake/files/patch-config.h
@@ -0,0 +1,14 @@
+--- unix/config.h.orig	Tue Jun  4 21:35:28 2002
++++ unix/config.h	Tue Jun  4 21:34:59 2002
+@@ -208,6 +208,11 @@
+ # define HAVE_POSIX
+ #endif /* SYSV */
+ 
++#include <sys/param.h>
++#ifdef __FreeBSD__
++# define HAVE_POSIX
++#endif
++
+ #define LIBTOC		"__.SYMDEF"
+ #define LIBFLAG		"-l"
+ #define LIBPREFIX	"lib"
diff --git a/misc/ttyrec/files/patch-tyrec.c b/misc/ttyrec/files/patch-tyrec.c
new file mode 100644
index 000000000000..aa0ba715e199
--- /dev/null
+++ b/misc/ttyrec/files/patch-tyrec.c
@@ -0,0 +1,14 @@
+--- ttyrec.c.orig	Tue Jun  4 21:52:00 2002
++++ ttyrec.c	Tue Jun  4 21:52:12 2002
+@@ -202,11 +202,7 @@
+ void
+ finish()
+ {
+-#if defined(SVR4)
+ 	int status;
+-#else /* !SVR4 */
+-	union wait status;
+-#endif /* !SVR4 */
+ 	register int pid;
+ 	register int die = 0;
+ 
diff --git a/net/rmsg/files/patch-server.c b/net/rmsg/files/patch-server.c
new file mode 100644
index 000000000000..72aaf6245f0b
--- /dev/null
+++ b/net/rmsg/files/patch-server.c
@@ -0,0 +1,21 @@
+--- server.c	Tue Jun  4 21:40:19 2002
++++ server.c	Tue Jun  4 21:42:56 2002
+@@ -146,7 +146,7 @@
+ {
+      int child, pid, fd;
+      unsigned int retval = 0;
+-#if defined(HPUX) || defined(SVR4)
++#if defined(HPUX) || defined(SVR4) || defined(BSD)
+      int status;
+ #else
+      union wait status;
+@@ -202,6 +202,9 @@
+ #if defined(HPUX) || defined(SVR4)
+           if (status & 0xff) retval = -1;
+           else retval = ((status & 0xffff) >> 8);
++#elif defined(BSD)
++          if (WIFSIGNALED(status)) retval = -1;
++          else retval = WEXITSTATUS(status);
+ #else
+           if (status.w_termsig) retval = -1;       /* ended in signal */
+           else retval = status.w_retcode;
diff --git a/news/nntp/files/patch-netaux.c b/news/nntp/files/patch-netaux.c
new file mode 100644
index 000000000000..f606f444ecd7
--- /dev/null
+++ b/news/nntp/files/patch-netaux.c
@@ -0,0 +1,11 @@
+--- server/netaux.c.orig	Tue Jun  4 21:22:30 2002
++++ server/netaux.c	Tue Jun  4 21:23:10 2002
+@@ -261,7 +261,7 @@
+ 
+ reaper()
+ {
+-#ifndef USG
++#if !defined(USG) && !defined(BSD_44)
+ 	union wait	status;
+ 
+ 	while (wait3(&status, WNOHANG, (struct rusage *)0) > 0)
diff --git a/news/nntpbtr/files/patch-nntpbtr.c b/news/nntpbtr/files/patch-nntpbtr.c
new file mode 100644
index 000000000000..f6a80ccd9299
--- /dev/null
+++ b/news/nntpbtr/files/patch-nntpbtr.c
@@ -0,0 +1,11 @@
+--- nntpbtr.c	Tue Jun  4 21:26:27 2002
++++ nntpbtr.c	Tue Jun  4 21:26:47 2002
+@@ -95,7 +95,7 @@
+ qchld()
+ {
+ 	int pid;
+-	union wait status;
++	int status;
+ 
+ 	while( (pid = wait3(&status, WNOHANG, (struct rusage *)0)) > 0 ) ;
+ }