Update 3.2p1-X11R6 --> 3.2p1.4-19c

This fixes cmdtool and shelltool terminal handling and utmpx issues under 9.0.
author: Cy Schubert <cy@FreeBSD.org> 2012-02-08 06:54:54 +0000
committer: Cy Schubert <cy@FreeBSD.org> 2012-02-08 06:54:54 +0000
commit: 6d0e01a6a190cb69e2ca83c6ff384b3bb49e3866 (patch)
tree: 7fea847636d4e0ba6f486c87c87ce8d3a9b01ff6 /x11-toolkits/xview
parent: - fix build for FreeBSD 9.x (diff)
123 files changed, 1291 insertions, 1977 deletions
diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile
index a734a47c9088..49d043aa1f93 100644
--- a/x11-toolkits/xview/Makefile
+++ b/x11-toolkits/xview/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	xview
-PORTVERSION=	3.2.1
-PORTREVISION=	12
+PORTVERSION=	3.2.1.4.19c
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://ftp.efd.lth.se/pub/X11/ \
-		ftp://ftp.uni-heidelberg.de/pub/X11/contrib/libraries/ \
+MASTER_SITES=	http://www.physionet.org/physiotools/xview/src/ \
+		http://komquats.com/distfiles/ \
 		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	pav
-DISTNAME=	xview3.2p1-X11R6
+MASTER_SITE_SUBDIR=	cy
+DISTNAME=	xview-3.2p1.4-19c
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	X Window-System-based Visual/Integrated Environment for Workstations
diff --git a/x11-toolkits/xview/distinfo b/x11-toolkits/xview/distinfo
index d0f1fcdf44c7..b1fcaf8951bc 100644
--- a/x11-toolkits/xview/distinfo
+++ b/x11-toolkits/xview/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xview3.2p1-X11R6.tar.gz) = cc5ced33936bbb674b467ffc1c1756be645972ae70f83aa4bc971b888741c9a1
-SIZE (xview3.2p1-X11R6.tar.gz) = 3436814
+SHA256 (xview-3.2p1.4-19c.tar.gz) = ce05762918ccaa0bd86819e1347b57b6d0e5d515b148f9f740d3ffd1fa9eea83
+SIZE (xview-3.2p1.4-19c.tar.gz) = 3350088
diff --git a/x11-toolkits/xview/files/patch-Imakefile b/x11-toolkits/xview/files/patch-Imakefile
index 49ba5f52e7da..8ff39c55f7b5 100644
--- a/x11-toolkits/xview/files/patch-Imakefile
+++ b/x11-toolkits/xview/files/patch-Imakefile
@@ -1,8 +1,8 @@
---- Imakefile.orig	Sun Jun 26 03:47:22 1994
-+++ Imakefile	Thu Aug 11 14:26:34 2005
-@@ -4,8 +4,8 @@
- /**/# Top level Imakefile for ProductNameAndRelease
- /**/# @(#)Imakefile	1.7 1/7/92 SMI
+--- Imakefile.orig	2005-03-28 06:41:59.000000000 -0800
++++ Imakefile	2012-02-02 13:40:06.681898858 -0800
+@@ -10,8 +10,8 @@
+ XCOMM # Top level Imakefile for ProductNameAndRelease
+ XCOMM # @(#)Imakefile	1.7 1/7/92 SMI
  
 -CC = cc
 -CFLAGS = -O 
@@ -11,19 +11,11 @@
  
  #define IHaveSubdirs
  #define PassCDebugFlags
-@@ -13,14 +13,21 @@
-            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
+@@ -26,7 +26,15 @@
              FONTSDIR = 
  #endif
            CLIENTSDIR = clients
--             SUBDIRS = $(COREDIRS) $(FONTSDIR) 
+-          SUBDIRS = $(COREDIRS) $(FONTSDIR) 
 +.ifdef DOCLIENTS
 +             SUBDIRS = $(CLIENTSDIR)
 +.else
@@ -32,10 +24,11 @@
 +.ifdef WITHDOCSUBDIR
 +SUBDIRS+=doc
 +.endif
- /**/# even if these subdirs are not included in the general rules, be sure to
- /**/# do a make clean in them.
-        CLEAN_SUBDIRS = clients contrib doc fonts bitmaps images lib misc util
-@@ -59,11 +66,11 @@
++
+ XCOMM # even if these SUBDIRS are not included in the general rules, be sure to
+ XCOMM # do a make clean in them.
+        CLEAN_SUBDIRS = clients contrib doc fonts bitmaps images lib misc util config
+@@ -65,11 +73,11 @@
  	@echo ""
  	@date
  	@echo ""
@@ -52,7 +45,7 @@
  	@echo ""
  	@date
  	@echo ""
-@@ -96,9 +103,9 @@
+@@ -102,9 +110,9 @@
  	@echo ""
  	@date
  	@echo ""
diff --git a/x11-toolkits/xview/files/patch-bitmaps+Imakefile b/x11-toolkits/xview/files/patch-bitmaps+Imakefile
index 3d5dcbedb3de..b0b0025be696 100644
--- a/x11-toolkits/xview/files/patch-bitmaps+Imakefile
+++ b/x11-toolkits/xview/files/patch-bitmaps+Imakefile
@@ -1,14 +1,12 @@
---- bitmaps/Imakefile.orig	Mon Sep 29 00:02:44 2003
-+++ bitmaps/Imakefile	Mon Sep 29 00:02:43 2003
-@@ -34,9 +34,9 @@
+--- bitmaps/Imakefile.orig	2005-03-28 06:38:51.000000000 -0800
++++ bitmaps/Imakefile	2012-02-02 13:43:04.454629471 -0800
+@@ -36,7 +36,8 @@
  
- ALLFILES = $(BITMAPS) 
- 
--all: $(SRCS)
-+all:: $(SRCS)
+ all:: $(SRCS)
  
 -BuildIncludes($(INCLUDES_SRCS),$(BITMAP_INCDIR),/**/)
 +BuildIncludes($(INCLUDES_SRCS),$(BITMAP_INCDIR),.)
++
  
  install:: $(SRCS)
- 	$(MKDIRHIER) $(HEADER_DEST)/$(BITMAPINC)
+ 	$(MKDIRHIER) $(DESTDIR)$(HEADER_DEST)/$(BITMAPINC)
diff --git a/x11-toolkits/xview/files/patch-clients+clock+clock.c b/x11-toolkits/xview/files/patch-clients+clock+clock.c
index 91b11db9d180..84eb448f653c 100644
--- a/x11-toolkits/xview/files/patch-clients+clock+clock.c
+++ b/x11-toolkits/xview/files/patch-clients+clock+clock.c
@@ -1,14 +1,6 @@
---- clients/clock/clock.c.orig	Tue Jun 29 00:11:39 1993
-+++ clients/clock/clock.c	Sun Mar 26 16:29:50 2006
-@@ -22,6 +22,7 @@
- #include  <stdio.h>
- #include  <pwd.h>
- #include  <math.h>
-+#include  <time.h>
- #include  <xview/xview.h>
- #include  <xview/panel.h>
- #include  <xview/canvas.h>
-@@ -146,6 +147,10 @@
+--- clients/clock/clock.c.orig	2005-03-28 06:39:35.000000000 -0800
++++ clients/clock/clock.c	2012-02-02 15:08:00.272944648 -0800
+@@ -147,6 +147,10 @@
  static Notify_value analog_timer_expired();
  static Notify_value icon_timer_expired();
  static Notify_value dig_timer_expired();
@@ -19,7 +11,7 @@
  
  typedef enum {digital, analog} Face;
  
