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

23 files changed, 373 insertions, 44 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();
+ 
diff --git a/x11/xview-lib/distinfo b/x11/xview-lib/distinfo
index c4da769f578..461fd696874 100644
--- a/x11/xview-lib/distinfo
+++ b/x11/xview-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2006/01/05 18:25:57 joerg Exp $
+$NetBSD: distinfo,v 1.11 2007/05/12 00:22:16 tnn Exp $
 
 SHA1 (xview3.2p1-X11R6.tar.gz) = 1cd04231b893c3e6c70b56791d527b498e21a27a
 RMD160 (xview3.2p1-X11R6.tar.gz) = 2f21b14cb088aec887683bbc6d4ed9a3bc3fe2bb
@@ -22,7 +22,7 @@ SHA1 (patch-ap) = 5458cd0e65dcca28da727d17494350369ece59f0
 SHA1 (patch-aq) = 7a13c8cd72b88061308fd85033fe53e1b1b6affe
 SHA1 (patch-ar) = ebc5412b91216ca3559db9dbbb9f5fe565cf744f
 SHA1 (patch-as) = 5fefb12b0c5f087d371f8241b028adedd0810435
-SHA1 (patch-at) = 9f0b508e285e80db49b811441264e7042c5f3c51
+SHA1 (patch-at) = d086303c4b766f5d6b9b535b97e6d7671cb436eb
 SHA1 (patch-au) = 4be6221b6b3660d5c74c043b7edf8aae946b7148
 SHA1 (patch-av) = fea7e5575fe913dfedbdd1e744ac60b75be737d2
 SHA1 (patch-aw) = e848355e0b704bdf6d726dc00cd4a49353e5eddb
@@ -76,22 +76,22 @@ SHA1 (patch-cr) = 025e5607cd3ecbc0c261f473bf0ddb31e9f70265
 SHA1 (patch-cs) = b4b224a0215dc11e20a1e54588d166a29621a997
 SHA1 (patch-ct) = 36d8a2eaeeed831e307e74ccba97007e037b61f2
 SHA1 (patch-cu) = ce19d2151f259e0cb5358a0c4350b391da94cbd9
-SHA1 (patch-cv) = 56fffeff6ca82ca661ee5ef72deb1d328777fb3e
+SHA1 (patch-cv) = 6945504abff7be96d8e9977441ffc6ca699040d4
 SHA1 (patch-cw) = ab33630d7854e7d93190a37d232ea481fc49159c
 SHA1 (patch-cx) = 3df44c86e60ed0e542a6746d04695b7e65adca73
 SHA1 (patch-cy) = 5d511a7d6cd4a0aefd0b05e0e1e26b3b8567ec08
-SHA1 (patch-cz) = d772125c6aeebec919bccd083f997cdd425c5a1d
+SHA1 (patch-cz) = c16b39423d0eb1bda6c2996fce94370e44a98af8
 SHA1 (patch-da) = 58f289767fd9a6f6a334e0e5a770564b780a1212
 SHA1 (patch-db) = 94c13bd10197c4b209a46da3e8008685db22adb6
 SHA1 (patch-dc) = d0240a7a6e330af56167b5707cd91fcade334d5f
 SHA1 (patch-dd) = 935f97cffd10b44c5bd7d80e599b3f897d56b049
-SHA1 (patch-de) = 7896d70ab94054d8a77049df47eceb2505c60ed1
+SHA1 (patch-de) = 37721bbeb9d62c41d39c3b2e9e65ab91f1cf4bdc
 SHA1 (patch-df) = 1140349bd309cfdc43c586e39914b607f2cb8e7a
 SHA1 (patch-dg) = 1c757673e8d21f90363997f853492c7d98192098
 SHA1 (patch-dh) = b0b7c1d3b99991c64e4d70a27f601993baa1f91b
 SHA1 (patch-di) = da64503892d0e421bce6f8f07da879884a757bcb
-SHA1 (patch-dj) = 7b13ec762f5dc0f21a1416c311e20c4ed2b62afc
-SHA1 (patch-dk) = ed02c7f7aa8ee25c4227843e115689952f765caf
+SHA1 (patch-dj) = cfc6a0706c67c15e81ff7a5285624cae30a78cc1
+SHA1 (patch-dk) = 9ba00db63023e0863901d017b54c05903fb19da4
 SHA1 (patch-dl) = 0aef1fe619dc5ff228d813d816f5e974d49bf829
 SHA1 (patch-dm) = 205ac73da2105f82d497279507f93a6ec703a5d0
 SHA1 (patch-dn) = b0ccb6467097b3b1937810d9f1fc6a2b21fbabc2
