1 files changed, 22 insertions, 71 deletions
diff --git a/x11-fm/xfm/files/patch-aa b/x11-fm/xfm/files/patch-aa
index 1a185cd9fac2..a467d0e117ec 100644
--- a/x11-fm/xfm/files/patch-aa
+++ b/x11-fm/xfm/files/patch-aa
@@ -1,71 +1,22 @@
-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 ****
-  
-  #define LABEL_WIDTH 300
-  
-- /* Uggh ...... */
-- #ifndef linux
-- extern char *sys_errlist[];
-- #endif
-- 
-  /*-----------------------------------------------------------------------------
-    STAIC DATA
-  -----------------------------------------------------------------------------*/
---- 21,26 ----
+--- lib/Apps.orig	Tue Aug  1 08:48:54 2000
++++ lib/Apps	Tue Aug  1 08:56:32 2000
+@@ -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,9 +12,9 @@
+ Mosaic:::xmosaic.xpm:exec mosaic:
+ News:::news.xpm:exec xrn:
+ Hosts:~/.xfm:Hosts:rlogin.xpm:LOAD:
+-Printer:::printer.xpm:lpq -Plaser:exec lpr -Plaser $*
++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 -b -V numbered $* ~/.trash
++Trash::.trash:recycle.xpm:OPEN:shift; mv -f numbered $* ~/.trash