Patch a bunch of gcc4 breakages, mostly static prototype mismatches.

6 files changed, 89 insertions, 9 deletions

diff --git a/x11/xview-clients/distinfo b/x11/xview-clients/distinfo
index d3a3d3a788c..5fa6b9969ef 100644
--- a/x11/xview-clients/distinfo
+++ b/x11/xview-clients/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2006/01/10 18:30:16 joerg Exp $
+$NetBSD: distinfo,v 1.7 2007/05/12 00:22:19 tnn Exp $
 
 SHA1 (xview3.2p1-X11R6.tar.gz) = 1cd04231b893c3e6c70b56791d527b498e21a27a
 RMD160 (xview3.2p1-X11R6.tar.gz) = 2f21b14cb088aec887683bbc6d4ed9a3bc3fe2bb
@@ -89,8 +89,12 @@ SHA1 (patch-de) = 2605b1a7dde702cc6b4f6487aa6653d8a9c679b3
 SHA1 (patch-df) = 8abaf316fdd7d187309594e94a8aa3d2f6dddf4a
 SHA1 (patch-dg) = 82f1ee4872b8e4f782c6511a93a796604891e54f
 SHA1 (patch-dh) = b4126aeff68c4bdb65544a69d7ee68e3e69b29a2
-SHA1 (patch-di) = c8ddf62bb2309955002112f66a08c28c47a4f767
+SHA1 (patch-di) = b182b2c55a08cfc1727a9a437580287c066facfb
 SHA1 (patch-dj) = b85959330e770704e44185d495c8fc34ad4c88b7
 SHA1 (patch-dk) = 1f8a6021161ca413ef1fa56f5d82603a0b79e039
 SHA1 (patch-dl) = 7942af332b07dd79da85aa9f7103e1d9cd5c5f0e
 SHA1 (patch-dm) = e06fd048ea639960727f039b94e9a60b4b4b568e
+SHA1 (patch-dn) = e147b6c9b3cd5b119006e8d8217ad3fd25adcd15
+SHA1 (patch-do) = 9b3461fff958764669e11115f881f9b1b71466f0
+SHA1 (patch-dp) = 42d0d86c0fb8e98d7245a98ed9b25bd9172c04df
+SHA1 (patch-dq) = 9744e800be15542261099a1d0f6e31483de68254
diff --git a/x11/xview-clients/patches/patch-di b/x11/xview-clients/patches/patch-di
index c3ad3833663..ea0688729c7 100644
--- a/x11/xview-clients/patches/patch-di
+++ b/x11/xview-clients/patches/patch-di
@@ -1,7 +1,7 @@
-$NetBSD: patch-di,v 1.1 2001/12/28 14:58:07 tron Exp $
+$NetBSD: patch-di,v 1.2 2007/05/12 00:22:19 tnn Exp $
 