@@ -120,3 +120,13 @@ SHA1 (patch-ej) = 8eb2a61821f1ebf778ae1fa7a828de3a0b8e2ae6
 SHA1 (patch-ek) = 49c51048cb416e53279d9f319466f5eaf5c28ae0
 SHA1 (patch-el) = 51e1d47e1f42e1cc62d53b1e4c3426b9dbf4a798
 SHA1 (patch-fa) = b17b18509017d19e52c1c54416bec24d67ce2b4d
+SHA1 (patch-fb) = 3f6906fe91374c3bfdd77549ec784643887ceee2
+SHA1 (patch-fc) = 3b4bd2940d0482ae8280b0cd7935b9368388b703
+SHA1 (patch-fd) = fb2590a1d297a202d812d4842e363e2fa24bd7f9
+SHA1 (patch-fe) = 5366fc218305323c1d9d003e999e3a9f2a64ffb9
+SHA1 (patch-ff) = bae46f189ae6495cb588ffe629133ed89d9a0e17
+SHA1 (patch-fg) = 33fa902f2294fe5e4b92a3024de86ed7f63f738a
+SHA1 (patch-fh) = 63b03cc4a5131bb9e54eac34596162b6f898b7d0
+SHA1 (patch-fi) = 98afeda924cbf156a0f1eafd59bc8d90d2ca6eb8
+SHA1 (patch-fj) = c1c466868943092d8a831d0587e48f53b522934f
+SHA1 (patch-fk) = 0fd7952f1a3f97b198973acdbdf60804c818648e
diff --git a/x11/xview-lib/patches/patch-at b/x11/xview-lib/patches/patch-at
index 35ace1ac800..39b576d63de 100644
--- a/x11/xview-lib/patches/patch-at
+++ b/x11/xview-lib/patches/patch-at
@@ -1,7 +1,7 @@
-$NetBSD: patch-at,v 1.3 2006/01/05 18:25:57 joerg Exp $
+$NetBSD: patch-at,v 1.4 2007/05/12 00:22:16 tnn Exp $
 
---- lib/libxview/win/win_input.c.orig	Mon Jun 27 00:27:53 1994
-+++ lib/libxview/win/win_input.c	Thu Dec 20 10:09:19 2001
+--- ./lib/libxview/win/win_input.c.orig	1994-06-27 00:27:53.000000000 +0200
++++ ./lib/libxview/win/win_input.c
 @@ -56,6 +56,7 @@ static int      BlockForEvent();
  static int      GetButtonEvent();
  static int      win_translate_KP_keysym();
@@ -30,6 +30,15 @@ $NetBSD: patch-at,v 1.3 2006/01/05 18:25:57 joerg Exp $
  					       buffer, BUFFERSIZE)) {
  			        (void)win_translate_KP_keysym(ksym, buffer);
  			    }
