161 files changed, 3063 insertions, 3898 deletions

diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile
index c0bef5e672b6..bb08008fb2db 100644
--- a/x11-toolkits/xview/Makefile
+++ b/x11-toolkits/xview/Makefile
@@ -7,51 +7,46 @@
 
 PORTNAME=	xview
 PORTVERSION=	3.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_LOCAL}	\
-		${MASTER_SITE_XCONTRIB}
-# former for ${MASTER_SITE_LOCAL}, latter for ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	asami/LOCAL_PORTS libraries
+MASTER_SITES=	ftp://ftp.efd.lth.se/pub/X11/ \
+		ftp://ftp.uni-heidelberg.de/pub/X11/contrib/libraries/ \
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	pav
 DISTNAME=	xview3.2p1-X11R6
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X Window-System-based Visual/Integrated Environment for Workstations
 
+USE_REINPLACE=	yes
+REINPLACE_ARGS=	-i ""
 USE_IMAKE=	yes
 INSTALLS_SHLIB=	yes
 IMAKEINCLUDE=	"-I${X11BASE}/lib/X11/config -I${WRKSRC}/config"
 MAKE_ENV+=	IMAKEINCLUDE=${IMAKEINCLUDE}
-XMKMF=		${SETENV} IMAKEINCLUDE=${IMAKEINCLUDE} xmkmf -a
 ALL_TARGET=	World
-USE_REINPLACE=	yes
-REINPLACE_ARGS=     -i ""
 
 MAN1=		msgfmt.1 xgettext.1 xview.1
 
-post-configure:
-	${CP} ${FILESDIR}/wait.h.in ${WRKSRC}/build/include/wait.h
-	${CP} ${FILESDIR}/types.h.in ${WRKSRC}/build/include/types.h
-
-post-install:
-
-	${INSTALL_DATA} ${WRKSRC}/build/include/wait.h ${X11BASE}/include/xview/
-	${INSTALL_DATA} ${WRKSRC}/build/include/types.h ${X11BASE}/include/xview/
-.if !defined(NOPORTDOCS)
-	@(cd $(WRKSRC); $(MAKE) -k 'SUBDIRS=doc' install)
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501102
-BROKEN=		"Fails to compile due to imake"
-.endif
-
-.if ${OSVERSION} >= 500000
 post-patch:
+	@${REINPLACE_CMD} -e 's+/usr/X11R6+${PREFIX}+;' \
+	  ${WRKSRC}/config/XView.cf
+	@${REINPLACE_CMD} -e 's+/usr/X11/+${X11BASE}/+g;' \
+	  ${WRKSRC}/clients/olwm/screen.c
+	@${REINPLACE_CMD} -e 's+/usr/lib+${PREFIX}/lib+g;' \
+	  ${WRKSRC}/clients/olwmslave/help_file.c \
+	  ${WRKSRC}/lib/libxview/help/help_file.c \
+	  ${WRKSRC}/lib/libxview/misc/gettext.h \
+	  ${WRKSRC}/lib/libxview/textsw/txt_e_menu.c
+
+pre-configure:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \
-	's|#include <sys/types.h>|#include "types.h"|;\
-	s|^#endif.*$$|#endif|;s|^#else.*$$|#else|'
+	's|^#endif.*$$|#endif|;s|^#else.*$$|#else|;\
+	s|^/\*\*/#*|XCOMM |'
+
+post-install:
+.if !defined{NOPORTDOCS}
+	@(cd ${WRKSRC}; ${MAKE} -k 'SUBDIRS=doc' install)
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/xview/files/patch-Imakefile b/x11-toolkits/xview/files/patch-Imakefile
new file mode 100644
index 000000000000..d5252f4d73fc
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-Imakefile
@@ -0,0 +1,22 @@
+--- Imakefile.orig	Mon Sep 29 00:02:44 2003
++++ Imakefile	Mon Sep 29 00:02:44 2003
+@@ -4,8 +4,8 @@
+ /**/# Top level Imakefile for ProductNameAndRelease
+ /**/# @(#)Imakefile	1.7 1/7/92 SMI
+ 
+-CC = cc
+-CFLAGS = -O 
++CC ?= cc
++CFLAGS += -fstrength-reduce -fpcc-struct-return 
+ 
+ #define IHaveSubdirs
+ #define PassCDebugFlags
+@@ -13,7 +13,7 @@
+            WORLDOPTS = 
+ /**/# If you want to make only the library, then start the build in the lib
+ /**/# subdirectory.  Be sure to do a 'make includes' in images and bitmaps first.
+-            COREDIRS = lib images bitmaps misc util
++            COREDIRS = lib images bitmaps misc util config
+ #if InstallOpenLookFonts 
+             FONTSDIR = fonts
+ #else
diff --git a/x11-toolkits/xview/files/patch-aa b/x11-toolkits/xview/files/patch-aa
deleted file mode 100644
index 375c958ea529..000000000000
--- a/x11-toolkits/xview/files/patch-aa
+++ /dev/null
@@ -1,38 +0,0 @@
-*** Imakefile.orig	Sat Jun 25 20:47:22 1994
---- Imakefile	Mon Jan 25 12:07:10 1999
-***************
-*** 4,11 ****
-  /**/# Top level Imakefile for ProductNameAndRelease
-  /**/# @(#)Imakefile	1.7 1/7/92 SMI
-  
-! CC = cc
-! CFLAGS = -O 
-  
-  #define IHaveSubdirs
-  #define PassCDebugFlags
---- 4,11 ----
-  /**/# Top level Imakefile for ProductNameAndRelease
-  /**/# @(#)Imakefile	1.7 1/7/92 SMI
-  
-! CC ?= gcc
-! CFLAGS += -O -fstrength-reduce -fpcc-struct-return 
-  
-  #define IHaveSubdirs
-  #define PassCDebugFlags
-***************
-*** 13,19 ****
-             WORLDOPTS = 
-  /**/# If you want to make only the library, then start the build in the lib
-  /**/# subdirectory.  Be sure to do a 'make includes' in images and bitmaps first.
-!             COREDIRS = lib images bitmaps misc util
-  #if InstallOpenLookFonts 
-              FONTSDIR = fonts
-  #else
---- 13,19 ----
-             WORLDOPTS = 
-  /**/# If you want to make only the library, then start the build in the lib
-  /**/# subdirectory.  Be sure to do a 'make includes' in images and bitmaps first.
-!             COREDIRS = lib images bitmaps misc util config
-  #if InstallOpenLookFonts 
-              FONTSDIR = fonts
-  #else
diff --git a/x11-toolkits/xview/files/patch-bitmaps+Imakefile b/x11-toolkits/xview/files/patch-bitmaps+Imakefile
new file mode 100644
index 000000000000..3d5dcbedb3de
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-bitmaps+Imakefile
@@ -0,0 +1,14 @@
+--- bitmaps/Imakefile.orig	Mon Sep 29 00:02:44 2003
++++ bitmaps/Imakefile	Mon Sep 29 00:02:43 2003
+@@ -34,9 +34,9 @@
+ 
+ ALLFILES = $(BITMAPS) 
+ 
+-all: $(SRCS)
++all:: $(SRCS)
+ 
+-BuildIncludes($(INCLUDES_SRCS),$(BITMAP_INCDIR),/**/)
++BuildIncludes($(INCLUDES_SRCS),$(BITMAP_INCDIR),.)
+ 
+ install:: $(SRCS)
+ 	$(MKDIRHIER) $(HEADER_DEST)/$(BITMAPINC)
diff --git a/x11-toolkits/xview/files/patch-ca b/x11-toolkits/xview/files/patch-ca
deleted file mode 100644
index 9e89ac109aa9..000000000000
--- a/x11-toolkits/xview/files/patch-ca
+++ /dev/null
@@ -1,28 +0,0 @@
-*** config/Imakefile.orig	Tue Jun 29 00:13:19 1993
---- config/Imakefile	Thu Jan 21 16:39:50 1999
-***************
-*** 8,17 ****
-  /**/# config directory
-  /**/# @(#)Imakefile	1.9 28 Jun 1993 SMI
-  
-! XVFILES = XView.cf XView.lib XView.obj XView.rules XView.tmpl library.tmpl
-  CFFILES = $(XVFILES) $(HEADERS)
-  
-  InstallMultipleDestFlags(install,$(CFFILES),$(CONFIGDIR),$(INSTDATFLAGS))
-  
-  depend::
-  
---- 8,20 ----
-  /**/# config directory
-  /**/# @(#)Imakefile	1.9 28 Jun 1993 SMI
-  
-! #XVFILES = XView.cf XView.lib XView.obj XView.rules XView.tmpl library.tmpl
-! XVFILES = XView.cf XView.lib XView.obj XView.rules XView.tmpl XView.prog
-  CFFILES = $(XVFILES) $(HEADERS)
-  
-  InstallMultipleDestFlags(install,$(CFFILES),$(CONFIGDIR),$(INSTDATFLAGS))
-+ 
-+ all::
-  
-  depend::
-  
diff --git a/x11-toolkits/xview/files/patch-cb b/x11-toolkits/xview/files/patch-cb
deleted file mode 100644
index cff23b94c3ed..000000000000
--- a/x11-toolkits/xview/files/patch-cb
+++ /dev/null
@@ -1,87 +0,0 @@
-*** config/XView.cf.orig	Sun Jun 26 21:09:19 1994
---- config/XView.cf	Thu Jan 21 17:48:22 1999
-***************
-*** 101,107 ****
-   *	the appropriate value.
-   */
-  #ifndef XVDestDir
-! #define XVDestDir /usr/X11/xview
-  #endif
-  /*
-   *	Command to add object modules to the library.
---- 101,107 ----
-   *	the appropriate value.
-   */
-  #ifndef XVDestDir
-! #define XVDestDir /usr/X11R6
-  #endif
-  /*
-   *	Command to add object modules to the library.
-***************
-*** 139,145 ****
-   *	installed in $(DESTDIR)/lib/X11/config (aka $(CONFIGDIR)).
-   */ 
-  #ifndef OnlyNeedsNewXViewConfigInstalled 
-! #define OnlyNeedsNewXViewConfigInstalled NO 
-  #endif 
-  /*
-   *	If you would like the XView man pages to be installed in 
---- 139,145 ----
-   *	installed in $(DESTDIR)/lib/X11/config (aka $(CONFIGDIR)).
-   */ 
-  #ifndef OnlyNeedsNewXViewConfigInstalled 
-! #define OnlyNeedsNewXViewConfigInstalled YES
-  #endif 
-  /*
-   *	If you would like the XView man pages to be installed in 
-***************
-*** 195,201 ****
-  # if PreR4Server
-  # define LibXViewDefines -DPRE_R4_ICCCM
-  # else
-! # define LibXViewDefines -DFULL_R5 -I$(OPENWINHOME)/include -DSUNOS41 -DX11R6
-  # endif
-  #endif
-  /*
---- 195,201 ----
-  # if PreR4Server
-  # define LibXViewDefines -DPRE_R4_ICCCM
-  # else
-! #   define LibXViewDefines -DFULL_R5 -I$(OPENWINHOME)/include -DSUNOS41 -DX11R6
-  # endif
-  #endif
-  /*
-***************
-*** 259,265 ****
-   *	following variable to YES.  
-   */
-  #ifndef InstallAllImages
-! #define InstallAllImages NO
-  #endif
-  /*
-   *	If you do not already have the textsw extras menu installed in
---- 259,265 ----
-   *	following variable to YES.  
-   */
-  #ifndef InstallAllImages
-! #define InstallAllImages YES
-  #endif
-  /*
-   *	If you do not already have the textsw extras menu installed in
-***************
-*** 360,366 ****
-   *    	be defined as -PIC
-   */
-  #ifndef PositionIndependentCodeFlag
-! #define PositionIndependentCodeFlag -PIC
-  #endif
-  
-  /*
---- 360,366 ----
-   *    	be defined as -PIC
-   */
-  #ifndef PositionIndependentCodeFlag
-! #define PositionIndependentCodeFlag -fpic
-  #endif
-  
-  /*
diff --git a/x11-toolkits/xview/files/patch-cc b/x11-toolkits/xview/files/patch-cc
deleted file mode 100644
index 16bda212c4a9..000000000000
--- a/x11-toolkits/xview/files/patch-cc
+++ /dev/null
@@ -1,119 +0,0 @@
-*** config/XView.obj.orig	Tue Jun 29 00:13:20 1993
---- config/XView.obj	Thu Jan 21 18:03:14 1999
-***************
-*** 15,21 ****
-              STD_DEFINES = StandardDefines LibXViewDefines 
-  #endif
-  HEADERS= ${HDRSPUBLIC} ${HDRSPRIVATE}
-! INCLUDES= -I$(BUILDINCDIR)$(INCDIR) 
-  OBJS = $(TEXT_OBJS) $(DATA_OBJS) $(SPECIAL_OBJS)
-  #if !NotLibXView
-  ALLFILES = $(SRCS) $(HEADERS)
---- 15,21 ----
-              STD_DEFINES = StandardDefines LibXViewDefines 
-  #endif
-  HEADERS= ${HDRSPUBLIC} ${HDRSPRIVATE}
-! INCLUDES= -I$(BUILDINCDIR)/$(INCDIR) 
-  OBJS = $(TEXT_OBJS) $(DATA_OBJS) $(SPECIAL_OBJS)
-  #if !NotLibXView
-  ALLFILES = $(SRCS) $(HEADERS)
-***************
-*** 54,62 ****
-   * data.
-   */
-  #if SharedLibXView
-! # if SubdirHasTextObjs
-  SubdirNormalSharedLibraryTarget(${LIBTARGET},${SOREV},$(TEXT_OBJS) $(SPECIAL_OBJS),$(SHARED_DIR),shared)
-! # endif
-  # if SubdirHasDataObjs
-  #  if DebugLibXView
-  SubdirSpecialSharedAndDebuggedObjectRule($(DATA_OBJS),/**/,/**/)
---- 54,63 ----
-   * data.
-   */
-  #if SharedLibXView
-! #if SubdirHasTextObjs
-  SubdirNormalSharedLibraryTarget(${LIBTARGET},${SOREV},$(TEXT_OBJS) $(SPECIAL_OBJS),$(SHARED_DIR),shared)
-! #endif
-! 
-  # if SubdirHasDataObjs
-  #  if DebugLibXView
-  SubdirSpecialSharedAndDebuggedObjectRule($(DATA_OBJS),/**/,/**/)
-***************
-*** 85,101 ****
-  
-  #if SubdirHasPublicHeaders
-  # if NotLibXView
-! BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),/**/)
-  
-  install::
-! 	$(MKDIRHIER) $(PUB_HEADER_DEST)
-  
-  InstallMultiple($(HDRSPUBLIC),$(PUB_HEADER_DEST))
-  # else
-! BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),/**/)
-  
-  install::
-! 	$(MKDIRHIER) $(XVPUB_HEADER_DEST)
-  
-  InstallMultiple($(HDRSPUBLIC),$(XVPUB_HEADER_DEST))
-  # endif
---- 86,102 ----
-  
-  #if SubdirHasPublicHeaders
-  # if NotLibXView
-! BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),.)
-  
-  install::
-! 	$(MKDIRHIER) $(DESTDIR)$(PUB_HEADER_DEST)
-  
-  InstallMultiple($(HDRSPUBLIC),$(PUB_HEADER_DEST))
-  # else
-! BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),.)
-  
-  install::
-! 	$(MKDIRHIER) $(DESTDIR)$(XVPUB_HEADER_DEST)
-  
-  InstallMultiple($(HDRSPUBLIC),$(XVPUB_HEADER_DEST))
-  # endif
-***************
-*** 103,121 ****
-  
-  #if SubdirHasPrivateHeaders
-  # if NotLibXView
-! BuildIncludes($(HDRSPRIVATE),$(PRI_INCDIR),/**/)
-  # else
-! BuildIncludes($(HDRSPRIVATE),$(XVPRI_INCDIR),/**/)
-  # endif
-  # if InstallPrivateHeaders
-  #  if NotLibXView
-  install::
-! 	$(MKDIRHIER) $(PRI_HEADER_DEST)
-  
-  InstallMultiple($(HDRSPRIVATE),$(PRI_HEADER_DEST))
-  #  else
-  install::
-! 	$(MKDIRHIER) $(XVPRI_HEADER_DEST)
-  
-  InstallMultiple($(HDRSPRIVATE),$(XVPRI_HEADER_DEST))
-  #  endif
---- 104,122 ----
-  
-  #if SubdirHasPrivateHeaders
-  # if NotLibXView
-! BuildIncludes($(HDRSPRIVATE),$(PRI_INCDIR),.)
-  # else
-! BuildIncludes($(HDRSPRIVATE),$(XVPRI_INCDIR),.)
-  # endif
-  # if InstallPrivateHeaders
-  #  if NotLibXView
-  install::
-! 	$(MKDIRHIER) $(DESTDIR)$(PRI_HEADER_DEST)
-  
-  InstallMultiple($(HDRSPRIVATE),$(PRI_HEADER_DEST))
-  #  else
-  install::
-! 	$(MKDIRHIER) $(DESTDIR)$(XVPRI_HEADER_DEST)
-  
-  InstallMultiple($(HDRSPRIVATE),$(XVPRI_HEADER_DEST))
-  #  endif
diff --git a/x11-toolkits/xview/files/patch-cd b/x11-toolkits/xview/files/patch-cd
deleted file mode 100644
index 88c89d6f96ac..000000000000
--- a/x11-toolkits/xview/files/patch-cd
+++ /dev/null
@@ -1,23 +0,0 @@
-*** config/XView.rules.orig	Tue Jun 29 00:13:20 1993
---- config/XView.rules	Thu Jan 21 18:27:53 1999
-***************
-*** 366,374 ****
-  #ifndef InstallSharedLibraryNoBuild
-  #define	InstallSharedLibraryNoBuild(libname,rev,dest)				@@\
-  install::  								@@\
-!         $(RM) /dest/lib/**/libname.so                                   @@\
-  	$(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.so.rev dest	@@\
-!         (cd dest; $(LN) lib/**/libname.so.rev lib/**/libname.so)
-  
-  #endif /* InstallSharedLibraryNoBuild */
-  
---- 366,374 ----
-  #ifndef InstallSharedLibraryNoBuild
-  #define	InstallSharedLibraryNoBuild(libname,rev,dest)				@@\
-  install::  								@@\
-! 	$(RM) /dest/lib/**/libname.so                                   @@\
-  	$(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.so.rev dest	@@\
-! 	(cd dest; $(LN) lib/**/libname.so.rev lib/**/libname.so)
-  
-  #endif /* InstallSharedLibraryNoBuild */
-  
diff --git a/x11-toolkits/xview/files/patch-ce b/x11-toolkits/xview/files/patch-ce
deleted file mode 100644
index d791d89d35eb..000000000000
--- a/x11-toolkits/xview/files/patch-ce
+++ /dev/null
@@ -1,151 +0,0 @@
-*** config/XView.tmpl.orig	Sun Jun 26 21:10:00 1994
---- config/XView.tmpl	Thu Jan 21 23:18:27 1999
-***************
-*** 96,102 ****
-   *      Work around small conflict with Project.tmpl file
-   */
-  #if UseInstalled
-!               MKDIRHIER = BourneShell BinDir/mkdirhier
-  #endif
-  
-  #if OsHasLocale
---- 96,102 ----
-   *      Work around small conflict with Project.tmpl file
-   */
-  #if UseInstalled
-!               MKDIRHIER = mkdirhier
-  #endif
-  
-  #if OsHasLocale
-***************
-*** 192,205 ****
-                       AS = as
-   */
-  /*
--  *	use the same trick X11R5 does for defining rules for installed libs
--  */
-- #ifdef UseInstalled
-- #define _Use(a,b) a
-- #else
-- #define _Use(a,b) b
-- #endif
-- /*
-   *	Temporary directory used during build process before the include
-   *	files are installed.  This is just a place where symbolic links are
-   *	placed to point back to the actual files in the build hierarchy to
---- 192,197 ----
-***************
-*** 224,230 ****
-   *	afterwards.
-   */
-  #ifndef XVIncludeDirName
-! #define XVIncludeDirName /include
-  #endif
-                   INCDIR = XVIncludeDirName
-  /*
---- 216,222 ----
-   *	afterwards.
-   */
-  #ifndef XVIncludeDirName
-! #define XVIncludeDirName include
-  #endif
-                   INCDIR = XVIncludeDirName
-  /*
-***************
-*** 356,365 ****
-  
-  #if SystemV4
-               SYSV_CLIENT_LIB = -lintl -ldl
-! 	     XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
-  #else
-               SYSV_CLIENT_LIB =
-! 	     XVCLIENTSYSDEFINES = -DSUNOS41
-  #endif
-  
-  /*
---- 348,357 ----
-  
-  #if SystemV4
-               SYSV_CLIENT_LIB = -lintl -ldl
-!              XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
-  #else
-               SYSV_CLIENT_LIB =
-!              XVCLIENTSYSDEFINES = -DSUNOS41
-  #endif
-  
-  /*
-***************
-*** 371,386 ****
-   */
-  
-  #if XvI18nLevel == 4
-! 	XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5
-! 	XVCLIENTMISCLIB = -lw
-! 	XVCLIENTINCLUDES = -I$(OPENWINHOME)/include
-  #else
-! 	XVCLIENTI18NDEFINES = -DOW_I18N_L3
-! 	XVCLIENTMISCLIB = 
-! 	XVCLIENTINCLUDES = 
-  #endif
-  
-! 	XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
-  
-  /*
-   *	Define libraries for XView clients
---- 363,378 ----
-   */
-  
-  #if XvI18nLevel == 4
-!         XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5
-!         XVCLIENTMISCLIB = -lw
-!         XVCLIENTINCLUDES = -I$(OPENWINHOME)/include
-  #else
-!         XVCLIENTI18NDEFINES = -DOW_I18N_L3
-!         XVCLIENTMISCLIB = 
-!         XVCLIENTINCLUDES = 
-  #endif
-  
-!         XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
-  
-  /*
-   *	Define libraries for XView clients
-***************
-*** 410,416 ****
-   */
-  #if SharedLibXView
-  # ifndef SharedXViewRev
-! #if SystemV4
-  # define SharedXViewRev 3
-  #else
-  # define SharedXViewRev 3.2
---- 402,408 ----
-   */
-  #if SharedLibXView
-  # ifndef SharedXViewRev
-! #if SystemV4 || UseElfFormat
-  # define SharedXViewRev 3
-  #else
-  # define SharedXViewRev 3.2
-***************
-*** 449,460 ****
-   *	Include the XView specific makefile macros.
-   */
-  
-- /*  This is just needed here because X11 is installed with gcc as
--     a default compiler.
-- 	lumpi@dobag.in-berlin.de
-- 
-  #undef CcCmd
-  #define CcCmd cc
-! #define LibraryCcCmd cc */
-  #include <XView.rules>
-  #endif /* XViewTmpl */
---- 441,448 ----
-   *	Include the XView specific makefile macros.
-   */
-  
-  #undef CcCmd
-  #define CcCmd cc
-! #define LibraryCcCmd cc
-  #include <XView.rules>
-  #endif /* XViewTmpl */
diff --git a/x11-toolkits/xview/files/patch-clients+olwm+Imakefile b/x11-toolkits/xview/files/patch-clients+olwm+Imakefile
new file mode 100644
index 000000000000..03848f1f8c55
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-clients+olwm+Imakefile
@@ -0,0 +1,11 @@
+--- clients/olwm/Imakefile.orig	Tue Jun 29 00:11:41 1993
++++ clients/olwm/Imakefile	Fri Oct 17 14:53:32 2003
+@@ -39,7 +39,7 @@
+ MANPAGES = olwm.man
+ BITMAPS = iconbitmap.h
+ SCRIPTS = 
+-MISC 	= openwin-menu
++MISC 	= openwin-menu openwin-menu-programs
+ 
+ 
+ SRCS	= atom.c client.c cmdstream.c \
diff --git a/x11-toolkits/xview/files/patch-clients+olwm+cmdstream.c b/x11-toolkits/xview/files/patch-clients+olwm+cmdstream.c
new file mode 100644
index 000000000000..46e71d09e48b
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-clients+olwm+cmdstream.c
@@ -0,0 +1,17 @@
+--- ./clients/olwm/cmdstream.c.orig	Tue Jun 29 07:11:43 1993
++++ ./clients/olwm/cmdstream.c	Sat Apr  1 18:26:06 2000
+@@ -51,10 +51,10 @@ static	CmdInfo		cmdInfo = {
+  *      Local Forward Declarations
+  * ---------------------------------------------------------------------*/
+ 
+-Command		*MatchCommand();
+-CmdAttr		*MatchAttr();
+-int		EncodeAttrValue();
+-int		DecodeAttrValue();
++static Command		*MatchCommand();
++static CmdAttr		*MatchAttr();
++static int		EncodeAttrValue();
++static int		DecodeAttrValue();
+ 
+ /* ----------------------------------------------------------------------
+  *      SetCmdStream
diff --git a/x11-toolkits/xview/files/patch-clients+olwm+defaults.c b/x11-toolkits/xview/files/patch-clients+olwm+defaults.c
new file mode 100644
index 000000000000..b57480bc906f
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-clients+olwm+defaults.c
@@ -0,0 +1,26 @@
+--- ./clients/olwm/defaults.c.orig	Tue Jun 29 07:11:43 1993
++++ ./clients/olwm/defaults.c	Sat Apr  1 18:26:06 2000
+@@ -25,9 +25,9 @@
+ #include <X11/Xutil.h>
+ #include <X11/Xatom.h>
+ #include <X11/Xresource.h>
+-#ifdef OW_I18N_L4
++/* #ifdef OW_I18N_L4 */
+ #include <sys/param.h>
+-#endif
++/* #endif */
+ 
+ #include "i18n.h"
+ #include "ollocale.h"
+@@ -80,7 +80,11 @@ GetUserDefaults(dpy)
+ 	if (homedir != NULL) {
+ 	    (void) strcpy(filename, homedir);
+ 	    (void) strcat(filename, "/.Xdefaults-");
++#ifdef BSD4_4
++	    if (0 == gethostname(hostname, sizeof(hostname))) {
++#else
+ 	    if (0 == gethostname(hostname, sizeof(hostname), &namelen)) {
++#endif
+ 		(void) strcat(filename, hostname);
+ 		fileDB = XrmGetFileDatabase(filename);
+ 	    }
diff --git a/x11-toolkits/xview/files/patch-clients+olwm+gettext.c b/x11-toolkits/xview/files/patch-clients+olwm+gettext.c
new file mode 100644
index 000000000000..7858cf27d5f0
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-clients+olwm+gettext.c
@@ -0,0 +1,14 @@
+--- clients/olwm/gettext.c.orig	Fri Oct 17 11:24:49 2003
++++ clients/olwm/gettext.c	Fri Oct 17 11:30:14 2003
+@@ -20,7 +20,10 @@
+ char *_gettext();
+ char *in_path();
+ char *fgets(), *getenv();
+-caddr_t mmap(), calloc();
++caddr_t calloc();
++#ifndef __FreeBSD__
++caddr_t mmap();
++#endif
+ 
+ static struct domain_binding *firstbind=0, *lastbind=0;
+ 
diff --git a/x11-toolkits/xview/files/patch-clients+olwm+gettext.h b/x11-toolkits/xview/files/patch-clients+olwm+gettext.h
new file mode 100644
index 000000000000..58c3afbf1ad4
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-clients+olwm+gettext.h
@@ -0,0 +1,15 @@
+--- ./clients/olwm/gettext.h.orig	Tue Jun 29 07:11:46 1993
++++ ./clients/olwm/gettext.h	Sat Apr  1 18:26:06 2000
+@@ -27,7 +27,11 @@
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/param.h>
+- 
++
++#ifndef LC_MESSAGES
++#define LC_MESSAGES 0
++#endif
++
+ struct domain_binding {
+     char    *domain_name;
+     char    *binding;
diff --git a/x11-toolkits/xview/files/patch-clients+olwm+i18n.h b/x11-toolkits/xview/files/patch-clients+olwm+i18n.h
new file mode 100644
index 000000000000..e3073042426a
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-clients+olwm+i18n.h
@@ -0,0 +1,13 @@
+--- ./clients/olwm/i18n.h.orig	Tue Jun 29 07:11:48 1993
++++ ./clients/olwm/i18n.h	Sat Apr  1 18:26:06 2000
+@@ -35,6 +35,10 @@ extern wchar_t  *mbstowcsdup();
+ 
+ #endif /* OW_I18N_L4 */
+ 
++#ifndef LC_MESSAGES
++#define LC_MESSAGES 0
++#endif
++
+ /*
+  *	String/Text - To better handle non-i18n, Level3 and Level4
+  *	we introduce two 'types'; string and text.
diff --git a/x11-toolkits/xview/files/patch-clients+olwm+mem.c b/x11-toolkits/xview/files/patch-clients+olwm+mem.c
new file mode 100644
index 000000000000..02e6f9b89caa
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-clients+olwm+mem.c
@@ -0,0 +1,16 @@
+--- ./clients/olwm/mem.c.orig	Tue Jun 29 07:11:45 1993
++++ ./clients/olwm/mem.c	Sat Apr  1 18:26:06 2000
+@@ -14,8 +14,12 @@
+  *
+  */
+ 
+-
++#include <sys/param.h>
++#ifdef __STDC__
++#include <stdlib.h>
++#else
+ #include <malloc.h>
++#endif
+ #include <memory.h>
+ #include <stdio.h>
+ #include <sys/types.h>
diff --git a/x11-toolkits/xview/files/patch-clients+olwm+menu.c b/x11-toolkits/xview/files/patch-clients+olwm+menu.c
new file mode 100644
index 000000000000..7dc3db3e4c98
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-clients+olwm+menu.c
@@ -0,0 +1,11 @@
+--- ./clients/olwm/menu.c.orig	Tue Jun 29 07:11:50 1993
++++ ./clients/olwm/menu.c	Sat Apr  1 18:26:06 2000
+@@ -52,6 +52,8 @@ static int  lastX, lastY, minX;
+ static WinGeneric *prevColorFocusWindow = NULL;
+ static MenuTrackMode menuTrackMode;
+ 
++static Bool isEnabled();
++
+ /*
+  * Table of currently active menus.
+  * REMIND: perhaps this should be dynamically allocated.
diff --git a/x11-toolkits/xview/files/patch-clients+olwm+olwm.c b/x11-toolkits/xview/files/patch-clients+olwm+olwm.c
new file mode 100644
index 000000000000..12a5c63d7c63
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-clients+olwm+olwm.c
@@ -0,0 +1,28 @@
+--- clients/olwm/olwm.c.orig	Fri Oct 17 18:23:53 2003
++++ clients/olwm/olwm.c	Fri Oct 17 18:48:37 2003
+@@ -23,6 +23,10 @@
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+ 
++#ifndef MAXPID
++#define MAXPID 30000
++#endif
++
+ #include <X11/Xos.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+@@ -622,9 +626,13 @@
+ void
+ ReapChildren()
+ {
+-#ifdef SYSV
++#if defined(SYSV)
+         pid_t pid;
+         int status;
++#elif (defined(BSD) && (BSD >= 199103))
++	pid_t pid;
++	int status;
++	int oldmask;
+ #else
+ 	int oldmask;
+ 	int pid;
diff --git a/x11-toolkits/xview/files/patch-clients+olwm+screen.c b/x11-toolkits/xview/files/patch-clients+olwm+screen.c
new file mode 100644
index 000000000000..0aa16e532c62
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-clients+olwm+screen.c
@@ -0,0 +1,41 @@
+--- clients/olwm/screen.c.orig	Tue Jun 29 00:11:56 1993
++++ clients/olwm/screen.c	Fri Oct 17 15:18:34 2003
+@@ -111,6 +111,12 @@
+ static XrmQuark stippledRubberBandsCQ;
+ static XrmQuark stippledRubberBandsIQ;
+ 
++static updateScreenWorkspaceColor();
++static updateScreenWindowColor();
++static updateScreenForegroundColor();
++static updateScreenBackGroundColor();
++static updateScreenBorderColor();
++static updateScreenGlyphFont();
+ 
+ /*-------------------------------------------------------------------------
+  *	Local Functions
+@@ -214,6 +220,7 @@
+ 		     	case PseudoColor:
+ 			case GrayScale:
+ 		     	case DirectColor:
++			case TrueColor:
+ 		    		return True;
+ 				/*NOTREACHED*/
+ 		    		break;
+@@ -460,7 +467,7 @@
+  * 	Construct bitmap search path as follows:
+  *		$OPENWINHOME/etc/workspace/patterns
+  *		$OPENWINHOME/include/X11/include/bitmaps
+- *		/usr/X11/include/X11/include/bitmaps
++ *		/usr/X11R6/include/X11/include/bitmaps
+  *
+  * REMIND: this should be cleaned up so that it doesn't use a fixed-size 
+  * array.
+@@ -483,7 +490,7 @@
+ 	(void)sprintf(bmPath, "%s/include/X11/bitmaps",owHome);
+ 	bitmapSearchPath[i++] = MemNewString(bmPath);
+ 
+-	bitmapSearchPath[i++] = MemNewString("/usr/X11/include/X11/bitmaps");
++	bitmapSearchPath[i++] = MemNewString("/usr/X11R6/include/X11/bitmaps");
+ 
+ 	bitmapSearchPath[i] = (char *)NULL;
+ }
diff --git a/x11-toolkits/xview/files/patch-clients+olwm+slave.c b/x11-toolkits/xview/files/patch-clients+olwm+slave.c
new file mode 100644
index 000000000000..8952411795f4
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-clients+olwm+slave.c
@@ -0,0 +1,11 @@
+--- ./clients/olwm/slave.c.orig	Tue Jun 29 07:11:57 1993
++++ ./clients/olwm/slave.c	Sat Apr  1 18:26:06 2000
+@@ -22,6 +22,8 @@
+ #include <signal.h>
+ #include <stdio.h>
+ 
++#include <sys/param.h>
++
+ #include "cmdstream.h"
+ #include "error.h"
+ 
diff --git a/x11-toolkits/xview/files/patch-clients+olwm+winicon.c b/x11-toolkits/xview/files/patch-clients+olwm+winicon.c
new file mode 100644
index 000000000000..4974c13c9da0
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-clients+olwm+winicon.c
@@ -0,0 +1,13 @@
+--- ./clients/olwm/winicon.c.orig	Tue Jun 29 07:12:04 1993
++++ ./clients/olwm/winicon.c	Sat Apr  1 18:26:06 2000
+@@ -32,6 +32,10 @@
+ extern 	Bool	PropGetWMName();
+ extern 	Bool	PropGetWMIconName();
+ 
++static int heightTopIcon();
++static int heightBottomIcon();
++static int widthBothIcon();
++
+ /***************************************************************************
+ * private data
+ ***************************************************************************/
diff --git a/x11-toolkits/xview/files/patch-clients+olwmslave+Imakefile b/x11-toolkits/xview/files/patch-clients+olwmslave+Imakefile
new file mode 100644
index 000000000000..96d73cc1f888
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-clients+olwmslave+Imakefile
@@ -0,0 +1,24 @@
+--- ./clients/olwmslave/Imakefile.orig	Tue Jun 29 07:12:14 1993
++++ ./clients/olwmslave/Imakefile	Sat Apr  1 18:26:06 2000
+@@ -38,18 +38,18 @@ SRCS = 	\
+         mem.c \
+         olwmslave.c \
+         propsrecv.c \
+-        propswin.c
++        propswin.c ${GETTEXT.C}
+ 
+ 
+ OBJS = 	\
+         cmdstream.o \
+         help_file.o \
+-        helprecv.o \ 
++        helprecv.o \
+         helpwin.o \
+         mem.o \
+         olwmslave.o \
+         propsrecv.o \
+-        propswin.o
++        propswin.o ${GETTEXT.O}
+ 
+ 
+ ALLFILES = \
diff --git a/x11-toolkits/xview/files/patch-clients+olwmslave+cmdstream.c b/x11-toolkits/xview/files/patch-clients+olwmslave+cmdstream.c
new file mode 100644
index 000000000000..ad1fca880f55
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-clients+olwmslave+cmdstream.c
@@ -0,0 +1,17 @@
+--- ./clients/olwmslave/cmdstream.c.orig	Tue Jun 29 07:12:10 1993
++++ ./clients/olwmslave/cmdstream.c	Sat Apr  1 18:26:06 2000
+@@ -50,10 +50,10 @@ static	CmdInfo		cmdInfo = {
+  *      Local Forward Declarations
+  * ---------------------------------------------------------------------*/
+ 
+-Command		*MatchCommand();
+-CmdAttr		*MatchAttr();
+-int		EncodeAttrValue();
+-int		DecodeAttrValue();
++static Command		*MatchCommand();
++static CmdAttr		*MatchAttr();
++static int		EncodeAttrValue();
++static int		DecodeAttrValue();
+ 
+ /* ----------------------------------------------------------------------
+  *      SetCmdStream
diff --git a/x11-toolkits/xview/files/patch-clients+olwmslave+helpwin.c b/x11-toolkits/xview/files/patch-clients+olwmslave+helpwin.c
new file mode 100644
index 000000000000..777b6387ffee
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-clients+olwmslave+helpwin.c
@@ -0,0 +1,18 @@
+--- clients/olwmslave/helpwin.c.orig	Fri Oct 17 18:23:54 2003
++++ clients/olwmslave/helpwin.c	Fri Oct 17 19:01:59 2003
+@@ -136,6 +136,7 @@
+ Bool		ImageHelpWindow();
+ void		MoreHelp();
+ void		ErrorNotice();
++static int	ConstrainMousePos();
+ 
+ /* ----------------------------------------------------------------------
+  *	ShowHelpWindow
+@@ -493,6 +494,7 @@
+ 	xv_set(hw->hwMGlassItem,
+ 		PANEL_LABEL_IMAGE,	hw->hwMGlassRender,
+ 		NULL);
++	return True;
+ }
+ 
+ /* ----------------------------------------------------------------------
diff --git a/x11-toolkits/xview/files/patch-clients+olwmslave+mem.c b/x11-toolkits/xview/files/patch-clients+olwmslave+mem.c
new file mode 100644
index 000000000000..9ac5ff67392b
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-clients+olwmslave+mem.c
@@ -0,0 +1,12 @@
+--- ./clients/olwmslave/mem.c.orig	Tue Jun 29 07:12:12 1993
++++ ./clients/olwmslave/mem.c	Sat Apr  1 18:26:06 2000
+@@ -16,7 +16,8 @@ static	char	sccsid[] = "@(#) mem.c 26.1 
+  *
+  */
+ 
+-#include <malloc.h>
++#include <sys/param.h>
++#include <stdlib.h>
+ #include <memory.h>
+ #include <stdio.h>
+ #include <sys/types.h>
diff --git a/x11-toolkits/xview/files/patch-config+Imakefile b/x11-toolkits/xview/files/patch-config+Imakefile
new file mode 100644
index 000000000000..edebc61e0e0b
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-config+Imakefile
@@ -0,0 +1,17 @@
+--- config/Imakefile.orig	Mon Sep 29 00:02:17 2003
++++ config/Imakefile	Mon Sep 29 00:02:17 2003
+@@ -8,10 +8,13 @@
+ /**/# config directory
+ /**/# @(#)Imakefile	1.9 28 Jun 1993 SMI
+ 
+-XVFILES = XView.cf XView.lib XView.obj XView.rules XView.tmpl library.tmpl
++#XVFILES = XView.cf XView.lib XView.obj XView.rules XView.tmpl library.tmpl
++XVFILES = XView.cf XView.lib XView.obj XView.rules XView.tmpl XView.prog
+ CFFILES = $(XVFILES) $(HEADERS)
+ 
+ InstallMultipleDestFlags(install,$(CFFILES),$(CONFIGDIR),$(INSTDATFLAGS))
++
++all::
+ 
+ depend::
+ 
diff --git a/x11-toolkits/xview/files/patch-config+XView.cf b/x11-toolkits/xview/files/patch-config+XView.cf
new file mode 100644
index 000000000000..9f5915c55545
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-config+XView.cf
@@ -0,0 +1,47 @@
+--- config/XView.cf.orig	Sun Jun 26 21:09:19 1994
++++ config/XView.cf	Sat Oct  4 12:37:28 2003
+@@ -101,7 +101,7 @@
+  *	the appropriate value.
+  */
+ #ifndef XVDestDir
+-#define XVDestDir /usr/X11/xview
++#define XVDestDir /usr/X11R6
+ #endif
+ /*
+  *	Command to add object modules to the library.
+@@ -139,7 +139,7 @@
+  *	installed in $(DESTDIR)/lib/X11/config (aka $(CONFIGDIR)).
+  */ 
+ #ifndef OnlyNeedsNewXViewConfigInstalled 
+-#define OnlyNeedsNewXViewConfigInstalled NO 
++#define OnlyNeedsNewXViewConfigInstalled YES
+ #endif 
+ /*
+  *	If you would like the XView man pages to be installed in 
+@@ -195,7 +195,7 @@
+ # if PreR4Server
+ # define LibXViewDefines -DPRE_R4_ICCCM
+ # else
+-# define LibXViewDefines -DFULL_R5 -I$(OPENWINHOME)/include -DSUNOS41 -DX11R6
++#   define LibXViewDefines -I$(OPENWINHOME)/include -DSUNOS41 -DX11R6 
+ # endif
+ #endif
+ /*
+@@ -259,7 +259,7 @@
+  *	following variable to YES.  
+  */
+ #ifndef InstallAllImages
+-#define InstallAllImages NO
++#define InstallAllImages YES
+ #endif
+ /*
+  *	If you do not already have the textsw extras menu installed in
+@@ -360,7 +360,7 @@
+  *    	be defined as -PIC
+  */
+ #ifndef PositionIndependentCodeFlag
+-#define PositionIndependentCodeFlag -PIC
++#define PositionIndependentCodeFlag -fPIC
+ #endif
+ 
+ /*
diff --git a/x11-toolkits/xview/files/patch-config+XView.obj b/x11-toolkits/xview/files/patch-config+XView.obj
new file mode 100644
index 000000000000..db1ce5e8c366
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-config+XView.obj
@@ -0,0 +1,70 @@
+--- config/XView.obj.orig	Tue Sep 30 23:10:16 2003
++++ config/XView.obj	Tue Sep 30 23:10:16 2003
+@@ -15,7 +15,7 @@
+             STD_DEFINES = StandardDefines LibXViewDefines 
+ #endif
+ HEADERS= ${HDRSPUBLIC} ${HDRSPRIVATE}
+-INCLUDES= -I$(BUILDINCDIR)$(INCDIR) 
++INCLUDES= -I$(BUILDINCDIR)/$(INCDIR) 
+ OBJS = $(TEXT_OBJS) $(DATA_OBJS) $(SPECIAL_OBJS)
+ #if !NotLibXView
+ ALLFILES = $(SRCS) $(HEADERS)
+@@ -54,9 +54,10 @@
+  * data.
+  */
+ #if SharedLibXView
+-# if SubdirHasTextObjs
++#if SubdirHasTextObjs
+ SubdirNormalSharedLibraryTarget(${LIBTARGET},${SOREV},$(TEXT_OBJS) $(SPECIAL_OBJS),$(SHARED_DIR),shared)
+-# endif
++#endif
++
+ # if SubdirHasDataObjs
+ #  if DebugLibXView
+ SubdirSpecialSharedAndDebuggedObjectRule($(DATA_OBJS),/**/,/**/)
+@@ -85,17 +86,17 @@
+ 
+ #if SubdirHasPublicHeaders
+ # if NotLibXView
+-BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),/**/)
++BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),.)
+ 
+ install::
+-	$(MKDIRHIER) $(PUB_HEADER_DEST)
++	$(MKDIRHIER) $(DESTDIR)$(PUB_HEADER_DEST)
+ 
+ InstallMultiple($(HDRSPUBLIC),$(PUB_HEADER_DEST))
+ # else
+-BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),/**/)
++BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),.)
+ 
+ install::
+-	$(MKDIRHIER) $(XVPUB_HEADER_DEST)
++	$(MKDIRHIER) $(DESTDIR)$(XVPUB_HEADER_DEST)
+ 
+ InstallMultiple($(HDRSPUBLIC),$(XVPUB_HEADER_DEST))
+ # endif
+@@ -103,19 +104,19 @@
+ 
+ #if SubdirHasPrivateHeaders
+ # if NotLibXView
+-BuildIncludes($(HDRSPRIVATE),$(PRI_INCDIR),/**/)
++BuildIncludes($(HDRSPRIVATE),$(PRI_INCDIR),.)
+ # else
+-BuildIncludes($(HDRSPRIVATE),$(XVPRI_INCDIR),/**/)
++BuildIncludes($(HDRSPRIVATE),$(XVPRI_INCDIR),.)
+ # endif
+ # if InstallPrivateHeaders
+ #  if NotLibXView
+ install::
+-	$(MKDIRHIER) $(PRI_HEADER_DEST)
++	$(MKDIRHIER) $(DESTDIR)$(PRI_HEADER_DEST)
+ 
+ InstallMultiple($(HDRSPRIVATE),$(PRI_HEADER_DEST))
+ #  else
+ install::
+-	$(MKDIRHIER) $(XVPRI_HEADER_DEST)
++	$(MKDIRHIER) $(DESTDIR)$(XVPRI_HEADER_DEST)
+ 
+ InstallMultiple($(HDRSPRIVATE),$(XVPRI_HEADER_DEST))
+ #  endif
diff --git a/x11-toolkits/xview/files/patch-config+XView.rules b/x11-toolkits/xview/files/patch-config+XView.rules
new file mode 100644
index 000000000000..0c0fddf9f210
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-config+XView.rules
@@ -0,0 +1,33 @@
+--- config/XView.rules.orig	Mon Sep 29 00:02:17 2003
++++ config/XView.rules	Mon Sep 29 00:02:17 2003
+@@ -148,7 +148,7 @@ lib/**/libname.so.rev:: solist 						@@\
+ 	$(RM) $@~ sodir/lib/**/libname.so.xs.o				@@\
+ 	@if [ -f xstrings ]; then \                                     @@\
+         	$(RM) strings; $(CP) xstrings strings; fi               @@\
+-	(cd sodir; $(LD) -o ../$@~ $(SHLIBLDFLAGS) ?*.o)		@@\
++	(cd sodir; $(CC) -o ../$@~ -Wl,-soname,$@ $(SHLIBLDFLAGS) ?*.o)	@@\
+ 	-@if [ -f strings~ ]; then $(RM) strings~; else exit 0; fi	@@\
+ 	$(RM) $@  							@@\
+ 	$(MV) $@~ $@							@@\
+@@ -175,7 +175,8 @@ lib/**/libname.so.rev:: solist 						@@\
+ 	@if [ -f xstrings ]; then \                                     @@\
+         	$(RM) strings; $(CP) xstrings strings; fi               @@\
+ 	-@if [ ! -x objsort ];then $(CHMOD) 755 objsort;else exit 0;fi	@@\
+-	$(LD) `objsort objlist sodir` -o $@~ $(SHLIBLDFLAGS) 		@@\
++	$(CC) `objsort objlist sodir` -o $@~ -Wl,-soname,$@\            @@\
++		$(SHLIBLDFLAGS) 					@@\
+ 	@if [ -f strings~ ]; then $(RM) strings~; else exit 0; fi	@@\
+ 	$(RM) $@  							@@\
+ 	$(MV) $@~ $@							@@\ 
+@@ -366,9 +366,9 @@
+ #ifndef InstallSharedLibraryNoBuild
+ #define	InstallSharedLibraryNoBuild(libname,rev,dest)				@@\
+ install::  								@@\
+-        $(RM) /dest/lib/**/libname.so                                   @@\
++	$(RM) /dest/lib/**/libname.so                                   @@\
+ 	$(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.so.rev dest	@@\
+-        (cd dest; $(LN) lib/**/libname.so.rev lib/**/libname.so)
++	(cd dest; $(LN) lib/**/libname.so.rev lib/**/libname.so)
+ 
+ #endif
+ 
diff --git a/x11-toolkits/xview/files/patch-config+XView.tmpl b/x11-toolkits/xview/files/patch-config+XView.tmpl
new file mode 100644
index 000000000000..10f6d7adac13
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-config+XView.tmpl
@@ -0,0 +1,95 @@
+--- config/XView.tmpl.orig	Mon Sep 29 00:02:17 2003
++++ config/XView.tmpl	Mon Sep 29 00:02:17 2003
+@@ -96,7 +96,7 @@
+  *      Work around small conflict with Project.tmpl file
+  */
+ #if UseInstalled
+-              MKDIRHIER = BourneShell BinDir/mkdirhier
++              MKDIRHIER = mkdirhier
+ #endif
+ 
+ #if OsHasLocale
+@@ -192,14 +192,6 @@
+                      AS = as
+  */
+ /*
+- *	use the same trick X11R5 does for defining rules for installed libs
+- */
+-#ifdef UseInstalled
+-#define _Use(a,b) a
+-#else
+-#define _Use(a,b) b
+-#endif
+-/*
+  *	Temporary directory used during build process before the include
+  *	files are installed.  This is just a place where symbolic links are
+  *	placed to point back to the actual files in the build hierarchy to
+@@ -224,7 +216,7 @@
+  *	afterwards.
+  */
+ #ifndef XVIncludeDirName
+-#define XVIncludeDirName /include
++#define XVIncludeDirName include
+ #endif
+                  INCDIR = XVIncludeDirName
+ /*
+@@ -356,10 +348,10 @@
+ 
+ #if SystemV4
+              SYSV_CLIENT_LIB = -lintl -ldl
+-	     XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
++             XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
+ #else
+              SYSV_CLIENT_LIB =
+-	     XVCLIENTSYSDEFINES = -DSUNOS41
++             XVCLIENTSYSDEFINES = -DSUNOS41
+ #endif
+ 
+ /*
+@@ -371,16 +363,16 @@
+  */
+ 
+ #if XvI18nLevel == 4
+-	XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5
+-	XVCLIENTMISCLIB = -lw
+-	XVCLIENTINCLUDES = -I$(OPENWINHOME)/include
++        XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5
++        XVCLIENTMISCLIB = -lw
++        XVCLIENTINCLUDES = -I$(OPENWINHOME)/include
+ #else
+-	XVCLIENTI18NDEFINES = -DOW_I18N_L3
+-	XVCLIENTMISCLIB = 
+-	XVCLIENTINCLUDES = 
++        XVCLIENTI18NDEFINES = -DOW_I18N_L3
++        XVCLIENTMISCLIB = 
++        XVCLIENTINCLUDES = 
+ #endif
+ 
+-	XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
++        XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
+ 
+ /*
+  *	Define libraries for XView clients
+@@ -410,7 +402,7 @@
+  */
+ #if SharedLibXView
+ # ifndef SharedXViewRev
+-#if SystemV4
++#if SystemV4 || UseElfFormat
+ # define SharedXViewRev 3
+ #else
+ # define SharedXViewRev 3.2
+@@ -449,12 +441,8 @@
+  *	Include the XView specific makefile macros.
+  */
+ 
+-/*  This is just needed here because X11 is installed with gcc as
+-    a default compiler.
+-	lumpi@dobag.in-berlin.de
+-
+ #undef CcCmd
+ #define CcCmd cc
+-#define LibraryCcCmd cc */
++#define LibraryCcCmd cc
+ #include <XView.rules>
+ #endif
diff --git a/x11-toolkits/xview/files/patch-doc+Imakefile b/x11-toolkits/xview/files/patch-doc+Imakefile
new file mode 100644
index 000000000000..20f86b189bb3
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-doc+Imakefile
@@ -0,0 +1,11 @@
+--- doc/Imakefile.orig	Mon Sep 29 00:02:17 2003
++++ doc/Imakefile	Mon Sep 29 00:02:17 2003
+@@ -17,7 +17,7 @@
+ ALLFILES = $(DOCFILES)
+ 
+ install::
+-        $(MKDIRHIER) $(DOC_DEST)
++	$(MKDIRHIER) $(DOC_DEST)
+ 
+ InstallNonExecList($(DOCFILES),$(DOC_DEST))
+ PopulateSCCSTree(h,$(ALLFILES) README)
diff --git a/x11-toolkits/xview/files/patch-images+Imakefile b/x11-toolkits/xview/files/patch-images+Imakefile
new file mode 100644
index 000000000000..e496fb5f520d
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-images+Imakefile
@@ -0,0 +1,14 @@
+--- images/Imakefile.orig	Mon Sep 29 00:02:43 2003
++++ images/Imakefile	Mon Sep 29 00:02:40 2003
+@@ -99,9 +99,9 @@
+ 
+ ALLFILES = $(BITMAPS) $(ICONS) $(PIXRECTS) $(CURSORS) $(IMAGES)
+ 
+-all: $(SRCS)
++all:: $(SRCS)
+ 
+-BuildIncludes($(INCLUDES_SRCS),$(IMAGE_INCDIR),/**/)
++BuildIncludes($(INCLUDES_SRCS),$(IMAGE_INCDIR),.)
+ 
+ install:: $(SRCS)
+ 	$(MKDIRHIER) $(HEADER_DEST)/$(IMAGEINC)
diff --git a/x11-toolkits/xview/files/patch-la b/x11-toolkits/xview/files/patch-la
deleted file mode 100644
index c66ec9775df5..000000000000
--- a/x11-toolkits/xview/files/patch-la
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -rc ../old/xview3.2p1-X11R6/bitmaps/Imakefile ./bitmaps/Imakefile
-*** ../old/xview3.2p1-X11R6/bitmaps/Imakefile	Tue Jun 29 01:19:54 1993
---- ./bitmaps/Imakefile	Sun Nov 20 13:38:56 1994
-***************
-*** 36,42 ****
-  
-! all: $(SRCS)
-  
-! BuildIncludes($(INCLUDES_SRCS),$(BITMAP_INCDIR),/**/)
-  
-  install:: $(SRCS)
-  	$(MKDIRHIER) $(HEADER_DEST)/$(BITMAPINC)
---- 36,42 ----
-  
-! all:: $(SRCS)
-  
-! BuildIncludes($(INCLUDES_SRCS),$(BITMAP_INCDIR),.)
-  
-  install:: $(SRCS)
-  	$(MKDIRHIER) $(HEADER_DEST)/$(BITMAPINC)
-diff -rc ../old/xview3.2p1-X11R6/doc/Imakefile ./doc/Imakefile
-*** ../old/xview3.2p1-X11R6/doc/Imakefile	Tue Jun 29 01:13:15 1993
---- ./doc/Imakefile	Sun Nov 20 13:38:59 1994
-***************
-*** 17,23 ****
-  ALLFILES = $(DOCFILES)
-  
-  install::
-!         $(MKDIRHIER) $(DOC_DEST)
-  
-  InstallNonExecList($(DOCFILES),$(DOC_DEST))
-  PopulateSCCSTree(h,$(ALLFILES) README)
---- 17,23 ----
-  ALLFILES = $(DOCFILES)
-  
-  install::
-! 	$(MKDIRHIER) $(DOC_DEST)
-  
-  InstallNonExecList($(DOCFILES),$(DOC_DEST))
-  PopulateSCCSTree(h,$(ALLFILES) README)
-diff -rc ../old/xview3.2p1-X11R6/images/Imakefile ./images/Imakefile
-*** ../old/xview3.2p1-X11R6/images/Imakefile	Tue Jun 29 01:18:41 1993
---- ./images/Imakefile	Sun Nov 20 13:38:59 1994
-***************
-*** 101,107 ****
-  
-! all: $(SRCS)
-  
-! BuildIncludes($(INCLUDES_SRCS),$(IMAGE_INCDIR),/**/)
-  
-  install:: $(SRCS)
-  	$(MKDIRHIER) $(HEADER_DEST)/$(IMAGEINC)
---- 101,107 ----
-  
-! all:: $(SRCS)
-  
-! BuildIncludes($(INCLUDES_SRCS),$(IMAGE_INCDIR),.)
-  
-  install:: $(SRCS)
-  	$(MKDIRHIER) $(HEADER_DEST)/$(IMAGEINC)
-diff -rc ../old/xview3.2p1-X11R6/lib/pixrect/Imakefile ./lib/pixrect/Imakefile
-*** ../old/xview3.2p1-X11R6/lib/pixrect/Imakefile	Tue Jun 29 01:18:39 1993
---- ./lib/pixrect/Imakefile	Sun Nov 20 13:39:15 1994
-***************
-*** 41,48 ****
-  all:: 
-  
-  #if InstallPixrectHeaders
-! BuildIncludes($(HEADERS),$(PIXRECT_INCDIR),/**/)
-! BuildIncludes($(HEADERS2),$(INCDIR),/**/)
-   
-  install::
-  	$(MKDIRHIER) $(PIXRECT_HEADER_DEST)
---- 41,48 ----
-  all:: 
-  
-  #if InstallPixrectHeaders
-! BuildIncludes($(HEADERS),$(PIXRECT_INCDIR),.)
-! BuildIncludes($(HEADERS2),$(INCDIR),.)
-   
-  install::
-  	$(MKDIRHIER) $(PIXRECT_HEADER_DEST)
diff --git a/x11-toolkits/xview/files/patch-lb b/x11-toolkits/xview/files/patch-lb
deleted file mode 100644
index 9537df08a57c..000000000000
--- a/x11-toolkits/xview/files/patch-lb
+++ /dev/null
@@ -1,132 +0,0 @@
-*** lib/libolgx/ol_button.c.orig	Fri Jan 22 16:13:24 1999
---- lib/libolgx/ol_button.c	Fri Jan 22 16:19:41 1999
-***************
-*** 241,248 ****
-  				   x + ((centerx > 0) ? centerx : 0),
-  				   y + ((centery > 0) ? centery : 0),
-  				   (((Pixlabel *) label)->width > width)? 
-!                                                width:((Pixlabel *)label)->width ,
-! 				  (height) ? height : Button_Height(info) - 2, state);
-  	} else if (state & OLGX_LABEL_IS_XIMAGE) {
-  
-  	    int             centerx, centery;
---- 241,252 ----
-  				   x + ((centerx > 0) ? centerx : 0),
-  				   y + ((centery > 0) ? centery : 0),
-  				   (((Pixlabel *) label)->width > width)? 
-! 						width:((Pixlabel *)label)->width ,
-! 				  (height) ? 
-! 				   ((((Pixlabel *) label)->height > height) ? 
-! 						 height : ((Pixlabel *)label)->height)
-!  					: Button_Height(info) - 2, state);
-!  
-  	} else if (state & OLGX_LABEL_IS_XIMAGE) {
-  
-  	    int             centerx, centery;
-***************
-*** 255,261 ****
-  				   y + ((centery > 0) ? centery : 0),
-  				   (((Pixlabel *) label)->width > width)? 
-                                                 width:((Pixlabel *)label)->width ,
-! 				  (height) ? height : Button_Height(info) - 2, state);
-         } else {
-  
-  
---- 259,268 ----
-  				   y + ((centery > 0) ? centery : 0),
-  				   (((Pixlabel *) label)->width > width)? 
-                                                 width:((Pixlabel *)label)->width ,
-! 				  (height) ? 
-! 				   ((((Pixlabel *) label)->height > height) ? 
-! 					       height : ((Pixlabel *)label)->height)
-! 					: Button_Height(info) - 2, state);
-         } else {
-  
-  
-*** lib/libolgx/ol_init.c.orig	Tue Jun 29 00:18:28 1993
---- lib/libolgx/ol_init.c	Fri Jan 22 17:09:26 1999
-***************
-*** 9,15 ****
---- 9,18 ----
-  
-  #include <stdio.h>
-  #include <stdlib.h>
-+ #include <sys/param.h>
-+ #ifndef __STDC__
-  #include <malloc.h>
-+ #endif
-  #include <X11/Xlib.h>
-  #include "olgx_impl.h"
-  #include "busy.h"
-***************
-*** 699,705 ****
---- 702,718 ----
-  	    XSetFont(info->dpy, info->gc_rec[OLGX_TEXTGC]->gc,
-  		     info->textfont->fid);
-  
-+  	    /* Even if !three_d, OLGX_TEXTGC_REV doesn't necessarily exist,
-+ 	     * so we only set the font, if it does. I don't know if this is
-+ 	     * the right place to change it, but this fixes a bug reported
-+ 	     * on alt.toolkits.xview.
-+ 	     * martin-2.buck@student.uni-ulm.de
-+ 	     */
-+ #if 1
-+ 	    if (!info->three_d && info->gc_rec[OLGX_TEXTGC_REV])
-+ #else
-  	    if (!info->three_d)
-+ #endif
-  		/* Only 2d has TEXTGC_REV */
-  		XSetFont(info->dpy, info->gc_rec[OLGX_TEXTGC_REV]->gc,
-  			 info->textfont->fid);
-***************
-*** 711,718 ****
---- 724,738 ----
-  	 */
-  
-  	XSetFont(info->dpy, info->gc_rec[OLGX_TEXTGC]->gc, font_info->fid);
-+ 	/* See comment above.
-+ 	 * martin-2.buck@student.uni-ulm.de
-+ 	 */
-+ #if 1
-+ 	if (!info->three_d && info->gc_rec[OLGX_TEXTGC_REV])
-+ #else
-  
-  	if (!info->three_d)
-+ #endif
-  	    /* Only 2d has TEXTGC_REV */
-            XSetFont(info->dpy, info->gc_rec[OLGX_TEXTGC_REV]->gc, font_info->fid);
-  #endif /* OW_I18N */
-***************
-*** 925,931 ****
---- 945,958 ----
-      if (! (Olgx_Flags(info) & OLGX_FONTSET)) {
-  #endif
-      info->gc_rec[OLGX_TEXTGC]->values.font = info->textfont->fid;
-+     /* See comment above.
-+      * martin-2.buck@student.uni-ulm.de
-+      */
-+ #if 1
-+     if (!info->three_d && info->gc_rec[OLGX_TEXTGC_REV])
-+ #else
-      if (!info->three_d)
-+ #endif
-  	info->gc_rec[OLGX_TEXTGC_REV]->values.font = info->textfont->fid;
-  #ifdef OW_I18N
-      }
-*** lib/libolgx/ol_sb.c.orig	Tue Jun 29 00:18:29 1993
---- lib/libolgx/ol_sb.c	Thu Jan 21 22:39:01 1999
-***************
-*** 11,17 ****
---- 11,22 ----
-   */
-  
-  #include <stdio.h>
-+ #include <sys/param.h>
-+ #if (defined(BSD) && (BSD >= 199103))
-+ #include <stdlib.h>
-+ #else
-  #include <malloc.h>
-+ #endif
-  #include <X11/Xlib.h>
-  #include <X11/Xutil.h>
-  #include "olgx_impl.h"
diff --git a/x11-toolkits/xview/files/patch-ld b/x11-toolkits/xview/files/patch-ld
deleted file mode 100644
index 991ca6754e42..000000000000
--- a/x11-toolkits/xview/files/patch-ld
+++ /dev/null
@@ -1,239 +0,0 @@
-*** lib/libxview/help/help_file.c.orig	Fri Jan 22 18:35:11 1999
---- lib/libxview/help/help_file.c	Fri Jan 22 18:38:24 1999
-***************
-*** 18,24 ****
-  
-  #include <xview_private/i18n_impl.h>
-  
-! #define DEFAULT_HELP_DIRECTORY "/usr/lib/help"
-  #define MAX_MORE_HELP_CMD 128
-  
-  Xv_private char *xv_strtok();
---- 18,24 ----
-  
-  #include <xview_private/i18n_impl.h>
-  
-! #define DEFAULT_HELP_DIRECTORY "/usr/X11R6/lib/help"
-  #define MAX_MORE_HELP_CMD 128
-  
-  Xv_private char *xv_strtok();
-*** lib/libxview/icon/icon.c.orig	Fri Jan 22 18:41:57 1999
---- lib/libxview/icon/icon.c	Fri Jan 22 18:50:48 1999
-***************
-*** 343,357 ****
-      val.ts_x_origin = 0;
-      val.ts_y_origin = 0;	
-      val_mask = GCForeground | GCBackground | GCFunction | 
-!                GCPlaneMask | GCFillStyle | GCTileStipXOrigin | 
-                 GCTileStipYOrigin;
-      XChangeGC(display, gc, val_mask, &val );
-  
-      if (PR_NOT_MPR(((Pixrect *) icon->ic_mpr)))  {
-  	DRAWABLE_INFO_MACRO( (Xv_opaque) icon->ic_mpr, src_info );
-  	val.clip_mask = xv_xid(mask_info);
-! 	val.stipple = xv_xid(src_info);
-! 	val_mask = GCStipple | GCClipMask;
-  	XChangeGC(display, gc, val_mask, &val );
-  
-  	if ( xv_rop_internal( display, xid, gc, icon->ic_gfxrect.r_left + x,
---- 343,374 ----
-      val.ts_x_origin = 0;
-      val.ts_y_origin = 0;	
-      val_mask = GCForeground | GCBackground | GCFunction | 
-!                GCPlaneMask | GCTileStipXOrigin | 
-                 GCTileStipYOrigin;
-      XChangeGC(display, gc, val_mask, &val );
-  
-      if (PR_NOT_MPR(((Pixrect *) icon->ic_mpr)))  {
-  	DRAWABLE_INFO_MACRO( (Xv_opaque) icon->ic_mpr, src_info );
-+ 
-+ 	/* stipple only if we have a bitmap icon */
-+ 	if (xv_depth(src_info) == 1) {
-+ 		val.stipple = xv_xid(src_info);
-+ 		val.fill_style = FillOpaqueStippled;
-+ 		val_mask = GCFillStyle | GCStipple;
-+ 	} else if (xv_depth(info) == xv_depth(src_info)) {
-+ 		val.tile = xv_xid(src_info);
-+ 		val.fill_style = FillTiled;
-+ 		val_mask = GCFillStyle | GCTile;
-+ 	} else {
-+ 		xv_error(NULL,
-+ 			ERROR_STRING,
-+ 		 	XV_MSG("icon: can't handle drawables of different depth"),
-+ 		 	0);
-+ 		return (XV_ERROR);
-+ 	}	
-+ 
-  	val.clip_mask = xv_xid(mask_info);
-! 	val_mask |= GCClipMask;
-  	XChangeGC(display, gc, val_mask, &val );
-  
-  	if ( xv_rop_internal( display, xid, gc, icon->ic_gfxrect.r_left + x,
-*** lib/libxview/win/win_input.c~	Tue Oct  8 22:51:45 1996
---- lib/libxview/win/win_input.c	Wed Apr 17 02:26:55 1996
-***************
-*** 854,860 ****
-  #ifdef X11R6
-  	/* lumpi@dobag.in-berlin.de */
-  		int ksym_pcc;
-! 		XGetKeyboardMapping(display,NoSymbol,0,&ksym_pcc);
-  		for (index = 0; index < ksym_pcc; index++) {
-  #else
-  		for (index = 0; index < display->keysyms_per_keycode; index++) {
---- 854,862 ----
-  #ifdef X11R6
-  	/* lumpi@dobag.in-berlin.de */
-  		int ksym_pcc;
-! 		int tc_min_keycode, tc_max_keycode;
-! 		XDisplayKeycodes(display, &tc_min_keycode, &tc_max_keycode);
-! 		XGetKeyboardMapping(display,tc_min_keycode,tc_max_keycode-tc_min_keycode-1,&ksym_pcc);
-  		for (index = 0; index < ksym_pcc; index++) {
-  #else
-  		for (index = 0; index < display->keysyms_per_keycode; index++) {
-***************
-*** 862,868 ****
-  		    if ((ksym = XLookupKeysym(ek, index)) != NoSymbol)
-  			if (IsKeypadKey(ksym)) {
-  			    /* See if key has been rebound. */
-! 			    if (!translate_key(display, ksym, ek->state,
-  					       buffer, BUFFERSIZE)) {
-  			        (void)win_translate_KP_keysym(ksym, buffer);
-  			    }
---- 864,870 ----
-  		    if ((ksym = XLookupKeysym(ek, index)) != NoSymbol)
-  			if (IsKeypadKey(ksym)) {
-  			    /* See if key has been rebound. */
-! 			    if (translate_key(display, ksym, ek->state,
-  					       buffer, BUFFERSIZE)) {
-  			        (void)win_translate_KP_keysym(ksym, buffer);
-  			    }
-***************
-*** 2721,2728 ****
-   * Xlib's.
-   */
-  
-! #ifdef X11R6
-! /* lumpi@dobag.in-berlin.de */
-  static int
-  translate_key(dpy, symbol, modifiers, buffer, nbytes)
-      Display 		*dpy;
---- 2723,2732 ----
-   * Xlib's.
-   */
-  
-! #ifdef X11R6 
-! /* lumpi@dobag.in-berlin.de  
-!    tom@sees.bangor.ac.uk this replacement for X11R6 doesn't work. At least 
-!    it should now return sensible values though. */
-  static int
-  translate_key(dpy, symbol, modifiers, buffer, nbytes)
-      Display 		*dpy;
-***************
-*** 2732,2742 ****
-      int 		 nbytes;
-  {
-  	/* This is _very_ rude ! */
-! 	strcpy(buffer,XKeysymToString(symbol));
-  }
-  
-- #else
-  
-  static int
-  translate_key(dpy, symbol, modifiers, buffer, nbytes)
-      Display 		*dpy;
---- 2736,2753 ----
-      int 		 nbytes;
-  {
-  	/* This is _very_ rude ! */
-! 	char *string;
-! 	string = XKeysymToString(symbol);
-!      	if (string) {
-! 		strncpy(buffer,XKeysymToString(symbol),nbytes);
-! 		return(strlen(buffer));
-! 	}
-! 	else
-! 		return 0;
-  }
-  
-  
-+ #else
-  static int
-  translate_key(dpy, symbol, modifiers, buffer, nbytes)
-      Display 		*dpy;
-***************
-*** 2762,2765 ****
-      }
-      return 0;
-  }
-! #endif
---- 2773,2776 ----
-      }
-      return 0;
-  }
-! #endif 
-
-3.
-
-
-*** lib/libxview/ttysw/tty_mapkey.c~	Tue Jun 29 06:17:20 1993
---- lib/libxview/ttysw/tty_mapkey.c	Tue Jan 16 23:58:56 1996
-***************
-*** 500,506 ****
-   * have more time.
-   */
-  
-! #ifdef i386
-  static void
-  ttysw_arrow_keys_to_string(xv_id, str)
-      unsigned        xv_id;
---- 500,506 ----
-   * have more time.
-   */
-  
-! #if defined(i386) && !defined (__FreeBSD__)
-  static void
-  ttysw_arrow_keys_to_string(xv_id, str)
-      unsigned        xv_id;
-*** lib/libxview/ttysw/cim_size.c.orig  Tue Jun 29 06:17:14 1993
---- lib/libxview/ttysw/cim_size.c       Sat Oct 25 00:53:49 1997
-***************
-*** 156,174 ****
-  {
-  
-      if (lines_ptr) {
-!         cfree((CHAR *) (lines_ptr));
-  	lines_ptr = NULL;
-      }
-      if (image) {
-!         cfree((CHAR **) image);
-  	image = NULL;
-      }
-      if (mode_ptr) {
-! 	cfree((char *) (mode_ptr));
-  	mode_ptr = NULL;
-      }
-      if (screenmode) {
-! 	cfree((char **) screenmode);
-  	screenmode = NULL;
-      }
-  }
---- 156,174 ----
-  {
-  
-      if (lines_ptr) {
-!         free((CHAR *) (lines_ptr));
-  	lines_ptr = NULL;
-      }
-      if (image) {
-!         free((CHAR **) image);
-  	image = NULL;
-      }
-      if (mode_ptr) {
-! 	free((char *) (mode_ptr));
-  	mode_ptr = NULL;
-      }
-      if (screenmode) {
-! 	free((char **) screenmode);
-  	screenmode = NULL;
-      }
-  }
diff --git a/x11-toolkits/xview/files/patch-le b/x11-toolkits/xview/files/patch-le
deleted file mode 100644
index 399c5d7d88be..000000000000
--- a/x11-toolkits/xview/files/patch-le
+++ /dev/null
@@ -1,66 +0,0 @@
-*** lib/libxview/misc/gettext.h.orig	Fri Jan 22 19:23:05 1999
---- lib/libxview/misc/gettext.h	Fri Jan 22 19:25:20 1999
-***************
-*** 1,7 ****
-  /* @(#)gettext.h 50.11 93/06/28 SMI */
-  
-  #define DEFAULT_DOMAIN	"default"
-! #define DEFAULT_BINDING "/usr/lib/locale\n"
-  #define COOKIE 0xFF
-  #define BINDINGLISTDELIM '\n'
-  
---- 1,7 ----
-  /* @(#)gettext.h 50.11 93/06/28 SMI */
-  
-  #define DEFAULT_DOMAIN	"default"
-! #define DEFAULT_BINDING "/usr/X11R6/lib/locale\n"
-  #define COOKIE 0xFF
-  #define BINDINGLISTDELIM '\n'
-  
-*** lib/libxview/misc/i18n_impl.h.orig	Tue Jun 29 00:16:31 1993
---- lib/libxview/misc/i18n_impl.h	Fri Jan 22 19:31:53 1999
-***************
-*** 25,30 ****
---- 25,34 ----
-  
-  #include  <locale.h>
-  
-+ #if !defined(LC_MESSAGES) && defined(LC_RESPONSE)
-+ #define LC_MESSAGES LC_RESPONSE
-+ #endif
-+ 
-  extern char	*dgettext();
-  
-  #define XV_I18N_MSG(d,s)	(dgettext(d,s))
---- lib/libxview/misc/portable.h.orig	Tue Jun 29 14:16:34 1993
-+++ lib/libxview/misc/portable.h	Sat Jan  9 23:19:57 1999
-@@ -10,6 +10,7 @@
- #ifndef xview_portable_h_DEFINED
- #define xview_portable_h_DEFINED
- 
-+#include <sys/param.h>
- #include <xview/attr.h>
- 
- #if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)
-@@ -24,6 +25,10 @@
- 
- EXTERN_FUNCTION (Attr_avlist copy_va_to_av, (va_list valist, Attr_avlist avlist, Attr_attribute attr1));
- 
-+#ifdef __alpha__
-+#define	NO_CAST_VATOAV
-+#endif
-+
- #ifdef NO_CAST_VATOAV
- #define AVLIST_DECL  Attr_attribute avarray[ATTR_STANDARD_SIZE];  \
-                      Attr_avlist    avlist = avarray
-@@ -70,7 +75,11 @@
- #define	XV_USE_TERMIOS
- #define	XV_USE_SVR4_PTYS
- #else	/* SVR4 */
-+#if (defined(BSD) && (BSD >= 199103))
-+#define XV_USE_TERMIOS
-+#else
- #undef	XV_USE_TERMIOS
-+#endif
- #undef	XV_USE_SVR4_PTYS
- #endif	/* SVR4 */
diff --git a/x11-toolkits/xview/files/patch-lf b/x11-toolkits/xview/files/patch-lf
deleted file mode 100644
index 0e52552d0798..000000000000
--- a/x11-toolkits/xview/files/patch-lf
+++ /dev/null
@@ -1,64 +0,0 @@
-*** lib/libxview/notify/ndet_loop.c~	Tue Nov 22 04:40:21 1994
---- lib/libxview/notify/ndet_loop.c	Tue Nov 22 05:35:17 1994
-***************
-*** 21,27 ****
---- 21,31 ----
-  #include <xview_private/nint.h>
-  #include <xview_private/ndis.h>	/* For ndis_dispatch */
-  #ifndef SVR4
-+ #ifndef __FreeBSD__
-  #include <syscall.h>
-+ #else
-+ #include <sys/syscall.h>
-+ #endif
-  #else SVR4
-  #include <sys/syscall.h>
-  #include <sys/poll.h>
-*** lib/libxview/notify/sys_fcntl.c~	Mon Jun 28 22:18:17 1993
---- lib/libxview/notify/sys_fcntl.c	Tue Nov 22 07:48:49 1994
-***************
-*** 15,21 ****
---- 15,25 ----
-   */
-  
-  #ifndef SVR4
-+ #ifndef __FreeBSD__
-  #include <syscall.h>
-+ #else
-+ #include <sys/syscall.h>
-+ #endif
-  #else SVR4
-  #include <sys/syscall.h>
-  #endif SVR4
-*** lib/libxview/notify/sys_read.c~	Mon Jun 28 22:18:01 1993
---- lib/libxview/notify/sys_read.c	Tue Nov 22 08:16:11 1994
-***************
-*** 15,21 ****
---- 15,25 ----
-   */
-  
-  #ifndef SVR4
-+ #ifndef __FreeBSD__
-  #include <syscall.h>
-+ #else
-+ #include <sys/syscall.h>
-+ #endif
-  #else SVR4
-  #include <sys/syscall.h>
-  #endif SVR4
-*** lib/libxview/notify/sys_select.c~	Mon Jun 28 22:18:11 1993
---- lib/libxview/notify/sys_select.c	Tue Nov 22 08:20:27 1994
-***************
-*** 15,21 ****
---- 15,25 ----
-   */
-  
-  #ifndef SVR4
-+ #ifndef __FreeBSD__
-  #include <syscall.h>
-+ #else
-+ #include <sys/syscall.h>
-+ #endif
-  #else SVR4
-  #include <values.h>
-  #include <sys/time.h>
diff --git a/x11-toolkits/xview/files/patch-li b/x11-toolkits/xview/files/patch-li
deleted file mode 100644
index c6cd20d98fc9..000000000000
--- a/x11-toolkits/xview/files/patch-li
+++ /dev/null
@@ -1,2544 +0,0 @@
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/attr/attr_copy.c ./lib/libxview/attr/attr_copy.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/attr/attr_copy.c	Tue Jun 29 01:14:35 1993
---- ./lib/libxview/attr/attr_copy.c	Sun Nov 20 13:39:00 1994
-***************
-*** 12,17 ****
---- 12,22 ----
-  
-  #include <xview/attr.h>
-  
-+ static int copy_1_attr();
-+ static int copy_counted_list();
-+ static int copy_singleton();
-+ static int copy_null_list();
-+ 
-  /*
-   * attr_copy:	copy an attribute list, returning the size in bytes
-   */
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/base/Imakefile ./lib/libxview/base/Imakefile
-*** ../old/xview3.2p1-X11R6/lib/libxview/base/Imakefile	Tue Jun 29 01:14:40 1993
---- ./lib/libxview/base/Imakefile	Sun Nov 20 13:39:00 1994
-***************
-*** 37,43 ****
-  	drawable.o\
-  	xv_debug.o\
-  	xv_parse.o\
-! 	xv_list.o\ 
-  	xv_error.o
-  
-  SRCS=\
---- 37,43 ----
-  	drawable.o\
-  	xv_debug.o\
-  	xv_parse.o\
-! 	xv_list.o\
-  	xv_error.o
-  
-  SRCS=\
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/base/base.h ./lib/libxview/base/base.h
-*** ../old/xview3.2p1-X11R6/lib/libxview/base/base.h	Tue Jun 29 01:14:42 1993
---- ./lib/libxview/base/base.h	Sun Nov 20 13:39:00 1994
-***************
-*** 6,15 ****
---- 6,20 ----
-   *	file for terms of the license.
-   */
-  
-+ #include <sys/param.h>
-  #ifndef xview_base_DEFINED
-  #define xview_base_DEFINED
-  #include <string.h>
-+ #ifdef __STDC__
-+ #include <stdlib.h>
-+ #else
-  #include <malloc.h>
-+ #endif
-  
-  #include <xview/xv_c_types.h>
-  
-***************
-*** 54,63 ****
-   * non-SVR4 systems.
-   */
-  #ifndef SUNOS41
-  #define XV_OS_SVR4
-- #define XV_USE_TTCOMPAT
-  #define SYSV_WAIT 
-  #define SYSV_UCONTEXT 
-  #define XV_USE_XVFCNTL 
-  #endif
-   
---- 59,70 ----
-   * non-SVR4 systems.
-   */
-  #ifndef SUNOS41
-+ #if !(defined(BSD) && (BSD >= 199103))
-  #define XV_OS_SVR4
-  #define SYSV_WAIT 
-  #define SYSV_UCONTEXT 
-+ #endif
-+ #define XV_USE_TTCOMPAT
-  #define XV_USE_XVFCNTL 
-  #endif
-   
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/base/xv_debug.h ./lib/libxview/base/xv_debug.h
-*** ../old/xview3.2p1-X11R6/lib/libxview/base/xv_debug.h	Tue Jun 29 01:14:44 1993
---- ./lib/libxview/base/xv_debug.h	Sun Nov 20 13:39:00 1994
-***************
-*** 9,19 ****
-  #ifndef _xv_debug_h_already_included
-  #define _xv_debug_h_already_included
-  
-  #ifndef FILE
-  #ifndef SVR4
-- #undef NULL
-  #endif SVR4
-  #include <stdio.h>
-  #endif FILE
-  #include <xview/pkg.h>		/* needed to get definition of Xv_private */
-    /* 
---- 9,24 ----
-  #ifndef _xv_debug_h_already_included
-  #define _xv_debug_h_already_included
-  
-+ #ifdef NULL
-+ #undef NULL
-+ #endif
-  #ifndef FILE
-  #ifndef SVR4
-  #endif SVR4
-  #include <stdio.h>
-+ #ifndef NULL
-+ #define NULL 0
-+ #endif
-  #endif FILE
-  #include <xview/pkg.h>		/* needed to get definition of Xv_private */
-    /* 
-*** lib/libxview/base/xv_error.c.orig	Tue Jun 29 00:14:42 1993
---- lib/libxview/base/xv_error.c	Fri Jan 22 17:30:59 1999
-***************
-*** 11,16 ****
---- 11,17 ----
-   */
-  
-  #include <stdio.h>
-+ #include <sys/param.h>
-  #include <xview/pkg_public.h>
-  #include <X11/Xlib.h>
-  #include <xview_private/i18n_impl.h>
-***************
-*** 18,27 ****
-  
-  /* Unix system error variables */
-! extern int      sys_nerr;
-  extern char    *sys_errlist[];
-  extern int      errno;
-  
-! Xv_private_data char *xv_app_name;
-  Xv_private int (*xv_error_proc) ();
-  
-  /*
---- 19,32 ----
-  
-  /* Unix system error variables */
-! extern const int sys_nerr;
-+ #if (defined(BSD) && (BSD >= 199306))
-+ extern const char *const sys_errlist[];
-+ #else
-  extern char    *sys_errlist[];
-+ #endif
-  extern int      errno;
-  
-! extern Xv_private_data char *xv_app_name;
-  Xv_private int (*xv_error_proc) ();
-  
-  /*
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/dnd/dnd.c ./lib/libxview/dnd/dnd.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/dnd/dnd.c	Tue Jun 29 01:15:57 1993
---- ./lib/libxview/dnd/dnd.c	Sun Nov 20 13:39:00 1994
-***************
-*** 38,43 ****
---- 38,47 ----
-  extern int  DndContactDSDM();
-  extern int  DndFindSite();
-  extern XID  DndGetCursor();
-+ static int SendTrigger();
-+ static int SendOldDndEvent();
-+ static int WaitForAck();
-+ static int IsV2App();
-  
-  Xv_public int
-  dnd_send_drop(dnd_public)
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/dnd/site.c ./lib/libxview/dnd/site.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/dnd/site.c	Tue Jun 29 01:15:58 1993
---- ./lib/libxview/dnd/site.c	Sun Nov 20 13:39:00 1994
-***************
-*** 19,24 ****
---- 19,25 ----
-  #ifdef SVR4 
-  #include <stdlib.h> 
-  #endif SVR4
-+ #include <sys/param.h>
-  
-  static     void 	TransCoords();
-  Xv_private Xv_Window	win_get_top_level();
-***************
-*** 246,252 ****
---- 247,257 ----
-            /* (rectNode->rect) is of the wrong type. */
-            memmove(rect, &(rectNode->rect),  sizeof(Rect));
-  #else
-+ #if (defined(BSD) && (BSD >= 199103))
-+ 	  bcopy(&(rectNode->rect), rect, sizeof(Rect));
-+ #else
-  	  bcopy(rectNode->rect, rect, sizeof(Rect));
-+ #endif
-  #endif SVR4
-  
-  	  return((Xv_opaque)rect);
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/file_chooser/Imakefile ./lib/libxview/file_chooser/Imakefile
-*** ../old/xview3.2p1-X11R6/lib/libxview/file_chooser/Imakefile	Tue Jun 29 01:17:58 1993
---- ./lib/libxview/file_chooser/Imakefile	Sun Nov 20 13:39:00 1994
-***************
-*** 27,61 ****
-  		path_impl.h hist_impl.h
-  
-  DATA_OBJS = fchsr_data.o\
-! 	   flist_data.o\
-! 	   path_data.o\
-! 	   hist_data.o
-  
-  TEXT_OBJS =\
-! 	file_chsr.o\
-          fc_layout.o\
-          file_list.o\
-          path.o\
-          xv_path_util.o\
-          hist_list.o\
-          hist_menu.o\
-! 	fchsr_data.o\
-!         flist_data.o\ 
-!         path_data.o\ 
-          hist_data.o
-  
-  
-  SRCS =\
-! 	file_chsr.c\
-! 	fc_layout.c\
-! 	file_list.c\
-! 	path.c\
-! 	xv_path_util.c\
-! 	hist_list.c\
-! 	hist_menu.c\
-! 	fchsr_data.c\
-!         flist_data.c\ 
-!         path_data.c\ 
-          hist_data.c
-  
-  LIBTARGET = xview
---- 27,61 ----
-  		path_impl.h hist_impl.h
-  
-  DATA_OBJS = fchsr_data.o\
-!         flist_data.o\
-!         path_data.o\
-!         hist_data.o
-  
-  TEXT_OBJS =\
-!         file_chsr.o\
-          fc_layout.o\
-          file_list.o\
-          path.o\
-          xv_path_util.o\
-          hist_list.o\
-          hist_menu.o\
-!         fchsr_data.o\
-!         flist_data.o\
-!         path_data.o\
-          hist_data.o
-  
-  
-  SRCS =\
-!         file_chsr.c\
-!         fc_layout.c\
-!         file_list.c\
-!         path.c\
-!         xv_path_util.c\
-!         hist_list.c\
-!         hist_menu.c\
-!         fchsr_data.c\
-!         flist_data.c\
-!         path_data.c\
-          hist_data.c
-  
-  LIBTARGET = xview
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/file_chooser/fc_layout.c ./lib/libxview/file_chooser/fc_layout.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/file_chooser/fc_layout.c	Tue Jun 29 01:17:55 1993
---- ./lib/libxview/file_chooser/fc_layout.c	Sun Nov 20 13:39:01 1994
-***************
-*** 464,471 ****
-  
-  	new_height 
-  	    = (* private->exten_func)( FC_PUBLIC(private),
-! 				      private->rect,
-! 				      exten_rect,
-  				      COLS(2),
-  				      private->rect.r_width - COLS(2),
-  				      max_height
---- 464,471 ----
-  
-  	new_height 
-  	    = (* private->exten_func)( FC_PUBLIC(private),
-! 				      &private->rect,
-! 				      &exten_rect,
-  				      COLS(2),
-  				      private->rect.r_width - COLS(2),
-  				      max_height
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/file_chooser/file_list.c ./lib/libxview/file_chooser/file_list.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/file_chooser/file_list.c	Tue Jun 29 01:17:56 1993
---- ./lib/libxview/file_chooser/file_list.c	Sun Nov 20 13:39:01 1994
-***************
-*** 23,28 ****
---- 23,31 ----
-  #include <xview_private/flist_impl.h>
-  #include <xview_private/portable.h>
-  
-+ #ifdef __FreeBSD__
-+ #include <regex.h>
-+ #endif
-  
-  
-  /* X bitmaps for default glyphs */
-***************
-*** 41,46 ****
---- 44,50 ----
-  static int		flist_list_notify();
-  static int		validate_new_directory();
-  static void		flist_new_dir();
-+ static int		flist_match_regex();
-  
-  #if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)
-  static void	flist_error(File_list_private *private, char *format, ...);
-***************
-*** 521,527 ****
---- 525,535 ----
-      if (status == DESTROY_CLEANUP) {
-  	xv_free_ref( private->directory );
-  	xv_free_ref( private->regex_pattern );
-+ #ifndef __FreeBSD__
-  	xv_free_ref( private->regex_compile );
-+ #else
-+ 	xv_free_regex_t( (regex_t *)private->regex_compile );
-+ #endif
-  	xv_free_ref( private->dotdot_string );
-  	if ( private->dir_ptr )
-  	    (void) closedir( private->dir_ptr );
-***************
-*** 1174,1187 ****
-  static int 	step();
-  #endif /* SVR4 */
-  
-! 
-  #include <regexp.h>
-  
-  
-  static void
-  flist_compile_regex( private )
-       File_list_private *private;
-  {
-      char compile_buf[MAXPATHLEN+1];
-      char *end_ptr;
-      size_t num_bytes;
---- 1182,1197 ----
-  static int 	step();
-  #endif /* SVR4 */
-  
-! #ifndef __FreeBSD__
-  #include <regexp.h>
-+ #endif
-  
-  
-  static void
-  flist_compile_regex( private )
-       File_list_private *private;
-  {
-+ #ifndef __FreeBSD__
-      char compile_buf[MAXPATHLEN+1];
-      char *end_ptr;
-      size_t num_bytes;
-***************
-*** 1197,1202 ****
---- 1207,1223 ----
-      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);
-+ #else
-+     regex_t *compile_buf = malloc(sizeof(regex_t));
-+     if (compile_buf == NULL){
-+       fprintf(stderr, "Couldn't allocate compile buffer\n");
-+       exit(-1);
-+     } 
-+     regcomp(compile_buf, private->regex_pattern, 0);
-+     xv_free_regex_t((regex_t *)private->regex_compile);
-+     private->regex_compile = (char *)compile_buf;
-+ #endif
-+ 
-  } 
-  
-  
-***************
-*** 1205,1211 ****
---- 1226,1236 ----
-       char *s;
-       File_list_private *private;
-  {
-+ #ifndef __FreeBSD__
-      return step(s, private->regex_compile);
-+ #else
-+     return !regexec((regex_t *)private->regex_compile, s, 0, NULL, 0);
-+ #endif
-  }
-  
-  /****************************************************************************/
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/file_chooser/xv_path_util.h ./lib/libxview/file_chooser/xv_path_util.h
-*** ../old/xview3.2p1-X11R6/lib/libxview/file_chooser/xv_path_util.h	Sat Jun 25 21:05:20 1994
---- ./lib/libxview/file_chooser/xv_path_util.h	Sun Nov 20 13:39:01 1994
-***************
-*** 41,46 ****
---- 41,47 ----
-  
-  
-  #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;}}
-  
-  
-  EXTERN_FUNCTION(void  xv_error_sprintf, (Frame frame, int use_footer, char *format, DOTDOTDOT) );
---- lib/libxview/filter/filter.c.orig	Tue Jun 29 06:14:57 1993
-+++ lib/libxview/filter/filter.c	Tue Oct 21 23:57:30 1997
-@@ -39,11 +39,12 @@
- 
- char           *stream_fgets();
- 
--enum CharClass
-+static enum CharClass
-                 breakProc();
--struct CharAction
-+static struct CharAction
-                 digits();
--
-+static
-+		any_shell_meta();
- 
- struct filter_rec **
- xv_parse_filter_table(in, filename)
-@@ -203,10 +204,10 @@
- {
-     int             i;
-     for (i = 0; table[i] != NULL; i++) {
--	cfree((char *) table[i]->call);
-+	free((char *) table[i]->call);
- 	free((char *) table[i]);
-     }
--    cfree((char *) table);
-+    free((char *) table);
- }
- 
- static struct CharAction
-*** lib/libxview/font/font.c.orig	Tue Jun 29 00:15:01 1993
---- lib/libxview/font/font.c	Sun Jan 24 22:58:32 1999
-***************
-*** 67,72 ****
---- 67,76 ----
-  Xv_private char *xv_font_scale_cmdline();
-  Xv_private char *xv_font_scale();
-  
-+ static int font_setup_defaults();
-+ static int font_construct_name();
-+ static int font_init_create_attrs();
-+ 
-  /*
-   * delimiters
-   */
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/frame/fm_get.c ./lib/libxview/frame/fm_get.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/frame/fm_get.c	Tue Jun 29 01:16:10 1993
---- ./lib/libxview/frame/fm_get.c	Sun Nov 20 13:39:02 1994
-***************
-*** 10,15 ****
---- 10,16 ----
-   *	file for terms of the license.
-   */
-  
-+ #include <ctype.h>
-  #include <xview_private/fm_impl.h>
-  #include <xview_private/draw_impl.h>
-  #include <xview/server.h>
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/frame/fm_impl.h ./lib/libxview/frame/fm_impl.h
-*** ../old/xview3.2p1-X11R6/lib/libxview/frame/fm_impl.h	Tue Jun 29 01:16:15 1993
---- ./lib/libxview/frame/fm_impl.h	Sun Nov 20 13:39:02 1994
-***************
-*** 17,27 ****
-  #define _frame_impl_h_already_included
-  
-  /* standard includes */
-  #ifndef FILE
-  #ifndef SVR4
-- #undef NULL
-  #endif SVR4
-  #include <stdio.h>
-  #endif FILE
-  #include <sys/time.h>
-  #ifdef OW_I18N
---- 17,32 ----
-  #define _frame_impl_h_already_included
-  
-  /* standard includes */
-+ #ifdef NULL
-+ #undef NULL
-+ #endif
-  #ifndef FILE
-  #ifndef SVR4
-  #endif SVR4
-  #include <stdio.h>
-+ #ifndef NULL
-+ #define NULL 0
-+ #endif
-  #endif FILE
-  #include <sys/time.h>
-  #ifdef OW_I18N
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/frame/fm_props.h ./lib/libxview/frame/fm_props.h
-*** ../old/xview3.2p1-X11R6/lib/libxview/frame/fm_props.h	Tue Jun 29 01:16:14 1993
---- ./lib/libxview/frame/fm_props.h	Sun Nov 20 13:39:02 1994
-***************
-*** 13,23 ****
-  #define _frame_props_h_already_included
-  
-  /* standard includes */
-  #ifndef FILE
-  #ifndef SVR4
-- #undef NULL
-  #endif SVR4
-  #include <stdio.h>
-  #endif FILE
-  #include <sys/time.h>
-  #include <xview/notify.h>
---- 13,28 ----
-  #define _frame_props_h_already_included
-  
-  /* standard includes */
-+ #ifdef NULL
-+ #undef NULL
-+ #endif
-  #ifndef FILE
-  #ifndef SVR4
-  #endif SVR4
-  #include <stdio.h>
-+ #ifndef NULL
-+ #define NULL 0
-+ #endif
-  #endif FILE
-  #include <sys/time.h>
-  #include <xview/notify.h>
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/frame/fmcmd_set.c ./lib/libxview/frame/fmcmd_set.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/frame/fmcmd_set.c	Tue Jun 29 01:16:07 1993
---- ./lib/libxview/frame/fmcmd_set.c	Sun Nov 20 13:39:02 1994
-***************
-*** 18,23 ****
---- 18,25 ----
-  #include <xview/panel.h>
-  #include <xview/server.h>
-  
-+ static int update_default_pin_state();
-+ 
-  Pkg_private     Xv_opaque
-  frame_cmd_set_avlist(frame_public, avlist)
-      Frame           frame_public;
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/frame/frame_base.h ./lib/libxview/frame/frame_base.h
-*** ../old/xview3.2p1-X11R6/lib/libxview/frame/frame_base.h	Tue Jun 29 01:16:14 1993
---- ./lib/libxview/frame/frame_base.h	Sun Nov 20 13:39:02 1994
-***************
-*** 17,27 ****
-  #define _frame_base_h_already_included
-  
-  /* standard includes */
-  #ifndef FILE
-  #ifndef SVR4
-- #undef NULL
-  #endif SVR4
-  #include <stdio.h>
-  #endif FILE
-  #include <sys/time.h>
-  #include <xview/notify.h>
---- 17,32 ----
-  #define _frame_base_h_already_included
-  
-  /* standard includes */
-+ #ifdef NULL
-+ #undef NULL
-+ #endif
-  #ifndef FILE
-  #ifndef SVR4
-  #endif SVR4
-  #include <stdio.h>
-+ #ifndef NULL
-+ #define NULL 0
-+ #endif
-  #endif FILE
-  #include <sys/time.h>
-  #include <xview/notify.h>
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/frame/frame_cmd.h ./lib/libxview/frame/frame_cmd.h
-*** ../old/xview3.2p1-X11R6/lib/libxview/frame/frame_cmd.h	Tue Jun 29 01:16:14 1993
---- ./lib/libxview/frame/frame_cmd.h	Sun Nov 20 13:39:02 1994
-***************
-*** 17,27 ****
-  #define _frame_cmd_h_already_included
-  
-  /* standard includes */
-  #ifndef FILE
-  #ifndef SVR4
-- #undef NULL
-  #endif SVR4
-  #include <stdio.h>
-  #endif FILE
-  #include <sys/time.h>
-  #include <xview/notify.h>
---- 17,32 ----
-  #define _frame_cmd_h_already_included
-  
-  /* standard includes */
-+ #ifdef NULL
-+ #undef NULL
-+ #endif
-  #ifndef FILE
-  #ifndef SVR4
-  #endif SVR4
-  #include <stdio.h>
-+ #ifndef NULL
-+ #define NULL 0
-+ #endif
-  #endif FILE
-  #include <sys/time.h>
-  #include <xview/notify.h>
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/frame/frame_help.h ./lib/libxview/frame/frame_help.h
-*** ../old/xview3.2p1-X11R6/lib/libxview/frame/frame_help.h	Tue Jun 29 01:16:10 1993
---- ./lib/libxview/frame/frame_help.h	Sun Nov 20 13:39:02 1994
-***************
-*** 17,27 ****
-  #define _frame_help_h_already_included
-  
-  /* standard includes */
-  #ifndef FILE
-  #ifndef SVR4
-- #undef NULL
-  #endif SVR4
-  #include <stdio.h>
-  #endif FILE
-  #include <sys/time.h>
-  #include <xview/notify.h>
---- 17,32 ----
-  #define _frame_help_h_already_included
-  
-  /* standard includes */
-+ #ifdef NULL
-+ #undef  NULL
-+ #endif
-  #ifndef FILE
-  #ifndef SVR4
-  #endif SVR4
-  #include <stdio.h>
-+ #ifndef NULL
-+ #define NULL 0
-+ #endif
-  #endif FILE
-  #include <sys/time.h>
-  #include <xview/notify.h>
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/io_stream/file_strms.c ./lib/libxview/io_stream/file_strms.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/io_stream/file_strms.c	Tue Jun 29 01:15:07 1993
---- ./lib/libxview/io_stream/file_strms.c	Sun Nov 20 13:39:02 1994
-***************
-*** 17,23 ****
---- 17,27 ----
-  
-  #define GetFISData struct xv_file_input_stream_data *data = (struct xv_file_input_stream_data*) in->client_data
-  
-+ #ifndef __FreeBSD__
-  static struct xv_file_input_stream_data {
-+ #else
-+ struct xv_file_input_stream_data {
-+ #endif
-      FILE           *fp;
-      int             lineno;
-  };
-***************
-*** 156,162 ****
---- 160,170 ----
-  
-  #define GetFOSData struct xv_file_output_stream_data *data = (struct xv_file_output_stream_data*) out->client_data
-  
-+ #ifndef __FreeBSD__
-  static struct xv_file_output_stream_data {
-+ #else
-+ struct xv_file_output_stream_data {
-+ #endif
-      FILE           *fp;
-      int             lineno;
-  };
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/io_stream/othr_strms.c ./lib/libxview/io_stream/othr_strms.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/io_stream/othr_strms.c	Tue Jun 29 01:15:05 1993
---- ./lib/libxview/io_stream/othr_strms.c	Sun Nov 20 13:39:03 1994
-***************
-*** 17,23 ****
---- 17,27 ----
-  
-  #define GetFCSData struct xv_filter_comments_stream_data *data = (struct xv_filter_comments_stream_data*) in->client_data
-  
-+ #ifndef __FreeBSD__
-  static struct xv_filter_comments_stream_data {
-+ #else
-+ struct xv_filter_comments_stream_data {
-+ #endif
-      Bool            backed_up;
-      char            backup, lastchar;
-  };
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/io_stream/str_strms.c ./lib/libxview/io_stream/str_strms.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/io_stream/str_strms.c	Tue Jun 29 01:15:06 1993
---- ./lib/libxview/io_stream/str_strms.c	Sun Nov 20 13:39:03 1994
-***************
-*** 17,23 ****
---- 17,27 ----
-  
-  #define GetSISData struct string_input_stream_data	*data = (struct string_input_stream_data*) in->client_data
-  
-+ #ifndef __FreeBSD__
-  static struct string_input_stream_data {
-+ #else
-+ struct string_input_stream_data {
-+ #endif
-      char           *string;
-      int             charpos;
-  };
-***************
-*** 148,154 ****
---- 152,162 ----
-  
-  #define GetSOSData struct string_output_stream_data *data = (struct string_output_stream_data*) out->client_data
-  
-+ #ifndef __FreeBSD__
-  static struct string_output_stream_data {
-+ #else
-+ struct string_output_stream_data {
-+ #endif
-      char           *string;
-      int             charpos;
-  };
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/menu/Imakefile ./lib/libxview/menu/Imakefile
-*** ../old/xview3.2p1-X11R6/lib/libxview/menu/Imakefile	Tue Jun 29 01:16:27 1993
---- ./lib/libxview/menu/Imakefile	Sun Nov 20 13:39:03 1994
-***************
-*** 28,34 ****
-  TEXT_OBJS =\
-  	omi.o\
-  	om_public.o\
-! 	om_render.o\ 
-  	om_set.o\
-  	om_get.o\
-  	om_compat.o
---- 28,34 ----
-  TEXT_OBJS =\
-  	omi.o\
-  	om_public.o\
-! 	om_render.o\
-  	om_set.o\
-  	om_get.o\
-  	om_compat.o
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/menu/om_render.c ./lib/libxview/menu/om_render.c
-*** lib/libxview/menu/om_impl.h.orig	Fri Jan 22 18:57:34 1999
---- lib/libxview/menu/om_impl.h	Fri Jan 22 19:04:41 1999
-***************
-*** 118,123 ****
---- 118,129 ----
-      Xv_Server		server;
-      int			setting_default;
-      int			three_d;	/* TRUE: 3D, FALSE: 2D */
-+ 	/* If we ran out of colors and reverted from 3D to 2D, we set
-+ 	* three_d_override, so that future invocations of menu_show won't set
-+ 	* three_d back to TRUE.
-+ 	* 	martin-2.buck@student.uni-ulm.de
-+ 	*/
-+     int			three_d_override;
-  } Xv_menu_group_info;
-  
-  
-*** lib/libxview/menu/om_public.c.orig	Fri Jan 22 18:57:50 1999
---- lib/libxview/menu/om_public.c	Fri Jan 22 19:08:31 1999
-***************
-*** 281,286 ****
---- 281,287 ----
-  	}
-  	xv_set(server, XV_KEY_DATA, menu_group_info_key, group_info, 0);
-  	group_info->server = server;
-+ 	group_info->three_d_override = FALSE;
-      }
-      group_info->client_window = win;
-      group_info->color_index = menu->color_index;
-***************
-*** 309,314 ****
---- 310,319 ----
-  #else
-  	group_info->three_d = FALSE;
-  #endif
-+       /* martin-2.buck@student.uni-ulm.de */
-+       if (group_info->three_d_override) {
-+ 	group_info->three_d = FALSE;
-+       }
-  
-      if (enable_rectp)
-  	menu->enable_rect = *enable_rectp;
-*** lib/libxview/menu/om_render.c.orig	Tue Jun 29 00:16:26 1993
---- lib/libxview/menu/om_render.c	Fri Jan 22 19:18:57 1999
-***************
-*** 174,179 ****
---- 174,183 ----
-      Rect            shadowrect;
-      int		    status;
-      Rect            used_window_rect; /* width = 0 => window not reused */
-+ #if 1
-+     /* martin-2.buck@student.uni-ulm.de */
-+     int             three_d_old;
-+ #endif
-  
-      /*
-       * Initial setup: Pull out group information.
-***************
-*** 289,294 ****
---- 293,302 ----
-  			      (Visual *)xv_get(group->client_window, XV_VISUAL))
-          xv_set(m->window, WIN_COLOR_INFO, color_info, 0);
-  
-+ #if 1
-+     /* martin-2.buck@student.uni-ulm.de */
-+     three_d_old = m->group_info->three_d;
-+ #endif
-      if (!m->ginfo)
-  	m->ginfo = xv_init_olgx(m->window, &m->group_info->three_d,
-  				  m->default_image.font);
-***************
-*** 306,311 ****
---- 314,328 ----
-  	    }
-  	xv_set(m->window, WIN_BACKGROUND_COLOR, 0, 0);
-      }
-+ #if 1
-+     /* martin-2.buck@student.uni-ulm.de */
-+     if (three_d_old != m->group_info->three_d) {
-+ 	m->group_info->three_d_override = TRUE;
-+     }
-+     /* BUG: If we arrived here, we should get a new window, because now we
-+      * need a border around it.
-+      */
-+ #endif
-  
-      /* Get the shadow window */
-      if (!m->group_info->three_d) { 
-***************
-*** 470,478 ****
-       * Define the menu and shadow window dimensions.  Note: shadow rect width &
-       * height = menu rect width & height
-       */
-!     xv_set(m->window, XV_RECT, m->fs_menurect, 0);
-      if (!m->group_info->three_d)
-! 	xv_set(m->shadow_window, XV_RECT, shadowrect, 0);
-  
-      XFlush(XV_DISPLAY_FROM_WINDOW(m->window));
-  
---- 487,495 ----
-       * Define the menu and shadow window dimensions.  Note: shadow rect width &
-       * height = menu rect width & height
-       */
-!     xv_set(m->window, XV_RECT, &m->fs_menurect, 0);
-      if (!m->group_info->three_d)
-! 	xv_set(m->shadow_window, XV_RECT, &shadowrect, 0);
-  
-      XFlush(XV_DISPLAY_FROM_WINDOW(m->window));
-  
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/menu/om_set.c ./lib/libxview/menu/om_set.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/menu/om_set.c	Tue Jun 29 01:16:24 1993
---- ./lib/libxview/menu/om_set.c	Sun Nov 20 13:39:03 1994
-***************
-*** 12,17 ****
---- 12,18 ----
-  
-  /* --------------------------------------------------------------------- */
-  #include <sys/types.h>
-+ #include <ctype.h>
-  #include <xview_private/om_impl.h>
-  #include <xview_private/draw_impl.h>
-  #include <xview_private/fm_impl.h>
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/misc/Imakefile ./lib/libxview/misc/Imakefile
-*** ../old/xview3.2p1-X11R6/lib/libxview/misc/Imakefile	Tue Jun 29 01:16:36 1993
---- ./lib/libxview/misc/Imakefile	Sun Nov 20 13:39:03 1994
-***************
-*** 29,36 ****
-                            xv_i18n.c     \
-                            xv_path.c
-  
-! OFILES.misc.3	= ${CFILES.misc.3:%.c=%.o}
-! OFILES.misc.4	= ${CFILES.misc.4:%.c=%.o}
-  
-  HFILES.misc.3          =
-  HFILES.misc.4          =
---- 29,36 ----
-                            xv_i18n.c     \
-                            xv_path.c
-  
-! OFILES.misc.3	= ${CFILES.misc.3:.c=.o}
-! OFILES.misc.4	= ${CFILES.misc.4:.c=.o}
-  
-  HFILES.misc.3          =
-  HFILES.misc.4          =
-***************
-*** 43,49 ****
-  GETTEXT.C		=
-  #endif
-  
-! GETTEXT.O		= ${GETTEXT.C:%.c=%.o}
-  
-  HDRSPUBLIC=     cms_grays.h cms_mono.h cmsrainbow.h cms_rgb.h sun.h \
-                  window_hs.h expandname.h xv_c_types.h attrol.h db.h \
---- 43,49 ----
-  GETTEXT.C		=
-  #endif
-  
-! GETTEXT.O		= ${GETTEXT.C:.c=.o}
-  
-  HDRSPUBLIC=     cms_grays.h cms_mono.h cmsrainbow.h cms_rgb.h sun.h \
-                  window_hs.h expandname.h xv_c_types.h attrol.h db.h \
-***************
-*** 57,63 ****
-  	demorandom.o\
-  	getlogindr.o\
-  	expandname.o\
-! 	expandpath.o\ 
-  	bitmask.o\
-  	hashfn.o\
-  	db_conv.o\
---- 57,63 ----
-  	demorandom.o\
-  	getlogindr.o\
-  	expandname.o\
-! 	expandpath.o\
-  	bitmask.o\
-  	hashfn.o\
-  	db_conv.o\
-***************
-*** 76,82 ****
-  	demorandom.c\
-  	getlogindr.c\
-  	expandname.c\
-! 	expandpath.c\ 
-  	bitmask.c\
-  	hashfn.c\
-  	db_conv.c\
---- 76,82 ----
-  	demorandom.c\
-  	getlogindr.c\
-  	expandname.c\
-! 	expandpath.c\
-  	bitmask.c\
-  	hashfn.c\
-  	db_conv.c\
-***************
-*** 95,101 ****
-  	demorandom.o\
-  	getlogindr.o\
-  	expandname.o\
-! 	expandpath.o\ 
-  	bitmask.o\
-  	hashfn.o\
-  	db_conv.o\
---- 95,101 ----
-  	demorandom.o\
-  	getlogindr.o\
-  	expandname.o\
-! 	expandpath.o\
-  	bitmask.o\
-  	hashfn.o\
-  	db_conv.o\
-***************
-*** 115,121 ****
-  	demorandom.c\
-  	getlogindr.c\
-  	expandname.c\
-! 	expandpath.c\ 
-  	bitmask.c\
-  	hashfn.c\
-  	db_conv.c\
---- 115,121 ----
-  	demorandom.c\
-  	getlogindr.c\
-  	expandname.c\
-! 	expandpath.c\
-  	bitmask.c\
-  	hashfn.c\
-  	db_conv.c\
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/misc/expandname.c ./lib/libxview/misc/expandname.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/misc/expandname.c	Tue Jun 29 01:16:30 1993
---- ./lib/libxview/misc/expandname.c	Sun Nov 20 13:39:03 1994
-***************
-*** 120,126 ****
---- 120,128 ----
-      }
-      (void) close(pivec[0]);
-  #ifndef SVR4
-+ #if !(defined(BSD) && (BSD >= 199103))
-      while (wait((union wait *) & status) != pid);
-+ #endif
-  #else SVR4
-      while (wait( & status) != pid);
-  #endif SVR4
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/misc/getlogindr.c ./lib/libxview/misc/getlogindr.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/misc/getlogindr.c	Tue Jun 29 01:16:30 1993
---- ./lib/libxview/misc/getlogindr.c	Sun Nov 20 13:39:03 1994
-***************
-*** 17,22 ****
---- 17,23 ----
-  
-  #include <stdio.h>
-  #include <pwd.h>
-+ #include <sys/param.h>
-  #include <xview_private/i18n_impl.h>
-  #include <xview/xv_error.h>
-  
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/notice/notice_pt.c ./lib/libxview/notice/notice_pt.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/notice/notice_pt.c	Tue Jun 29 01:16:40 1993
---- ./lib/libxview/notice/notice_pt.c	Sun Nov 20 13:39:04 1994
-***************
-*** 58,63 ****
---- 58,64 ----
-  static void     notice_copy_event();
-  static Xv_window	notice_get_focus_win();
-  static int	notice_show_focus_win();
-+ static int	notice_quadrant();
-  
-  /*
-   * --------------------------- STATICS ------------------------------
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/notify/ndet.h ./lib/libxview/notify/ndet.h
-*** ../old/xview3.2p1-X11R6/lib/libxview/notify/ndet.h	Tue Jun 29 01:18:12 1993
---- ./lib/libxview/notify/ndet.h	Sun Nov 20 13:39:04 1994
-***************
-*** 17,22 ****
---- 17,27 ----
-  #ifndef	NDET_DEFINED
-  #define	NDET_DEFINED
-  
-+ #include <sys/param.h>
-+ #if (defined(BSD) && (BSD >= 199103))
-+ #include <signal.h>
-+ #endif
-+ 
-  /*
-  ********************** Detector Loop Notes ****************************
-  Here is some notes on the detector loop:
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/notify/ndet_fcntl.c ./lib/libxview/notify/ndet_fcntl.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/notify/ndet_fcntl.c	Tue Jun 29 01:18:03 1993
---- ./lib/libxview/notify/ndet_fcntl.c	Sun Nov 20 13:39:04 1994
-***************
-*** 17,38 ****
-  
-  #include <xview_private/ntfy.h>
-  #include <xview_private/ndet.h>
-  #include <signal.h>
-  #include <fcntl.h>
-  #ifdef SVR4
-  #include <sys/file.h>
-  #endif SVR4
-! 
-  extern int
-  #ifdef SVR4
-  xv_fcntl(fd, cmd, arg)
-  #else
-  fcntl(fd, cmd, arg)
-  #endif SVR4
-      int             fd, cmd, arg;
-  {
-      fd_set          bit;
-      int             res;
-  
-      /* Set fd bit */
-      FD_ZERO(&bit);
---- 17,55 ----
-  
-  #include <xview_private/ntfy.h>
-  #include <xview_private/ndet.h>
-+ #include <sys/param.h>
-  #include <signal.h>
-  #include <fcntl.h>
-  #ifdef SVR4
-  #include <sys/file.h>
-  #endif SVR4
-! #if (defined(BSD) && (BSD >= 199103))
-! #include <stdarg.h>
-! #endif
-  extern int
-  #ifdef SVR4
-  xv_fcntl(fd, cmd, arg)
-  #else
-+ #if (defined(BSD) && (BSD >= 199103))
-+ fcntl(int fd, int cmd, ...)
-+ #else
-  fcntl(fd, cmd, arg)
-+ #endif
-  #endif SVR4
-+ #if !(defined(BSD) && (BSD >= 199103))
-      int             fd, cmd, arg;
-+ #endif
-  {
-      fd_set          bit;
-      int             res;
-+ 
-+ #if (defined(BSD) && (BSD >= 199103))
-+     int arg;  
-+     va_list valist;
-+     va_start(valist, cmd);
-+     arg = va_arg(valist, int);
-+     va_end(valist);
-+ #endif
-  
-      /* Set fd bit */
-      FD_ZERO(&bit);
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/notify/ndet_loop.c ./lib/libxview/notify/ndet_loop.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/notify/ndet_loop.c	Tue Jun 29 01:18:19 1993
---- ./lib/libxview/notify/ndet_loop.c	Sun Nov 20 13:39:04 1994
-***************
-*** 14,19 ****
---- 14,20 ----
-   * Ndet_loop.c - Notification loop.
-   */
-  
-+ #include <sys/param.h>
-  #include <xview_private/i18n_impl.h>
-  #include <xview_private/ntfy.h>
-  #include <xview_private/ndet.h>
-***************
-*** 224,230 ****
-  	     * will return with an EINTR when a signal arrives while IN
-  	     * select, not ON THE WAY into select).
-  	     */
-! #ifndef SVR4
-  	    nfds = syscall(SYS_select,
-  			   FD_SETSIZE, &ibits, &obits, &ebits,
-  		 (sigisempty(&ndet_sigs_received)) ? timer : &ndet_polling_tv);
---- 225,232 ----
-  	     * will return with an EINTR when a signal arrives while IN
-  	     * select, not ON THE WAY into select).
-  	     */
-! 
-! #if !defined(SVR4) && !(defined(BSD) && (BSD >= 199103))
-  	    nfds = syscall(SYS_select,
-  			   FD_SETSIZE, &ibits, &obits, &ebits,
-  		 (sigisempty(&ndet_sigs_received)) ? timer : &ndet_polling_tv);
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/notify/ndet_read.c ./lib/libxview/notify/ndet_read.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/notify/ndet_read.c	Tue Jun 29 01:18:04 1993
---- ./lib/libxview/notify/ndet_read.c	Sun Nov 20 13:39:05 1994
-***************
-*** 15,20 ****
---- 15,21 ----
-   * not already in the middle of it.
-   */
-  
-+ #include <sys/param.h>
-  #include <xview_private/ntfy.h>
-  #include <xview_private/ndet.h>
-  #include <xview_private/ndis.h>	/* For ndis_client == NTFY_CLIENT_NULL check */
-***************
-*** 29,39 ****
---- 30,45 ----
-  
-  static Notify_client ndet_read_nclient = (Notify_client) & ndet_read_done;
-  
-+ #if !(defined(BSD) && (BSD >= 199103))
-  extern int
-  read(fd, buf, nbytes)
-      register int    fd;
-      char           *buf;
-      int             nbytes;
-+ #else
-+ extern int
-+ read(int fd, void *buf, size_t nbytes)
-+ #endif
-  {
-      int             ndelay;
-      Notify_error    return_code;
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/notify/ntfy_test.c ./lib/libxview/notify/ntfy_test.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/notify/ntfy_test.c	Tue Jun 29 01:18:12 1993
---- ./lib/libxview/notify/ntfy_test.c	Sun Nov 20 13:39:05 1994
-***************
-*** 989,995 ****
-  	    fprintf(stderr, "%s in unknown destroy status\n", arg1);
-  	    goto Error;
-  	}
-! 	if ((ne = notify_post_destroy(client, status)) != NOTIFY_OK) {
-  	    if (!(status == DESTROY_CHECKING &&
-  		  ne == NOTIFY_DESTROY_VETOED)) {
-  		notify_perror("notify_destroy");
---- 989,995 ----
-  	    fprintf(stderr, "%s in unknown destroy status\n", arg1);
-  	    goto Error;
-  	}
-! 	if ((ne = notify_post_destroy(client, status, NOTIFY_IMMEDIATE)) != NOTIFY_OK) {
-  	    if (!(status == DESTROY_CHECKING &&
-  		  ne == NOTIFY_DESTROY_VETOED)) {
-  		notify_perror("notify_destroy");
-***************
-*** 1781,1787 ****
-      }
-      /* Send only last client event */
-      if (*event_count_ptr > 0) {
-! 	(void) notify_event(nclient, *(events + (*event_count_ptr) - 1));
-  	*event_count_ptr--;
-      }
-      /* Send fd 1 input */
---- 1781,1787 ----
-      }
-      /* Send only last client event */
-      if (*event_count_ptr > 0) {
-! 	(void) notify_event(nclient, *(events + (*event_count_ptr) - 1), 0);
-  	*event_count_ptr--;
-      }
-      /* Send fd 1 input */
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/notify/ntfyclient.c ./lib/libxview/notify/ntfyclient.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/notify/ntfyclient.c	Tue Jun 29 01:18:11 1993
---- ./lib/libxview/notify/ntfyclient.c	Sun Nov 20 13:39:05 1994
-***************
-*** 18,24 ****
---- 18,26 ----
-  #include <xview_private/ntfy.h>
-  #include <xview_private/ndis.h>	/* For ndis_default_prioritizer */
-  #include <xview_private/ndet.h>	
-+ #ifndef __FreeBSD__
-  #include <search.h>
-+ #endif
-  #include <xview_private/portable.h>
-  
-  /* Variables used in paranoid enumerator (see ntfy_condition) */
-***************
-*** 60,65 ****
---- 62,68 ----
-      if (*client_latest && (*client_latest)->nclient == nclient)
-  	return (*client_latest);
-  
-+ #ifndef __FreeBSD__
-      if(( client_list == ndet_clients ) && ndet_clients ) {
-         dummy_client.nclient = nclient;
-         /* Find client */
-***************
-*** 73,79 ****
-             return (client);
-         }
-      }
-! 
-      else 
-          /* Search entire list */
-          for (client = client_list; client; client = next) {
---- 76,84 ----
-             return (client);
-         }
-      }
-! #else
-!     if(0);
-! #endif
-      else 
-          /* Search entire list */
-          for (client = client_list; client; client = next) {
-***************
-*** 100,105 ****
---- 105,111 ----
-      register NTFY_CLIENT *client;
-      static NTFY_CLIENT *new_client;
-  
-+ #ifndef __FreeBSD__
-      if( client_list == &ndet_clients ) {
-          if( new_client  == NTFY_CLIENT_NULL ) {
-              if ((new_client = ntfy_alloc_client()) == NTFY_CLIENT_NULL)
-***************
-*** 119,125 ****
-          else
-              return client;
-      }
-! 
-      else if ((client = ntfy_find_nclient(*client_list, nclient,
-  				    client_latest)) != NTFY_CLIENT_NULL)
-          return client;
---- 125,133 ----
-          else
-              return client;
-      }
-! #else
-!     if(0);
-! #endif
-      else if ((client = ntfy_find_nclient(*client_list, nclient,
-  				    client_latest)) != NTFY_CLIENT_NULL)
-          return client;
-***************
-*** 163,170 ****
---- 171,180 ----
-  	ntfy_remove_condition(client, condition, who);
-      }
-      /* Remove & free client from client_list */
-+ #ifndef __FreeBSD__
-      if( client_list == &ndet_clients )
-          tdelete( client, ndet_root, ndet_compar );
-+ #endif
-      ntfy_remove_node((NTFY_NODE **) client_list, (NTFY_NODE *) client);
-      /* Invalidate condition hint */
-      *client_latest = NTFY_CLIENT_NULL;
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/openwin/ow_view.c ./lib/libxview/openwin/ow_view.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/openwin/ow_view.c	Tue Jun 29 01:16:43 1993
---- ./lib/libxview/openwin/ow_view.c	Sun Nov 20 13:39:05 1994
-***************
-*** 48,53 ****
---- 48,54 ----
-  static          openwin_init_view();
-  static          openwin_free_view();
-  static          openwin_remove_scrollbars();
-+ static int	openwin_check_view();
-  static          openwin_create_viewwindow();
-  static          openwin_test_for_sb();
-  static          openwin_link_view();
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/panel/item_set.c ./lib/libxview/panel/item_set.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/panel/item_set.c	Tue Jun 29 01:16:50 1993
---- ./lib/libxview/panel/item_set.c	Sun Nov 20 13:39:06 1994
-***************
-*** 28,33 ****
---- 28,35 ----
-  
-  extern Notify_value panel_base_event_handler();
-  
-+ static fix_positions();
-+ 
-  Pkg_private     Xv_opaque
-  item_set_avlist(item_public, avlist)
-      Panel_item      item_public;
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/panel/p_btn.c ./lib/libxview/panel/p_btn.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/panel/p_btn.c	Tue Jun 29 01:16:52 1993
---- ./lib/libxview/panel/p_btn.c	Sun Nov 20 13:39:06 1994
-***************
-*** 203,209 ****
-  	if (pin_is_default) {
-  	    image.im_type = PIT_STRING;
-  	    image_string(&image) = NULL;
-! 	    label = "";
-  	} else if (!(image_string(&image) = (char *) xv_get(default_menu_item,
-  		MENU_STRING))) {
-  	    olgx_state |= OLGX_LABEL_IS_PIXMAP;
---- 203,209 ----
-  	if (pin_is_default) {
-  	    image.im_type = PIT_STRING;
-  	    image_string(&image) = NULL;
-! 	    label = (Xv_opaque) "";
-  	} else if (!(image_string(&image) = (char *) xv_get(default_menu_item,
-  		MENU_STRING))) {
-  	    olgx_state |= OLGX_LABEL_IS_PIXMAP;
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/panel/p_choice.c ./lib/libxview/panel/p_choice.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/panel/p_choice.c	Tue Jun 29 01:16:57 1993
---- ./lib/libxview/panel/p_choice.c	Sun Nov 20 13:39:06 1994
-***************
-*** 106,111 ****
---- 106,115 ----
-  static int      choice_number();
-  static int	choice_x_gap();
-  static int	choice_y_gap();
-+ static int	find_choice();
-+ static int	modify_choice();
-+ static int	move_specified();
-+ static int	re_alloc_choices();
-  static unsigned int choice_value();
-  static void     choice_create_menu();
-  static void	choice_images_to_menu_items();
-***************
-*** 120,126 ****
-  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() */
---- 124,129 ----
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/panel/p_drop.c ./lib/libxview/panel/p_drop.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/panel/p_drop.c	Tue Jun 29 01:17:04 1993
---- ./lib/libxview/panel/p_drop.c	Sun Nov 20 13:39:06 1994
-***************
-*** 10,16 ****
---- 10,21 ----
-   *	file for terms of the license.
-   */
-  
-+ #include <sys/param.h>
-+ #if (defined(BSD) && (BSD >= 199103))
-+ #include <stdlib.h>
-+ #else
-  #include <malloc.h>
-+ #endif
-  #include <xview_private/draw_impl.h>
-  #include <xview_private/i18n_impl.h>
-  #include <xview_private/panel_impl.h>
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/panel/p_gauge.c ./lib/libxview/panel/p_gauge.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/panel/p_gauge.c	Tue Jun 29 01:17:04 1993
---- ./lib/libxview/panel/p_gauge.c	Sun Nov 20 13:39:07 1994
-***************
-*** 47,52 ****
---- 47,53 ----
-  /* Local functions */
-  static void     paint_gauge();
-  static void     update_rects();
-+ static int	etoi();
-  
-  static Panel_ops ops = {
-      panel_default_handle_event,		/* handle_event() */
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/panel/p_get.c ./lib/libxview/panel/p_get.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/panel/p_get.c	Tue Jun 29 01:16:49 1993
---- ./lib/libxview/panel/p_get.c	Sun Nov 20 13:39:07 1994
-***************
-*** 16,21 ****
---- 16,22 ----
-  #include <xview/scrollbar.h>
-  
-  static int      shrink_to_fit();
-+ static panel_shrink_margin();
-  
-  #define MAX_NEGATIVE_SHRINK 2000
-  #define SHRINK_MARGIN       4
-*** lib/libxview/panel/p_num_txt.c.orig	Sat Jan 23 19:24:30 1999
---- lib/libxview/panel/p_num_txt.c	Sat Jan 23 19:29:03 1999
-***************
-*** 707,713 ****
-  
-  	event_init( &event ); /* send empty, bogus event */
-          if (ip->notify)
-!             (*ip->notify) (ITEM_PUBLIC(ip), event);
-  
-          /*
-             UP_INACTIVE flag is set in set_value(); if
---- 707,713 ----
-  
-  	event_init( &event ); /* send empty, bogus event */
-          if (ip->notify)
-!             (*ip->notify) (ITEM_PUBLIC(ip), &event);
-  
-          /*
-             UP_INACTIVE flag is set in set_value(); if
-***************
-*** 724,730 ****
-  
-  	event_init( &event ); /* send empty, bogus event */
-          if (ip->notify)
-!             (*ip->notify) (ITEM_PUBLIC(ip), event);
-  
-          if (dp->btn_state & DOWN_INACTIVE)
-              panel_autoscroll_stop_itimer( item );
---- 724,730 ----
-  
-  	event_init( &event ); /* send empty, bogus event */
-          if (ip->notify)
-!             (*ip->notify) (ITEM_PUBLIC(ip), &event);
-  
-          if (dp->btn_state & DOWN_INACTIVE)
-              panel_autoscroll_stop_itimer( item );
-*** lib/libxview/panel/p_set.c.orig	Tue Jun 29 00:16:59 1993
---- lib/libxview/panel/p_set.c	Sat Jan 23 21:00:16 1999
-***************
-*** 14,20 ****
-  #include <xview/font.h>
-  #include <xview/scrollbar.h>
-  #include <xview/xv_xrect.h>
-- #include <xview/font.h>
-  #include <xview_private/draw_impl.h>
-  
-  Xv_private void	    win_set_no_focus();
---- 14,19 ----
-***************
-*** 25,30 ****
---- 24,31 ----
-  
-  static void panel_set_fonts();
-  
-+ static int column_from_absolute_x();
-+ static int row_from_absolute_y();
-  
-  Pkg_private     Xv_opaque
-  panel_set_avlist(panel_public, avlist)
-***************
-*** 509,516 ****
-  
-      font_info = (XFontStruct *) xv_get(glyph_font, FONT_INFO);
-      if (font_info->per_char) {
-! 	active_caret_info = font_info->per_char[OLGX_ACTIVE_CARET];
-! 	inactive_caret_info = font_info->per_char[OLGX_INACTIVE_CARET];
-      } else {
-  	active_caret_info = font_info->min_bounds;
-  	inactive_caret_info = font_info->min_bounds;
---- 510,519 ----
-  
-      font_info = (XFontStruct *) xv_get(glyph_font, FONT_INFO);
-      if (font_info->per_char) {
-! 	active_caret_info = font_info->per_char[OLGX_ACTIVE_CARET -
-! 	    font_info->min_char_or_byte2];
-! 	inactive_caret_info = font_info->per_char[OLGX_INACTIVE_CARET -
-! 	    font_info->min_char_or_byte2];
-      } else {
-  	active_caret_info = font_info->min_bounds;
-  	inactive_caret_info = font_info->min_bounds;
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/panel/p_slider.c ./lib/libxview/panel/p_slider.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/panel/p_slider.c	Tue Jun 29 01:17:02 1993
---- ./lib/libxview/panel/p_slider.c	Sun Nov 20 13:39:08 1994
-***************
-*** 54,59 ****
---- 54,61 ----
-  static Panel_setting get_value();
-  static void     paint_slider();
-  static void     update_rects();
-+ static int	etoi();
-+ static int	itoe();
-  
-  static Panel_ops ops = {
-      panel_default_handle_event,		/* handle_event() */
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/panel/p_txt.c ./lib/libxview/panel/p_txt.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/panel/p_txt.c	Tue Jun 29 01:16:55 1993
---- ./lib/libxview/panel/p_txt.c	Sun Nov 20 13:39:09 1994
-***************
-*** 10,16 ****
---- 10,21 ----
-   *	file for terms of the license.
-   */
-  
-+ #include <sys/param.h>
-+ #if (defined(BSD) && (BSD >= 199103))
-+ #include <stdlib.h>
-+ #else
-  #include <malloc.h>
-+ #endif
-  #include <string.h>
-  #include <ctype.h>
-  #include <X11/X.h>
-*** lib/libxview/panel/panel.c.orig	Tue Jun 29 00:16:57 1993
---- lib/libxview/panel/panel.c	Sat Jan 23 19:43:05 1999
-***************
-*** 27,34 ****
-  Pkg_private int panel_destroy();
-  
-  static int      panel_layout();
-  
-! Xv_private_data Defaults_pairs xv_kbd_cmds_value_pairs[4];
-  
-  /* default timer value */
-  static struct itimerval PANEL_TIMER = {0, 500000, 0, 500000};
---- 27,35 ----
-  Pkg_private int panel_destroy();
-  
-  static int      panel_layout();
-+ static int	panel_unregister_view();
-  
-! extern Defaults_pairs xv_kbd_cmds_value_pairs[4];
-  
-  /* default timer value */
-  static struct itimerval PANEL_TIMER = {0, 500000, 0, 500000};
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/panel/panel_impl.h ./lib/libxview/panel/panel_impl.h
-*** ../old/xview3.2p1-X11R6/lib/libxview/panel/panel_impl.h	Tue Jun 29 01:16:50 1993
---- ./lib/libxview/panel/panel_impl.h	Sun Nov 20 13:39:09 1994
-***************
-*** 9,19 ****
-  #ifndef panel_impl_defined
-  #define panel_impl_defined
-  
-  #ifndef FILE
-  #ifndef SVR4
-- #undef NULL
-  #endif SVR4
-  #include <stdio.h>
-  #endif FILE
-  #include <sys/types.h>
-  #include <X11/Xlib.h>
---- 9,24 ----
-  #ifndef panel_impl_defined
-  #define panel_impl_defined
-  
-+ #ifdef NULL
-+ #undef NULL
-+ #endif
-  #ifndef FILE
-  #ifndef SVR4
-  #endif SVR4
-  #include <stdio.h>
-+ #ifndef NULL
-+ #define NULL 0
-+ #endif
-  #endif FILE
-  #include <sys/types.h>
-  #include <X11/Xlib.h>
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/rect/rect_util.c ./lib/libxview/rect/rect_util.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/rect/rect_util.c	Tue Jun 29 01:15:17 1993
---- ./lib/libxview/rect/rect_util.c	Sun Nov 20 13:39:09 1994
-***************
-*** 16,21 ****
---- 16,23 ----
-  
-  #include <xview/rect.h>
-  
-+ static int rect_nearest_edge();
-+ 
-  /*
-   * Compute the distance from rect to (x, y). If (x, y) is in rect, zero is
-   * returned. If x_used or y_used are non-zero, the projection point is
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/sel/sel_agent.c ./lib/libxview/sel/sel_agent.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/sel/sel_agent.c	Sun Jun 26 14:46:20 1994
---- ./lib/libxview/sel/sel_agent.c	Sun Nov 20 13:39:09 1994
-***************
-*** 63,69 ****
-  static void     selection_agent_do_function();
-  static Atom 	get_atom();
-  static Seln_attribute save_atom();
-! 
-  
-  Xv_private Seln_result seln_convert_request_to_property();
-  /* called by seln_svc.c
---- 63,69 ----
-  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,315 ****
---- 309,319 ----
-      struct stat     stat_buf;
-      int             count, size;
-      char           *destp;
-+ #if (defined(BSD) && (BSD >= 199306))
-+     extern off_t    lseek();
-+ #else
-      extern long     lseek();
-+ #endif
-  
-      if (fstat(fd, &stat_buf) != 0) {
-  	perror(XV_MSG("Agent couldn't reply about a file"));
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/sel/seln_impl.h ./lib/libxview/sel/seln_impl.h
-*** ../old/xview3.2p1-X11R6/lib/libxview/sel/seln_impl.h	Tue Jun 29 01:15:25 1993
---- ./lib/libxview/sel/seln_impl.h	Sun Nov 20 13:39:09 1994
-***************
-*** 9,20 ****
-   *	file for terms of the license.
-   */
-  
-  #include <errno.h>
-  #ifndef FILE
-  #ifndef SVR4
-- #undef NULL
-  #endif SVR4
-  #include <stdio.h>
-  #endif FILE
-  #include <sys/time.h>
-  #include <sys/types.h>
---- 9,25 ----
-   *	file for terms of the license.
-   */
-  
-+ #ifdef NULL
-+ #undef NULL
-+ #endif
-  #include <errno.h>
-  #ifndef FILE
-  #ifndef SVR4
-  #endif SVR4
-  #include <stdio.h>
-+ #ifndef NULL
-+ #define NULL 0
-+ #endif
-  #endif FILE
-  #include <sys/time.h>
-  #include <sys/types.h>
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/selection/sel_own.c ./lib/libxview/selection/sel_own.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/selection/sel_own.c	Sat Jun 25 21:05:22 1994
---- ./lib/libxview/selection/sel_own.c	Sun Nov 20 13:39:10 1994
-***************
-*** 35,40 ****
---- 35,41 ----
-  static int sel_set_ownership(/* sel_owner */);
-  static int (*OldErrorHandler)();
-  static int SelOwnerErrorHandler();
-+ static int SendIncr();
-  static int ValidatePropertyEvent();
-  
-  static void SelClean();
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/selection/sel_req.c ./lib/libxview/selection/sel_req.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/selection/sel_req.c	Sat Jun 25 21:05:21 1994
---- ./lib/libxview/selection/sel_req.c	Sun Nov 20 13:39:10 1994
-***************
-*** 55,61 ****
-  static int GetSelection();
-  static int ProcessReply();
-  static Requestor *SelGetReq();
-! 
-  
-  /*ARGSUSED*/
-  Pkg_private int
---- 55,64 ----
-  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
-***************
-*** 1226,1232 ****
-  }
-  
-  
-! static XID 
-  SelGetOwnerXID( selReq )
-  Sel_req_info  *selReq;
-  {
---- 1229,1235 ----
-  }
-  
-  
-! Pkg_private XID 
-  SelGetOwnerXID( selReq )
-  Sel_req_info  *selReq;
-  {
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/selection/sel_util.c ./lib/libxview/selection/sel_util.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/selection/sel_util.c	Tue Jun 29 01:16:03 1993
---- ./lib/libxview/selection/sel_util.c	Sun Nov 20 13:39:10 1994
-***************
-*** 23,28 ****
---- 23,29 ----
-  static void FreeMultiProp();
-  static int	SelMatchReply();
-  static Sel_req_tbl *SelMatchReqTbl();
-+ static int SelFindReply();
-  
-  Pkg_private struct timeval *
-  xv_sel_cvt_xtime_to_timeval( XTime )
-***************
-*** 601,607 ****
-  	reqTbl->reply = reply;
-  	reqTbl->next = NULL;
-  	(void)XSaveContext( dpy, DefaultRootWindow(dpy),replyCtx,
-! 			   (caddr_t *)reqTbl);
-  	return reqTbl;
-      }
-      return (Sel_req_tbl *) xv_sel_add_new_req( reqTbl, reply );
---- 602,608 ----
-  	reqTbl->reply = reply;
-  	reqTbl->next = NULL;
-  	(void)XSaveContext( dpy, DefaultRootWindow(dpy),replyCtx,
-! 			   (XPointer)reqTbl);
-  	return reqTbl;
-      }
-      return (Sel_req_tbl *) xv_sel_add_new_req( reqTbl, reply );
-*** lib/libxview/server/server.c.orig	Sun Jun 26 13:53:40 1994
---- lib/libxview/server/server.c	Sun Jan 24 23:07:12 1999
-***************
-*** 65,70 ****
---- 65,71 ----
-  static unsigned int 	 string_to_modmask();
-  static Server_atom_type  save_atom();
-  static void 		 server_yield_modifiers();
-+ static int		 xv_set_scheduler();
-  
-  Xv_private char		*xv_strtok();
-  
-***************
-*** 100,108 ****
-  Xv_private_data char 	*xv_shell_prompt;
-  
-  /* global default server parameters */
-! Xv_private_data Xv_Server xv_default_server;
-! Xv_private_data Xv_Screen xv_default_screen;
-! Xv_private_data Display *xv_default_display;
-  
-  /* Global data */
-  Xv_private_data Defaults_pairs xv_kbd_cmds_value_pairs[4] = {
---- 101,109 ----
-  Xv_private_data char 	*xv_shell_prompt;
-  
-  /* global default server parameters */
-! extern Xv_Server xv_default_server;
-! extern Xv_Screen xv_default_screen;
-! extern Display *xv_default_display;
-  
-  /* Global data */
-  Xv_private_data Defaults_pairs xv_kbd_cmds_value_pairs[4] = {
-***************
-*** 440,446 ****
-    	/* lumpi@dobag.in-berlin.de */
-      if (XrmGetDatabase((Display *)server->xdisplay)) {
-  	server->db = XrmGetStringDatabase(
-! 				(XrmGetDatabase((Display *)server->xdisplay)));
-  #else
-      if (((Display *)server->xdisplay)->xdefaults) {
-  	server->db = XrmGetStringDatabase(
---- 441,447 ----
-    	/* lumpi@dobag.in-berlin.de */
-      if (XrmGetDatabase((Display *)server->xdisplay)) {
-  	server->db = XrmGetStringDatabase(
-! 				(char *) (XrmGetDatabase((Display *)server->xdisplay)));
-  #else
-      if (((Display *)server->xdisplay)->xdefaults) {
-  	server->db = XrmGetStringDatabase(
-*** lib/libxview/server/svr_x.c.orig	Sat Jan 23 20:41:18 1999
---- lib/libxview/server/svr_x.c	Sat Jan 23 20:42:42 1999
-***************
-*** 28,34 ****
-  #include <X11/keysym.h>
-  
-  extern Display *XOpenDisplay();
-! Xv_private_data Defaults_pairs xv_kbd_cmds_value_pairs[4];
-  
-  /*
-   * The following table describes the default key mappings for special 
---- 28,34 ----
-  #include <X11/keysym.h>
-  
-  extern Display *XOpenDisplay();
-! extern Defaults_pairs xv_kbd_cmds_value_pairs[4];
-  
-  /*
-   * The following table describes the default key mappings for special 
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/textsw/ei_text.c ./lib/libxview/textsw/ei_text.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/textsw/ei_text.c	Tue Jun 29 01:17:37 1993
---- ./lib/libxview/textsw/ei_text.c	Sun Nov 20 13:39:11 1994
-***************
-*** 121,126 ****
---- 121,127 ----
-  #endif
-  static struct ei_span_result ei_plain_text_span_of_group();
-  static struct ei_process_result ei_plain_text_expand();
-+ static paint_batch();
-  
-  struct ei_ops   ei_plain_text_ops = {
-      ei_plain_text_destroy,
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/textsw/es_attr.c ./lib/libxview/textsw/es_attr.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/textsw/es_attr.c	Tue Jun 29 01:17:31 1993
---- ./lib/libxview/textsw/es_attr.c	Sun Nov 20 13:39:11 1994
-***************
-*** 22,28 ****
-  
-  Pkg_private int
-  #ifdef ANSI_FUNC_PROTO
-! es_set(register Es_handle esh, ...)
-  #else
-  es_set(esh, va_alist)
-      register Es_handle esh;
---- 22,28 ----
-  
-  Pkg_private int
-  #ifdef ANSI_FUNC_PROTO
-! es_set(Es_handle esh, ...)
-  #else
-  es_set(esh, va_alist)
-      register Es_handle esh;
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/textsw/es_file.c ./lib/libxview/textsw/es_file.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/textsw/es_file.c	Tue Jun 29 01:17:34 1993
---- ./lib/libxview/textsw/es_file.c	Sun Nov 20 13:39:11 1994
-***************
-*** 109,117 ****
-  #include <xview_private/txt_18impl.h>
-  
-  
-! extern int      errno, sys_nerr;
-  extern char    *sys_errlist[];
-  extern long     lseek();
-  
-  static void update_read_buf();  /* update the read buf if overlaps write buf */
-  static Es_status es_file_commit();
---- 109,123 ----
-  #include <xview_private/txt_18impl.h>
-  
-  
-! extern int      errno;
-! extern const sys_nerr;
-! #if (defined(BSD) && (BSD >= 199306))
-! extern const char *const sys_err_list[];
-! extern off_t  lseek();
-! #else
-  extern char    *sys_errlist[];
-  extern long     lseek();
-+ #endif
-  
-  static void update_read_buf();  /* update the read buf if overlaps write buf */
-  static Es_status es_file_commit();
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/textsw/ev_op_bdry.c ./lib/libxview/textsw/ev_op_bdry.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/textsw/ev_op_bdry.c	Tue Jun 29 01:17:30 1993
---- ./lib/libxview/textsw/ev_op_bdry.c	Sun Nov 20 13:39:11 1994
-***************
-*** 28,33 ****
---- 28,36 ----
-  static Ev_finger_handle ev_insert_finger();
-  static Ev_mark_object last_generated_id;
-  
-+ static int ev_find_finger_internal();
-+ static ev_remove_finger_internal();
-+ 
-  #define FORALL(index_var)						\
-  	for (index_var = 0; index_var < fingers->last_plus_one; index_var++)
-  
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/textsw/ps_impl.c ./lib/libxview/textsw/ps_impl.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/textsw/ps_impl.c	Tue Jun 29 01:17:39 1993
---- ./lib/libxview/textsw/ps_impl.c	Sun Nov 20 13:39:12 1994
-***************
-*** 62,67 ****
---- 62,71 ----
-  static Es_index ps_replace(), ps_scratch_replace();
-  static int      ps_set();
-  
-+ static int	get_current_offset();
-+ 
-+ static copy_pieces();
-+ 
-  static Es_index write_header_etc();
-  
-  static struct es_ops ps_ops = {
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_again.c ./lib/libxview/textsw/txt_again.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_again.c	Tue Jun 29 01:17:32 1993
---- ./lib/libxview/textsw/txt_again.c	Sun Nov 20 13:39:12 1994
-***************
-*** 28,33 ****
---- 28,35 ----
-  Pkg_private Es_index textsw_do_input();
-  Pkg_private Es_index textsw_do_pending_delete();
-  
-+ static int textsw_string_min_free();
-+ 
-  string_t        null_string = {0, 0, 0};
-  
-  #define	TEXT_DELIMITER	"\\"
-***************
-*** 182,187 ****
---- 184,190 ----
-   * Following is stolen from 3.2ALPHA sprintf(str, fmt, va_alist) SIDE_EFFECT:
-   * TXTSW_STRING_FREE(ptr_to_string) is modified by this routine.
-   */
-+ #ifndef __FreeBSD__
-  #ifndef SVR4
-  
-  /* VARARGS2 */
-***************
-*** 325,330 ****
---- 328,358 ----
-  
-  #endif /* SVR4 */
-  
-+ #else /* __FreeBSD__ */
-+ /*inspiration taken from sprintf.c */
-+ 
-+ static int
-+ textsw_printf(register string_t *ptr_to_string, char  *fmt, ...)
-+ { 
-+     FILE            _strbuf;
-+     int             result;
-+     va_list         args;
-+     _strbuf._flags = __SWR | __SSTR;
-+     _strbuf._bf._base = _strbuf._p = (char *) TXTSW_STRING_FREE(ptr_to_string);
-+     _strbuf._bf._size = _strbuf._w = ptr_to_string->max_length - TXTSW_STRING_LENGTH(ptr_to_string);
-+     VA_START(args, fmt);
-+     result = vfprintf (&_strbuf, fmt, args);
-+     va_end(args);
-+     TXTSW_STRING_FREE(ptr_to_string) = (char *) _strbuf._p;
-+ #ifndef lint
-+     if (result >= 0)
-+     putc('\0', &_strbuf);
-+ #endif
-+     return (result); 
-+ }
-+ 
-+ #endif /* __FreeBSD__ */
-+ 
-  static	void
-  textsw_record_buf(again, buffer, buffer_length)
-      register string_t *again;
-***************
-*** 619,624 ****
---- 647,654 ----
-   */
-  /* VARARGS2 */
-  
-+ #ifndef __FreeBSD__
-+ 
-  static int
-  #ifdef ANSI_FUNC_PROTO
-  textsw_scanf(register string_t *ptr_to_string, register char  *fmt, ...)
-***************
-*** 705,710 ****
---- 735,773 ----
-  
-  #endif /* OW_I18N */
-  }
-+ #else /* __FreeBSD__ */
-+ /*inspiration/code taken from sscanf.c */
-+ 
-+ static int
-+ eofread(cookie, buf, len)
-+         void *cookie;
-+         char *buf;
-+         int len;
-+ {
-+ 
-+         return (0);
-+ }   
-+ 
-+ static int
-+ textsw_scanf(register string_t *ptr_to_string, char  *fmt, ...)
-+ {
-+     FILE            _strbuf;
-+     int             result;
-+     va_list         args;
-+ 
-+     _strbuf._flags = __SRD;
-+     _strbuf._bf._base = _strbuf._p = (char *) TXTSW_STRING_BASE(ptr_to_string);
-+     _strbuf._bf._size = _strbuf._r = TXTSW_STRING_LENGTH(ptr_to_string);
-+     _strbuf._read = eofread;
-+     _strbuf._ub._base = NULL;
-+     _strbuf._lb._base = NULL;
-+     VA_START(args, fmt);
-+     result = __svfscanf(&_strbuf, fmt, args);
-+     va_end(args);
-+     TXTSW_STRING_BASE(ptr_to_string) = (char *) _strbuf._p;
-+     return (result);
-+ }       
-+ #endif /* __FreeBSD__ */
-  
-  static int
-  textsw_next_is_delimiter(again)
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_e_menu.c ./lib/libxview/textsw/txt_e_menu.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_e_menu.c	Tue Jun 29 01:17:42 1993
---- ./lib/libxview/textsw/txt_e_menu.c	Sun Nov 20 13:39:12 1994
-***************
-*** 50,57 ****
---- 50,61 ----
-  #define	ERROR	-1
-  
-  #define	MAX_FILES	40
-+ #ifndef MAXPATHLEN
-  #define MAXPATHLEN	1024
-+ #endif
-+ #ifndef EXTRASMENU
-  #define	EXTRASMENU	"text_extras_menu"
-+ #endif
-  #define	MAXSTRLEN	256
-  #define	MAXARGS		20
-  
-***************
-*** 78,83 ****
---- 82,89 ----
-  
-  extern int      EXTRASMENU_FILENAME_KEY;
-  
-+ static any_shell_meta();
-+ 
-  Pkg_private char *
-  textsw_get_extras_filename(mi)
-      Menu_item       mi;
-***************
-*** 136,142 ****
-  	            goto found;
-  	}
-  
-! #ifdef notdef
-  	/* Gee, still?... We will try the old fashioned way */
-          (void) sprintf(tmp, "%s/lib/.%s",
-  		       filename, EXTRASMENU);
---- 142,148 ----
-  	            goto found;
-  	}
-  
-! #ifdef __FreeBSD__
-  	/* Gee, still?... We will try the old fashioned way */
-          (void) sprintf(tmp, "%s/lib/.%s",
-  		       filename, EXTRASMENU);
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_file.c ./lib/libxview/textsw/txt_file.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_file.c	Tue Jun 29 01:17:48 1993
---- ./lib/libxview/textsw/txt_file.c	Sun Nov 20 13:39:12 1994
-***************
-*** 50,57 ****
-  #else
-  extern char    *getwd();
-  #endif /* SVR4 */
-! extern int      errno, sys_nerr;
-  extern char    *sys_errlist[];
-  
-  Pkg_private int textsw_change_directory();
-  Pkg_private void textsw_display(), textsw_display_view_margins();
---- 50,62 ----
-  #else
-  extern char    *getwd();
-  #endif /* SVR4 */
-! extern int      errno;
-! extern const int sys_nerr;
-! #if (defined(BSD) && (BSD >= 199306))
-! extern const char *const sys_errlist[];
-! #else
-  extern char    *sys_errlist[];
-+ #endif
-  
-  Pkg_private int textsw_change_directory();
-  Pkg_private void textsw_display(), textsw_display_view_margins();
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_filter.c ./lib/libxview/textsw/txt_filter.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_filter.c	Tue Jun 29 01:17:39 1993
---- ./lib/libxview/textsw/txt_filter.c	Sun Nov 20 13:39:13 1994
-***************
-*** 55,60 ****
---- 55,63 ----
-  #define	REPLY_OKAY	 0
-  #define	REPLY_SEND	 1
-  
-+ static int	talk_to_filter();
-+ static int	start_filter();
-+ 
-  /* performance: global cache of getdtablesize() */
-  extern int      dtablesize_cache;
-  
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_input.c ./lib/libxview/textsw/txt_input.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_input.c	Tue Jun 29 01:17:42 1993
---- ./lib/libxview/textsw/txt_input.c	Sun Nov 20 13:39:13 1994
-***************
-*** 57,62 ****
---- 57,64 ----
-  Pkg_private     void textsw_implicit_commit_doit();
-  #endif
-  
-+ static int textsw_do_newline();
-+ 
-  #define SPACE_CHAR 0x20
-  
-  Pkg_private int
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_move.c ./lib/libxview/textsw/txt_move.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_move.c	Tue Jun 29 01:17:47 1993
---- ./lib/libxview/textsw/txt_move.c	Sun Nov 20 13:39:13 1994
-***************
-*** 55,61 ****
-  
-  static int dnd_data_key = 0; /* XXX: Don't do this at home kids. */
-  static int dnd_view_key = 0; 
-! static int DndConvertProc();
-  
-  Pkg_private Es_handle textsw_esh_for_span();
-  Pkg_private Es_index ev_resolve_xy();
---- 55,61 ----
-  
-  static int dnd_data_key = 0; /* XXX: Don't do this at home kids. */
-  static int dnd_view_key = 0; 
-! int DndConvertProc();
-  
-  Pkg_private Es_handle textsw_esh_for_span();
-  Pkg_private Es_index ev_resolve_xy();
-***************
-*** 688,694 ****
-      xv_destroy(dnd_accept_cursor);
-  }
-  
-! static int
-  DndConvertProc(dnd, type, data, length, format)
-      Dnd      	 dnd;
-      Atom        *type;
---- 688,694 ----
-      xv_destroy(dnd_accept_cursor);
-  }
-  
-! int
-  DndConvertProc(dnd, type, data, length, format)
-      Dnd      	 dnd;
-      Atom        *type;
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_popup.c ./lib/libxview/textsw/txt_popup.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_popup.c	Tue Jun 29 01:17:38 1993
---- ./lib/libxview/textsw/txt_popup.c	Sun Nov 20 13:39:13 1994
-***************
-*** 95,100 ****
---- 95,104 ----
-  static int      TEXTSW_POPUP_KEY;  /* key data holding one of the above
-  				      key names */
-  
-+ static void add_exten_item();
-+ static int  fc_exten_func();
-+ static void show_dot_files_proc();
-+ 
-  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,141 ****
-      Frame           popup_frame, base_frame;
-      Panel           panel = NULL;
-      char           *label;
--     void            add_exten_item();
-  #ifdef OW_I18N
-      int		    win_use_im = ((popup_type != TEXTSW_MENU_SEL_MARK_TEXT) &&
-  				  (popup_type != TEXTSW_MENU_NORMALIZE_LINE));
---- 139,144 ----
-***************
-*** 502,509 ****
-      int frame_width;
-      int frame_height;
-      Panel_item item;
--     void show_dot_files_proc();
--     int  fc_exten_func();
-   
-      
-      panel = xv_get(fc, FRAME_CMD_PANEL);
---- 505,510 ----
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_putkey.c ./lib/libxview/textsw/txt_putkey.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_putkey.c	Tue Jun 29 01:17:41 1993
---- ./lib/libxview/textsw/txt_putkey.c	Sun Nov 20 13:39:13 1994
-***************
-*** 21,26 ****
---- 21,28 ----
-  
-  extern int      errno;
-  
-+ static int	textsw_do_put();
-+ 
-  Pkg_private Ev_finger_handle ev_add_finger();
-  Pkg_private int      ev_get_selection();
-  Pkg_private Es_handle textsw_esh_for_span();
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_selsvc.c ./lib/libxview/textsw/txt_selsvc.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_selsvc.c	Sat Jun 25 21:05:23 1994
---- ./lib/libxview/textsw/txt_selsvc.c	Sun Nov 20 13:39:13 1994
-***************
-*** 24,29 ****
---- 24,31 ----
-  #include <stdlib.h>
-  #endif /* SVR4 */
-  
-+ static int textsw_should_ask_seln_svc();
-+ 
-  extern int      errno;
-  
-  Pkg_private Es_status es_copy();
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/ttysw/cim_change.c ./lib/libxview/ttysw/cim_change.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/ttysw/cim_change.c	Tue Jun 29 01:17:12 1993
---- ./lib/libxview/ttysw/cim_change.c	Sun Nov 20 13:39:14 1994
-***************
-*** 17,26 ****
-  #include <xview_private/i18n_impl.h>
-  #include <sys/types.h>
-  #include <pixrect/pixrect.h>
-- #include <xview_private/ttyansi.h>
-  #include <xview_private/charimage.h>
-  #include <xview_private/charscreen.h>
-  #include <xview_private/tty_impl.h>
-  
-  char            boldify;
-  
---- 17,26 ----
-  #include <xview_private/i18n_impl.h>
-  #include <sys/types.h>
-  #include <pixrect/pixrect.h>
-  #include <xview_private/charimage.h>
-  #include <xview_private/charscreen.h>
-  #include <xview_private/tty_impl.h>
-+ #include <xview_private/ttyansi.h>
-  
-  char            boldify;
-  
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/ttysw/tty_gtty.c ./lib/libxview/ttysw/tty_gtty.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/ttysw/tty_gtty.c	Tue Jun 29 01:17:20 1993
---- ./lib/libxview/ttysw/tty_gtty.c	Sun Nov 20 13:39:14 1994
-***************
-*** 14,19 ****
---- 14,20 ----
-   * Ttysw parameter retrieval mechanism to get original tty settings to pty.
-   */
-  
-+ #include <sys/param.h>
-  #include <sys/types.h>
-  #include <stdio.h>
-  #include <xview_private/portable.h>	/* for tty_mode_t and XV* defines */
-***************
-*** 34,39 ****
---- 35,41 ----
-   */
-  #ifdef	XV_USE_TERMIOS
-  
-+ #if !(defined(BSD) && (BSD >= 199103))
-  static struct termios	default_modes = {
-  	BRKINT|ICRNL|IXON|IGNPAR|IMAXBEL,	    	/* input modes */
-  	OPOST|ONLCR,				    	/* output modes */
-***************
-*** 57,62 ****
---- 59,78 ----
-  	CWERASE,	/* VWERASE */
-  	CLNEXT,		/* VLNEXT */
-  };
-+ #else
-+ #include <sys/ttydefaults.h>
-+ static struct termios default_modes = {
-+ 	TTYDEF_IFLAG,   /* input modes */
-+ 	TTYDEF_OFLAG,   /* output modes */      
-+ 	TTYDEF_CFLAG,   /* control modes */
-+ 	TTYDEF_LFLAG,   /* local modes */
-+ 	/* control characters */
-+ 	{ CEOF,   CEOL,   CEOL,   CERASE, CWERASE, CKILL, CREPRINT,
-+ 	_POSIX_VDISABLE, CINTR, CQUIT,  CSUSP,  CDSUSP, CSTART, CSTOP,  CLNEXT,
-+ 	CDISCARD, CMIN, CTIME,  CSTATUS, _POSIX_VDISABLE },
-+ 	TTYDEF_SPEED, TTYDEF_SPEED /* input and output speeds */
-+ };    
-+ #endif
-  
-  #else	/* XV_USE_TERMIOS */
-  
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/ttysw/tty_impl.h ./lib/libxview/ttysw/tty_impl.h
-*** ../old/xview3.2p1-X11R6/lib/libxview/ttysw/tty_impl.h	Tue Jun 29 01:17:18 1993
---- ./lib/libxview/ttysw/tty_impl.h	Sun Nov 20 13:39:14 1994
-***************
-*** 14,19 ****
---- 14,20 ----
-   * terminal emulation for teletype based programs.
-   */
-  
-+ #include <sys/param.h>
-  #include <xview_private/portable.h>	/* tty and pty configuration info */
-  
-  #ifdef	XV_USE_TERMIOS
-***************
-*** 210,216 ****
---- 211,223 ----
-   * Access functions for tty characteristics.
-   */
-  #ifdef	XV_USE_TERMIOS
-+ #if (defined(BSD) && (BSD >= 199103))
-+ #include <sys/ioctl.h>
-+ #include <sys/ioctl_compat.h>
-+ #define tty_gettabs(t)		((t)->termios.c_oflag & OXTABS)
-+ #else   
-  #define	tty_gettabs(t)		((t)->termios.c_oflag & XTABS)
-+ #endif
-  #define	tty_getdsuspc(t)	((int) ((t)->termios.c_cc[VDSUSP]))
-  #define	tty_geteofc(t)		((int) ((t)->termios.c_cc[VEOF]))
-  #define	tty_geteolc(t)		((int) ((t)->termios.c_cc[VEOL]))
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/ttysw/tty_init.c ./lib/libxview/ttysw/tty_init.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/ttysw/tty_init.c	Tue Jun 29 01:17:19 1993
---- ./lib/libxview/ttysw/tty_init.c	Sun Nov 20 13:39:14 1994
-***************
-*** 14,19 ****
---- 14,20 ----
-   * Ttysw initialization, destruction and error procedures
-   */
-  
-+ #include <sys/param.h>
-  #include <sys/time.h>
-  #include <sys/types.h>
-  #include <sys/stat.h>
-***************
-*** 82,88 ****
---- 83,93 ----
-  
-  extern char    *strncpy();
-  extern char    *strcpy();
-+ #if (defined(BSD) && (BSD >= 199306))
-+ extern off_t	lseek();
-+ #else
-  extern long     lseek();
-+ #endif
-  char           *textsw_checkpoint_undo();
-  
-  /* static */ void ttysw_parseargs();
-***************
-*** 106,111 ****
---- 111,117 ----
-  
-  extern int      ttysel_use_seln_service;
-  
-+ static int	ttyinit();
-  
-  struct ttysw_createoptions {
-      int             becomeconsole;	/* be the console */
-***************
-*** 518,523 ****
---- 524,532 ----
-      (void) dup2(ttysw->ttysw_tty, 2);
-      (void) close(ttysw->ttysw_tty);
-  
-+ #if (defined(BSD) && (BSD >= 199103))
-+     (void) ioctl(0, TIOCSCTTY, NULL);
-+ #endif
-      if (*argv == (char *) NULL || strcmp("-c", *argv) == 0) {
-  	/* Process arg list */
-  	int             argc;
-***************
-*** 955,961 ****
---- 964,974 ----
-      struct utmpx     utmp;
-  #endif
-      struct passwd  *passwdent;
-+ #if !(defined(BSD) && (BSD >= 199103))
-      extern struct passwd *getpwuid();
-+ #else
-+     struct passwd *getpwuid __P((uid_t));
-+ #endif
-      int             f;
-      char           *ttyn;
-      extern char    *ttyname();
-***************
-*** 1007,1019 ****
---- 1020,1041 ----
-  		XV_MSG("Add tty[qrs][0-f] to /etc/ttys file.\n"));
-  	return (0);
-      }
-+ #if !(defined(BSD) && (BSD >= 199103))
-      if ((f = open("/etc/utmp", 1)) >= 0) {
-+ #else
-+     if ((f = open(_PATH_UTMP, 1)) >= 0) {
-+ #endif
-  	(void) lseek(f, (long) (ttyslotuse * sizeof(utmp)), 0);
-  	(void) write(f, (char *) &utmp, sizeof(utmp));
-  	(void) close(f);
-      } else {
-  	(void) fprintf(stderr, 
-+ #if !(defined(BSD) && (BSD >= 199103))
-  	XV_MSG("make sure that you can write /etc/utmp!\n"));
-+ #else
-+ 	XV_MSG("make sure that you can write "));
-+ 	    (void) fprintf(stderr, "%s!\n", _PATH_UTMP);
-+ #endif
-  	return (0);
-      }
-      return (ttyslotuse);
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/ttysw/tty_main.c ./lib/libxview/ttysw/tty_main.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/ttysw/tty_main.c	Tue Jun 29 01:17:22 1993
---- ./lib/libxview/ttysw/tty_main.c	Sun Nov 20 13:39:14 1994
-***************
-*** 75,80 ****
---- 75,85 ----
-  int     committed_left = 0;
-  #endif
-  
-+ static int ttysw_process_point();
-+ static int ttysw_process_adjust();
-+ static int ttysw_process_motion();
-+ static int ttysw_process_keyboard();
-+ 
-  extern Textsw_index textsw_insert();
-  #ifdef OW_I18N
-  extern Textsw_index textsw_insert_wcs();
-***************
-*** 906,913 ****
---- 911,922 ----
-  
-  	    if (int_ucntl == (tiocsti & 0xff))
-  		ttysw_process_STI(ttysw, owbp, cc - 1);
-+ #ifndef XV_USE_TERMIOS
-  	    (void) ioctl(ttysw->ttysw_tty, TIOCGETC, &ttysw->tchars);
-  	    (void) ioctl(ttysw->ttysw_tty, TIOCGLTC, &ttysw->ltchars);
-+ #else
-+ 	    (void) tcgetattr(ttysw->ttysw_tty, &ttysw->termios);
-+ #endif
-  	    ttysw_getp(TTY_VIEW_HANDLE_FROM_TTY_FOLIO(ttysw));	/* jcb for nng */
-  	} else
-  #ifdef OW_I18N
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/ttysw/tty_ntfy.c ./lib/libxview/ttysw/tty_ntfy.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/ttysw/tty_ntfy.c	Tue Jun 29 01:17:17 1993
---- ./lib/libxview/ttysw/tty_ntfy.c	Sun Nov 20 13:39:14 1994
-***************
-*** 171,180 ****
---- 171,184 ----
-       * SIGWINCHes on resize.
-       */
-      /* Notify process group that terminal has changed. */
-+ #if !(defined(BSD) && (BSD >= 199103))
-      if (ioctl(ttysw->ttysw_tty, TIOCGPGRP, &pgrp) == -1) {
-  	perror(XV_MSG("ttysw_sigwinch, can't get tty process group"));
-  	return;
-      }
-+ #else
-+     pgrp = tcgetpgrp(ttysw->ttysw_pty);
-+ #endif
-      /*
-       * Only killpg when pgrp is not tool's.  This is the case of haven't
-       * completed ttysw_fork yet (or even tried to do it yet).
-***************
-*** 204,210 ****
---- 208,218 ----
-  	return;
-      }
-      /* Send the signal to the process group of the controlling tty */
-+ #if !(defined(BSD) && (BSD >= 199103))
-      if (ioctl(ttysw->ttysw_tty, TIOCGPGRP, &control_pg) >= 0) {
-+ #else
-+     if ((control_pg = tcgetpgrp(ttysw->ttysw_pty)) >= 0) {
-+ #endif
-  	/*
-  	 * Flush our buffers of completed and partial commands. Be sure to do
-  	 * this BEFORE killpg, or we'll flush the prompt coming back from the
-***************
-*** 227,237 ****
-  	    termsw->cmd_started = 0;
-  	    termsw->pty_owes_newline = 0;
-  	}
-! #	if defined(XV_USE_SVR4_PTYS) || defined(sun)
-  	(void) ioctl(ttysw->ttysw_pty, TIOCSIGNAL, &sig);;
-! #	else
-  	(void) killpg(control_pg, sig);
-! #	endif
-      } else
-  	perror(XV_MSG("ioctl"));
-  }
---- 235,245 ----
-  	    termsw->cmd_started = 0;
-  	    termsw->pty_owes_newline = 0;
-  	}
-! #if defined(XV_USE_SVR4_PTYS) || defined(sun)
-  	(void) ioctl(ttysw->ttysw_pty, TIOCSIGNAL, &sig);;
-! #else
-  	(void) killpg(control_pg, sig);
-! #endif
-      } else
-  	perror(XV_MSG("ioctl"));
-  }
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/ttysw/ttyansi.c ./lib/libxview/ttysw/ttyansi.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/ttysw/ttyansi.c	Tue Jun 29 01:17:21 1993
---- ./lib/libxview/ttysw/ttyansi.c	Sun Nov 20 13:39:15 1994
-***************
-*** 31,36 ****
---- 31,40 ----
-  
-  #include <xview/sel_attrs.h>
-  
-+ static int	send_input_to_textsw();
-+ static int	ansi_lf();
-+ static int	ansi_char();
-+ 
-  char           *strncpy();
-  char           *textsw_checkpoint_undo();
-  Textsw_index    textsw_replace_i18n(), textsw_erase_i18n();
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/ttysw/ttyselect.c ./lib/libxview/ttysw/ttyselect.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/ttysw/ttyselect.c	Sat Jun 25 21:05:23 1994
---- ./lib/libxview/ttysw/ttyselect.c	Sun Nov 20 13:39:15 1994
-***************
-*** 75,80 ****
---- 75,82 ----
-  #endif
-                  ttysel_reply();
-  
-+ static ttysel_resynch();
-+ 
-  static struct ttyselection *
-                  ttysel_from_rank();
-  
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/win/win_input.c ./lib/libxview/win/win_input.c
-*** ../old/xview3.2p1-X11R6/lib/libxview/win/win_input.c	Sun Jun 26 18:27:53 1994
---- ./lib/libxview/win/win_input.c	Sun Nov 20 13:39:15 1994
-***************
-*** 56,61 ****
---- 56,62 ----
-  static int      GetButtonEvent();
-  static int      win_translate_KP_keysym();
-  static int 	translate_key();
-+ static int	xevent_to_event();
-  
-  extern struct rectlist *win_get_damage();
-  extern void     server_set_timestamp();
diff --git a/x11-toolkits/xview/files/patch-lib+libolgx+ol_button.c b/x11-toolkits/xview/files/patch-lib+libolgx+ol_button.c
new file mode 100644
index 000000000000..d4e0b87ffb83
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libolgx+ol_button.c
@@ -0,0 +1,29 @@
+--- lib/libolgx/ol_button.c.orig	Mon Sep 29 00:02:39 2003
++++ lib/libolgx/ol_button.c	Mon Sep 29 00:02:39 2003
+@@ -241,8 +241,12 @@
+ 				   x + ((centerx > 0) ? centerx : 0),
+ 				   y + ((centery > 0) ? centery : 0),
+ 				   (((Pixlabel *) label)->width > width)? 
+-                                               width:((Pixlabel *)label)->width ,
+-				  (height) ? height : Button_Height(info) - 2, state);
++						width:((Pixlabel *)label)->width ,
++				  (height) ? 
++				   ((((Pixlabel *) label)->height > height) ? 
++						 height : ((Pixlabel *)label)->height)
++ 					: Button_Height(info) - 2, state);
++ 
+ 	} else if (state & OLGX_LABEL_IS_XIMAGE) {
+ 
+ 	    int             centerx, centery;
+@@ -255,7 +259,10 @@
+ 				   y + ((centery > 0) ? centery : 0),
+ 				   (((Pixlabel *) label)->width > width)? 
+                                                width:((Pixlabel *)label)->width ,
+-				  (height) ? height : Button_Height(info) - 2, state);
++				  (height) ? 
++				   ((((Pixlabel *) label)->height > height) ? 
++					       height : ((Pixlabel *)label)->height)
++					: Button_Height(info) - 2, state);
+        } else {
+ 
+ 
diff --git a/x11-toolkits/xview/files/patch-lib+libolgx+ol_init.c b/x11-toolkits/xview/files/patch-lib+libolgx+ol_init.c
new file mode 100644
index 000000000000..85912f5942a9
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libolgx+ol_init.c
@@ -0,0 +1,62 @@
+--- lib/libolgx/ol_init.c.orig	Mon Sep 29 00:02:39 2003
++++ lib/libolgx/ol_init.c	Mon Sep 29 00:02:39 2003
+@@ -9,7 +9,10 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <sys/param.h>
++#ifndef __STDC__
+ #include <malloc.h>
++#endif
+ #include <X11/Xlib.h>
+ #include "olgx_impl.h"
+ #include "busy.h"
+@@ -699,7 +702,17 @@
+ 	    XSetFont(info->dpy, info->gc_rec[OLGX_TEXTGC]->gc,
+ 		     info->textfont->fid);
+ 
++ 	    /* Even if !three_d, OLGX_TEXTGC_REV doesn't necessarily exist,
++	     * so we only set the font, if it does. I don't know if this is
++	     * the right place to change it, but this fixes a bug reported
++	     * on alt.toolkits.xview.
++	     * martin-2.buck@student.uni-ulm.de
++	     */
++#if 1
++	    if (!info->three_d && info->gc_rec[OLGX_TEXTGC_REV])
++#else
+ 	    if (!info->three_d)
++#endif
+ 		/* Only 2d has TEXTGC_REV */
+ 		XSetFont(info->dpy, info->gc_rec[OLGX_TEXTGC_REV]->gc,
+ 			 info->textfont->fid);
+@@ -711,8 +724,15 @@
+ 	 */
+ 
+ 	XSetFont(info->dpy, info->gc_rec[OLGX_TEXTGC]->gc, font_info->fid);
++	/* See comment above.
++	 * martin-2.buck@student.uni-ulm.de
++	 */
++#if 1
++	if (!info->three_d && info->gc_rec[OLGX_TEXTGC_REV])
++#else
+ 
+ 	if (!info->three_d)
++#endif
+ 	    /* Only 2d has TEXTGC_REV */
+           XSetFont(info->dpy, info->gc_rec[OLGX_TEXTGC_REV]->gc, font_info->fid);
+ #endif
+@@ -925,7 +945,14 @@
+     if (! (Olgx_Flags(info) & OLGX_FONTSET)) {
+ #endif
+     info->gc_rec[OLGX_TEXTGC]->values.font = info->textfont->fid;
++    /* See comment above.
++     * martin-2.buck@student.uni-ulm.de
++     */
++#if 1
++    if (!info->three_d && info->gc_rec[OLGX_TEXTGC_REV])
++#else
+     if (!info->three_d)
++#endif
+ 	info->gc_rec[OLGX_TEXTGC_REV]->values.font = info->textfont->fid;
+ #ifdef OW_I18N
+     }
diff --git a/x11-toolkits/xview/files/patch-lib+libolgx+ol_sb.c b/x11-toolkits/xview/files/patch-lib+libolgx+ol_sb.c
new file mode 100644
index 000000000000..3fb7c3127382
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libolgx+ol_sb.c
@@ -0,0 +1,15 @@
+--- lib/libolgx/ol_sb.c.orig	Mon Sep 29 00:02:40 2003
++++ lib/libolgx/ol_sb.c	Mon Sep 29 00:02:39 2003
+@@ -11,7 +11,12 @@
+  */
+ 
+ #include <stdio.h>
++#include <sys/param.h>
++#ifdef __STDC__
++#include <stdlib.h>
++#else
+ #include <malloc.h>
++#endif
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include "olgx_impl.h"
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+attr+attr_copy.c b/x11-toolkits/xview/files/patch-lib+libxview+attr+attr_copy.c
new file mode 100644
index 000000000000..1aaec6cfa8fc
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+attr+attr_copy.c
@@ -0,0 +1,14 @@
+--- ./lib/libxview/attr/attr_copy.c.orig	Tue Jun 29 07:14:35 1993
++++ ./lib/libxview/attr/attr_copy.c	Sat Apr  1 18:25:23 2000
+@@ -12,6 +12,11 @@ static char     sccsid[] = "@(#)attr_cop
+ 
+ #include <xview/attr.h>
+ 
++static int copy_1_attr();
++static int copy_counted_list();
++static int copy_singleton();
++static int copy_null_list();
++
+ /*
+  * attr_copy:	copy an attribute list, returning the size in bytes
+  */
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+base+Imakefile b/x11-toolkits/xview/files/patch-lib+libxview+base+Imakefile
new file mode 100644
index 000000000000..2d733d87152a
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+base+Imakefile
@@ -0,0 +1,11 @@
+--- lib/libxview/base/Imakefile.orig	Wed Oct  1 23:53:39 2003
++++ lib/libxview/base/Imakefile	Wed Oct  1 23:53:39 2003
+@@ -37,7 +37,7 @@
+ 	drawable.o\
+ 	xv_debug.o\
+ 	xv_parse.o\
+-	xv_list.o\ 
++	xv_list.o\
+ 	xv_error.o
+ 
+ SRCS=\
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+base+base.h b/x11-toolkits/xview/files/patch-lib+libxview+base+base.h
new file mode 100644
index 000000000000..8ec5005c772c
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+base+base.h
@@ -0,0 +1,32 @@
+--- lib/libxview/base/base.h.orig	Wed Oct  1 23:53:39 2003
++++ lib/libxview/base/base.h	Wed Oct  1 23:53:39 2003
+@@ -6,10 +6,15 @@
+  *	file for terms of the license.
+  */
+ 
++#include <sys/param.h>
+ #ifndef xview_base_DEFINED
+ #define xview_base_DEFINED
+ #include <string.h>
++#ifdef __STDC__
++#include <stdlib.h>
++#else
+ #include <malloc.h>
++#endif
+ 
+ #include <xview/xv_c_types.h>
+ 
+@@ -54,10 +59,12 @@
+  * non-SVR4 systems.
+  */
+ #ifndef SUNOS41
++#if !(defined(BSD) && (BSD >= 199103))
+ #define XV_OS_SVR4
+-#define XV_USE_TTCOMPAT
+ #define SYSV_WAIT 
+ #define SYSV_UCONTEXT 
++#endif
++#define XV_USE_TTCOMPAT
+ #define XV_USE_XVFCNTL 
+ #endif
+  
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+base+xv_debug.h b/x11-toolkits/xview/files/patch-lib+libxview+base+xv_debug.h
new file mode 100644
index 000000000000..a550c9f588be
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+base+xv_debug.h
@@ -0,0 +1,20 @@
+--- ./lib/libxview/base/xv_debug.h.orig	Tue Jun 29 07:14:44 1993
++++ ./lib/libxview/base/xv_debug.h	Sat Apr  1 18:25:23 2000
+@@ -9,11 +9,16 @@
+ #ifndef _xv_debug_h_already_included
+ #define _xv_debug_h_already_included
+ 
++#ifdef NULL
++#undef NULL
++#endif
+ #ifndef FILE
+ #ifndef SVR4
+-#undef NULL
+ #endif SVR4
+ #include <stdio.h>
++#ifndef NULL
++#define NULL 0
++#endif
+ #endif FILE
+ #include <xview/pkg.h>		/* needed to get definition of Xv_private */
+   /* 
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+base+xv_error.c b/x11-toolkits/xview/files/patch-lib+libxview+base+xv_error.c
new file mode 100644
index 000000000000..1926246578c5
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+base+xv_error.c
@@ -0,0 +1,27 @@
+--- lib/libxview/base/xv_error.c.orig	Sat Oct  4 16:03:54 2003
++++ lib/libxview/base/xv_error.c	Sat Oct  4 16:52:26 2003
+@@ -11,17 +11,22 @@
+  */
+ 
+ #include <stdio.h>
++#include <sys/param.h>
+ #include <xview/pkg_public.h>
+ #include <X11/Xlib.h>
+ #include <xview_private/i18n_impl.h>
+ #include <xview_private/portable.h>
+ 
+ /* Unix system error variables */
+-extern int      sys_nerr;
++extern const int      sys_nerr;
++#if (defined(BSD) && (BSD >= 199306))
++extern const char *const sys_errlist[];
++#else
+ extern char    *sys_errlist[];
++#endif
+ extern int      errno;
+ 
+-Xv_private_data char *xv_app_name;
++extern Xv_private_data char *xv_app_name;
+ Xv_private int (*xv_error_proc) ();
+ 
+ /*
diff --git a/x11-toolkits/xview/files/patch-lc b/x11-toolkits/xview/files/patch-lib+libxview+color+cms_pblc.c
index e42b72290b5f..b930c5b81759 100644
--- a/x11-toolkits/xview/files/patch-lc
+++ b/x11-toolkits/xview/files/patch-lib+libxview+color+cms_pblc.c
@@ -1,5 +1,5 @@
---- lib/libxview/color/cms_pblc.c.orig	Tue Jun 29 14:15:53 1993
-+++ lib/libxview/color/cms_pblc.c	Sat Jan  9 23:32:10 1999
+--- lib/libxview/color/cms_pblc.c.orig	Mon Sep 29 00:02:28 2003
++++ lib/libxview/color/cms_pblc.c	Mon Sep 29 00:02:28 2003
 @@ -316,9 +316,10 @@
  {
      Cms_info		*cms = CMS_PRIVATE(cms_public);
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+defaults+defaults.c b/x11-toolkits/xview/files/patch-lib+libxview+defaults+defaults.c
new file mode 100644
index 000000000000..2e2e774e10fc
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+defaults+defaults.c
@@ -0,0 +1,14 @@
+--- lib/libxview/defaults/defaults.c.orig	Sat Oct  4 21:06:17 2003
++++ lib/libxview/defaults/defaults.c	Sat Oct  4 21:39:32 2003
+@@ -24,7 +24,11 @@
+ #include <xview/server.h>
+ #endif
+ #include <xview/xv_error.h>
++#ifdef X11R6
++#include <X11/Xlibint.h>
++#else
+ #include <X11/Xlib.h>
++#endif
+ #include <X11/Xatom.h>
+ #include <X11/Xresource.h>
+ #include <xview_private/i18n_impl.h>
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+dnd+dnd.c b/x11-toolkits/xview/files/patch-lib+libxview+dnd+dnd.c
new file mode 100644
index 000000000000..ca8e9bd8390d
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+dnd+dnd.c
@@ -0,0 +1,13 @@
+--- ./lib/libxview/dnd/dnd.c.orig	Tue Jun 29 07:15:57 1993
++++ ./lib/libxview/dnd/dnd.c	Sat Apr  1 18:25:23 2000
+@@ -38,6 +38,10 @@ static void UpdateGrabCursor();
+ extern int  DndContactDSDM();
+ extern int  DndFindSite();
+ extern XID  DndGetCursor();
++static int SendTrigger();
++static int SendOldDndEvent();
++static int WaitForAck();
++static int IsV2App();
+ 
+ Xv_public int
+ dnd_send_drop(dnd_public)
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+dnd+site.c b/x11-toolkits/xview/files/patch-lib+libxview+dnd+site.c
new file mode 100644
index 000000000000..28b50d410b05
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+dnd+site.c
@@ -0,0 +1,22 @@
+--- ./lib/libxview/dnd/site.c.orig	Tue Jun 29 07:15:58 1993
++++ ./lib/libxview/dnd/site.c	Sat Apr  1 18:25:23 2000
+@@ -19,6 +19,7 @@ static char     sccsid[] = "@(#)site.c 1
+ #ifdef SVR4 
+ #include <stdlib.h> 
+ #endif SVR4
++#include <sys/param.h>
+ 
+ static     void 	TransCoords();
+ Xv_private Xv_Window	win_get_top_level();
+@@ -246,7 +247,11 @@ DndDropAreaOps(site, mode, area)
+           /* (rectNode->rect) is of the wrong type. */
+           memmove(rect, &(rectNode->rect),  sizeof(Rect));
+ #else
++#if (defined(BSD) && (BSD >= 199103))
++	  bcopy(&(rectNode->rect), rect, sizeof(Rect));
++#else
+ 	  bcopy(rectNode->rect, rect, sizeof(Rect));
++#endif
+ #endif SVR4
+ 
+ 	  return((Xv_opaque)rect);
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+file_chooser+Imakefile b/x11-toolkits/xview/files/patch-lib+libxview+file_chooser+Imakefile
new file mode 100644
index 000000000000..7862751ba757
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+file_chooser+Imakefile
@@ -0,0 +1,55 @@
+--- ./lib/libxview/file_chooser/Imakefile.orig	Tue Jun 29 07:17:58 1993
++++ ./lib/libxview/file_chooser/Imakefile	Sat Apr  1 18:25:23 2000
+@@ -27,35 +27,35 @@ HDRSPRIVATE=	fchsr_impl.h flist_impl.h x
+ 		path_impl.h hist_impl.h
+ 
+ DATA_OBJS = fchsr_data.o\
+-	   flist_data.o\
+-	   path_data.o\
+-	   hist_data.o
++        flist_data.o\
++        path_data.o\
++        hist_data.o
+ 
+ TEXT_OBJS =\
+-	file_chsr.o\
++        file_chsr.o\
+         fc_layout.o\
+         file_list.o\
+         path.o\
+         xv_path_util.o\
+         hist_list.o\
+         hist_menu.o\
+-	fchsr_data.o\
+-        flist_data.o\ 
+-        path_data.o\ 
++        fchsr_data.o\
++        flist_data.o\
++        path_data.o\
+         hist_data.o
+ 
+ 
+ SRCS =\
+-	file_chsr.c\
+-	fc_layout.c\
+-	file_list.c\
+-	path.c\
+-	xv_path_util.c\
+-	hist_list.c\
+-	hist_menu.c\
+-	fchsr_data.c\
+-        flist_data.c\ 
+-        path_data.c\ 
++        file_chsr.c\
++        fc_layout.c\
++        file_list.c\
++        path.c\
++        xv_path_util.c\
++        hist_list.c\
++        hist_menu.c\
++        fchsr_data.c\
++        flist_data.c\
++        path_data.c\
+         hist_data.c
+ 
+ LIBTARGET = xview
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+file_chooser+fc_layout.c b/x11-toolkits/xview/files/patch-lib+libxview+file_chooser+fc_layout.c
new file mode 100644
index 000000000000..636bacfe5134
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+file_chooser+fc_layout.c
@@ -0,0 +1,13 @@
+--- ./lib/libxview/file_chooser/fc_layout.c.orig	Tue Jun 29 07:17:55 1993
++++ ./lib/libxview/file_chooser/fc_layout.c	Sat Apr  1 18:25:23 2000
+@@ -464,8 +464,8 @@ file_chooser_position_objects( private )
+ 
+ 	new_height 
+ 	    = (* private->exten_func)( FC_PUBLIC(private),
+-				      private->rect,
+-				      exten_rect,
++				      &private->rect,
++				      &exten_rect,
+ 				      COLS(2),
+ 				      private->rect.r_width - COLS(2),
+ 				      max_height
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+file_chooser+file_list.c b/x11-toolkits/xview/files/patch-lib+libxview+file_chooser+file_list.c
new file mode 100644
index 000000000000..46840d5f48bb
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+file_chooser+file_list.c
@@ -0,0 +1,80 @@
+--- ./lib/libxview/file_chooser/file_list.c.orig	Tue Jun 29 07:17:56 1993
++++ ./lib/libxview/file_chooser/file_list.c	Sat Apr  1 18:25:23 2000
+@@ -23,6 +23,9 @@ static char     sccsid[] = "@(#)file_lis
+ #include <xview_private/flist_impl.h>
+ #include <xview_private/portable.h>
+ 
++#ifdef __FreeBSD__
++#include <regex.h>
++#endif
+ 
+ 
+ /* X bitmaps for default glyphs */
+@@ -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();
++static int		flist_match_regex();
+ 
+ #if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)
+ static void	flist_error(File_list_private *private, char *format, ...);
+@@ -521,7 +525,11 @@ file_list_destroy ( public, status )
+     if (status == DESTROY_CLEANUP) {
+ 	xv_free_ref( private->directory );
+ 	xv_free_ref( private->regex_pattern );
++#ifndef __FreeBSD__
+ 	xv_free_ref( private->regex_compile );
++#else
++	xv_free_regex_t( (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 @@ static char	*compile();
+ static int 	step();
+ #endif /* SVR4 */
+ 
+-
++#ifndef __FreeBSD__
+ #include <regexp.h>
++#endif
+ 
+ 
+ static void
+ flist_compile_regex( private )
+      File_list_private *private;
+ {
++#ifndef __FreeBSD__
+     char compile_buf[MAXPATHLEN+1];
+     char *end_ptr;
+     size_t num_bytes;
+@@ -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);
++#else
++    regex_t *compile_buf = malloc(sizeof(regex_t));
++    if (compile_buf == NULL){
++      fprintf(stderr, "Couldn't allocate compile buffer\n");
++      exit(-1);
++    } 
++    regcomp(compile_buf, private->regex_pattern, 0);
++    xv_free_regex_t((regex_t *)private->regex_compile);
++    private->regex_compile = (char *)compile_buf;
++#endif
++
+ } 
+ 
+ 
+@@ -1205,7 +1226,11 @@ flist_match_regex( s, private )
+      char *s;
+      File_list_private *private;
+ {
++#ifndef __FreeBSD__
+     return step(s, private->regex_compile);
++#else
++    return !regexec((regex_t *)private->regex_compile, s, 0, NULL, 0);
++#endif
+ }
+ 
+ /****************************************************************************/
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+file_chooser+xv_path_util.h b/x11-toolkits/xview/files/patch-lib+libxview+file_chooser+xv_path_util.h
new file mode 100644
index 000000000000..685401fd3c73
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+file_chooser+xv_path_util.h
@@ -0,0 +1,10 @@
+--- lib/libxview/file_chooser/xv_path_util.h.orig	Wed Oct  1 23:53:54 2003
++++ lib/libxview/file_chooser/xv_path_util.h	Wed Oct  1 23:53:54 2003
+@@ -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;}}
+ 
+ 
+ EXTERN_FUNCTION(void  xv_error_sprintf, (Frame frame, int use_footer, char *format, DOTDOTDOT) );
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+filter+filter.c b/x11-toolkits/xview/files/patch-lib+libxview+filter+filter.c
new file mode 100644
index 000000000000..57d8ec9dbc2d
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+filter+filter.c
@@ -0,0 +1,31 @@
+--- ./lib/libxview/filter/filter.c.orig	Tue Jun 29 07:14:57 1993
++++ ./lib/libxview/filter/filter.c	Sat Apr  1 18:25:23 2000
+@@ -39,11 +39,12 @@ static char     sccsid[] = "@(#)filter.c
+ 
+ char           *stream_fgets();
+ 
+-enum CharClass
++static enum CharClass
+                 breakProc();
+-struct CharAction
++static struct CharAction
+                 digits();
+-
++static
++		any_shell_meta();
+ 
+ struct filter_rec **
+ xv_parse_filter_table(in, filename)
+@@ -203,10 +204,10 @@ xv_free_filter_table(table)
+ {
+     int             i;
+     for (i = 0; table[i] != NULL; i++) {
+-	cfree((char *) table[i]->call);
++	free((char *) table[i]->call);
+ 	free((char *) table[i]);
+     }
+-    cfree((char *) table);
++    free((char *) table);
+ }
+ 
+ static struct CharAction
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+font+font.c b/x11-toolkits/xview/files/patch-lib+libxview+font+font.c
new file mode 100644
index 000000000000..4875b05b34bc
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+font+font.c
@@ -0,0 +1,13 @@
+--- ./lib/libxview/font/font.c.orig	Tue Jun 29 07:15:01 1993
++++ ./lib/libxview/font/font.c	Sat Apr  1 18:25:24 2000
+@@ -67,6 +67,10 @@ Xv_private char *xv_font_regular_cmdline
+ Xv_private char *xv_font_scale_cmdline();
+ Xv_private char *xv_font_scale();
+ 
++static int font_setup_defaults();
++static int font_construct_name();
++static int font_init_create_attrs();
++
+ /*
+  * delimiters
+  */
diff --git a/x11-toolkits/xview/files/patch-lj b/x11-toolkits/xview/files/patch-lib+libxview+font+font_get.c
index 513256b9fcb8..513256b9fcb8 100644
--- a/x11-toolkits/xview/files/patch-lj
+++ b/x11-toolkits/xview/files/patch-lib+libxview+font+font_get.c
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+font+font_x.c b/x11-toolkits/xview/files/patch-lib+libxview+font+font_x.c
new file mode 100644
index 000000000000..16dd860e29ce
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+font+font_x.c
@@ -0,0 +1,11 @@
+--- lib/libxview/font/font_x.c.orig	Sun Oct  5 12:16:24 2003
++++ lib/libxview/font/font_x.c	Sun Oct  5 12:18:03 2003
+@@ -127,7 +127,7 @@
+ 	 */
+ 	*default_x = font->max_bounds.width;
+ 	*default_y = font->ascent + font->descent;
+-	if (font->min_byte1 || font->max_byte1)
++	if (font->min_byte1)	/* mbuck@debian.org */
+ 	    ERROR;
+ 	*max_char = MIN(255, font->max_char_or_byte2);	/* pixfont compat */
+ 	*min_char = MIN(255, font->min_char_or_byte2);	/* pixfont compat */
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+frame+fm_get.c b/x11-toolkits/xview/files/patch-lib+libxview+frame+fm_get.c
new file mode 100644
index 000000000000..0367c185e512
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+frame+fm_get.c
@@ -0,0 +1,10 @@
+--- ./lib/libxview/frame/fm_get.c.orig	Tue Jun 29 07:16:10 1993
++++ ./lib/libxview/frame/fm_get.c	Sat Apr  1 18:25:24 2000
+@@ -10,6 +10,7 @@ static char     sccsid[] = "@(#)fm_get.c
+  *	file for terms of the license.
+  */
+ 
++#include <ctype.h>
+ #include <xview_private/fm_impl.h>
+ #include <xview_private/draw_impl.h>
+ #include <xview/server.h>
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+frame+fm_impl.h b/x11-toolkits/xview/files/patch-lib+libxview+frame+fm_impl.h
new file mode 100644
index 000000000000..e3eff1fa594c
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+frame+fm_impl.h
@@ -0,0 +1,23 @@
+--- lib/libxview/frame/fm_impl.h.orig	Tue Jun 29 00:16:15 1993
++++ lib/libxview/frame/fm_impl.h	Sun Oct 12 20:13:46 2003
+@@ -17,12 +17,17 @@
+ #define _frame_impl_h_already_included
+ 
+ /* standard includes */
++#ifdef NULL
++#undef NULL
++#endif
+ #ifndef FILE
+ #ifndef SVR4
+-#undef NULL
+-#endif SVR4
++#endif /* SVR4 */
+ #include <stdio.h>
+-#endif FILE
++#ifndef NULL
++#define NULL 0
++#endif
++#endif /* FILE */
+ #include <sys/time.h>
+ #ifdef OW_I18N
+ #endif /* OW_I18N */
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+frame+fm_props.h b/x11-toolkits/xview/files/patch-lib+libxview+frame+fm_props.h
new file mode 100644
index 000000000000..579e83619afb
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+frame+fm_props.h
@@ -0,0 +1,20 @@
+--- ./lib/libxview/frame/fm_props.h.orig	Tue Jun 29 07:16:14 1993
++++ ./lib/libxview/frame/fm_props.h	Sat Apr  1 18:25:24 2000
+@@ -13,11 +13,16 @@
+ #define _frame_props_h_already_included
+ 
+ /* standard includes */
++#ifdef NULL
++#undef NULL
++#endif
+ #ifndef FILE
+ #ifndef SVR4
+-#undef NULL
+ #endif SVR4
+ #include <stdio.h>
++#ifndef NULL
++#define NULL 0
++#endif
+ #endif FILE
+ #include <sys/time.h>
+ #include <xview/notify.h>
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+frame+fm_rescale.c b/x11-toolkits/xview/files/patch-lib+libxview+frame+fm_rescale.c
new file mode 100644
index 000000000000..5d13c594d60f
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+frame+fm_rescale.c
@@ -0,0 +1,11 @@
+--- lib/libxview/frame/fm_rescale.c.orig	Sat Oct  4 19:28:47 2003
++++ lib/libxview/frame/fm_rescale.c	Sat Oct  4 19:31:47 2003
+@@ -43,7 +43,7 @@
+      */
+     window_default_event_func(frame_public, (Event *) 0, scale, (Notify_event_type) 0);
+     window_calculate_new_size(frame_public, frame_public, &frame_height, &frame_width);
+-    xv_set(frame_public, WIN_RECT, 0);
++	/* xv_set(frame_public, WIN_RECT, 0); */
+ 
+ 
+     /*
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+frame+fmcmd_set.c b/x11-toolkits/xview/files/patch-lib+libxview+frame+fmcmd_set.c
new file mode 100644
index 000000000000..7780fd0f93a7
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+frame+fmcmd_set.c
@@ -0,0 +1,11 @@
+--- ./lib/libxview/frame/fmcmd_set.c.orig	Tue Jun 29 07:16:07 1993
++++ ./lib/libxview/frame/fmcmd_set.c	Sat Apr  1 18:25:24 2000
+@@ -18,6 +18,8 @@ static char     sccsid[] = "@(#)fmcmd_se
+ #include <xview/panel.h>
+ #include <xview/server.h>
+ 
++static int update_default_pin_state();
++
+ Pkg_private     Xv_opaque
+ frame_cmd_set_avlist(frame_public, avlist)
+     Frame           frame_public;
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+frame+frame_base.h b/x11-toolkits/xview/files/patch-lib+libxview+frame+frame_base.h
new file mode 100644
index 000000000000..c9ed3d075615
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+frame+frame_base.h
@@ -0,0 +1,20 @@
+--- ./lib/libxview/frame/frame_base.h.orig	Tue Jun 29 07:16:14 1993
++++ ./lib/libxview/frame/frame_base.h	Sat Apr  1 18:25:24 2000
+@@ -17,11 +17,16 @@ static char     sccsid[] = "@(#)frame_ba
+ #define _frame_base_h_already_included
+ 
+ /* standard includes */
++#ifdef NULL
++#undef NULL
++#endif
+ #ifndef FILE
+ #ifndef SVR4
+-#undef NULL
+ #endif SVR4
+ #include <stdio.h>
++#ifndef NULL
++#define NULL 0
++#endif
+ #endif FILE
+ #include <sys/time.h>
+ #include <xview/notify.h>
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+frame+frame_cmd.h b/x11-toolkits/xview/files/patch-lib+libxview+frame+frame_cmd.h
new file mode 100644
index 000000000000..293434b379af
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+frame+frame_cmd.h
@@ -0,0 +1,20 @@
+--- ./lib/libxview/frame/frame_cmd.h.orig	Tue Jun 29 07:16:14 1993
++++ ./lib/libxview/frame/frame_cmd.h	Sat Apr  1 18:25:24 2000
+@@ -17,11 +17,16 @@ static char     sccsid[] = "@(#)frame_cm
+ #define _frame_cmd_h_already_included
+ 
+ /* standard includes */
++#ifdef NULL
++#undef NULL
++#endif
+ #ifndef FILE
+ #ifndef SVR4
+-#undef NULL
+ #endif SVR4
+ #include <stdio.h>
++#ifndef NULL
++#define NULL 0
++#endif
+ #endif FILE
+ #include <sys/time.h>
+ #include <xview/notify.h>
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+frame+frame_help.h b/x11-toolkits/xview/files/patch-lib+libxview+frame+frame_help.h
new file mode 100644
index 000000000000..aa59b32f7d77
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+frame+frame_help.h
@@ -0,0 +1,20 @@
+--- ./lib/libxview/frame/frame_help.h.orig	Tue Jun 29 07:16:10 1993
++++ ./lib/libxview/frame/frame_help.h	Sat Apr  1 18:25:24 2000
+@@ -17,11 +17,16 @@ static char     sccsid[] = "@(#)frame_he
+ #define _frame_help_h_already_included
+ 
+ /* standard includes */
++#ifdef NULL
++#undef  NULL
++#endif
+ #ifndef FILE
+ #ifndef SVR4
+-#undef NULL
+ #endif SVR4
+ #include <stdio.h>
++#ifndef NULL
++#define NULL 0
++#endif
+ #endif FILE
+ #include <sys/time.h>
+ #include <xview/notify.h>
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+icon+icon.c b/x11-toolkits/xview/files/patch-lib+libxview+icon+icon.c
new file mode 100644
index 000000000000..4cdfabaaf146
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+icon+icon.c
@@ -0,0 +1,38 @@
+--- lib/libxview/icon/icon.c.orig	Mon Sep 29 00:02:30 2003
++++ lib/libxview/icon/icon.c	Mon Sep 29 00:02:30 2003
+@@ -343,15 +343,32 @@
+     val.ts_x_origin = 0;
+     val.ts_y_origin = 0;	
+     val_mask = GCForeground | GCBackground | GCFunction | 
+-               GCPlaneMask | GCFillStyle | GCTileStipXOrigin | 
++               GCPlaneMask | GCTileStipXOrigin | 
+                GCTileStipYOrigin;
+     XChangeGC(display, gc, val_mask, &val );
+ 
+     if (PR_NOT_MPR(((Pixrect *) icon->ic_mpr)))  {
+ 	DRAWABLE_INFO_MACRO( (Xv_opaque) icon->ic_mpr, src_info );
++
++	/* stipple only if we have a bitmap icon */
++	if (xv_depth(src_info) == 1) {
++		val.stipple = xv_xid(src_info);
++		val.fill_style = FillOpaqueStippled;
++		val_mask = GCFillStyle | GCStipple;
++	} else if (xv_depth(info) == xv_depth(src_info)) {
++		val.tile = xv_xid(src_info);
++		val.fill_style = FillTiled;
++		val_mask = GCFillStyle | GCTile;
++	} else {
++		xv_error(NULL,
++			ERROR_STRING,
++		 	XV_MSG("icon: can't handle drawables of different depth"),
++		 	0);
++		return (XV_ERROR);
++	}	
++
+ 	val.clip_mask = xv_xid(mask_info);
+-	val.stipple = xv_xid(src_info);
+-	val_mask = GCStipple | GCClipMask;
++	val_mask |= GCClipMask;
+ 	XChangeGC(display, gc, val_mask, &val );
+ 
+ 	if ( xv_rop_internal( display, xid, gc, icon->ic_gfxrect.r_left + x,
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+io_stream+file_strms.c b/x11-toolkits/xview/files/patch-lib+libxview+io_stream+file_strms.c
new file mode 100644
index 000000000000..ea38b7748475
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+io_stream+file_strms.c
@@ -0,0 +1,26 @@
+--- ./lib/libxview/io_stream/file_strms.c.orig	Tue Jun 29 07:15:07 1993
++++ ./lib/libxview/io_stream/file_strms.c	Sat Apr  1 18:25:24 2000
+@@ -17,7 +17,11 @@ static char     sccsid[] = "@(#)file_str
+ 
+ #define GetFISData struct xv_file_input_stream_data *data = (struct xv_file_input_stream_data*) in->client_data
+ 
++#ifndef __FreeBSD__
+ static struct xv_file_input_stream_data {
++#else
++struct xv_file_input_stream_data {
++#endif
+     FILE           *fp;
+     int             lineno;
+ };
+@@ -156,7 +160,11 @@ xv_file_input_stream(s, fp)
+ 
+ #define GetFOSData struct xv_file_output_stream_data *data = (struct xv_file_output_stream_data*) out->client_data
+ 
++#ifndef __FreeBSD__
+ static struct xv_file_output_stream_data {
++#else
++struct xv_file_output_stream_data {
++#endif
+     FILE           *fp;
+     int             lineno;
+ };
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+io_stream+othr_strms.c b/x11-toolkits/xview/files/patch-lib+libxview+io_stream+othr_strms.c
new file mode 100644
index 000000000000..9411667e503a
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+io_stream+othr_strms.c
@@ -0,0 +1,14 @@
+--- ./lib/libxview/io_stream/othr_strms.c.orig	Tue Jun 29 07:15:05 1993
++++ ./lib/libxview/io_stream/othr_strms.c	Sat Apr  1 18:25:24 2000
+@@ -17,7 +17,11 @@ static char     sccsid[] = "@(#)othr_str
+ 
+ #define GetFCSData struct xv_filter_comments_stream_data *data = (struct xv_filter_comments_stream_data*) in->client_data
+ 
++#ifndef __FreeBSD__
+ static struct xv_filter_comments_stream_data {
++#else
++struct xv_filter_comments_stream_data {
++#endif
+     Bool            backed_up;
+     char            backup, lastchar;
+ };
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+io_stream+str_strms.c b/x11-toolkits/xview/files/patch-lib+libxview+io_stream+str_strms.c
new file mode 100644
index 000000000000..39e39aecc8ab
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+io_stream+str_strms.c
@@ -0,0 +1,26 @@
+--- ./lib/libxview/io_stream/str_strms.c.orig	Tue Jun 29 07:15:06 1993
++++ ./lib/libxview/io_stream/str_strms.c	Sat Apr  1 18:25:24 2000
+@@ -17,7 +17,11 @@ static char     sccsid[] = "@(#)str_strm
+ 
+ #define GetSISData struct string_input_stream_data	*data = (struct string_input_stream_data*) in->client_data
+ 
++#ifndef __FreeBSD__
+ static struct string_input_stream_data {
++#else
++struct string_input_stream_data {
++#endif
+     char           *string;
+     int             charpos;
+ };
+@@ -148,7 +152,11 @@ string_input_stream(s, in)
+ 
+ #define GetSOSData struct string_output_stream_data *data = (struct string_output_stream_data*) out->client_data
+ 
++#ifndef __FreeBSD__
+ static struct string_output_stream_data {
++#else
++struct string_output_stream_data {
++#endif
+     char           *string;
+     int             charpos;
+ };
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+menu+Imakefile b/x11-toolkits/xview/files/patch-lib+libxview+menu+Imakefile
new file mode 100644
index 000000000000..a0b38dbd33e3
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+menu+Imakefile
@@ -0,0 +1,11 @@
+--- ./lib/libxview/menu/Imakefile.orig	Tue Jun 29 07:16:27 1993
++++ ./lib/libxview/menu/Imakefile	Sat Apr  1 18:25:24 2000
+@@ -28,7 +28,7 @@ DATA_OBJS = om_data.o
+ TEXT_OBJS =\
+ 	omi.o\
+ 	om_public.o\
+-	om_render.o\ 
++	om_render.o\
+ 	om_set.o\
+ 	om_get.o\
+ 	om_compat.o
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+menu+om_render.c b/x11-toolkits/xview/files/patch-lib+libxview+menu+om_render.c
new file mode 100644
index 000000000000..b011632db190
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+menu+om_render.c
@@ -0,0 +1,14 @@
+--- ./lib/libxview/menu/om_render.c.orig	Tue Jun 29 07:16:26 1993
++++ ./lib/libxview/menu/om_render.c	Sat Apr  1 18:25:24 2000
+@@ -470,9 +470,9 @@ menu_render(menu, group, parent)
+      * Define the menu and shadow window dimensions.  Note: shadow rect width &
+      * height = menu rect width & height
+      */
+-    xv_set(m->window, XV_RECT, m->fs_menurect, 0);
++    xv_set(m->window, XV_RECT, &m->fs_menurect, 0);
+     if (!m->group_info->three_d)
+-	xv_set(m->shadow_window, XV_RECT, shadowrect, 0);
++	xv_set(m->shadow_window, XV_RECT, &shadowrect, 0);
+ 
+     XFlush(XV_DISPLAY_FROM_WINDOW(m->window));
+ 
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+menu+om_set.c b/x11-toolkits/xview/files/patch-lib+libxview+menu+om_set.c
new file mode 100644
index 000000000000..407c1c6ffc3f
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+menu+om_set.c
@@ -0,0 +1,10 @@
+--- ./lib/libxview/menu/om_set.c.orig	Tue Jun 29 07:16:24 1993
++++ ./lib/libxview/menu/om_set.c	Sat Apr  1 18:25:25 2000
+@@ -12,6 +12,7 @@ static char     sccsid[] = "@(#)om_set.c
+ 
+ /* --------------------------------------------------------------------- */
+ #include <sys/types.h>
++#include <ctype.h>
+ #include <xview_private/om_impl.h>
+ #include <xview_private/draw_impl.h>
+ #include <xview_private/fm_impl.h>
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+misc+Imakefile b/x11-toolkits/xview/files/patch-lib+libxview+misc+Imakefile
new file mode 100644
index 000000000000..a918e6439e98
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+misc+Imakefile
@@ -0,0 +1,58 @@
+--- lib/libxview/misc/Imakefile.orig	Wed Oct  1 23:53:48 2003
++++ lib/libxview/misc/Imakefile	Wed Oct  1 23:53:48 2003
+@@ -29,8 +29,8 @@
+                           xv_i18n.c     \
+                           xv_path.c
+ 
+-OFILES.misc.3	= ${CFILES.misc.3:%.c=%.o}
+-OFILES.misc.4	= ${CFILES.misc.4:%.c=%.o}
++OFILES.misc.3	= ${CFILES.misc.3:.c=.o}
++OFILES.misc.4	= ${CFILES.misc.4:.c=.o}
+ 
+ HFILES.misc.3          =
+ HFILES.misc.4          =
+@@ -43,7 +43,7 @@
+ GETTEXT.C		=
+ #endif
+ 
+-GETTEXT.O		= ${GETTEXT.C:%.c=%.o}
++GETTEXT.O		= ${GETTEXT.C:.c=.o}
+ 
+ HDRSPUBLIC=     cms_grays.h cms_mono.h cmsrainbow.h cms_rgb.h sun.h \
+                 window_hs.h expandname.h xv_c_types.h attrol.h db.h \
+@@ -57,7 +57,7 @@
+ 	demorandom.o\
+ 	getlogindr.o\
+ 	expandname.o\
+-	expandpath.o\ 
++	expandpath.o\
+ 	bitmask.o\
+ 	hashfn.o\
+ 	db_conv.o\
+@@ -76,7 +76,7 @@
+ 	demorandom.c\
+ 	getlogindr.c\
+ 	expandname.c\
+-	expandpath.c\ 
++	expandpath.c\
+ 	bitmask.c\
+ 	hashfn.c\
+ 	db_conv.c\
+@@ -95,7 +95,7 @@
+ 	demorandom.o\
+ 	getlogindr.o\
+ 	expandname.o\
+-	expandpath.o\ 
++	expandpath.o\
+ 	bitmask.o\
+ 	hashfn.o\
+ 	db_conv.o\
+@@ -115,7 +115,7 @@
+ 	demorandom.c\
+ 	getlogindr.c\
+ 	expandname.c\
+-	expandpath.c\ 
++	expandpath.c\
+ 	bitmask.c\
+ 	hashfn.c\
+ 	db_conv.c\
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+misc+expandname.c b/x11-toolkits/xview/files/patch-lib+libxview+misc+expandname.c
new file mode 100644
index 000000000000..8a2e8bf51324
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+misc+expandname.c
@@ -0,0 +1,12 @@
+--- ./lib/libxview/misc/expandname.c.orig	Tue Jun 29 07:16:30 1993
++++ ./lib/libxview/misc/expandname.c	Sat Apr  1 18:25:25 2000
+@@ -120,7 +120,9 @@ xv_expand_name(name)
+     }
+     (void) close(pivec[0]);
+ #ifndef SVR4
++#if !(defined(BSD) && (BSD >= 199103))
+     while (wait((union wait *) & status) != pid);
++#endif
+ #else SVR4
+     while (wait( & status) != pid);
+ #endif SVR4
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+misc+getlogindr.c b/x11-toolkits/xview/files/patch-lib+libxview+misc+getlogindr.c
new file mode 100644
index 000000000000..d773e611ea5a
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+misc+getlogindr.c
@@ -0,0 +1,10 @@
+--- ./lib/libxview/misc/getlogindr.c.orig	Tue Jun 29 07:16:30 1993
++++ ./lib/libxview/misc/getlogindr.c	Sat Apr  1 18:25:25 2000
+@@ -17,6 +17,7 @@ static char     sccsid[] = "@(#)getlogin
+ 
+ #include <stdio.h>
+ #include <pwd.h>
++#include <sys/param.h>
+ #include <xview_private/i18n_impl.h>
+ #include <xview/xv_error.h>
+ 
diff --git a/x11-toolkits/xview/files/patch-lq b/x11-toolkits/xview/files/patch-lib+libxview+misc+gettext.c
index 0d720edd8b1a..0d720edd8b1a 100644
--- a/x11-toolkits/xview/files/patch-lq
+++ b/x11-toolkits/xview/files/patch-lib+libxview+misc+gettext.c
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+misc+gettext.h b/x11-toolkits/xview/files/patch-lib+libxview+misc+gettext.h
new file mode 100644
index 000000000000..5ca7ab0ad24b
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+misc+gettext.h
@@ -0,0 +1,11 @@
+--- lib/libxview/misc/gettext.h.orig	Wed Oct  1 00:25:29 2003
++++ lib/libxview/misc/gettext.h	Wed Oct  1 15:26:09 2003
+@@ -1,7 +1,7 @@
+ /* @(#)gettext.h 50.11 93/06/28 SMI */
+ 
+ #define DEFAULT_DOMAIN	"default"
+-#define DEFAULT_BINDING "/usr/lib/locale\n"
++#define DEFAULT_BINDING "/usr/lib/share/locale\n"
+ #define COOKIE 0xFF
+ #define BINDINGLISTDELIM '\n'
+ 
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+misc+portable.h b/x11-toolkits/xview/files/patch-lib+libxview+misc+portable.h
new file mode 100644
index 000000000000..1c4bebf53bbc
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+misc+portable.h
@@ -0,0 +1,32 @@
+--- lib/libxview/misc/portable.h.orig	Tue Jun 29 14:16:34 1993
++++ lib/libxview/misc/portable.h	Sat Jan  9 23:19:57 1999
+@@ -10,6 +10,7 @@
+ #ifndef xview_portable_h_DEFINED
+ #define xview_portable_h_DEFINED
+ 
++#include <sys/param.h>
+ #include <xview/attr.h>
+ 
+ #if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)
+@@ -24,6 +25,10 @@
+ 
+ EXTERN_FUNCTION (Attr_avlist copy_va_to_av, (va_list valist, Attr_avlist avlist, Attr_attribute attr1));
+ 
++#ifdef __alpha__
++#define	NO_CAST_VATOAV
++#endif
++
+ #ifdef NO_CAST_VATOAV
+ #define AVLIST_DECL  Attr_attribute avarray[ATTR_STANDARD_SIZE];  \
+                      Attr_avlist    avlist = avarray
+@@ -70,7 +75,11 @@
+ #define	XV_USE_TERMIOS
+ #define	XV_USE_SVR4_PTYS
+ #else	/* SVR4 */
++#if (defined(BSD) && (BSD >= 199103))
++#define XV_USE_TERMIOS
++#else
+ #undef	XV_USE_TERMIOS
++#endif
+ #undef	XV_USE_SVR4_PTYS
+ #endif	/* SVR4 */
diff --git a/x11-toolkits/xview/files/patch-lk b/x11-toolkits/xview/files/patch-lib+libxview+notice+notice_get.c
index eaa1f177c542..eaa1f177c542 100644
--- a/x11-toolkits/xview/files/patch-lk
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notice+notice_get.c
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+notice+notice_pt.c b/x11-toolkits/xview/files/patch-lib+libxview+notice+notice_pt.c
new file mode 100644
index 000000000000..6682d30db82d
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notice+notice_pt.c
@@ -0,0 +1,10 @@
+--- ./lib/libxview/notice/notice_pt.c.orig	Tue Jun 29 07:16:40 1993
++++ ./lib/libxview/notice/notice_pt.c	Sat Apr  1 18:25:25 2000
+@@ -58,6 +58,7 @@ static notice_buttons_handle notice_butt
+ static void     notice_copy_event();
+ static Xv_window	notice_get_focus_win();
+ static int	notice_show_focus_win();
++static int	notice_quadrant();
+ 
+ /*
+  * --------------------------- STATICS ------------------------------
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet.h b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet.h
new file mode 100644
index 000000000000..46a6600bf238
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet.h
@@ -0,0 +1,14 @@
+--- lib/libxview/notify/ndet.h.orig	Tue Jun 29 00:18:12 1993
++++ lib/libxview/notify/ndet.h	Sun Oct 12 19:47:56 2003
+@@ -17,6 +17,11 @@
+ #ifndef	NDET_DEFINED
+ #define	NDET_DEFINED
+ 
++#include <sys/param.h>
++#if (defined(BSD) && (BSD >= 199103))
++#include <signal.h>
++#endif
++
+ /*
+ ********************** Detector Loop Notes ****************************
+ Here is some notes on the detector loop: 
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_auto.c b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_auto.c
new file mode 100644
index 000000000000..5660b3c7b266
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_auto.c
@@ -0,0 +1,12 @@
+--- lib/libxview/notify/ndet_auto.c.orig	Sun Oct 12 19:37:15 2003
++++ lib/libxview/notify/ndet_auto.c	Sun Oct 12 19:39:34 2003
+@@ -21,7 +21,8 @@
+ #include <xview_private/ndis.h>	/* For ndis_enqueue */
+ #include <errno.h>
+ #include <signal.h>
+-#ifdef SVR4 
++#include <sys/param.h>
++#if defined(SVR4) || defined(BSD4_4) 
+ #include <stdlib.h> 
+ #endif SVR4
+ 
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_fcntl.c b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_fcntl.c
new file mode 100644
index 000000000000..2503973be49e
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_fcntl.c
@@ -0,0 +1,43 @@
+--- ./lib/libxview/notify/ndet_fcntl.c.orig	Tue Jun 29 07:18:03 1993
++++ ./lib/libxview/notify/ndet_fcntl.c	Sat Apr  1 18:25:25 2000
+@@ -17,22 +17,39 @@ static char     sccsid[] = "@(#)ndet_fcn
+ 
+ #include <xview_private/ntfy.h>
+ #include <xview_private/ndet.h>
++#include <sys/param.h>
+ #include <signal.h>
+ #include <fcntl.h>
+ #ifdef SVR4
+ #include <sys/file.h>
+ #endif SVR4
+-
++#if (defined(BSD) && (BSD >= 199103))
++#include <stdarg.h>
++#endif
+ extern int
+ #ifdef SVR4
+ xv_fcntl(fd, cmd, arg)
+ #else
++#if (defined(BSD) && (BSD >= 199103))
++fcntl(int fd, int cmd, ...)
++#else
+ fcntl(fd, cmd, arg)
++#endif
+ #endif SVR4
++#if !(defined(BSD) && (BSD >= 199103))
+     int             fd, cmd, arg;
++#endif
+ {
+     fd_set          bit;
+     int             res;
++
++#if (defined(BSD) && (BSD >= 199103))
++    int arg;  
++    va_list valist;
++    va_start(valist, cmd);
++    arg = va_arg(valist, int);
++    va_end(valist);
++#endif
+ 
+     /* Set fd bit */
+     FD_ZERO(&bit);
diff --git a/x11-toolkits/xview/files/patch-lg b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_fd.c
index c4588bb399f9..c4588bb399f9 100644
--- a/x11-toolkits/xview/files/patch-lg
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_fd.c
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_loop.c b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_loop.c
new file mode 100644
index 000000000000..3804f7bc32eb
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_loop.c
@@ -0,0 +1,28 @@
+--- 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
+  * Ndet_loop.c - Notification loop.
+  */
+ 
++#include <sys/param.h>
+ #include <xview_private/i18n_impl.h>
+ #include <xview_private/ntfy.h>
+ #include <xview_private/ndet.h>
+ #include <xview_private/nint.h>
+ #include <xview_private/ndis.h>	/* For ndis_dispatch */
+ #ifndef SVR4
+-#include <syscall.h>
++#include <sys/syscall.h>
+ #else SVR4
+ #include <sys/syscall.h>
+ #include <sys/poll.h>
+@@ -224,7 +225,8 @@ notify_start()
+ 	     * will return with an EINTR when a signal arrives while IN
+ 	     * select, not ON THE WAY into select).
+ 	     */
+-#ifndef SVR4
++
++#if !defined(SVR4) && !(defined(BSD) && (BSD >= 199103))
+ 	    nfds = syscall(SYS_select,
+ 			   FD_SETSIZE, &ibits, &obits, &ebits,
+ 		 (sigisempty(&ndet_sigs_received)) ? timer : &ndet_polling_tv);
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_read.c b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_read.c
new file mode 100644
index 000000000000..409cab1f77c7
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_read.c
@@ -0,0 +1,27 @@
+--- ./lib/libxview/notify/ndet_read.c.orig	Tue Jun 29 07:18:04 1993
++++ ./lib/libxview/notify/ndet_read.c	Sat Apr  1 18:25:25 2000
+@@ -15,6 +15,7 @@ static char     sccsid[] = "@(#)ndet_rea
+  * not already in the middle of it.
+  */
+ 
++#include <sys/param.h>
+ #include <xview_private/ntfy.h>
+ #include <xview_private/ndet.h>
+ #include <xview_private/ndis.h>	/* For ndis_client == NTFY_CLIENT_NULL check */
+@@ -29,11 +30,16 @@ static int      ndet_read_done;
+ 
+ static Notify_client ndet_read_nclient = (Notify_client) & ndet_read_done;
+ 
++#if !(defined(BSD) && (BSD >= 199103))
+ extern int
+ read(fd, buf, nbytes)
+     register int    fd;
+     char           *buf;
+     int             nbytes;
++#else
++extern int
++read(int fd, void *buf, size_t nbytes)
++#endif
+ {
+     int             ndelay;
+     Notify_error    return_code;
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+notify+ndisd_wait.c b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndisd_wait.c
new file mode 100644
index 000000000000..a27ea0296536
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndisd_wait.c
@@ -0,0 +1,24 @@
+--- lib/libxview/notify/ndisd_wait.c.orig	Tue Jun 29 00:17:59 1993
++++ lib/libxview/notify/ndisd_wait.c	Thu Oct 16 17:37:44 2003
+@@ -16,17 +16,18 @@
+ #include <xview_private/ntfy.h>
+ #include <xview_private/ndis.h>
+ #include <signal.h>
++#include <sys/param.h>
+ 
+ /* ARGSUSED */
+ extern          Notify_value
+ notify_default_wait3(client, pid, status, rusage)
+     Notify_client   client;
+     int             pid;
+-#ifndef SVR4
++#if !((BSD4_4) || defined(SVR4))
+     union wait     *status;
+-#else SVR4
++#else /* SVR4 */
+     int *status;
+-#endif SVR4
++#endif /* SVR4 */
+     struct rusage  *rusage;
+ {
+     return (NOTIFY_IGNORED);
diff --git a/x11-toolkits/xview/files/patch-lh b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndisdispch.c
index 0c5469e10ef0..0c5469e10ef0 100644
--- a/x11-toolkits/xview/files/patch-lh
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndisdispch.c
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+notify+nintn_wait.c b/x11-toolkits/xview/files/patch-lib+libxview+notify+nintn_wait.c
new file mode 100644
index 000000000000..da8c609355d3
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+nintn_wait.c
@@ -0,0 +1,17 @@
+--- lib/libxview/notify/nintn_wait.c.orig	Thu Oct 16 17:47:39 2003
++++ lib/libxview/notify/nintn_wait.c	Thu Oct 16 17:49:13 2003
+@@ -22,11 +22,11 @@
+ notify_next_wait3_func(nclient, pid, status, rusage)
+     Notify_client   nclient;
+     int             pid;
+-#ifndef SVR4
++#if !(defined(BSD4_4) || defined(SVR4))
+     union wait     *status;
+-#else SVR4
++#else /* SVR4 */
+     int *status;
+-#endif SVR4
++#endif /* SVR4 */
+     struct rusage  *rusage;
+ {
+     Notify_func     func;
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+notify+notify.h b/x11-toolkits/xview/files/patch-lib+libxview+notify+notify.h
new file mode 100644
index 000000000000..e29229b89409
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+notify.h
@@ -0,0 +1,14 @@
+--- lib/libxview/notify/notify.h.orig	Thu Oct 16 16:58:37 2003
++++ lib/libxview/notify/notify.h	Thu Oct 16 17:43:40 2003
+@@ -24,8 +24,10 @@
+ #include <xview/base.h>
+ #ifdef SYSV_WAIT
+ #include <sys/rusage.h>
++#elif (__FreeBSD__>=4)
++#define SYSV_WAIT 
+ #endif 
+-#ifdef SYSV_UCONTEXT
++#if defined(SYSV_UCONTEXT) || (__FreeBSD__>=4)
+ #include <sys/ucontext.h>
+ #endif 
+ 
diff --git a/x11-toolkits/xview/files/patch-lo b/x11-toolkits/xview/files/patch-lib+libxview+notify+ntfy.h
index 570132f101cb..e75b0d15a0bc 100644
--- a/x11-toolkits/xview/files/patch-lo
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+ntfy.h
@@ -1,5 +1,5 @@
---- lib/libxview/notify/ntfy.h.orig	Tue Jun 29 07:18:14 1993
-+++ lib/libxview/notify/ntfy.h	Mon Jan 10 15:50:53 2000
+--- lib/libxview/notify/ntfy.h.orig	Thu Oct 16 21:09:40 2003
++++ lib/libxview/notify/ntfy.h	Thu Oct 16 23:43:09 2003
 @@ -22,6 +22,10 @@
  #include <sys/rusage.h>
  #endif
@@ -16,11 +16,11 @@
  typedef	struct ntfy_wait3_data {
  	int	pid;			/* Process waiting for */
 -#ifndef SVR4
-+#if !defined(SVR4) && !(defined(BSD) && (BSD >= 199103))
++#if (!defined(BSD4_4) && !defined(SVR4))
  	union	wait status;		/* Return value from wait3 */
- #else SVR4
+ #else
  	int 	status;		/* Return value from wait3 */
-@@ -188,7 +197,12 @@
+@@ -188,7 +192,12 @@
  #define sigisempty(s)   (!(((s)->__sigbits[0]) | ((s)->__sigbits[1])   \
                          | ((s)->__sigbits[2]) | ((s)->__sigbits[3])))
  #else
@@ -34,3 +34,12 @@
  #endif
  
  /*
+@@ -456,7 +465,7 @@
+ /*
+  * Debugging aids.
+  */
+-#define	NTFY_DEBUG	1
++#define	NTFY_DEBUG	0
+ /*
+  * Ntfy_set_errno is for setting notify_errno when there is really something
+  * wrong.  An error message is displayed with notifier code has been compiled
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+notify+ntfy_test.c b/x11-toolkits/xview/files/patch-lib+libxview+notify+ntfy_test.c
new file mode 100644
index 000000000000..58e80a1c293b
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+ntfy_test.c
@@ -0,0 +1,20 @@
+--- ./lib/libxview/notify/ntfy_test.c.orig	Tue Jun 29 07:18:12 1993
++++ ./lib/libxview/notify/ntfy_test.c	Sat Apr  1 18:25:26 2000
+@@ -989,7 +989,7 @@ nt_try_send_event(client, cond)
+ 	    fprintf(stderr, "%s in unknown destroy status\n", arg1);
+ 	    goto Error;
+ 	}
+-	if ((ne = notify_post_destroy(client, status)) != NOTIFY_OK) {
++	if ((ne = notify_post_destroy(client, status), NOTIFY_IMMEDIATE) != NOTIFY_OK) {
+ 	    if (!(status == DESTROY_CHECKING &&
+ 		  ne == NOTIFY_DESTROY_VETOED)) {
+ 		notify_perror("notify_destroy");
+@@ -1781,7 +1781,7 @@ nt_prioritizer(nclient, nfd, ibits_ptr, 
+     }
+     /* Send only last client event */
+     if (*event_count_ptr > 0) {
+-	(void) notify_event(nclient, *(events + (*event_count_ptr) - 1));
++	(void) notify_event(nclient, *(events + (*event_count_ptr) - 1), 0);
+ 	*event_count_ptr--;
+     }
+     /* Send fd 1 input */
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+notify+ntfyclient.c b/x11-toolkits/xview/files/patch-lib+libxview+notify+ntfyclient.c
new file mode 100644
index 000000000000..c8e31f2465e7
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+ntfyclient.c
@@ -0,0 +1,61 @@
+--- ./lib/libxview/notify/ntfyclient.c.orig	Tue Jun 29 07:18:11 1993
++++ ./lib/libxview/notify/ntfyclient.c	Sat Apr  1 18:25:26 2000
+@@ -18,7 +18,9 @@ static char     sccsid[] = "@(#)ntfyclie
+ #include <xview_private/ntfy.h>
+ #include <xview_private/ndis.h>	/* For ndis_default_prioritizer */
+ #include <xview_private/ndet.h>	
++#ifndef __FreeBSD__
+ #include <search.h>
++#endif
+ #include <xview_private/portable.h>
+ 
+ /* Variables used in paranoid enumerator (see ntfy_condition) */
+@@ -60,6 +62,7 @@ ntfy_find_nclient(client_list, nclient, 
+     if (*client_latest && (*client_latest)->nclient == nclient)
+ 	return (*client_latest);
+ 
++#ifndef __FreeBSD__
+     if(( client_list == ndet_clients ) && ndet_clients ) {
+        dummy_client.nclient = nclient;
+        /* Find client */
+@@ -73,7 +76,9 @@ ntfy_find_nclient(client_list, nclient, 
+            return (client);
+        }
+     }
+-
++#else
++    if(0);
++#endif
+     else 
+         /* Search entire list */
+         for (client = client_list; client; client = next) {
+@@ -100,6 +105,7 @@ ntfy_new_nclient(client_list, nclient, c
+     register NTFY_CLIENT *client;
+     static NTFY_CLIENT *new_client;
+ 
++#ifndef __FreeBSD__
+     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
+         else
+             return client;
+     }
+-
++#else
++    if(0);
++#endif
+     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, 
+ 	ntfy_remove_condition(client, condition, who);
+     }
+     /* Remove & free client from client_list */
++#ifndef __FreeBSD__
+     if( client_list == &ndet_clients )
+         tdelete( client, ndet_root, ndet_compar );
++#endif
+     ntfy_remove_node((NTFY_NODE **) client_list, (NTFY_NODE *) client);
+     /* Invalidate condition hint */
+     *client_latest = NTFY_CLIENT_NULL;
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+notify+sys_fcntl.c b/x11-toolkits/xview/files/patch-lib+libxview+notify+sys_fcntl.c
new file mode 100644
index 000000000000..569090d101fe
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+sys_fcntl.c
@@ -0,0 +1,16 @@
+*** lib/libxview/notify/sys_fcntl.c~	Mon Jun 28 22:18:17 1993
+--- lib/libxview/notify/sys_fcntl.c	Tue Nov 22 07:48:49 1994
+***************
+*** 15,21 ****
+--- 15,25 ----
+   */
+  
+  #ifndef SVR4
++ #ifndef __FreeBSD__
+  #include <syscall.h>
++ #else
++ #include <sys/syscall.h>
++ #endif
+  #else SVR4
+  #include <sys/syscall.h>
+  #endif SVR4
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+notify+sys_read.c b/x11-toolkits/xview/files/patch-lib+libxview+notify+sys_read.c
new file mode 100644
index 000000000000..bc68b9c9e714
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+sys_read.c
@@ -0,0 +1,16 @@
+*** lib/libxview/notify/sys_read.c~	Mon Jun 28 22:18:01 1993
+--- lib/libxview/notify/sys_read.c	Tue Nov 22 08:16:11 1994
+***************
+*** 15,21 ****
+--- 15,25 ----
+   */
+  
+  #ifndef SVR4
++ #ifndef __FreeBSD__
+  #include <syscall.h>
++ #else
++ #include <sys/syscall.h>
++ #endif
+  #else SVR4
+  #include <sys/syscall.h>
+  #endif SVR4
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+notify+sys_select.c b/x11-toolkits/xview/files/patch-lib+libxview+notify+sys_select.c
new file mode 100644
index 000000000000..dd2daaf32d53
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+sys_select.c
@@ -0,0 +1,16 @@
+*** lib/libxview/notify/sys_select.c~	Mon Jun 28 22:18:11 1993
+--- lib/libxview/notify/sys_select.c	Tue Nov 22 08:20:27 1994
+***************
+*** 15,21 ****
+--- 15,25 ----
+   */
+  
+  #ifndef SVR4
++ #ifndef __FreeBSD__
+  #include <syscall.h>
++ #else
++ #include <sys/syscall.h>
++ #endif
+  #else SVR4
+  #include <values.h>
+  #include <sys/time.h>
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+notify+ultrix_cpt.h b/x11-toolkits/xview/files/patch-lib+libxview+notify+ultrix_cpt.h
new file mode 100644
index 000000000000..432e82b63b3d
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+ultrix_cpt.h
@@ -0,0 +1,14 @@
+--- lib/libxview/notify/ultrix_cpt.h.orig	Fri Oct 17 00:27:24 2003
++++ lib/libxview/notify/ultrix_cpt.h	Fri Oct 17 00:43:03 2003
+@@ -14,7 +14,10 @@
+ #ifndef xview_ultrix_compat_DEFINED
+ #define xview_ultrix_compat_DEFINED
+ 
+-#ifdef OLD_BSD_FDSETS
++#ifdef __FreeBSD__
++#include <sys/param.h>
++#include <sys/select.h>
++#elif defined(OLD_BSD_FDSETS)
+ 
+ #ifndef NBBY
+ #define NBBY    8               /* number of bits in a byte */
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+openwin+ow_view.c b/x11-toolkits/xview/files/patch-lib+libxview+openwin+ow_view.c
new file mode 100644
index 000000000000..3be563b92075
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+openwin+ow_view.c
@@ -0,0 +1,10 @@
+--- ./lib/libxview/openwin/ow_view.c.orig	Tue Jun 29 07:16:43 1993
++++ ./lib/libxview/openwin/ow_view.c	Sat Apr  1 18:25:26 2000
+@@ -48,6 +48,7 @@ void            openwin_remove_split();
+ static          openwin_init_view();
+ static          openwin_free_view();
+ static          openwin_remove_scrollbars();
++static int	openwin_check_view();
+ static          openwin_create_viewwindow();
+ static          openwin_test_for_sb();
+ static          openwin_link_view();
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+panel+p_btn.c b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_btn.c
new file mode 100644
index 000000000000..9a1be2f9b2a2
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_btn.c
@@ -0,0 +1,11 @@
+--- ./lib/libxview/panel/p_btn.c.orig	Tue Jun 29 07:16:52 1993
++++ ./lib/libxview/panel/p_btn.c	Sat Apr  1 18:25:26 2000
+@@ -203,7 +203,7 @@ btn_begin_preview(item_public, event)
+ 	if (pin_is_default) {
+ 	    image.im_type = PIT_STRING;
+ 	    image_string(&image) = NULL;
+-	    label = "";
++	    label = (Xv_opaque) "";
+ 	} else if (!(image_string(&image) = (char *) xv_get(default_menu_item,
+ 		MENU_STRING))) {
+ 	    olgx_state |= OLGX_LABEL_IS_PIXMAP;
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+panel+p_choice.c b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_choice.c
new file mode 100644
index 000000000000..56ed1d88b079
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_choice.c
@@ -0,0 +1,21 @@
+--- ./lib/libxview/panel/p_choice.c.orig	Tue Jun 29 07:16:57 1993
++++ ./lib/libxview/panel/p_choice.c	Sat Apr  1 18:25:26 2000
+@@ -106,6 +106,10 @@ static void     choice_begin_preview(), 
+ static int      choice_number();
+ static int	choice_x_gap();
+ static int	choice_y_gap();
++static int	find_choice();
++static int	modify_choice();
++static int	move_specified();
++static int	re_alloc_choices();
+ static unsigned int choice_value();
+ static void     choice_create_menu();
+ static void	choice_images_to_menu_items();
+@@ -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() */
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+panel+p_drop.c b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_drop.c
new file mode 100644
index 000000000000..2e064dfca041
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_drop.c
@@ -0,0 +1,15 @@
+--- ./lib/libxview/panel/p_drop.c.orig	Tue Jun 29 07:17:04 1993
++++ ./lib/libxview/panel/p_drop.c	Sat Apr  1 18:25:26 2000
+@@ -10,7 +10,12 @@ static char     sccsid[] = "@(#)p_drop.c
+  *	file for terms of the license.
+  */
+ 
++#include <sys/param.h>
++#if (defined(BSD) && (BSD >= 199103))
++#include <stdlib.h>
++#else
+ #include <malloc.h>
++#endif
+ #include <xview_private/draw_impl.h>
+ #include <xview_private/i18n_impl.h>
+ #include <xview_private/panel_impl.h>
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+panel+p_gauge.c b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_gauge.c
new file mode 100644
index 000000000000..7d08306bd4bf
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_gauge.c
@@ -0,0 +1,10 @@
+--- ./lib/libxview/panel/p_gauge.c.orig	Tue Jun 29 07:17:04 1993
++++ ./lib/libxview/panel/p_gauge.c	Sat Apr  1 18:25:26 2000
+@@ -47,6 +47,7 @@ static void	gauge_layout();
+ /* Local functions */
+ static void     paint_gauge();
+ static void     update_rects();
++static int	etoi();
+ 
+ static Panel_ops ops = {
+     panel_default_handle_event,		/* handle_event() */
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+panel+p_get.c b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_get.c
new file mode 100644
index 000000000000..f7f9ea1ec23f
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_get.c
@@ -0,0 +1,10 @@
+--- ./lib/libxview/panel/p_get.c.orig	Tue Jun 29 07:16:49 1993
++++ ./lib/libxview/panel/p_get.c	Sat Apr  1 18:25:26 2000
+@@ -16,6 +16,7 @@ static char     sccsid[] = "@(#)p_get.c 
+ #include <xview/scrollbar.h>
+ 
+ static int      shrink_to_fit();
++static panel_shrink_margin();
+ 
+ #define MAX_NEGATIVE_SHRINK 2000
+ #define SHRINK_MARGIN       4
diff --git a/x11-toolkits/xview/files/patch-lm b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_mlinetxt.c
index cde42fcd148c..cde42fcd148c 100644
--- a/x11-toolkits/xview/files/patch-lm
+++ b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_mlinetxt.c
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+panel+p_num_txt.c b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_num_txt.c
new file mode 100644
index 000000000000..1cd19d1509f2
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_num_txt.c
@@ -0,0 +1,20 @@
+--- lib/libxview/panel/p_num_txt.c.orig	Sun Oct  5 00:13:32 2003
++++ lib/libxview/panel/p_num_txt.c	Sun Oct  5 00:17:55 2003
+@@ -707,7 +707,7 @@
+ 
+ 	event_init( &event ); /* send empty, bogus event */
+         if (ip->notify)
+-            (*ip->notify) (ITEM_PUBLIC(ip), event);
++            (*ip->notify) (ITEM_PUBLIC(ip), &event);
+ 
+         /*
+            UP_INACTIVE flag is set in set_value(); if
+@@ -724,7 +724,7 @@
+ 
+ 	event_init( &event ); /* send empty, bogus event */
+         if (ip->notify)
+-            (*ip->notify) (ITEM_PUBLIC(ip), event);
++            (*ip->notify) (ITEM_PUBLIC(ip), &event);
+ 
+         if (dp->btn_state & DOWN_INACTIVE)
+             panel_autoscroll_stop_itimer( item );
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+panel+p_set.c b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_set.c
new file mode 100644
index 000000000000..48bb5bd03b48
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_set.c
@@ -0,0 +1,11 @@
+--- ./lib/libxview/panel/p_set.c.orig	Tue Jun 29 07:16:59 1993
++++ ./lib/libxview/panel/p_set.c	Sat Apr  1 18:25:27 2000
+@@ -25,6 +25,8 @@ Xv_private char     *xv_font_regular_cmd
+ 
+ static void panel_set_fonts();
+ 
++static int column_from_absolute_x();
++static int row_from_absolute_y();
+ 
+ Pkg_private     Xv_opaque
+ panel_set_avlist(panel_public, avlist)
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+panel+p_slider.c b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_slider.c
new file mode 100644
index 000000000000..af4d590c0585
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_slider.c
@@ -0,0 +1,11 @@
+--- ./lib/libxview/panel/p_slider.c.orig	Tue Jun 29 07:17:02 1993
++++ ./lib/libxview/panel/p_slider.c	Sat Apr  1 18:25:27 2000
+@@ -54,6 +54,8 @@ static void	check_endbox_entered();
+ static Panel_setting get_value();
+ static void     paint_slider();
+ static void     update_rects();
++static int	etoi();
++static int	itoe();
+ 
+ static Panel_ops ops = {
+     panel_default_handle_event,		/* handle_event() */
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+panel+p_txt.c b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_txt.c
new file mode 100644
index 000000000000..7905b8756e9c
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_txt.c
@@ -0,0 +1,15 @@
+--- ./lib/libxview/panel/p_txt.c.orig	Tue Jun 29 07:16:55 1993
++++ ./lib/libxview/panel/p_txt.c	Sat Apr  1 18:25:27 2000
+@@ -10,7 +10,12 @@ static char     sccsid[] = "@(#)p_txt.c 
+  *	file for terms of the license.
+  */
+ 
++#include <sys/param.h>
++#if (defined(BSD) && (BSD >= 199103))
++#include <stdlib.h>
++#else
+ #include <malloc.h>
++#endif
+ #include <string.h>
+ #include <ctype.h>
+ #include <X11/X.h>
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+panel+p_utl.c b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_utl.c
new file mode 100644
index 000000000000..222ca2081ab0
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_utl.c
@@ -0,0 +1,23 @@
+--- lib/libxview/panel/p_utl.c.orig	Sun Oct  5 11:58:54 2003
++++ lib/libxview/panel/p_utl.c	Sun Oct  5 12:08:09 2003
+@@ -168,11 +168,6 @@
+         if (image_string_wc(dest))
+             xv_free(image_string_wc(dest));
+     }
+-#else
+-    {
+-        if (image_string(dest))
+-            xv_free(image_string(dest));
+-    }
+ #endif
+ 
+     size.x = size.y = 0;
+@@ -195,6 +190,8 @@
+ 	    value_str = "";
+ 	if (!(str = (char *) panel_strsave((u_char *) value_str)))
+ 	    return (size);
++        if (image_string(dest))	/* lmfken Oct-93 */
++            xv_free(image_string(dest));
+ 	image_set_string(dest, str);
+ #endif
+ 	panel_image_set_font(dest, font);
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+panel+panel.c b/x11-toolkits/xview/files/patch-lib+libxview+panel+panel.c
new file mode 100644
index 000000000000..001850433580
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+panel+panel.c
@@ -0,0 +1,10 @@
+--- ./lib/libxview/panel/panel.c.orig	Tue Jun 29 07:16:57 1993
++++ ./lib/libxview/panel/panel.c	Sat Apr  1 18:25:27 2000
+@@ -27,6 +27,7 @@ Pkg_private int panel_view_init();
+ Pkg_private int panel_destroy();
+ 
+ static int      panel_layout();
++static int	panel_unregister_view();
+ 
+ Xv_private_data Defaults_pairs xv_kbd_cmds_value_pairs[4];
+ 
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+panel+panel_impl.h b/x11-toolkits/xview/files/patch-lib+libxview+panel+panel_impl.h
new file mode 100644
index 000000000000..6a8c341b68ff
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+panel+panel_impl.h
@@ -0,0 +1,20 @@
+--- ./lib/libxview/panel/panel_impl.h.orig	Tue Jun 29 07:16:50 1993
++++ ./lib/libxview/panel/panel_impl.h	Sat Apr  1 18:25:27 2000
+@@ -9,11 +9,16 @@
+ #ifndef panel_impl_defined
+ #define panel_impl_defined
+ 
++#ifdef NULL
++#undef NULL
++#endif
+ #ifndef FILE
+ #ifndef SVR4
+-#undef NULL
+ #endif SVR4
+ #include <stdio.h>
++#ifndef NULL
++#define NULL 0
++#endif
+ #endif FILE
+ #include <sys/types.h>
+ #include <X11/Xlib.h>
diff --git a/x11-toolkits/xview/files/patch-ll b/x11-toolkits/xview/files/patch-lib+libxview+panel+plist.c
index f8b343a0c6e4..f8b343a0c6e4 100644
--- a/x11-toolkits/xview/files/patch-ll
+++ b/x11-toolkits/xview/files/patch-lib+libxview+panel+plist.c
diff --git a/x11-toolkits/xview/files/patch-ln b/x11-toolkits/xview/files/patch-lib+libxview+pw+pwline.c
index fd5ef34817e2..fd5ef34817e2 100644
--- a/x11-toolkits/xview/files/patch-ln
+++ b/x11-toolkits/xview/files/patch-lib+libxview+pw+pwline.c
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+rect+rect_util.c b/x11-toolkits/xview/files/patch-lib+libxview+rect+rect_util.c
new file mode 100644
index 000000000000..71a04d60b487
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+rect+rect_util.c
@@ -0,0 +1,11 @@
+--- ./lib/libxview/rect/rect_util.c.orig	Tue Jun 29 07:15:17 1993
++++ ./lib/libxview/rect/rect_util.c	Sat Apr  1 18:25:27 2000
+@@ -16,6 +16,8 @@ static char     sccsid[] = "@(#)rect_uti
+ 
+ #include <xview/rect.h>
+ 
++static int rect_nearest_edge();
++
+ /*
+  * Compute the distance from rect to (x, y). If (x, y) is in rect, zero is
+  * returned. If x_used or y_used are non-zero, the projection point is
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+sel+sel_agent.c b/x11-toolkits/xview/files/patch-lib+libxview+sel+sel_agent.c
new file mode 100644
index 000000000000..6c71d2d19e66
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+sel+sel_agent.c
@@ -0,0 +1,36 @@
+--- lib/libxview/sel/sel_agent.c.orig	Fri Oct 17 00:27:07 2003
++++ lib/libxview/sel/sel_agent.c	Fri Oct 17 00:55:00 2003
+@@ -28,10 +28,10 @@
+ #include <stdio.h>
+ /*
+  * The following header file provides fd_set compatibility with SunOS for
+- * Ultrix
++ * Ultrix and provides howmany() for newer BSDs
+  */
+ #include <xview_private/ultrix_cpt.h>
+-#ifdef SVR4
++#if (defined(BSD4_4) || defined(SVR4))
+ #include <stdlib.h>
+ #include <unistd.h>
+ #endif
+@@ -63,7 +63,7 @@
+ 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 @@
+     struct stat     stat_buf;
+     int             count, size;
+     char           *destp;
++#if (defined(BSD) && (BSD >= 199306))
++    extern off_t    lseek();
++#else
+     extern long     lseek();
++#endif
+ 
+     if (fstat(fd, &stat_buf) != 0) {
+ 	perror(XV_MSG("Agent couldn't reply about a file"));
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+sel+seln_impl.h b/x11-toolkits/xview/files/patch-lib+libxview+sel+seln_impl.h
new file mode 100644
index 000000000000..a9787c83eaa8
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+sel+seln_impl.h
@@ -0,0 +1,21 @@
+--- ./lib/libxview/sel/seln_impl.h.orig	Tue Jun 29 07:15:25 1993
++++ ./lib/libxview/sel/seln_impl.h	Sat Apr  1 18:25:27 2000
+@@ -9,12 +9,17 @@
+  *	file for terms of the license.
+  */
+ 
++#ifdef NULL
++#undef NULL
++#endif
+ #include <errno.h>
+ #ifndef FILE
+ #ifndef SVR4
+-#undef NULL
+ #endif SVR4
+ #include <stdio.h>
++#ifndef NULL
++#define NULL 0
++#endif
+ #endif FILE
+ #include <sys/time.h>
+ #include <sys/types.h>
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+selection+sel_own.c b/x11-toolkits/xview/files/patch-lib+libxview+selection+sel_own.c
new file mode 100644
index 000000000000..b4d1929649d4
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+selection+sel_own.c
@@ -0,0 +1,10 @@
+--- ./lib/libxview/selection/sel_own.c.orig	Sun Jun 26 03:05:22 1994
++++ ./lib/libxview/selection/sel_own.c	Sat Apr  1 18:25:28 2000
+@@ -35,6 +35,7 @@ static int SelLoseOwnership();
+ static int sel_set_ownership(/* sel_owner */);
+ static int (*OldErrorHandler)();
+ static int SelOwnerErrorHandler();
++static int SendIncr();
+ static int ValidatePropertyEvent();
+ 
+ static void SelClean();
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+selection+sel_req.c b/x11-toolkits/xview/files/patch-lib+libxview+selection+sel_req.c
new file mode 100644
index 000000000000..b9578084db4c
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+selection+sel_req.c
@@ -0,0 +1,23 @@
+--- ./lib/libxview/selection/sel_req.c.orig	Sun Jun 26 03:05:21 1994
++++ ./lib/libxview/selection/sel_req.c	Sat Apr  1 18:25:28 2000
+@@ -55,7 +55,10 @@ 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
+@@ -1226,7 +1229,7 @@ Selection_requestor  sel;
+ }
+ 
+ 
+-static XID 
++Pkg_private XID 
+ SelGetOwnerXID( selReq )
+ Sel_req_info  *selReq;
+ {
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+selection+sel_util.c b/x11-toolkits/xview/files/patch-lib+libxview+selection+sel_util.c
new file mode 100644
index 000000000000..badb7f1bef13
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+selection+sel_util.c
@@ -0,0 +1,19 @@
+--- ./lib/libxview/selection/sel_util.c.orig	Tue Jun 29 07:16:03 1993
++++ ./lib/libxview/selection/sel_util.c	Sat Apr  1 18:25:28 2000
+@@ -23,6 +23,7 @@ static void tvdiff();
+ static void FreeMultiProp();
+ static int	SelMatchReply();
+ static Sel_req_tbl *SelMatchReqTbl();
++static int SelFindReply();
+ 
+ Pkg_private struct timeval *
+ xv_sel_cvt_xtime_to_timeval( XTime )
+@@ -601,7 +602,7 @@ Sel_reply_info  *reply;
+ 	reqTbl->reply = reply;
+ 	reqTbl->next = NULL;
+ 	(void)XSaveContext( dpy, DefaultRootWindow(dpy),replyCtx,
+-			   (caddr_t *)reqTbl);
++			   (XPointer)reqTbl);
+ 	return reqTbl;
+     }
+     return (Sel_req_tbl *) xv_sel_add_new_req( reqTbl, reply );
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+server+server.c b/x11-toolkits/xview/files/patch-lib+libxview+server+server.c
new file mode 100644
index 000000000000..c691498f3c5d
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+server+server.c
@@ -0,0 +1,19 @@
+--- ./lib/libxview/server/server.c.orig	Sun Jun 26 20:53:40 1994
++++ ./lib/libxview/server/server.c	Sat Apr  1 18:25:28 2000
+@@ -65,6 +65,7 @@ static Notify_value 	 scheduler();
+ static unsigned int 	 string_to_modmask();
+ static Server_atom_type  save_atom();
+ static void 		 server_yield_modifiers();
++static int		 xv_set_scheduler();
+ 
+ Xv_private char		*xv_strtok();
+ 
+@@ -440,7 +441,7 @@ server_init(parent, server_public, avlis
+   	/* lumpi@dobag.in-berlin.de */
+     if (XrmGetDatabase((Display *)server->xdisplay)) {
+ 	server->db = XrmGetStringDatabase(
+-				(XrmGetDatabase((Display *)server->xdisplay)));
++				(char *) (XrmGetDatabase((Display *)server->xdisplay)));
+ #else
+     if (((Display *)server->xdisplay)->xdefaults) {
+ 	server->db = XrmGetStringDatabase(
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+textsw+ei_text.c b/x11-toolkits/xview/files/patch-lib+libxview+textsw+ei_text.c
new file mode 100644
index 000000000000..e98865af907c
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+ei_text.c
@@ -0,0 +1,10 @@
+--- ./lib/libxview/textsw/ei_text.c.orig	Tue Jun 29 07:17:37 1993
++++ ./lib/libxview/textsw/ei_text.c	Sat Apr  1 18:25:28 2000
+@@ -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();
++static paint_batch();
+ 
+ struct ei_ops   ei_plain_text_ops = {
+     ei_plain_text_destroy,
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+textsw+es_attr.c b/x11-toolkits/xview/files/patch-lib+libxview+textsw+es_attr.c
new file mode 100644
index 000000000000..04a15f1ddac0
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+es_attr.c
@@ -0,0 +1,11 @@
+--- ./lib/libxview/textsw/es_attr.c.orig	Tue Jun 29 07:17:31 1993
++++ ./lib/libxview/textsw/es_attr.c	Sat Apr  1 18:25:28 2000
+@@ -22,7 +22,7 @@ static char     sccsid[] = "@(#)es_attr.
+ 
+ Pkg_private int
+ #ifdef ANSI_FUNC_PROTO
+-es_set(register Es_handle esh, ...)
++es_set(Es_handle esh, ...)
+ #else
+ es_set(esh, va_alist)
+     register Es_handle esh;
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+textsw+es_file.c b/x11-toolkits/xview/files/patch-lib+libxview+textsw+es_file.c
new file mode 100644
index 000000000000..9884fcfd55f7
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+es_file.c
@@ -0,0 +1,36 @@
+--- lib/libxview/textsw/es_file.c.orig	Tue Jun 29 00:17:34 1993
++++ lib/libxview/textsw/es_file.c	Sat Oct  4 18:46:45 2003
+@@ -85,14 +85,14 @@
+ 
+ #include <string.h>
+ #include <fcntl.h>
+-#ifdef SVR4
++#include <sys/param.h>
++#if (defined(BSD4_4) || defined(SVR4))
+ #include <stdlib.h>
+ #include <dirent.h>
+ #else
+ #include <sys/dir.h>
+ #endif /* SVR4 */
+ #include <sys/errno.h>
+-#include <sys/param.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/file.h>
+@@ -109,9 +109,15 @@
+ #include <xview_private/txt_18impl.h>
+ 
+ 
+-extern int      errno, sys_nerr;
++extern int	errno;
++extern const	sys_nerr;
++#if (defined(BSD) && (BSD >= 199306))
++extern const char *const sys_err_list[];
++extern off_t	lseek();
++#else
+ extern char    *sys_errlist[];
+ extern long     lseek();
++#endif
+ 
+ static void update_read_buf();  /* update the read buf if overlaps write buf */
+ static Es_status es_file_commit();
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+textsw+ev_edit.c b/x11-toolkits/xview/files/patch-lib+libxview+textsw+ev_edit.c
new file mode 100644
index 000000000000..1ae4fda9701a
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+ev_edit.c
@@ -0,0 +1,11 @@
+--- lib/libxview/textsw/ev_edit.c.orig	Sun Oct  5 00:21:31 2003
++++ lib/libxview/textsw/ev_edit.c	Sun Oct  5 00:23:36 2003
+@@ -123,7 +123,7 @@
+ 	    ft_add_delta(*table, 0, delta);
+ 	} else {
+ 	    lt_index = ft_bounding_index(table, before_edit);
+-	    if (lt_index < table->last_plus_one)
++	    if (lt_index+1 < table->last_plus_one)
+ 		ft_add_delta(*table, lt_index + 1, delta);
+ 	}
+     } else {
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+textsw+ev_op_bdry.c b/x11-toolkits/xview/files/patch-lib+libxview+textsw+ev_op_bdry.c
new file mode 100644
index 000000000000..79c1f3260c27
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+ev_op_bdry.c
@@ -0,0 +1,12 @@
+--- ./lib/libxview/textsw/ev_op_bdry.c.orig	Tue Jun 29 07:17:30 1993
++++ ./lib/libxview/textsw/ev_op_bdry.c	Sat Apr  1 18:25:28 2000
+@@ -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;
+ 
++static int ev_find_finger_internal();
++static ev_remove_finger_internal();
++
+ #define FORALL(index_var)						\
+ 	for (index_var = 0; index_var < fingers->last_plus_one; index_var++)
+ 
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+textsw+ps_impl.c b/x11-toolkits/xview/files/patch-lib+libxview+textsw+ps_impl.c
new file mode 100644
index 000000000000..0bc125fe02b0
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+ps_impl.c
@@ -0,0 +1,13 @@
+--- ./lib/libxview/textsw/ps_impl.c.orig	Tue Jun 29 07:17:39 1993
++++ ./lib/libxview/textsw/ps_impl.c	Sat Apr  1 18:25:29 2000
+@@ -62,6 +62,10 @@ static Es_index ps_read(), ps_scratch_re
+ static Es_index ps_replace(), ps_scratch_replace();
+ static int      ps_set();
+ 
++static int	get_current_offset();
++
++static copy_pieces();
++
+ static Es_index write_header_etc();
+ 
+ static struct es_ops ps_ops = {
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_again.c b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_again.c
new file mode 100644
index 000000000000..fe1e5ac5ccee
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_again.c
@@ -0,0 +1,100 @@
+--- ./lib/libxview/textsw/txt_again.c.orig	Tue Jun 29 07:17:32 1993
++++ ./lib/libxview/textsw/txt_again.c	Sat Apr  1 18:25:29 2000
+@@ -28,6 +28,8 @@ Pkg_private CHAR    *STRNCPY();
+ Pkg_private Es_index textsw_do_input();
+ Pkg_private Es_index textsw_do_pending_delete();
+ 
++static int textsw_string_min_free();
++
+ string_t        null_string = {0, 0, 0};
+ 
+ #define	TEXT_DELIMITER	"\\"
+@@ -182,6 +184,7 @@ textsw_string_min_free(ptr_to_string, mi
+  * Following is stolen from 3.2ALPHA sprintf(str, fmt, va_alist) SIDE_EFFECT:
+  * TXTSW_STRING_FREE(ptr_to_string) is modified by this routine.
+  */
++#ifndef __FreeBSD__
+ #ifndef SVR4
+ 
+ /* VARARGS2 */
+@@ -325,6 +328,31 @@ va_dcl
+ 
+ #endif /* SVR4 */
+ 
++#else /* __FreeBSD__ */
++/*inspiration taken from sprintf.c */
++
++static int
++textsw_printf(register string_t *ptr_to_string, char  *fmt, ...)
++{ 
++    FILE            _strbuf;
++    int             result;
++    va_list         args;
++    _strbuf._flags = __SWR | __SSTR;
++    _strbuf._bf._base = _strbuf._p = (char *) TXTSW_STRING_FREE(ptr_to_string);
++    _strbuf._bf._size = _strbuf._w = ptr_to_string->max_length - TXTSW_STRING_LENGTH(ptr_to_string);
++    VA_START(args, fmt);
++    result = vfprintf (&_strbuf, fmt, args);
++    va_end(args);
++    TXTSW_STRING_FREE(ptr_to_string) = (char *) _strbuf._p;
++#ifndef lint
++    if (result >= 0)
++    putc('\0', &_strbuf);
++#endif
++    return (result); 
++}
++
++#endif /* __FreeBSD__ */
++
+ static	void
+ textsw_record_buf(again, buffer, buffer_length)
+     register string_t *again;
+@@ -619,6 +647,8 @@ textsw_record_trash_insert(textsw)
+  */
+ /* VARARGS2 */
+ 
++#ifndef __FreeBSD__
++
+ static int
+ #ifdef ANSI_FUNC_PROTO
+ textsw_scanf(register string_t *ptr_to_string, register char  *fmt, ...)
+@@ -705,6 +735,39 @@ va_dcl
+ 
+ #endif /* OW_I18N */
+ }
++#else /* __FreeBSD__ */
++/*inspiration/code taken from sscanf.c */
++
++static int
++eofread(cookie, buf, len)
++        void *cookie;
++        char *buf;
++        int len;
++{
++
++        return (0);
++}   
++
++static int
++textsw_scanf(register string_t *ptr_to_string, char  *fmt, ...)
++{
++    FILE            _strbuf;
++    int             result;
++    va_list         args;
++
++    _strbuf._flags = __SRD;
++    _strbuf._bf._base = _strbuf._p = (char *) TXTSW_STRING_BASE(ptr_to_string);
++    _strbuf._bf._size = _strbuf._r = TXTSW_STRING_LENGTH(ptr_to_string);
++    _strbuf._read = eofread;
++    _strbuf._ub._base = NULL;
++    _strbuf._lb._base = NULL;
++    VA_START(args, fmt);
++    result = __svfscanf(&_strbuf, fmt, args);
++    va_end(args);
++    TXTSW_STRING_BASE(ptr_to_string) = (char *) _strbuf._p;
++    return (result);
++}       
++#endif /* __FreeBSD__ */
+ 
+ static int
+ textsw_next_is_delimiter(again)
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_attr.c b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_attr.c
new file mode 100644
index 000000000000..efd958d087d4
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_attr.c
@@ -0,0 +1,12 @@
+--- lib/libxview/textsw/txt_attr.c.orig	Sun Oct  5 16:38:50 2003
++++ lib/libxview/textsw/txt_attr.c	Sun Oct  5 16:39:55 2003
+@@ -19,7 +19,8 @@
+ #include <xview_private/primal.h>
+ #include <xview_private/txt_impl.h>
+ #include <xview_private/txt_18impl.h>
+-#ifdef SVR4
++#include <sys/param.h>
++#if (defined(BSD4_4) || defined(SVR4))
+ #include <dirent.h>
+ #include <string.h>
+ #else
diff --git a/x11-toolkits/xview/files/patch-lp b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_e_menu.c
index d94992827f0b..d94992827f0b 100644
--- a/x11-toolkits/xview/files/patch-lp
+++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_e_menu.c
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_file.c b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_file.c
new file mode 100644
index 000000000000..2d3274bf6e4d
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_file.c
@@ -0,0 +1,82 @@
+--- lib/libxview/textsw/txt_file.c.orig	Tue Jun 29 00:17:48 1993
++++ lib/libxview/textsw/txt_file.c	Sun Oct  5 17:00:24 2003
+@@ -18,10 +18,14 @@
+ #include <xview_private/txt_impl.h>
+ #include <xview_private/ev_impl.h>
+ #include <xview_private/txt_18impl.h>
+-#ifdef SVR4
++#include <sys/param.h>
++#if (defined(BSD4_4) || defined(SVR4))
+ #include <dirent.h>
+ #include <string.h>
+ #include <unistd.h>
++#ifdef BSD4_4
++#include <sys/file.h>
++#endif
+ #else
+ #include <sys/dir.h>
+ #include <sys/file.h>
+@@ -33,7 +37,6 @@
+  */
+ #undef MIN
+ #undef MAX
+-#include <sys/param.h>
+ #include <xview/notice.h>
+ #include <xview/frame.h>
+ #include <errno.h>
+@@ -45,13 +48,16 @@
+ 
+ extern CHAR    *STRCAT();
+ extern CHAR    *STRNCAT();
+-#ifdef SVR4
++#if (defined(BSD4_4) || defined(SVR4))
+ extern char    *getcwd();
+ #else
+ extern char    *getwd();
+ #endif /* SVR4 */
+-extern int      errno, sys_nerr;
+-extern char    *sys_errlist[];
++extern int	errno;
++extern const int sys_nerr;
++#if (defined(BSD) && (BSD >= 199306))
++extern const char *const sys_errlist[];
++#endif /* BSD */
+ 
+ Pkg_private int textsw_change_directory();
+ Pkg_private void textsw_display(), textsw_display_view_margins();
+@@ -354,7 +360,7 @@
+     }
+ 
+ #ifdef		OW_I18N
+-#ifdef SVR4
++#if (defined(BSD4_4) || defined(SVR4)) 
+     if (getcwd(pathname_mb, MAXPATHLEN) == 0)
+ #else
+     if (getwd(pathname_mb) == 0)
+@@ -364,7 +370,7 @@
+ 
+ #else		/* OW_I18N */
+ 
+-#ifdef SVR4
++#if (defined(BSD4_4) || defined(SVR4)) 
+     if (getcwd(pathname, MAXPATHLEN) == 0)
+ #else
+     if (getwd(pathname) == 0)
+@@ -1538,7 +1544,7 @@
+     int             cmd_is_undo_all_edit;	/* This is for doing an "Undo
+ 						 * All edit" */
+ {
+-#ifndef SVR4
++#if !(defined(BSD4_4) && defined(SVR4))
+     pkg_private Es_status textsw_checkpoint_internal();
+ #else /* SVR4 */
+     static Es_status textsw_checkpoint_internal();
+@@ -2386,7 +2392,7 @@
+     return (result);
+ }
+ 
+-#ifndef SVR4
++#if !(defined(BSD4_4) && defined(SVR4))
+ Pkg_private     Es_status
+ #else /* SVR4 */
+ static     Es_status
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_filter.c b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_filter.c
new file mode 100644
index 000000000000..07e91cdf21dd
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_filter.c
@@ -0,0 +1,31 @@
+--- lib/libxview/textsw/txt_filter.c.orig	Sun Oct  5 14:57:49 2003
++++ lib/libxview/textsw/txt_filter.c	Sun Oct  5 15:20:32 2003
+@@ -17,7 +17,8 @@
+ #include "types.h"
+ #include <sys/file.h>
+ #include <unistd.h>
+-#ifdef SVR4
++#include <sys/param.h>
++#if (defined(BSD4_4) || defined(SVR4))
+ #include <dirent.h>
+ #else
+ #include <sys/dir.h>
+@@ -32,7 +33,7 @@
+ #include <string.h>
+ 
+ #ifdef sparc
+-#ifdef SVR4
++#if (defined(BSD4_4) || defined(SVR4))
+ #include <unistd.h>
+ #else
+ #include <vfork.h>
+@@ -54,6 +57,9 @@
+ #define	REPLY_ERROR	-1
+ #define	REPLY_OKAY	 0
+ #define	REPLY_SEND	 1
++
++static int	talk_to_filter();
++static int	start_filter();
+ 
+ /* performance: global cache of getdtablesize() */
+ extern int      dtablesize_cache;
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_input.c b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_input.c
new file mode 100644
index 000000000000..1971d1c5ae82
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_input.c
@@ -0,0 +1,11 @@
+--- ./lib/libxview/textsw/txt_input.c.orig	Tue Jun 29 07:17:42 1993
++++ ./lib/libxview/textsw/txt_input.c	Sat Apr  1 18:25:29 2000
+@@ -57,6 +57,8 @@ static	void	textsw_do_undo();
+ Pkg_private     void textsw_implicit_commit_doit();
+ #endif
+ 
++static int textsw_do_newline();
++
+ #define SPACE_CHAR 0x20
+ 
+ Pkg_private int
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_move.c b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_move.c
new file mode 100644
index 000000000000..14b4d37eb1c0
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_move.c
@@ -0,0 +1,20 @@
+--- ./lib/libxview/textsw/txt_move.c.orig	Tue Jun 29 07:17:47 1993
++++ ./lib/libxview/textsw/txt_move.c	Sat Apr  1 18:25:29 2000
+@@ -55,7 +55,7 @@ static char     sccsid[] = "@(#)txt_move
+ 
+ static int dnd_data_key = 0; /* XXX: Don't do this at home kids. */
+ static int dnd_view_key = 0; 
+-static int DndConvertProc();
++int DndConvertProc();
+ 
+ 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
+     xv_destroy(dnd_accept_cursor);
+ }
+ 
+-static int
++int
+ DndConvertProc(dnd, type, data, length, format)
+     Dnd      	 dnd;
+     Atom        *type;
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_once.c b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_once.c
new file mode 100644
index 000000000000..b878652e3f74
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_once.c
@@ -0,0 +1,29 @@
+--- lib/libxview/textsw/txt_once.c.orig	Sun Oct  5 12:27:25 2003
++++ lib/libxview/textsw/txt_once.c	Sun Oct  5 13:37:04 2003
+@@ -44,7 +44,9 @@
+ #ifdef OW_I18N
+ #include <xview_private/draw_impl.h>
+ #endif
+-#ifdef SVR4
++
++#include <sys/param.h>
++#if (defined(BSD4_4) || defined(SVR4))
+ #include <dirent.h>
+ #else
+ #include <sys/dir.h>
+@@ -1084,6 +1086,7 @@
+ 	}
+     }
+     /* Destroy all of the view's auxillary objects and any back links */
++    textsw_unlink_view(folio,view);
+     ev_destroy(view->e_view);
+     free((char *) view);
+ }
+@@ -1350,6 +1353,7 @@
+ 	    
+ 	xv_destroy(view->drop_site);
+ 	textsw_view_cleanup(view);
++	VIEW_PRIVATE(view_public) = NULL; /* WG Mar '95 */
+ 	break;
+ 
+       default:			/* Conservative in face of new cases. */
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_popup.c b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_popup.c
new file mode 100644
index 000000000000..aafafd53aada
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_popup.c
@@ -0,0 +1,30 @@
+--- ./lib/libxview/textsw/txt_popup.c.orig	Tue Jun 29 07:17:38 1993
++++ ./lib/libxview/textsw/txt_popup.c	Sat Apr  1 18:25:29 2000
+@@ -95,6 +95,10 @@ Pkg_private int      FC_PARENT_KEY;
+ static int      TEXTSW_POPUP_KEY;  /* key data holding one of the above
+ 				      key names */
+ 
++static void add_exten_item();
++static int  fc_exten_func();
++static void show_dot_files_proc();
++
+ 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
+     Frame           popup_frame, base_frame;
+     Panel           panel = NULL;
+     char           *label;
+-    void            add_exten_item();
+ #ifdef OW_I18N
+     int		    win_use_im = ((popup_type != TEXTSW_MENU_SEL_MARK_TEXT) &&
+ 				  (popup_type != TEXTSW_MENU_NORMALIZE_LINE));
+@@ -502,8 +505,6 @@ add_exten_item( fc )
+     int frame_width;
+     int frame_height;
+     Panel_item item;
+-    void show_dot_files_proc();
+-    int  fc_exten_func();
+  
+     
+     panel = xv_get(fc, FRAME_CMD_PANEL);
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_putkey.c b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_putkey.c
new file mode 100644
index 000000000000..b5b7896cb500
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_putkey.c
@@ -0,0 +1,11 @@
+--- ./lib/libxview/textsw/txt_putkey.c.orig	Tue Jun 29 07:17:41 1993
++++ ./lib/libxview/textsw/txt_putkey.c	Sat Apr  1 18:25:29 2000
+@@ -21,6 +21,8 @@ static char     sccsid[] = "@(#)txt_putk
+ 
+ extern int      errno;
+ 
++static int	textsw_do_put();
++
+ Pkg_private Ev_finger_handle ev_add_finger();
+ Pkg_private int      ev_get_selection();
+ Pkg_private Es_handle textsw_esh_for_span();
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_selsvc.c b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_selsvc.c
new file mode 100644
index 000000000000..6079f7f5dba0
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_selsvc.c
@@ -0,0 +1,11 @@
+--- ./lib/libxview/textsw/txt_selsvc.c.orig	Sun Jun 26 03:05:23 1994
++++ ./lib/libxview/textsw/txt_selsvc.c	Sat Apr  1 18:25:29 2000
+@@ -24,6 +24,8 @@ static char     sccsid[] = "@(#)txt_sels
+ #include <stdlib.h>
+ #endif /* SVR4 */
+ 
++static int textsw_should_ask_seln_svc();
++
+ extern int      errno;
+ 
+ Pkg_private Es_status es_copy();
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+cim_change.c b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+cim_change.c
new file mode 100644
index 000000000000..a575e8c63260
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+cim_change.c
@@ -0,0 +1,14 @@
+--- ./lib/libxview/ttysw/cim_change.c.orig	Tue Jun 29 07:17:12 1993
++++ ./lib/libxview/ttysw/cim_change.c	Sat Apr  1 18:25:29 2000
+@@ -17,10 +17,10 @@ static char     sccsid[] = "@(#)cim_chan
+ #include <xview_private/i18n_impl.h>
+ #include <sys/types.h>
+ #include <pixrect/pixrect.h>
+-#include <xview_private/ttyansi.h>
+ #include <xview_private/charimage.h>
+ #include <xview_private/charscreen.h>
+ #include <xview_private/tty_impl.h>
++#include <xview_private/ttyansi.h>
+ 
+ char            boldify;
+ 
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+cim_size.c b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+cim_size.c
new file mode 100644
index 000000000000..31c11b8c8038
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+cim_size.c
@@ -0,0 +1,26 @@
+--- ./lib/libxview/ttysw/cim_size.c.orig	Tue Jun 29 07:17:14 1993
++++ ./lib/libxview/ttysw/cim_size.c	Sat Apr  1 18:25:33 2000
+@@ -156,19 +156,19 @@ xv_tty_free_image_and_mode()
+ {
+ 
+     if (lines_ptr) {
+-        cfree((CHAR *) (lines_ptr));
++        free((CHAR *) (lines_ptr));
+ 	lines_ptr = NULL;
+     }
+     if (image) {
+-        cfree((CHAR **) image);
++        free((CHAR **) image);
+ 	image = NULL;
+     }
+     if (mode_ptr) {
+-	cfree((char *) (mode_ptr));
++	free((char *) (mode_ptr));
+ 	mode_ptr = NULL;
+     }
+     if (screenmode) {
+-	cfree((char **) screenmode);
++	free((char **) screenmode);
+ 	screenmode = NULL;
+     }
+ }
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+term_ntfy.c b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+term_ntfy.c
new file mode 100644
index 000000000000..7d658bc790ab
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+term_ntfy.c
@@ -0,0 +1,21 @@
+--- lib/libxview/ttysw/term_ntfy.c.orig	Fri Oct 17 10:07:41 2003
++++ lib/libxview/ttysw/term_ntfy.c	Fri Oct 17 10:07:41 2003
+@@ -22,7 +22,8 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <string.h>
+-#ifdef SVR4
++#include <sys/param.h>
++#if (defined(BSD4_4) || defined(SVR4))
+ #include <unistd.h>
+ #endif
+ 
+@@ -63,7 +64,7 @@
+ /* performance: global cache of getdtablesize() */
+ extern int      dtablesize_cache;
+ 
+-#ifdef SVR4
++#if (defined(BSD4_4) || defined(SVR4))
+ #define GETDTABLESIZE() \
+ (dtablesize_cache?dtablesize_cache:(dtablesize_cache=(int)sysconf(_SC_OPEN_MAX)))
+ #else
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty.c b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty.c
new file mode 100644
index 000000000000..4fe61b08fca0
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty.c
@@ -0,0 +1,20 @@
+--- lib/libxview/ttysw/tty.c.orig	Thu Oct 16 18:55:36 2003
++++ lib/libxview/ttysw/tty.c	Thu Oct 16 18:58:46 2003
+@@ -534,7 +534,7 @@
+ tty_quit_on_death(client, pid, status, rusage)
+     caddr_t         client;
+     int             pid;
+-#ifndef SVR4
++#if !(defined(BSD4_4) || defined(SVR4))
+     union wait     *status;
+ #else
+     int     *status;
+@@ -586,7 +586,7 @@
+ tty_handle_death(tty_folio_private, pid, status, rusage)
+     Ttysw_folio     tty_folio_private;
+     int             pid;
+-#ifndef SVR4
++#if !(defined(BSD4_4) || defined(SVR4))
+     union wait     *status;
+ #else
+     int     *status;
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_gtty.c b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_gtty.c
new file mode 100644
index 000000000000..10f41fc213d3
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_gtty.c
@@ -0,0 +1,39 @@
+--- ./lib/libxview/ttysw/tty_gtty.c.orig	Tue Jun 29 07:17:20 1993
++++ ./lib/libxview/ttysw/tty_gtty.c	Sat Apr  1 18:25:29 2000
+@@ -14,6 +14,7 @@ static  char sccsid[] = "@(#)tty_gtty.c 
+  * Ttysw parameter retrieval mechanism to get original tty settings to pty.
+  */
+ 
++#include <sys/param.h>
+ #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 
+  */
+ #ifdef	XV_USE_TERMIOS
+ 
++#if !(defined(BSD) && (BSD >= 199103))
+ static struct termios	default_modes = {
+ 	BRKINT|ICRNL|IXON|IGNPAR|IMAXBEL,	    	/* input modes */
+ 	OPOST|ONLCR,				    	/* output modes */
+@@ -57,6 +59,20 @@ static struct termios	default_modes = {
+ 	CWERASE,	/* VWERASE */
+ 	CLNEXT,		/* VLNEXT */
+ };
++#else
++#include <sys/ttydefaults.h>
++static struct termios default_modes = {
++	TTYDEF_IFLAG,   /* input modes */
++	TTYDEF_OFLAG,   /* output modes */      
++	TTYDEF_CFLAG,   /* control modes */
++	TTYDEF_LFLAG,   /* local modes */
++	/* control characters */
++	{ CEOF,   CEOL,   CEOL,   CERASE, CWERASE, CKILL, CREPRINT,
++	_POSIX_VDISABLE, CINTR, CQUIT,  CSUSP,  CDSUSP, CSTART, CSTOP,  CLNEXT,
++	CDISCARD, CMIN, CTIME,  CSTATUS, _POSIX_VDISABLE },
++	TTYDEF_SPEED, TTYDEF_SPEED /* input and output speeds */
++};    
++#endif
+ 
+ #else	/* XV_USE_TERMIOS */
+ 
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_impl.h b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_impl.h
new file mode 100644
index 000000000000..853d3ed79f9f
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_impl.h
@@ -0,0 +1,24 @@
+--- lib/libxview/ttysw/tty_impl.h.orig	Tue Jun 29 00:17:18 1993
++++ lib/libxview/ttysw/tty_impl.h	Sun Oct 12 20:29:16 2003
+@@ -14,6 +14,7 @@
+  * terminal emulation for teletype based programs.
+  */
+ 
++#include <sys/param.h>
+ #include <xview_private/portable.h>	/* tty and pty configuration info */
+ 
+ #ifdef	XV_USE_TERMIOS
+@@ -210,7 +211,13 @@
+  * Access functions for tty characteristics.
+  */
+ #ifdef	XV_USE_TERMIOS
++#if (defined(BSD) && (BSD >= 199103))
++#include <sys/ioctl.h>
++#include <sys/ioctl_compat.h>
++#define tty_gettabs(t)		((t)->termios.c_oflag & OXTABS)
++#else   
+ #define	tty_gettabs(t)		((t)->termios.c_oflag & XTABS)
++#endif
+ #define	tty_getdsuspc(t)	((int) ((t)->termios.c_cc[VDSUSP]))
+ #define	tty_geteofc(t)		((int) ((t)->termios.c_cc[VEOF]))
+ #define	tty_geteolc(t)		((int) ((t)->termios.c_cc[VEOL]))
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_init.c b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_init.c
new file mode 100644
index 000000000000..4a3f98e32780
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_init.c
@@ -0,0 +1,75 @@
+--- lib/libxview/ttysw/tty_init.c.orig	Tue Jun 29 00:17:19 1993
++++ lib/libxview/ttysw/tty_init.c	Fri Oct 17 09:40:42 2003
+@@ -14,6 +14,7 @@
+  * Ttysw initialization, destruction and error procedures
+  */
+ 
++#include <sys/param.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -82,7 +83,11 @@
+ 
+ extern char    *strncpy();
+ extern char    *strcpy();
++#if (defined(BSD) && (BSD >= 199306))
++extern off_t	lseek();
++#else
+ extern long     lseek();
++#endif
+ char           *textsw_checkpoint_undo();
+ 
+ /* static */ void ttysw_parseargs();
+@@ -106,6 +111,7 @@
+ 
+ extern int      ttysel_use_seln_service;
+ 
++static int	ttyinit();
+ 
+ struct ttysw_createoptions {
+     int             becomeconsole;	/* be the console */
+@@ -518,6 +524,9 @@
+     (void) dup2(ttysw->ttysw_tty, 2);
+     (void) close(ttysw->ttysw_tty);
+ 
++#if (defined(BSD) && (BSD >= 199103))
++    (void) ioctl(0, TIOCSCTTY, NULL);
++#endif
+     if (*argv == (char *) NULL || strcmp("-c", *argv) == 0) {
+ 	/* Process arg list */
+ 	int             argc;
+@@ -955,7 +964,11 @@
+     struct utmpx     utmp;
+ #endif
+     struct passwd  *passwdent;
++#if !(defined(BSD) && (BSD >= 199103))
+     extern struct passwd *getpwuid();
++#else
++    struct passwd *getpwuid __P((uid_t));
++#endif
+     int             f;
+     char           *ttyn;
+     extern char    *ttyname();
+@@ -1007,13 +1020,22 @@
+ 		XV_MSG("Add tty[qrs][0-f] to /etc/ttys file.\n"));
+ 	return (0);
+     }
++#if !(defined(BSD) && (BSD >= 199103))
+     if ((f = open("/etc/utmp", 1)) >= 0) {
++#else
++    if ((f = open(_PATH_UTMP, 1)) >= 0) {
++#endif
+ 	(void) lseek(f, (long) (ttyslotuse * sizeof(utmp)), 0);
+ 	(void) write(f, (char *) &utmp, sizeof(utmp));
+ 	(void) close(f);
+     } else {
+ 	(void) fprintf(stderr, 
++#if !(defined(BSD) && (BSD >= 199103))
+ 	XV_MSG("make sure that you can write /etc/utmp!\n"));
++#else
++	XV_MSG("make sure that you can write "));
++	    (void) fprintf(stderr, "%s!\n", _PATH_UTMP);
++#endif
+ 	return (0);
+     }
+     return (ttyslotuse);
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_main.c b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_main.c
new file mode 100644
index 000000000000..06c245feb374
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_main.c
@@ -0,0 +1,36 @@
+--- lib/libxview/ttysw/tty_main.c.orig	Tue Jun 29 00:17:22 1993
++++ lib/libxview/ttysw/tty_main.c	Fri Oct 17 09:49:09 2003
+@@ -60,7 +60,7 @@
+ #include <wctype.h>
+ #include <stdlib.h>
+ #include <xview_private/charimage.h>
+-#ifdef FULL_R5
++#if defined(FULL_R5) || defined(X11R6)
+ #include <X11/Xlib.h>
+ #endif /* FULL_R5 */    
+ #endif
+@@ -75,6 +75,11 @@
+ int     committed_left = 0;
+ #endif
+ 
++static int ttysw_process_point();
++static int ttysw_process_adjust();
++static int ttysw_process_motion();
++static int ttysw_process_keyboard();
++
+ extern Textsw_index textsw_insert();
+ #ifdef OW_I18N
+ extern Textsw_index textsw_insert_wcs();
+@@ -906,8 +911,12 @@
+ 
+ 	    if (int_ucntl == (tiocsti & 0xff))
+ 		ttysw_process_STI(ttysw, owbp, cc - 1);
++#ifndef XV_USE_TERMIOS
+ 	    (void) ioctl(ttysw->ttysw_tty, TIOCGETC, &ttysw->tchars);
+ 	    (void) ioctl(ttysw->ttysw_tty, TIOCGLTC, &ttysw->ltchars);
++#else
++	    (void) tcgetattr(ttysw->ttysw_tty, &ttysw->termios);
++#endif
+ 	    ttysw_getp(TTY_VIEW_HANDLE_FROM_TTY_FOLIO(ttysw));	/* jcb for nng */
+ 	} else
+ #ifdef OW_I18N
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_mapkey.c b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_mapkey.c
new file mode 100644
index 000000000000..cab7af7e6e98
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_mapkey.c
@@ -0,0 +1,21 @@
+--- lib/libxview/ttysw/tty_mapkey.c.orig	Tue Jun 29 00:17:20 1993
++++ lib/libxview/ttysw/tty_mapkey.c	Fri Oct 17 09:54:12 2003
+@@ -12,7 +12,8 @@
+ 
+ #include <stdio.h>
+ #include <ctype.h>
+-#ifdef SVR4
++#include <sys/param.h>
++#if (defined(BSD4_4) || defined(SVR4))
+ #include <string.h>
+ #endif
+ #include <sys/types.h>
+@@ -500,7 +501,7 @@
+  * have more time.
+  */
+ 
+-#ifdef i386
++#if defined(i386) && !defined (__FreeBSD__)
+ static void
+ ttysw_arrow_keys_to_string(xv_id, str)
+     unsigned        xv_id;
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_ntfy.c b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_ntfy.c
new file mode 100644
index 000000000000..dd6d02c374e2
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_ntfy.c
@@ -0,0 +1,29 @@
+--- lib/libxview/ttysw/tty_ntfy.c.orig	Tue Jun 29 00:17:17 1993
++++ lib/libxview/ttysw/tty_ntfy.c	Sun Oct 12 20:25:29 2003
+@@ -171,10 +173,14 @@
+      * SIGWINCHes on resize.
+      */
+     /* Notify process group that terminal has changed. */
++#if !(defined(BSD) && (BSD >= 199103))
+     if (ioctl(ttysw->ttysw_tty, TIOCGPGRP, &pgrp) == -1) {
+ 	perror(XV_MSG("ttysw_sigwinch, can't get tty process group"));
+ 	return;
+     }
++#else
++    pgrp = tcgetpgrp(ttysw->ttysw_pty);
++#endif
+     /*
+      * Only killpg when pgrp is not tool's.  This is the case of haven't
+      * completed ttysw_fork yet (or even tried to do it yet).
+@@ -204,7 +210,11 @@
+ 	return;
+     }
+     /* Send the signal to the process group of the controlling tty */
++#if !(defined(BSD) && (BSD >= 199103))
+     if (ioctl(ttysw->ttysw_tty, TIOCGPGRP, &control_pg) >= 0) {
++#else
++    if ((control_pg = tcgetpgrp(ttysw->ttysw_pty)) >= 0) {
++#endif
+ 	/*
+ 	 * Flush our buffers of completed and partial commands. Be sure to do
+ 	 * this BEFORE killpg, or we'll flush the prompt coming back from the
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+ttyansi.c b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+ttyansi.c
new file mode 100644
index 000000000000..5d5e9f00e298
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+ttyansi.c
@@ -0,0 +1,13 @@
+--- ./lib/libxview/ttysw/ttyansi.c.orig	Tue Jun 29 07:17:21 1993
++++ ./lib/libxview/ttysw/ttyansi.c	Sat Apr  1 18:25:30 2000
+@@ -31,6 +31,10 @@ static char     sccsid[] = "@(#)ttyansi.
+ 
+ #include <xview/sel_attrs.h>
+ 
++static int	send_input_to_textsw();
++static int	ansi_lf();
++static int	ansi_char();
++
+ char           *strncpy();
+ char           *textsw_checkpoint_undo();
+ Textsw_index    textsw_replace_i18n(), textsw_erase_i18n();
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+ttyselect.c b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+ttyselect.c
new file mode 100644
index 000000000000..de8b31fded93
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+ttyselect.c
@@ -0,0 +1,11 @@
+--- ./lib/libxview/ttysw/ttyselect.c.orig	Sun Jun 26 03:05:23 1994
++++ ./lib/libxview/ttysw/ttyselect.c	Sat Apr  1 18:25:30 2000
+@@ -75,6 +75,8 @@ static Seln_result ttysel_copy_in(),
+ #endif
+                 ttysel_reply();
+ 
++static ttysel_resynch();
++
+ static struct ttyselection *
+                 ttysel_from_rank();
+ 
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+win+win_input.c b/x11-toolkits/xview/files/patch-lib+libxview+win+win_input.c
new file mode 100644
index 000000000000..d5d4d16bc8f7
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+win+win_input.c
@@ -0,0 +1,62 @@
+--- ./lib/libxview/win/win_input.c.orig	Sat Apr  1 18:25:30 2000
++++ ./lib/libxview/win/win_input.c	Sat Apr  1 18:25:33 2000
+@@ -854,7 +854,9 @@ ContProcess:
+ #ifdef X11R6
+ 	/* lumpi@dobag.in-berlin.de */
+ 		int ksym_pcc;
+-		XGetKeyboardMapping(display,NoSymbol,0,&ksym_pcc);
++		int tc_min_keycode, tc_max_keycode;
++		XDisplayKeycodes(display, &tc_min_keycode, &tc_max_keycode);
++		XGetKeyboardMapping(display,tc_min_keycode,tc_max_keycode-tc_min_keycode-1,&ksym_pcc);
+ 		for (index = 0; index < ksym_pcc; index++) {
+ #else
+ 		for (index = 0; index < display->keysyms_per_keycode; index++) {
+@@ -862,7 +864,7 @@ ContProcess:
+ 		    if ((ksym = XLookupKeysym(ek, index)) != NoSymbol)
+ 			if (IsKeypadKey(ksym)) {
+ 			    /* See if key has been rebound. */
+-			    if (!translate_key(display, ksym, ek->state,
++			    if (translate_key(display, ksym, ek->state,
+ 					       buffer, BUFFERSIZE)) {
+ 			        (void)win_translate_KP_keysym(ksym, buffer);
+ 			    }
+@@ -2721,8 +2723,10 @@ win_translate_KP_keysym(keysym, buffer)
+  * Xlib's.
+  */
+ 
+-#ifdef X11R6
+-/* lumpi@dobag.in-berlin.de */
++#ifdef X11R6 
++/* lumpi@dobag.in-berlin.de  
++   tom@sees.bangor.ac.uk this replacement for X11R6 doesn't work. At least 
++   it should now return sensible values though. */
+ static int
+ translate_key(dpy, symbol, modifiers, buffer, nbytes)
+     Display 		*dpy;
+@@ -2732,11 +2736,18 @@ translate_key(dpy, symbol, modifiers, bu
+     int 		 nbytes;
+ {
+ 	/* This is _very_ rude ! */
+-	strcpy(buffer,XKeysymToString(symbol));
++	char *string;
++	string = XKeysymToString(symbol);
++     	if (string) {
++		strncpy(buffer,XKeysymToString(symbol),nbytes);
++		return(strlen(buffer));
++	}
++	else
++		return 0;
+ }
+ 
+-#else
+ 
++#else
+ static int
+ translate_key(dpy, symbol, modifiers, buffer, nbytes)
+     Display 		*dpy;
+@@ -2762,4 +2773,4 @@ translate_key(dpy, symbol, modifiers, bu
+     }
+     return 0;
+ }
+-#endif
++#endif 
diff --git a/x11-toolkits/xview/files/patch-lib+misc+support+Imakefile b/x11-toolkits/xview/files/patch-lib+misc+support+Imakefile
new file mode 100644
index 000000000000..b948e71a6014
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+misc+support+Imakefile
@@ -0,0 +1,11 @@
+--- misc/support/Imakefile.orig	Sun Apr  2 05:09:59 2000
++++ misc/support/Imakefile	Sun Apr  2 05:10:11 2000
+@@ -13,7 +13,7 @@
+ all::
+ 
+ install::
+-	$(MKDIRHIER) $(HELP_DEST) $(LIBRARY_DEST)
++	$(MKDIRHIER) $(DESTDIR)$(HELP_DEST) $(DESTDIR)$(LIBRARY_DEST)
+ 
+ InstallSupportList($(SUPPORTFILES),$(LIBRARY_DEST))
+ InstallNonExecList($(INFOFILES),$(HELP_DEST))
diff --git a/x11-toolkits/xview/files/patch-lib+pixrect+Imakefile b/x11-toolkits/xview/files/patch-lib+pixrect+Imakefile
new file mode 100644
index 000000000000..c368882ad38f
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+pixrect+Imakefile
@@ -0,0 +1,13 @@
+--- lib/pixrect/Imakefile.orig	Mon Sep 29 00:02:40 2003
++++ lib/pixrect/Imakefile	Mon Sep 29 00:02:40 2003
+@@ -41,8 +41,8 @@
+ all:: 
+ 
+ #if InstallPixrectHeaders
+-BuildIncludes($(HEADERS),$(PIXRECT_INCDIR),/**/)
+-BuildIncludes($(HEADERS2),$(INCDIR),/**/)
++BuildIncludes($(HEADERS),$(PIXRECT_INCDIR),.)
++BuildIncludes($(HEADERS2),$(INCDIR),.)
+  
+ install::
+ 	$(MKDIRHIER) $(PIXRECT_HEADER_DEST)
diff --git a/x11-toolkits/xview/files/patch-old-wait.h b/x11-toolkits/xview/files/patch-old-wait.h
deleted file mode 100644
index 6c7ecf17b00e..000000000000
--- a/x11-toolkits/xview/files/patch-old-wait.h
+++ /dev/null
@@ -1,99 +0,0 @@
---- clients/olwm/olwm.c.orig	Tue Apr 22 23:19:15 2003
-+++ clients/olwm/olwm.c	Tue Apr 22 23:43:14 2003
-@@ -21,7 +21,7 @@
- #include <sys/param.h>
- #include <sys/resource.h>
- #include <sys/stat.h>
--#include <sys/wait.h>
-+#include "wait.h"
- 
- #include <X11/Xos.h>
- #include <X11/Xlib.h>
---- contrib/examples/notifier/ntfy_pipe.c.orig	Tue Apr 22 23:20:04 2003
-+++ contrib/examples/notifier/ntfy_pipe.c	Tue Apr 22 23:20:39 2003
-@@ -11,7 +11,7 @@
- #include <signal.h>
- #include <sys/time.h>
- #include <sys/types.h>
--#include <sys/wait.h>
-+#include "wait.h"
- #include <sys/resource.h>
- #include <sys/ioctl.h>
- #include <xview/notify.h>
---- lib/libxview/misc/expandname.c.orig	Tue Apr 22 23:21:21 2003
-+++ lib/libxview/misc/expandname.c	Tue Apr 22 23:21:39 2003
-@@ -18,7 +18,7 @@
- 
- #include <sys/param.h>
- #include <sys/stat.h>
--#include <sys/wait.h>
-+#include "wait.h"
- #include <stdio.h>
- #include <string.h>
- #include <sgtty.h>
---- lib/libxview/ttysw/tty.c.orig	Tue Apr 22 23:22:10 2003
-+++ lib/libxview/ttysw/tty.c	Tue Apr 22 23:22:27 2003
-@@ -17,7 +17,7 @@
- #include <fcntl.h>
- #include <sys/types.h>
- #include <sys/time.h>
--#include <sys/wait.h>
-+#include "wait.h"
- #include <pixrect/pixrect.h>
- #include <pixrect/pixfont.h>
- #include <xview_private/i18n_impl.h>
---- lib/libxview/ttysw/termsw.c.orig	Tue Apr 22 23:23:06 2003
-+++ lib/libxview/ttysw/termsw.c	Tue Apr 22 23:23:29 2003
-@@ -17,7 +17,7 @@
- #include <stdio.h>
- #include <fcntl.h>
- #include <sys/types.h>
--#include <sys/wait.h>
-+#include "wait.h"
- #include <xview/sun.h>
- #include <xview/frame.h>
- #include <xview/tty.h>
---- lib/libxview/ttysw/tty_ntfy.c.orig	Tue Apr 22 23:23:54 2003
-+++ lib/libxview/ttysw/tty_ntfy.c	Tue Apr 22 23:24:44 2003
-@@ -18,7 +18,7 @@
- #include <sys/file.h>
- #include <sys/time.h>
- #include <sys/resource.h>
--#include <sys/wait.h>
-+#include "wait.h"
- #include <signal.h>
- #include <stdio.h>
- #include <errno.h>
---- lib/libxview/ttysw/term_ntfy.c.orig	Tue Apr 22 23:25:05 2003
-+++ lib/libxview/ttysw/term_ntfy.c	Tue Apr 22 23:25:24 2003
-@@ -17,7 +17,7 @@
- #include <sys/file.h>
- #include <sys/time.h>
- #include <sys/resource.h>
--#include <sys/wait.h>
-+#include "wait.h"
- #include <signal.h>
- #include <stdio.h>
- #include <ctype.h>
---- lib/libxview/notify/ntfy.h.orig	Tue Apr 22 23:25:54 2003
-+++ lib/libxview/notify/ntfy.h	Tue Apr 22 23:26:20 2003
-@@ -23,7 +23,7 @@
- #endif
- #include <sys/resource.h>
- #if (defined(BSD) && (BSD >= 199103))
--#include <sys/wait.h>
-+#include  "wait.h"
- #include <sys/signal.h>
- #endif
- #include <xview/notify.h>
---- lib/libxview/notify/notify.h.orig	Tue Apr 22 23:26:42 2003
-+++ lib/libxview/notify/notify.h	Tue Apr 22 23:36:29 2003
-@@ -18,7 +18,7 @@
- 
- #include <stdio.h>
- #include <sys/types.h>
--#include <sys/wait.h>
-+#include "wait.h"
- #include <sys/time.h>
- #include <sys/resource.h>
- #include <xview/base.h>
diff --git a/x11-toolkits/xview/files/patch-text_extras_menu b/x11-toolkits/xview/files/patch-text_extras_menu
deleted file mode 100644
index 3d2f3ffb2161..000000000000
--- a/x11-toolkits/xview/files/patch-text_extras_menu
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/libxview/textsw/txt_e_menu.c.orig	Sun Apr 27 11:56:09 2003
-+++ lib/libxview/textsw/txt_e_menu.c	Sun Apr 27 11:56:37 2003
-@@ -159,7 +159,7 @@
-     }
- 
-     /* Giving up, try with ancient way (SunView1) */
--    (void) sprintf(tmp, "/usr/lib/.%s", EXTRASMENU);
-+    (void) sprintf(tmp, "%s", EXTRASMENU);
-     result = xv_strsave(tmp);
- 
- found:
diff --git a/x11-toolkits/xview/files/patch-util-Imakefile b/x11-toolkits/xview/files/patch-util+Imakefile
index 2b5bb68599e7..2b5bb68599e7 100644
--- a/x11-toolkits/xview/files/patch-util-Imakefile
+++ b/x11-toolkits/xview/files/patch-util+Imakefile
diff --git a/x11-toolkits/xview/files/patch-util+xgettext+xgettext.c b/x11-toolkits/xview/files/patch-util+xgettext+xgettext.c
new file mode 100644
index 000000000000..389593a626e1
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-util+xgettext+xgettext.c
@@ -0,0 +1,11 @@
+--- util/xgettext/xgettext.c.orig	Sat Oct  4 19:07:38 2003
++++ util/xgettext/xgettext.c	Sat Oct  4 19:09:10 2003
+@@ -193,7 +193,7 @@
+ 	
+ 	switch (*cp) {
+ 
+-	case NULL:
++	case 0:
+             readstd++;
+             break;
+ 
diff --git a/x11-toolkits/xview/files/patch-util+xgettext+xgettext.h b/x11-toolkits/xview/files/patch-util+xgettext+xgettext.h
new file mode 100644
index 000000000000..5be1e4e59080
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-util+xgettext+xgettext.h
@@ -0,0 +1,20 @@
+--- util/xgettext/xgettext.h.orig	Tue Jun 29 00:14:13 1993
++++ util/xgettext/xgettext.h	Thu Oct 16 14:32:50 2003
+@@ -8,13 +8,14 @@
+ #include <signal.h>
+ #include <sys/types.h>
+ 
+-#ifndef SVR4
++#include <sys/param.h>
++
++#if !(defined(BSD4_4) || defined(SVR4))
+ #include <sys/dir.h>
+ #else
+ #include <dirent.h>
+-#endif SVR4
++#endif /* SVR4 */
+ 
+-#include <sys/param.h>
+ #include <sys/stat.h>
+ 
+ #define DOMAIN_TOKEN    "domain"
diff --git a/x11-toolkits/xview/files/types.h.in b/x11-toolkits/xview/files/types.h.in
deleted file mode 100644
index 891dae311488..000000000000
--- a/x11-toolkits/xview/files/types.h.in
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <sys/types.h>
-#ifndef howmany
-#define howmany(x, y)   (((x) + ((y) - 1)) / (y))
-#endif
diff --git a/x11-toolkits/xview/files/wait.h.in b/x11-toolkits/xview/files/wait.h.in
deleted file mode 100644
index db225434799c..000000000000
--- a/x11-toolkits/xview/files/wait.h.in
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1989, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)wait.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD: /tmp/pcvs/ports/x11-toolkits/xview/files/Attic/wait.h.in,v 1.1 2003-06-19 06:56:25 daichi Exp $
- */
-
-#ifndef _SYS_WAIT_H_
-#define _SYS_WAIT_H_
-
-/*
- * This file holds definitions relevant to the wait4 system call
- * and the alternate interfaces that use it (wait, wait3, waitpid).
- */
-
-/*
- * Macros to test the exit status returned by wait
- * and extract the relevant values.
- */
-#ifdef _POSIX_SOURCE
-#define	_W_INT(i)	(i)
-#else
-#define	_W_INT(w)	(*(int *)&(w))	/* convert union wait to int */
-#define	WCOREFLAG	0200
-#endif
-
-#define	_WSTATUS(x)	(_W_INT(x) & 0177)
-#define	_WSTOPPED	0177		/* _WSTATUS if process is stopped */
-#define WIFSTOPPED(x)	(_WSTATUS(x) == _WSTOPPED)
-#define WSTOPSIG(x)	(_W_INT(x) >> 8)
-#define WIFSIGNALED(x)	(_WSTATUS(x) != _WSTOPPED && _WSTATUS(x) != 0)
-#define WTERMSIG(x)	(_WSTATUS(x))
-#define WIFEXITED(x)	(_WSTATUS(x) == 0)
-#define WEXITSTATUS(x)	(_W_INT(x) >> 8)
-#ifndef _POSIX_SOURCE
-#define WCOREDUMP(x)	(_W_INT(x) & WCOREFLAG)
-
-#define	W_EXITCODE(ret, sig)	((ret) << 8 | (sig))
-#define	W_STOPCODE(sig)		((sig) << 8 | _WSTOPPED)
-#endif
-
-/*
- * Option bits for the third argument of wait4.  WNOHANG causes the
- * wait to not hang if there are no stopped or terminated processes, rather
- * returning an error indication in this case (pid==0).  WUNTRACED
- * indicates that the caller should receive status about untraced children
- * which stop due to signals.  If children are stopped and a wait without
- * this option is done, it is as though they were still running... nothing
- * about them is returned.
- */
-#define WNOHANG		1	/* don't hang in wait */
-#define WUNTRACED	2	/* tell about stopped, untraced children */
-#define WLINUXCLONE     0x80000000       /* wait for kthread spawned from linux_clone */
-
-#ifndef _POSIX_SOURCE
-/* POSIX extensions and 4.2/4.3 compatibility: */
-
-/*
- * Tokens for special values of the "pid" parameter to wait4.
- */
-#define	WAIT_ANY	(-1)	/* any process */
-#define	WAIT_MYPGRP	0	/* any process in my process group */
-
-#include <machine/endian.h>
-
-/*
- * Deprecated:
- * Structure of the information in the status word returned by wait4.
- * If w_stopval==WSTOPPED, then the second structure describes
- * the information returned, else the first.
- */
-union wait {
-	int	w_status;		/* used in syscall */
-	/*
-	 * Terminated process status.
-	 */
-	struct {
-#if BYTE_ORDER == LITTLE_ENDIAN
-		unsigned int	w_Termsig:7,	/* termination signal */
-				w_Coredump:1,	/* core dump indicator */
-				w_Retcode:8,	/* exit code if w_termsig==0 */
-				w_Filler:16;	/* upper bits filler */
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-		unsigned int	w_Filler:16,	/* upper bits filler */
-				w_Retcode:8,	/* exit code if w_termsig==0 */
-				w_Coredump:1,	/* core dump indicator */
-				w_Termsig:7;	/* termination signal */
-#endif
-	} w_T;
-	/*
-	 * Stopped process status.  Returned
-	 * only for traced children unless requested
-	 * with the WUNTRACED option bit.
-	 */
-	struct {
-#if BYTE_ORDER == LITTLE_ENDIAN
-		unsigned int	w_Stopval:8,	/* == W_STOPPED if stopped */
-				w_Stopsig:8,	/* signal that stopped us */
-				w_Filler:16;	/* upper bits filler */
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-		unsigned int	w_Filler:16,	/* upper bits filler */
-				w_Stopsig:8,	/* signal that stopped us */
-				w_Stopval:8;	/* == W_STOPPED if stopped */
-#endif
-	} w_S;
-};
-#define	w_termsig	w_T.w_Termsig
-#define w_coredump	w_T.w_Coredump
-#define w_retcode	w_T.w_Retcode
-#define w_stopval	w_S.w_Stopval
-#define w_stopsig	w_S.w_Stopsig
-
-#define	WSTOPPED	_WSTOPPED
-#endif /* _POSIX_SOURCE */
-
-#ifndef _KERNEL
-#include <sys/types.h>
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-struct rusage;	/* forward declaration */
-
-pid_t	wait __P((int *));
-pid_t	waitpid __P((pid_t, int *, int));
-#ifndef _POSIX_SOURCE
-pid_t	wait3 __P((int *, int, struct rusage *));
-pid_t	wait4 __P((pid_t, int *, int, struct rusage *));
-#endif
-__END_DECLS
-#endif
-
-#endif
diff --git a/x11-toolkits/xview/pkg-plist b/x11-toolkits/xview/pkg-plist
index 194d3ff93a71..07267c571ec9 100644
--- a/x11-toolkits/xview/pkg-plist
+++ b/x11-toolkits/xview/pkg-plist
@@ -422,8 +422,6 @@ include/xview/text.h
 include/xview/textsw.h
 include/xview/tty.h
 include/xview/ttysw.h
-include/xview/types.h
-include/xview/wait.h
 include/xview/win_enum.h
 include/xview/win_env.h
 include/xview/win_event.h
@@ -545,12 +543,12 @@ lib/X11/config/XView.obj
 lib/X11/config/XView.rules
 lib/X11/config/XView.tmpl
 lib/X11/config/XView.prog
-%%PORTDOCS%%share/doc/xview/bugform
-%%PORTDOCS%%share/doc/xview/dnd_api.txt
-%%PORTDOCS%%share/doc/xview/olgx_api.txt
-%%PORTDOCS%%share/doc/xview/olgx_api.ps
-%%PORTDOCS%%share/doc/xview/paper.ms
-%%PORTDOCS%%share/doc/xview/sel_api.txt
-%%PORTDOCS%%share/doc/xview/whats_new.ps
-%%PORTDOCS%%share/doc/xview/xview-info
-%%PORTDOCS%%@dirrm share/doc/xview
+%%PORTDOCS%%%%DOCSDIR%%/bugform
+%%PORTDOCS%%%%DOCSDIR%%/dnd_api.txt
+%%PORTDOCS%%%%DOCSDIR%%/olgx_api.txt
+%%PORTDOCS%%%%DOCSDIR%%/olgx_api.ps
+%%PORTDOCS%%%%DOCSDIR%%/paper.ms
+%%PORTDOCS%%%%DOCSDIR%%/sel_api.txt
+%%PORTDOCS%%%%DOCSDIR%%/whats_new.ps
+%%PORTDOCS%%%%DOCSDIR%%/xview-info
+%%PORTDOCS%%@dirrm %%DOCSDIR%%