Upgrade to version 4.0

Submitted by:   giffunip@asme.org
PR:             6419

12 files changed, 912 insertions, 1052 deletions

diff --git a/x11-toolkits/FWF/Makefile b/x11-toolkits/FWF/Makefile
index f5516c69a4b1..5478d085625e 100644
--- a/x11-toolkits/FWF/Makefile
+++ b/x11-toolkits/FWF/Makefile
@@ -1,23 +1,23 @@
 # New ports collection makefile for:	FWF Widgets
-# Version required:	3.8
+# Version required:	4.0
 # Date created:		14 July 1995
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.9 1997/01/06 12:14:26 jkh Exp $
+# $Id: Makefile,v 1.10 1997/11/22 21:42:31 jseger Exp $
 #
 
-DISTNAME=	fwf-3.8
+DISTNAME=	fwf-4.0
 CATEGORIES=	x11
-MASTER_SITES=   ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=     widgets
+MASTER_SITES=	${MASTER_SITE_SUNSITE}	\
+		ftp://ftp.let.rug.nl/pub/FWF/
+MASTER_SITE_SUBDIR=libs/X/fwf
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	jseger@FreeBSD.org
 
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_IMAKE=	yes
 WRKSRC=		${WRKDIR}/FWF
-PATCH_STRIP=	-p1
 XMKMF=		env X11BASE=${X11BASE} WRKSRC=${WRKSRC} sh ${FILESDIR}/xmkmf
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/FWF/distinfo b/x11-toolkits/FWF/distinfo
index 6dc53a73bf39..c954ab2a791a 100644
--- a/x11-toolkits/FWF/distinfo
+++ b/x11-toolkits/FWF/distinfo
@@ -1 +1 @@
-MD5 (fwf-3.8.tar.gz) = 0cdc0ddd525d25c1d8875296725f95f9
+MD5 (fwf-4.0.tar.gz) = d7c43cbfbbcb23d63c02478e99c2cdd2
diff --git a/x11-toolkits/FWF/files/patch-aa b/x11-toolkits/FWF/files/patch-aa
index 6632cac77ba1..2009f6691e58 100644
--- a/x11-toolkits/FWF/files/patch-aa
+++ b/x11-toolkits/FWF/files/patch-aa
@@ -1,941 +1,81 @@
-diff -r -c FWF.orig/FWF.tmpl FWF/FWF.tmpl
-*** FWF.orig/FWF.tmpl	Wed Apr 19 08:28:49 1995
---- FWF/FWF.tmpl	Sat Jul 15 11:59:41 1995
+*** FWF.tmpl.orig	Thu Apr 18 07:00:06 1996
+--- FWF.tmpl	Sun Apr 26 00:06:16 1998
 ***************
-*** 26,32 ****
-  	Set if you also want Motif versions of the widgets (if available)
+*** 33,53 ****
+  
+  #define WantMotifVersions 1
+  
+! MOTIFINC = -I/usr/MOTIF/include
+! XMLIB = -L/usr/MOTIF/lib -lXm
+  
+  /*------------------------------------------------------------------------
+  	To use a different compiler, or different compiler options
   ------------------------------------------------------------------------*/
   
-! #define WantMotifVersions 1
+  XCOMM CC = gcc
+! CDEBUGFLAGS = -g
   
-  XCOMM MOTIFINC = -I/usr/include/Motif1.2
-  XCOMM XMLIB = -L/usr/lib/Motif1.2 -lXm
---- 26,32 ----
-  	Set if you also want Motif versions of the widgets (if available)
+  /*------------------------------------------------------------------------
+  	If you don't want to build the test programs, set this to 0
   ------------------------------------------------------------------------*/
   
-! #define WantMotifVersions 0
+! #define	BuildExecs	1
   
-  XCOMM MOTIFINC = -I/usr/include/Motif1.2
-  XCOMM XMLIB = -L/usr/lib/Motif1.2 -lXm
-***************
-*** 37,43 ****
+  /*------------------------------------------------------------------------
+  	If you have the XPM pixmap library installed:
+--- 33,53 ----
+  
+  #define WantMotifVersions 1
+  
+! MOTIFINC = -I$(X11BASE)/include
+! XMLIB = $(MOTIFLIB)
+  
+  /*------------------------------------------------------------------------
+  	To use a different compiler, or different compiler options
+  ------------------------------------------------------------------------*/
   
-  CC = gcc
-  /* CC = cc -Ae */
-! CDEBUGFLAGS = -g -Wall
-  /* CDEBUGFLAGS = -O -z +z -DNDEBUG */
+  XCOMM CC = gcc
+! CDEBUGFLAGS = -O -Wall
   
   /*------------------------------------------------------------------------
---- 37,44 ----
+  	If you don't want to build the test programs, set this to 0
+  ------------------------------------------------------------------------*/
   
-  CC = gcc
-  /* CC = cc -Ae */
-! CDEBUGFLAGS = -O
-! 
-  /* CDEBUGFLAGS = -O -z +z -DNDEBUG */
+! #define	BuildExecs	0
   
   /*------------------------------------------------------------------------
+  	If you have the XPM pixmap library installed:
 ***************
-*** 52,62 ****
+*** 55,61 ****
   
   #define	HaveXpm		1
   
-- XPM_LIBDIR = $(LIBDIR)		/* /usr/lib/X11R5.supplement */
-  XPM_INCDIR = $(INCDIR)		/* /usr/include/X11R5.supplement */
-! XPM_LIBBASENAME = Xpm
-! XPM_LIBNAME = lib$(XPM_LIBBASENAME).a
-! XPM_LIB = $(XPM_LIBDIR)/$(XPM_LIBNAME)
+! XCOMM XPM_INCDIR = -I/usr/include/X11R5/X11
+  XPM_LIB = -lXpm
   
   /*------------------------------------------------------------------------
-  	The following lines might be helpful for your system.  Uncomment
---- 53,60 ----
+--- 55,61 ----
   
   #define	HaveXpm		1
   
-  XPM_INCDIR = $(INCDIR)		/* /usr/include/X11R5.supplement */
-! XPM_LIB = -lXpm
+! XCOMM XPM_INCDIR = -I$(X11BASE)/include/X11
+  XPM_LIB = -lXpm
   
   /*------------------------------------------------------------------------
-  	The following lines might be helpful for your system.  Uncomment
 ***************
-*** 66,71 ****
---- 64,70 ----
-  /* MKDIRHIER = /bin/sh $(PROJECTDIR)/utils/mkdirhier.sh */
-  /* EXTRA_LOAD_FLAGS = /usr/lib/libdl.so.1.0 */
+*** 84,90 ****
   
-+ 
-  /*------------------------------------------------------------------------
-  	These directories are the final installation locations for the
-  	files.  Once everything is built, a make install will move the
-***************
-*** 82,88 ****
-  	You probably won't need to edit these...
-  ------------------------------------------------------------------------*/
+  IMAKE_DEFINES = -DAvoidNullMakeCommand
   
 ! ARMERGE = ar r
   PROJECTDIR = $(TOP)
   
   FWF_LIBBASENAME = fwf
---- 81,87 ----
-  	You probably won't need to edit these...
-  ------------------------------------------------------------------------*/
+--- 84,90 ----
+  
+  IMAKE_DEFINES = -DAvoidNullMakeCommand
   
 ! ARMERGE = ar qc
   PROJECTDIR = $(TOP)
   
   FWF_LIBBASENAME = fwf