+@@ -2316,7 +2319,7 @@ chording(display, bEvent, timeout)
+     /* XView does a passive grab on the SELECT button! */
+     window_x_allow_events(display);
+ 
+-    return BlockForEvent(display, xevent, timeout * 1000, GetButtonEvent,
++    return BlockForEvent(display, &xevent, timeout * 1000, GetButtonEvent,
+ 			 (char *) bEvent);
+ }
+ 
 @@ -2341,7 +2344,6 @@ BlockForEvent(display, xevent, usec, pre
      int             result;
      struct timeval  timeout;
diff --git a/x11/xview-lib/patches/patch-cv b/x11/xview-lib/patches/patch-cv
index 93cd892b86c..7a84650bd3a 100644
--- a/x11/xview-lib/patches/patch-cv
+++ b/x11/xview-lib/patches/patch-cv
@@ -1,8 +1,8 @@
-$NetBSD: patch-cv,v 1.1 2001/12/20 09:20:04 tron Exp $
+$NetBSD: patch-cv,v 1.2 2007/05/12 00:22:17 tnn Exp $
 
---- lib/libxview/textsw/ps_impl.c.orig	Tue Jun 29 07:17:39 1993
-+++ lib/libxview/textsw/ps_impl.c	Thu Dec 20 10:09:17 2001
-@@ -62,6 +62,10 @@
+--- lib/libxview/textsw/ps_impl.c.orig	1993-06-29 07:17:39.000000000 +0200
++++ lib/libxview/textsw/ps_impl.c
+@@ -62,6 +62,10 @@ static Es_index ps_read(), ps_scratch_re
  static Es_index ps_replace(), ps_scratch_replace();
  static int      ps_set();
  
@@ -13,3 +13,12 @@ $NetBSD: patch-cv,v 1.1 2001/12/20 09:20:04 tron Exp $
  static Es_index write_header_etc();
  
  static struct es_ops ps_ops = {
+@@ -1575,7 +1579,7 @@ ps_undo_to_mark(esh, mark, notify_proc, 
+     private->last_write_plus_one = ES_INFINITY;
+ }
+ 
+-static          caddr_t
++caddr_t
+ #ifdef ANSI_FUNC_PROTO
+ ps_get(Es_handle esh, Es_attribute attribute, ...)
+ #else
diff --git a/x11/xview-lib/patches/patch-cz b/x11/xview-lib/patches/patch-cz
index c025db47305..a933dc2b9a2 100644
--- a/x11/xview-lib/patches/patch-cz
+++ b/x11/xview-lib/patches/patch-cz
@@ -1,7 +1,7 @@
-$NetBSD: patch-cz,v 1.2 2006/01/05 18:25:57 joerg Exp $
+$NetBSD: patch-cz,v 1.3 2007/05/12 00:22:17 tnn Exp $
 
---- lib/libxview/textsw/txt_input.c.orig	Tue Jun 29 07:17:42 1993
-+++ lib/libxview/textsw/txt_input.c	Thu Dec 20 10:09:17 2001
+--- lib/libxview/textsw/txt_input.c.orig	1993-06-29 07:17:42.000000000 +0200
++++ lib/libxview/textsw/txt_input.c
 @@ -40,8 +40,6 @@ static char     sccsid[] = "@(#)txt_inpu
  #include <stdlib.h> 
  #endif /* SVR4 */
@@ -20,3 +20,34 @@ $NetBSD: patch-cz,v 1.2 2006/01/05 18:25:57 joerg Exp $
  #define SPACE_CHAR 0x20
  
  Pkg_private int
+@@ -193,6 +193,15 @@ textsw_gprofed_routine(view, ie)
+ #endif
+ 
+ 
++static int      textsw_scroll_event();
++static int      textsw_function_key_event();
++static int      textsw_mouse_event();
++static int      textsw_edit_function_key_event();
++static int      textsw_caret_motion_event();
++static int      textsw_field_event();
++static int      textsw_file_operation();
++static int      textsw_erase_action();
++
+ Pkg_private int
+ textsw_process_event(view_public, ie, arg)
+     Textsw_view     view_public;
+@@ -200,14 +209,6 @@ textsw_process_event(view_public, ie, ar
+     Notify_arg      arg;
+ {
+     Pkg_private void     textsw_update_scrollbars();
+-    static int      textsw_scroll_event();
+-    static int      textsw_function_key_event();
+-    static int      textsw_mouse_event();
+-    static int      textsw_edit_function_key_event();
+-    static int      textsw_caret_motion_event();
+-    static int      textsw_field_event();
+-    static int      textsw_file_operation();
+-    static int      textsw_erase_action();
+ 
+     int             caret_was_up;
+     int             result = TEXTSW_PE_USED;
diff --git a/x11/xview-lib/patches/patch-de b/x11/xview-lib/patches/patch-de
index 51310191f4e..4db16028a93 100644
--- a/x11/xview-lib/patches/patch-de
+++ b/x11/xview-lib/patches/patch-de
@@ -1,7 +1,7 @@
-$NetBSD: patch-de,v 1.3 2006/01/05 18:25:57 joerg Exp $
+$NetBSD: patch-de,v 1.4 2007/05/12 00:22:17 tnn Exp $
 
---- lib/libxview/textsw/es_file.c.orig	1993-06-29 05:17:34.000000000 +0000
-+++ lib/libxview/textsw/es_file.c
+--- ./lib/libxview/textsw/es_file.c.orig	1993-06-29 07:17:34.000000000 +0200
++++ ./lib/libxview/textsw/es_file.c
 @@ -85,18 +85,15 @@ static char     sccsid[] = "@(#)es_file.
  
  #include <string.h>
@@ -63,6 +63,15 @@ $NetBSD: patch-de,v 1.3 2006/01/05 18:25:57 joerg Exp $
  
      if (status == 0)
  	status = &dummy_status;
+@@ -473,7 +486,7 @@ Error_Return:
+ }
+ 
+ /* ARGSUSED */
+-static          caddr_t
++caddr_t
+ #ifdef ANSI_FUNC_PROTO
+ es_file_get(Es_handle esh, Es_attribute attribute, ...)
+ #else
 @@ -1146,9 +1159,16 @@ es_file_copy_status(esh, to)
      Es_file_data    private = ABS_TO_REP(esh);
      int             dummy;
diff --git a/x11/xview-lib/patches/patch-dj b/x11/xview-lib/patches/patch-dj
index b203fdf7c10..02f8bb4a1e8 100644
--- a/x11/xview-lib/patches/patch-dj
+++ b/x11/xview-lib/patches/patch-dj
@@ -1,8 +1,8 @@
-$NetBSD: patch-dj,v 1.2 2006/01/05 18:25:57 joerg Exp $
+$NetBSD: patch-dj,v 1.3 2007/05/12 00:22:17 tnn Exp $
 
---- lib/libxview/file_chooser/file_list.c.orig	Tue Jun 29 07:17:56 1993
-+++ lib/libxview/file_chooser/file_list.c	Thu Dec 20 10:09:16 2001
-@@ -23,6 +23,9 @@
+--- lib/libxview/file_chooser/file_list.c.orig	1993-06-29 07:17:56.000000000 +0200
++++ lib/libxview/file_chooser/file_list.c
+@@ -23,6 +23,9 @@ static char     sccsid[] = "@(#)file_lis
  #include <xview_private/flist_impl.h>
  #include <xview_private/portable.h>
  
@@ -12,7 +12,7 @@ $NetBSD: patch-dj,v 1.2 2006/01/05 18:25:57 joerg Exp $
  
  
  /* X bitmaps for default glyphs */
-@@ -41,6 +44,7 @@
+@@ -41,6 +44,7 @@ static int		go_down_one_directory();
  static int		flist_list_notify();
  static int		validate_new_directory();
  static void		flist_new_dir();
@@ -20,19 +20,19 @@ $NetBSD: patch-dj,v 1.2 2006/01/05 18:25:57 joerg Exp $
  
  #if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)
  static void	flist_error(File_list_private *private, char *format, ...);
-@@ -521,7 +525,11 @@
+@@ -521,7 +525,11 @@ file_list_destroy ( public, status )
      if (status == DESTROY_CLEANUP) {
  	xv_free_ref( private->directory );
  	xv_free_ref( private->regex_pattern );
 +#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
  	xv_free_ref( private->regex_compile );
 +#else
-+	xv_free_regex_t( (regex_t *)private->regex_compile );
++	xv_free_regex_t( private->regex_compile );
 +#endif
  	xv_free_ref( private->dotdot_string );
  	if ( private->dir_ptr )
  	    (void) closedir( private->dir_ptr );
-@@ -1174,14 +1182,16 @@
+@@ -1174,14 +1182,16 @@ static char	*compile();
  static int 	step();
  #endif /* SVR4 */
  
@@ -50,7 +50,7 @@ $NetBSD: patch-dj,v 1.2 2006/01/05 18:25:57 joerg Exp $
      char compile_buf[MAXPATHLEN+1];
      char *end_ptr;
      size_t num_bytes;
-@@ -1197,6 +1207,17 @@
+@@ -1197,6 +1207,17 @@ flist_compile_regex( private )
      xv_free_ref( private->regex_compile );
      private->regex_compile = xv_alloc_n(char, num_bytes);
      (void) XV_BCOPY(compile_buf, private->regex_compile, num_bytes);
@@ -61,14 +61,14 @@ $NetBSD: patch-dj,v 1.2 2006/01/05 18:25:57 joerg Exp $
 +      exit(-1);
 +    } 
 +    regcomp(compile_buf, private->regex_pattern, 0);
-+    xv_free_regex_t((regex_t *)private->regex_compile);
++    xv_free_regex_t(private->regex_compile);
 +    private->regex_compile = (char *)compile_buf;
 +#endif
 +
  } 
  
  
-@@ -1205,7 +1226,11 @@
+@@ -1205,7 +1226,11 @@ flist_match_regex( s, private )
       char *s;
       File_list_private *private;
  {
diff --git a/x11/xview-lib/patches/patch-dk b/x11/xview-lib/patches/patch-dk
index 3b0b9d39aa9..e89d7f43b53 100644
--- a/x11/xview-lib/patches/patch-dk
+++ b/x11/xview-lib/patches/patch-dk
@@ -1,12 +1,12 @@
-$NetBSD: patch-dk,v 1.1 2001/12/20 09:20:07 tron Exp $
+$NetBSD: patch-dk,v 1.2 2007/05/12 00:22:17 tnn Exp $
 
---- lib/libxview/file_chooser/xv_path_util.h.orig	Sun Jun 26 03:05:20 1994
-+++ lib/libxview/file_chooser/xv_path_util.h	Thu Dec 20 10:09:16 2001
+--- lib/libxview/file_chooser/xv_path_util.h.orig	1994-06-26 03:05:20.000000000 +0200
++++ lib/libxview/file_chooser/xv_path_util.h
 @@ -41,6 +41,7 @@
  
  
  #define xv_free_ref(str)	{if((str)) {xv_free((str)); (str) = NULL;}}
-+#define xv_free_regex_t(str)  {if((str)) {regfree((str)); free  ((str)); (str) = NULL;}}
++#define xv_free_regex_t(str)  {if((str)) {regfree(((regex_t*)str)); free((str)); (str) = NULL;}}
  
  
  EXTERN_FUNCTION(void  xv_error_sprintf, (Frame frame, int use_footer, char *format, DOTDOTDOT) );
diff --git a/x11/xview-lib/patches/patch-fb b/x11/xview-lib/patches/patch-fb
new file mode 100644
index 00000000000..51de70a3dae
--- /dev/null
+++ b/x11/xview-lib/patches/patch-fb
@@ -0,0 +1,22 @@
+$NetBSD: patch-fb,v 1.1 2007/05/12 00:22:17 tnn Exp $
+
+--- lib/libxview/base/xv.c.orig	1993-06-29 07:14:41.000000000 +0200
++++ lib/libxview/base/xv.c
+@@ -556,7 +556,7 @@ va_dcl
+ 	case XV_KEY_DATA:
+ 	case XV_IS_SUBTYPE_OF:
+ 	    status = XV_OK;
+-	    args = args_save;
++	    va_copy(args_save, args);
+ 	    result = generic_get(object, &status, (Attr_attribute) attr, args);
+ 	    va_end(args);
+ 	    return result;
+@@ -575,7 +575,7 @@ va_dcl
+ 	 * Go to the beginning of the varargs list every time to insure each
+          * pkg gets the start of the  varargs.
+ 	 */
+-        args = args_save;
++	 va_copy(args, args_save);
+ 
+ 	/* ask the object to handle the get */
+ 	result = (*(pkg->get)) (object, &status, (Attr_attribute) attr, args);
diff --git a/x11/xview-lib/patches/patch-fc b/x11/xview-lib/patches/patch-fc
new file mode 100644
index 00000000000..03e90191c86
--- /dev/null
+++ b/x11/xview-lib/patches/patch-fc
@@ -0,0 +1,13 @@
+$NetBSD: patch-fc,v 1.1 2007/05/12 00:22:17 tnn Exp $
+
+--- lib/libxview/io_stream/input.c.orig	1993-06-29 07:15:05.000000000 +0200
++++ lib/libxview/io_stream/input.c
+@@ -22,7 +22,7 @@ static char     sccsid[] = "@(#)input.c 
+ 		XV_MSG("input stream not of type input"), 0); \
+ 	ops = in->ops.input_ops
+ 
+-char	*stream_getstring();
++static char	*stream_getstring();
+ 
+ /* GENERIC INPUT FUNCTIONS */
+ 
diff --git a/x11/xview-lib/patches/patch-fd b/x11/xview-lib/patches/patch-fd
new file mode 100644
index 00000000000..38f950c06ba
--- /dev/null
+++ b/x11/xview-lib/patches/patch-fd
@@ -0,0 +1,20 @@
+$NetBSD: patch-fd,v 1.1 2007/05/12 00:22:17 tnn Exp $
+
+--- ./lib/libxview/dnd/dnd_dsdm.c.orig	1993-06-29 07:16:00.000000000 +0200
++++ ./lib/libxview/dnd/dnd_dsdm.c
+@@ -26,6 +26,7 @@ static char     sccsid[] = "@(#)dnd_dsdm
+ 			(dnd->siteRects[i].screen_number == dnd->screenNumber)
+ 
+ Xv_private int DndSendPreviewEvent();
++static void	ReplyProc();
+ 
+ 
+ Xv_private int
+@@ -40,7 +41,6 @@ DndContactDSDM(dnd)
+     if (!dnd->sel) {
+         Xv_object  	owner,
+     			server;
+-    	static void	ReplyProc();
+ 
+     	owner = (Xv_object)xv_get(DND_PUBLIC(dnd), XV_OWNER);
+ 
diff --git a/x11/xview-lib/patches/patch-fe b/x11/xview-lib/patches/patch-fe
new file mode 100644
index 00000000000..07485668711
--- /dev/null
+++ b/x11/xview-lib/patches/patch-fe
@@ -0,0 +1,15 @@
+$NetBSD: patch-fe,v 1.1 2007/05/12 00:22:17 tnn Exp $
+
+--- ./lib/libxview/attr/attr.c.orig	1993-06-29 07:14:36.000000000 +0200
++++ ./lib/libxview/attr/attr.c
+@@ -91,8 +91,8 @@ Xv_private Attr_avlist copy_va_to_av( va
+    /* These two variables are used instead of the paramters so that the
+       position in the lists is maintained after a recursive call. 
+    */
+-   valist = valist1;
+-   avlist = avlist1;
++   va_copy(valist, valist1);
++   va_copy(avlist, avlist1);
+ 
+    if( !avlist )
+       avlist = avlist_tmp;
diff --git a/x11/xview-lib/patches/patch-ff b/x11/xview-lib/patches/patch-ff
new file mode 100644
index 00000000000..07c380d83a3
--- /dev/null
+++ b/x11/xview-lib/patches/patch-ff
@@ -0,0 +1,13 @@
+$NetBSD: patch-ff,v 1.1 2007/05/12 00:22:17 tnn Exp $
+
+--- ./lib/libxview/misc/quark.c.orig	1993-06-29 07:16:31.000000000 +0200
++++ ./lib/libxview/misc/quark.c
+@@ -16,7 +16,7 @@ static char     sccsid[] = "@(#) quark.c
+ #include  <xview/xview.h>
+ #include  <xview/pkg.h>
+ 
+-Xv_opaque resource_type_conv();
++static Xv_opaque resource_type_conv();
+ 
+ /* 
+  *    Utilities to deal with quark lists and such.
diff --git a/x11/xview-lib/patches/patch-fg b/x11/xview-lib/patches/patch-fg
new file mode 100644
index 00000000000..0b57009eef7
--- /dev/null
+++ b/x11/xview-lib/patches/patch-fg
@@ -0,0 +1,21 @@
+$NetBSD: patch-fg,v 1.1 2007/05/12 00:22:18 tnn Exp $
+
+--- ./lib/libxview/window/window_set.c.orig	1993-06-29 07:15:47.000000000 +0200
++++ ./lib/libxview/window/window_set.c
+@@ -960,6 +960,8 @@ window_set_avlist_tier2(win_public, attr
+     return(error);
+ }
+ 
++static void                   	 window_set_softkey_labels();
++
+ static     Xv_opaque
+ window_set_avlist_tier3(win_public, attrs, error, new_rect, old_rect, win_attrs, win_attrs_mask)
+     Xv_Window			 win_public;
+@@ -1072,7 +1074,6 @@ window_set_avlist_tier3(win_public, attr
+ 
+       case WIN_SOFT_FNKEY_LABELS: {
+         register Xv_Drawable_info 	*info;
+-        static void                   	 window_set_softkey_labels();
+ 
+         DRAWABLE_INFO_MACRO(win_public, info);
+         win->softkey_flag = TRUE;
diff --git a/x11/xview-lib/patches/patch-fh b/x11/xview-lib/patches/patch-fh
new file mode 100644
index 00000000000..900715a7f31
--- /dev/null
+++ b/x11/xview-lib/patches/patch-fh
@@ -0,0 +1,13 @@
+$NetBSD: patch-fh,v 1.1 2007/05/12 00:22:18 tnn Exp $
+
+--- ./lib/libxview/textsw/es_mem.c.orig	1993-06-29 07:17:30.000000000 +0200
++++ ./lib/libxview/textsw/es_mem.c
+@@ -117,7 +117,7 @@ es_mem_destroy(esh)
+ }
+ 
+ /* ARGSUSED */
+-static          caddr_t
++caddr_t
+ #ifdef ANSI_FUNC_PROTO
+ es_mem_get(Es_handle esh, Es_attribute attribute, ...)
+ #else
diff --git a/x11/xview-lib/patches/patch-fi b/x11/xview-lib/patches/patch-fi
new file mode 100644
index 00000000000..0a701224777
--- /dev/null
+++ b/x11/xview-lib/patches/patch-fi
@@ -0,0 +1,21 @@
+$NetBSD: patch-fi,v 1.1 2007/05/12 00:22:18 tnn Exp $
+
+--- lib/libxview/textsw/ev_display.c.orig	1994-06-26 23:11:43.000000000 +0200
++++ lib/libxview/textsw/ev_display.c
+@@ -922,6 +922,8 @@ ev_swap_line_table(table1, table2)
+ }
+ 
+ 
++void     ev_swap_line_table();
++
+ Pkg_private	Es_index
+ ev_scroll_lines(view, line_count, scroll_by_display_lines)
+     register Ev_handle view;
+@@ -940,7 +942,6 @@ ev_scroll_lines(view, line_count, scroll
+ 	register int    i;
+ 	Es_index        pos, pos_to_remember;
+ 	Pkg_private void ev_lt_format();
+-	static void     ev_swap_line_table();
+ 
+ 	esbuf.esh = chain->esh;
+ 	esbuf.buf = buf;
diff --git a/x11/xview-lib/patches/patch-fj b/x11/xview-lib/patches/patch-fj
new file mode 100644
index 00000000000..432c74d5447
--- /dev/null
+++ b/x11/xview-lib/patches/patch-fj
@@ -0,0 +1,23 @@
+$NetBSD: patch-fj,v 1.1 2007/05/12 00:22:18 tnn Exp $
+
+--- lib/libxview/textsw/txt_menu.c.orig	1994-06-26 03:05:22.000000000 +0200
++++ lib/libxview/textsw/txt_menu.c
+@@ -127,6 +127,9 @@ static Defaults_pairs line_break_pairs[]
+ };
+ 
+ 
++static int textsw_edit_do_menu_action();
++static int textsw_view_do_menu_action();
++static int textsw_find_do_menu_action();
+ 
+ /* VARARGS0 */
+ static void
+@@ -140,8 +143,6 @@ textsw_new_menu(folio)
+     Frame           frame = xv_get(textsw, WIN_FRAME);
+     Menu_item       break_mode_item, undo_cmds_item, find_sel_cmds_item,
+                     select_field_cmds_item;
+-    static int      textsw_edit_do_menu_action(), textsw_view_do_menu_action(),
+-                    textsw_find_do_menu_action();
+     int             index;
+     Pkg_private char *textsw_get_extras_filename();
+     Pkg_private int textsw_build_extras_menu_items();
diff --git a/x11/xview-lib/patches/patch-fk b/x11/xview-lib/patches/patch-fk
new file mode 100644
index 00000000000..84f8932a9a5
--- /dev/null
+++ b/x11/xview-lib/patches/patch-fk
@@ -0,0 +1,20 @@
+$NetBSD: patch-fk,v 1.1 2007/05/12 00:22:18 tnn Exp $
+
+--- lib/libxview/textsw/txt_field.c.orig	1993-06-29 07:17:50.000000000 +0200
++++ lib/libxview/textsw/txt_field.c
+@@ -121,7 +121,6 @@ check_selection(buf, buf_len, first, las
+ 		    CHAR            marker2[3];
+ 		    int             marker2_len;
+ 		    unsigned        direction;
+-		    static void     textsw_get_match_symbol();
+ 
+ 		    buf = buf + (buf_len - marker1_len);
+ 		    (void) textsw_get_match_symbol(marker1, marker1_len,
+@@ -152,7 +151,6 @@ check_selection(buf, buf_len, first, las
+ 		    CHAR            marker2[3];
+ 		    int             marker2_len;
+ 		    unsigned        direction;
+-		    static void     textsw_get_match_symbol();
+ 
+ 		    (void) textsw_get_match_symbol(marker1, marker1_len,
+ 					 marker2, &marker2_len, &direction);