no fix, just regen patches

2010-05-28 01:13:54 +00:00 · 2010-05-28 01:13:54 +00:00 · ee09d91d5b
commit ee09d91d5b
parent 5498f3d480
64 changed files with 216 additions and 215 deletions
--- a/x11/xview/config/patches/p-Imakefile
+++ b/x11/xview/config/patches/p-Imakefile
@ -1,5 +1,5 @@
--- Imakefile.orig	1994-06-26 03:47:22.000000000 +0200
-+++ Imakefile	2003-12-30 01:58:47.000000000 +0100
+--- Imakefile.orig	Sun Jun 26 03:47:22 1994
+++ Imakefile	Sun May 23 14:16:14 2010
@@ -1,8 +1,8 @@
 #include <XView.tmpl>
 
@ -44,7 +44,7 @@
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
 PopulateSubdirs($(SUBDIRS))
-@@ -36,14 +36,14 @@ MakeLintSubdirs(lib,install.ln,install.l
+@@ -36,14 +36,14 @@ MakeLintSubdirs(lib,install.ln,install.ln)
 InstallSrcsSubdirs($(SUBDIRS))
 
 #ifdef XVDestDir
--- a/x11/xview/config/patches/p-cmdtool-Imakefile
+++ b/x11/xview/config/patches/p-cmdtool-Imakefile
@ -1,5 +1,5 @@
--- clients/cmdtool/Imakefile.orig	1993-06-29 07:12:08.000000000 +0200
-+++ clients/cmdtool/Imakefile	2003-12-30 01:51:03.000000000 +0100
+--- clients/cmdtool/Imakefile.orig	Tue Jun 29 07:12:08 1993
+++ clients/cmdtool/Imakefile	Sun May 23 14:16:14 2010
@@ -1,8 +1,8 @@
 #include <XView.tmpl>
 
@ -12,7 +12,7 @@
 
 DEFINES = -DSTANDALONE  $(XVCLIENTDEFINES)
 INCLUDES = -I$(HEADER_DEST) -I$(TOP) $(XVCLIENTINCLUDES)
-@@ -20,7 +20,7 @@ ALLFILES = ${HEADERS} ${INFOFILES} ${MAN
+@@ -20,7 +20,7 @@ ALLFILES = ${HEADERS} ${INFOFILES} ${MANPAGES} ${ICONS
 
 ComplexProgramTarget(cmdtool)
 
--- a/x11/xview/config/patches/p-config-XView_lib
+++ b/x11/xview/config/patches/p-config-XView_lib
@ -1,5 +1,5 @@
--- config/XView.lib.orig	1993-06-29 07:13:20.000000000 +0200
-+++ config/XView.lib	2003-12-30 02:07:36.000000000 +0100
+--- config/XView.lib.orig	Tue Jun 29 07:13:20 1993
+++ config/XView.lib	Sun May 23 14:16:14 2010
@@ -1,12 +1,12 @@
 -/**/##########################################################################
 -/**/# @(#)XView.lib	1.3 07 Jan 1992 SMI
@ -17,7 +17,7 @@
 
 #if DebugLibXView
 InstallLibraryNoBuild(${LIBTARGET}_d,$(LIBRARY_DEST))
-@@ -29,7 +29,7 @@ InstallSharedLibraryDataNoBuild(${LIBTAR
+@@ -29,7 +29,7 @@ InstallSharedLibraryDataNoBuild(${LIBTARGET},${SOREV},
 InstallSharedLibraryNoBuild(${LIBTARGET},${SOREV},$(LIBRARY_DEST))
 #endif
 
--- a/x11/xview/config/patches/p-config-XView_obj
+++ b/x11/xview/config/patches/p-config-XView_obj
@ -1,5 +1,5 @@
--- config/XView.obj.orig	1993-06-29 07:13:20.000000000 +0200
-+++ config/XView.obj	2003-12-30 02:25:28.000000000 +0100
+--- config/XView.obj.orig	Tue Jun 29 07:13:20 1993
+++ config/XView.obj	Sun May 23 14:16:14 2010
@@ -1,6 +1,6 @@
 -/**/###########################################################################
 -/**/# @(#)XView.obj	1.6 28 Jun 1993 SMI
@ -48,7 +48,7 @@
 
 InstallMultiple($(HDRSPUBLIC),$(XVPUB_HEADER_DEST))
 # endif
-@@ -103,19 +103,19 @@ InstallMultiple($(HDRSPUBLIC),$(XVPUB_HE
+@@ -103,19 +103,19 @@ InstallMultiple($(HDRSPUBLIC),$(XVPUB_HEADER_DEST))
 
 #if SubdirHasPrivateHeaders
 # if NotLibXView
--- a/x11/xview/config/patches/p-doc-Imakefile
+++ b/x11/xview/config/patches/p-doc-Imakefile
@ -1,5 +1,5 @@
--- doc/Imakefile.orig	1993-06-29 07:13:15.000000000 +0200
-+++ doc/Imakefile	2003-12-30 01:51:44.000000000 +0100
+--- doc/Imakefile.orig	Tue Jun 29 07:13:15 1993
+++ doc/Imakefile	Sun May 23 14:16:14 2010
@@ -1,8 +1,8 @@
 #include <XView.tmpl>
 
@ -12,7 +12,7 @@
 
 #define IHaveSubdirs 
 #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
-@@ -17,7 +17,7 @@ DOCFILES = xview-info olgx_api.txt olgx_
+@@ -17,7 +17,7 @@ DOCFILES = xview-info olgx_api.txt olgx_api.ps sel_api
 ALLFILES = $(DOCFILES)
 
 install::
--- a/x11/xview/config/patches/p-lib_libxview_attr_attr_c
+++ b/x11/xview/config/patches/p-lib_libxview_attr_attr_c
@ -1,6 +1,6 @@
--- lib/libxview/attr/attr.c.orig	1993-06-29 07:14:36.000000000 +0200
-+++ lib/libxview/attr/attr.c	2004-03-10 17:47:04.000000000 +0100
-@@ -91,7 +91,7 @@ Xv_private Attr_avlist copy_va_to_av( va
+--- lib/libxview/attr/attr.c.orig	Tue Jun 29 07:14:36 1993
+++ lib/libxview/attr/attr.c	Sun May 23 14:16:14 2010
+@@ -91,7 +91,7 @@ Xv_private Attr_avlist copy_va_to_av( valist1, avlist1
    /* These two variables are used instead of the paramters so that the
       position in the lists is maintained after a recursive call. 
    */
--- a/x11/xview/config/patches/p-lib_libxview_dnd_site_impl_h
+++ b/x11/xview/config/patches/p-lib_libxview_dnd_site_impl_h
@ -1,7 +1,7 @@
-$OpenBSD: p-lib_libxview_dnd_site_impl_h,v 1.1 2003/12/30 02:00:39 espie Exp $
--- lib/libxview/dnd/site_impl.h.orig	2003-12-30 02:54:00.000000000 +0100
-+++ lib/libxview/dnd/site_impl.h	2003-12-30 02:54:06.000000000 +0100
-@@ -81,4 +81,4 @@ Pkg_private Xv_opaque	dnd_site_set_avlis
+$OpenBSD: p-lib_libxview_dnd_site_impl_h,v 1.2 2010/05/28 01:13:54 espie Exp $
+--- lib/libxview/dnd/site_impl.h.orig	Tue Jun 29 07:15:58 1993
+++ lib/libxview/dnd/site_impl.h	Sun May 23 14:16:14 2010
+@@ -81,4 +81,4 @@ Pkg_private Xv_opaque	dnd_site_set_avlist();
 Pkg_private Xv_opaque	dnd_site_get_attr();
 Pkg_private int		dnd_site_destroy();
 
--- a/x11/xview/config/patches/p-libxview-attr-attr_copy_c
+++ b/x11/xview/config/patches/p-libxview-attr-attr_copy_c
@ -1,6 +1,6 @@
--- lib/libxview/attr/attr_copy.c.orig	1993-06-29 07:14:35.000000000 +0200
-+++ lib/libxview/attr/attr_copy.c	2003-12-30 01:31:11.000000000 +0100
-@@ -12,6 +12,11 @@ static char     sccsid[] = "@(#)attr_cop
+--- lib/libxview/attr/attr_copy.c.orig	Tue Jun 29 07:14:35 1993
+++ lib/libxview/attr/attr_copy.c	Sun May 23 14:16:14 2010
+@@ -12,6 +12,11 @@ static char     sccsid[] = "@(#)attr_copy.c 20.14 93/0
 
 #include <xview/attr.h>
 
--- a/x11/xview/config/patches/p-libxview-base-xv_error_c
+++ b/x11/xview/config/patches/p-libxview-base-xv_error_c
@ -1,6 +1,6 @@
--- lib/libxview/base/xv_error.c.orig	1993-06-29 07:14:42.000000000 +0200
-+++ lib/libxview/base/xv_error.c	2003-12-30 01:31:11.000000000 +0100
-@@ -11,6 +11,7 @@ static char     sccsid[] = "@(#)xv_error
+--- lib/libxview/base/xv_error.c.orig	Tue Jun 29 07:14:42 1993
+++ lib/libxview/base/xv_error.c	Sun May 23 14:16:14 2010
+@@ -11,6 +11,7 @@ static char     sccsid[] = "@(#)xv_error.c 1.36 93/06/
  */
 
 #include <stdio.h>
--- a/x11/xview/config/patches/p-libxview-dnd-site_c
+++ b/x11/xview/config/patches/p-libxview-dnd-site_c
@ -1,6 +1,6 @@
--- lib/libxview/dnd/site.c.orig	1993-06-29 07:15:58.000000000 +0200
-+++ lib/libxview/dnd/site.c	2003-12-30 01:31:12.000000000 +0100
-@@ -19,6 +19,7 @@ static char     sccsid[] = "@(#)site.c 1
+--- lib/libxview/dnd/site.c.orig	Tue Jun 29 07:15:58 1993
+++ lib/libxview/dnd/site.c	Sun May 23 14:16:14 2010
+@@ -19,6 +19,7 @@ static char     sccsid[] = "@(#)site.c 1.13 93/06/28";
 #ifdef SVR4 
 #include <stdlib.h> 
 #endif SVR4
--- a/x11/xview/config/patches/p-libxview-file_chooser-Imakefile
+++ b/x11/xview/config/patches/p-libxview-file_chooser-Imakefile
@ -1,5 +1,5 @@
--- lib/libxview/file_chooser/Imakefile.orig	1993-06-29 07:17:58.000000000 +0200
-+++ lib/libxview/file_chooser/Imakefile	2003-12-30 01:58:09.000000000 +0100
+--- lib/libxview/file_chooser/Imakefile.orig	Tue Jun 29 07:17:58 1993
+++ lib/libxview/file_chooser/Imakefile	Sun May 23 14:16:14 2010
@@ -6,8 +6,8 @@
 #include <Library.tmpl>
 
@ -11,7 +11,7 @@
 
 #ifndef SubdirHasTextObjs
 #define SubdirHasTextObjs YES
-@@ -27,35 +27,35 @@ HDRSPRIVATE=	fchsr_impl.h flist_impl.h x
+@@ -27,35 +27,35 @@ HDRSPRIVATE=	fchsr_impl.h flist_impl.h xv_path_util.h 
 		path_impl.h hist_impl.h
 
 DATA_OBJS = fchsr_data.o\
--- a/x11/xview/config/patches/p-libxview-file_chooser-file_list_c
+++ b/x11/xview/config/patches/p-libxview-file_chooser-file_list_c
@ -1,6 +1,6 @@
--- lib/libxview/file_chooser/file_list.c.orig	1993-06-29 07:17:56.000000000 +0200
-+++ lib/libxview/file_chooser/file_list.c	2003-12-30 01:31:12.000000000 +0100
-@@ -23,6 +23,9 @@ static char     sccsid[] = "@(#)file_lis
+--- lib/libxview/file_chooser/file_list.c.orig	Tue Jun 29 07:17:56 1993
+++ lib/libxview/file_chooser/file_list.c	Sun May 23 14:16:14 2010
+@@ -23,6 +23,9 @@ static char     sccsid[] = "@(#)file_list.c 1.30 93/06
 #include <xview_private/flist_impl.h>
 #include <xview_private/portable.h>
 
--- a/x11/xview/config/patches/p-libxview-filter-filter_c
+++ b/x11/xview/config/patches/p-libxview-filter-filter_c
@ -1,6 +1,6 @@
--- lib/libxview/filter/filter.c.orig	1993-06-29 07:14:57.000000000 +0200
-+++ lib/libxview/filter/filter.c	2003-12-30 01:31:12.000000000 +0100
-@@ -39,11 +39,12 @@ static char     sccsid[] = "@(#)filter.c
+--- lib/libxview/filter/filter.c.orig	Tue Jun 29 07:14:57 1993
+++ lib/libxview/filter/filter.c	Sun May 23 14:16:14 2010
+@@ -39,12 +39,13 @@ static char     sccsid[] = "@(#)filter.c 20.28 93/06/2
 
 char           *stream_fgets();
 
@ -10,12 +10,13 @@
 -struct CharAction
 +static struct CharAction
                 digits();
-
 +static
 +		any_shell_meta();
 
+-
 struct filter_rec **
 xv_parse_filter_table(in, filename)
+     STREAM         *in;
@@ -203,10 +204,10 @@ xv_free_filter_table(table)
 {
     int             i;
--- a/x11/xview/config/patches/p-libxview-font-font_c
+++ b/x11/xview/config/patches/p-libxview-font-font_c
@ -1,6 +1,6 @@
--- lib/libxview/font/font.c.orig	1993-06-29 07:15:01.000000000 +0200
-+++ lib/libxview/font/font.c	2003-12-30 01:31:12.000000000 +0100
-@@ -67,6 +67,10 @@ Xv_private char *xv_font_regular_cmdline
+--- lib/libxview/font/font.c.orig	Tue Jun 29 07:15:01 1993
+++ lib/libxview/font/font.c	Sun May 23 14:16:14 2010
+@@ -67,6 +67,10 @@ Xv_private char *xv_font_regular_cmdline();
 Xv_private char *xv_font_scale_cmdline();
 Xv_private char *xv_font_scale();
 
--- a/x11/xview/config/patches/p-libxview-frame-fm_get_c
+++ b/x11/xview/config/patches/p-libxview-frame-fm_get_c
@ -1,6 +1,6 @@
--- lib/libxview/frame/fm_get.c.orig	1993-06-29 07:16:10.000000000 +0200
-+++ lib/libxview/frame/fm_get.c	2003-12-30 01:31:12.000000000 +0100
-@@ -10,6 +10,7 @@ static char     sccsid[] = "@(#)fm_get.c
+--- lib/libxview/frame/fm_get.c.orig	Tue Jun 29 07:16:10 1993
+++ lib/libxview/frame/fm_get.c	Sun May 23 14:16:14 2010
+@@ -10,6 +10,7 @@ static char     sccsid[] = "@(#)fm_get.c 20.62 93/06/2
  *	file for terms of the license.
  */
 
--- a/x11/xview/config/patches/p-libxview-frame-fm_impl_h
+++ b/x11/xview/config/patches/p-libxview-frame-fm_impl_h
@ -1,6 +1,6 @@
--- lib/libxview/frame/fm_impl.h.orig	1993-06-29 07:16:15.000000000 +0200
-+++ lib/libxview/frame/fm_impl.h	2003-12-30 01:31:12.000000000 +0100
-@@ -17,11 +17,16 @@ static char     sccsid[] = "@(#)fm_impl.
+--- lib/libxview/frame/fm_impl.h.orig	Tue Jun 29 07:16:15 1993
+++ lib/libxview/frame/fm_impl.h	Sun May 23 14:16:14 2010
+@@ -17,11 +17,16 @@ static char     sccsid[] = "@(#)fm_impl.h 20.64 93/06/
 #define _frame_impl_h_already_included
 
 /* standard includes */
--- a/x11/xview/config/patches/p-libxview-frame-fmcmd_set_c
+++ b/x11/xview/config/patches/p-libxview-frame-fmcmd_set_c
@ -1,6 +1,6 @@
--- lib/libxview/frame/fmcmd_set.c.orig	1993-06-29 07:16:07.000000000 +0200
-+++ lib/libxview/frame/fmcmd_set.c	2003-12-30 01:31:12.000000000 +0100
-@@ -18,6 +18,8 @@ static char     sccsid[] = "@(#)fmcmd_se
+--- lib/libxview/frame/fmcmd_set.c.orig	Tue Jun 29 07:16:07 1993
+++ lib/libxview/frame/fmcmd_set.c	Sun May 23 14:16:14 2010
+@@ -18,6 +18,8 @@ static char     sccsid[] = "@(#)fmcmd_set.c 1.46 93/06
 #include <xview/panel.h>
 #include <xview/server.h>
 
--- a/x11/xview/config/patches/p-libxview-frame-frame_base_h
+++ b/x11/xview/config/patches/p-libxview-frame-frame_base_h
@ -1,6 +1,6 @@
--- lib/libxview/frame/frame_base.h.orig	1993-06-29 07:16:14.000000000 +0200
-+++ lib/libxview/frame/frame_base.h	2003-12-30 01:31:12.000000000 +0100
-@@ -17,11 +17,16 @@ static char     sccsid[] = "@(#)frame_ba
+--- lib/libxview/frame/frame_base.h.orig	Tue Jun 29 07:16:14 1993
+++ lib/libxview/frame/frame_base.h	Sun May 23 14:16:14 2010
+@@ -17,11 +17,16 @@ static char     sccsid[] = "@(#)frame_base.h 1.30 93/0
 #define _frame_base_h_already_included
 
 /* standard includes */
--- a/x11/xview/config/patches/p-libxview-frame-frame_cmd_h
+++ b/x11/xview/config/patches/p-libxview-frame-frame_cmd_h
@ -1,6 +1,6 @@
--- lib/libxview/frame/frame_cmd.h.orig	1993-06-29 07:16:14.000000000 +0200
-+++ lib/libxview/frame/frame_cmd.h	2003-12-30 01:31:12.000000000 +0100
-@@ -17,11 +17,16 @@ static char     sccsid[] = "@(#)frame_cm
+--- lib/libxview/frame/frame_cmd.h.orig	Tue Jun 29 07:16:14 1993
+++ lib/libxview/frame/frame_cmd.h	Sun May 23 14:16:14 2010
+@@ -17,11 +17,16 @@ static char     sccsid[] = "@(#)frame_cmd.h 1.39 93/06
 #define _frame_cmd_h_already_included
 
 /* standard includes */
--- a/x11/xview/config/patches/p-libxview-frame-frame_help_h
+++ b/x11/xview/config/patches/p-libxview-frame-frame_help_h
@ -1,6 +1,6 @@
--- lib/libxview/frame/frame_help.h.orig	1993-06-29 07:16:10.000000000 +0200
-+++ lib/libxview/frame/frame_help.h	2003-12-30 01:31:12.000000000 +0100
-@@ -17,11 +17,16 @@ static char     sccsid[] = "@(#)frame_he
+--- lib/libxview/frame/frame_help.h.orig	Tue Jun 29 07:16:10 1993
+++ lib/libxview/frame/frame_help.h	Sun May 23 14:16:14 2010
+@@ -17,11 +17,16 @@ static char     sccsid[] = "@(#)frame_help.h 1.27 93/0
 #define _frame_help_h_already_included
 
 /* standard includes */
--- a/x11/xview/config/patches/p-libxview-io_stream-file_strms_c
+++ b/x11/xview/config/patches/p-libxview-io_stream-file_strms_c
@ -1,6 +1,6 @@
--- lib/libxview/io_stream/file_strms.c.orig	1993-06-29 07:15:07.000000000 +0200
-+++ lib/libxview/io_stream/file_strms.c	2003-12-30 01:31:12.000000000 +0100
-@@ -17,7 +17,11 @@ static char     sccsid[] = "@(#)file_str
+--- lib/libxview/io_stream/file_strms.c.orig	Tue Jun 29 07:15:07 1993
+++ lib/libxview/io_stream/file_strms.c	Sun May 23 14:16:14 2010
+@@ -17,7 +17,11 @@ static char     sccsid[] = "@(#)file_strms.c 20.18 93/
 
 #define GetFISData struct xv_file_input_stream_data *data = (struct xv_file_input_stream_data*) in->client_data
 
--- a/x11/xview/config/patches/p-libxview-io_stream-othr_strms_c
+++ b/x11/xview/config/patches/p-libxview-io_stream-othr_strms_c
@ -1,6 +1,6 @@
--- lib/libxview/io_stream/othr_strms.c.orig	1993-06-29 07:15:05.000000000 +0200
-+++ lib/libxview/io_stream/othr_strms.c	2003-12-30 01:31:12.000000000 +0100
-@@ -17,7 +17,11 @@ static char     sccsid[] = "@(#)othr_str
+--- lib/libxview/io_stream/othr_strms.c.orig	Tue Jun 29 07:15:05 1993
+++ lib/libxview/io_stream/othr_strms.c	Sun May 23 14:16:14 2010
+@@ -17,7 +17,11 @@ static char     sccsid[] = "@(#)othr_strms.c 20.20 93/
 
 #define GetFCSData struct xv_filter_comments_stream_data *data = (struct xv_filter_comments_stream_data*) in->client_data
 
--- a/x11/xview/config/patches/p-libxview-io_stream-str_strms_c
+++ b/x11/xview/config/patches/p-libxview-io_stream-str_strms_c
@ -1,6 +1,6 @@
--- lib/libxview/io_stream/str_strms.c.orig	1993-06-29 07:15:06.000000000 +0200
-+++ lib/libxview/io_stream/str_strms.c	2003-12-30 01:31:12.000000000 +0100
-@@ -17,7 +17,11 @@ static char     sccsid[] = "@(#)str_strm
+--- lib/libxview/io_stream/str_strms.c.orig	Tue Jun 29 07:15:06 1993
+++ lib/libxview/io_stream/str_strms.c	Sun May 23 14:16:14 2010
+@@ -17,7 +17,11 @@ static char     sccsid[] = "@(#)str_strms.c 20.17 93/0
 
 #define GetSISData struct string_input_stream_data	*data = (struct string_input_stream_data*) in->client_data
 
--- a/x11/xview/config/patches/p-libxview-menu-om_set_c
+++ b/x11/xview/config/patches/p-libxview-menu-om_set_c
@ -1,6 +1,6 @@
--- lib/libxview/menu/om_set.c.orig	1993-06-29 07:16:24.000000000 +0200
-+++ lib/libxview/menu/om_set.c	2003-12-30 01:31:12.000000000 +0100
-@@ -12,6 +12,7 @@ static char     sccsid[] = "@(#)om_set.c
+--- lib/libxview/menu/om_set.c.orig	Tue Jun 29 07:16:24 1993
+++ lib/libxview/menu/om_set.c	Sun May 23 14:16:14 2010
+@@ -12,6 +12,7 @@ static char     sccsid[] = "@(#)om_set.c 20.96 93/06/2
 
 /* --------------------------------------------------------------------- */
 #include <sys/types.h>
--- a/x11/xview/config/patches/p-libxview-misc-getlogindr_c
+++ b/x11/xview/config/patches/p-libxview-misc-getlogindr_c
@ -1,6 +1,6 @@
--- lib/libxview/misc/getlogindr.c.orig	1993-06-29 07:16:30.000000000 +0200
-+++ lib/libxview/misc/getlogindr.c	2003-12-30 01:31:12.000000000 +0100
-@@ -17,6 +17,7 @@ static char     sccsid[] = "@(#)getlogin
+--- lib/libxview/misc/getlogindr.c.orig	Tue Jun 29 07:16:30 1993
+++ lib/libxview/misc/getlogindr.c	Sun May 23 14:16:14 2010
+@@ -17,6 +17,7 @@ static char     sccsid[] = "@(#)getlogindr.c 20.18 93/
 
 #include <stdio.h>
 #include <pwd.h>
--- a/x11/xview/config/patches/p-libxview-misc-portable_h
+++ b/x11/xview/config/patches/p-libxview-misc-portable_h
@ -1,5 +1,5 @@
--- lib/libxview/misc/portable.h.orig	1993-06-29 07:16:34.000000000 +0200
-+++ lib/libxview/misc/portable.h	2003-12-30 01:31:12.000000000 +0100
+--- lib/libxview/misc/portable.h.orig	Tue Jun 29 07:16:34 1993
+++ lib/libxview/misc/portable.h	Sun May 23 14:16:14 2010
@@ -10,6 +10,7 @@
 #ifndef xview_portable_h_DEFINED
 #define xview_portable_h_DEFINED
@ -8,7 +8,7 @@
 #include <xview/attr.h>
 
 #if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)
-@@ -70,7 +71,11 @@ EXTERN_FUNCTION (Attr_avlist copy_va_to_
+@@ -70,7 +71,11 @@ EXTERN_FUNCTION (Attr_avlist copy_va_to_av, (va_list v
 #define	XV_USE_TERMIOS
 #define	XV_USE_SVR4_PTYS
 #else	/* SVR4 */
--- a/x11/xview/config/patches/p-libxview-notice-notice_pt_c
+++ b/x11/xview/config/patches/p-libxview-notice-notice_pt_c
@ -1,6 +1,6 @@
--- lib/libxview/notice/notice_pt.c.orig	1993-06-29 07:16:40.000000000 +0200
-+++ lib/libxview/notice/notice_pt.c	2003-12-30 01:31:12.000000000 +0100
-@@ -58,6 +58,7 @@ static notice_buttons_handle notice_butt
+--- lib/libxview/notice/notice_pt.c.orig	Tue Jun 29 07:16:40 1993
+++ lib/libxview/notice/notice_pt.c	Sun May 23 14:16:14 2010
+@@ -58,6 +58,7 @@ static notice_buttons_handle notice_button_for_event()
 static void     notice_copy_event();
 static Xv_window	notice_get_focus_win();
 static int	notice_show_focus_win();
--- a/x11/xview/config/patches/p-libxview-notify-ndet_fcntl_c
+++ b/x11/xview/config/patches/p-libxview-notify-ndet_fcntl_c
@ -1,6 +1,6 @@
--- lib/libxview/notify/ndet_fcntl.c.orig	1993-06-29 07:18:03.000000000 +0200
-+++ lib/libxview/notify/ndet_fcntl.c	2003-12-30 01:31:12.000000000 +0100
-@@ -17,23 +17,40 @@ static char     sccsid[] = "@(#)ndet_fcn
+--- lib/libxview/notify/ndet_fcntl.c.orig	Tue Jun 29 07:18:03 1993
+++ lib/libxview/notify/ndet_fcntl.c	Sun May 23 14:16:14 2010
+@@ -17,22 +17,39 @@ static char     sccsid[] = "@(#)ndet_fcntl.c 20.13 93/
 
 #include <xview_private/ntfy.h>
 #include <xview_private/ndet.h>
@ -30,7 +30,7 @@
 {
     fd_set          bit;
     int             res;
- 
+
 +#if (defined(BSD) && (BSD >= 199103))
 +    int arg;  
 +    va_list valist;
@ -38,7 +38,6 @@
 +    arg = va_arg(valist, int);
 +    va_end(valist);
 +#endif
-+
+ 
     /* Set fd bit */
     FD_ZERO(&bit);
-     FD_SET(fd, &bit);
--- a/x11/xview/config/patches/p-libxview-notify-ndet_loop_c
+++ b/x11/xview/config/patches/p-libxview-notify-ndet_loop_c
@ -1,6 +1,6 @@
 --- lib/libxview/notify/ndet_loop.c.orig	Tue Jun 29 07:18:19 1993
-+++ lib/libxview/notify/ndet_loop.c	Sun Apr  2 03:32:17 2000
-@@ -14,13 +14,14 @@ static char     sccsid[] = "@(#)ndet_loo
+++ lib/libxview/notify/ndet_loop.c	Sun May 23 14:16:14 2010
+@@ -14,13 +14,14 @@ static char     sccsid[] = "@(#)ndet_loop.c 20.36 93/0
  * Ndet_loop.c - Notification loop.
  */
 
--- a/x11/xview/config/patches/p-libxview-notify-ndet_read_c
+++ b/x11/xview/config/patches/p-libxview-notify-ndet_read_c
@ -1,6 +1,6 @@
--- lib/libxview/notify/ndet_read.c.orig	1993-06-29 07:18:04.000000000 +0200
-+++ lib/libxview/notify/ndet_read.c	2003-12-30 01:31:13.000000000 +0100
-@@ -15,6 +15,7 @@ static char     sccsid[] = "@(#)ndet_rea
+--- lib/libxview/notify/ndet_read.c.orig	Tue Jun 29 07:18:04 1993
+++ lib/libxview/notify/ndet_read.c	Sun May 23 14:16:14 2010
+@@ -15,6 +15,7 @@ static char     sccsid[] = "@(#)ndet_read.c 20.12 93/0
  * not already in the middle of it.
  */
 
--- a/x11/xview/config/patches/p-libxview-notify-ntfy_test_c
+++ b/x11/xview/config/patches/p-libxview-notify-ntfy_test_c
@ -1,5 +1,5 @@
--- lib/libxview/notify/ntfy_test.c.orig	1993-06-29 07:18:12.000000000 +0200
-+++ lib/libxview/notify/ntfy_test.c	2003-12-30 01:31:13.000000000 +0100
+--- lib/libxview/notify/ntfy_test.c.orig	Tue Jun 29 07:18:12 1993
+++ lib/libxview/notify/ntfy_test.c	Sun May 23 14:16:14 2010
@@ -989,7 +989,7 @@ nt_try_send_event(client, cond)
 	    fprintf(stderr, "%s in unknown destroy status\n", arg1);
 	    goto Error;
@ -9,7 +9,7 @@
 	    if (!(status == DESTROY_CHECKING &&
 		  ne == NOTIFY_DESTROY_VETOED)) {
 		notify_perror("notify_destroy");
-@@ -1781,7 +1781,7 @@ nt_prioritizer(nclient, nfd, ibits_ptr, 
+@@ -1781,7 +1781,7 @@ nt_prioritizer(nclient, nfd, ibits_ptr, obits_ptr, ebi
     }
     /* Send only last client event */
     if (*event_count_ptr > 0) {
--- a/x11/xview/config/patches/p-libxview-notify-ntfyclient_c
+++ b/x11/xview/config/patches/p-libxview-notify-ntfyclient_c
@ -1,6 +1,6 @@
--- lib/libxview/notify/ntfyclient.c.orig	1993-06-29 07:18:11.000000000 +0200
-+++ lib/libxview/notify/ntfyclient.c	2003-12-30 01:31:13.000000000 +0100
-@@ -18,7 +18,9 @@ static char     sccsid[] = "@(#)ntfyclie
+--- lib/libxview/notify/ntfyclient.c.orig	Tue Jun 29 07:18:11 1993
+++ lib/libxview/notify/ntfyclient.c	Sun May 23 14:16:14 2010
+@@ -18,7 +18,9 @@ static char     sccsid[] = "@(#)ntfyclient.c 20.18 93/
 #include <xview_private/ntfy.h>
 #include <xview_private/ndis.h>	/* For ndis_default_prioritizer */
 #include <xview_private/ndet.h>	
@ -10,7 +10,7 @@
 #include <xview_private/portable.h>
 
 /* Variables used in paranoid enumerator (see ntfy_condition) */
-@@ -60,6 +62,7 @@ ntfy_find_nclient(client_list, nclient, 
+@@ -60,6 +62,7 @@ ntfy_find_nclient(client_list, nclient, client_latest)
     if (*client_latest && (*client_latest)->nclient == nclient)
 	return (*client_latest);
 
@ -18,7 +18,7 @@
     if(( client_list == ndet_clients ) && ndet_clients ) {
        dummy_client.nclient = nclient;
        /* Find client */
-@@ -73,7 +76,9 @@ ntfy_find_nclient(client_list, nclient, 
+@@ -73,7 +76,9 @@ ntfy_find_nclient(client_list, nclient, client_latest)
            return (client);
        }
     }
@ -29,7 +29,7 @@
     else 
         /* Search entire list */
         for (client = client_list; client; client = next) {
-@@ -100,6 +105,7 @@ ntfy_new_nclient(client_list, nclient, c
+@@ -100,6 +105,7 @@ ntfy_new_nclient(client_list, nclient, client_latest)
     register NTFY_CLIENT *client;
     static NTFY_CLIENT *new_client;
 
@ -37,7 +37,7 @@
     if( client_list == &ndet_clients ) {
         if( new_client  == NTFY_CLIENT_NULL ) {
             if ((new_client = ntfy_alloc_client()) == NTFY_CLIENT_NULL)
-@@ -119,7 +125,9 @@ ntfy_new_nclient(client_list, nclient, c
+@@ -119,7 +125,9 @@ ntfy_new_nclient(client_list, nclient, client_latest)
         else
             return client;
     }
@ -48,7 +48,7 @@
     else if ((client = ntfy_find_nclient(*client_list, nclient,
 				    client_latest)) != NTFY_CLIENT_NULL)
         return client;
-@@ -163,8 +171,10 @@ ntfy_remove_client(client_list, client, 
+@@ -163,8 +171,10 @@ ntfy_remove_client(client_list, client, client_latest,
 	ntfy_remove_condition(client, condition, who);
     }
     /* Remove & free client from client_list */
--- a/x11/xview/config/patches/p-libxview-notify-sys_fcntl_c
+++ b/x11/xview/config/patches/p-libxview-notify-sys_fcntl_c
@ -1,6 +1,6 @@
--- lib/libxview/notify/sys_fcntl.c.orig	1993-06-29 07:18:17.000000000 +0200
-+++ lib/libxview/notify/sys_fcntl.c	2003-12-30 01:31:13.000000000 +0100
-@@ -15,7 +15,11 @@ static char     sccsid[] = "@(#)sys_fcnt
+--- lib/libxview/notify/sys_fcntl.c.orig	Tue Jun 29 07:18:17 1993
+++ lib/libxview/notify/sys_fcntl.c	Sun May 23 14:16:14 2010
+@@ -15,7 +15,11 @@ static char     sccsid[] = "@(#)sys_fcntl.c 20.13 93/0
  */
 
 #ifndef SVR4
--- a/x11/xview/config/patches/p-libxview-notify-sys_read_c
+++ b/x11/xview/config/patches/p-libxview-notify-sys_read_c
@ -1,6 +1,6 @@
--- lib/libxview/notify/sys_read.c.orig	1993-06-29 07:18:01.000000000 +0200
-+++ lib/libxview/notify/sys_read.c	2003-12-30 01:31:13.000000000 +0100
-@@ -15,7 +15,11 @@ static char     sccsid[] = "@(#)sys_read
+--- lib/libxview/notify/sys_read.c.orig	Tue Jun 29 07:18:01 1993
+++ lib/libxview/notify/sys_read.c	Sun May 23 14:16:14 2010
+@@ -15,7 +15,11 @@ static char     sccsid[] = "@(#)sys_read.c 20.13 93/06
  */
 
 #ifndef SVR4
--- a/x11/xview/config/patches/p-libxview-notify-sys_select_c
+++ b/x11/xview/config/patches/p-libxview-notify-sys_select_c
@ -1,6 +1,6 @@
--- lib/libxview/notify/sys_select.c.orig	1993-06-29 07:18:11.000000000 +0200
-+++ lib/libxview/notify/sys_select.c	2003-12-30 01:31:13.000000000 +0100
-@@ -15,7 +15,11 @@ static char     sccsid[] = "@(#)sys_sele
+--- lib/libxview/notify/sys_select.c.orig	Tue Jun 29 07:18:11 1993
+++ lib/libxview/notify/sys_select.c	Sun May 23 14:16:14 2010
+@@ -15,7 +15,11 @@ static char     sccsid[] = "@(#)sys_select.c 20.17 93/
  */
 
 #ifndef SVR4
--- a/x11/xview/config/patches/p-libxview-panel-p_choice_c
+++ b/x11/xview/config/patches/p-libxview-panel-p_choice_c
@ -1,6 +1,6 @@
--- lib/libxview/panel/p_choice.c.orig	1993-06-29 07:16:57.000000000 +0200
-+++ lib/libxview/panel/p_choice.c	2003-12-30 01:31:13.000000000 +0100
-@@ -106,6 +106,10 @@ static void     choice_begin_preview(), 
+--- lib/libxview/panel/p_choice.c.orig	Tue Jun 29 07:16:57 1993
+++ lib/libxview/panel/p_choice.c	Sun May 23 14:16:14 2010
+@@ -106,6 +106,10 @@ static void     choice_begin_preview(), choice_cancel_
 static int      choice_number();
 static int	choice_x_gap();
 static int	choice_y_gap();
@ -11,11 +11,11 @@
 static unsigned int choice_value();
 static void     choice_create_menu();
 static void	choice_images_to_menu_items();
-@@ -121,7 +125,6 @@ static void     update_item_rect();
+@@ -120,7 +124,6 @@ static void     update_display();
+ static void     update_item_rect();
 static void     update_value_rect();
 static Xv_opaque choice_do_menu_item();
- 
 -
+ 
 static Panel_ops ops = {
     panel_default_handle_event,		/* handle_event() */
-     choice_begin_preview,		/* begin_preview() */
--- a/x11/xview/config/patches/p-libxview-panel-p_drop_c
+++ b/x11/xview/config/patches/p-libxview-panel-p_drop_c
@ -1,6 +1,6 @@
--- lib/libxview/panel/p_drop.c.orig	1993-06-29 07:17:04.000000000 +0200
-+++ lib/libxview/panel/p_drop.c	2003-12-30 01:31:13.000000000 +0100
-@@ -10,7 +10,12 @@ static char     sccsid[] = "@(#)p_drop.c
+--- lib/libxview/panel/p_drop.c.orig	Tue Jun 29 07:17:04 1993
+++ lib/libxview/panel/p_drop.c	Sun May 23 14:16:14 2010
+@@ -10,7 +10,12 @@ static char     sccsid[] = "@(#)p_drop.c 1.22 93/06/28
  *	file for terms of the license.
  */
 
--- a/x11/xview/config/patches/p-libxview-panel-p_get_c
+++ b/x11/xview/config/patches/p-libxview-panel-p_get_c
@ -1,6 +1,6 @@
--- lib/libxview/panel/p_get.c.orig	1993-06-29 07:16:49.000000000 +0200
-+++ lib/libxview/panel/p_get.c	2003-12-30 01:31:13.000000000 +0100
-@@ -16,6 +16,7 @@ static char     sccsid[] = "@(#)p_get.c 
+--- lib/libxview/panel/p_get.c.orig	Tue Jun 29 07:16:49 1993
+++ lib/libxview/panel/p_get.c	Sun May 23 14:16:14 2010
+@@ -16,6 +16,7 @@ static char     sccsid[] = "@(#)p_get.c 20.38 93/06/28
 #include <xview/scrollbar.h>
 
 static int      shrink_to_fit();
--- a/x11/xview/config/patches/p-libxview-panel-p_set_c
+++ b/x11/xview/config/patches/p-libxview-panel-p_set_c
@ -1,6 +1,6 @@
--- lib/libxview/panel/p_set.c.orig	1993-06-29 07:16:59.000000000 +0200
-+++ lib/libxview/panel/p_set.c	2003-12-30 01:31:13.000000000 +0100
-@@ -25,6 +25,8 @@ Xv_private char     *xv_font_regular_cmd
+--- lib/libxview/panel/p_set.c.orig	Tue Jun 29 07:16:59 1993
+++ lib/libxview/panel/p_set.c	Sun May 23 14:16:14 2010
+@@ -25,6 +25,8 @@ Xv_private char     *xv_font_regular_cmdline();
 
 static void panel_set_fonts();
 
--- a/x11/xview/config/patches/p-libxview-panel-p_txt_c
+++ b/x11/xview/config/patches/p-libxview-panel-p_txt_c
@ -1,6 +1,6 @@
--- lib/libxview/panel/p_txt.c.orig	1993-06-29 07:16:55.000000000 +0200
-+++ lib/libxview/panel/p_txt.c	2003-12-30 01:31:13.000000000 +0100
-@@ -10,7 +10,12 @@ static char     sccsid[] = "@(#)p_txt.c 
+--- lib/libxview/panel/p_txt.c.orig	Tue Jun 29 07:16:55 1993
+++ lib/libxview/panel/p_txt.c	Sun May 23 14:16:14 2010
+@@ -10,7 +10,12 @@ static char     sccsid[] = "@(#)p_txt.c 20.217 93/06/2
  *	file for terms of the license.
  */
 
--- a/x11/xview/config/patches/p-libxview-rect-rect_util_c
+++ b/x11/xview/config/patches/p-libxview-rect-rect_util_c
@ -1,6 +1,6 @@
--- lib/libxview/rect/rect_util.c.orig	1993-06-29 07:15:17.000000000 +0200
-+++ lib/libxview/rect/rect_util.c	2003-12-30 01:31:13.000000000 +0100
-@@ -16,6 +16,8 @@ static char     sccsid[] = "@(#)rect_uti
+--- lib/libxview/rect/rect_util.c.orig	Tue Jun 29 07:15:17 1993
+++ lib/libxview/rect/rect_util.c	Sun May 23 14:16:14 2010
+@@ -16,6 +16,8 @@ static char     sccsid[] = "@(#)rect_util.c 20.13 93/0
 
 #include <xview/rect.h>
 
--- a/x11/xview/config/patches/p-libxview-sel-sel_agent_c
+++ b/x11/xview/config/patches/p-libxview-sel-sel_agent_c
@ -1,15 +1,16 @@
--- lib/libxview/sel/sel_agent.c.orig	1994-06-26 20:46:20.000000000 +0200
-+++ lib/libxview/sel/sel_agent.c	2003-12-30 01:31:13.000000000 +0100
-@@ -63,7 +63,7 @@ static Seln_result seln_do_request_from_
+--- lib/libxview/sel/sel_agent.c.orig	Sun Jun 26 20:46:20 1994
+++ lib/libxview/sel/sel_agent.c	Sun May 23 14:16:14 2010
+@@ -63,8 +63,8 @@ static Seln_result seln_do_request_from_file();
 static void     selection_agent_do_function();
 static Atom 	get_atom();
 static Seln_attribute save_atom();
-
 +static int	waitforReadableTimeout();
 
+-
 Xv_private Seln_result seln_convert_request_to_property();
 /* called by seln_svc.c
-@@ -309,7 +309,11 @@ seln_do_request_from_file(attr, context,
+  * to do selection
+@@ -309,7 +309,11 @@ seln_do_request_from_file(attr, context, fd, max_lengt
     struct stat     stat_buf;
     int             count, size;
     char           *destp;
--- a/x11/xview/config/patches/p-libxview-selection-sel_req_c
+++ b/x11/xview/config/patches/p-libxview-selection-sel_req_c
@ -1,17 +1,18 @@
--- lib/libxview/selection/sel_req.c.orig	1994-06-26 03:05:21.000000000 +0200
-+++ lib/libxview/selection/sel_req.c	2003-12-30 01:31:13.000000000 +0100
-@@ -55,7 +55,10 @@ static int ProcessMultiple();
+--- lib/libxview/selection/sel_req.c.orig	Sun Jun 26 03:05:21 1994
+++ lib/libxview/selection/sel_req.c	Sun May 23 14:16:14 2010
+@@ -55,8 +55,11 @@ static int ProcessMultiple();
 static int GetSelection();
 static int ProcessReply();
 static Requestor *SelGetReq();
-
 +static int XvGetRequestedValue();
 +static int ProcessNonBlkIncr();
 +static int ProcessReq();
 +static int OldPkgIsOwner();
 
+-
 /*ARGSUSED*/
 Pkg_private int
+ sel_req_init(parent, sel_req_public, avlist)
@@ -1226,7 +1229,7 @@ Selection_requestor  sel;
 }
 
--- a/x11/xview/config/patches/p-libxview-server-server_c
+++ b/x11/xview/config/patches/p-libxview-server-server_c
@ -1,5 +1,5 @@
--- lib/libxview/server/server.c.orig	1994-06-26 20:53:40.000000000 +0200
-+++ lib/libxview/server/server.c	2003-12-30 01:31:13.000000000 +0100
+--- lib/libxview/server/server.c.orig	Sun Jun 26 20:53:40 1994
+++ lib/libxview/server/server.c	Sun May 23 14:16:14 2010
@@ -65,6 +65,7 @@ static Notify_value 	 scheduler();
 static unsigned int 	 string_to_modmask();
 static Server_atom_type  save_atom();
@ -8,7 +8,7 @@
 
 Xv_private char		*xv_strtok();
 
-@@ -440,7 +441,7 @@ server_init(parent, server_public, avlis
+@@ -440,7 +441,7 @@ server_init(parent, server_public, avlist)
   	/* lumpi@dobag.in-berlin.de */
     if (XrmGetDatabase((Display *)server->xdisplay)) {
 	server->db = XrmGetStringDatabase(
--- a/x11/xview/config/patches/p-libxview-textsw-ei_text_c
+++ b/x11/xview/config/patches/p-libxview-textsw-ei_text_c
@ -1,6 +1,6 @@
--- lib/libxview/textsw/ei_text.c.orig	1993-06-29 07:17:37.000000000 +0200
-+++ lib/libxview/textsw/ei_text.c	2003-12-30 01:31:13.000000000 +0100
-@@ -121,6 +121,7 @@ static void	ei_plain_text_set_dummy_char
+--- lib/libxview/textsw/ei_text.c.orig	Tue Jun 29 07:17:37 1993
+++ lib/libxview/textsw/ei_text.c	Sun May 23 14:16:14 2010
+@@ -121,6 +121,7 @@ static void	ei_plain_text_set_dummy_char();
 #endif
 static struct ei_span_result ei_plain_text_span_of_group();
 static struct ei_process_result ei_plain_text_expand();
--- a/x11/xview/config/patches/p-libxview-textsw-es_attr_c
+++ b/x11/xview/config/patches/p-libxview-textsw-es_attr_c
@ -1,6 +1,6 @@
--- lib/libxview/textsw/es_attr.c.orig	1993-06-29 07:17:31.000000000 +0200
-+++ lib/libxview/textsw/es_attr.c	2003-12-30 01:31:13.000000000 +0100
-@@ -22,7 +22,7 @@ static char     sccsid[] = "@(#)es_attr.
+--- lib/libxview/textsw/es_attr.c.orig	Tue Jun 29 07:17:31 1993
+++ lib/libxview/textsw/es_attr.c	Sun May 23 14:16:14 2010
+@@ -22,7 +22,7 @@ static char     sccsid[] = "@(#)es_attr.c 20.22 93/06/
 
 Pkg_private int
 #ifdef ANSI_FUNC_PROTO
--- a/x11/xview/config/patches/p-libxview-textsw-es_file_c
+++ b/x11/xview/config/patches/p-libxview-textsw-es_file_c
@ -1,6 +1,6 @@
--- lib/libxview/textsw/es_file.c.orig	1993-06-29 07:17:34.000000000 +0200
-+++ lib/libxview/textsw/es_file.c	2003-12-30 01:31:13.000000000 +0100
-@@ -110,8 +110,13 @@ static char     sccsid[] = "@(#)es_file.
+--- lib/libxview/textsw/es_file.c.orig	Tue Jun 29 07:17:34 1993
+++ lib/libxview/textsw/es_file.c	Sun May 23 14:16:14 2010
+@@ -110,8 +110,13 @@ static char     sccsid[] = "@(#)es_file.c 20.49 93/06/
 
 
 extern int      errno, sys_nerr;
--- a/x11/xview/config/patches/p-libxview-textsw-ev_op_bdry_c
+++ b/x11/xview/config/patches/p-libxview-textsw-ev_op_bdry_c
@ -1,6 +1,6 @@
--- lib/libxview/textsw/ev_op_bdry.c.orig	1993-06-29 07:17:30.000000000 +0200
-+++ lib/libxview/textsw/ev_op_bdry.c	2003-12-30 01:31:13.000000000 +0100
-@@ -28,6 +28,9 @@ Pkg_private void ev_clear_from_margins()
+--- lib/libxview/textsw/ev_op_bdry.c.orig	Tue Jun 29 07:17:30 1993
+++ lib/libxview/textsw/ev_op_bdry.c	Sun May 23 14:16:14 2010
+@@ -28,6 +28,9 @@ Pkg_private void ev_clear_from_margins();
 static Ev_finger_handle ev_insert_finger();
 static Ev_mark_object last_generated_id;
 
--- a/x11/xview/config/patches/p-libxview-textsw-ps_impl_c
+++ b/x11/xview/config/patches/p-libxview-textsw-ps_impl_c
@ -1,6 +1,6 @@
--- lib/libxview/textsw/ps_impl.c.orig	1993-06-29 07:17:39.000000000 +0200
-+++ lib/libxview/textsw/ps_impl.c	2003-12-30 01:31:13.000000000 +0100
-@@ -62,6 +62,10 @@ static Es_index ps_read(), ps_scratch_re
+--- lib/libxview/textsw/ps_impl.c.orig	Tue Jun 29 07:17:39 1993
+++ lib/libxview/textsw/ps_impl.c	Sun May 23 14:16:14 2010
+@@ -62,6 +62,10 @@ static Es_index ps_read(), ps_scratch_read();
 static Es_index ps_replace(), ps_scratch_replace();
 static int      ps_set();
 
--- a/x11/xview/config/patches/p-libxview-textsw-txt_again_c
+++ b/x11/xview/config/patches/p-libxview-textsw-txt_again_c
@ -1,6 +1,6 @@
-$OpenBSD: p-libxview-textsw-txt_again_c,v 1.3 2005/04/18 11:48:20 espie Exp $
+$OpenBSD: p-libxview-textsw-txt_again_c,v 1.4 2010/05/28 01:13:54 espie Exp $
 --- lib/libxview/textsw/txt_again.c.orig	Tue Jun 29 07:17:32 1993
-+++ lib/libxview/textsw/txt_again.c	Sun Apr 17 23:59:11 2005
+++ lib/libxview/textsw/txt_again.c	Sun May 23 14:16:14 2010
@@ -28,6 +28,8 @@ Pkg_private CHAR    *STRNCPY();
 Pkg_private Es_index textsw_do_input();
 Pkg_private Es_index textsw_do_pending_delete();
@ -10,7 +10,7 @@ $OpenBSD: p-libxview-textsw-txt_again_c,v 1.3 2005/04/18 11:48:20 espie Exp $
 string_t        null_string = {0, 0, 0};
 
 #define	TEXT_DELIMITER	"\\"
-@@ -182,6 +184,7 @@ textsw_string_min_free(ptr_to_string, mi
+@@ -182,6 +184,7 @@ textsw_string_min_free(ptr_to_string, min_free_desired
  * Following is stolen from 3.2ALPHA sprintf(str, fmt, va_alist) SIDE_EFFECT:
  * TXTSW_STRING_FREE(ptr_to_string) is modified by this routine.
  */
--- a/x11/xview/config/patches/p-libxview-textsw-txt_filter_c
+++ b/x11/xview/config/patches/p-libxview-textsw-txt_filter_c
@ -1,6 +1,6 @@
--- lib/libxview/textsw/txt_filter.c.orig	1993-06-29 07:17:39.000000000 +0200
-+++ lib/libxview/textsw/txt_filter.c	2003-12-30 01:31:14.000000000 +0100
-@@ -55,6 +55,9 @@ static char     sccsid[] = "@(#)txt_filt
+--- lib/libxview/textsw/txt_filter.c.orig	Tue Jun 29 07:17:39 1993
+++ lib/libxview/textsw/txt_filter.c	Sun May 23 14:16:14 2010
+@@ -55,6 +55,9 @@ static char     sccsid[] = "@(#)txt_filter.c 20.48 93/
 #define	REPLY_OKAY	 0
 #define	REPLY_SEND	 1
 
--- a/x11/xview/config/patches/p-libxview-textsw-txt_move_c
+++ b/x11/xview/config/patches/p-libxview-textsw-txt_move_c
@ -1,6 +1,6 @@
--- lib/libxview/textsw/txt_move.c.orig	1993-06-29 07:17:47.000000000 +0200
-+++ lib/libxview/textsw/txt_move.c	2003-12-30 01:31:14.000000000 +0100
-@@ -55,7 +55,7 @@ static char     sccsid[] = "@(#)txt_move
+--- lib/libxview/textsw/txt_move.c.orig	Tue Jun 29 07:17:47 1993
+++ lib/libxview/textsw/txt_move.c	Sun May 23 14:16:14 2010
+@@ -55,7 +55,7 @@ static char     sccsid[] = "@(#)txt_move.c 20.91 93/06
 
 static int dnd_data_key = 0; /* XXX: Don't do this at home kids. */
 static int dnd_view_key = 0; 
@ -9,7 +9,7 @@
 
 Pkg_private Es_handle textsw_esh_for_span();
 Pkg_private Es_index ev_resolve_xy();
-@@ -688,7 +688,7 @@ textsw_do_drag_copy_move(view, ie, is_co
+@@ -688,7 +688,7 @@ textsw_do_drag_copy_move(view, ie, is_copy)
     xv_destroy(dnd_accept_cursor);
 }
 
--- a/x11/xview/config/patches/p-libxview-textsw-txt_popup_c
+++ b/x11/xview/config/patches/p-libxview-textsw-txt_popup_c
@ -1,5 +1,5 @@
--- lib/libxview/textsw/txt_popup.c.orig	1993-06-29 07:17:38.000000000 +0200
-+++ lib/libxview/textsw/txt_popup.c	2003-12-30 01:31:14.000000000 +0100
+--- lib/libxview/textsw/txt_popup.c.orig	Tue Jun 29 07:17:38 1993
+++ lib/libxview/textsw/txt_popup.c	Sun May 23 14:16:14 2010
@@ -95,6 +95,10 @@ Pkg_private int      FC_PARENT_KEY;
 static int      TEXTSW_POPUP_KEY;  /* key data holding one of the above
 				      key names */
@ -11,7 +11,7 @@
 Panel_item      store_panel_items[MAX_FILE_PANEL_ITEMS];
 Panel_item      load_panel_items[MAX_FILE_PANEL_ITEMS];
 Panel_item      include_panel_items[MAX_FILE_PANEL_ITEMS];
-@@ -135,7 +139,6 @@ textsw_create_popup_frame(view, popup_ty
+@@ -135,7 +139,6 @@ textsw_create_popup_frame(view, popup_type)
     Frame           popup_frame, base_frame;
     Panel           panel = NULL;
     char           *label;
--- a/x11/xview/config/patches/p-libxview-textsw-txt_putkey_c
+++ b/x11/xview/config/patches/p-libxview-textsw-txt_putkey_c
@ -1,6 +1,6 @@
--- lib/libxview/textsw/txt_putkey.c.orig	1993-06-29 07:17:41.000000000 +0200
-+++ lib/libxview/textsw/txt_putkey.c	2003-12-30 01:31:14.000000000 +0100
-@@ -21,6 +21,8 @@ static char     sccsid[] = "@(#)txt_putk
+--- lib/libxview/textsw/txt_putkey.c.orig	Tue Jun 29 07:17:41 1993
+++ lib/libxview/textsw/txt_putkey.c	Sun May 23 14:16:14 2010
+@@ -21,6 +21,8 @@ static char     sccsid[] = "@(#)txt_putkey.c 20.19 93/
 
 extern int      errno;
 
--- a/x11/xview/config/patches/p-libxview-textsw-txt_selsvc_c
+++ b/x11/xview/config/patches/p-libxview-textsw-txt_selsvc_c
@ -1,6 +1,6 @@
--- lib/libxview/textsw/txt_selsvc.c.orig	1994-06-26 03:05:23.000000000 +0200
-+++ lib/libxview/textsw/txt_selsvc.c	2003-12-30 01:31:14.000000000 +0100
-@@ -24,6 +24,8 @@ static char     sccsid[] = "@(#)txt_sels
+--- lib/libxview/textsw/txt_selsvc.c.orig	Sun Jun 26 03:05:23 1994
+++ lib/libxview/textsw/txt_selsvc.c	Sun May 23 14:16:14 2010
+@@ -24,6 +24,8 @@ static char     sccsid[] = "@(#)txt_selsvc.c 20.64 93/
 #include <stdlib.h>
 #endif /* SVR4 */
 
--- a/x11/xview/config/patches/p-libxview-ttysw-cim_change_c
+++ b/x11/xview/config/patches/p-libxview-ttysw-cim_change_c
@ -1,6 +1,6 @@
--- lib/libxview/ttysw/cim_change.c.orig	1993-06-29 07:17:12.000000000 +0200
-+++ lib/libxview/ttysw/cim_change.c	2003-12-30 01:31:14.000000000 +0100
-@@ -17,10 +17,10 @@ static char     sccsid[] = "@(#)cim_chan
+--- lib/libxview/ttysw/cim_change.c.orig	Tue Jun 29 07:17:12 1993
+++ lib/libxview/ttysw/cim_change.c	Sun May 23 14:16:14 2010
+@@ -17,10 +17,10 @@ static char     sccsid[] = "@(#)cim_change.c 20.19 93/
 #include <xview_private/i18n_impl.h>
 #include <sys/types.h>
 #include <pixrect/pixrect.h>
--- a/x11/xview/config/patches/p-libxview-ttysw-tty_gtty_c
+++ b/x11/xview/config/patches/p-libxview-ttysw-tty_gtty_c
@ -1,6 +1,6 @@
--- lib/libxview/ttysw/tty_gtty.c.orig	1993-06-29 07:17:20.000000000 +0200
-+++ lib/libxview/ttysw/tty_gtty.c	2003-12-30 01:31:14.000000000 +0100
-@@ -14,6 +14,7 @@ static  char sccsid[] = "@(#)tty_gtty.c 
+--- lib/libxview/ttysw/tty_gtty.c.orig	Tue Jun 29 07:17:20 1993
+++ lib/libxview/ttysw/tty_gtty.c	Sun May 23 14:16:14 2010
+@@ -14,6 +14,7 @@ static  char sccsid[] = "@(#)tty_gtty.c 20.29 93/06/28
  * Ttysw parameter retrieval mechanism to get original tty settings to pty.
  */
 
@ -8,7 +8,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 #include <xview_private/portable.h>	/* for tty_mode_t and XV* defines */
-@@ -34,6 +35,7 @@ static  char sccsid[] = "@(#)tty_gtty.c 
+@@ -34,6 +35,7 @@ static  char sccsid[] = "@(#)tty_gtty.c 20.29 93/06/28
  */
 #ifdef	XV_USE_TERMIOS
 
--- a/x11/xview/config/patches/p-libxview-ttysw-tty_impl_h
+++ b/x11/xview/config/patches/p-libxview-ttysw-tty_impl_h
@ -1,5 +1,5 @@
--- lib/libxview/ttysw/tty_impl.h.orig	1993-06-29 07:17:18.000000000 +0200
-+++ lib/libxview/ttysw/tty_impl.h	2003-12-30 01:31:14.000000000 +0100
+--- lib/libxview/ttysw/tty_impl.h.orig	Tue Jun 29 07:17:18 1993
+++ lib/libxview/ttysw/tty_impl.h	Sun May 23 14:16:14 2010
@@ -14,6 +14,7 @@
  * terminal emulation for teletype based programs.
  */
@ -8,7 +8,7 @@
 #include <xview_private/portable.h>	/* tty and pty configuration info */
 
 #ifdef	XV_USE_TERMIOS
-@@ -210,7 +211,13 @@ typedef Ttysw_view_object* 	Ttysw_view_h
+@@ -210,7 +211,13 @@ typedef Ttysw_view_object* 	Ttysw_view_handle;
  * Access functions for tty characteristics.
  */
 #ifdef	XV_USE_TERMIOS
--- a/x11/xview/config/patches/p-libxview-ttysw-tty_init_c
+++ b/x11/xview/config/patches/p-libxview-ttysw-tty_init_c
@ -1,6 +1,6 @@
--- lib/libxview/ttysw/tty_init.c.orig	1993-06-29 07:17:19.000000000 +0200
-+++ lib/libxview/ttysw/tty_init.c	2003-12-30 01:31:14.000000000 +0100
-@@ -14,6 +14,7 @@ static char     sccsid[] = "@(#)tty_init
+--- lib/libxview/ttysw/tty_init.c.orig	Tue Jun 29 07:17:19 1993
+++ lib/libxview/ttysw/tty_init.c	Sun May 23 14:16:14 2010
+@@ -14,6 +14,7 @@ static char     sccsid[] = "@(#)tty_init.c 20.71 93/06
  * Ttysw initialization, destruction and error procedures
  */
 
@ -8,7 +8,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-@@ -82,7 +83,11 @@ static char     sccsid[] = "@(#)tty_init
+@@ -82,7 +83,11 @@ static char     sccsid[] = "@(#)tty_init.c 20.71 93/06
 
 extern char    *strncpy();
 extern char    *strcpy();
--- a/x11/xview/config/patches/p-libxview-ttysw-tty_main_c
+++ b/x11/xview/config/patches/p-libxview-ttysw-tty_main_c
@ -1,6 +1,6 @@
--- lib/libxview/ttysw/tty_main.c.orig	1993-06-29 07:17:22.000000000 +0200
-+++ lib/libxview/ttysw/tty_main.c	2003-12-30 01:31:14.000000000 +0100
-@@ -75,6 +75,11 @@ static char     sccsid[] = "@(#)tty_main
+--- lib/libxview/ttysw/tty_main.c.orig	Tue Jun 29 07:17:22 1993
+++ lib/libxview/ttysw/tty_main.c	Sun May 23 14:16:14 2010
+@@ -75,6 +75,11 @@ static char     sccsid[] = "@(#)tty_main.c 20.93 93/06
 int     committed_left = 0;
 #endif
 
--- a/x11/xview/config/patches/p-libxview-ttysw-ttyansi_c
+++ b/x11/xview/config/patches/p-libxview-ttysw-ttyansi_c
@ -1,6 +1,6 @@
--- lib/libxview/ttysw/ttyansi.c.orig	1993-06-29 07:17:21.000000000 +0200
-+++ lib/libxview/ttysw/ttyansi.c	2003-12-30 01:31:14.000000000 +0100
-@@ -31,6 +31,10 @@ static char     sccsid[] = "@(#)ttyansi.
+--- lib/libxview/ttysw/ttyansi.c.orig	Tue Jun 29 07:17:21 1993
+++ lib/libxview/ttysw/ttyansi.c	Sun May 23 14:16:15 2010
+@@ -31,6 +31,10 @@ static char     sccsid[] = "@(#)ttyansi.c 20.43 93/06/
 
 #include <xview/sel_attrs.h>
 
--- a/x11/xview/config/patches/p-libxview-win-win_input_c
+++ b/x11/xview/config/patches/p-libxview-win-win_input_c
@ -1,5 +1,5 @@
--- lib/libxview/win/win_input.c.orig	1994-06-27 00:27:53.000000000 +0200
-+++ lib/libxview/win/win_input.c	2003-12-30 01:31:14.000000000 +0100
+--- lib/libxview/win/win_input.c.orig	Mon Jun 27 00:27:53 1994
+++ lib/libxview/win/win_input.c	Sun May 23 14:16:15 2010
@@ -853,7 +853,9 @@ ContProcess:
 #ifdef X11R6
 	/* lumpi@dobag.in-berlin.de */
@ -33,7 +33,7 @@
 static int
 translate_key(dpy, symbol, modifiers, buffer, nbytes)
     Display 		*dpy;
-@@ -2731,11 +2735,18 @@ translate_key(dpy, symbol, modifiers, bu
+@@ -2731,11 +2735,18 @@ translate_key(dpy, symbol, modifiers, buffer, nbytes)
     int 		 nbytes;
 {
 	/* This is _very_ rude ! */
@ -54,7 +54,7 @@
 static int
 translate_key(dpy, symbol, modifiers, buffer, nbytes)
     Display 		*dpy;
-@@ -2761,4 +2772,4 @@ translate_key(dpy, symbol, modifiers, bu
+@@ -2761,4 +2772,4 @@ translate_key(dpy, symbol, modifiers, buffer, nbytes)
     }
     return 0;
 }
--- a/x11/xview/config/patches/p-olwm-olwm_c
+++ b/x11/xview/config/patches/p-olwm-olwm_c
@ -1,5 +1,5 @@
--- clients/olwm/olwm.c.orig	1993-06-29 07:11:52.000000000 +0200
-+++ clients/olwm/olwm.c	2003-12-30 01:31:15.000000000 +0100
+--- clients/olwm/olwm.c.orig	Tue Jun 29 07:11:52 1993
+++ clients/olwm/olwm.c	Sun May 23 14:16:15 2010
@@ -23,6 +23,10 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
@ -11,7 +11,7 @@
 #include <X11/Xos.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-@@ -622,14 +626,20 @@ handleChildSignal()
+@@ -622,13 +626,19 @@ handleChildSignal()
 void
 ReapChildren()
 {
@ -23,13 +23,12 @@
 +#if (defined(BSD) && (BSD >= 199103))
 +	pid_t pid;
 +	int status;
-+	int oldmask;
-+#else   
 	int oldmask;
+#else   
+	int oldmask;
 	int pid;
 	union wait status;
- #endif
 +#endif
+ #endif
 
 	if (!deadChildren)
- 		return;
--- a/x11/xview/config/patches/p-olwmslave-mem_c
+++ b/x11/xview/config/patches/p-olwmslave-mem_c
@ -1,6 +1,6 @@
--- clients/olwmslave/mem.c.orig	1993-06-29 07:12:12.000000000 +0200
-+++ clients/olwmslave/mem.c	2003-12-30 01:31:16.000000000 +0100
-@@ -16,7 +16,8 @@ static	char	sccsid[] = "@(#) mem.c 26.1 
+--- clients/olwmslave/mem.c.orig	Tue Jun 29 07:12:12 1993
+++ clients/olwmslave/mem.c	Sun May 23 14:16:15 2010
+@@ -16,7 +16,8 @@ static	char	sccsid[] = "@(#) mem.c 26.1 90/08/14 Cruci
  *
  */