---- olwmslave/helpwin.c.orig	Tue Jun 29 07:12:11 1993
-+++ olwmslave/helpwin.c	Fri Dec 28 15:55:43 2001
+--- olwmslave/helpwin.c.orig	1993-06-29 07:12:11.000000000 +0200
++++ olwmslave/helpwin.c
 @@ -6,7 +6,6 @@
  /* ----------------------------------------------------------------------
   *	helpwin.c
@@ -10,10 +10,26 @@ $NetBSD: patch-di,v 1.1 2001/12/28 14:58:07 tron Exp $
  
  #include <stdio.h>
  #include <xview/xview.h>
-@@ -136,6 +135,7 @@
- Bool		ImageHelpWindow();
- void		MoreHelp();
- void		ErrorNotice();
+@@ -128,14 +127,15 @@ char		*help_get_text();
+  *	Local Forward Functions
+  * ---------------------------------------------------------------------*/
+ int		ShowHelpWindow();
+-void		InitHelpWindow();
+-Bool		CreateHelpWindow();
+-Notify_value	DestroyHelpWindow();
+-void		ResetHelpWindow();
+-Bool		TextHelpWindow();
+-Bool		ImageHelpWindow();
+-void		MoreHelp();
+-void		ErrorNotice();
++static void		InitHelpWindow();
++static Bool		CreateHelpWindow();
++static Notify_value	DestroyHelpWindow();
++static void		ResetHelpWindow();
++static Bool		TextHelpWindow();
++static Bool		ImageHelpWindow();
++static void		MoreHelp();
++static void		ErrorNotice();
 +static int	ConstrainMousePos();
  
  /* ----------------------------------------------------------------------
diff --git a/x11/xview-clients/patches/patch-dn b/x11/xview-clients/patches/patch-dn
new file mode 100644
index 00000000000..c7cfd6968e7
--- /dev/null
+++ b/x11/xview-clients/patches/patch-dn
@@ -0,0 +1,13 @@
+$NetBSD: patch-dn,v 1.1 2007/05/12 00:22:19 tnn Exp $
+
+--- olwmslave/helprecv.c.orig	1993-06-29 07:12:11.000000000 +0200
++++ olwmslave/helprecv.c
+@@ -15,7 +15,7 @@ static	char	sccsid[] = "@(#) helprecv.c 
+ #include "helpcmd.h"
+ 
+ extern	int	ShowHelpWindow();
+-	void	ReceiveHelpCmd();
++static	void	ReceiveHelpCmd();
+ 
+ /* ----------------------------------------------------------------------
+  *	RegisterHelpWindow
diff --git a/x11/xview-clients/patches/patch-do b/x11/xview-clients/patches/patch-do
new file mode 100644
index 00000000000..92b63a2ffc2
--- /dev/null
+++ b/x11/xview-clients/patches/patch-do
@@ -0,0 +1,13 @@
+$NetBSD: patch-do,v 1.1 2007/05/12 00:22:19 tnn Exp $
+
+--- olwmslave/propsrecv.c.orig	1993-06-29 07:12:13.000000000 +0200
++++ olwmslave/propsrecv.c
+@@ -15,7 +15,7 @@ static char     sccsid[] = "@(#) propsre
+ #include "propscmd.h"
+ 
+ extern	int	ShowWindowProps();
+-	void	ReceivePropsCmd();
++static	void	ReceivePropsCmd();
+ 
+ /* ----------------------------------------------------------------------
+  *	RegisterPropsWindow
diff --git a/x11/xview-clients/patches/patch-dp b/x11/xview-clients/patches/patch-dp
new file mode 100644
index 00000000000..0c35b35de7b
--- /dev/null
+++ b/x11/xview-clients/patches/patch-dp
@@ -0,0 +1,17 @@
+$NetBSD: patch-dp,v 1.1 2007/05/12 00:22:19 tnn Exp $
+
+--- olwmslave/olwmslave.c.orig	1993-06-29 07:12:12.000000000 +0200
++++ olwmslave/olwmslave.c
+@@ -44,9 +44,9 @@ char		cmdBuf[CMDBUFLEN];
+ /* ----------------------------------------------------------------------
+  *	Forward Definitions
+  * ----------------------------------------------------------------------*/
+-void		InitScreenInfo();
+-void		ParseScreenArgs();
+-Notify_value	InputReader();
++static void		InitScreenInfo();
++static void		ParseScreenArgs();
++static Notify_value	InputReader();
+ 
+ /* ----------------------------------------------------------------------
+  * 	main
diff --git a/x11/xview-clients/patches/patch-dq b/x11/xview-clients/patches/patch-dq
new file mode 100644
index 00000000000..802d8bbaeb5
--- /dev/null
+++ b/x11/xview-clients/patches/patch-dq
@@ -0,0 +1,17 @@
+$NetBSD: patch-dq,v 1.1 2007/05/12 00:22:20 tnn Exp $
+
+--- olwmslave/propswin.c.orig	1993-06-29 07:12:13.000000000 +0200
++++ olwmslave/propswin.c
+@@ -38,9 +38,9 @@ static WindowProps	*winPropsList = 0; 	/
+  *      Local Forward Declarations
+  * ----------------------------------------------------------------------*/
+ int		ShowWindowProps();
+-void		InitWindowProps();
+-Bool		CreateWindowProps();
+-Notify_value	DestroyWindowProps();
++static void		InitWindowProps();
++static Bool		CreateWindowProps();
++static Notify_value	DestroyWindowProps();
+ void		ApplyProps();
+ void		ResetProps();
+