-diff -r -c FWF.orig/src/AnsiTerm/AnsiTermT.c FWF/src/AnsiTerm/AnsiTermT.c
-*** FWF.orig/src/AnsiTerm/AnsiTermT.c	Tue Mar  7 08:48:56 1995
---- FWF/src/AnsiTerm/AnsiTermT.c	Sat Jul 15 11:59:41 1995
-***************
-*** 30,41 ****
-  #include <signal.h>
-  #include <unistd.h>
-  #include <fcntl.h>
-  #include <sys/ptyio.h>
-  #include <X11/Intrinsic.h>
-  #include <X11/StringDefs.h>
-  #include <Xfwf/AnsiTerm.h>
-  
-! 
-  
-  /*--------------------------------------------------------------------
-   |  Provide rather strict fallback resources, to make the program work
---- 30,45 ----
-  #include <signal.h>
-  #include <unistd.h>
-  #include <fcntl.h>
-+ #if !defined(__FreeBSD__)
-  #include <sys/ptyio.h>
-+ #endif
-  #include <X11/Intrinsic.h>
-  #include <X11/StringDefs.h>
-  #include <Xfwf/AnsiTerm.h>
-  
-! #if !defined(KILL_ALL_OTHERS)
-! #define KILL_ALL_OTHERS	-1
-! #endif
-  
-  /*--------------------------------------------------------------------
-   |  Provide rather strict fallback resources, to make the program work
-diff -r -c FWF.orig/src/Dir/DirMgr.c FWF/src/Dir/DirMgr.c
-*** FWF.orig/src/Dir/DirMgr.c	Mon Apr 18 18:07:20 1994
---- FWF/src/Dir/DirMgr.c	Sat Jul 15 11:59:41 1995
-***************
-*** 22,33 ****
-   */ 
-  
-  #include <Xfwf/DirMgr.h>
-! 
-! #ifndef NO_REGEXP
-! #include <Xfwf/RegExp.h>
-! #endif
-! 
-! #define	DIR_MGR_FSM_SIZE 1024
-  
-  /*---------------------------------------------------------------------------*
-  
---- 22,28 ----
-   */ 
-  
-  #include <Xfwf/DirMgr.h>
-! #include <regex.h>
-  
-  /*---------------------------------------------------------------------------*
-  
-***************
-*** 42,60 ****
-  {
-  	DirectoryMgr *dm;
-  	PFI f_func,s_func;
-! 	char *f_data;
-  
-  	if (pattern == NULL) pattern = "*";
-! 	if (!DirectoryMgrSimpleFilterFunc(pattern,&f_func,&f_data))
-  	{
-  		return(NULL);
-  	}
-! 	if (!DirectoryMgrSimpleSortingFunc(sort_type,&s_func))
-  	{
-  		free(f_data);
-  		return(NULL);
-  	}
-! 	dm = DirectoryMgrOpen(path,s_func,f_func,f_data,TRUE);
-  	return(dm);
-  } /* End DirectoryMgrSimpleOpen */
-  
---- 37,55 ----
-  {
-  	DirectoryMgr *dm;
-  	PFI f_func,s_func;
-! 	regex_t *f_data;
-  
-  	if (pattern == NULL) pattern = "*";
-! 	if (!DirectoryMgrSimpleFilterFunc(pattern, &f_func, &f_data))
-  	{
-  		return(NULL);
-  	}
-! 	if (!DirectoryMgrSimpleSortingFunc(sort_type, &s_func))
-  	{
-  		free(f_data);
-  		return(NULL);
-  	}
-! 	dm = DirectoryMgrOpen(path, s_func, f_func, f_data, TRUE);
-  	return(dm);
-  } /* End DirectoryMgrSimpleOpen */
-  
-***************
-*** 64,72 ****
-  char *pattern;
-  {
-  	PFI f_func;
-! 	char *f_data;
-  
-! 	if (!DirectoryMgrSimpleFilterFunc(pattern,&f_func,&f_data))
-  	{
-  		return(FALSE);
-  	}
---- 59,67 ----
-  char *pattern;
-  {
-  	PFI f_func;
-! 	regex_t *f_data;
-  
-! 	if (!DirectoryMgrSimpleFilterFunc(pattern, &f_func, &f_data))
-  	{
-  		return(FALSE);
-  	}
-***************
-*** 108,117 ****
-  } /* End DirectoryMgrCanOpen */
-  
-  
-! DirectoryMgr *DirectoryMgrOpen(path,c_func,f_func,f_data,free_data)
-  char *path;
-  PFI c_func,f_func;
-! char *f_data;
-  int free_data;
-  {
-  	DirectoryMgr *dm;
---- 103,112 ----
-  } /* End DirectoryMgrCanOpen */
-  
-  
-! DirectoryMgr *DirectoryMgrOpen(path, c_func, f_func, f_data, free_data)
-  char *path;
-  PFI c_func,f_func;
-! regex_t *f_data;
-  int free_data;
-  {
-  	DirectoryMgr *dm;
-***************
-*** 120,126 ****
-  	if (dm == NULL)
-  	{
-  		fprintf(stderr,"DirectoryMgrOpen: out of memory\n");
-! 		if (free_data && f_data) free(f_data);
-  		return(NULL);
-  	}
-  	if (DirectoryOpen(path,DirectoryMgrDir(dm)) == FALSE)
---- 115,124 ----
-  	if (dm == NULL)
-  	{
-  		fprintf(stderr,"DirectoryMgrOpen: out of memory\n");
-! 		if (free_data && f_data) {
-! 		    regfree(f_data);
-! 		    free(f_data);
-! 		}
-  		return(NULL);
-  	}
-  	if (DirectoryOpen(path,DirectoryMgrDir(dm)) == FALSE)
-***************
-*** 128,134 ****
-  		fprintf(stderr,"DirectoryMgrOpen: can't open dir '%s'\n",
-  			DirectoryMgrDir(dm));
-  		free(dm);
-! 		if (free_data && f_data) free(f_data);
-  		return(NULL);
-  	}
-  	DirectoryMgrCompFunc(dm) = c_func;
---- 126,135 ----
-  		fprintf(stderr,"DirectoryMgrOpen: can't open dir '%s'\n",
-  			DirectoryMgrDir(dm));
-  		free(dm);
-! 		if (free_data && f_data) {
-! 		    regfree(f_data);
-! 		    free(f_data);
-! 		}
-  		return(NULL);
-  	}
-  	DirectoryMgrCompFunc(dm) = c_func;
-***************
-*** 154,164 ****
-  int DirectoryMgrRefilter(dm,f_func,f_data,f_free)
-  DirectoryMgr *dm;
-  PFI f_func;
-! char *f_data;
-  int f_free;
-  {
-  	if (DirectoryMgrFilterData(dm) && DirectoryMgrFreeFilterData(dm))
-  	{
-  		free(DirectoryMgrFilterData(dm));
-  	}
-  	DirectoryMgrFilterFunc(dm) = f_func;
---- 155,166 ----
-  int DirectoryMgrRefilter(dm,f_func,f_data,f_free)
-  DirectoryMgr *dm;
-  PFI f_func;
-! regex_t *f_data;
-  int f_free;
-  {
-  	if (DirectoryMgrFilterData(dm) && DirectoryMgrFreeFilterData(dm))
-  	{
-+ 		regfree(DirectoryMgrFilterData(dm));
-  		free(DirectoryMgrFilterData(dm));
-  	}
-  	DirectoryMgrFilterFunc(dm) = f_func;
-***************
-*** 342,362 ****
-  
-   *---------------------------------------------------------------------------*/
-  
-! int DirectoryMgrSimpleFilterFunc(pattern,ff_ptr,fd_ptr)
-  char *pattern;
-  PFI *ff_ptr;
-! char **fd_ptr;
-  {
-- #ifndef	NO_REGEXP
-- 	char regexp[2048];
-  
-  	*ff_ptr = DirectoryMgrFilterName;
-! 	*fd_ptr = (char *)malloc(sizeof(char) * DIR_MGR_FSM_SIZE);
-! 	if (*fd_ptr == NULL) return(FALSE);
-! 	RegExpPatternToRegExp(pattern,regexp);
-! 	RegExpCompile(regexp,*fd_ptr,DIR_MGR_FSM_SIZE);
-! #endif
-! 	return(TRUE);
-  } /* End DirectoryMgrSimpleFilterFunc */
-  
-  
---- 344,362 ----
-  
-   *---------------------------------------------------------------------------*/
-  
-! int DirectoryMgrSimpleFilterFunc(pattern, ff_ptr, fd_ptr)
-  char *pattern;
-  PFI *ff_ptr;
-! regex_t **fd_ptr;
-  {
-  
-  	*ff_ptr = DirectoryMgrFilterName;
-! 	*fd_ptr = (regex_t *)malloc(sizeof(regex_t));
-! 	if (!*fd_ptr)
-! 	    return FALSE;
-! 	if (!regcomp(*fd_ptr, pattern, REG_EXTENDED | REG_NOSUB))
-! 	    return TRUE;
-! 	return FALSE;
-  } /* End DirectoryMgrSimpleFilterFunc */
-  
-  
-***************
-*** 467,479 ****
-  
-   *---------------------------------------------------------------------------*/
-  
-! int DirectoryMgrFilterName(de,fsm)
-  DirEntry *de;
-! char *fsm;
-  {
-! #ifndef	NO_REGEXP
-! 	return(RegExpMatch(DirEntryFileName(de),fsm));
-! #else
-! 	return(TRUE);
-! #endif
-  } /* End DirectoryMgrFilterName */
---- 467,475 ----
-  
-   *---------------------------------------------------------------------------*/
-  
-! int DirectoryMgrFilterName(de, fsm)
-  DirEntry *de;
-! regex_t *fsm;
-  {
-! 	return(regexec(fsm, DirEntryFileName(de), 0, NULL, 0));
-  } /* End DirectoryMgrFilterName */
-diff -r -c FWF.orig/src/Dir/DirMgr.h FWF/src/Dir/DirMgr.h
-*** FWF.orig/src/Dir/DirMgr.h	Tue Apr 26 09:27:39 1994
---- FWF/src/Dir/DirMgr.h	Sat Jul 15 11:59:41 1995
-***************
-*** 26,31 ****
---- 26,32 ----
-  #define	_FWF_DIRECTORY_MGR_H_
-  
-  #include <Xfwf/Directory.h>
-+ #include <regex.h>
-  
-  /*---------------------------------------------------------------------------*
-  
-***************
-*** 101,107 ****
-  	int total_count;
-  	int filtered_count;
-  	PFI filter_func;
-! 	char *filter_data;
-  	int free_filter_data;
-  	PFI comp_func;
-  	int current_index;
---- 102,108 ----
-  	int total_count;
-  	int filtered_count;
-  	PFI filter_func;
-! 	regex_t *filter_data;
-  	int free_filter_data;
-  	PFI comp_func;
-  	int current_index;
-***************
-*** 170,179 ****
-  
-  int		DirectoryMgrCanOpen(char *path);
-  DirectoryMgr *	DirectoryMgrOpen(char *path, PFI c_func, PFI f_func,
-! 			char *f_data, int free_data);
-  void		DirectoryMgrClose(DirectoryMgr *dm);
-  int		DirectoryMgrRefilter(DirectoryMgr *dm, PFI f_func,
-! 			char *f_data, int f_free);
-  int		DirectoryMgrRefresh(DirectoryMgr *dm);
-  void		DirectoryMgrResort(DirectoryMgr *dm, PFI c_func);
-  
---- 171,180 ----
-  
-  int		DirectoryMgrCanOpen(char *path);
-  DirectoryMgr *	DirectoryMgrOpen(char *path, PFI c_func, PFI f_func,
-! 			regex_t *f_data, int free_data);
-  void		DirectoryMgrClose(DirectoryMgr *dm);
-  int		DirectoryMgrRefilter(DirectoryMgr *dm, PFI f_func,
-! 			regex_t *f_data, int f_free);
-  int		DirectoryMgrRefresh(DirectoryMgr *dm);
-  void		DirectoryMgrResort(DirectoryMgr *dm, PFI c_func);
-  
-diff -r -c FWF.orig/src/Dir/Directory.c FWF/src/Dir/Directory.c
-*** FWF.orig/src/Dir/Directory.c	Wed Mar  8 09:14:01 1995
---- FWF/src/Dir/Directory.c	Sat Jul 15 11:59:43 1995
-***************
-*** 24,30 ****
-   */ 
-  
-  #include <Xfwf/Directory.h>
-- #include <Xfwf/RegExp.h>
-  
-  /*--------------------------------------------------------------------------*
-  
---- 24,29 ----
-diff -r -c FWF.orig/src/Dir/Imakefile FWF/src/Dir/Imakefile
-*** FWF.orig/src/Dir/Imakefile	Wed Apr 19 08:15:12 1995
---- FWF/src/Dir/Imakefile	Sat Jul 15 11:59:41 1995
-***************
-*** 4,18 ****
-  
-  CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(STD_INCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(DEFINES) $(COMPATFLAGS)
-  
-- REGH		=	RegExp.h
-- REGSRC		=	RegExp.c
-- REGOBJ		=	RegExp.o
-- REGTESTSRC	=	RegExpT.c
-- REGTESTOBJ	=	RegExpT.o
-- REGTEST		=	$(FWF_BINDIR)/RegExpT
-- REGOBJS		=	$(REGOBJ) $(REGTESTOBJ)
-- REGSRCS		=	$(REGSRC) $(REGTESTSRC)
-- 
-  DIRH		=	Directory.h
-  DIRSRC		=	Directory.c
-  DIROBJ		=	Directory.o
---- 4,9 ----
-***************
-*** 33,64 ****
-  
-  DIR_LIBNAME	=	libDir.a
-  
-! PROGRAMS = $(REGTEST) $(DIRTEST) $(DIRMGRTEST)
-! LIB_OBJS = $(REGOBJ) $(DIROBJ) $(DIRMGROBJ)
-! EXT_OBJS = $(REGTESTOBJ) $(DIRTESTOBJ) $(DIRMGRTESTOBJ)
-  
-! INCS = $(FWF_INCDIR)/$(REGH) $(FWF_INCDIR)/$(DIRH) $(FWF_INCDIR)/$(DIRMGRH)
-  SRCS = $(REGSRCS) $(DIRSRCS) $(DIRMGRSRCS)
-  
-  LOCALLIBS = $(DIR_LIB)
-  DEPLIBS = $(DIR_LIB)
-  SYSLIBS =
-  
-- AddToLibraryTarget(archive,$(FWF_LIBDIR),$(DIR_LIBNAME),$(REGOBJ))
-  AddToLibraryTarget(archive,$(FWF_LIBDIR),$(DIR_LIBNAME),$(DIROBJ))
-  AddToLibraryTarget(archive,$(FWF_LIBDIR),$(DIR_LIBNAME),$(DIRMGROBJ))
-  
-  ObjectRuleWithFlags($(CFLAGS) -I$(XPM_INCDIR) -I$(FWF_INCBASE))
-  
-- RequireThisFileForInit($(FWF_INCDIR)/$(REGH))
-  RequireThisFileForInit($(FWF_INCDIR)/$(DIRH))
-  RequireThisFileForInit($(FWF_INCDIR)/$(DIRMGRH))
-  
-- FileCopyWhenNeeded(.,$(REGH),$(FWF_INCDIR),$(REGH))
-  FileCopyWhenNeeded(.,$(DIRH),$(FWF_INCDIR),$(DIRH))
-  FileCopyWhenNeeded(.,$(DIRMGRH),$(FWF_INCDIR),$(DIRMGRH))
-  
-- NormalProgramTarget($(REGTEST),$(REGOBJS),$(DEPLIBS),$(LOCALLIBS),$(SYSLIBS))
-  NormalProgramTarget($(DIRTEST),$(DIROBJS),$(DEPLIBS),$(LOCALLIBS),$(SYSLIBS))
-  NormalProgramTarget($(DIRMGRTEST),$(DIRMGROBJS),$(DEPLIBS),$(LOCALLIBS),$(SYSLIBS))
-  
---- 24,51 ----
-  
-  DIR_LIBNAME	=	libDir.a
-  
-! PROGRAMS = $(DIRTEST) $(DIRMGRTEST)
-! LIB_OBJS = $(DIROBJ) $(DIRMGROBJ)
-! EXT_OBJS = $(DIRTESTOBJ) $(DIRMGRTESTOBJ)
-  
-! INCS = $(FWF_INCDIR)/$(DIRH) $(FWF_INCDIR)/$(DIRMGRH)
-  SRCS = $(REGSRCS) $(DIRSRCS) $(DIRMGRSRCS)
-  
-  LOCALLIBS = $(DIR_LIB)
-  DEPLIBS = $(DIR_LIB)
-  SYSLIBS =
-  
-  AddToLibraryTarget(archive,$(FWF_LIBDIR),$(DIR_LIBNAME),$(DIROBJ))
-  AddToLibraryTarget(archive,$(FWF_LIBDIR),$(DIR_LIBNAME),$(DIRMGROBJ))
-  
-  ObjectRuleWithFlags($(CFLAGS) -I$(XPM_INCDIR) -I$(FWF_INCBASE))
-  
-  RequireThisFileForInit($(FWF_INCDIR)/$(DIRH))
-  RequireThisFileForInit($(FWF_INCDIR)/$(DIRMGRH))
-  
-  FileCopyWhenNeeded(.,$(DIRH),$(FWF_INCDIR),$(DIRH))
-  FileCopyWhenNeeded(.,$(DIRMGRH),$(FWF_INCDIR),$(DIRMGRH))
-  
-  NormalProgramTarget($(DIRTEST),$(DIROBJS),$(DEPLIBS),$(LOCALLIBS),$(SYSLIBS))
-  NormalProgramTarget($(DIRMGRTEST),$(DIRMGROBJS),$(DEPLIBS),$(LOCALLIBS),$(SYSLIBS))
-  
-***************
-*** 81,97 ****
-  	         echo "#include <sys/dir.h>" >> dirent.h;	\ 
-  	         echo "#endif" >> dirent.h;			\ 
-  	         cp dirent.h $(FWF_INCDIR)/dirent.h;		\ 
-- 	    else echo "";					\ 
-- 	    fi; exit 0)
-- 	@rm -f regexp.h
-- 	@rm -f $(FWF_INCDIR)/regexp.h
-- 	@(if [ ! -f /usr/include/regexp.h ];			\ 
-- 	    then echo "Patching because no regexp.h";		\ 
-- 	         echo "#ifndef _BRIREGEXP_H_" > regexp.h;	\ 
-- 	         echo "#define _BRIREGEXP_H_" >> regexp.h;	\ 
-- 	         echo "#define NO_REGEXP 1" >> regexp.h;	\ 
-- 	         echo "#endif" >> regexp.h;			\ 
-- 	         cp regexp.h $(FWF_INCDIR)/regexp.h;		\ 
-  	    else echo "";					\ 
-  	    fi; exit 0)
-  
---- 68,73 ----
-diff -r -c FWF.orig/src/EzMenu/EzMenu.c FWF/src/EzMenu/EzMenu.c
-*** FWF.orig/src/EzMenu/EzMenu.c	Fri May  6 12:59:31 1994
---- FWF/src/EzMenu/EzMenu.c	Sat Jul 15 11:59:42 1995
-***************
-*** 414,422 ****
---- 414,424 ----
-        SimpleMenuWidget smw = (SimpleMenuWidget) ez_old;
-        SmeObject *entry;
-        
-+ #if 0
-        ForAllChildren(smw, entry) {
-  	XtDestroyWidget((Widget)entry);
-        }
-+ #endif
-  
-        XfwfEzMenuParseMenu(ez_new, ez_new -> ez_menu.menu, True);
-        ret_val = TRUE;
-diff -r -c FWF.orig/src/FileComp/FileComp.c FWF/src/FileComp/FileComp.c
-*** FWF.orig/src/FileComp/FileComp.c	Tue Feb 14 08:15:55 1995
---- FWF/src/FileComp/FileComp.c	Sat Jul 15 12:16:27 1995
-***************
-*** 121,129 ****
-  #ifdef USEONELINE
-  #include "OneLineText.h"
-  #endif
-! #if defined(USE_REGEX) && defined(GNU_REGEX)
-  #include <regex.h>
-! #endif
-  #if defined(USE_GLOB)
-  #include <glob.h>
-  #endif
---- 121,129 ----
-  #ifdef USEONELINE
-  #include "OneLineText.h"
-  #endif
-! 
-  #include <regex.h>
-! 
-  #if defined(USE_GLOB)
-  #include <glob.h>
-  #endif
-***************
-*** 294,302 ****
-  static void ChoosePrefix();
-  static void UpdateFilesList();
-  
-! #if defined(USE_REGEX) && defined(GNU_REGEX)
-! static struct re_pattern_buffer compbuf;
-! #endif
-  
-  static void
-  Initialize(request, new)
---- 294,300 ----
-  static void ChoosePrefix();
-  static void UpdateFilesList();
-  
-! static regex_t *compbuf;
-  
-  static void
-  Initialize(request, new)
-***************
-*** 400,412 ****
-    } else
-      fcwp->cancel_button = NULL;
-  
-- #if defined(USE_REGEX) && defined(GNU_REGEX)
--   /* this code initializes the compile buffer for the regex routines */
--   compbuf.buffer = XtMalloc(256);
--   compbuf.allocated = 256;
--   compbuf.fastmap = compbuf.translate = NULL;
-- #endif
-- 
-    UpdateFilesList(new);
-    ChoosePrefix(new);
-  
---- 398,403 ----
-***************
-*** 446,457 ****
-      free(fcwp->candidates);
-    if (fcwp->candidx)
-      free(fcwp->candidx);
-! #if defined(USE_REGEX) && defined(GNU_REGEX)
-!   if (compbuf.buffer) {	  /* free the compile buffer from the regex routines */
-!     XtFree(compbuf.buffer);
-!     compbuf.buffer = NULL;
-    }
-- #endif
-  }
-  
-  /* this is used to detect a double-click.
---- 437,446 ----
-      free(fcwp->candidates);
-    if (fcwp->candidx)
-      free(fcwp->candidx);
-!   if (compbuf) {	  /* free the compile buffer from the regex routines */
-!     regfree(compbuf);
-!     compbuf = NULL;
-    }
-  }
-  
-  /* this is used to detect a double-click.
-***************
-*** 1652,1685 ****
-  }
-  
-  
-! 
-! 
-! #if defined(USE_REGEX)
-! 
-! /* following regex routine was developed by reading Brian Totty's code
-!    and reading the man page.  Long live free source code! */
-! 
-! #if !defined(GNU_REGEX)
-! 
-! #define INIT		register char *sp = instring;
-! #define	GETC()		(*sp++)
-! #define	PEEKC()		(*sp)
-! #define	UNGETC(c)	-- sp
-! #define	RETURN(ptr)	return (ptr);
-! #define	ERROR(val)	{ regex_errno = (val); return NULL; }
-! static int	regex_errno;
-! static int	getrnge();
-! #include	<regexp.h>
-! 
-! #endif /* !GNU_REGEX */
-! 
-! /* This routine now uses either the regexp library or the GNU regex
-!    library based on the #define GNU_REGEX.  It can also be eliminated
-!    entirely by not #defining USE_REGEX 			EdW */
-! /* We don't want to completely eliminate it.  This would cause
-!    compatibility problems.  Instead we define some stub procedures
-!    that issue XtAppWarningMsgs.                         RF */
-! 
-  #if NeedFunctionPrototypes
-  Boolean XfwfFCRegexFiles (
-       char	*s,
---- 1641,1647 ----
-  }
-  
-  
-! /* This routine now uses POSIX regex */
-  #if NeedFunctionPrototypes
-  Boolean XfwfFCRegexFiles (
-       char	*s,
-***************
-*** 1699,1747 ****
-  {
-    static char	*cache_regex = NULL,
-  		*busted_regex = NULL;
-! #if defined(GNU_REGEX)
-!   _Xconst char *	comp_result;
-! #else
-!   static char	compbuf[2048]; /* I should modify this to be a dynamically
-! 				  grown array.  sigh */
-! #endif
-    int	rval;
-  
-    if (busted_regex && 0==strcmp(regex,busted_regex))
-      return TRUE;
-  
-    if (!cache_regex || 0!=strcmp(cache_regex,regex)) {
-! #if defined(GNU_REGEX)
-!     if (!(comp_result = re_compile_pattern(regex, strlen(regex), &compbuf))) {
-! #else
-!     if (NULL != compile(regex, compbuf, compbuf+sizeof(compbuf), '\0')) {
-! #endif
-        XtFree(cache_regex);	/* safe for NULL */
-        cache_regex = XtNewString(regex);
-      } else {
-        String	params[2];
-        Cardinal	n;
-  
-! #if defined(GNU_REGEX)
-!       params[0] = comp_result;
-! #else
-!       switch (regex_errno) {
-!       case 11: params[0] = "Range endpoint too large."; break;
-!       case 16: params[0] = "Bad number"; break;
-!       case 25: params[0] = "`\\digit' out of range."; break;
-!       case 36: params[0] = "Illegal or missing delimiter."; break;
-!       case 41: params[0] = "No remembered search string."; break;
-!       case 42: params[0] = "\\( \\) imbalance."; break;
-!       case 43: params[0] = "Too many \\(."; break;
-!       case 44: params[0] = "More than 2 numbers given in \\{ \\}."; break;
-!       case 45: params[0] = "} expected after \\."; break;
-!       case 46: params[0] = "First number exceeds second in \\{ \\}."; break;
-!       case 49: params[0] = "[] imbalance."; break;
-!       case 50: params[0] = "Regular expression too long."; break;
-!       default: params[0] = "unknown regex compilation error."; break;
-!       }
-! #endif
-! 
-        params[1] = regex;
-        n = 2;
-        XtAppWarningMsg(app_con, "compileFailed", "xfwfFileCompRegex",
---- 1661,1682 ----
-  {
-    static char	*cache_regex = NULL,
-  		*busted_regex = NULL;
-!   static regex_t *compbuf;
-    int	rval;
-  
-    if (busted_regex && 0==strcmp(regex,busted_regex))
-      return TRUE;
-  
-    if (!cache_regex || 0!=strcmp(cache_regex,regex)) {
-!     compbuf = (regex_t *)malloc(sizeof(regex_t));
-!     if (!regcomp(compbuf, regex, REG_EXTENDED | REG_NOSUB)) {
-        XtFree(cache_regex);	/* safe for NULL */
-        cache_regex = XtNewString(regex);
-      } else {
-        String	params[2];
-        Cardinal	n;
-  
-!       params[0] = "bogus regex";
-        params[1] = regex;
-        n = 2;
-        XtAppWarningMsg(app_con, "compileFailed", "xfwfFileCompRegex",
-***************
-*** 1753,1766 ****
-        return TRUE;
-      }
-    }
-! 
-! #if defined(GNU_REGEX)
-!   rval = re_match(&compbuf, s, strlen(s), 0, NULL);
-!   return ((rval >= 0) && (rval == strlen(s)));
-! #else
-!   rval = advance(s, compbuf);
-!   return rval && *loc2==0;
-! #endif
-  }
-  
-  
---- 1688,1694 ----
-        return TRUE;
-      }
-    }
-!   return regexec(compbuf, s, 0, NULL, 0);
-  }
-  
-  
-***************
-*** 1778,1835 ****
-      XfwfFCRegexFiles(filename, regex, app_con) ;
-  }
-  
-- #else /* USE_REGEX */
-- 
-- #if NeedFunctionPrototypes
-- Boolean XfwfFCRegexFiles (
--      char	*s,
--      _Xconst XtPointer	regex,
--      XtAppContext	app_con)
-- #else
-- Boolean XfwfFCRegexFiles (s, regex, app_con)
--      char	*s;
--      XtPointer	regex;
--      XtAppContext	app_con;
-- #endif
-- {
--   Cardinal	num_subs = 0;
--   String	subs[1];
--   static int	issued=0;
-- 
--   if (issued)
--     return;		/* they don't want to see this a million times */
--   /* urgh, regex was not available at the time :( */
--   XtAppWarningMsg(app_con, "packageUnavailable", "xfwfFileCompRegex",
-- 		  "XfwfLibraryError",
-- 		  "attempt to use regular expressions in a FileComplete widget (XfwfFCRegexFiles).  The FWF library was not compiled with that option.",
-- 		  subs, &num_subs);
--   issued = 1;
-- }
-- 
-- Boolean XfwfFCDirsOrRegexFiles(filename, filestats, regex, app_con)
--      char	*filename;
--      struct stat *filestats;
--      XtPointer	regex;
--      XtAppContext	app_con;
-- {
--   Cardinal	num_subs = 0;
--   String	subs[1];
--   static int	issued=0;
-- 
--   if (issued)
--     return;		/* they don't want to see this a million times */
-- 
--   /* urgh, regex was not available at the time :( */
--   XtAppWarningMsg(app_con, "packageUnavailable", "xfwfFileCompRegex",
-- 		  "XfwfLibraryError",
-- 		  "attempt to use regular expressions in a FileComplete widget (XfwfFCDirsOrRegexFiles).  The FWF library was not compiled with that option.",
-- 		  subs, &num_subs);
--   issued = 1;
-- }
-- 
-- #endif /* USE_REGEX */
-- 
-- 
-  #ifdef USE_GLOB
-  
-  Boolean XfwfFCDirsOrGlobFiles(filename, filestats, regex, app_con)
---- 1706,1711 ----
-***************
-*** 1944,1958 ****
-  enum xfwfFileCompleteRegexFlavor
-  XfwfFileCompleteRegexFlavor()
-  {
-- #ifdef USE_REGEX
-- #ifdef GNU_REGEX
-    return xfwfFC_Emacs;
-- #else
--   return xfwfFC_ATT;
-- #endif
-- #else
--   return xfwfFC_NoRegex;
-- #endif
-  }
-  
-  int XfwfFileCompleteHasGlob()
---- 1820,1826 ----
-diff -r -c FWF.orig/src/IconBox/IconBoxT.c FWF/src/IconBox/IconBoxT.c
-*** FWF.orig/src/IconBox/IconBoxT.c	Fri May  6 08:53:22 1994
---- FWF/src/IconBox/IconBoxT.c	Sat Jul 15 11:59:42 1995
-***************
-*** 42,48 ****
-  };
-  
-  extern int errno;
-- extern char *sys_errlist[];
-  
-  static XtAppContext app_context;
-  static int hlen, vlen;
---- 42,47 ----
-diff -r -c FWF.orig/src/Imakefile FWF/src/Imakefile
-*** FWF.orig/src/Imakefile	Wed Apr 19 08:31:04 1995
---- FWF/src/Imakefile	Sat Jul 15 11:59:42 1995
-***************
-*** 28,34 ****
-  	OptButton VScrollb HScrollb Cmap Shistogram Hdial Canvas	\
-  	CircPerc Stack Enforcer Rows MenuBar ScrollWin ScrollWin3 Tabs	\
-  	PieMenu Array FileLister AnsiTerm Entry SpinLabel		\
-! 	Mdial PcBar Toggle Icon Alert Group RadioGroup ThumbWheel	\
-  	FoldingTree IconBox Animator Pager
-  #endif
-  
---- 28,34 ----
-  	OptButton VScrollb HScrollb Cmap Shistogram Hdial Canvas	\
-  	CircPerc Stack Enforcer Rows MenuBar ScrollWin ScrollWin3 Tabs	\
-  	PieMenu Array FileLister AnsiTerm Entry SpinLabel		\
-! 	PcBar Toggle Icon Alert Group RadioGroup ThumbWheel	\
-  	FoldingTree IconBox Animator Pager
-  #endif
-  
-***************
-*** 53,59 ****
-  	OptButton VScrollb HScrollb Cmap Shistogram Hdial Canvas	\
-  	CircPerc Stack Enforcer Rows MenuBar ScrollWin ScrollWin3 Tabs	\
-  	ThumbWheel2 PieMenu Array FileLister AnsiTerm Entry SpinLabel	\
-! 	Mdial PcBar
-  #endif
-  
-  
---- 53,59 ----
-  	OptButton VScrollb HScrollb Cmap Shistogram Hdial Canvas	\
-  	CircPerc Stack Enforcer Rows MenuBar ScrollWin ScrollWin3 Tabs	\
-  	ThumbWheel2 PieMenu Array FileLister AnsiTerm Entry SpinLabel	\
-! 	PcBar
-  #endif
-  
-  
-diff -r -c FWF.orig/src/XmAnsiTerm/XmATermT.c FWF/src/XmAnsiTerm/XmATermT.c
-*** FWF.orig/src/XmAnsiTerm/XmATermT.c	Tue Mar  7 08:48:56 1995
---- FWF/src/XmAnsiTerm/XmATermT.c	Sat Jul 15 11:59:42 1995
-***************
-*** 30,41 ****
-  #include <signal.h>
-  #include <unistd.h>
-  #include <fcntl.h>
-  #include <sys/ptyio.h>
-  #include <X11/Intrinsic.h>
-  #include <X11/StringDefs.h>
-  #include <Xfwf/XmATerm.h>
-  
-! 
-  
-  /*--------------------------------------------------------------------
-   |  Provide rather strict fallback resources, to make the program work
---- 30,45 ----
-  #include <signal.h>
-  #include <unistd.h>
-  #include <fcntl.h>
-+ #if !defined(__FreeBSD__)
-  #include <sys/ptyio.h>
-+ #endif
-  #include <X11/Intrinsic.h>
-  #include <X11/StringDefs.h>
-  #include <Xfwf/XmATerm.h>
-  
-! #ifndef KILL_ALL_OTHERS
-! #define KILL_ALL_OTHERS -1
-! #endif
-  
-  /*--------------------------------------------------------------------
-   |  Provide rather strict fallback resources, to make the program work
diff --git a/x11-toolkits/FWF/files/patch-ab b/x11-toolkits/FWF/files/patch-ab
index 3023f0153983..97b8fc5c511d 100644
--- a/x11-toolkits/FWF/files/patch-ab
+++ b/x11-toolkits/FWF/files/patch-ab
@@ -1,42 +1,36 @@
---- ./src/StdImakefile.org	Wed Apr 19 10:47:22 1995
-+++ ./src/StdImakefile	Tue Jul 18 00:17:45 1995
-@@ -18,7 +18,9 @@
- DEPLIBS = XawClientDepLibs $(OTHERDEPLIBS)
- SYSLIBS = XawClientLibs
- 
-+#ifndef NOT_SINGLE_OBJECT_FILE
- AddToLibraryTarget(archive,$(FWF_LIBDIR),$(FWF_LIBNAME),$(LIB_OBJS))
-+#endif
- 
- ObjectRuleWithFlags($(FWF_CFLAGS))
- 
---- FWF.rules.orig	Wed Apr 19 08:27:56 1995
-+++ FWF.rules	Tue Jul 18 02:04:22 1995
-@@ -23,9 +23,6 @@
- libdir/libname:: objlist						@@\
- 	-@(if [ ! -f libdir/libname ]; then \				@@\
- 		$(MKDIRHIER) libdir ; \					@@\
--		echo Creating Library libdir/libname ; \		@@\
--		$(AR) libdir/libname ; \				@@\
--		RanLibrary(libdir/libname) ; \				@@\
- 	fi; exit 0)							@@\
- 	@echo Adding objlist To Library libdir/libname			@@\
- 	$(ARMERGE) libdir/libname objlist				@@\
-@@ -282,3 +279,9 @@
- #define SqueakyCleanSubdirs(dirs)					@@\
- NamedSqueakyCleanSubdirs(squeakyclean,dirs)
- #endif
-+
-+#undef InstallNamedTarget
-+#define	InstallNamedTarget(step,srcname,flags,dest,dstname)		@@\
-+step:: srcname								@@\
-+	MakeDir($(DESTDIR)dest)						@@\
-+	$(INSTALL) $(INSTALLFLAGS) flags srcname $(DESTDIR)dest/
---- ./src/FileComp/Imakefile.org	Mon May  3 12:40:20 1993
-+++ ./src/FileComp/Imakefile	Tue Jul 18 03:09:52 1995
-@@ -7,4 +7,4 @@
- 
- #include "../StdImakefile"
- 
--AddToLibraryTarget(archive,$(FWF_LIBDIR),$(FWF_LIBNAME),squish.o getod.o)
-+AddToLibraryTarget(archive,$(FWF_LIBDIR),$(FWF_LIBNAME),$(WIDGET).o squish.o getod.o)
+*** src/Imakefile.orig	Wed Feb 14 18:05:37 1996
+--- src/Imakefile	Sat Apr 25 22:03:03 1998
+***************
+*** 13,19 ****
+  	Button RowCol Prompt Slider2 Slider4 Arrow Scrollbar PullDown	\
+  	OptButton VScrollb HScrollb Cmap Shistogram Hdial Canvas	\
+  	CircPerc Stack Enforcer Rows MenuBar ScrollWin ScrollWin3	\
+! 	PieMenu Array FileLister Entry SpinLabel Mdial PcBar Toggle	\
+  	Icon Alert Group RadioGroup ThumbWheel FoldingTree IconBox	\
+  	Animator XmTabs XmAnsiTerm XmIcon XmPager			\
+  	UserGraf TextOut FText Calendar # HTML2 SSGML
+--- 13,19 ----
+  	Button RowCol Prompt Slider2 Slider4 Arrow Scrollbar PullDown	\
+  	OptButton VScrollb HScrollb Cmap Shistogram Hdial Canvas	\
+  	CircPerc Stack Enforcer Rows MenuBar ScrollWin ScrollWin3	\
+! 	PieMenu Array FileLister Entry SpinLabel PcBar Toggle	\
+  	Icon Alert Group RadioGroup ThumbWheel FoldingTree IconBox	\
+  	Animator XmTabs XmAnsiTerm XmIcon XmPager			\
+  	UserGraf TextOut FText Calendar # HTML2 SSGML
+***************
+*** 42,48 ****
+  	OptButton VScrollb HScrollb Cmap Shistogram Hdial Canvas	\
+  	CircPerc Stack Enforcer Rows MenuBar ScrollWin ScrollWin3	\
+  	ThumbWheel2 PieMenu Array FileLister Entry SpinLabel		\
+! 	Mdial PcBar XmTabs XmAnsiTerm					\
+  	TextOut ArticleText Calendar
+  #endif
+  
+--- 42,48 ----
+  	OptButton VScrollb HScrollb Cmap Shistogram Hdial Canvas	\
+  	CircPerc Stack Enforcer Rows MenuBar ScrollWin ScrollWin3	\
+  	ThumbWheel2 PieMenu Array FileLister Entry SpinLabel		\
+! 	PcBar XmTabs XmAnsiTerm					\
+  	TextOut ArticleText Calendar
+  #endif
+  
diff --git a/x11-toolkits/FWF/files/patch-ac b/x11-toolkits/FWF/files/patch-ac
index 37764808a1d3..2b984565914c 100644
--- a/x11-toolkits/FWF/files/patch-ac
+++ b/x11-toolkits/FWF/files/patch-ac
@@ -1,10 +1,19 @@
---- ./src/IconBox/IconBoxT.c.org	Wed Apr 23 00:21:28 1997
-+++ ./src/IconBox/IconBoxT.c	Wed Apr 23 00:34:26 1997
-@@ -5,6 +5,7 @@
-  */
- 
- #include <stdio.h>
-+#include <sys/types.h>
- #include <dirent.h>
- #include <unistd.h>
- #include <sys/stat.h>
+*** src/AnsiTerm/AnsiTermT.c.orig	Wed Nov 29 12:47:58 1995
+--- src/AnsiTerm/AnsiTermT.c	Sat Apr 25 22:23:50 1998
+***************
+*** 32,38 ****
+  #include <unistd.h>
+  #include <fcntl.h>
+  #include <sys/wait.h>
+! #ifdef USE_PTY
+  #include <sys/ptyio.h>
+  #endif
+  #include <X11/Intrinsic.h>
+--- 32,38 ----
+  #include <unistd.h>
+  #include <fcntl.h>
+  #include <sys/wait.h>
+! #ifdef USE_PTYIO_H
+  #include <sys/ptyio.h>
+  #endif
+  #include <X11/Intrinsic.h>
diff --git a/x11-toolkits/FWF/files/patch-ad b/x11-toolkits/FWF/files/patch-ad
new file mode 100644
index 000000000000..b684d4b11c43
--- /dev/null
+++ b/x11-toolkits/FWF/files/patch-ad
@@ -0,0 +1,416 @@
+*** src/Dir/DirMgr.c.orig	Sat Apr 25 20:23:08 1998
+--- src/Dir/DirMgr.c	Sat Apr 25 20:55:09 1998
+***************
+*** 24,31 ****
+  
+  #include <Xfwf/DirMgr.h>
+  
+! #ifndef NO_REGEXP
+  #include <Xfwf/RegExp.h>
+  #endif
+  
+  #define	DIR_MGR_FSM_SIZE 1024
+--- 24,33 ----
+  
+  #include <Xfwf/DirMgr.h>
+  
+! #ifdef NO_REGEXP
+  #include <Xfwf/RegExp.h>
++ #else
++ #include <regex.h>
+  #endif
+  
+  #define	DIR_MGR_FSM_SIZE 1024
+***************
+*** 43,61 ****
+  {
+  	DirectoryMgr *dm;
+  	PFI f_func,s_func;
+! 	char *f_data;
+  
+  	if (pattern == NULL) pattern = "*";
+! 	if (!DirectoryMgrSimpleFilterFunc(pattern,&f_func,&f_data))
+  	{
+  		return(NULL);
+  	}
+! 	if (!DirectoryMgrSimpleSortingFunc(sort_type,&s_func))
+  	{
+  		free(f_data);
+  		return(NULL);
+  	}
+! 	dm = DirectoryMgrOpen(path,s_func,f_func,f_data,TRUE);
+  	return(dm);
+  } /* End DirectoryMgrSimpleOpen */
+  
+--- 45,63 ----
+  {
+  	DirectoryMgr *dm;
+  	PFI f_func,s_func;
+! 	regex_t *f_data;
+  
+  	if (pattern == NULL) pattern = "*";
+! 	if (!DirectoryMgrSimpleFilterFunc(pattern, &f_func, &f_data))
+  	{
+  		return(NULL);
+  	}
+! 	if (!DirectoryMgrSimpleSortingFunc(sort_type, &s_func))
+  	{
+  		free(f_data);
+  		return(NULL);
+  	}
+! 	dm = DirectoryMgrOpen(path, s_func, f_func, f_data, TRUE);
+  	return(dm);
+  } /* End DirectoryMgrSimpleOpen */
+  
+***************
+*** 65,73 ****
+  char *pattern;
+  {
+  	PFI f_func;
+! 	char *f_data;
+  
+! 	if (!DirectoryMgrSimpleFilterFunc(pattern,&f_func,&f_data))
+  	{
+  		return(FALSE);
+  	}
+--- 67,75 ----
+  char *pattern;
+  {
+  	PFI f_func;
+! 	regex_t *f_data;
+  
+! 	if (!DirectoryMgrSimpleFilterFunc(pattern, &f_func, &f_data))
+  	{
+  		return(FALSE);
+  	}
+***************
+*** 109,118 ****
+  } /* End DirectoryMgrCanOpen */
+  
+  
+! DirectoryMgr *DirectoryMgrOpen(path,c_func,f_func,f_data,free_data)
+  char *path;
+  PFI c_func,f_func;
+! char *f_data;
+  int free_data;
+  {
+  	DirectoryMgr *dm;
+--- 111,120 ----
+  } /* End DirectoryMgrCanOpen */
+  
+  
+! DirectoryMgr *DirectoryMgrOpen(path, c_func, f_func, f_data, free_data)
+  char *path;
+  PFI c_func,f_func;
+! regex_t *f_data;
+  int free_data;
+  {
+  	DirectoryMgr *dm;
+***************
+*** 121,127 ****
+  	if (dm == NULL)
+  	{
+  		fprintf(stderr,"DirectoryMgrOpen: out of memory\n");
+! 		if (free_data && f_data) free(f_data);
+  		return(NULL);
+  	}
+  	if (DirectoryOpen(path,DirectoryMgrDir(dm)) == FALSE)
+--- 123,132 ----
+  	if (dm == NULL)
+  	{
+  		fprintf(stderr,"DirectoryMgrOpen: out of memory\n");
+! 		if (free_data && f_data) {
+! 			regfree(f_data);	
+! 			free(f_data);
+! 		}
+  		return(NULL);
+  	}
+  	if (DirectoryOpen(path,DirectoryMgrDir(dm)) == FALSE)
+***************
+*** 129,135 ****
+  		fprintf(stderr,"DirectoryMgrOpen: can't open dir '%s'\n",
+  			DirectoryMgrDir(dm));
+  		free(dm);
+! 		if (free_data && f_data) free(f_data);
+  		return(NULL);
+  	}
+  	DirectoryMgrCompFunc(dm) = c_func;
+--- 134,143 ----
+  		fprintf(stderr,"DirectoryMgrOpen: can't open dir '%s'\n",
+  			DirectoryMgrDir(dm));
+  		free(dm);
+! 		if (free_data && f_data) { 
+! 			regfree(f_data);
+! 			free(f_data);
+! 		}
+  		return(NULL);
+  	}
+  	DirectoryMgrCompFunc(dm) = c_func;
+***************
+*** 155,165 ****
+  int DirectoryMgrRefilter(dm,f_func,f_data,f_free)
+  DirectoryMgr *dm;
+  PFI f_func;
+! char *f_data;
+  int f_free;
+  {
+  	if (DirectoryMgrFilterData(dm) && DirectoryMgrFreeFilterData(dm))
+  	{
+  		free(DirectoryMgrFilterData(dm));
+  	}
+  	DirectoryMgrFilterFunc(dm) = f_func;
+--- 163,174 ----
+  int DirectoryMgrRefilter(dm,f_func,f_data,f_free)
+  DirectoryMgr *dm;
+  PFI f_func;
+! regex_t *f_data;
+  int f_free;
+  {
+  	if (DirectoryMgrFilterData(dm) && DirectoryMgrFreeFilterData(dm))
+  	{
++ 		regfree(DirectoryMgrFilterData(dm));
+  		free(DirectoryMgrFilterData(dm));
+  	}
+  	DirectoryMgrFilterFunc(dm) = f_func;
+***************
+*** 349,369 ****
+  
+   *---------------------------------------------------------------------------*/
+  
+! int DirectoryMgrSimpleFilterFunc(pattern,ff_ptr,fd_ptr)
+  char *pattern;
+  PFI *ff_ptr;
+! char **fd_ptr;
+  {
+! #ifndef	NO_REGEXP
+  	char regexp[2048];
+  
+  	*ff_ptr = DirectoryMgrFilterName;
+! 	*fd_ptr = (char *)malloc(sizeof(char) * DIR_MGR_FSM_SIZE);
+! 	if (*fd_ptr == NULL) return(FALSE);
+! 	RegExpPatternToRegExp(pattern,regexp);
+! 	RegExpCompile(regexp,*fd_ptr,DIR_MGR_FSM_SIZE);
+! #endif
+! 	return(TRUE);
+  } /* End DirectoryMgrSimpleFilterFunc */
+  
+  
+--- 358,379 ----
+  
+   *---------------------------------------------------------------------------*/
+  
+! int DirectoryMgrSimpleFilterFunc(pattern, ff_ptr, fd_ptr)
+  char *pattern;
+  PFI *ff_ptr;
+! regex_t **fd_ptr;
+  {
+! #ifdef	NO_REGEXP
+  	char regexp[2048];
++ #endif
+  
+  	*ff_ptr = DirectoryMgrFilterName;
+! 	*fd_ptr = (regex_t *)malloc(sizeof(regex_t));
+! 	if (!*fd_ptr)
+! 		return(FALSE);
+! 	if (!regcomp(*fd_ptr, pattern, REG_EXTENDED | REG_NOSUB))
+! 		return(TRUE);
+! 	return FALSE;
+  } /* End DirectoryMgrSimpleFilterFunc */
+  
+  
+***************
+*** 474,486 ****
+  
+   *---------------------------------------------------------------------------*/
+  
+! int DirectoryMgrFilterName(de,fsm)
+  DirEntry *de;
+! char *fsm;
+  {
+! #ifndef	NO_REGEXP
+  	return(RegExpMatch(DirEntryFileName(de),fsm));
+  #else
+! 	return(TRUE);
+  #endif
+  } /* End DirectoryMgrFilterName */
+--- 484,496 ----
+  
+   *---------------------------------------------------------------------------*/
+  
+! int DirectoryMgrFilterName(de, fsm)
+  DirEntry *de;
+! regex_t *fsm;
+  {
+! #ifdef	NO_REGEXP
+  	return(RegExpMatch(DirEntryFileName(de),fsm));
+  #else
+! 	return(regexec(fsm, DirEntryFileName(de), 0, NULL, 0));
+  #endif
+  } /* End DirectoryMgrFilterName */
+*** src/Dir/DirMgr.h.orig	Wed Nov 29 12:47:59 1995
+--- src/Dir/DirMgr.h	Sat Apr 25 21:48:24 1998
+***************
+*** 26,31 ****
+--- 26,32 ----
+  #define	_FWF_DIRECTORY_MGR_H_
+  
+  #include <Xfwf/Directory.h>
++ #include <regex.h>
+  
+  /*---------------------------------------------------------------------------*
+  
+***************
+*** 101,107 ****
+  	int total_count;
+  	int filtered_count;
+  	PFI filter_func;
+! 	char *filter_data;
+  	int free_filter_data;
+  	PFI comp_func;
+  	int current_index;
+--- 102,108 ----
+  	int total_count;
+  	int filtered_count;
+  	PFI filter_func;
+! 	regex_t *filter_data;
+  	int free_filter_data;
+  	PFI comp_func;
+  	int current_index;
+***************
+*** 170,179 ****
+  
+  int		DirectoryMgrCanOpen(char *path);
+  DirectoryMgr *	DirectoryMgrOpen(char *path, PFI c_func, PFI f_func,
+! 			char *f_data, int free_data);
+  void		DirectoryMgrClose(DirectoryMgr *dm);
+  int		DirectoryMgrRefilter(DirectoryMgr *dm, PFI f_func,
+! 			char *f_data, int f_free);
+  int		DirectoryMgrRefresh(DirectoryMgr *dm);
+  void		DirectoryMgrResort(DirectoryMgr *dm, PFI c_func);
+  
+--- 171,180 ----
+  
+  int		DirectoryMgrCanOpen(char *path);
+  DirectoryMgr *	DirectoryMgrOpen(char *path, PFI c_func, PFI f_func,
+! 			regex_t *f_data, int free_data);
+  void		DirectoryMgrClose(DirectoryMgr *dm);
+  int		DirectoryMgrRefilter(DirectoryMgr *dm, PFI f_func,
+! 			regex_t *f_data, int f_free);
+  int		DirectoryMgrRefresh(DirectoryMgr *dm);
+  void		DirectoryMgrResort(DirectoryMgr *dm, PFI c_func);
+  
+*** src/Dir/Directory.c.orig	Wed Nov 29 12:47:59 1995
+--- src/Dir/Directory.c	Sat Apr 25 21:48:25 1998
+***************
+*** 24,30 ****
+   */ 
+  
+  #include <Xfwf/Directory.h>
+- #include <Xfwf/RegExp.h>
+  
+  /*--------------------------------------------------------------------------*
+  
+--- 24,29 ----
+*** src/Dir/Imakefile.orig	Thu Apr 18 05:19:51 1996
+--- src/Dir/Imakefile	Sat Apr 25 22:10:55 1998
+***************
+*** 4,18 ****
+  
+  CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(STD_INCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(DEFINES) $(COMPATFLAGS)
+  
+- REGH		=	RegExp.h
+- REGSRC		=	RegExp.c
+- REGOBJ		=	RegExp.o
+- REGTESTSRC	=	RegExpT.c
+- REGTESTOBJ	=	RegExpT.o
+- REGTEST		=	$(FWF_BINDIR)/RegExpT
+- REGOBJS		=	$(REGOBJ) $(REGTESTOBJ)
+- REGSRCS		=	$(REGSRC) $(REGTESTSRC)
+- 
+  DIRH		=	Directory.h
+  DIRSRC		=	Directory.c
+  DIROBJ		=	Directory.o
+--- 4,9 ----
+***************
+*** 33,64 ****
+  
+  DIR_LIBNAME	=	libDir.a
+  
+! PROGRAMS = $(REGTEST) $(DIRTEST) $(DIRMGRTEST)
+! LIB_OBJS = $(REGOBJ) $(DIROBJ) $(DIRMGROBJ)
+! EXT_OBJS = $(REGTESTOBJ) $(DIRTESTOBJ) $(DIRMGRTESTOBJ)
+  
+! INCS = $(FWF_INCDIR)/$(REGH) $(FWF_INCDIR)/$(DIRH) $(FWF_INCDIR)/$(DIRMGRH)
+  SRCS = $(REGSRCS) $(DIRSRCS) $(DIRMGRSRCS)
+  
+  LOCALLIBS = $(DIR_LIB)
+  DEPLIBS = $(DIR_LIB)
+  SYSLIBS =
+  
+- AddToLibraryTarget(archive,$(FWF_LIBDIR),$(DIR_LIBNAME),$(REGOBJ))
+  AddToLibraryTarget(archive,$(FWF_LIBDIR),$(DIR_LIBNAME),$(DIROBJ))
+  AddToLibraryTarget(archive,$(FWF_LIBDIR),$(DIR_LIBNAME),$(DIRMGROBJ))
+  
+  ObjectRuleWithFlags($(CFLAGS) $(XPM_INCDIR) -I$(FWF_INCBASE))
+  
+- RequireThisFileForInit($(FWF_INCDIR)/$(REGH))
+  RequireThisFileForInit($(FWF_INCDIR)/$(DIRH))
+  RequireThisFileForInit($(FWF_INCDIR)/$(DIRMGRH))
+  
+- FileCopyWhenNeeded(.,$(REGH),$(FWF_INCDIR),$(REGH))
+  FileCopyWhenNeeded(.,$(DIRH),$(FWF_INCDIR),$(DIRH))
+  FileCopyWhenNeeded(.,$(DIRMGRH),$(FWF_INCDIR),$(DIRMGRH))
+  
+- NormalProgramTarget($(REGTEST),$(REGOBJS),$(DEPLIBS),$(LOCALLIBS),$(SYSLIBS))
+  NormalProgramTarget($(DIRTEST),$(DIROBJS),$(DEPLIBS),$(LOCALLIBS),$(SYSLIBS))
+  NormalProgramTarget($(DIRMGRTEST),$(DIRMGROBJS),$(DEPLIBS),$(LOCALLIBS),$(SYSLIBS))
+  
+--- 24,51 ----
+  
+  DIR_LIBNAME	=	libDir.a
+  
+! PROGRAMS = $(DIRTEST) $(DIRMGRTEST)
+! LIB_OBJS = $(DIROBJ) $(DIRMGROBJ)
+! EXT_OBJS = $(DIRTESTOBJ) $(DIRMGRTESTOBJ)
+  
+! INCS = $(FWF_INCDIR)/$(DIRH) $(FWF_INCDIR)/$(DIRMGRH)
+  SRCS = $(REGSRCS) $(DIRSRCS) $(DIRMGRSRCS)
+  
+  LOCALLIBS = $(DIR_LIB)
+  DEPLIBS = $(DIR_LIB)
+  SYSLIBS =
+  
+  AddToLibraryTarget(archive,$(FWF_LIBDIR),$(DIR_LIBNAME),$(DIROBJ))
+  AddToLibraryTarget(archive,$(FWF_LIBDIR),$(DIR_LIBNAME),$(DIRMGROBJ))
+  
+  ObjectRuleWithFlags($(CFLAGS) $(XPM_INCDIR) -I$(FWF_INCBASE))
+  
+  RequireThisFileForInit($(FWF_INCDIR)/$(DIRH))
+  RequireThisFileForInit($(FWF_INCDIR)/$(DIRMGRH))
+  
+  FileCopyWhenNeeded(.,$(DIRH),$(FWF_INCDIR),$(DIRH))
+  FileCopyWhenNeeded(.,$(DIRMGRH),$(FWF_INCDIR),$(DIRMGRH))
+  
+  NormalProgramTarget($(DIRTEST),$(DIROBJS),$(DEPLIBS),$(LOCALLIBS),$(SYSLIBS))
+  NormalProgramTarget($(DIRMGRTEST),$(DIRMGROBJS),$(DEPLIBS),$(LOCALLIBS),$(SYSLIBS))
+  
+***************
+*** 81,97 ****
+  	         echo "#include <sys/dir.h>" >> dirent.h;	\ 
+  	         echo "#endif" >> dirent.h;			\ 
+  	         cp dirent.h $(FWF_INCDIR)/dirent.h;		\ 
+- 	    else echo "";					\ 
+- 	    fi; exit 0)
+- 	@rm -f regexp.h
+- 	@rm -f $(FWF_INCDIR)/regexp.h
+- 	@(if [ ! -f /usr/include/regexp.h ];			\ 
+- 	    then echo "Patching because no regexp.h";		\ 
+- 	         echo "#ifndef _BRIREGEXP_H_" > regexp.h;	\ 
+- 	         echo "#define _BRIREGEXP_H_" >> regexp.h;	\ 
+- 	         echo "#define NO_REGEXP 1" >> regexp.h;	\ 
+- 	         echo "#endif" >> regexp.h;			\ 
+- 	         cp regexp.h $(FWF_INCDIR)/regexp.h;		\ 
+  	    else echo "";					\ 
+  	    fi; exit 0)
+  
+--- 68,73 ----
diff --git a/x11-toolkits/FWF/files/patch-ae b/x11-toolkits/FWF/files/patch-ae
new file mode 100644
index 000000000000..f65dcc92edfe
--- /dev/null
+++ b/x11-toolkits/FWF/files/patch-ae
@@ -0,0 +1,16 @@
+*** src/EzMenu/EzMenu.c.orig	Wed Nov 29 12:47:59 1995
+--- src/EzMenu/EzMenu.c	Sat Apr 25 21:48:25 1998
+***************
+*** 422,430 ****
+--- 422,432 ----
+        SimpleMenuWidget smw = (SimpleMenuWidget) ez_old;
+        SmeObject *entry;
+        
++ #if 0
+        ForAllChildren(smw, entry) {
+  	XtDestroyWidget((Widget)entry);
+        }
++ #endif
+  
+        XfwfEzMenuParseMenu(ez_new, ez_new -> ez_menu.menu, True);
+        ret_val = TRUE;
diff --git a/x11-toolkits/FWF/files/patch-af b/x11-toolkits/FWF/files/patch-af
new file mode 100644
index 000000000000..0a6de2d7a879
--- /dev/null
+++ b/x11-toolkits/FWF/files/patch-af
@@ -0,0 +1,304 @@
+*** src/FileComp/FileComp.c.orig	Thu Apr 18 05:21:21 1996
+--- src/FileComp/FileComp.c	Sat Apr 25 21:48:25 1998
+***************
+*** 121,129 ****
+  #ifdef USEONELINE
+  #include "OneLineText.h"
+  #endif
+! #if defined(USE_REGEX) && defined(GNU_REGEX)
+  #include <regex.h>
+! #endif
+  #if defined(USE_GLOB)
+  #include <glob.h>
+  #endif
+--- 121,129 ----
+  #ifdef USEONELINE
+  #include "OneLineText.h"
+  #endif
+! 
+  #include <regex.h>
+! 
+  #if defined(USE_GLOB)
+  #include <glob.h>
+  #endif
+***************
+*** 299,307 ****
+  static void ChoosePrefix();
+  static void UpdateFilesList();
+  
+! #if defined(USE_REGEX) && defined(GNU_REGEX)
+! static struct re_pattern_buffer compbuf;
+! #endif
+  
+  static void
+  Initialize(request, new)
+--- 299,305 ----
+  static void ChoosePrefix();
+  static void UpdateFilesList();
+  
+! static regex_t *compbuf;
+  
+  static void
+  Initialize(request, new)
+***************
+*** 405,417 ****
+    } else
+      fcwp->cancel_button = NULL;
+  
+- #if defined(USE_REGEX) && defined(GNU_REGEX)
+-   /* this code initializes the compile buffer for the regex routines */
+-   compbuf.buffer = XtMalloc(256);
+-   compbuf.allocated = 256;
+-   compbuf.fastmap = compbuf.translate = NULL;
+- #endif
+- 
+    UpdateFilesList(new);
+    ChoosePrefix(new);
+  
+--- 403,408 ----
+***************
+*** 451,462 ****
+      free(fcwp->candidates);
+    if (fcwp->candidx)
+      free(fcwp->candidx);
+! #if defined(USE_REGEX) && defined(GNU_REGEX)
+!   if (compbuf.buffer) {	  /* free the compile buffer from the regex routines */
+!     XtFree(compbuf.buffer);
+!     compbuf.buffer = NULL;
+    }
+- #endif
+  }
+  
+  /* this is used to detect a double-click.
+--- 442,451 ----
+      free(fcwp->candidates);
+    if (fcwp->candidx)
+      free(fcwp->candidx);
+!   if (compbuf) {	  /* free the compile buffer from the regex routines */
+!     regfree(compbuf);
+!     compbuf = NULL;
+    }
+  }
+  
+  /* this is used to detect a double-click.
+***************
+*** 1657,1690 ****
+  }
+  
+  
+! 
+! 
+! #if defined(USE_REGEX)
+! 
+! /* following regex routine was developed by reading Brian Totty's code
+!    and reading the man page.  Long live free source code! */
+! 
+! #if !defined(GNU_REGEX)
+! 
+! #define INIT		register char *sp = instring;
+! #define	GETC()		(*sp++)
+! #define	PEEKC()		(*sp)
+! #define	UNGETC(c)	-- sp
+! #define	RETURN(ptr)	return (ptr);
+! #define	ERROR(val)	{ regex_errno = (val); return NULL; }
+! static int	regex_errno;
+! static int	getrnge();
+! #include	<regexp.h>
+! 
+! #endif /* !GNU_REGEX */
+! 
+! /* This routine now uses either the regexp library or the GNU regex
+!    library based on the #define GNU_REGEX.  It can also be eliminated
+!    entirely by not #defining USE_REGEX 			EdW */
+! /* We don't want to completely eliminate it.  This would cause
+!    compatibility problems.  Instead we define some stub procedures
+!    that issue XtAppWarningMsgs.                         RF */
+! 
+  #if NeedFunctionPrototypes
+  Boolean XfwfFCRegexFiles (
+       char	*s,
+--- 1646,1652 ----
+  }
+  
+  
+! /* This routine now uses POSIX regex */
+  #if NeedFunctionPrototypes
+  Boolean XfwfFCRegexFiles (
+       char	*s,
+***************
+*** 1704,1752 ****
+  {
+    static char	*cache_regex = NULL,
+  		*busted_regex = NULL;
+! #if defined(GNU_REGEX)
+!   _Xconst char *	comp_result;
+! #else
+!   static char	compbuf[2048]; /* I should modify this to be a dynamically
+! 				  grown array.  sigh */
+! #endif
+    int	rval;
+  
+    if (busted_regex && 0==strcmp(regex,busted_regex))
+      return TRUE;
+  
+    if (!cache_regex || 0!=strcmp(cache_regex,regex)) {
+! #if defined(GNU_REGEX)
+!     if (!(comp_result = re_compile_pattern(regex, strlen(regex), &compbuf))) {
+! #else
+!     if (NULL != compile(regex, compbuf, compbuf+sizeof(compbuf), '\0')) {
+! #endif
+        XtFree(cache_regex);	/* safe for NULL */
+        cache_regex = XtNewString(regex);
+      } else {
+        String	params[2];
+        Cardinal	n;
+  
+! #if defined(GNU_REGEX)
+!       params[0] = comp_result;
+! #else
+!       switch (regex_errno) {
+!       case 11: params[0] = "Range endpoint too large."; break;
+!       case 16: params[0] = "Bad number"; break;
+!       case 25: params[0] = "`\\digit' out of range."; break;
+!       case 36: params[0] = "Illegal or missing delimiter."; break;
+!       case 41: params[0] = "No remembered search string."; break;
+!       case 42: params[0] = "\\( \\) imbalance."; break;
+!       case 43: params[0] = "Too many \\(."; break;
+!       case 44: params[0] = "More than 2 numbers given in \\{ \\}."; break;
+!       case 45: params[0] = "} expected after \\."; break;
+!       case 46: params[0] = "First number exceeds second in \\{ \\}."; break;
+!       case 49: params[0] = "[] imbalance."; break;
+!       case 50: params[0] = "Regular expression too long."; break;
+!       default: params[0] = "unknown regex compilation error."; break;
+!       }
+! #endif
+! 
+        params[1] = regex;
+        n = 2;
+        XtAppWarningMsg(app_con, "compileFailed", "xfwfFileCompRegex",
+--- 1666,1687 ----
+  {
+    static char	*cache_regex = NULL,
+  		*busted_regex = NULL;
+!   static regex_t *compbuf;
+    int	rval;
+  
+    if (busted_regex && 0==strcmp(regex,busted_regex))
+      return TRUE;
+  
+    if (!cache_regex || 0!=strcmp(cache_regex,regex)) {
+!     compbuf = (regex_t *)malloc(sizeof(regex_t));
+!     if (!regcomp(compbuf, regex, REG_EXTENDED | REG_NOSUB)) {
+        XtFree(cache_regex);	/* safe for NULL */
+        cache_regex = XtNewString(regex);
+      } else {
+        String	params[2];
+        Cardinal	n;
+  
+!       params[0] = "bogus regex";
+        params[1] = regex;
+        n = 2;
+        XtAppWarningMsg(app_con, "compileFailed", "xfwfFileCompRegex",
+***************
+*** 1758,1771 ****
+        return TRUE;
+      }
+    }
+! 
+! #if defined(GNU_REGEX)
+!   rval = re_match(&compbuf, s, strlen(s), 0, NULL);
+!   return ((rval >= 0) && (rval == strlen(s)));
+! #else
+!   rval = advance(s, compbuf);
+!   return rval && *loc2==0;
+! #endif
+  }
+  
+  
+--- 1693,1699 ----
+        return TRUE;
+      }
+    }
+!   return regexec(compbuf, s, 0, NULL, 0);
+  }
+  
+  
+***************
+*** 1783,1840 ****
+      XfwfFCRegexFiles(filename, regex, app_con) ;
+  }
+  
+- #else /* USE_REGEX */
+- 
+- #if NeedFunctionPrototypes
+- Boolean XfwfFCRegexFiles (
+-      char	*s,
+-      _Xconst XtPointer	regex,
+-      XtAppContext	app_con)
+- #else
+- Boolean XfwfFCRegexFiles (s, regex, app_con)
+-      char	*s;
+-      XtPointer	regex;
+-      XtAppContext	app_con;
+- #endif
+- {
+-   Cardinal	num_subs = 0;
+-   String	subs[1];
+-   static int	issued=0;
+- 
+-   if (issued)
+-     return;		/* they don't want to see this a million times */
+-   /* urgh, regex was not available at the time :( */
+-   XtAppWarningMsg(app_con, "packageUnavailable", "xfwfFileCompRegex",
+- 		  "XfwfLibraryError",
+- 		  "attempt to use regular expressions in a FileComplete widget (XfwfFCRegexFiles).  The FWF library was not compiled with that option.",
+- 		  subs, &num_subs);
+-   issued = 1;
+- }
+- 
+- Boolean XfwfFCDirsOrRegexFiles(filename, filestats, regex, app_con)
+-      char	*filename;
+-      struct stat *filestats;
+-      XtPointer	regex;
+-      XtAppContext	app_con;
+- {
+-   Cardinal	num_subs = 0;
+-   String	subs[1];
+-   static int	issued=0;
+- 
+-   if (issued)
+-     return;		/* they don't want to see this a million times */
+- 
+-   /* urgh, regex was not available at the time :( */
+-   XtAppWarningMsg(app_con, "packageUnavailable", "xfwfFileCompRegex",
+- 		  "XfwfLibraryError",
+- 		  "attempt to use regular expressions in a FileComplete widget (XfwfFCDirsOrRegexFiles).  The FWF library was not compiled with that option.",
+- 		  subs, &num_subs);
+-   issued = 1;
+- }
+- 
+- #endif /* USE_REGEX */
+- 
+- 
+  #ifdef USE_GLOB
+  
+  Boolean XfwfFCDirsOrGlobFiles(filename, filestats, regex, app_con)
+--- 1711,1716 ----
+***************
+*** 1949,1963 ****
+  enum xfwfFileCompleteRegexFlavor
+  XfwfFileCompleteRegexFlavor()
+  {
+- #ifdef USE_REGEX
+- #ifdef GNU_REGEX
+    return xfwfFC_Emacs;
+- #else
+-   return xfwfFC_ATT;
+- #endif
+- #else
+-   return xfwfFC_NoRegex;
+- #endif
+  }
+  
+  int XfwfFileCompleteHasGlob()
+--- 1825,1831 ----
diff --git a/x11-toolkits/FWF/files/patch-ag b/x11-toolkits/FWF/files/patch-ag
new file mode 100644
index 000000000000..2da613b96c4c
--- /dev/null
+++ b/x11-toolkits/FWF/files/patch-ag
@@ -0,0 +1,18 @@
+--- src/IconBox/IconBoxT.c.orig	Wed Nov 29 12:48:00 1995
++++ src/IconBox/IconBoxT.c	Sun Apr 26 07:51:32 1998
+@@ -5,6 +5,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <sys/types.h>
+ #include <dirent.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+@@ -42,7 +43,6 @@
+ };
+ 
+ extern int errno;
+-extern char *sys_errlist[];
+ 
+ static XtAppContext app_context;
+ static int hlen, vlen;
diff --git a/x11-toolkits/FWF/pkg-comment b/x11-toolkits/FWF/pkg-comment
index db0b4ec5f83e..fc7282b4092c 100644
--- a/x11-toolkits/FWF/pkg-comment
+++ b/x11-toolkits/FWF/pkg-comment
@@ -1 +1 @@
-The Free Widget Foundation Widget Release
+The Free Widget Foundation widget release
diff --git a/x11-toolkits/FWF/pkg-descr b/x11-toolkits/FWF/pkg-descr
index be66983350a8..8498975badc7 100644
--- a/x11-toolkits/FWF/pkg-descr
+++ b/x11-toolkits/FWF/pkg-descr
@@ -1,23 +1,20 @@
-=================================== README ===================================
+                        The Free Widget Foundation
+				       
+                                Brian Totty
 
-*****************************************************************
-*                                                               *
-*           The Free Widget Foundation Widget Release           *
-*                                                               *
-*****************************************************************
+                      Department of Computer Science
+                University of Illinois at Urbana-Champaign
+                        1304 West Springfield Avenue
+                             Urbana, IL 61801
 
-This is the Free Widget Foundation widget release, a collection of no-cost,
-freely redistributable X graphical user interface widgets.
+                    free-widgets-info@let.rug.nl
 
-The Free Widget Foundation is a grass-roots, all-volunteer effort.
+THE FREE WIDGET FOUNDATION
 
-The Free Widget Foundation project was started summer 1990 in order to collect
-existing widgets in a well-publicized location to prevent duplication of
-effort.  Numerous people have expressed interest in submitting widgets to the
-collection.  The collection process is going slowly because of lack of time
-and organizational needs.  The "Free Widget Foundation" is a pun on the "Free
-Software Foundation" title.  While the two organizations share some similar
-goals, that is the improvement of the quality and quantity of
-freely-redistributable public software, this organization is in no way related
-to the Free Software Foundation or the GNU projects.  In fact, we aren't even
-a "foundation" in the legal meaning of the word.
+The Free Widget Foundation (FWF) was first organized in the summer of 1990, as
+a grass-roots, all-volunteer effort to generate a publically accessible
+repository for X widgets.  The goal of the FWF was to gather a set of
+powerful, flexible, freely-accessible widgets, assisting programmers to
+construct complicated user-interfaces.  Furthermore, we wanted to discourage
+multiple parties from "reinventing the widget" multiple times, and encourage
+the development of a single, quality object.
diff --git a/x11-toolkits/FWF/pkg-plist b/x11-toolkits/FWF/pkg-plist
index 294b4c55d996..29aac072500d 100644
--- a/x11-toolkits/FWF/pkg-plist
+++ b/x11-toolkits/FWF/pkg-plist
@@ -1,64 +1,7 @@
-bin/AlertT
-bin/AnimatorT
-bin/AnsiTermT
-bin/ArrayT
-bin/ArrowT
-bin/BoardT
-bin/ButtonT
-bin/CanvasT
-bin/CircPercT
-bin/CmapT
-bin/CommonT
-bin/EnforcerT
-bin/EntryT
-bin/EzMenuT
-bin/FChooserT
-bin/FileCompT
-bin/FileListT
-bin/FileSelT
-bin/FoldTreeT
-bin/FrameT
-bin/GroupT
-bin/HScrollbT
-bin/HdialT
-bin/HistogramT
-bin/IconBoxT
-bin/IconT
-bin/ImageSelT
-bin/LabelT
-bin/MenuBarT
-bin/MultiListT
-bin/OptButtonT
-bin/PagerT
-bin/PcBarT
-bin/PieMenuT
-bin/PixEditT
-bin/PromptT
-bin/PullDownT
-bin/RadioGrpT
-bin/RheostatT
-bin/RowColT
-bin/RowsT
-bin/ScrListT
-bin/ScrWin3T
-bin/ScrollWinT
-bin/ScrollbarT
-bin/ShistogramT
-bin/Slider2T
-bin/Slider4T
-bin/SpinLabelT
-bin/StackT
-bin/TabsT
-bin/TextMenuT
-bin/ThWheelT
-bin/ToggleT
-bin/VScrollbT
 include/Xfwf/Alert.h
 include/Xfwf/AlertP.h
 include/Xfwf/Animator.h
 include/Xfwf/AnimatorP.h
-include/Xfwf/AnsiTerm.h
-include/Xfwf/AnsiTermP.h
 include/Xfwf/Array.h
 include/Xfwf/ArrayP.h
 include/Xfwf/Arrow.h
@@ -67,6 +10,8 @@ include/Xfwf/Board.h
 include/Xfwf/BoardP.h
 include/Xfwf/Button.h
 include/Xfwf/ButtonP.h
+include/Xfwf/Calendar.h
+include/Xfwf/CalendarP.h
 include/Xfwf/Canvas.h
 include/Xfwf/CanvasP.h
 include/Xfwf/CircPerc.h
@@ -88,6 +33,8 @@ include/Xfwf/EzMenu.h
 include/Xfwf/EzMenuP.h
 include/Xfwf/FChooser.h
 include/Xfwf/FChooserP.h
+include/Xfwf/FText.h
+include/Xfwf/FTextP.h
 include/Xfwf/FileComp.h
 include/Xfwf/FileCompP.h
 include/Xfwf/FileList.h
@@ -120,8 +67,6 @@ include/Xfwf/MultiList.h
 include/Xfwf/MultiListP.h
 include/Xfwf/OptButton.h
 include/Xfwf/OptButtonP.h
-include/Xfwf/Pager.h
-include/Xfwf/PagerP.h
 include/Xfwf/PcBar.h
 include/Xfwf/PcBarP.h
 include/Xfwf/Pen.h
@@ -161,21 +106,34 @@ include/Xfwf/Stack.h
 include/Xfwf/StackP.h
 include/Xfwf/StrToPmap.h
 include/Xfwf/TabString.h
-include/Xfwf/Tabs.h
-include/Xfwf/TabsP.h
 include/Xfwf/TextMenu.h
 include/Xfwf/TextMenuP.h
+include/Xfwf/TextOut.h
+include/Xfwf/TextOutP.h
 include/Xfwf/ThWheel.h
 include/Xfwf/ThWheelP.h
 include/Xfwf/Toggle.h
 include/Xfwf/ToggleP.h
+include/Xfwf/UGraf.h
+include/Xfwf/UGrafP.h
 include/Xfwf/VScrollb.h
 include/Xfwf/VScrollbP.h
 include/Xfwf/VarArgs.h
+include/Xfwf/XCC.h
+include/Xfwf/XCCP.h
+include/Xfwf/XmATerm.h
+include/Xfwf/XmATermP.h
+include/Xfwf/XmIcon.h
+include/Xfwf/XmIconP.h
+include/Xfwf/XmPager.h
+include/Xfwf/XmPagerP.h
+include/Xfwf/XmTabs.h
+include/Xfwf/XmTabsP.h
 include/Xfwf/choosecol.h
 include/Xfwf/icon.h
 include/Xfwf/long.h
 include/Xfwf/scroll.h
+include/Xfwf/str2color.h
 include/Xfwf/strarray.h
 lib/libDir.a
 lib/libfwf.a
@@ -183,8 +141,6 @@ man/man1/Alert.1.gz
 man/man1/AlertT.1.gz
 man/man1/Animator.1.gz
 man/man1/AnimatorT.1.gz
-man/man1/AnsiTerm.1.gz
-man/man1/AnsiTermT.1.gz
 man/man1/Array.1.gz
 man/man1/ArrayT.1.gz
 man/man1/Arrow.1.gz
@@ -193,6 +149,8 @@ man/man1/Board.1.gz
 man/man1/BoardT.1.gz
 man/man1/Button.1.gz
 man/man1/ButtonT.1.gz
+man/man1/Calendar.1.gz
+man/man1/CalendarT.1.gz
 man/man1/Canvas.1.gz
 man/man1/CanvasT.1.gz
 man/man1/CircPerc.1.gz
@@ -210,6 +168,8 @@ man/man1/EzMenu.1.gz
 man/man1/EzMenuT.1.gz
 man/man1/FChooser.1.gz
 man/man1/FChooserT.1.gz
+man/man1/FText.1.gz
+man/man1/FTextT.1.gz
 man/man1/FileComp.1.gz
 man/man1/FileCompT.1.gz
 man/man1/FileList.1.gz
@@ -242,8 +202,6 @@ man/man1/MultiList.1.gz
 man/man1/MultiListT.1.gz
 man/man1/OptButton.1.gz
 man/man1/OptButtonT.1.gz
-man/man1/Pager.1.gz
-man/man1/PagerT.1.gz
 man/man1/PcBar.1.gz
 man/man1/PcBarT.1.gz
 man/man1/PieMenu.1.gz
@@ -280,15 +238,23 @@ man/man1/SpinLabel.1.gz
 man/man1/SpinLabelT.1.gz
 man/man1/Stack.1.gz
 man/man1/StackT.1.gz
-man/man1/Tabs.1.gz
-man/man1/TabsT.1.gz
 man/man1/TextMenu.1.gz
 man/man1/TextMenuT.1.gz
 man/man1/ThWheel.1.gz
 man/man1/ThWheelT.1.gz
 man/man1/Toggle.1.gz
 man/man1/ToggleT.1.gz
+man/man1/UGraf.1.gz
+man/man1/UGrafT.1.gz
 man/man1/VScrollb.1.gz
 man/man1/VScrollbT.1.gz
+man/man1/XmATerm.1.gz
+man/man1/XmATermT.1.gz
+man/man1/XmIcon.1.gz
+man/man1/XmIconT.1.gz
+man/man1/XmPager.1.gz
+man/man1/XmPagerT.1.gz
+man/man1/XmTabs.1.gz
+man/man1/XmTabsT.1.gz
 man/man1/fwf.1.gz
 @dirrm include/Xfwf