-@@ -488,7 +493,7 @@
+@@ -489,7 +493,7 @@
  init_images (c, w, h)
  	Clock c; int w, h;
  {
@@ -28,36 +20,7 @@
  	struct tm *tm;
  
  	/* resize the remote images */
-@@ -866,7 +871,7 @@
- paint_date (c) 
- 	Clock c;
- {
--	int now;
-+	time_t now;
- 	struct tm *tm;
- 	char buf[25];
- 	Frame f;
-@@ -910,7 +915,8 @@
- paint_second_hand (c) 
- 	Clock c; 
- {
--	int x, y, diameter, radius, now, fromrim, angle, height, width;
-+	int x, y, diameter, radius, fromrim, angle, height, width;
-+	time_t	now;
- 	struct tm *tm;
- 	ClockDisplay d;
- 	Pixwin *pw;
-@@ -993,7 +999,8 @@
- 	Pixwin * pw;
- 	Rectlist *area;
- {
--	int w, h, x, y, prw, prh, now;
-+	int w, h, x, y, prw, prh;
-+	time_t now;
- 	struct tm *tm;
- 	Clock c;
- 
-@@ -1020,7 +1027,7 @@
+@@ -1043,7 +1047,7 @@
  	Pixwin *pw;
  	Rectlist *area;
  {
@@ -66,66 +29,3 @@
  	Font_string_dims size;
  	struct tm *tm;
  	Clock c;
-@@ -1048,7 +1055,8 @@
- icon_timer_expired (me, which)
- {
- 	static int	mins, hours;
--	int		now, w, h;
-+	time_t		now;
-+	int		w, h;
- 	struct		tm *tm;
- 	Font_string_dims size;
- 	Clock		c;
-@@ -1077,11 +1085,12 @@
- 
- static Notify_value
- analog_timer_expired (me, which)
--	Notify_value	me;
-+	Frame	me;
- 	int		which;
- {
- 	static int	mins, hours;
--	int		now, x, y, w, h, prw, prh;
-+	time_t		now;
-+	int		x, y, w, h, prw, prh;
- 	struct		tm *tm;
- 	Clock		c;
- 
-@@ -1154,7 +1163,8 @@
- 	Pixwin *	pw;
- 	Rectlist	*area;
- {
--	int		i, now, y_coord, fontHeight, fontWidth;
-+	int		i, y_coord, fontHeight, fontWidth;
-+	time_t		now;
- 	struct tm	*tm;
- 	Clock		c;
- 	ClockDisplay		d;
-@@ -1211,7 +1221,7 @@
- 	int		which, invalidate;
- {
- 	static int	mins, hours;
--	int		now;
-+	time_t		now;
- 	struct		tm *tm;
- 	Clock		c;
- 
-@@ -1273,7 +1283,8 @@
- 	Panel_item item;
- 	Event *event;
- {
--	int w, h, now;
-+	int w, h; 
-+	time_t now;
- 	struct tm *tm;
- 	Clock c		= (Clock) xv_get (item, XV_KEY_DATA, key, 0);
- 	ClockDisplay d	= c-> display;
-@@ -1662,7 +1673,7 @@
- init_clck (argc, argv)
- 	int  argc; char **argv;
- {
--	int now;
-+	time_t now;
- 	struct tm *tm;
- 	Menu_item       tmp_item;
- 	char    **argscanner = argv;
diff --git a/x11-toolkits/xview/files/patch-clients+olwm+Imakefile b/x11-toolkits/xview/files/patch-clients+olwm+Imakefile
deleted file mode 100644
index 03848f1f8c55..000000000000
--- a/x11-toolkits/xview/files/patch-clients+olwm+Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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+defaults.c b/x11-toolkits/xview/files/patch-clients+olwm+defaults.c
index b57480bc906f..32c4bc893cb7 100644
--- a/x11-toolkits/xview/files/patch-clients+olwm+defaults.c
+++ b/x11-toolkits/xview/files/patch-clients+olwm+defaults.c
@@ -1,5 +1,5 @@
---- ./clients/olwm/defaults.c.orig	Tue Jun 29 07:11:43 1993
-+++ ./clients/olwm/defaults.c	Sat Apr  1 18:26:06 2000
+--- clients/olwm/defaults.c.orig	2005-03-28 06:39:46.000000000 -0800
++++ clients/olwm/defaults.c	2012-02-02 15:14:16.298703787 -0800
 @@ -25,9 +25,9 @@
  #include <X11/Xutil.h>
  #include <X11/Xatom.h>
@@ -12,15 +12,12 @@
  
  #include "i18n.h"
  #include "ollocale.h"
-@@ -80,7 +80,11 @@ GetUserDefaults(dpy)
+@@ -82,7 +82,7 @@
  	if (homedir != NULL) {
  	    (void) strcpy(filename, homedir);
  	    (void) strcat(filename, "/.Xdefaults-");
-+#ifdef BSD4_4
-+	    if (0 == gethostname(hostname, sizeof(hostname))) {
-+#else
+-#if !defined(__linux__) && !defined(__CYGWIN__)
++#if !defined(__linux__) && !defined(__CYGWIN__) && !defined(BSD4_4)
  	    if (0 == gethostname(hostname, sizeof(hostname), &namelen)) {
-+#endif
- 		(void) strcat(filename, hostname);
- 		fileDB = XrmGetFileDatabase(filename);
- 	    }
+ #else
+ 	    if (0 == gethostname(hostname, sizeof(hostname))) {
diff --git a/x11-toolkits/xview/files/patch-clients+olwm+gettext.c b/x11-toolkits/xview/files/patch-clients+olwm+gettext.c
index 08c598dd4153..b6b9e47cdcfe 100644
--- a/x11-toolkits/xview/files/patch-clients+olwm+gettext.c
+++ b/x11-toolkits/xview/files/patch-clients+olwm+gettext.c
@@ -1,17 +1,20 @@
---- clients/olwm/gettext.c.orig	Thu Aug 11 13:59:59 2005
-+++ clients/olwm/gettext.c	Thu Aug 11 14:05:12 2005
-@@ -16,11 +16,13 @@
+--- clients/olwm/gettext.c.orig	2005-03-28 06:39:46.000000000 -0800
++++ clients/olwm/gettext.c	2012-02-07 19:03:56.561212174 -0800
+@@ -19,14 +19,14 @@
+ #define bzero(a,b) memset(a,0,b)
  #endif
  
+-#if !defined(__linux__) || !defined(__GLIBC__)
++#if !defined(__linux__) && !defined(__GLIBC__) && !defined(__FreeBSD__)
  char *malloc(), *strdup();
--char * dgettext();
+ #endif
+-char * dgettext(char *, char *);
 +char * dgettext(char *domain_name, char *msg_id);
  char *_gettext();
  char *in_path();
  char *fgets(), *getenv();
-+#ifndef __FreeBSD__
+-#if !defined(__linux__) || !defined(__GLIBC__)
++#if !defined(__linux__) && !defined(__GLIBC__) && !defined(__FreeBSD__)
  caddr_t mmap(), calloc();
-+#endif
- 
- static struct domain_binding *firstbind=0, *lastbind=0;
+ #endif
  
diff --git a/x11-toolkits/xview/files/patch-clients+olwm+olwm.c b/x11-toolkits/xview/files/patch-clients+olwm+olwm.c
index 12a5c63d7c63..2385e1053015 100644
--- a/x11-toolkits/xview/files/patch-clients+olwm+olwm.c
+++ b/x11-toolkits/xview/files/patch-clients+olwm+olwm.c
@@ -1,5 +1,5 @@
---- clients/olwm/olwm.c.orig	Fri Oct 17 18:23:53 2003
-+++ clients/olwm/olwm.c	Fri Oct 17 18:48:37 2003
+--- clients/olwm/olwm.c.orig	2005-03-28 06:39:46.000000000 -0800
++++ clients/olwm/olwm.c	2012-02-02 15:22:35.676398718 -0800
 @@ -23,6 +23,10 @@
  #include <sys/stat.h>
  #include <sys/wait.h>
@@ -11,12 +11,8 @@
  #include <X11/Xos.h>
  #include <X11/Xlib.h>
  #include <X11/Xutil.h>
-@@ -622,9 +626,13 @@
- void
- ReapChildren()
- {
--#ifdef SYSV
-+#if defined(SYSV)
+@@ -637,6 +641,10 @@
+ #if defined SYSV || defined __CYGWIN__
          pid_t pid;
          int status;
 +#elif (defined(BSD) && (BSD >= 199103))
diff --git a/x11-toolkits/xview/files/patch-clients+olwm+screen.c b/x11-toolkits/xview/files/patch-clients+olwm+screen.c
deleted file mode 100644
index 5ee381e1c5cb..000000000000
--- a/x11-toolkits/xview/files/patch-clients+olwm+screen.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- clients/olwm/screen.c.orig	1993-06-29 07:11:56.000000000 +0200
-+++ clients/olwm/screen.c	2007-08-03 14:58:43.000000000 +0200
-@@ -39,6 +39,8 @@
- #include "iconimage.h"
- #include "iconmask.h"
- 
-+static updateScreenBackgroundColor(Display *dpy, ScreenInfo *scrInfo);
-+
- /*-------------------------------------------------------------------------
-  *	Default Constants
-  *-------------------------------------------------------------------------*/
-@@ -111,6 +113,12 @@
- static XrmQuark stippledRubberBandsCQ;
- static XrmQuark stippledRubberBandsIQ;
- 
-+static updateScreenWorkspaceColor();
-+static updateScreenWindowColor();
-+static updateScreenForegroundColor();
-+static updateScreenBackGroundColor();
-+static updateScreenBorderColor();
-+static updateScreenGlyphFont();
- 
- /*-------------------------------------------------------------------------
-  *	Local Functions
-@@ -214,6 +222,7 @@
- 		     	case PseudoColor:
- 			case GrayScale:
- 		     	case DirectColor:
-+			case TrueColor:
- 		    		return True;
- 				/*NOTREACHED*/
- 		    		break;
diff --git a/x11-toolkits/xview/files/patch-clients+olwmslave+Imakefile b/x11-toolkits/xview/files/patch-clients+olwmslave+Imakefile
index 96d73cc1f888..1512238f8cd2 100644
--- a/x11-toolkits/xview/files/patch-clients+olwmslave+Imakefile
+++ b/x11-toolkits/xview/files/patch-clients+olwmslave+Imakefile
@@ -1,6 +1,6 @@
---- ./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 = 	\
+--- clients/olwmslave/Imakefile.orig	2005-03-28 06:39:34.000000000 -0800
++++ clients/olwmslave/Imakefile	2012-02-02 15:27:33.050960289 -0800
+@@ -42,7 +42,7 @@
          mem.c \
          olwmslave.c \
          propsrecv.c \
@@ -9,11 +9,7 @@
  
  
  OBJS = 	\
-         cmdstream.o \
-         help_file.o \
--        helprecv.o \ 
-+        helprecv.o \
-         helpwin.o \
+@@ -53,7 +53,7 @@
          mem.o \
          olwmslave.o \
          propsrecv.o \
diff --git a/x11-toolkits/xview/files/patch-clients+olwmslave+helpwin.c b/x11-toolkits/xview/files/patch-clients+olwmslave+helpwin.c
deleted file mode 100644
index 7bc1ce80c6e7..000000000000
--- a/x11-toolkits/xview/files/patch-clients+olwmslave+helpwin.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- clients/olwmslave/helpwin.c.orig	1993-06-29 07:12:11.000000000 +0200
-+++ clients/olwmslave/helpwin.c	2007-08-03 15:23:23.000000000 +0200
-@@ -128,14 +128,15 @@
-  *	Local Forward Functions
-  * ---------------------------------------------------------------------*/
- int		ShowHelpWindow();
--void		InitHelpWindow();
--Bool		CreateHelpWindow();
--Notify_value	DestroyHelpWindow();
--void		ResetHelpWindow();
--Bool		TextHelpWindow();
--Bool		ImageHelpWindow();
--void		MoreHelp();
--void		ErrorNotice();
-+static void		InitHelpWindow();
-+static Bool		CreateHelpWindow();
-+static Notify_value	DestroyHelpWindow();
-+static void		ResetHelpWindow();
-+static Bool		TextHelpWindow();
-+static Bool		ImageHelpWindow();
-+static void		MoreHelp();
-+static void		ErrorNotice();
-+static int	ConstrainMousePos();
- 
- /* ----------------------------------------------------------------------
-  *	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+olwmslave.c b/x11-toolkits/xview/files/patch-clients+olwmslave+olwmslave.c
index dbe157b71903..b198ef07bee9 100644
--- a/x11-toolkits/xview/files/patch-clients+olwmslave+olwmslave.c
+++ b/x11-toolkits/xview/files/patch-clients+olwmslave+olwmslave.c
@@ -1,5 +1,5 @@
---- clients/olwmslave/olwmslave.c.orig	Sat Mar 25 22:35:19 2006
-+++ clients/olwmslave/olwmslave.c	Sat Mar 25 22:36:52 2006
+--- clients/olwmslave/olwmslave.c.orig	2012-02-07 19:28:02.625687577 -0800
++++ clients/olwmslave/olwmslave.c	2012-02-07 19:38:15.496241454 -0800
 @@ -44,9 +44,9 @@
  /* ----------------------------------------------------------------------
   *	Forward Definitions
@@ -13,3 +13,20 @@
  
  /* ----------------------------------------------------------------------
   * 	main
+@@ -73,13 +73,14 @@
+ 	if ((openwinDir = getenv("OPENWINHOME")) != 0)
+ 		(void)strcpy(localePath,openwinDir);
+ 	else
+-#ifndef OPENWINHOME_DEFAULT
++#define OPENWINHOME_DEFAULT	"/usr/local/lib/X11"
++#ifdef OPENWINHOME_DEFAULT
+ 		/* martin-2.buck@student.uni-ulm.de */
+ 		(void)strcpy(localePath,OPENWINHOME_DEFAULT);
+ #else
+ 		(void)strcpy(localePath,"/usr/share");
+ #endif
+-	(void)strcat(localePath,"/lib/locale");
++	(void)strcat(localePath,"/locale");
+ 	(void)bindtextdomain(domain,localePath);
+ 	textdomain(domain);
+ 	}
diff --git a/x11-toolkits/xview/files/patch-clients-Imakefile b/x11-toolkits/xview/files/patch-clients-Imakefile
new file mode 100644
index 000000000000..b15107fa1c2c
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-clients-Imakefile
@@ -0,0 +1,11 @@
+--- clients/Imakefile.orig	Mon Feb 21 19:10:20 2005
++++ clients/Imakefile	Mon Feb 21 19:10:28 2005
+@@ -9,7 +9,7 @@
+ 
+ SUBDIRS = clock cmdtool olwm olwmslave 
+ 
+-DIRS_TO_CREATE = $(SRC_DEST) 
++# DIRS_TO_CREATE = $(SRC_DEST) 
+ 
+ MakeSubdirs($(SUBDIRS))
+ DependSubdirs($(SUBDIRS))
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..8647c6fdc3b0
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-clients-olwm-screen.c
@@ -0,0 +1,50 @@
+--- clients/olwm/screen.c.orig	2005-03-28 06:39:46.000000000 -0800
++++ clients/olwm/screen.c	2012-02-07 18:53:41.460748331 -0800
+@@ -1518,7 +1518,6 @@
+ /*
+  * updateScreenWorkspaceColor -- change all GC/Ginfo's that use WorkspaceColor
+  */
+-static
+ updateScreenWorkspaceColor(dpy,scrInfo)
+ 	Display		*dpy;
+ 	ScreenInfo	*scrInfo;
+@@ -1540,7 +1539,6 @@
+ /*
+  * updateScreenWindowColor -- change all GC/Ginfo's that use WindowColor
+  */
+-static
+ updateScreenWindowColor(dpy,scrInfo)
+ 	Display		*dpy;
+ 	ScreenInfo	*scrInfo;
+@@ -1597,7 +1595,6 @@
+ /*
+  * updateScreenForegroundColor -- change all GC/Ginfo's that use Foreground
+  */
+-static
+ updateScreenForegroundColor(dpy,scrInfo)
+ 	Display		*dpy;
+ 	ScreenInfo	*scrInfo;
+@@ -1630,7 +1627,6 @@
+ /*
+  * updateScreenBackgroundColor -- change all GC/Ginfo's that use Background
+  */
+-static
+ updateScreenBackgroundColor(dpy,scrInfo)
+ 	Display		*dpy;
+ 	ScreenInfo	*scrInfo;
+@@ -1645,7 +1641,6 @@
+ /*
+  * updateScreenBorderColor -- change all GC/Ginfo's that use Border
+  */
+-static
+ updateScreenBorderColor(dpy,scrInfo)
+ 	Display		*dpy;
+ 	ScreenInfo	*scrInfo;
+@@ -1761,7 +1756,6 @@
+ /*
+  * updateScreenGlyphFont -- change all GC/Ginfo's that use GlyphFont
+  */
+-static
+ updateScreenGlyphFont(dpy,scrInfo)
+ 	Display		*dpy;
+ 	ScreenInfo	*scrInfo;
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..cb875f0d2006
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-clients-olwmslave-helpwin.c
@@ -0,0 +1,83 @@
+--- clients/olwmslave/helpwin.c.orig	2012-02-07 19:18:57.806432096 -0800
++++ clients/olwmslave/helpwin.c	2012-02-07 19:26:21.863976814 -0800
+@@ -186,7 +186,7 @@
+ /* ----------------------------------------------------------------------
+  *	InitHelpWindow		- Inits helpWinList array.
+  * ----------------------------------------------------------------------*/
+-static	void
++void
+ InitHelpWindow()
+ {
+ 	HelpWindow	*hw;
+@@ -215,7 +215,7 @@
+ /* ----------------------------------------------------------------------
+  *	CreateHelpWindow	- Creates the help window frame and etc.
+  * ----------------------------------------------------------------------*/
+-static 	Bool
++Bool
+ CreateHelpWindow(hw,helpkey)
+ 	HelpWindow	*hw;
+ 	char		*helpkey;
+@@ -325,7 +325,7 @@
+ /* ----------------------------------------------------------------------
+  *	ResetHelpWindow
+  * ---------------------------------------------------------------------*/
+-static	void
++void
+ ResetHelpWindow(hw)
+ 	HelpWindow	*hw;
+ {
+@@ -335,7 +335,7 @@
+ /* ----------------------------------------------------------------------
+  *	DestroyHelpWindow	- Destroy the help window
+  * ---------------------------------------------------------------------*/
+-static Notify_value
++Notify_value
+ DestroyHelpWindow(client,status)
+ 	Notify_client	client;
+ 	Destroy_status	status;
+@@ -361,7 +361,7 @@
+ /* ----------------------------------------------------------------------
+  *	TextHelpWindow		- Inserts the help text.
+  * ---------------------------------------------------------------------*/
+-static	Bool
++Bool
+ TextHelpWindow(hw,helpkey)
+ 	HelpWindow	*hw;
+ 	char		*helpkey;
+@@ -460,7 +460,7 @@
+ /* ----------------------------------------------------------------------
+  *	ImageHelpWindow
+  * ---------------------------------------------------------------------*/
+-static	Bool
++Bool
+ ImageHelpWindow(hw,mousex,mousey)
+ 	HelpWindow	*hw;
+ {
+@@ -500,7 +500,7 @@
+ /* ----------------------------------------------------------------------
+  *	ConstrainMousePos
+  * ---------------------------------------------------------------------*/
+-static int
++int
+ ConstrainMousePos(nscreen,mousex,mousey,imagex,imagey)
+ 	int		nscreen;
+ 	int		mousex,mousey;
+@@ -528,7 +528,7 @@
+  *	MoreHelp
+  * ---------------------------------------------------------------------*/
+ /*ARGSUSED*/
+-static void
++void
+ MoreHelp(item,event)
+ 	Panel_item	item;
+ 	Event		*event;
+@@ -547,7 +547,7 @@
+ /* ----------------------------------------------------------------------
+  *	ErrorNotice
+  * ---------------------------------------------------------------------*/
+-static	void
++void
+ ErrorNotice(nscreen,errmsg,helpkey)
+ 	int		nscreen;
+ 	char		*errmsg;
diff --git a/x11-toolkits/xview/files/patch-clients-props-l10n_read.c b/x11-toolkits/xview/files/patch-clients-props-l10n_read.c
new file mode 100644
index 000000000000..41b7b17e17a3
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-clients-props-l10n_read.c
@@ -0,0 +1,11 @@
+--- clients/props/l10n_read.c.orig	2012-02-07 19:44:47.873072262 -0800
++++ clients/props/l10n_read.c	2012-02-07 19:54:04.282770082 -0800
+@@ -25,7 +25,7 @@
+ #define	ITEM_SEPARATOR		';'
+ 
+ 
+-#if !defined(__linux__) && !defined(__CYGWIN__)
++#if !defined(__linux__) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
+ #ifndef ultrix
+ extern char	*malloc();
+ #endif
diff --git a/x11-toolkits/xview/files/patch-clients-textedit-textedit.c b/x11-toolkits/xview/files/patch-clients-textedit-textedit.c
new file mode 100644
index 000000000000..be7511c1cc1a
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-clients-textedit-textedit.c
@@ -0,0 +1,68 @@
+--- clients/textedit/textedit.c.orig	2012-02-07 19:59:37.568483244 -0800
++++ clients/textedit/textedit.c	2012-02-07 20:27:31.078772400 -0800
+@@ -12,7 +12,7 @@
+  */
+ 
+ #include <sys/param.h> /* MAXPATHLEN (include types.h if removed) */
+-#ifndef __CYGWIN__
++#if !defined(__CYGWIN__) && !defined(__FreeBSD__)
+ #include <sys/dir.h>   /* MAXNAMLEN */
+ #else
+ #include <dirent.h>
+@@ -45,7 +45,7 @@
+ long	textsw_store_file();
+ */
+ char	*getwd();
+-#if !defined(__linux__) && !defined(__CYGWIN__)
++#if !defined(__linux__) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
+ char *sprintf();
+ #endif
+ void	frame_cmdline_help();
+@@ -824,10 +824,10 @@
+ 	 * Setup signal handlers.
+ 	 */
+ 	(void)notify_set_signal_func(base_frame, mysigproc, SIGINT,  NOTIFY_ASYNC);
+-#if !(defined(__linux__) || defined(__CYGWIN__)) || defined(SIGXCPU)
++#if !(defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__)) || defined(SIGXCPU)
+ 	(void)notify_set_signal_func(base_frame, mysigproc, SIGXCPU, NOTIFY_ASYNC);
+ #endif
+-#if !(defined(__linux__) || defined(__CYGWIN__)) || defined(SIGBUS)
++#if !(defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__)) || defined(SIGBUS)
+ 	(void)notify_set_signal_func(base_frame, mysigproc, SIGBUS,  NOTIFY_ASYNC);
+ #endif
+ 	(void)notify_set_signal_func(base_frame, mysigproc, SIGHUP,  NOTIFY_ASYNC);
+@@ -915,7 +915,7 @@
+ 	char			 name_to_use[MAXNAMLEN];
+ 	int			 pid = getpid();
+ 	int			 was_SIGILL = (sig == SIGILL);
+-#if !defined(__linux__) && !defined(__CYGWIN__)
++#if !defined(__linux__) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
+ 	struct sigvec vec;
+ #else
+ 	struct sigaction vec;
+@@ -978,7 +978,7 @@
+ #ifndef lint
+ 	    char	dummy, *bad_ptr = 0;
+ 	    /* (void)signal(SIGSEGV, SIG_DFL);	/* Make sure 0 deref dumps. */
+-#if !defined(__linux__) && !defined(__CYGWIN__)
++#if !defined(__linux__) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
+ 	    vec.sv_handler = SIG_DFL;
+ 	    vec.sv_mask = vec.sv_onstack = 0;
+ 	    sigvec(SIGSEGV, &vec, 0);
+@@ -1001,7 +1001,7 @@
+ #endif
+ 	} else {
+ 	    /* (void)signal(SIGILL, SIG_DFL);	/* Make sure abort() dumps. */
+-#if !defined(__linux__) && !defined(__CYGWIN__)
++#if !defined(__linux__) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
+             vec.sv_handler = SIG_DFL; 
+ 	    vec.sv_mask = vec.sv_onstack = 0; 
+             sigvec(SIGILL, &vec, 0);
+@@ -1029,7 +1029,6 @@
+ /*
+  * Misc. utilities
+  */
+-static
+ die(msg1, msg2, msg3)
+ 	char	*msg1, *msg2, *msg3;
+ {
diff --git a/x11-toolkits/xview/files/patch-config+Imakefile b/x11-toolkits/xview/files/patch-config+Imakefile
deleted file mode 100644
index edebc61e0e0b..000000000000
--- a/x11-toolkits/xview/files/patch-config+Imakefile
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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
index 8f01db7e49b2..f08c3c3f1796 100644
--- a/x11-toolkits/xview/files/patch-config+XView.cf
+++ b/x11-toolkits/xview/files/patch-config+XView.cf
@@ -1,24 +1,15 @@
---- config/XView.cf.orig	Mon Jun 27 04:09:19 1994
-+++ config/XView.cf	Thu Oct  5 22:23:13 2006
-@@ -101,7 +101,7 @@
+--- config/XView.cf.orig	2005-03-28 06:40:20.000000000 -0800
++++ config/XView.cf	2012-02-02 15:36:32.989294630 -0800
+@@ -118,7 +118,7 @@
   *	the appropriate value.
   */
  #ifndef XVDestDir
--#define XVDestDir /usr/X11/xview
+-#define XVDestDir /usr/X11R6
 +#define XVDestDir /usr/local
  #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 
-@@ -162,7 +162,7 @@
+@@ -179,7 +179,7 @@
   *	These are unchanged from X.V11R4 and the XView 2 release.
   */
  #ifndef InstallOpenLookFonts
@@ -27,30 +18,12 @@
  #endif
  /*
   *	If you want to install the private header files, set below value to
-@@ -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
- 
- /*
+@@ -223,6 +223,8 @@
+ #   endif
+ #  elif defined __CYGWIN__
+ #    define LibXViewDefines -I$(OPENWINHOME)/include -DX11R6 -Di386 -DNO_CAST_VATOAV
++#  elif defined __FreeBSD__
++#   define LibXViewDefines -I$(OPENWINHOME)/include -DSUNOS41 -DX11R6
+ #  else
+ #   define LibXViewDefines -DFULL_R5 -I$(OPENWINHOME)/include -DSUNOS41 -DX11R6
+ #  endif
diff --git a/x11-toolkits/xview/files/patch-config+XView.obj b/x11-toolkits/xview/files/patch-config+XView.obj
index db1ce5e8c366..8ce1408dabef 100644
--- a/x11-toolkits/xview/files/patch-config+XView.obj
+++ b/x11-toolkits/xview/files/patch-config+XView.obj
@@ -1,5 +1,5 @@
---- config/XView.obj.orig	Tue Sep 30 23:10:16 2003
-+++ config/XView.obj	Tue Sep 30 23:10:16 2003
+--- config/XView.obj.orig	2005-03-28 06:40:20.000000000 -0800
++++ config/XView.obj	2012-02-02 15:45:32.687556002 -0800
 @@ -15,7 +15,7 @@
              STD_DEFINES = StandardDefines LibXViewDefines 
  #endif
@@ -9,20 +9,7 @@
  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 @@
+@@ -99,14 +99,14 @@
  
  #if SubdirHasPublicHeaders
  # if NotLibXView
@@ -30,8 +17,7 @@
 +BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),.)
  
  install::
--	$(MKDIRHIER) $(PUB_HEADER_DEST)
-+	$(MKDIRHIER) $(DESTDIR)$(PUB_HEADER_DEST)
+ 	$(MKDIRHIER) $(DESTDIR)$(PUB_HEADER_DEST)
  
  InstallMultiple($(HDRSPUBLIC),$(PUB_HEADER_DEST))
  # else
@@ -39,12 +25,8 @@
 +BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),.)
  
  install::
--	$(MKDIRHIER) $(XVPUB_HEADER_DEST)
-+	$(MKDIRHIER) $(DESTDIR)$(XVPUB_HEADER_DEST)
- 
- InstallMultiple($(HDRSPUBLIC),$(XVPUB_HEADER_DEST))
- # endif
-@@ -103,19 +104,19 @@
+ 	$(MKDIRHIER) $(DESTDIR)$(XVPUB_HEADER_DEST)
+@@ -117,9 +117,9 @@
  
  #if SubdirHasPrivateHeaders
  # if NotLibXView
@@ -56,15 +38,3 @@
  # 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
index 0c0fddf9f210..8bbc4f612506 100644
--- a/x11-toolkits/xview/files/patch-config+XView.rules
+++ b/x11-toolkits/xview/files/patch-config+XView.rules
@@ -1,6 +1,6 @@
---- 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 						@@\
+--- config/XView.rules.orig	2005-03-28 06:40:20.000000000 -0800
++++ config/XView.rules	2012-02-02 15:51:23.012928640 -0800
+@@ -229,7 +229,7 @@
  	$(RM) $@~ sodir/lib/**/libname.so.xs.o				@@\
  	@if [ -f xstrings ]; then \                                     @@\
          	$(RM) strings; $(CP) xstrings strings; fi               @@\
@@ -9,7 +9,7 @@
  	-@if [ -f strings~ ]; then $(RM) strings~; else exit 0; fi	@@\
  	$(RM) $@  							@@\
  	$(MV) $@~ $@							@@\
-@@ -175,7 +175,8 @@ lib/**/libname.so.rev:: solist 						@@\
+@@ -265,7 +265,8 @@
  	@if [ -f xstrings ]; then \                                     @@\
          	$(RM) strings; $(CP) xstrings strings; fi               @@\
  	-@if [ ! -x objsort ];then $(CHMOD) 755 objsort;else exit 0;fi	@@\
@@ -18,16 +18,16 @@
 +		$(SHLIBLDFLAGS) 					@@\
  	@if [ -f strings~ ]; then $(RM) strings~; else exit 0; fi	@@\
  	$(RM) $@  							@@\
- 	$(MV) $@~ $@							@@\ 
-@@ -366,9 +366,9 @@
- #ifndef InstallSharedLibraryNoBuild
- #define	InstallSharedLibraryNoBuild(libname,rev,dest)				@@\
+ 	$(MV) $@~ $@							@@\
+@@ -557,9 +558,9 @@
+ #else /* __linux__ */
+ #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)
+-	$(RM) $(DESTDIR)dest/lib/**/libname.so				@@\
++	$(RM) /dest/lib/**/libname.so					@@\
+ 	$(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.so.rev $(DESTDIR)dest @@\
+-	(cd $(DESTDIR)dest && $(LN) lib/**/libname.so.rev lib/**/libname.so) @@\
 +	(cd dest; $(LN) lib/**/libname.so.rev lib/**/libname.so)
  
- #endif
- 
+ #endif /* !__linux__ */
+ #endif /* InstallSharedLibraryNoBuild */
diff --git a/x11-toolkits/xview/files/patch-config+XView.tmpl b/x11-toolkits/xview/files/patch-config+XView.tmpl
index 998f9bf085bd..8463aa04bdd0 100644
--- a/x11-toolkits/xview/files/patch-config+XView.tmpl
+++ b/x11-toolkits/xview/files/patch-config+XView.tmpl
@@ -1,27 +1,29 @@
---- config/XView.tmpl.orig	2010-04-07 10:28:25.000000000 +0900
-+++ config/XView.tmpl	2010-04-07 10:35:36.000000000 +0900
-@@ -96,11 +96,13 @@
-  *      Work around small conflict with Project.tmpl file
+--- config/XView.tmpl.orig	2012-02-03 13:15:49.992408249 -0800
++++ config/XView.tmpl	2012-02-03 13:17:45.694502291 -0800
+@@ -97,12 +97,14 @@
   */
+ #if !defined(__linux__) && !defined(__CYGWIN__)
  #if UseInstalled
--              MKDIRHIER = BourneShell BinDir/mkdirhier
-+              MKDIRHIER = mkdirhier
+-            MKDIRHIER = BourneShell BinDir/mkdirhier
++            MKDIRHIER = mkdirhier
+ #endif
  #endif
  
  #if OsHasLocale
--         LOCALE_DEFINES = -DOS_HAS_LOCALE
-+         LOCALE_DEFINES = -DOS_HAS_LOCALE -DCOMPAT_43TTY
+-            LOCALE_DEFINES = -DOS_HAS_LOCALE
++            LOCALE_DEFINES = -DOS_HAS_LOCALE -DCOMPAT_43TTY
 +#else
-+         LOCALE_DEFINES = -DCOMPAT_43TTY
++            LOCALE_DEFINES = -DCOMPAT_43TTY
  #endif
  
  #if OsHasMmap
-@@ -192,14 +194,6 @@
+@@ -194,15 +196,6 @@
                       AS = as
   */
  /*
 - *	use the same trick X11R5 does for defining rules for installed libs
 - */
+-#undef _Use
 -#ifdef UseInstalled
 -#define _Use(a,b) a
 -#else
@@ -31,7 +33,7 @@
   *	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 +218,7 @@
+@@ -227,7 +220,7 @@
   *	afterwards.
   */
  #ifndef XVIncludeDirName
@@ -40,53 +42,36 @@
  #endif
                   INCDIR = XVIncludeDirName
  /*
-@@ -356,10 +350,10 @@
- 
- #if SystemV4
-              SYSV_CLIENT_LIB = -lintl -ldl
--	     XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
-+             XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
+@@ -332,7 +325,7 @@
+ #ifdef __CYGWIN__
+             DEPXVIEWLIB = -lrpc
  #else
-              SYSV_CLIENT_LIB =
--	     XVCLIENTSYSDEFINES = -DSUNOS41
-+             XVCLIENTSYSDEFINES = -DSUNOS41
+-	    DEPXVIEWLIB =
++            DEPXVIEWLIB =
  #endif
- 
- /*
-@@ -371,16 +365,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
+                XVIEWLIB = -L$(LIBRARY_DEST) -lxview
  #else
--	XVCLIENTI18NDEFINES = -DOW_I18N_L3
--	XVCLIENTMISCLIB = 
--	XVCLIENTINCLUDES = 
-+        XVCLIENTI18NDEFINES = -DOW_I18N_L3
-+        XVCLIENTMISCLIB = 
-+        XVCLIENTINCLUDES = 
+@@ -393,8 +386,8 @@
+              XVCLIENTINCLUDES = -I$(OPENWINHOME)/include
+ #else
+              XVCLIENTI18NDEFINES = -DOW_I18N_L3
+-             XVCLIENTMISCLIB = 
+-             XVCLIENTINCLUDES = 
++             XVCLIENTMISCLIB =
++             XVCLIENTINCLUDES =
  #endif
  
--	XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
-+        XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
- 
- /*
-  *	Define libraries for XView clients
-@@ -410,7 +404,7 @@
-  */
- #if SharedLibXView
- # ifndef SharedXViewRev
+              XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
+@@ -430,7 +423,7 @@
+ #if defined __linux__ || defined __CYGWIN__
+ #define SharedXViewRev 3.2.4
+ #else
 -#if SystemV4
 +#if SystemV4 || UseElfFormat
  # define SharedXViewRev 3
  #else
  # define SharedXViewRev 3.2
-@@ -449,12 +443,8 @@
+@@ -470,12 +463,8 @@
   *	Include the XView specific makefile macros.
   */
  
diff --git a/x11-toolkits/xview/files/patch-doc+Imakefile b/x11-toolkits/xview/files/patch-doc+Imakefile
index 20f86b189bb3..91ae6d4f5fbf 100644
--- a/x11-toolkits/xview/files/patch-doc+Imakefile
+++ b/x11-toolkits/xview/files/patch-doc+Imakefile
@@ -1,10 +1,10 @@
---- doc/Imakefile.orig	Mon Sep 29 00:02:17 2003
-+++ doc/Imakefile	Mon Sep 29 00:02:17 2003
+--- doc/Imakefile.orig	2005-03-28 06:39:49.000000000 -0800
++++ doc/Imakefile	2012-02-02 16:01:48.522525809 -0800
 @@ -17,7 +17,7 @@
  ALLFILES = $(DOCFILES)
  
  install::
--        $(MKDIRHIER) $(DOC_DEST)
+-	$(MKDIRHIER) $(DESTDIR)$(DOC_DEST)
 +	$(MKDIRHIER) $(DOC_DEST)
  
  InstallNonExecList($(DOCFILES),$(DOC_DEST))
diff --git a/x11-toolkits/xview/files/patch-images+Imakefile b/x11-toolkits/xview/files/patch-images+Imakefile
index e496fb5f520d..63d83bf11abc 100644
--- a/x11-toolkits/xview/files/patch-images+Imakefile
+++ b/x11-toolkits/xview/files/patch-images+Imakefile
@@ -1,14 +1,11 @@
---- images/Imakefile.orig	Mon Sep 29 00:02:43 2003
-+++ images/Imakefile	Mon Sep 29 00:02:40 2003
-@@ -99,9 +99,9 @@
+--- images/Imakefile.orig	2005-03-28 06:40:19.000000000 -0800
++++ images/Imakefile	2012-02-02 16:03:14.473867390 -0800
+@@ -101,7 +101,7 @@
  
- ALLFILES = $(BITMAPS) $(ICONS) $(PIXRECTS) $(CURSORS) $(IMAGES)
- 
--all: $(SRCS)
-+all:: $(SRCS)
+ all:: $(SRCS)
  
 -BuildIncludes($(INCLUDES_SRCS),$(IMAGE_INCDIR),/**/)
 +BuildIncludes($(INCLUDES_SRCS),$(IMAGE_INCDIR),.)
  
  install:: $(SRCS)
- 	$(MKDIRHIER) $(HEADER_DEST)/$(IMAGEINC)
+ 	$(MKDIRHIER) $(DESTDIR)$(HEADER_DEST)/$(IMAGEINC)
diff --git a/x11-toolkits/xview/files/patch-lib+libolgx+ol_button.c b/x11-toolkits/xview/files/patch-lib+libolgx+ol_button.c
deleted file mode 100644
index d4e0b87ffb83..000000000000
--- a/x11-toolkits/xview/files/patch-lib+libolgx+ol_button.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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
deleted file mode 100644
index 85912f5942a9..000000000000
--- a/x11-toolkits/xview/files/patch-lib+libolgx+ol_init.c
+++ /dev/null
@@ -1,62 +0,0 @@
---- 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+libxview+attr+attr.c b/x11-toolkits/xview/files/patch-lib+libxview+attr+attr.c
index e5f00d68783a..788550bc519a 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+attr+attr.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+attr+attr.c
@@ -1,15 +1,11 @@
---- lib/libxview/attr/attr.c.orig	Wed May  5 15:36:36 2004
-+++ lib/libxview/attr/attr.c	Wed May  5 15:37:13 2004
-@@ -91,7 +91,12 @@
+--- lib/libxview/attr/attr.c.orig	2005-03-28 06:41:03.000000000 -0800
++++ lib/libxview/attr/attr.c	2012-02-02 16:15:04.864763999 -0800
+@@ -91,7 +91,7 @@
     /* These two variables are used instead of the paramters so that the
        position in the lists is maintained after a recursive call. 
     */
-+
-+#ifdef __amd64__
-+   va_copy(valist,valist1);
-+#else
+-#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
++#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || __amd64__
+    __va_copy(valist, valist1);
+ #else
     valist = valist1;
-+#endif
-    avlist = avlist1;
- 
-    if( !avlist )
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+base+Imakefile b/x11-toolkits/xview/files/patch-lib+libxview+base+Imakefile
deleted file mode 100644
index 2d733d87152a..000000000000
--- a/x11-toolkits/xview/files/patch-lib+libxview+base+Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
index 8ec5005c772c..fb1b4459c326 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+base+base.h
+++ b/x11-toolkits/xview/files/patch-lib+libxview+base+base.h
@@ -1,5 +1,5 @@
---- 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
+--- lib/libxview/base/base.h.orig	2005-03-28 06:41:49.000000000 -0800
++++ lib/libxview/base/base.h	2012-02-02 16:19:48.679145715 -0800
 @@ -6,10 +6,15 @@
   *	file for terms of the license.
   */
@@ -19,7 +19,7 @@
 @@ -54,10 +59,12 @@
   * non-SVR4 systems.
   */
- #ifndef SUNOS41
+ #if !defined(SUNOS41) && !defined(__linux__) && !defined(__CYGWIN__)
 +#if !(defined(BSD) && (BSD >= 199103))
  #define XV_OS_SVR4
 -#define XV_USE_TTCOMPAT
@@ -28,5 +28,5 @@
 +#endif
 +#define XV_USE_TTCOMPAT
  #define XV_USE_XVFCNTL 
- #endif
-  
+ #elif defined(__linux__)
+ #define XV_OS_SVR4
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+base+xv.c b/x11-toolkits/xview/files/patch-lib+libxview+base+xv.c
index f47fdcb7391b..5fd1e7e3c68b 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+base+xv.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+base+xv.c
@@ -1,26 +1,20 @@
---- lib/libxview/base/xv.c.orig	Wed May  5 15:38:10 2004
-+++ lib/libxview/base/xv.c	Wed May  5 15:40:31 2004
-@@ -556,7 +556,11 @@
+--- lib/libxview/base/xv.c.orig	2005-03-28 06:41:49.000000000 -0800
++++ lib/libxview/base/xv.c	2012-02-02 16:22:12.711340868 -0800
+@@ -556,7 +556,7 @@
  	case XV_KEY_DATA:
  	case XV_IS_SUBTYPE_OF:
  	    status = XV_OK;
-+#ifdef __amd64__
-+	    va_copy(args,args_save);
-+#else
+-#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
++#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || __amd64__
+ 	    __va_copy(args, args_save);
+ #else
  	    args = args_save;
-+#endif
- 	    result = generic_get(object, &status, (Attr_attribute) attr, args);
- 	    va_end(args);
- 	    return result;
-@@ -575,7 +579,11 @@
+@@ -579,7 +579,7 @@
  	 * Go to the beginning of the varargs list every time to insure each
           * pkg gets the start of the  varargs.
  	 */
-+#ifdef __amd64__
-+        va_copy(args,args_save);
-+#else
+-#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
++#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || __amd64__
+ 	__va_copy(args, args_save);
+ #else
          args = args_save;
-+#endif
- 
- 	/* ask the object to handle the get */
- 	result = (*(pkg->get)) (object, &status, (Attr_attribute) attr, args);
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
index a550c9f588be..f0a4c760d18e 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+base+xv_debug.h
+++ b/x11-toolkits/xview/files/patch-lib+libxview+base+xv_debug.h
@@ -1,20 +1,17 @@
---- ./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
+--- lib/libxview/base/xv_debug.h.orig	2005-03-28 06:41:49.000000000 -0800
++++ lib/libxview/base/xv_debug.h	2012-02-02 16:34:28.232644833 -0800
+@@ -11,9 +11,14 @@
  
+ #ifndef FILE
+ #if !defined(SVR4) && !defined(__linux__)
 +#ifdef NULL
-+#undef NULL
+ #undef NULL
 +#endif
- #ifndef FILE
- #ifndef SVR4
--#undef NULL
- #endif SVR4
+ #endif /* SVR4 */
  #include <stdio.h>
 +#ifndef NULL
 +#define NULL 0
 +#endif
- #endif FILE
+ #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
index 1926246578c5..3ba0d008b4c2 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+base+xv_error.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+base+xv_error.c
@@ -1,6 +1,6 @@
---- 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 @@
+--- lib/libxview/base/xv_error.c.orig	2005-03-28 06:41:48.000000000 -0800
++++ lib/libxview/base/xv_error.c	2012-02-02 16:41:03.978724572 -0800
+@@ -11,6 +11,7 @@
   */
  
  #include <stdio.h>
@@ -8,20 +8,21 @@
  #include <xview/pkg_public.h>
  #include <X11/Xlib.h>
  #include <xview_private/i18n_impl.h>
- #include <xview_private/portable.h>
- 
+@@ -21,12 +22,15 @@
+ #include <errno.h>
+ #else
  /* 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;
+ #endif
  
--Xv_private_data char *xv_app_name;
-+extern Xv_private_data char *xv_app_name;
- Xv_private int (*xv_error_proc) ();
- 
- /*
+-#if !defined(__linux__) && !defined(__CYGWIN__)
++#if !defined(__linux__) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
+ /* Global already defined in xv_init.c */
+ Xv_private_data char *xv_app_name;
+ #else
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+base+xv_parse.c b/x11-toolkits/xview/files/patch-lib+libxview+base+xv_parse.c
deleted file mode 100644
index 53952e100420..000000000000
--- a/x11-toolkits/xview/files/patch-lib+libxview+base+xv_parse.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- lib/libxview/base/xv_parse.c~	2005-01-15 17:11:54.000000000 +0100
-+++ lib/libxview/base/xv_parse.c	2005-01-15 17:20:23.000000000 +0100
-@@ -312,7 +312,7 @@ xv_parse_one(app_name, argc, argv)
-     if (argc <= slot->num_args) {
- 	char            dummy[128];
- 
--	(void) sprintf(dummy, 
-+	(void) snprintf(dummy, sizeof(dummy),
- 			XV_MSG("%s: missing argument after %s"), 
- 			app_name,
- 		       argv[0]);
-@@ -392,7 +392,7 @@ xv_parse_one(app_name, argc, argv)
- 	if (defaults_lookup(argv[1], known_scales) == -1) {
- 		char dummy[1024];
- 		
--		(void) sprintf(dummy, 
-+		(void) snprintf(dummy, sizeof(dummy),
- 			XV_MSG("%s: unknown scale \"%s\" used with %s option"),
- 			       app_name, argv[1], argv[0]);
- 		xv_error(XV_NULL,
-@@ -611,7 +611,7 @@ NegArg:
-     {
- 	char            dummy[128];
- 
--	(void) sprintf(dummy, 
-+	(void) snprintf(dummy, sizeof(dummy),
- 		XV_MSG("%s: can't have negative argument %s after %s"),
- 		       app_name, argv[bad_arg], argv[0]);
- 	xv_error(XV_NULL,
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+color+cms_pblc.c b/x11-toolkits/xview/files/patch-lib+libxview+color+cms_pblc.c
index b930c5b81759..d6ac5606d69a 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+color+cms_pblc.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+color+cms_pblc.c
@@ -1,11 +1,12 @@
---- 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);
-     Xv_opaque		value;
--    Attr_avlist     	avlist = (Attr_avlist) args;
-+    Attr_avlist     	avlist;
+--- lib/libxview/color/cms_pblc.c.orig	2005-03-28 06:41:05.000000000 -0800
++++ lib/libxview/color/cms_pblc.c	2012-02-02 16:47:45.624915917 -0800
+@@ -319,9 +319,12 @@
+ /* Alpha compatibility, mbuck@debian.org */
+ #if 0
+     Attr_avlist     	avlist = (Attr_avlist) args;
++#else
++    Attr_avlist       avlist;
+ #endif
      int			cms_status = 0;
  
 +    MAKE_AVLIST(args, avlist);
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+defaults+defaults.c b/x11-toolkits/xview/files/patch-lib+libxview+defaults+defaults.c
index 2e2e774e10fc..94d18fd41964 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+defaults+defaults.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+defaults+defaults.c
@@ -1,14 +1,12 @@
---- 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 @@
+--- lib/libxview/defaults/defaults.c.orig	2005-03-28 06:41:45.000000000 -0800
++++ lib/libxview/defaults/defaults.c	2012-02-02 16:50:29.447421571 -0800
+@@ -24,8 +24,7 @@
  #include <xview/server.h>
  #endif
  #include <xview/xv_error.h>
+-/* mbuck@debian.org */
+-#if 1
 +#ifdef X11R6
-+#include <X11/Xlibint.h>
-+#else
+ #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+site.c b/x11-toolkits/xview/files/patch-lib+libxview+dnd+site.c
index 28b50d410b05..9af267dbb60b 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+dnd+site.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+dnd+site.c
@@ -1,22 +1,19 @@
---- ./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
+--- lib/libxview/dnd/site.c.orig	2005-03-28 06:41:43.000000000 -0800
++++ lib/libxview/dnd/site.c	2012-02-02 16:53:57.650628403 -0800
+@@ -19,6 +19,7 @@
  #ifdef SVR4 
  #include <stdlib.h> 
- #endif SVR4
+ #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)
+@@ -245,6 +246,8 @@
+           /* This will probably not work right, but it compiles. */
            /* (rectNode->rect) is of the wrong type. */
            memmove(rect, &(rectNode->rect),  sizeof(Rect));
- #else
-+#if (defined(BSD) && (BSD >= 199103))
++#elif (defined(BSD) && (BSD >= 199103))
 +	  bcopy(&(rectNode->rect), rect, sizeof(Rect));
-+#else
+ #else
  	  bcopy(rectNode->rect, rect, sizeof(Rect));
-+#endif
- #endif SVR4
- 
- 	  return((Xv_opaque)rect);
+ #endif /* SVR4 */
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+file_chooser+Imakefile b/x11-toolkits/xview/files/patch-lib+libxview+file_chooser+Imakefile
deleted file mode 100644
index 7862751ba757..000000000000
--- a/x11-toolkits/xview/files/patch-lib+libxview+file_chooser+Imakefile
+++ /dev/null
@@ -1,55 +0,0 @@
---- ./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
deleted file mode 100644
index 636bacfe5134..000000000000
--- a/x11-toolkits/xview/files/patch-lib+libxview+file_chooser+fc_layout.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./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
index 386f16538a39..1e422eb6f76e 100644
--- 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
@@ -1,5 +1,5 @@
---- lib/libxview/file_chooser/file_list.c.orig	Thu Oct  5 18:21:11 2006
-+++ lib/libxview/file_chooser/file_list.c	Thu Oct  5 18:43:18 2006
+--- lib/libxview/file_chooser/file_list.c.orig	2005-03-28 06:40:42.000000000 -0800
++++ lib/libxview/file_chooser/file_list.c	2012-02-02 17:05:39.791400764 -0800
 @@ -23,6 +23,9 @@
  #include <xview_private/flist_impl.h>
  #include <xview_private/portable.h>
@@ -18,28 +18,26 @@
  
  #if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)
  static void	flist_error(File_list_private *private, char *format, ...);
-@@ -521,7 +525,11 @@
-     if (status == DESTROY_CLEANUP) {
- 	xv_free_ref( private->directory );
- 	xv_free_ref( private->regex_pattern );
-+#ifndef __FreeBSD__
- 	xv_free_ref( private->regex_compile );
+@@ -530,7 +534,11 @@
+ 	if (private->regex_compile != NULL && private->regex_compile->allocated)
+ 		xv_free_ref( private->regex_compile->buffer);
+ #endif
++#ifdef __FreeBSD__
++        xv_free_regex_t( private->regex_compile );
 +#else
-+	xv_free_regex_t( private->regex_compile );
+ 	xv_free_ref( private->regex_compile );
 +#endif
  	xv_free_ref( private->dotdot_string );
  	if ( private->dir_ptr )
  	    (void) closedir( private->dir_ptr );
-@@ -1174,14 +1182,16 @@
+@@ -1184,12 +1192,15 @@
  static int 	step();
- #endif
+ #endif /* SVR4 */
  
--
 +#ifndef __FreeBSD__
  #include <regexp.h>
 +#endif
  
- 
  static void
  flist_compile_regex( private )
       File_list_private *private;
@@ -48,7 +46,7 @@
      char compile_buf[MAXPATHLEN+1];
      char *end_ptr;
      size_t num_bytes;
-@@ -1197,6 +1207,17 @@
+@@ -1205,6 +1216,17 @@
      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);
@@ -66,7 +64,7 @@
  } 
  
  
-@@ -1205,7 +1226,11 @@
+@@ -1213,7 +1235,11 @@
       char *s;
       File_list_private *private;
  {
@@ -77,4 +75,4 @@
 +#endif
  }
  
- /****************************************************************************/
+ #else /* __linux__ */
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+filter+filter.c b/x11-toolkits/xview/files/patch-lib+libxview+filter+filter.c
deleted file mode 100644
index 57d8ec9dbc2d..000000000000
--- a/x11-toolkits/xview/files/patch-lib+libxview+filter+filter.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- ./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_get.c b/x11-toolkits/xview/files/patch-lib+libxview+font+font_get.c
index 513256b9fcb8..e5e8bd08390a 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+font+font_get.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+font+font_get.c
@@ -1,13 +1,14 @@
---- lib/libxview/font/font_get.c.orig	Tue Jun 29 14:15:00 1993
-+++ lib/libxview/font/font_get.c	Sat Jan  9 23:35:51 1999
-@@ -43,7 +43,9 @@
-     XFontStruct		*x_font_info = (XFontStruct *)font->x_font_info;
-     Xv_opaque       v;
-     int             attr_is_char_width = 0;
--    Attr_avlist     avlist = (Attr_avlist) args;
+--- lib/libxview/font/font_get.c.orig	2005-03-28 06:41:44.000000000 -0800
++++ lib/libxview/font/font_get.c	2012-02-02 17:10:02.725435117 -0800
+@@ -47,6 +47,11 @@
+ #if 0
+     Attr_avlist     avlist = (Attr_avlist) args;
+ #endif
++#ifdef __FreeBSD__
 +    Attr_avlist     avlist;
 +
 +    MAKE_AVLIST(args, avlist);
++#endif
  
  #ifdef OW_I18N
      if (font->type == FONT_TYPE_TEXT)  {
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
deleted file mode 100644
index 16dd860e29ce..000000000000
--- a/x11-toolkits/xview/files/patch-lib+libxview+font+font_x.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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_impl.h b/x11-toolkits/xview/files/patch-lib+libxview+frame+fm_impl.h
index e3eff1fa594c..ecad58598829 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+frame+fm_impl.h
+++ b/x11-toolkits/xview/files/patch-lib+libxview+frame+fm_impl.h
@@ -1,23 +1,17 @@
---- 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
- 
+--- lib/libxview/frame/fm_impl.h.orig	2005-03-28 06:41:27.000000000 -0800
++++ lib/libxview/frame/fm_impl.h	2012-02-02 17:15:19.460301420 -0800
+@@ -19,9 +19,14 @@
  /* standard includes */
+ #ifndef FILE
+ #if !defined(SVR4) && !defined(__linux__) && !defined(__CYGWIN__)
 +#ifdef NULL
-+#undef NULL
+ #undef NULL
 +#endif
- #ifndef FILE
- #ifndef SVR4
--#undef NULL
--#endif SVR4
-+#endif /* SVR4 */
+ #endif /* SVR4 */
  #include <stdio.h>
--#endif FILE
 +#ifndef NULL
 +#define NULL 0
 +#endif
-+#endif /* FILE */
+ #endif /* FILE */
  #include <sys/time.h>
  #ifdef OW_I18N
- #endif /* OW_I18N */
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+frame+fm_input.c b/x11-toolkits/xview/files/patch-lib+libxview+frame+fm_input.c
deleted file mode 100644
index fe1a90c03f1b..000000000000
--- a/x11-toolkits/xview/files/patch-lib+libxview+frame+fm_input.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/libxview/frame/fm_input.c.orig	Sat Mar 25 23:39:23 2006
-+++ lib/libxview/frame/fm_input.c	Sat Mar 25 23:42:06 2006
-@@ -359,6 +359,7 @@
-  */
- Xv_private	void
- frame_set_accept_default_focus(frame_public, flag)
-+	Frame frame_public;
- {
-     Frame_class_info *frame = FRAME_CLASS_PRIVATE(frame_public);
- 
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
index 579e83619afb..c42999a16af9 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+frame+fm_props.h
+++ b/x11-toolkits/xview/files/patch-lib+libxview+frame+fm_props.h
@@ -1,20 +1,17 @@
---- ./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
- 
+--- lib/libxview/frame/fm_props.h.orig	2005-03-28 06:41:27.000000000 -0800
++++ lib/libxview/frame/fm_props.h	2012-02-02 17:18:57.633679042 -0800
+@@ -15,9 +15,14 @@
  /* standard includes */
+ #ifndef FILE
+ #if !defined(SVR4) && !defined(__linux__) && !defined(__CYGWIN__)
 +#ifdef NULL
-+#undef NULL
+ #undef NULL
 +#endif
- #ifndef FILE
- #ifndef SVR4
--#undef NULL
- #endif SVR4
+ #endif /* SVR4 */
  #include <stdio.h>
 +#ifndef NULL
 +#define NULL 0
 +#endif
- #endif FILE
+ #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
index 5d13c594d60f..0721f17c7213 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+frame+fm_rescale.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+frame+fm_rescale.c
@@ -1,11 +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
+--- lib/libxview/frame/fm_rescale.c.orig	2005-03-28 06:41:27.000000000 -0800
++++ lib/libxview/frame/fm_rescale.c	2012-02-02 17:20:51.135422700 -0800
 @@ -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); */
+-#if !defined(__linux__) && !defined(__CYGWIN__)
++#if !defined(__linux__) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
+     xv_set(frame_public, WIN_RECT, 0); /* This looks like a XView bug to me */
+ #endif
  
- 
-     /*
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
index c9ed3d075615..93f62ad77882 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+frame+frame_base.h
+++ b/x11-toolkits/xview/files/patch-lib+libxview+frame+frame_base.h
@@ -1,20 +1,17 @@
---- ./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
- 
+--- lib/libxview/frame/frame_base.h.orig	2005-03-28 06:41:27.000000000 -0800
++++ lib/libxview/frame/frame_base.h	2012-02-03 13:42:33.820547288 -0800
+@@ -19,9 +19,14 @@
  /* standard includes */
+ #ifndef FILE
+ #if !defined(SVR4) && !defined(__linux__) && !defined(__CYGWIN__)
 +#ifdef NULL
-+#undef NULL
+ #undef NULL
 +#endif
- #ifndef FILE
- #ifndef SVR4
--#undef NULL
- #endif SVR4
+ #endif /* SVR4 */
  #include <stdio.h>
 +#ifndef NULL
 +#define NULL 0
 +#endif
- #endif FILE
+ #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
index 293434b379af..f291e028cf83 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+frame+frame_cmd.h
+++ b/x11-toolkits/xview/files/patch-lib+libxview+frame+frame_cmd.h
@@ -1,20 +1,17 @@
---- ./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
- 
+--- lib/libxview/frame/frame_cmd.h.orig	2005-03-28 06:41:27.000000000 -0800
++++ lib/libxview/frame/frame_cmd.h	2012-02-02 17:25:53.470077244 -0800
+@@ -19,9 +19,14 @@
  /* standard includes */
+ #ifndef FILE
+ #if !defined(SVR4) && !defined(__linux__) && !defined(__CYGWIN__)
 +#ifdef NULL
-+#undef NULL
+ #undef NULL
 +#endif
- #ifndef FILE
- #ifndef SVR4
--#undef NULL
- #endif SVR4
+ #endif /* SVR4 */
  #include <stdio.h>
 +#ifndef NULL
 +#define NULL 0
 +#endif
- #endif FILE
+ #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
index aa59b32f7d77..3f306feda748 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+frame+frame_help.h
+++ b/x11-toolkits/xview/files/patch-lib+libxview+frame+frame_help.h
@@ -1,20 +1,17 @@
---- ./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
- 
+--- lib/libxview/frame/frame_help.h.orig	2005-03-28 06:41:27.000000000 -0800
++++ lib/libxview/frame/frame_help.h	2012-02-02 17:27:52.211890239 -0800
+@@ -19,9 +19,14 @@
  /* standard includes */
+ #ifndef FILE
+ #if !defined(SVR4) && !defined(__linux__) && !defined(__CYGWIN__)
 +#ifdef NULL
-+#undef  NULL
+ #undef NULL
 +#endif
- #ifndef FILE
- #ifndef SVR4
--#undef NULL
- #endif SVR4
+ #endif /* SVR4 */
  #include <stdio.h>
 +#ifndef NULL
 +#define NULL 0
 +#endif
- #endif FILE
+ #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
deleted file mode 100644
index 4cdfabaaf146..000000000000
--- a/x11-toolkits/xview/files/patch-lib+libxview+icon+icon.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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+menu+Imakefile b/x11-toolkits/xview/files/patch-lib+libxview+menu+Imakefile
deleted file mode 100644
index a0b38dbd33e3..000000000000
--- a/x11-toolkits/xview/files/patch-lib+libxview+menu+Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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
deleted file mode 100644
index b011632db190..000000000000
--- a/x11-toolkits/xview/files/patch-lib+libxview+menu+om_render.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./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+misc+Imakefile b/x11-toolkits/xview/files/patch-lib+libxview+misc+Imakefile
deleted file mode 100644
index a918e6439e98..000000000000
--- a/x11-toolkits/xview/files/patch-lib+libxview+misc+Imakefile
+++ /dev/null
@@ -1,58 +0,0 @@
---- 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
index 528c2b720888..98efb48cdc55 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+misc+expandname.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+misc+expandname.c
@@ -1,28 +1,12 @@
---- lib/libxview/misc/expandname.c.orig	Tue Jun 29 07:16:30 1993
-+++ lib/libxview/misc/expandname.c	Fri Aug 19 15:53:44 2005
-@@ -21,15 +21,6 @@
- #include <sys/wait.h>
- #include <stdio.h>
- #include <string.h>
--#include <sgtty.h>
--
--#ifdef sparc
--#ifdef SVR4
--#include <unistd.h>
--#else
--#include <vfork.h>
--#endif SVR4
--#endif
- 
- #ifdef SVR4
- #include <sys/signal.h>
-@@ -120,7 +111,9 @@
+--- lib/libxview/misc/expandname.c.orig	2005-03-28 06:41:36.000000000 -0800
++++ lib/libxview/misc/expandname.c	2012-02-02 20:25:52.508626867 -0800
+@@ -122,7 +122,9 @@
      }
      (void) close(pivec[0]);
  #ifndef SVR4
 +#if !(defined(BSD) && (BSD >= 199103))
      while (wait((union wait *) & status) != pid);
 +#endif
- #else SVR4
+ #else /* SVR4 */
      while (wait( & status) != pid);
- #endif SVR4
+ #endif /* SVR4 */
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+misc+gettext.c b/x11-toolkits/xview/files/patch-lib+libxview+misc+gettext.c
index d56a3ca8c603..3158431b9e13 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+misc+gettext.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+misc+gettext.c
@@ -1,17 +1,16 @@
---- lib/libxview/misc/gettext.c.orig	Thu Oct  5 18:45:03 2006
-+++ lib/libxview/misc/gettext.c	Thu Oct  5 18:50:03 2006
-@@ -10,10 +10,12 @@
+--- lib/libxview/misc/gettext.c.orig	2012-02-03 16:44:26.083038397 -0800
++++ lib/libxview/misc/gettext.c	2012-02-03 16:47:10.335612397 -0800
+@@ -10,10 +10,10 @@
+ #include <string.h>
  #include <xview_private/gettext.h>
  
- char *strdup();
--char * dgettext(), *bindtextdomain();
+-char * dgettext(char *, char *), *bindtextdomain();
 -char *_gettext();
 +char * dgettext(char* domain_nane, char* msg_id), *bindtextdomain();
 +static char *_gettext();
  char *fgets(), *getenv();
-+#ifndef OS_HAS_MMAP
+-#if (!defined(__linux__) || !defined(__GLIBC__)) && !defined(__CYGWIN__)
++#if (!defined(__linux__) || !defined(__GLIBC__)) && !defined(__CYGWIN__) && !defined(OS_HAS_MMAP) || !defined(__FreeBSD__)
  caddr_t mmap();
-+#endif
- 
- static struct domain_binding *firstbind=0, *lastbind=0;
+ #endif
  
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+misc+gettext.h b/x11-toolkits/xview/files/patch-lib+libxview+misc+gettext.h
index 5ca7ab0ad24b..d23f49cafdc1 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+misc+gettext.h
+++ b/x11-toolkits/xview/files/patch-lib+libxview+misc+gettext.h
@@ -1,11 +1,14 @@
---- 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 */
+--- lib/libxview/misc/gettext.h.orig	2005-03-28 06:41:36.000000000 -0800
++++ lib/libxview/misc/gettext.h	2012-02-02 20:37:56.819985942 -0800
+@@ -2,7 +2,11 @@
  
  #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'
- 
+ #if !defined(__linux__) && !defined(__CYGWIN__)
++#ifdef __FreeBSD__
++#define DEFAULT_BINDING "/usr/local/lib/X11//locale\n"
++#else
+ #define DEFAULT_BINDING "/usr/lib/locale\n"
++#endif
+ #else
+ #define DEFAULT_BINDING "/usr/openwin/lib/locale\n"
+ #endif
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+misc+portable.h b/x11-toolkits/xview/files/patch-lib+libxview+misc+portable.h
index 1c4bebf53bbc..c74d7d1e9e51 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+misc+portable.h
+++ b/x11-toolkits/xview/files/patch-lib+libxview+misc+portable.h
@@ -1,5 +1,5 @@
---- 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
+--- lib/libxview/misc/portable.h.orig	2005-03-28 06:41:36.000000000 -0800
++++ lib/libxview/misc/portable.h	2012-02-02 20:41:11.043182949 -0800
 @@ -10,6 +10,7 @@
  #ifndef xview_portable_h_DEFINED
  #define xview_portable_h_DEFINED
@@ -19,14 +19,15 @@
  #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 */
+@@ -74,7 +79,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
+ #undef  XV_USE_TERMIOS
 +#endif
- #undef	XV_USE_SVR4_PTYS
- #endif	/* SVR4 */
+ #undef  XV_USE_SVR4_PTYS
+ #endif  /* SVR4 */
+ #endif  /* __linux__ */
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+notice+notice_get.c b/x11-toolkits/xview/files/patch-lib+libxview+notice+notice_get.c
index eaa1f177c542..356856b8b642 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+notice+notice_get.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notice+notice_get.c
@@ -1,11 +1,12 @@
---- lib/libxview/notice/notice_get.c.orig	Tue Jun 29 14:16:39 1993
-+++ lib/libxview/notice/notice_get.c	Sat Jan  9 23:40:19 1999
-@@ -29,9 +29,10 @@
- va_list			valist;
- {
-     Notice_info	*notice = NOTICE_PRIVATE(notice_public);
--    Attr_avlist     avlist = (Attr_avlist) valist;
+--- lib/libxview/notice/notice_get.c.orig	2005-03-28 06:41:08.000000000 -0800
++++ lib/libxview/notice/notice_get.c	2012-02-02 20:44:18.306259052 -0800
+@@ -32,9 +32,12 @@
+ /* Alpha compatibility, mbuck@debian.org */
+ #if 0
+     Attr_avlist     avlist = (Attr_avlist) valist;
++#else
 +    Attr_avlist     avlist;
+ #endif
      Xv_opaque	v = (Xv_opaque)NULL;
  
 +    MAKE_AVLIST(valist, avlist);
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+notice+notice_set.c b/x11-toolkits/xview/files/patch-lib+libxview+notice+notice_set.c
deleted file mode 100644
index 240c661df396..000000000000
--- a/x11-toolkits/xview/files/patch-lib+libxview+notice+notice_set.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/libxview/notice/notice_set.c.orig	Sun Mar 26 00:02:43 2006
-+++ lib/libxview/notice/notice_set.c	Sun Mar 26 00:04:18 2006
-@@ -22,7 +22,6 @@
- #include <xview/win_input.h>
- #include <xview/cms.h>
- 
--extern char		*strchr();
- Pkg_private Xv_opaque	notice_generic_set();
- #ifdef  OW_I18N
- static CHAR     **notice_string_set();
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
index 2503973be49e..9c029f0b7dbc 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_fcntl.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_fcntl.c
@@ -1,21 +1,22 @@
---- ./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
+--- lib/libxview/notify/ndet_fcntl.c.orig	2005-03-28 06:41:00.000000000 -0800
++++ lib/libxview/notify/ndet_fcntl.c	2012-02-02 20:54:21.876186252 -0800
+@@ -17,12 +17,13 @@
  
  #include <xview_private/ntfy.h>
  #include <xview_private/ndet.h>
 +#include <sys/param.h>
  #include <signal.h>
  #include <fcntl.h>
- #ifdef SVR4
+ #if defined SVR4 || __CYGWIN__
  #include <sys/file.h>
- #endif SVR4
--
-+#if (defined(BSD) && (BSD >= 199103))
-+#include <stdarg.h>
-+#endif
- extern int
- #ifdef SVR4
+ #endif /* SVR4 */
+-#ifdef __linux__
++#if defined(__linux__) || (defined(BSD) && (BSD >= 199103))
+ #include <stdarg.h>
+ #endif
+ 
+@@ -31,12 +32,26 @@
+ #if defined SVR4 || __CYGWIN__
  xv_fcntl(fd, cmd, arg)
  #else
 +#if (defined(BSD) && (BSD >= 199103))
@@ -23,7 +24,7 @@
 +#else
  fcntl(fd, cmd, arg)
 +#endif
- #endif SVR4
+ #endif /* SVR4 */
 +#if !(defined(BSD) && (BSD >= 199103))
      int             fd, cmd, arg;
 +#endif
@@ -32,12 +33,12 @@
      int             res;
 +
 +#if (defined(BSD) && (BSD >= 199103))
-+    int arg;  
++    int arg;
 +    va_list valist;
 +    va_start(valist, cmd);
 +    arg = va_arg(valist, int);
 +    va_end(valist);
 +#endif
- 
-     /* Set fd bit */
-     FD_ZERO(&bit);
+ #else /* __linux__ */
+ /* fcntl() is declared using variable args in linux */
+ fcntl(int fd, int cmd, ...) {
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_fd.c b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_fd.c
index c4588bb399f9..3c30ca6362f6 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_fd.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_fd.c
@@ -1,14 +1,14 @@
---- ../alt/lib/libxview/notify/ndet_fd.c	Tue Jun 29 07:18:08 1993
-+++ lib/libxview/notify/ndet_fd.c	Sat Jul 26 00:42:21 1997
+--- lib/libxview/notify/ndet_fd.c.orig	2005-03-28 06:41:00.000000000 -0800
++++ lib/libxview/notify/ndet_fd.c	2012-02-02 20:58:01.499747999 -0800
 @@ -27,8 +27,9 @@
  #define GETDTABLESIZE() \
  (dtablesize_cache?dtablesize_cache:(dtablesize_cache=(int)sysconf(_SC_OPEN_MAX)))
  #else
 -#define GETDTABLESIZE() \
 -    (dtablesize_cache?dtablesize_cache:(dtablesize_cache=getdtablesize()))
-+#define GETDTABLESIZE()						\
-+    (dtablesize_cache ? dtablesize_cache :			\
++#define GETDTABLESIZE()                                               \
++    (dtablesize_cache ? dtablesize_cache :                    \
 +    (dtablesize_cache = MIN(getdtablesize(), FD_SETSIZE)))
- #endif SVR4
+ #endif /* SVR4 */
  
  static int      ndet_fd_table_size;	/* Number of descriptor slots
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
index 3804f7bc32eb..bb851c9a55f8 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_loop.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_loop.c
@@ -1,6 +1,6 @@
---- lib/libxview/notify/ndet_loop.c.orig	Tue Jun 29 07:18:19 1993
-+++ lib/libxview/notify/ndet_loop.c	Sun Apr  2 03:32:17 2000
-@@ -14,13 +14,14 @@ static char     sccsid[] = "@(#)ndet_loo
+--- lib/libxview/notify/ndet_loop.c.orig	2005-03-28 06:41:00.000000000 -0800
++++ lib/libxview/notify/ndet_loop.c	2012-02-02 21:04:53.576391986 -0800
+@@ -14,6 +14,7 @@
   * Ndet_loop.c - Notification loop.
   */
  
@@ -8,21 +8,21 @@
  #include <xview_private/i18n_impl.h>
  #include <xview_private/ntfy.h>
  #include <xview_private/ndet.h>
- #include <xview_private/nint.h>
+@@ -21,7 +22,7 @@
  #include <xview_private/ndis.h>	/* For ndis_dispatch */
+ #if !defined(__linux__) && !defined(__CYGWIN__)
  #ifndef SVR4
 -#include <syscall.h>
 +#include <sys/syscall.h>
- #else SVR4
+ #else /* SVR4 */
  #include <sys/syscall.h>
  #include <sys/poll.h>
-@@ -224,7 +225,8 @@ notify_start()
+@@ -232,7 +233,7 @@
  	     * 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))
+ #if !defined(__linux__) && !defined(__CYGWIN__)
  	    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
index 409cab1f77c7..6ea050bccd32 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_read.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndet_read.c
@@ -1,6 +1,6 @@
---- ./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
+--- lib/libxview/notify/ndet_read.c.orig	2005-03-28 06:41:00.000000000 -0800
++++ lib/libxview/notify/ndet_read.c	2012-02-02 21:11:37.972925839 -0800
+@@ -15,6 +15,7 @@
   * not already in the middle of it.
   */
  
@@ -8,19 +8,19 @@
  #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;
+@@ -29,11 +30,16 @@
  
  static Notify_client ndet_read_nclient = (Notify_client) & ndet_read_done;
  
 +#if !(defined(BSD) && (BSD >= 199103))
  extern int
- read(fd, buf, nbytes)
+ ndet_read(fd, buf, nbytes)
      register int    fd;
      char           *buf;
      int             nbytes;
 +#else
 +extern int
-+read(int fd, void *buf, size_t nbytes)
++ndet_read(int fd, void *buf, size_t nbytes)
 +#endif
  {
      int             ndelay;
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
index a27ea0296536..23be47b33091 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+notify+ndisd_wait.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndisd_wait.c
@@ -1,6 +1,6 @@
---- 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 @@
+--- lib/libxview/notify/ndisd_wait.c.orig	2005-03-28 06:41:00.000000000 -0800
++++ lib/libxview/notify/ndisd_wait.c	2012-02-02 21:15:25.836613036 -0800
+@@ -16,13 +16,14 @@
  #include <xview_private/ntfy.h>
  #include <xview_private/ndis.h>
  #include <signal.h>
@@ -11,14 +11,8 @@
  notify_default_wait3(client, pid, status, rusage)
      Notify_client   client;
      int             pid;
--#ifndef SVR4
-+#if !((BSD4_4) || defined(SVR4))
+-#if !defined SVR4 && !defined __CYGWIN__
++#if !defined SVR4 && !defined __CYGWIN__ && !defined BSD4_4
      union wait     *status;
--#else SVR4
-+#else /* SVR4 */
+ #else /* SVR4 */
      int *status;
--#endif SVR4
-+#endif /* SVR4 */
-     struct rusage  *rusage;
- {
-     return (NOTIFY_IGNORED);
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+notify+ndisdispch.c b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndisdispch.c
index 0c5469e10ef0..8abc92311bbc 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+notify+ndisdispch.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+ndisdispch.c
@@ -1,14 +1,14 @@
---- ../alt/lib/libxview/notify/ndisdispch.c	Tue Jun 29 07:18:06 1993
-+++ lib/libxview/notify/ndisdispch.c	Sat Jul 26 00:55:47 1997
+--- lib/libxview/notify/ndisdispch.c.orig	2005-03-28 06:41:00.000000000 -0800
++++ lib/libxview/notify/ndisdispch.c	2012-02-02 21:19:12.920272396 -0800
 @@ -30,8 +30,9 @@
  #define GETDTABLESIZE() \
  (dtablesize_cache?dtablesize_cache:(dtablesize_cache=(int)sysconf(_SC_OPEN_MAX)))
  #else
 -#define GETDTABLESIZE() \
 - (dtablesize_cache?dtablesize_cache:(dtablesize_cache=getdtablesize()))
-+#define GETDTABLESIZE()						\
-+    (dtablesize_cache ? dtablesize_cache :			\
++#define GETDTABLESIZE()                                               \
++    (dtablesize_cache ? dtablesize_cache :                    \
 +    (dtablesize_cache = MIN(getdtablesize(), FD_SETSIZE)))
- #endif SVR4
+ #endif /* SVR4 */
  
  pkg_private_data u_int ndis_flags = 0;
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
index da8c609355d3..2e63061b57d4 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+notify+nintn_wait.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+nintn_wait.c
@@ -1,17 +1,11 @@
---- 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 @@
+--- lib/libxview/notify/nintn_wait.c.orig	2005-03-28 06:41:00.000000000 -0800
++++ lib/libxview/notify/nintn_wait.c	2012-02-02 21:22:32.283495742 -0800
+@@ -22,7 +22,7 @@
  notify_next_wait3_func(nclient, pid, status, rusage)
      Notify_client   nclient;
      int             pid;
--#ifndef SVR4
-+#if !(defined(BSD4_4) || defined(SVR4))
+-#if !defined SVR4 && !defined __CYGWIN__
++#if !defined SVR4 && !defined __CYGWIN__ && !defined BSD4_4
      union wait     *status;
--#else SVR4
-+#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
index e29229b89409..bd6b378ab816 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+notify+notify.h
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+notify.h
@@ -1,14 +1,15 @@
---- 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 
+--- lib/libxview/notify/notify.h.orig	2005-03-28 06:41:00.000000000 -0800
++++ lib/libxview/notify/notify.h	2012-02-02 21:25:57.386812073 -0800
+@@ -26,9 +26,11 @@
+ #if !defined(__linux__) && !defined(__CYGWIN__)
+ # ifdef SYSV_WAIT
+ #  include <sys/rusage.h>
++# elif (__FreeBSD__>=4)
++#  define SYSV_WAIT
+ # endif 
+ #endif
 -#ifdef SYSV_UCONTEXT
 +#if defined(SYSV_UCONTEXT) || (__FreeBSD__>=4)
- #include <sys/ucontext.h>
- #endif 
- 
+ # include <sys/ucontext.h>
+ #else
+ typedef int ucontext_t;
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+notify+ntfy.h b/x11-toolkits/xview/files/patch-lib+libxview+notify+ntfy.h
index e75b0d15a0bc..fa91af5ecb50 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+notify+ntfy.h
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+ntfy.h
@@ -1,6 +1,6 @@
---- 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 @@
+--- lib/libxview/notify/ntfy.h.orig	2005-03-28 06:41:00.000000000 -0800
++++ lib/libxview/notify/ntfy.h	2012-02-02 22:53:44.551883626 -0800
+@@ -35,6 +35,10 @@
  #include <sys/rusage.h>
  #endif
  #include <sys/resource.h>
@@ -11,16 +11,16 @@
  #include <xview/notify.h>
  
  /*
-@@ -149,7 +153,7 @@
+@@ -167,7 +171,7 @@
   */
  typedef	struct ntfy_wait3_data {
  	int	pid;			/* Process waiting for */
--#ifndef SVR4
-+#if (!defined(BSD4_4) && !defined(SVR4))
+-#if !defined(SVR4) && !(defined(__linux__) || defined(__CYGWIN__))
++#if !defined(SVR4) && !(defined(__linux__) || defined(__CYGWIN__) || defined(BSD4_4))
  	union	wait status;		/* Return value from wait3 */
- #else
+ #else /* SVR4 */
  	int 	status;		/* Return value from wait3 */
-@@ -188,7 +192,12 @@
+@@ -210,7 +214,12 @@
  #define sigisempty(s)   (!(((s)->__sigbits[0]) | ((s)->__sigbits[1])   \
                          | ((s)->__sigbits[2]) | ((s)->__sigbits[3])))
  #else
@@ -32,14 +32,5 @@
 +	return (! memcmp(&n, s, sizeof(sigset_t)));
 +}
  #endif
+ #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+ntfyclient.c b/x11-toolkits/xview/files/patch-lib+libxview+notify+ntfyclient.c
index c8e31f2465e7..4f206ce2ac11 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+notify+ntfyclient.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+ntfyclient.c
@@ -1,61 +1,26 @@
---- ./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>
+--- lib/libxview/notify/ntfyclient.c.orig	2012-02-03 16:47:24.025771621 -0800
++++ lib/libxview/notify/ntfyclient.c	2012-02-03 16:57:20.624935481 -0800
+@@ -23,7 +23,15 @@
+ /* Newsflash: As of libc-5.0.9, Linux has tsearch() & friends, so we define
+  * HAVE_TSEARCH here.                  <martin-2.buck@student.uni-ulm.de>
+  */
++
++/* XXX
++   XXX Previous version of the FreeBSD patch assumed FreeBSD had no
++   XXX tsearch() support or that it didn't work.
++   XXX
++   XXX */
++#ifdef __FreeBSD__
+ #define HAVE_TSEARCH
 +#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, 
+ #include <xview_private/ntfy.h>
+ #include <xview_private/ndis.h>	/* For ndis_default_prioritizer */
+@@ -103,7 +111,6 @@
             return (client);
         }
      }
 -
-+#else
-+    if(0);
-+#endif
      else 
+ #endif
          /* 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
index 569090d101fe..d97c5364e981 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+notify+sys_fcntl.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+sys_fcntl.c
@@ -1,16 +1,11 @@
-*** 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_fcntl.c.orig	2005-03-28 06:41:00.000000000 -0800
++++ lib/libxview/notify/sys_fcntl.c	2012-02-03 08:15:30.766090164 -0800
+@@ -14,7 +14,7 @@
+  * Sys_fcntl.c - Real system call to fcntl.
+  */
+ 
+-#ifndef SVR4
++#if !defined(SVR4) && !defined(__FreeBSD__)
+ #if !defined(__linux__) && !defined(__CYGWIN__)
+ #include <syscall.h>
+ #else
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
index bc68b9c9e714..b9935e7c55df 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+notify+sys_read.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+sys_read.c
@@ -1,16 +1,11 @@
-*** 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_read.c.orig	2005-03-28 06:41:00.000000000 -0800
++++ lib/libxview/notify/sys_read.c	2012-02-03 08:17:27.427881537 -0800
+@@ -14,7 +14,7 @@
+  * Sys_read.c - Real system call to read.
+  */
+ 
+-#ifndef SVR4
++#if !defined(SVR4) && !defined(__FreeBSD__)
+ #if !defined(__linux__) && !defined(__CYGWIN__)
+ #include <syscall.h>
+ #else
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
index dd2daaf32d53..859533810b9c 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+notify+sys_select.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+notify+sys_select.c
@@ -1,16 +1,18 @@
-*** 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>
+--- lib/libxview/notify/sys_select.c.orig	2005-03-28 06:41:00.000000000 -0800
++++ lib/libxview/notify/sys_select.c	2012-02-03 08:22:42.752727013 -0800
+@@ -15,11 +15,15 @@
+  */
+ 
+ #ifndef SVR4
++#ifdef __FreeBSD__
++#include <sys/syscall.h>
++#else
+ #if !defined __linux__ && !defined __CYGWIN__
+ #include <syscall.h>
+ #else
+ #include "linux_select.h"
+ #endif
++#endif /* __FreeBSD__ */
+ #else /* SVR4 */
+ #include <values.h>
+ #include <sys/time.h>
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
index 9a1be2f9b2a2..73436d312cf6 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+panel+p_btn.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_btn.c
@@ -1,11 +1,19 @@
---- ./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)
+--- lib/libxview/panel/p_btn.c.orig	2005-03-28 06:40:39.000000000 -0800
++++ lib/libxview/panel/p_btn.c	2012-02-03 08:25:38.585429214 -0800
+@@ -203,12 +203,16 @@
  	if (pin_is_default) {
  	    image.im_type = PIT_STRING;
  	    image_string(&image) = NULL;
--	    label = "";
++#ifdef __FreeBSD__
 +	    label = (Xv_opaque) "";
++#else
+ /* Alpha compatibility, mbuck@debian.org */
+ #if 1
+ 	    label = (char *)"";
+ #else
+ 	    label = "";
+ #endif
++#endif
  	} 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_gauge.c b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_gauge.c
index 7d08306bd4bf..344400782984 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+panel+p_gauge.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_gauge.c
@@ -1,6 +1,6 @@
---- ./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();
+--- lib/libxview/panel/p_gauge.c.orig	2012-02-03 17:06:18.363199423 -0800
++++ lib/libxview/panel/p_gauge.c	2012-02-03 17:08:58.565678508 -0800
+@@ -47,6 +47,7 @@
  /* Local functions */
  static void     paint_gauge();
  static void     update_rects();
@@ -8,3 +8,12 @@
  
  static Panel_ops ops = {
      panel_default_handle_event,		/* handle_event() */
+@@ -535,7 +536,7 @@
+ /*
+  * Convert external value (client units) to internal value (pixels).
+  */
+-static int
++int
+ etoi_gauge(dp, value)
+     Gauge_info    *dp;
+     int             value;
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+panel+p_list.c b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_list.c
deleted file mode 100644
index f8b343a0c6e4..000000000000
--- a/x11-toolkits/xview/files/patch-lib+libxview+panel+p_list.c
+++ /dev/null
@@ -1,92 +0,0 @@
---- lib/libxview/panel/p_list.c.orig	Tue Jun 29 14:16:48 1993
-+++ lib/libxview/panel/p_list.c	Sun Jan 10 01:47:42 1999
-@@ -1239,7 +1239,7 @@
- 	return ((Xv_opaque) dp->choose_one);
- 
-       case PANEL_ITEM_NTH_WINDOW:
--	if (*(int *) valist == 0)
-+	if (va_arg(valist, int) == 0)
- 	    return (Xv_opaque) dp->list_sb;
- 	else
- 	    return (Xv_opaque) NULL;
-@@ -1266,7 +1266,7 @@
- 	return (Xv_opaque) dp->list_sb;
- 
-       case PANEL_LIST_SELECTED:
--	row = *(int *) valist;
-+	row = va_arg(valist, int);
- 	node = find_or_create_nth_row(dp, row, FALSE);
- 	return (node ? (Xv_opaque) node->f.selected : (Xv_opaque) XV_ERROR);
- 
-@@ -1278,7 +1278,7 @@
- 	return -1;	/* no rows selected */
- 	
-       case PANEL_LIST_NEXT_SELECTED:
--	row = *(int *) valist;
-+	row = va_arg(valist, int);
- 	node = find_or_create_nth_row(dp, row, FALSE);
- 	if (!node)
- 	    return -1;	/* specified row doesn't exist */
-@@ -1289,7 +1289,7 @@
- 	return -1;	/* no subsequent row selected */
- 
-       case PANEL_LIST_CLIENT_DATA:
--	row = *(int *) valist;
-+	row = va_arg(valist, int);
- 	node = find_or_create_nth_row(dp, row, FALSE);
- 	return (node ? (Xv_opaque) node->client_data : (Xv_opaque) XV_ERROR);
- 
-@@ -1297,7 +1297,7 @@
- #ifdef OW_I18N
-       case PANEL_LIST_STRING_WCS:
- #endif
--	row = *(int *) valist;
-+	row = va_arg(valist, int);
- 	node = find_or_create_nth_row(dp, row, FALSE);
- #ifdef OW_I18N
- 	if (node != NULL)
-@@ -1312,7 +1312,7 @@
- #endif /* OW_I18N */
- 
-       case PANEL_LIST_GLYPH:
--	row = *(int *) valist;
-+	row = va_arg(valist, int);
- 	node = find_or_create_nth_row(dp, row, FALSE);
- 	return (node ? (Xv_opaque) node->glyph : (Xv_opaque) XV_ERROR);
- 
-@@ -1328,7 +1328,7 @@
- #endif /* OW_I18N */
- 
-       case PANEL_LIST_FONT:
--	row = *(int *) valist;
-+	row = va_arg(valist, int);
- 	node = find_or_create_nth_row(dp, row, FALSE);
- 	return (node ? (Xv_opaque) node->font : (Xv_opaque) XV_ERROR);
- 
-@@ -1352,7 +1352,7 @@
- 
- 
-     case PANEL_LIST_INACTIVE:
--	row = *(int *) valist;
-+	row = va_arg(valist, int);
- 	node = find_or_create_nth_row(dp, row, FALSE);
- 	return (node ? (Xv_opaque) node->f.row_inactive : (Xv_opaque) XV_ERROR);
- 
-@@ -1407,7 +1407,7 @@
-     }
- 
-     case PANEL_LIST_EXTENSION_DATA:
--	row = *(int *) valist;
-+	row = va_arg(valist, int);
- 	node = find_or_create_nth_row(dp, row, FALSE);
- 	return (node ? (Xv_opaque) node->exten_data : (Xv_opaque) XV_ERROR);
- 
-@@ -3789,7 +3789,7 @@
- 
-     /* weigh timeval's against multiclick-timeout resource */
-     is_multiclick = panel_is_multiclick(ip->panel, 
--					dp->last_click_row->click_time,
-+					&dp->last_click_row->click_time,
- 					&event_time(event)
- 					);
- 
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+panel+p_mlinetxt.c b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_mlinetxt.c
deleted file mode 100644
index 59243ee8c8b7..000000000000
--- a/x11-toolkits/xview/files/patch-lib+libxview+panel+p_mlinetxt.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- lib/libxview/panel/p_mlinetxt.c.orig	Sat Mar 25 23:52:08 2006
-+++ lib/libxview/panel/p_mlinetxt.c	Sun Mar 26 00:22:01 2006
-@@ -14,6 +14,7 @@
-  * Multi-line Text Field Panel Item
-  */
- #include <string.h>
-+#include <stdarg.h>
- #include <xview_private/panel_impl.h>
- #include <xview_private/draw_impl.h>
- #include <xview/defaults.h>
-@@ -449,7 +450,7 @@
- 	return (Xv_opaque) dp->rows_displayed;
- 
-       case PANEL_ITEM_NTH_WINDOW:
--	switch (*(int *) valist) {
-+	switch (va_arg(valist, int)) {
- 	  case 0:
- 	    return dp->view;
- 	  case 1:
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
deleted file mode 100644
index 1cd19d1509f2..000000000000
--- a/x11-toolkits/xview/files/patch-lib+libxview+panel+p_num_txt.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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_slider.c b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_slider.c
index af4d590c0585..3535b7abf3c6 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+panel+p_slider.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_slider.c
@@ -1,6 +1,6 @@
---- ./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();
+--- lib/libxview/panel/p_slider.c.orig	2012-02-03 17:01:53.259129212 -0800
++++ lib/libxview/panel/p_slider.c	2012-02-03 17:05:37.912629308 -0800
+@@ -54,6 +54,8 @@
  static Panel_setting get_value();
  static void     paint_slider();
  static void     update_rects();
@@ -9,3 +9,12 @@
  
  static Panel_ops ops = {
      panel_default_handle_event,		/* handle_event() */
+@@ -1377,7 +1379,7 @@
+ /*
+  * Convert external value (client units) to internal value (pixels).
+  */
+-static int
++int
+ etoi_slider(dp, value)
+     Slider_info    *dp;
+     int             value;
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
index 222ca2081ab0..b9d6977a1c2a 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+panel+p_utl.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+panel+p_utl.c
@@ -1,23 +1,20 @@
---- 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))
+--- lib/libxview/panel/p_utl.c.orig	2005-03-28 06:40:39.000000000 -0800
++++ lib/libxview/panel/p_utl.c	2012-02-03 08:39:12.397932758 -0800
+@@ -169,7 +169,7 @@
              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 @@
+ #else
+-#if !defined(__linux__) && !defined(__CYGWIN__)
++#if !defined(__linux__) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
+     {
+         if (image_string(dest))
+             xv_free(image_string(dest));
+@@ -197,7 +197,7 @@
  	    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);
+-#if defined(__linux__) || defined(__CYGWIN__)
++#if defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__)
+ /* XView bug: This routine sometimes used a value that was already freed,
+  * leading to clobbered menu items. The problem is the 
+  * 'xv_free(image_string(dest))' above. In some cases the new 'value' 
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
index 6a8c341b68ff..a11b46f398fb 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+panel+panel_impl.h
+++ b/x11-toolkits/xview/files/patch-lib+libxview+panel+panel_impl.h
@@ -1,20 +1,17 @@
---- ./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
+--- lib/libxview/panel/panel_impl.h.orig	2005-03-28 06:40:39.000000000 -0800
++++ lib/libxview/panel/panel_impl.h	2012-02-03 09:20:21.855877273 -0800
+@@ -11,9 +11,14 @@
  
+ #ifndef FILE
+ #if !defined(SVR4) && !defined(__linux__) && !defined(__CYGWIN__)
 +#ifdef NULL
-+#undef NULL
+ #undef NULL
 +#endif
- #ifndef FILE
- #ifndef SVR4
--#undef NULL
- #endif SVR4
+ #endif /* SVR4 */
  #include <stdio.h>
 +#ifndef NULL
 +#define NULL 0
 +#endif
- #endif FILE
+ #endif /* FILE */
  #include <sys/types.h>
  #include <X11/Xlib.h>
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+pw+pwline.c b/x11-toolkits/xview/files/patch-lib+libxview+pw+pwline.c
deleted file mode 100644
index fd5ef34817e2..000000000000
--- a/x11-toolkits/xview/files/patch-lib+libxview+pw+pwline.c
+++ /dev/null
@@ -1,78 +0,0 @@
-*** lib/libxview/pw/pw_line.c.orig	Sat Jan 23 19:46:47 1999
---- lib/libxview/pw/pw_line.c	Sat Jan 23 19:49:44 1999
-***************
-*** 26,32 ****
-  {
-      XGCValues       gc_val;
-      unsigned long   gc_mask = GCLineWidth | GCLineStyle;
-!     char           *dash_set;
-      int             p_len;
-      char           *pw_short_to_char();
-      Xv_Drawable_info *info;
---- 26,32 ----
-  {
-      XGCValues       gc_val;
-      unsigned long   gc_mask = GCLineWidth | GCLineStyle;
-!     char           *dash_set = NULL;
-      int             p_len;
-      char           *pw_short_to_char();
-      Xv_Drawable_info *info;
-*** lib/libxview/pw/xv_rop.c.orig	Sat Jan 23 19:47:07 1999
---- lib/libxview/pw/xv_rop.c	Sat Jan 23 20:10:57 1999
-***************
-*** 171,190 ****
-  	    height = (height > ((Pixrect *) src)->pr_size.y) ?
-  		((Pixrect *) src)->pr_size.y : height;
-  
-! 	    if (xv_depth(dest_info) == xv_depth(src_info)) {
-! 		if (xv_depth(dest_info) == 1) {
-! 		    changes.stipple = xv_xid(src_info);
-! 		    changes.fill_style = FillOpaqueStippled;
-! 		    changes_mask |= GCFillStyle | GCStipple;
-! 		} else {
-! 		    changes.tile = xv_xid(src_info);
-! 		    changes.fill_style = FillTiled;
-! 		    changes_mask |=  GCTile | GCFillStyle;
-! 		}
-! 	    } else if (xv_depth(dest_info) > xv_depth(src_info)) {
-! 		changes.stipple = xv_xid(src_info);
-! 		changes.fill_style = FillOpaqueStippled;
-! 		changes_mask |= GCStipple | GCFillStyle;
-  	    } else {
-  		xv_error(NULL,
-  			 ERROR_STRING,
---- 171,185 ----
-  	    height = (height > ((Pixrect *) src)->pr_size.y) ?
-  		((Pixrect *) src)->pr_size.y : height;
-  
-! 	    /* stipple only if we have a bitmap src */
-! 	    if (xv_depth(src_info) == 1) {
-! 	      changes.stipple = xv_xid(src_info);
-! 	      changes.fill_style = FillOpaqueStippled;
-! 	      changes_mask |=  GCStipple | GCFillStyle;
-! 	    } else if(xv_depth(dest_info) == xv_depth(src_info)) {
-! 	      changes.tile = xv_xid(src_info);
-! 	      changes.fill_style = FillTiled;
-! 	      changes_mask |=  GCTile | GCFillStyle;
-  	    } else {
-  		xv_error(NULL,
-  			 ERROR_STRING,
-*** lib/libxview/scrollbar/sb.c.orig	Sat Jan 23 20:12:12 1999
---- lib/libxview/scrollbar/sb.c	Sat Jan 23 20:13:26 1999
-***************
-*** 43,49 ****
-  
-  Xv_private void	win_set_no_focus();
-  Xv_private Graphics_info	*xv_init_olgx();
-! Xv_private_data Defaults_pairs xv_kbd_cmds_value_pairs[4];
-  
-  /******************************************************************/
-  
---- 43,49 ----
-  
-  Xv_private void	win_set_no_focus();
-  Xv_private Graphics_info	*xv_init_olgx();
-! extern Defaults_pairs xv_kbd_cmds_value_pairs[4];
-  
-  /******************************************************************/
-  
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+screen+scrn_get.c b/x11-toolkits/xview/files/patch-lib+libxview+screen+scrn_get.c
deleted file mode 100644
index b60b84fc8b68..000000000000
--- a/x11-toolkits/xview/files/patch-lib+libxview+screen+scrn_get.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/libxview/screen/scrn_get.c.orig	Sat Mar 25 23:20:12 2006
-+++ lib/libxview/screen/scrn_get.c	Sat Mar 25 23:20:44 2006
-@@ -20,6 +20,7 @@
- #include <xview/base.h>
- #include <xview/font.h>
- #include <xview/server.h>
-+#include <X11/Xlibint.h>
- 
- /* Bitmap used for the inactive GC */
- static unsigned short screen_gray50_bitmap[16] = {   /* 50% gray pattern */
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
index 6c71d2d19e66..2d4edf3709ec 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+sel+sel_agent.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+sel+sel_agent.c
@@ -1,6 +1,6 @@
---- 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 @@
+--- lib/libxview/sel/sel_agent.c.orig	2005-03-28 06:41:13.000000000 -0800
++++ lib/libxview/sel/sel_agent.c	2012-02-03 09:06:12.722830476 -0800
+@@ -33,10 +33,10 @@
  #include <stdio.h>
  /*
   * The following header file provides fd_set compatibility with SunOS for
@@ -8,12 +8,12 @@
 + * Ultrix and provides howmany() for newer BSDs
   */
  #include <xview_private/ultrix_cpt.h>
--#ifdef SVR4
-+#if (defined(BSD4_4) || defined(SVR4))
+-#if defined(SVR4) || defined(__linux__) || defined(__CYGWIN__)
++#if defined(SVR4) || defined(__linux__) || defined(__CYGWIN__) || (defined(BSD4_4) || defined(SVR4))
  #include <stdlib.h>
  #include <unistd.h>
- #endif
-@@ -63,7 +63,7 @@
+ #endif /* SVR4 */
+@@ -68,7 +68,7 @@
  static void     selection_agent_do_function();
  static Atom 	get_atom();
  static Seln_attribute save_atom();
@@ -22,15 +22,14 @@
  
  Xv_private Seln_result seln_convert_request_to_property();
  /* called by seln_svc.c
-@@ -309,7 +309,11 @@
+@@ -314,7 +314,9 @@
      struct stat     stat_buf;
      int             count, size;
      char           *destp;
+-#ifndef __CYGWIN__
 +#if (defined(BSD) && (BSD >= 199306))
 +    extern off_t    lseek();
-+#else
++#elif !defined __CYGWIN__)
      extern long     lseek();
-+#endif
- 
+ #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
index a9787c83eaa8..9427b29da8c2 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+sel+seln_impl.h
+++ b/x11-toolkits/xview/files/patch-lib+libxview+sel+seln_impl.h
@@ -1,21 +1,19 @@
---- ./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.
-  */
+--- lib/libxview/sel/seln_impl.h.orig	2005-03-28 06:41:13.000000000 -0800
++++ lib/libxview/sel/seln_impl.h	2012-02-03 09:22:34.447913971 -0800
+@@ -11,10 +11,15 @@
  
-+#ifdef NULL
-+#undef NULL
-+#endif
  #include <errno.h>
  #ifndef FILE
- #ifndef SVR4
--#undef NULL
- #endif SVR4
+-#if !defined(SVR4) && !defined(__linux__) && !defined(__CYGWIN__)
++#if !defined(SVR4) && !defined(__linux__) && !defined(__CYGWIN__) 
++#ifdef NULL
+ #undef NULL
++#endif
+ #endif /* SVR4 */
  #include <stdio.h>
 +#ifndef NULL
 +#define NULL 0
 +#endif
- #endif FILE
+ #endif /* FILE */
  #include <sys/time.h>
  #include <sys/types.h>
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+server+server.c b/x11-toolkits/xview/files/patch-lib+libxview+server+server.c
index 8ef64286e4e0..77d54192fe40 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+server+server.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+server+server.c
@@ -1,14 +1,6 @@
---- lib/libxview/server/server.c.orig	1994-06-26 11:53:40.000000000 -0700
-+++ lib/libxview/server/server.c	2011-06-08 10:21:36.653037943 -0700
-@@ -25,6 +25,7 @@
- #include <xview/win_notify.h>
- #include <xview/defaults.h>
- #include <X11/Xlib.h>
-+#include <X11/Xlibint.h>
- #include <xview_private/portable.h>
- #include <xview_private/svr_atom.h>
- #include <xview_private/svr_impl.h>
-@@ -65,6 +66,7 @@
+--- lib/libxview/server/server.c.orig	2012-02-04 10:06:21.849338608 -0800
++++ lib/libxview/server/server.c	2012-02-04 10:10:13.953502758 -0800
+@@ -70,6 +70,7 @@
  static unsigned int 	 string_to_modmask();
  static Server_atom_type  save_atom();
  static void 		 server_yield_modifiers();
@@ -16,16 +8,24 @@
  
  Xv_private char		*xv_strtok();
  
-@@ -440,7 +442,7 @@
+@@ -451,14 +452,14 @@
+     /* See if defaults have been loaded on server */
+ #ifdef X11R6
    	/* lumpi@dobag.in-berlin.de */
+-#if 1
++#ifndef __FreeBSD__
+     /* martin-2.buck@student.uni-ulm.de */
+     if ((xrmstr = XResourceManagerString((Display *)server->xdisplay))) {
+ 	server->db = XrmGetStringDatabase(xrmstr);
+ #else
      if (XrmGetDatabase((Display *)server->xdisplay)) {
  	server->db = XrmGetStringDatabase(
 -				(XrmGetDatabase((Display *)server->xdisplay)));
 +				(char *) (XrmGetDatabase((Display *)server->xdisplay)));
+ #endif
  #else
      if (((Display *)server->xdisplay)->xdefaults) {
- 	server->db = XrmGetStringDatabase(
-@@ -741,10 +743,8 @@
+@@ -778,10 +779,8 @@
       */
  
      /* Used by atom mgr */
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
index 9884fcfd55f7..ead2a2a99442 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+textsw+es_file.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+es_file.c
@@ -1,12 +1,12 @@
---- 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
+--- lib/libxview/textsw/es_file.c.orig	2005-03-28 06:40:33.000000000 -0800
++++ lib/libxview/textsw/es_file.c	2012-02-03 09:41:57.345780320 -0800
 @@ -85,14 +85,14 @@
  
  #include <string.h>
  #include <fcntl.h>
--#ifdef SVR4
+-#if defined SVR4 || defined __CYGWIN__
 +#include <sys/param.h>
-+#if (defined(BSD4_4) || defined(SVR4))
++#if defined SVR4 || defined __CYGWIN__ || defined(BSD4_4)
  #include <stdlib.h>
  #include <dirent.h>
  #else
@@ -17,20 +17,21 @@
  #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))
+@@ -115,11 +115,16 @@
+ #if (defined(__linux__) && defined(__GLIBC__)) || defined(__CYGWIN__)
+ /* martin.buck@bigfoot.com */
+ #include <errno.h>
++#elif defined(__FreeBSD__)
++extern int    errno;
++extern const  sys_nerr;
 +extern const char *const sys_err_list[];
-+extern off_t	lseek();
-+#else
++extern off_t  lseek();
+ #else
+ extern int      errno, sys_nerr;
  extern char    *sys_errlist[];
+ #endif
+-#ifndef __CYGWIN__
++#if !defined(__CYGWIN__) && !defined(__FreeBSD__)
  extern long     lseek();
-+#endif
+ #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
deleted file mode 100644
index 1ae4fda9701a..000000000000
--- a/x11-toolkits/xview/files/patch-lib+libxview+textsw+ev_edit.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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+txt_again.c b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_again.c
index 23bf8dfd4545..816be9d038c3 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_again.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_again.c
@@ -1,6 +1,6 @@
---- ./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();
+--- lib/libxview/textsw/txt_again.c.orig	2012-02-03 13:46:41.014675944 -0800
++++ lib/libxview/textsw/txt_again.c	2012-02-03 16:26:22.136396016 -0800
+@@ -27,6 +27,8 @@
  Pkg_private Es_index textsw_do_input();
  Pkg_private Es_index textsw_do_pending_delete();
  
@@ -9,7 +9,7 @@
  string_t        null_string = {0, 0, 0};
  
  #define	TEXT_DELIMITER	"\\"
-@@ -182,6 +184,7 @@ textsw_string_min_free(ptr_to_string, mi
+@@ -211,6 +213,7 @@
   * Following is stolen from 3.2ALPHA sprintf(str, fmt, va_alist) SIDE_EFFECT:
   * TXTSW_STRING_FREE(ptr_to_string) is modified by this routine.
   */
@@ -17,16 +17,16 @@
  #ifndef SVR4
  
  /* VARARGS2 */
-@@ -325,6 +328,31 @@ va_dcl
+@@ -353,6 +356,30 @@
+ }     
  
  #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;
@@ -41,15 +41,14 @@
 +    if (result >= 0)
 +    putc('\0', &_strbuf);
 +#endif
-+    return (result); 
++    return (result);
 +}
 +
 +#endif /* __FreeBSD__ */
-+
+ #endif /* __linux__ */
+ 
  static	void
- textsw_record_buf(again, buffer, buffer_length)
-     register string_t *again;
-@@ -619,6 +647,8 @@ textsw_record_trash_insert(textsw)
+@@ -728,6 +755,8 @@
   */
  /* VARARGS2 */
  
@@ -58,7 +57,7 @@
  static int
  #ifdef ANSI_FUNC_PROTO
  textsw_scanf(register string_t *ptr_to_string, register char  *fmt, ...)
-@@ -705,6 +735,39 @@ va_dcl
+@@ -814,6 +843,39 @@
  
  #endif /* OW_I18N */
  }
@@ -71,9 +70,9 @@
 +        char *buf;
 +        int len;
 +{
-+
++    
 +        return (0);
-+}   
++}
 +
 +static int
 +textsw_scanf(register string_t *ptr_to_string, char  *fmt, ...)
@@ -93,8 +92,8 @@
 +    va_end(args);
 +    TXTSW_STRING_BASE(ptr_to_string) = (char *) _strbuf._p;
 +    return (result);
-+}       
++}
 +#endif /* __FreeBSD__ */
+ #endif /* __linux__ */
  
  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
index efd958d087d4..ba8852c52c8f 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_attr.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_attr.c
@@ -1,12 +1,11 @@
---- 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 @@
+--- lib/libxview/textsw/txt_attr.c.orig	2005-03-28 06:40:33.000000000 -0800
++++ lib/libxview/textsw/txt_attr.c	2012-02-03 09:51:40.604742562 -0800
+@@ -19,7 +19,7 @@
  #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))
+-#if defined SVR4 || defined __CYGWIN__
++#if defined SVR4 || defined __CYGWIN__ || defined(__FreeBSD__)
  #include <dirent.h>
  #include <string.h>
  #else
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_e_menu.c b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_e_menu.c
index 9b26125ee89d..763c05d29d1e 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_e_menu.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_e_menu.c
@@ -1,5 +1,14 @@
---- lib/libxview/textsw/txt_e_menu.c.orig	Tue Jun 29 00:17:42 1993
-+++ lib/libxview/textsw/txt_e_menu.c	Sat Jun 30 20:13:46 2007
+--- lib/libxview/textsw/txt_e_menu.c.orig	2012-02-04 10:33:31.397319914 -0800
++++ lib/libxview/textsw/txt_e_menu.c	2012-02-04 10:37:28.681263979 -0800
+@@ -19,7 +19,7 @@
+  *  3. $(HOME)/.text_extras_menu{.<locale>} (home dir),
+  *  4. locale sensitive system default
+  *		("$OPENWINHOME/lib/locale/<locale>/XView/.text_extras_menu")
+- *  4. fall back to SunView1 ("/usr/lib/.text_extras_menu")
++ *  4. fall back to SunView1 ("/usr/local/lib/.text_extras_menu")
+  *
+  * Always try locale specific name first, if not there, try without
+  * locale name.  In the #4, we will fall back to the "C" locale.
 @@ -76,6 +76,8 @@
  static	int      Nargs;
  static	char	*check_filename_locale();
@@ -9,9 +18,9 @@
  extern int      EXTRASMENU_FILENAME_KEY;
  
  Pkg_private char *
-@@ -138,10 +140,17 @@
+@@ -145,17 +147,25 @@
  
- #ifdef notdef
+ /*#ifdef notdef*/
  	/* Gee, still?... We will try the old fashioned way */
 +	/* If it is never defined, EXTRASMENU is set to text_extras_menu
 +	   see top of this file ... */
@@ -24,6 +33,23 @@
 +	(void) sprintf(tmp, "%s", EXTRASMENU);
 +	if ((result = check_filename_locale(NULL, tmp, 1)) != NULL)
 +	    goto found;
- #endif
++
+ /*#endif*/
+ #ifndef OPENWINHOME_DEFAULT
      }
+ #endif
+ 
+     /* Giving up, try with ancient way (SunView1) */
+-    (void) sprintf(tmp, "/usr/lib/.%s", EXTRASMENU);
++    (void) sprintf(tmp, "/usr/local/lib/.%s", EXTRASMENU);
+     result = xv_strsave(tmp);
  
+ found:
+@@ -639,7 +649,6 @@
+ /*
+  * Are there any shell meta-characters in string s?
+  */
+-static
+ any_shell_meta_e_menu(s)
+     register char  *s;
+ {
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
index 2d3274bf6e4d..7e3a5f92578d 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_file.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_file.c
@@ -1,22 +1,21 @@
---- 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 @@
+--- lib/libxview/textsw/txt_file.c.orig	2005-03-28 06:40:33.000000000 -0800
++++ lib/libxview/textsw/txt_file.c	2012-02-03 10:12:40.144095469 -0800
+@@ -18,10 +18,13 @@
  #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))
+-#if defined(SVR4) || defined(__linux__) || defined(__CYGWIN__)
++#if defined(SVR4) || defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__)
  #include <dirent.h>
  #include <string.h>
  #include <unistd.h>
-+#ifdef BSD4_4
++#ifdef __FreeBSD__
 +#include <sys/file.h>
 +#endif
- #else
- #include <sys/dir.h>
- #include <sys/file.h>
-@@ -33,7 +37,6 @@
+ #if defined(__linux__) || defined(__CYGWIN__)
+ #include <sys/types.h>
+ #include <fcntl.h>
+@@ -37,7 +40,6 @@
   */
  #undef MIN
  #undef MAX
@@ -24,45 +23,45 @@
  #include <xview/notice.h>
  #include <xview/frame.h>
  #include <errno.h>
-@@ -45,13 +48,16 @@
+@@ -47,7 +49,7 @@
+ 	if ((unsigned)(to_test) != 0) (flags) |= (flag);	\
+ 	else (flags) &= ~(flag)
  
- extern CHAR    *STRCAT();
- extern CHAR    *STRNCAT();
--#ifdef SVR4
-+#if (defined(BSD4_4) || defined(SVR4))
+-#if defined(SVR4) || defined(__linux__) || defined(__CYGWIN__)
++#if defined(SVR4) || defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__)
  extern char    *getcwd();
  #else
  extern char    *getwd();
- #endif /* SVR4 */
--extern int      errno, sys_nerr;
--extern char    *sys_errlist[];
-+extern int	errno;
+@@ -56,6 +58,10 @@
+ #if (defined(__linux__) && defined(__GLIBC__)) || defined(__CYGWIN__)
+ /* martin.buck@bigfoot.com */
+ #include <errno.h>
++#elif defined(__FreeBSD__)
++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 @@
+ #else
+ extern int      errno, sys_nerr;
+ extern char    *sys_errlist[];
+@@ -368,7 +374,7 @@
      }
  
  #ifdef		OW_I18N
--#ifdef SVR4
-+#if (defined(BSD4_4) || defined(SVR4)) 
+-#if defined(SVR4) || defined(__linux__) || defined(__CYGWIN__)
++#if defined(SVR4) || defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__)
      if (getcwd(pathname_mb, MAXPATHLEN) == 0)
  #else
      if (getwd(pathname_mb) == 0)
-@@ -364,7 +370,7 @@
+@@ -378,7 +384,7 @@
  
  #else		/* OW_I18N */
  
--#ifdef SVR4
-+#if (defined(BSD4_4) || defined(SVR4)) 
+-#if defined(SVR4) || defined(__linux__) || defined(__CYGWIN__)
++#if defined(SVR4) || defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__)
      if (getcwd(pathname, MAXPATHLEN) == 0)
  #else
      if (getwd(pathname) == 0)
-@@ -1538,7 +1544,7 @@
+@@ -1552,7 +1558,7 @@
      int             cmd_is_undo_all_edit;	/* This is for doing an "Undo
  						 * All edit" */
  {
@@ -71,7 +70,7 @@
      pkg_private Es_status textsw_checkpoint_internal();
  #else /* SVR4 */
      static Es_status textsw_checkpoint_internal();
-@@ -2386,7 +2392,7 @@
+@@ -2400,7 +2406,7 @@
      return (result);
  }
  
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
index 07e91cdf21dd..ac1bec3ac778 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_filter.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_filter.c
@@ -1,31 +1,30 @@
---- 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"
+--- lib/libxview/textsw/txt_filter.c.orig	2005-03-28 06:40:33.000000000 -0800
++++ lib/libxview/textsw/txt_filter.c	2012-02-03 10:15:09.976397060 -0800
+@@ -17,7 +17,7 @@
+ #include <sys/types.h>
  #include <sys/file.h>
  #include <unistd.h>
--#ifdef SVR4
-+#include <sys/param.h>
-+#if (defined(BSD4_4) || defined(SVR4))
+-#if defined SVR4 || defined __CYGWIN__
++#if defined SVR4 || defined __CYGWIN__ || defined __FreeBSD__
  #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
+@@ -38,7 +38,7 @@
  #include <vfork.h>
-@@ -54,6 +57,9 @@
- #define	REPLY_ERROR	-1
+ #endif /* SVR4 */
+ #endif
+-#if defined(__linux__) || defined(__CYGWIN__)
++#if defined(__linux__) || defined(__CYGWIN__) || defined __FreeBSD__
+ #include <unistd.h>
+ #endif
+ #include <sys/errno.h>
+@@ -58,6 +58,9 @@
  #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_once.c b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_once.c
index 167d2c541d64..f6b265885b8b 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_once.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_once.c
@@ -1,30 +1,31 @@
---- lib/libxview/textsw/txt_once.c.orig	Thu Oct  5 19:18:11 2006
-+++ lib/libxview/textsw/txt_once.c	Thu Oct  5 19:51:36 2006
-@@ -44,7 +44,9 @@
+--- lib/libxview/textsw/txt_once.c.orig	2012-02-04 10:11:25.924750298 -0800
++++ lib/libxview/textsw/txt_once.c	2012-02-04 10:26:43.570466001 -0800
+@@ -44,7 +44,7 @@
  #ifdef OW_I18N
  #include <xview_private/draw_impl.h>
  #endif
--#ifdef SVR4
-+
-+#include <sys/param.h>
-+#if (defined(BSD4_4) || defined(SVR4))
+-#if defined SVR4 || __CYGWIN__
++#if defined SVR4 || __CYGWIN__ || defined __FreeBSD__
  #include <dirent.h>
  #else
  #include <sys/dir.h>
-@@ -1084,6 +1086,7 @@
- 	}
-     }
+@@ -1091,6 +1091,7 @@
+     /* Remove from the list. */
+     textsw_unlink_view(folio, view);
      /* 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,8 @@
+@@ -1357,7 +1358,11 @@
  	    
  	xv_destroy(view->drop_site);
  	textsw_view_cleanup(view);
-+
++#ifdef __FreeBSD__
 +	((Xv_textsw_view *) (view_public))->private_data = NULL;
++#else
+ 	VIEW_PRIVATE(view_public) = NULL; /* WG Mar '95 */
++#endif
  	break;
  
        default:			/* Conservative in face of new cases. */
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_search.c b/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_search.c
deleted file mode 100644
index 282f5b3a04e7..000000000000
--- a/x11-toolkits/xview/files/patch-lib+libxview+textsw+txt_search.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/libxview/textsw/txt_search.c.orig	Sun Mar 26 01:12:40 2006
-+++ lib/libxview/textsw/txt_search.c	Sun Mar 26 01:13:17 2006
-@@ -79,7 +79,7 @@
-     if (direction == EV_FIND_DEFAULT)
- 	first = last_plus_one;
- 
--    STRNCPY(buf, (CHAR *) panel_get(search_panel_items[(int) FIND_STRING_ITEM],
-+    (STRNCPY) (buf, (CHAR *) panel_get(search_panel_items[(int) FIND_STRING_ITEM],
- #ifdef OW_I18N
- 				PANEL_VALUE_WCS, NULL),
- #else
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
index 31c11b8c8038..bdcd28865eb0 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+cim_size.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+cim_size.c
@@ -1,26 +1,38 @@
---- ./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()
+--- lib/libxview/ttysw/cim_size.c.orig	2005-03-28 06:41:31.000000000 -0800
++++ lib/libxview/ttysw/cim_size.c	2012-02-03 11:32:42.637883645 -0800
+@@ -156,7 +156,7 @@
  {
  
      if (lines_ptr) {
--        cfree((CHAR *) (lines_ptr));
-+        free((CHAR *) (lines_ptr));
+-#ifndef __CYGWIN__
++#if !defined(__CYGWIN__) && !defined(__FreeBSD__)
+         cfree((CHAR *) (lines_ptr));
+ #else
+         free((CHAR *) (lines_ptr));
+@@ -164,7 +164,7 @@
  	lines_ptr = NULL;
      }
      if (image) {
--        cfree((CHAR **) image);
-+        free((CHAR **) image);
+-#ifndef __CYGWIN__
++#if !defined(__CYGWIN__) && !defined(__FreeBSD__)
+         cfree((CHAR **) image);
+ #else
+         free((CHAR **) image);
+@@ -172,7 +172,7 @@
  	image = NULL;
      }
      if (mode_ptr) {
--	cfree((char *) (mode_ptr));
-+	free((char *) (mode_ptr));
+-#ifndef __CYGWIN__
++#if !defined(__CYGWIN__) && !defined(__FreeBSD__)
+ 	cfree((char *) (mode_ptr));
+ #else
+         free((char *) (mode_ptr));
+@@ -180,7 +180,7 @@
  	mode_ptr = NULL;
      }
      if (screenmode) {
--	cfree((char **) screenmode);
-+	free((char **) screenmode);
- 	screenmode = NULL;
-     }
- }
+-#ifndef __CYGWIN__
++#if !defined(__CYGWIN__) && !defined(__FreeBSD__)
+ 	cfree((char **) screenmode);
+ #else
+         free((char **) screenmode);
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
index cab22dfc066e..95874c4c87dd 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+term_ntfy.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+term_ntfy.c
@@ -1,33 +1,29 @@
---- lib/libxview/ttysw/term_ntfy.c.orig	Sat Aug  6 21:47:27 2005
-+++ lib/libxview/ttysw/term_ntfy.c	Sat Aug  6 22:03:25 2005
-@@ -22,7 +22,8 @@
+--- lib/libxview/ttysw/term_ntfy.c.orig	2012-02-07 17:28:16.554359417 -0800
++++ lib/libxview/ttysw/term_ntfy.c	2012-02-07 17:34:31.010651930 -0800
+@@ -22,7 +22,7 @@
  #include <stdio.h>
  #include <ctype.h>
  #include <string.h>
--#ifdef SVR4
-+#include <sys/param.h>
-+#if (defined(BSD4_4) || defined(SVR4))
+-#if defined(SVR4) || defined(__linux__) || defined(__CYGWIN__)
++#if defined(SVR4) || defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__)
  #include <unistd.h>
  #endif
  
-@@ -63,7 +64,7 @@
+@@ -63,7 +63,7 @@
  /* performance: global cache of getdtablesize() */
  extern int      dtablesize_cache;
  
--#ifdef SVR4
-+#if (defined(BSD4_4) || defined(SVR4))
+-#if defined(SVR4) || defined(__linux__) || defined(__CYGWIN__)
++#if defined(SVR4) || defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__)
  #define GETDTABLESIZE() \
  (dtablesize_cache?dtablesize_cache:(dtablesize_cache=(int)sysconf(_SC_OPEN_MAX)))
  #else
-@@ -173,9 +174,11 @@
+@@ -173,7 +173,7 @@
       * again, this is the place to start looking.
       */
      if (ttysw->pending_remote != ttysw->remote) {
-+#ifdef TIOCREMOTE
+-#if !(defined(__linux__) || defined(__CYGWIN__)) || defined(TIOCREMOTE)
++#if !(defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__)) || defined(TIOCREMOTE)
  	if (ioctl(ttysw->ttysw_pty, TIOCREMOTE, &ttysw->pending_remote) < 0)
  	    perror("ioctl: TIOCREMOTE");
  	else
-+#endif
- 	    ttysw->remote = ttysw->pending_remote;
-     }
- 
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+termsw.c b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+termsw.c
deleted file mode 100644
index 5bf01fec7575..000000000000
--- a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+termsw.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/libxview/ttysw/termsw.c.orig	Sat Aug  6 21:47:27 2005
-+++ lib/libxview/ttysw/termsw.c	Sat Aug  6 22:04:10 2005
-@@ -413,7 +413,9 @@
- 
-     /* Set the PTY to operate as a "remote terminal". */
-     fd = (int) xv_get(termsw_public, TTY_PTY_FD);
-+#ifdef TIOCREMOTE
-     (void) ioctl(fd, TIOCREMOTE, &on);
-+#endif /* TIOCREMOTE */
-     ttysw_folio->remote = ttysw_folio->pending_remote = on;
- 
-     /*
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty.c b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty.c
index 4fe61b08fca0..328016347a80 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty.c
@@ -1,20 +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
+--- lib/libxview/ttysw/tty.c.orig	2005-03-28 06:41:31.000000000 -0800
++++ lib/libxview/ttysw/tty.c	2012-02-03 11:42:08.176574457 -0800
 @@ -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))
+-#if !defined SVR4 && !defined __CYGWIN__
++#if !defined SVR4 && !defined __CYGWIN__ && !defined __FreeBSD__
      union wait     *status;
  #else
      int     *status;
-@@ -586,7 +586,7 @@
+@@ -592,7 +592,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))
+-#if !defined SVR4 && !defined __CYGWIN__
++#if !defined SVR4 && !defined __CYGWIN__ && !defined __FreeBSD__
      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
index 10f41fc213d3..8daf9ddadbb3 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_gtty.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_gtty.c
@@ -1,6 +1,6 @@
---- ./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 
+--- lib/libxview/ttysw/tty_gtty.c.orig	2005-03-28 06:41:31.000000000 -0800
++++ lib/libxview/ttysw/tty_gtty.c	2012-02-04 10:05:24.248305867 -0800
+@@ -14,6 +14,7 @@
   * Ttysw parameter retrieval mechanism to get original tty settings to pty.
   */
  
@@ -8,19 +8,13 @@
  #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 */
+@@ -93,7 +94,20 @@
+ 	CREPRINT, CDISCARD, CWERASE, CLNEXT,
+ 	CEOL2
  };
-+#else
+-	
++
++#elif defined(BSD) && (BSD >= 199103)
 +#include <sys/ttydefaults.h>
 +static struct termios default_modes = {
 +	TTYDEF_IFLAG,   /* input modes */
@@ -32,8 +26,7 @@
 +	_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 */
- 
++};
+ #else /* __linux__ */
+ static struct termios	default_modes = {
+ 	BRKINT|ICRNL|IXON|IGNPAR|IMAXBEL,	    	/* input modes */
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
index 853d3ed79f9f..c7f117be83a6 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_impl.h
+++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_impl.h
@@ -1,5 +1,5 @@
---- 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
+--- lib/libxview/ttysw/tty_impl.h.orig	2005-03-28 06:41:31.000000000 -0800
++++ lib/libxview/ttysw/tty_impl.h	2012-02-03 11:51:09.464890989 -0800
 @@ -14,6 +14,7 @@
   * terminal emulation for teletype based programs.
   */
@@ -15,10 +15,10 @@
 +#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 & OXTABS)
++#else
  #define	tty_gettabs(t)		((t)->termios.c_oflag & XTABS)
 +#endif
+ #if !(defined(__linux__)||defined(__CYGWIN__)) || defined(VDSUSP)
  #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]))
+ #else
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
index c0901b49487e..ecd46446f33b 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_init.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_init.c
@@ -1,5 +1,5 @@
---- lib/libxview/ttysw/tty_init.c.orig	1993-06-28 22:17:19.000000000 -0700
-+++ lib/libxview/ttysw/tty_init.c	2011-09-26 12:14:34.093549504 -0700
+--- lib/libxview/ttysw/tty_init.c.orig	2012-02-07 17:09:17.565198180 -0800
++++ lib/libxview/ttysw/tty_init.c	2012-02-07 17:16:27.392427537 -0800
 @@ -14,6 +14,7 @@
   * Ttysw initialization, destruction and error procedures
   */
@@ -8,37 +8,30 @@
  #include <sys/time.h>
  #include <sys/types.h>
  #include <sys/stat.h>
-@@ -23,10 +24,17 @@
- 
- #include <xview_private/portable.h>	/* for XV* defines and termios */
+@@ -36,7 +37,11 @@
+ #endif
  
+ #ifndef SVR4
 +#if defined(__FreeBSD_version) && __FreeBSD_version > 900007
-+#define SVR4
-+#define XV_USE_SVR4_PTYS
-+#endif
-+
- #ifdef	XV_USE_SVR4_PTYS
-+#if !(defined(__FreeBSD_version) && __FreeBSD_version > 900007)
- #include <sys/stream.h>
- #include <sys/stropts.h>
- #include <sys/bufmod.h>
++#include <utmpx.h>
++#else
+ #include <utmp.h>
 +#endif
- #endif	/* XV_USE_SVR4_PTYS */
- 
- #ifndef SVR4
-@@ -82,7 +90,11 @@
+ #else
+  /* #include <sys/sigaction.h> */  /* vmh - 7/16/90 The compiler chokes
+   * on the redefinition of sigaction, and on siginfo_t. Removing this
+@@ -94,7 +99,9 @@
+ #define jcsetpgrp(p)	setpgrp((p),(p))
+ #endif
  
- extern char    *strncpy();
- extern char    *strcpy();
+-#ifndef __CYGWIN__
 +#if (defined(BSD) && (BSD >= 199306))
-+extern off_t	lseek();
-+#else
++extern off_t  lseek();
++#elif !defined(__CYGWIN__)
  extern long     lseek();
-+#endif
+ #endif
  char           *textsw_checkpoint_undo();
- 
- /* static */ void ttysw_parseargs();
-@@ -106,6 +118,7 @@
+@@ -120,6 +127,7 @@
  
  extern int      ttysel_use_seln_service;
  
@@ -46,30 +39,7 @@
  
  struct ttysw_createoptions {
      int             becomeconsole;	/* be the console */
-@@ -403,14 +416,22 @@
-     int             fdflags;
- 
- #ifdef SVR4
-+#if defined(__FreeBSD_version) && __FreeBSD_version > 900007
-+    if ((fdflags = fcntl(fd, F_GETFL, 0)) == -1)
-+#else
-     if ((fdflags = xv_fcntl(fd, F_GETFL, 0)) == -1)
-+#endif
- #else
-     if ((fdflags = fcntl(fd, F_GETFL, 0)) == -1)
- #endif
- 	return (-1);
-     fdflags |= FNDELAY;
- #ifdef SVR4
-+#if defined(__FreeBSD_version) && __FreeBSD_version > 900007
-+    if (fcntl(fd, F_SETFL, fdflags) == -1)
-+#else
-     if (xv_fcntl(fd, F_SETFL, fdflags) == -1)
-+#endif
- #else
-     if (fcntl(fd, F_SETFL, fdflags) == -1)
- #endif
-@@ -518,6 +539,9 @@
+@@ -574,6 +582,9 @@
      (void) dup2(ttysw->ttysw_tty, 2);
      (void) close(ttysw->ttysw_tty);
  
@@ -79,7 +49,7 @@
      if (*argv == (char *) NULL || strcmp("-c", *argv) == 0) {
  	/* Process arg list */
  	int             argc;
-@@ -544,15 +568,25 @@
+@@ -600,17 +611,27 @@
   * ttcompat seems to leave things in a funny state and assumes
   * (seemingly) that login will fix things up.  Do it here.
   */
@@ -105,7 +75,9 @@
  #endif /* BSD_TTY_COMPAT */
  #endif /* SVR4 */
  
-@@ -739,7 +773,9 @@
+     /* restore various signals to their defaults */
+     signal (SIGINT, SIG_DFL);
+@@ -801,7 +822,9 @@
  
  #ifdef SB_NO_DROPS /* defined as result of including new bufmod.h */
  
@@ -115,9 +87,9 @@
        
        /* we can't push bufmod... this means we're probably 
  	 running on a generic SVR4 system - we can ignore this
-@@ -864,13 +900,16 @@
- #endif SB_NO_DROPS
+@@ -925,13 +948,16 @@
  
+ #endif
  
 +#ifndef __FreeBSD_version
      if (ioctl(pty, I_PUSH, "pckt") == -1) { /* must use getmsg for read */
@@ -132,7 +104,7 @@
      if (ioctl(tty, I_PUSH, "ptem") == -1) {
          perror("push ptem");
  	return XV_ERROR;
-@@ -879,12 +918,15 @@
+@@ -940,12 +966,15 @@
          perror("push ldterm");
  	return XV_ERROR;
      }
@@ -146,9 +118,25 @@
  #endif
 +#endif
   
- #endif /* SVR4 */
+ #endif
+ #endif
+@@ -998,7 +1027,7 @@
+  */
  
-@@ -955,7 +997,11 @@
+ #ifndef SVR4
+-#if !defined __linux__ && !defined __CYGWIN__
++#if !defined __linux__ && !defined __CYGWIN__ && !(defined(__FreeBSD_version) && __FreeBSD_version > 900007)
+ /*
+  * Make entry in /etc/utmp for ttyfd. Note: this is dubious usage of
+  * /etc/utmp but many programs (e.g. sccs) look there when determining who is
+@@ -1013,13 +1042,17 @@
+     /*
+      * Update /etc/utmp
+      */
+-#ifndef SVR4
++#if !defined(SVR4) && !(defined(__FreeBSD_version) && __FreeBSD_version > 900007)
+     struct utmp     utmp;
+ #else
      struct utmpx     utmp;
  #endif
      struct passwd  *passwdent;
@@ -160,15 +148,40 @@
      int             f;
      char           *ttyn;
      extern char    *ttyname();
-@@ -1007,13 +1053,22 @@
+@@ -1035,8 +1068,13 @@
+ 	}
+ 	username = passwdent->pw_name;
+     }
++#if defined(__FreeBSD_version) && __FreeBSD_version > 900007
++    utmp.ut_user[0] = '\0';	/* Set incase *username is 0 */
++    (void) strncpy(utmp.ut_user, username, sizeof(utmp.ut_user));
++#else
+     utmp.ut_name[0] = '\0';	/* Set incase *username is 0 */
+     (void) strncpy(utmp.ut_name, username, sizeof(utmp.ut_name));
++#endif
+     /*
+      * Get line (tty) name
+      */
+@@ -1051,7 +1089,7 @@
+     /*
+      * Get start time
+      */
+-#ifndef SVR4
++#if !defined(SVR4) && !(defined(__FreeBSD_version) && __FreeBSD_version > 900007)
+     (void) time((time_t *) (&utmp.ut_time));
+ #else
+     (void) time((time_t *) (&utmp.ut_tv));
+@@ -1071,13 +1109,24 @@
  		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 defined(__FreeBSD_version) && __FreeBSD_version < 900007
 +    if ((f = open(_PATH_UTMP, 1)) >= 0) {
 +#endif
++#endif
  	(void) lseek(f, (long) (ttyslotuse * sizeof(utmp)), 0);
  	(void) write(f, (char *) &utmp, sizeof(utmp));
  	(void) close(f);
@@ -183,3 +196,62 @@
  	return (0);
      }
      return (ttyslotuse);
+@@ -1093,7 +1142,11 @@
+     /*
+      * Update /etc/utmp
+      */
++#if defined(__FreeBSD_version) && __FreeBSD_version >= 900007
++    struct utmpx    utmp;
++#else
+     struct utmp     utmp;
++#endif
+     struct passwd  *passwdent;
+     int             f;
+     char           *ttyn;
+@@ -1117,8 +1170,13 @@
+       if (!(*username))
+         utmp.ut_type = DEAD_PROCESS; /* "" as username, logging out */
+ 
++#if defined(__FreeBSD_version) && __FreeBSD_version >= 900007
++    utmp.ut_id[0] = '\0';	/* Set incase *username is 0 */
++    (void) strncpy(utmp.ut_id, username, sizeof(utmp.ut_id));
++#else
+     utmp.ut_name[0] = '\0';	/* Set incase *username is 0 */
+     (void) strncpy(utmp.ut_name, username, sizeof(utmp.ut_name));
++#endif
+     /*
+      * Get line (tty) name
+      */
+@@ -1135,14 +1193,32 @@
+     /*
+      * Get start time
+      */
++#if defined(__FreeBSD_version) && __FreeBSD_version >= 900007
++    {
++      struct timeval tv;
++
++      if (gettimeofday(&tv, NULL))
++	return errno;
++      utmp.ut_tv.tv_sec = tv.tv_sec;
++      utmp.ut_tv.tv_usec = tv.tv_usec;
++    }
++#else
+     (void) time((time_t *) (&utmp.ut_time));
++#endif
+     /*
+      * Put utmp in /etc/utmp
+      */
++#if defined(__FreeBSD_version) && __FreeBSD_version >= 900007
++    setutxent();
++    (void)getutxline(&utmp);
++    pututxline(&utmp);
++    endutxent();
++#else
+     setutent();
+     (void)getutline(&utmp);
+     pututline(&utmp);
+     endutent();
++#endif
+     return 1;        /* Return dummy value for ttyslot number */
+ }
+ #endif
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
index 06c245feb374..04fc5349de32 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_main.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_main.c
@@ -1,6 +1,6 @@
---- 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 @@
+--- lib/libxview/ttysw/tty_main.c.orig	2005-03-28 06:41:31.000000000 -0800
++++ lib/libxview/ttysw/tty_main.c	2012-02-03 12:15:40.077487003 -0800
+@@ -60,12 +60,14 @@
  #include <wctype.h>
  #include <stdlib.h>
  #include <xview_private/charimage.h>
@@ -9,7 +9,15 @@
  #include <X11/Xlib.h>
  #endif /* FULL_R5 */    
  #endif
-@@ -75,6 +75,11 @@
+ 
+-#if (defined(__linux__) && defined(__GLIBC__)) || defined(__CYGWIN__)
++#include <sys/param.h>
++
++#if (defined(__linux__) && defined(__GLIBC__)) || defined(__CYGWIN__) || (defined(__FreeBSD__) && defined(__FreeBSD_version) && __FreeBSD_version > 900007)
+ /* martin.buck@bigfoot.com */
+ #include <sys/ioctl.h>
+ #endif
+@@ -80,6 +82,11 @@
  int     committed_left = 0;
  #endif
  
@@ -21,16 +29,3 @@
  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
index cab7af7e6e98..8761d41f4574 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_mapkey.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_mapkey.c
@@ -1,21 +1,20 @@
---- 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 @@
+--- lib/libxview/ttysw/tty_mapkey.c.orig	2005-03-28 06:41:31.000000000 -0800
++++ lib/libxview/ttysw/tty_mapkey.c	2012-02-03 12:18:01.439658731 -0800
+@@ -12,7 +12,7 @@
  
  #include <stdio.h>
  #include <ctype.h>
--#ifdef SVR4
-+#include <sys/param.h>
-+#if (defined(BSD4_4) || defined(SVR4))
+-#if defined SVR4 || defined __linux__ || defined __CYGWIN__ 
++#if defined SVR4 || defined __linux__ || defined __CYGWIN__ || defined __FreeBSD__
  #include <string.h>
  #endif
  #include <sys/types.h>
-@@ -500,7 +501,7 @@
+@@ -507,7 +507,7 @@
   * have more time.
   */
  
--#ifdef i386
-+#if defined(i386) && !defined (__FreeBSD__)
+-#if defined(i386) && !defined(__linux__) && !defined(__CYGWIN__)
++#if defined(i386) && !defined(__linux__) && !defined(__CYGWIN__) && !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_modes.c b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_modes.c
deleted file mode 100644
index ae60a68cf0d5..000000000000
--- a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_modes.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- lib/libxview/ttysw/tty_modes.c.orig	Sat Aug  6 21:47:27 2005
-+++ lib/libxview/ttysw/tty_modes.c	Sat Aug  6 22:01:01 2005
-@@ -125,9 +125,11 @@
- 	/*
- 	 * Switch the pty out of remote mode.
- 	 */
-+#   if defined(TIOCREMOTE)
- 	if (ioctl(ttysw->ttysw_pty, TIOCREMOTE, &off) < 0)
- 	    perror("ioctl: TIOCREMOTE");
- 	else
-+#   endif
- 	    ttysw->remote = ttysw->pending_remote = off;
-     }
- 
-@@ -276,9 +278,11 @@
-      */
-     ttysw_getp((Ttysw_view_handle) ttysw_view);
-     ttysw->pending_remote = termsw->cooked_echo;
-+#   if defined(TIOCREMOTE)
-     if (ioctl(ttysw->ttysw_pty, TIOCREMOTE, &ttysw->pending_remote) < 0)
- 	perror("ioctl: TIOCREMOTE");
-     else
-+#   endif /* TIOCREMOTE */
- 	ttysw->remote = ttysw->pending_remote;
- 
-     if (!ttysw_waiting_for_pty_input) {
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_newtxt.c b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_newtxt.c
deleted file mode 100644
index badb327cf000..000000000000
--- a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_newtxt.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/libxview/ttysw/tty_newtxt.c.orig	Sun Mar 26 00:27:19 2006
-+++ lib/libxview/ttysw/tty_newtxt.c	Sun Mar 26 00:27:49 2006
-@@ -34,6 +34,7 @@
-  */
- 
- 
-+#include <X11/Xlibint.h>
- #include <xview/window.h>
- #include <xview_private/pw_impl.h>
- #include <pixrect/pixrect.h>
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
index dd6d02c374e2..5a13408a12dc 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_ntfy.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+tty_ntfy.c
@@ -1,29 +1,34 @@
---- 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.
+--- lib/libxview/ttysw/tty_ntfy.c.orig	2005-03-28 06:41:31.000000000 -0800
++++ lib/libxview/ttysw/tty_ntfy.c	2012-02-03 12:33:30.543933995 -0800
+@@ -186,6 +186,8 @@
+      * group nevertheless.
       */
-     /* 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
-     /*
+     if (ioctl(ttysw->ttysw_pty, TIOCGPGRP, &pgrp) == -1) {
++#elif (defined(BSD) && (BSD >= 199103))
++    if (pgrp = tcgetpgrp(ttysw->ttysw_pty) == -1 ) {
+ #elif defined(__CYGWIN__)
+     if (tcgetpgrp(ttysw->ttysw_pty) == -1 ) {
+ #else
+@@ -198,10 +200,12 @@
       * 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) {
+ #if !defined __linux__
+     if (getpgrp(0) != pgrp)
+ #else
+-    if (getpgrp() != pgrp)
++    if (pgrp = getpgrp() != pgrp)
 +#endif
+ #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
+ 	 * killpg could return -1 with errno == ESRCH but this is OK.
+@@ -230,7 +234,7 @@
+ #if defined __linux__
+     /* See the comment in ttysw_sigwinch */
+     if (ioctl(ttysw->ttysw_pty, TIOCGPGRP, &control_pg) >= 0) {
+-#elif defined(__CYGWIN__)
++#elif defined(__CYGWIN__) || defined(BSD) && (BSD >= 199103)
+     control_pg = tcgetpgrp(ttysw->ttysw_pty);
+     if ( control_pg >= 0 ) {
+ #else
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+ttyansi.c b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+ttyansi.c
index 5d5e9f00e298..a9566176e572 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+ttysw+ttyansi.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+ttysw+ttyansi.c
@@ -1,13 +1,12 @@
---- ./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.
+--- lib/libxview/ttysw/ttyansi.c.orig	2005-03-28 06:41:31.000000000 -0800
++++ lib/libxview/ttysw/ttyansi.c	2012-02-03 12:45:50.351507890 -0800
+@@ -31,6 +31,9 @@
+ #include <xview_private/ttyansi.h>
  
  #include <xview/sel_attrs.h>
++static int    send_input_to_textsw();
++static int    ansi_lf();
++static int    ansi_char();
  
-+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+wmgr+wmgr_menu.c b/x11-toolkits/xview/files/patch-lib+libxview+wmgr+wmgr_menu.c
index 45a1cdf51a59..1964f2992285 100644
--- a/x11-toolkits/xview/files/patch-lib+libxview+wmgr+wmgr_menu.c
+++ b/x11-toolkits/xview/files/patch-lib+libxview+wmgr+wmgr_menu.c
@@ -1,16 +1,13 @@
---- lib/libxview/wmgr/wmgr_menu.c.orig	Tue Jun 29 07:17:24 1993
-+++ lib/libxview/wmgr/wmgr_menu.c	Fri Aug 19 15:57:04 2005
-@@ -14,13 +14,6 @@
+--- lib/libxview/wmgr/wmgr_menu.c.orig	2005-03-28 06:41:51.000000000 -0800
++++ lib/libxview/wmgr/wmgr_menu.c	2012-02-03 12:56:34.963007532 -0800
+@@ -14,8 +14,8 @@
  #include <stdio.h>
  #include <ctype.h>
  #include <string.h>
--#ifdef sparc
--#ifdef SVR4
--#include <unistd.h>
--#else
--#include <vfork.h>
--#endif SVR4
--#endif
- 
- #include <xview/frame.h>
- #include <xview/wmgr.h>
+-#if defined(sparc) || defined(__linux__) || defined(__CYGWIN__)
+-#if defined(SVR4) || defined(__linux__) || defined(__CYGWIN__)
++#if defined(sparc) || defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__)
++#if defined(SVR4) || defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__)
+ #include <unistd.h>
+ #else
+ #include <vfork.h>
diff --git a/x11-toolkits/xview/files/patch-lib+misc+support+Imakefile b/x11-toolkits/xview/files/patch-lib+misc+support+Imakefile
deleted file mode 100644
index b948e71a6014..000000000000
--- a/x11-toolkits/xview/files/patch-lib+misc+support+Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-libolgx-ol_init.c b/x11-toolkits/xview/files/patch-lib-libolgx-ol_init.c
new file mode 100644
index 000000000000..20e1e3ac08ce
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib-libolgx-ol_init.c
@@ -0,0 +1,12 @@
+--- lib/libolgx/ol_init.c.orig	2012-02-03 13:24:25.181587269 -0800
++++ lib/libolgx/ol_init.c	2012-02-03 13:26:13.093464170 -0800
+@@ -9,7 +9,9 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#ifndef __FreeBSD__
+ #include <malloc.h>
++#endif
+ #include <X11/Xlib.h>
+ #include "olgx_impl.h"
+ #include "busy.h"
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..c658d6faa130
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib-libxview-filter-filter.c
@@ -0,0 +1,28 @@
+--- lib/libxview/filter/filter.c.orig	2012-02-03 13:34:17.201860917 -0800
++++ lib/libxview/filter/filter.c	2012-02-03 13:37:57.245727053 -0800
+@@ -209,7 +209,7 @@
+     free((char *) table);
+ }
+ 
+-static struct CharAction
++struct CharAction
+ digits(c)
+     char            c;
+ {
+@@ -226,7 +226,7 @@
+ }
+ 
+ 
+-static enum CharClass
++enum CharClass
+ breakProc(c)
+     char            c;
+ {
+@@ -246,7 +246,6 @@
+ /*
+  * Are there any shell meta-characters in string s?
+  */
+-static
+ any_shell_meta_filter(s)
+     register char  *s;
+ {
diff --git a/x11-toolkits/xview/files/patch-lib-libxview-ttysw-termsw.c b/x11-toolkits/xview/files/patch-lib-libxview-ttysw-termsw.c
new file mode 100644
index 000000000000..2d838a17e87b
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib-libxview-ttysw-termsw.c
@@ -0,0 +1,11 @@
+--- lib/libxview/ttysw/termsw.c.orig	2012-02-07 17:35:21.611504567 -0800
++++ lib/libxview/ttysw/termsw.c	2012-02-07 17:41:35.657788530 -0800
+@@ -418,7 +418,7 @@
+ 
+     /* Set the PTY to operate as a "remote terminal". */
+     fd = (int) xv_get(termsw_public, TTY_PTY_FD);
+-#if !(defined(__linux__) || defined(__CYGWIN__)) || defined(TIOCREMOTE)
++#if !(defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__)) || defined(TIOCREMOTE)
+     (void) ioctl(fd, TIOCREMOTE, &on);
+ #endif
+     ttysw_folio->remote = ttysw_folio->pending_remote = on;
diff --git a/x11-toolkits/xview/files/patch-lib-libxview-ttysw-tty_modes.c b/x11-toolkits/xview/files/patch-lib-libxview-ttysw-tty_modes.c
new file mode 100644
index 000000000000..90503d45441a
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib-libxview-ttysw-tty_modes.c
@@ -0,0 +1,20 @@
+--- lib/libxview/ttysw/tty_modes.c.orig	2012-02-07 17:18:34.004531277 -0800
++++ lib/libxview/ttysw/tty_modes.c	2012-02-07 17:25:54.661975084 -0800
+@@ -125,7 +125,7 @@
+ 	/*
+ 	 * Switch the pty out of remote mode.
+ 	 */
+-#if !(defined(__linux__) || defined(__CYGWIN__)) || defined(TIOCREMOTE)
++#if !(defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__)) || defined(TIOCREMOTE)
+ 	if (ioctl(ttysw->ttysw_pty, TIOCREMOTE, &off) < 0)
+ 	    perror("ioctl: TIOCREMOTE");
+ 	else
+@@ -278,7 +278,7 @@
+      */
+     ttysw_getp((Ttysw_view_handle) ttysw_view);
+     ttysw->pending_remote = termsw->cooked_echo;
+-#if !(defined(__linux__) || defined(__CYGWIN__)) || defined(TIOCREMOTE)
++#if !(defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__)) || defined(TIOCREMOTE)
+     if (ioctl(ttysw->ttysw_pty, TIOCREMOTE, &ttysw->pending_remote) < 0)
+ 	perror("ioctl: TIOCREMOTE");
+     else
diff --git a/x11-toolkits/xview/files/patch-util+Imakefile b/x11-toolkits/xview/files/patch-util+Imakefile
deleted file mode 100644
index 2b5bb68599e7..000000000000
--- a/x11-toolkits/xview/files/patch-util+Imakefile
+++ /dev/null
@@ -1,47 +0,0 @@
---- util/conversion/Imakefile.orig	Sun May 18 19:48:42 2003
-+++ util/conversion/Imakefile	Sun May 18 19:49:39 2003
-@@ -3,6 +3,7 @@
- /**/##########################################################################
- /**/# @(#)Imakefile 1.3 89/12/29 SMI
- /**/# Imakefile for util/conversion
-+INCLUDES=	-I../../build/include
- 
- SEDFILES=	full1.sed		\
- 		full2.sed		\
---- util/xgettext/Imakefile.orig	Sun May 18 19:51:00 2003
-+++ util/xgettext/Imakefile	Sun May 18 19:51:27 2003
-@@ -2,6 +2,7 @@
- /**/# Imakefile for util/xgettext
- 
- #include	<XView.tmpl>
-+INCLUDES=	-I../../build/include
- 
- MANSUFFIX =1
- SimpleProgramTarget(xgettext)
---- util/cpp/Imakefile.orig	Sun May 18 19:58:54 2003
-+++ util/cpp/Imakefile	Sun May 18 19:59:49 2003
-@@ -5,6 +5,7 @@
- /**/# generate cpp....  But, for systems on which that isn't a problem, here
- /**/# is the proper Imakefile.
- /**/# 
-+INCLUDES=	-I../../build/include
- 
- #if defined(SystemV)
-      STRINGDEFS = 
---- util/msgfmt/Imakefile.orig	Sun May 18 20:00:36 2003
-+++ util/msgfmt/Imakefile	Sun May 18 20:01:17 2003
-@@ -1,5 +1,6 @@
- /**/# @(#)Imakefile	1.5 28 Jun 1993 SMI
- /**/# Imakefile for util/msgfmt
-+INCLUDES=	-I../../build/include
- 
- #include	<XView.tmpl>
- 
---- util/soelim/Imakefile.orig	Sun May 18 20:02:07 2003
-+++ util/soelim/Imakefile	Sun May 18 20:02:39 2003
-@@ -1,4 +1,5 @@
- #include <XView.tmpl>
-+INCLUDES=	-I../../build/include
- 
-            SRCS = soelim.c
-            OBJS = soelim.o 
diff --git a/x11-toolkits/xview/files/patch-util+xgettext+xgettext.c b/x11-toolkits/xview/files/patch-util+xgettext+xgettext.c
deleted file mode 100644
index 389593a626e1..000000000000
--- a/x11-toolkits/xview/files/patch-util+xgettext+xgettext.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
index 5be1e4e59080..2943168d1a0e 100644
--- a/x11-toolkits/xview/files/patch-util+xgettext+xgettext.h
+++ b/x11-toolkits/xview/files/patch-util+xgettext+xgettext.h
@@ -1,20 +1,11 @@
---- 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 @@
+--- util/xgettext/xgettext.h.orig	2005-03-28 06:41:59.000000000 -0800
++++ util/xgettext/xgettext.h	2012-02-03 13:13:01.859402717 -0800
+@@ -8,7 +8,7 @@
  #include <signal.h>
  #include <sys/types.h>
  
--#ifndef SVR4
-+#include <sys/param.h>
-+
-+#if !(defined(BSD4_4) || defined(SVR4))
- #include <sys/dir.h>
- #else
+-#if defined SVR4 || defined __CYGWIN__
++#if defined SVR4 || defined __CYGWIN__ || defined __FreeBSD__
  #include <dirent.h>
--#endif SVR4
-+#endif /* SVR4 */
- 
--#include <sys/param.h>
- #include <sys/stat.h>
- 
- #define DOMAIN_TOKEN    "domain"
+ #else
+ #include <sys/dir.h>
diff --git a/x11-toolkits/xview/files/patch-util-conversion-Imakefile b/x11-toolkits/xview/files/patch-util-conversion-Imakefile
new file mode 100644
index 000000000000..4b46af74d9ea
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-util-conversion-Imakefile
@@ -0,0 +1,10 @@
+--- util/conversion/Imakefile.orig	2005-03-28 06:41:58.000000000 -0800
++++ util/conversion/Imakefile	2012-02-03 13:02:07.758136242 -0800
+@@ -3,6 +3,7 @@
+ XCOMM ##########################################################################
+ XCOMM # @(#)Imakefile 1.3 89/12/29 SMI
+ XCOMM # Imakefile for util/conversion
++INCLUDES=	-I../../build/include
+ 
+ SEDFILES=	full1.sed		\
+ 		full2.sed		\
diff --git a/x11-toolkits/xview/files/patch-util-cpp-Imakefile b/x11-toolkits/xview/files/patch-util-cpp-Imakefile
new file mode 100644
index 000000000000..f3c2c80a6583
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-util-cpp-Imakefile
@@ -0,0 +1,10 @@
+--- util/cpp/Imakefile.orig	2005-03-28 06:41:57.000000000 -0800
++++ util/cpp/Imakefile	2012-02-03 13:05:40.311621530 -0800
+@@ -5,6 +5,7 @@
+ XCOMM # generate cpp....  But, for systems on which that isn't a problem, here
+ XCOMM # is the proper Imakefile.
+ XCOMM # 
++INCLUDES=	-I../../build/include
+ 
+ #if defined(SystemV)
+      STRINGDEFS = 
diff --git a/x11-toolkits/xview/files/patch-util-msgfmt-Imakefile b/x11-toolkits/xview/files/patch-util-msgfmt-Imakefile
new file mode 100644
index 000000000000..333e65897267
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-util-msgfmt-Imakefile
@@ -0,0 +1,9 @@
+--- util/msgfmt/Imakefile.orig	2005-03-28 06:41:59.000000000 -0800
++++ util/msgfmt/Imakefile	2012-02-03 13:01:00.097079040 -0800
+@@ -1,5 +1,6 @@
+ XCOMM # @(#)Imakefile	1.5 28 Jun 1993 SMI
+ XCOMM # Imakefile for util/msgfmt
++INCLUDES=	-I../../build/include
+ 
+ #include	<XView.tmpl>
+ 
diff --git a/x11-toolkits/xview/files/patch-util-soelim-Imakefile b/x11-toolkits/xview/files/patch-util-soelim-Imakefile
new file mode 100644
index 000000000000..1306d804dae3
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-util-soelim-Imakefile
@@ -0,0 +1,8 @@
+--- util/soelim/Imakefile.orig	2005-03-28 06:41:58.000000000 -0800
++++ util/soelim/Imakefile	2012-02-03 13:01:00.097079040 -0800
+@@ -1,4 +1,5 @@
+ #include <XView.tmpl>
++INCLUDES=	-I../../build/include
+ 
+            SRCS = soelim.c
+            OBJS = soelim.o 
diff --git a/x11-toolkits/xview/pkg-descr b/x11-toolkits/xview/pkg-descr
index 9b05fb74bf6b..d672b30c59c9 100644
--- a/x11-toolkits/xview/pkg-descr
+++ b/x11-toolkits/xview/pkg-descr
@@ -12,11 +12,11 @@ the XView libraries and applications.
 This package contains the libraries, headers and support files
 necessary to build XView applications.
 
+WWW:	http://www.physionet.org/physiotools/xview/
+
 Source Notes
 ------------
 This version of the XView source corresponds to that provided with
 OpenWindows Version 3.2 from SunSoft Inc.  Libraries generated with this
 source should be interchangeable with those from the OpenWindows Version 3.2
 release.
-
-WWW:	http://en.wikipedia.org/wiki/XView
diff --git a/x11-toolkits/xview/pkg-plist b/x11-toolkits/xview/pkg-plist
index 591fb5d76101..4ee47cf3e52a 100644
--- a/x11-toolkits/xview/pkg-plist
+++ b/x11-toolkits/xview/pkg-plist
@@ -133,6 +133,8 @@ include/images/confirm.pr
 include/images/confirm_left.pr
 include/images/confirm_middle.pr
 include/images/confirm_right.pr
+include/images/console.icon
+include/images/console_mask.icon
 include/images/copy.cursor
 include/images/copy_cursor.pr
 include/images/copyletter.cursor
author	Cy Schubert <cy@FreeBSD.org>	2012-02-08 06:54:54 +0000
committer	Cy Schubert <cy@FreeBSD.org>	2012-02-08 06:54:54 +0000
commit	6d0e01a6a190cb69e2ca83c6ff384b3bb49e3866 (patch)
tree	7fea847636d4e0ba6f486c87c87ce8d3a9b01ff6 /x11-toolkits/xview
parent	- fix build for FreeBSD 9.x (diff)