1 files changed, 57 insertions, 47 deletions

diff --git a/x11-fm/xfm/files/patch-aa b/x11-fm/xfm/files/patch-aa
index e84076da2aa7..1a185cd9fac2 100644
--- a/x11-fm/xfm/files/patch-aa
+++ b/x11-fm/xfm/files/patch-aa
@@ -1,6 +1,60 @@
-diff -rc ./xfm/FmErrors.c ../xfm-1.3/xfm/FmErrors.c
-*** ./xfm/FmErrors.c	Sat Apr 30 22:03:13 1994
---- ../xfm-1.3/xfm/FmErrors.c	Mon Dec 26 19:36:08 1994
+diff -rc ../xfm-1.3.2port/work/xfm-1.3.2/lib/Apps ../xfm-1.3.2/lib/Apps
+*** ../xfm-1.3.2port/work/xfm-1.3.2/lib/Apps	Fri Apr  7 05:51:34 1995
+--- ../xfm-1.3.2/lib/Apps	Sun Jul 23 22:29:18 1995
+***************
+*** 1,6 ****
+--- 1,7 ----
+  #XFM
+  Xterm:::terminal.xpm:exec xterm:
+  Emacs:::emacs.xpm:exec emacs:exec emacs $*
++ Vi:::editor.xpm:exec xterm -geometry 80x30 -sb -e vi:exec xterm -geometry 80x30 -sb -e vi $*
+  Textedit:::edit.xpm:exec textedit:exec textedit $*
+  Mail:::mailtool.xpm:exec xmailtool:
+  Calculator:::calc.xpm:exec xcalc:
+***************
+*** 11,19 ****
+  Mosaic:::xmosaic.xpm:exec mosaic:
+  News:::news.xpm:exec xrn:
+  Hosts:~/.xfm:Hosts:rlogin.xpm:LOAD:
+! Printer:::printer.xpm:lpq -Plaser:exec lpr -Plaser $*
+  Home::.:citadel.xpm:OPEN:
+  Root:/:.:citadelroot.xpm:OPEN:
+  A\::/disk:a:floppy.xpm:OPEN:
+  B\::/disk:b:disk.xpm:OPEN:
+! Trash::.trash:recycle.xpm:OPEN:shift; mv -f -b -V numbered $* ~/.trash
+--- 12,20 ----
+  Mosaic:::xmosaic.xpm:exec mosaic:
+  News:::news.xpm:exec xrn:
+  Hosts:~/.xfm:Hosts:rlogin.xpm:LOAD:
+! Printer:::printer.xpm:lpq:exec lpr $*
+  Home::.:citadel.xpm:OPEN:
+  Root:/:.:citadelroot.xpm:OPEN:
+  A\::/disk:a:floppy.xpm:OPEN:
+  B\::/disk:b:disk.xpm:OPEN:
+! Trash::.trash:recycle.xpm:OPEN:shift; mv -f numbered $* ~/.trash
+diff -rc ../xfm-1.3.2port/work/xfm-1.3.2/src/Fm.h ../xfm-1.3.2/src/Fm.h
+*** ../xfm-1.3.2port/work/xfm-1.3.2/src/Fm.h	Wed Apr 12 08:35:11 1995
+--- ../xfm-1.3.2/src/Fm.h	Sun Jul 23 22:49:59 1995
+***************
+*** 16,25 ****
+--- 16,29 ----
+  #include <malloc.h>
+  #endif
+  
++ #ifdef __FreeBSD__
++ #include <stdlib.h>
++ #else
+  #ifdef _AIX
+  #pragma alloca
+  #else
+  #include <alloca.h>
++ #endif
+  #endif
+  
+  #include <stdio.h>
+diff -rc ../xfm-1.3.2port/work/xfm-1.3.2/src/FmErrors.c ../xfm-1.3.2/src/FmErrors.c
+*** ../xfm-1.3.2port/work/xfm-1.3.2/src/FmErrors.c	Sat Apr 30 22:03:13 1994
+--- ../xfm-1.3.2/src/FmErrors.c	Sun Jul 23 22:22:43 1995
 ***************
 *** 21,31 ****
   
@@ -15,47 +69,3 @@ diff -rc ./xfm/FmErrors.c ../xfm-1.3/xfm/FmErrors.c
     STAIC DATA
   -----------------------------------------------------------------------------*/
 --- 21,26 ----
-diff -rc ./xfm/FmUtils.c ../xfm-1.3/xfm/FmUtils.c
-*** ./xfm/FmUtils.c	Sat May 14 08:42:10 1994
---- ../xfm-1.3/xfm/FmUtils.c	Wed Dec 28 17:08:21 1994
-***************
-*** 518,523 ****
---- 518,524 ----
-      dialog_questions = (QuestionRec *)XtMalloc(n_vars*sizeof(QuestionRec));
-      for (i = 0; i < n_vars; i++) {
-        vals[i] = (char *)XtMalloc(MAXVARSTRINGLEN);
-+       bzero(vals[i], MAXVARSTRINGLEN);
-        dialog_questions[i].label = vars[i];
-        dialog_questions[i].value = vals[i];
-        dialog_questions[i].length = MAXVARSTRINGLEN;
-diff -rc ./xfm-apps ../xfm-1.3/xfm-apps
-*** ./xfm-apps	Mon May 16 16:20:35 1994
---- ../xfm-1.3/xfm-apps	Wed Dec 28 17:16:42 1994
-***************
-*** 5,16 ****
-  ##########################################
-  
-  Terminal:::xterm.xpm:exec xterm:
-! Editor:::editor.xpm:exec emacs:exec emacs $*
-  Printer:::printer.xpm::exec lpr $*
-  Mail:::mail.xpm:exec xmailtool:
-  Calculator:::calc.xpm:exec xcalc:
-  Manual:::xman.xpm:exec xman:
-  Toolbox::.xfm/xfm-tools:xfm_appmgr.xpm:LOAD:
-! Trash::.trash:trash.xpm:OPEN:shift; mv -f -b -V numbered $* ~/.trash
-  A\::/disk:a:disk.xpm:OPEN:
-  B\::/disk:b:disk.xpm:OPEN:
---- 5,17 ----
-  ##########################################
-  
-  Terminal:::xterm.xpm:exec xterm:
-! Emacs:::editor.xpm:exec emacs:exec emacs $*
-! Vi:::editor.xpm:exec xterm -geometry 80x30 -sb:exec xterm -geometry 80x30 -sb $*
-  Printer:::printer.xpm::exec lpr $*
-  Mail:::mail.xpm:exec xmailtool:
-  Calculator:::calc.xpm:exec xcalc:
-  Manual:::xman.xpm:exec xman:
-  Toolbox::.xfm/xfm-tools:xfm_appmgr.xpm:LOAD:
-! Trash::.trash:trash.xpm:OPEN:shift; mv -f numbered $* ~/.trash
-  A\::/disk:a:disk.xpm:OPEN:
-  B\::/disk:b:disk.xpm:OPEN: