Update to version 1.4.2

8 files changed, 442 insertions, 321 deletions

diff --git a/x11-fm/xfm/Makefile b/x11-fm/xfm/Makefile
index c53bfb9527f6..d371f73b9df5 100644
--- a/x11-fm/xfm/Makefile
+++ b/x11-fm/xfm/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	xfm
-PORTVERSION= 	1.3.2
+PORTVERSION= 	1.4.2
 CATEGORIES=	x11-fm
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	applications
+MASTER_SITES=	ftp://ftp.uni-koeln.de/windows/xcontrib/
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=    Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=    Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d \
+		Xpm.4:${PORTSDIR}/graphics/xpm
 
 USE_IMAKE=	yes
 MAN1=		xfm.1 xfmtype.1
diff --git a/x11-fm/xfm/distinfo b/x11-fm/xfm/distinfo
index db66c4562304..06239cc12fff 100644
--- a/x11-fm/xfm/distinfo
+++ b/x11-fm/xfm/distinfo
@@ -1 +1 @@
-MD5 (xfm-1.3.2.tar.gz) = e954ca08ef323d4fa0ec1ac01482b6f9
+MD5 (xfm-1.4.2.tar.gz) = 7b23ae130220592015e39adca067af10
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
diff --git a/x11-fm/xfm/files/patch-ab b/x11-fm/xfm/files/patch-ab
index c0fdb1311d5c..13fed2e9684d 100644
--- a/x11-fm/xfm/files/patch-ab
+++ b/x11-fm/xfm/files/patch-ab
@@ -1,11 +1,17 @@
---- src/magic.c.orig	Sun Aug  9 13:47:06 1998
-+++ src/magic.c	Sun Aug  9 13:47:18 1998
-@@ -227,7 +227,7 @@
- 	    default:
- 		mtypes[count].flags |= M_EQ;
- 	    }
--	    mtypes[count].value.number = strtol(cptr, &cptr, 0);
-+	    mtypes[count].value.number = strtoul(cptr, &cptr, 0);
- 	}
- 	while(isspace(*cptr))
- 	    cptr++;
+--- src/Fm.h.orig	Tue Aug  1 09:09:35 2000
++++ src/Fm.h	Tue Aug  1 09:16:04 2000
+@@ -19,10 +19,14 @@
+ #include <malloc.h>
+ #endif
+ 
++#ifdef __FreeBSD__
++#include <stdlib.h>
++#else
+ #ifdef _AIX
+ #pragma alloca
+ #else
+ #include <alloca.h>
++#endif
+ #endif
+ 
+ #include <stdio.h>
diff --git a/x11-fm/xfm/files/patch-ac b/x11-fm/xfm/files/patch-ac
new file mode 100644
index 000000000000..fac3c3c263a3
--- /dev/null
+++ b/x11-fm/xfm/files/patch-ac
@@ -0,0 +1,14 @@
+--- src/FmErrors.c.orig	Tue Aug  1 09:19:16 2000
++++ src/FmErrors.c	Tue Aug  1 09:20:09 2000
+@@ -21,11 +21,6 @@
+ 
+ #define LABEL_WIDTH 300
+ 
+-/* Uggh ...... */
+-#ifndef linux
+-extern char *sys_errlist[];
+-#endif
+-
+ /*-----------------------------------------------------------------------------
+   STAIC DATA
+ -----------------------------------------------------------------------------*/
diff --git a/x11-fm/xfm/files/patch-ad b/x11-fm/xfm/files/patch-ad
new file mode 100644
index 000000000000..dfb4acb5e28c
--- /dev/null
+++ b/x11-fm/xfm/files/patch-ad
@@ -0,0 +1,11 @@
+--- src/magic.c.orig	Wed Aug  2 13:21:00 2000
++++ src/magic.c	Wed Aug  2 13:21:26 2000
+@@ -234,7 +234,7 @@
+ 	    default:
+ 		mtypes[count].flags |= M_EQ;
+ 	    }
+-	    mtypes[count].value.number = strtol(cptr, &cptr, 0) & vmask;
++	    mtypes[count].value.number = strtoul(cptr, &cptr, 0) & vmask;
+ 	}
+ 	while(isspace(*cptr))
+ 	    cptr++;
diff --git a/x11-fm/xfm/pkg-descr b/x11-fm/xfm/pkg-descr
index fac60d90369d..998dbb39aed4 100644
--- a/x11-fm/xfm/pkg-descr
+++ b/x11-fm/xfm/pkg-descr
@@ -1,34 +1,8 @@
-xfm-1.3
-
-Here is an extract from the source distribution xfm-1.3 README file:
-
-	XFM - The X File Manager (ver 1.3)
-	----------------------------------
-
-	(c) Simon Marlow 1990-1993 	simonm@dcs.glasgow.ac.uk
-	(c) Albert Graef 1994		ag@muwiinfa.geschichte.uni-mainz.de
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published
-	by the Free Software Foundation; either version 2, or (at your option) 
-	any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-------------------------------------------------------------------------------
-
-This is a powerful file and applications manager program written using the X
+XFM is a powerful file and applications manager program written using the X
 toolkit. It contains virtually all of the features that you would expect in a
 file manager -- move around your directory tree in multiple windows, and move,
 copy or delete files with simple mouse operations. Directory displays are
-updated automatically in regular intervals when the contents of a diaplayed
+updated automatically in regular intervals when the contents of a displayed
 directory changes. The integrated application manager allows you to load files
 into your favourite applications from the file manager by dragging icons. It
 can also be used as a "shelf" onto which you can place files and directories
@@ -47,22 +21,3 @@ directories (mount points). So you won't have to fiddle around with mount or
 mtools commands any more if all you want to do is copy some files between the
 hard disk and your floppy drive.
 
-The original version of this program was written by Simon Marlow at the
-University of Glasgow. I included Simon's README for reference purposes; see
-README-1.2. [Most of the information in this file is outdated; please refer to
-this README file and the man page for up-to-date installation and usage
-instructions.] The current release stems from my efforts to resolve some nasty
-bugs in the 1.2 beta version distributed with Linux slackware, and to add XPM
-support for displaying color icons in the file and application windows. As it
-came out, I also added a plethora of other features to make xfm the tool I was
-looking for; see the ChangeLog for details. Realizing that my private xfm
-version might be useful for others as well, I contacted Simon and he told me
-to put together a new release and make it available on the net. So here it is!
-I hope you will find it as useful as I do -- I am now using xfm regularly, and
-can't imagine how I ever did without it. I think that this program compares
-well to other free -- and even commercial -- file managers. It is fast,
-convenient to use, and offers a lot of built-in functionality and
-configuration options. If you are not addicted to the shell and like to
-shuffle around files with one hand in order to perform tasks such as moving,
-copying, deleting, compiling, formatting, archiving, compressing, etc. etc.,
-then xfm is certainly for you.
diff --git a/x11-fm/xfm/pkg-plist b/x11-fm/xfm/pkg-plist
index c77b4fd0e181..c7ef11386ccb 100644
--- a/x11-fm/xfm/pkg-plist
+++ b/x11-fm/xfm/pkg-plist
@@ -2,255 +2,439 @@ bin/xfm
 bin/xfm.install
 bin/xfmtype
 lib/X11/app-defaults/Xfm
-lib/X11/xfm/dot.xfm/Apps
-lib/X11/xfm/dot.xfm/Graphics
-lib/X11/xfm/dot.xfm/Hosts
-lib/X11/xfm/dot.xfm/Toolbox
-lib/X11/xfm/dot.xfm/magic
-lib/X11/xfm/dot.xfm/xfmrc
-lib/X11/xfm/dot.xfm/xfmdev
-lib/X11/xfm/bitmaps/sc.xbm
-lib/X11/xfm/bitmaps/lock.xbm
-lib/X11/xfm/bitmaps/xfm_dir.xbm
+lib/X11/xfm/bitmaps/app.xbm
+lib/X11/xfm/bitmaps/app_compress.xbm
+lib/X11/xfm/bitmaps/app_find.xbm
+lib/X11/xfm/bitmaps/app_grep.xbm
+lib/X11/xfm/bitmaps/app_make.xbm
+lib/X11/xfm/bitmaps/app_tar.xbm
+lib/X11/xfm/bitmaps/app_taz.xbm
+lib/X11/xfm/bitmaps/app_uuencode.xbm
+lib/X11/xfm/bitmaps/app_zip.xbm
+lib/X11/xfm/bitmaps/binedit.xbm
+lib/X11/xfm/bitmaps/bitmap.xbm
+lib/X11/xfm/bitmaps/calculator.xbm
 lib/X11/xfm/bitmaps/calendar.xbm
-lib/X11/xfm/bitmaps/printer.xbm
-lib/X11/xfm/bitmaps/trash.xbm
+lib/X11/xfm/bitmaps/calendar2.xbm
+lib/X11/xfm/bitmaps/chess.xbm
+lib/X11/xfm/bitmaps/citadel.xbm
+lib/X11/xfm/bitmaps/citadelroot.xbm
+lib/X11/xfm/bitmaps/clipboard.xbm
 lib/X11/xfm/bitmaps/clipboard2.xbm
+lib/X11/xfm/bitmaps/console_sun.xbm
+lib/X11/xfm/bitmaps/debug.xbm
+lib/X11/xfm/bitmaps/drafting.xbm
 lib/X11/xfm/bitmaps/drawing.xbm
+lib/X11/xfm/bitmaps/edit.xbm
+lib/X11/xfm/bitmaps/emacs.xbm
+lib/X11/xfm/bitmaps/frog.xbm
+lib/X11/xfm/bitmaps/ghost.xbm
+lib/X11/xfm/bitmaps/ghostview.xbm
+lib/X11/xfm/bitmaps/gopher.xbm
+lib/X11/xfm/bitmaps/hexdump.xbm
+lib/X11/xfm/bitmaps/laserprinter.xbm
+lib/X11/xfm/bitmaps/laserwriter.xbm
+lib/X11/xfm/bitmaps/library.xbm
+lib/X11/xfm/bitmaps/library2.xbm
+lib/X11/xfm/bitmaps/lock.xbm
+lib/X11/xfm/bitmaps/log.xbm
+lib/X11/xfm/bitmaps/mailtool.xbm
+lib/X11/xfm/bitmaps/man.xbm
+lib/X11/xfm/bitmaps/man2.xbm
+lib/X11/xfm/bitmaps/math.xbm
+lib/X11/xfm/bitmaps/news.xbm
+lib/X11/xfm/bitmaps/palette.xbm
+lib/X11/xfm/bitmaps/pic_frame.xbm
+lib/X11/xfm/bitmaps/printer.xbm
+lib/X11/xfm/bitmaps/recycle.xbm
+lib/X11/xfm/bitmaps/rlogin.xbm
+lib/X11/xfm/bitmaps/sc.xbm
+lib/X11/xfm/bitmaps/scroll.xbm
+lib/X11/xfm/bitmaps/spell.xbm
+lib/X11/xfm/bitmaps/terminal.xbm
+lib/X11/xfm/bitmaps/terminal_SGI.xbm
+lib/X11/xfm/bitmaps/terminal_lock.xbm
+lib/X11/xfm/bitmaps/terminal_pc.xbm
+lib/X11/xfm/bitmaps/terminal_sun.xbm
+lib/X11/xfm/bitmaps/terminal_tty.xbm
+lib/X11/xfm/bitmaps/termlock.xbm
+lib/X11/xfm/bitmaps/tex-view.xbm
+lib/X11/xfm/bitmaps/tools.xbm
+lib/X11/xfm/bitmaps/trash.xbm
+lib/X11/xfm/bitmaps/typewriter.xbm
+lib/X11/xfm/bitmaps/wizard.xbm
+lib/X11/xfm/bitmaps/xchess.xbm
+lib/X11/xfm/bitmaps/xdbx.xbm
+lib/X11/xfm/bitmaps/xfig.xbm
+lib/X11/xfm/bitmaps/xfm_Sticky.xbm
+lib/X11/xfm/bitmaps/xfm_Suid.xbm
 lib/X11/xfm/bitmaps/xfm_a.xbm
 lib/X11/xfm/bitmaps/xfm_appmgr.xbm
+lib/X11/xfm/bitmaps/xfm_au.xbm
+lib/X11/xfm/bitmaps/xfm_blackhole.xbm
+lib/X11/xfm/bitmaps/xfm_c.xbm
+lib/X11/xfm/bitmaps/xfm_cc.xbm
 lib/X11/xfm/bitmaps/xfm_cline.xbm
+lib/X11/xfm/bitmaps/xfm_core.xbm
+lib/X11/xfm/bitmaps/xfm_data.xbm
+lib/X11/xfm/bitmaps/xfm_dir.xbm
+lib/X11/xfm/bitmaps/xfm_dir_s.xbm
 lib/X11/xfm/bitmaps/xfm_dirlnk.xbm
 lib/X11/xfm/bitmaps/xfm_dirmsk.xbm
+lib/X11/xfm/bitmaps/xfm_dirmsk_s.xbm
+lib/X11/xfm/bitmaps/xfm_draw.xbm
 lib/X11/xfm/bitmaps/xfm_excl.xbm
 lib/X11/xfm/bitmaps/xfm_exec.xbm
+lib/X11/xfm/bitmaps/xfm_exec_s.xbm
 lib/X11/xfm/bitmaps/xfm_execlnk.xbm
 lib/X11/xfm/bitmaps/xfm_execmsk.xbm
+lib/X11/xfm/bitmaps/xfm_execmsk_s.xbm
+lib/X11/xfm/bitmaps/xfm_fig.xbm
+lib/X11/xfm/bitmaps/xfm_file.xbm
+lib/X11/xfm/bitmaps/xfm_file_s.xbm
 lib/X11/xfm/bitmaps/xfm_filemsk.xbm
-lib/X11/xfm/bitmaps/xfm_noentrymsk.xbm
+lib/X11/xfm/bitmaps/xfm_filemsk_s.xbm
+lib/X11/xfm/bitmaps/xfm_files.xbm
+lib/X11/xfm/bitmaps/xfm_files_s.xbm
 lib/X11/xfm/bitmaps/xfm_filesmsk.xbm
+lib/X11/xfm/bitmaps/xfm_filesmsk_s.xbm
 lib/X11/xfm/bitmaps/xfm_fline.xbm
+lib/X11/xfm/bitmaps/xfm_gif.xbm
+lib/X11/xfm/bitmaps/xfm_h.xbm
 lib/X11/xfm/bitmaps/xfm_icon.xbm
+lib/X11/xfm/bitmaps/xfm_info.xbm
 lib/X11/xfm/bitmaps/xfm_larrow.xbm
 lib/X11/xfm/bitmaps/xfm_lines.xbm
+lib/X11/xfm/bitmaps/xfm_lline.xbm
+lib/X11/xfm/bitmaps/xfm_make.xbm
 lib/X11/xfm/bitmaps/xfm_noentry.xbm
-lib/X11/xfm/bitmaps/xfm_cc.xbm
+lib/X11/xfm/bitmaps/xfm_noentry32.xbm
+lib/X11/xfm/bitmaps/xfm_noentry_s.xbm
+lib/X11/xfm/bitmaps/xfm_noentrymsk.xbm
+lib/X11/xfm/bitmaps/xfm_noentrymsk32.xbm
+lib/X11/xfm/bitmaps/xfm_noentrymsk_s.xbm
 lib/X11/xfm/bitmaps/xfm_notick.xbm
-lib/X11/xfm/bitmaps/xfm_rarrow.xbm
-lib/X11/xfm/bitmaps/xfm_symlnk.xbm
-lib/X11/xfm/bitmaps/xfm_tick.xbm
-lib/X11/xfm/bitmaps/xfm_watch.xbm
-lib/X11/xfm/bitmaps/xfm_watchmsk.xbm
-lib/X11/xfm/bitmaps/xfm_wavy.xbm
-lib/X11/xfm/bitmaps/xfm_wavy1.xbm
-lib/X11/xfm/bitmaps/xman.xbm
-lib/X11/xfm/bitmaps/xfm_file.xbm
-lib/X11/xfm/bitmaps/binedit.xbm
-lib/X11/xfm/bitmaps/bitmap.xbm
-lib/X11/xfm/bitmaps/debug.xbm
-lib/X11/xfm/bitmaps/emacs.xbm
-lib/X11/xfm/bitmaps/hexdump.xbm
-lib/X11/xfm/bitmaps/xfm_blackhole.xbm
-lib/X11/xfm/bitmaps/xfm_files.xbm
-lib/X11/xfm/bitmaps/xfm_lline.xbm
-lib/X11/xfm/bitmaps/xfm_tline.xbm
-lib/X11/xfm/bitmaps/xfm_wavy_arrow.xbm
-lib/X11/xfm/bitmaps/xfm_h.xbm
 lib/X11/xfm/bitmaps/xfm_o.xbm
-lib/X11/xfm/bitmaps/xchess.xbm
-lib/X11/xfm/bitmaps/xdbx.xbm
-lib/X11/xfm/bitmaps/xfm_c.xbm
-lib/X11/xfm/bitmaps/xfm_au.xbm
-lib/X11/xfm/bitmaps/xfm_core.xbm
-lib/X11/xfm/bitmaps/xfm_data.xbm
-lib/X11/xfm/bitmaps/xfm_draw.xbm
-lib/X11/xfm/bitmaps/xfm_fig.xbm
-lib/X11/xfm/bitmaps/xfm_gif.xbm
-lib/X11/xfm/bitmaps/xfm_info.xbm
-lib/X11/xfm/bitmaps/xfm_make.xbm
 lib/X11/xfm/bitmaps/xfm_objects.xbm
-lib/X11/xfm/bitmaps/xfm_ps.xbm
-lib/X11/xfm/bitmaps/xfm_tar.xbm
-lib/X11/xfm/bitmaps/xfm_tex.xbm
-lib/X11/xfm/bitmaps/xfm_tiff.xbm
-lib/X11/xfm/bitmaps/xfm_xbm.xbm
-lib/X11/xfm/bitmaps/xfm_xpm.xbm
-lib/X11/xfm/bitmaps/xfm_z.xbm
 lib/X11/xfm/bitmaps/xfm_paint.xbm
 lib/X11/xfm/bitmaps/xfm_par.xbm
 lib/X11/xfm/bitmaps/xfm_phone.xbm
+lib/X11/xfm/bitmaps/xfm_ps.xbm
+lib/X11/xfm/bitmaps/xfm_rarrow.xbm
 lib/X11/xfm/bitmaps/xfm_report.xbm
+lib/X11/xfm/bitmaps/xfm_sc.xbm
+lib/X11/xfm/bitmaps/xfm_sticky.xbm
 lib/X11/xfm/bitmaps/xfm_stop.xbm
+lib/X11/xfm/bitmaps/xfm_suid.xbm
+lib/X11/xfm/bitmaps/xfm_symlnk.xbm
 lib/X11/xfm/bitmaps/xfm_sys.xbm
 lib/X11/xfm/bitmaps/xfm_tag.xbm
+lib/X11/xfm/bitmaps/xfm_tar.xbm
+lib/X11/xfm/bitmaps/xfm_tex.xbm
 lib/X11/xfm/bitmaps/xfm_text.xbm
+lib/X11/xfm/bitmaps/xfm_tick.xbm
+lib/X11/xfm/bitmaps/xfm_tiff.xbm
+lib/X11/xfm/bitmaps/xfm_tline.xbm
 lib/X11/xfm/bitmaps/xfm_uu.xbm
+lib/X11/xfm/bitmaps/xfm_watch.xbm
+lib/X11/xfm/bitmaps/xfm_watchmsk.xbm
+lib/X11/xfm/bitmaps/xfm_wavy.xbm
+lib/X11/xfm/bitmaps/xfm_wavy1.xbm
+lib/X11/xfm/bitmaps/xfm_wavy_arrow.xbm
 lib/X11/xfm/bitmaps/xfm_word.xbm
+lib/X11/xfm/bitmaps/xfm_xbm.xbm
+lib/X11/xfm/bitmaps/xfm_xpm.xbm
+lib/X11/xfm/bitmaps/xfm_z.xbm
 lib/X11/xfm/bitmaps/xfm_zoo.xbm
-lib/X11/xfm/bitmaps/calculator.xbm
-lib/X11/xfm/bitmaps/chess.xbm
-lib/X11/xfm/bitmaps/xfig.xbm
-lib/X11/xfm/bitmaps/man.xbm
-lib/X11/xfm/bitmaps/man2.xbm
-lib/X11/xfm/bitmaps/frog.xbm
-lib/X11/xfm/bitmaps/ghost.xbm
-lib/X11/xfm/bitmaps/ghostview.xbm
-lib/X11/xfm/bitmaps/gopher.xbm
-lib/X11/xfm/bitmaps/laserprinter.xbm
-lib/X11/xfm/bitmaps/log.xbm
-lib/X11/xfm/bitmaps/library.xbm
-lib/X11/xfm/bitmaps/laserwriter.xbm
-lib/X11/xfm/bitmaps/app_tar.xbm
-lib/X11/xfm/bitmaps/mailtool.xbm
-lib/X11/xfm/bitmaps/app_taz.xbm
-lib/X11/xfm/bitmaps/math.xbm
-lib/X11/xfm/bitmaps/palette.xbm
-lib/X11/xfm/bitmaps/pic_frame.xbm
-lib/X11/xfm/bitmaps/recycle.xbm
-lib/X11/xfm/bitmaps/scroll.xbm
-lib/X11/xfm/bitmaps/spell.xbm
-lib/X11/xfm/bitmaps/terminal.xbm
-lib/X11/xfm/bitmaps/terminal_SGI.xbm
-lib/X11/xfm/bitmaps/terminal_lock.xbm
-lib/X11/xfm/bitmaps/terminal_pc.xbm
-lib/X11/xfm/bitmaps/terminal_sun.xbm
-lib/X11/xfm/bitmaps/terminal_tty.xbm
-lib/X11/xfm/bitmaps/termlock.xbm
-lib/X11/xfm/bitmaps/typewriter.xbm
+lib/X11/xfm/bitmaps/xman.xbm
 lib/X11/xfm/bitmaps/xmosaic.xbm
-lib/X11/xfm/bitmaps/calendar2.xbm
-lib/X11/xfm/bitmaps/clipboard.xbm
-lib/X11/xfm/bitmaps/citadel.xbm
-lib/X11/xfm/bitmaps/citadelroot.xbm
-lib/X11/xfm/bitmaps/edit.xbm
-lib/X11/xfm/bitmaps/library2.xbm
-lib/X11/xfm/bitmaps/news.xbm
-lib/X11/xfm/bitmaps/rlogin.xbm
-lib/X11/xfm/bitmaps/tex-view.xbm
-lib/X11/xfm/bitmaps/tools.xbm
-lib/X11/xfm/bitmaps/wizard.xbm
 lib/X11/xfm/bitmaps/xv.xbm
-lib/X11/xfm/bitmaps/xfm_sc.xbm
-lib/X11/xfm/bitmaps/console_sun.xbm
-lib/X11/xfm/bitmaps/drafting.xbm
-lib/X11/xfm/bitmaps/app_compress.xbm
-lib/X11/xfm/bitmaps/app_find.xbm
-lib/X11/xfm/bitmaps/app_grep.xbm
-lib/X11/xfm/bitmaps/app_make.xbm
-lib/X11/xfm/bitmaps/app_uuencode.xbm
-lib/X11/xfm/bitmaps/app_zip.xbm
-lib/X11/xfm/bitmaps/app.xbm
-lib/X11/xfm/pixmaps/edit.xpm
+lib/X11/xfm/dot.xfm/Apps
+lib/X11/xfm/dot.xfm/Graphics
+lib/X11/xfm/dot.xfm/Toolbox
+lib/X11/xfm/dot.xfm/magic
+lib/X11/xfm/dot.xfm/xfmdev
+lib/X11/xfm/dot.xfm/xfmrc
+lib/X11/xfm/icons/app.xpm
+lib/X11/xfm/icons/app_link.xpm
+lib/X11/xfm/icons/app_link_small.xpm
+lib/X11/xfm/icons/app_plain.xpm
+lib/X11/xfm/icons/app_small.xpm
+lib/X11/xfm/icons/bluelogo.xpm
+lib/X11/xfm/icons/book.xpm
+lib/X11/xfm/icons/bookshelf.xpm
+lib/X11/xfm/icons/bookshelf_small.xpm
+lib/X11/xfm/icons/bug.xpm
+lib/X11/xfm/icons/calc.xpm
+lib/X11/xfm/icons/calc2.xpm
+lib/X11/xfm/icons/camera.xpm
+lib/X11/xfm/icons/cdrom.xpm
+lib/X11/xfm/icons/chess.xpm
+lib/X11/xfm/icons/chess2.xpm
+lib/X11/xfm/icons/chess3.xpm
+lib/X11/xfm/icons/chip.xpm
+lib/X11/xfm/icons/circuit.xpm
+lib/X11/xfm/icons/circuit2.xpm
+lib/X11/xfm/icons/clip.xpm
+lib/X11/xfm/icons/clip_file.xpm
+lib/X11/xfm/icons/clip_folder.xpm
+lib/X11/xfm/icons/clip_folder_file.xpm
+lib/X11/xfm/icons/compress.xpm
+lib/X11/xfm/icons/compressed.xpm
+lib/X11/xfm/icons/core.xpm
+lib/X11/xfm/icons/cycle.xpm
+lib/X11/xfm/icons/data.xpm
+lib/X11/xfm/icons/debug.xpm
+lib/X11/xfm/icons/dev_cdrom.xpm
+lib/X11/xfm/icons/dev_floppy.xpm
+lib/X11/xfm/icons/dev_harddrive.xpm
+lib/X11/xfm/icons/diff.xpm
+lib/X11/xfm/icons/dot_a.xpm
+lib/X11/xfm/icons/dot_c.xpm
+lib/X11/xfm/icons/dot_cc.xpm
+lib/X11/xfm/icons/dot_h.xpm
+lib/X11/xfm/icons/dot_o.xpm
+lib/X11/xfm/icons/dot_sa.xpm
+lib/X11/xfm/icons/dot_so.xpm
+lib/X11/xfm/icons/draw.xpm
+lib/X11/xfm/icons/draw2.xpm
+lib/X11/xfm/icons/dvi.xpm
+lib/X11/xfm/icons/edit.xpm
+lib/X11/xfm/icons/editres.xpm
+lib/X11/xfm/icons/emacs.xpm
+lib/X11/xfm/icons/empty.xpm
+lib/X11/xfm/icons/exec.xpm
+lib/X11/xfm/icons/fig.xpm
+lib/X11/xfm/icons/file.xpm
+lib/X11/xfm/icons/file_bad.xpm
+lib/X11/xfm/icons/file_bad_small.xpm
+lib/X11/xfm/icons/file_link.xpm
+lib/X11/xfm/icons/file_link_bad.xpm
+lib/X11/xfm/icons/file_link_bad_small.xpm
+lib/X11/xfm/icons/file_link_small.xpm
+lib/X11/xfm/icons/file_small.xpm
+lib/X11/xfm/icons/fileman.xpm
+lib/X11/xfm/icons/files.xpm
+lib/X11/xfm/icons/fileserver.xpm
+lib/X11/xfm/icons/find.xpm
+lib/X11/xfm/icons/fish.xpm
+lib/X11/xfm/icons/floppy.xpm
+lib/X11/xfm/icons/folder.xpm
+lib/X11/xfm/icons/folder_bad.xpm
+lib/X11/xfm/icons/folder_bad_small.xpm
+lib/X11/xfm/icons/folder_link.xpm
+lib/X11/xfm/icons/folder_link_small.xpm
+lib/X11/xfm/icons/folder_small.xpm
+lib/X11/xfm/icons/folder_up.xpm
+lib/X11/xfm/icons/folder_up_small.xpm
+lib/X11/xfm/icons/font.xpm
+lib/X11/xfm/icons/framemaker.xpm
+lib/X11/xfm/icons/games.xpm
+lib/X11/xfm/icons/ghost.xpm
+lib/X11/xfm/icons/ghostview.xpm
+lib/X11/xfm/icons/gif.xpm
+lib/X11/xfm/icons/graph.xpm
+lib/X11/xfm/icons/grep.xpm
+lib/X11/xfm/icons/hammer.xpm
+lib/X11/xfm/icons/harddrive.xpm
+lib/X11/xfm/icons/helpme.xpm
+lib/X11/xfm/icons/hex.xpm
+lib/X11/xfm/icons/home.xpm
+lib/X11/xfm/icons/home_small.xpm
+lib/X11/xfm/icons/html.xpm
+lib/X11/xfm/icons/icon.xpm
+lib/X11/xfm/icons/iff.xpm
+lib/X11/xfm/icons/info.xpm
+lib/X11/xfm/icons/jpeg.xpm
+lib/X11/xfm/icons/link.xpm
+lib/X11/xfm/icons/link_shadow.xpm
+lib/X11/xfm/icons/link_shadow_small.xpm
+lib/X11/xfm/icons/link_small.xpm
+lib/X11/xfm/icons/lisp.xpm
+lib/X11/xfm/icons/list.xpm
+lib/X11/xfm/icons/mag_glass.xpm
+lib/X11/xfm/icons/magic.xpm
+lib/X11/xfm/icons/mail.xpm
+lib/X11/xfm/icons/mailfolder.xpm
+lib/X11/xfm/icons/make.xpm
+lib/X11/xfm/icons/makefile.xpm
+lib/X11/xfm/icons/manpage.xpm
+lib/X11/xfm/icons/manual.xpm
+lib/X11/xfm/icons/modem.xpm
+lib/X11/xfm/icons/movies.xpm
+lib/X11/xfm/icons/music.xpm
+lib/X11/xfm/icons/netscape.xpm
+lib/X11/xfm/icons/news.xpm
+lib/X11/xfm/icons/paint.xpm
+lib/X11/xfm/icons/paint2.xpm
+lib/X11/xfm/icons/paintings.xpm
+lib/X11/xfm/icons/paragraphs.xpm
+lib/X11/xfm/icons/pbm.xpm
+lib/X11/xfm/icons/pgm.xpm
+lib/X11/xfm/icons/pictures.xpm
+lib/X11/xfm/icons/ppm.xpm
+lib/X11/xfm/icons/printer.xpm
+lib/X11/xfm/icons/printer2.xpm
+lib/X11/xfm/icons/printer3.xpm
+lib/X11/xfm/icons/ps.xpm
+lib/X11/xfm/icons/ps2.xpm
+lib/X11/xfm/icons/raster.xpm
+lib/X11/xfm/icons/rc.xpm
+lib/X11/xfm/icons/readme.xpm
+lib/X11/xfm/icons/recycle.xpm
+lib/X11/xfm/icons/res.xpm
+lib/X11/xfm/icons/script.xpm
+lib/X11/xfm/icons/script_file.xpm
+lib/X11/xfm/icons/script_link.xpm
+lib/X11/xfm/icons/script_plain.xpm
+lib/X11/xfm/icons/sound.xpm
+lib/X11/xfm/icons/sounds.xpm
+lib/X11/xfm/icons/sounds2.xpm
+lib/X11/xfm/icons/stuff.xpm
+lib/X11/xfm/icons/suitcase.xpm
+lib/X11/xfm/icons/system.xpm
+lib/X11/xfm/icons/tape.xpm
+lib/X11/xfm/icons/tape_net.xpm
+lib/X11/xfm/icons/tar.xpm
+lib/X11/xfm/icons/teddy.xpm
+lib/X11/xfm/icons/term.xpm
+lib/X11/xfm/icons/tex.xpm
+lib/X11/xfm/icons/text.xpm
+lib/X11/xfm/icons/tiff.xpm
+lib/X11/xfm/icons/tmpfile.xpm
+lib/X11/xfm/icons/tools.xpm
+lib/X11/xfm/icons/trash_empty.xpm
+lib/X11/xfm/icons/trash_full.xpm
+lib/X11/xfm/icons/uu.xpm
+lib/X11/xfm/icons/video.xpm
+lib/X11/xfm/icons/winzip.xpm
+lib/X11/xfm/icons/write.xpm
+lib/X11/xfm/icons/writings.xpm
+lib/X11/xfm/icons/x.xpm
+lib/X11/xfm/icons/xapp.xpm
+lib/X11/xfm/icons/xbm.xpm
+lib/X11/xfm/icons/xfig.xpm
+lib/X11/xfm/icons/xlogo.xpm
+lib/X11/xfm/icons/xmcd.xpm
+lib/X11/xfm/icons/xplate.xpm
+lib/X11/xfm/icons/xrolodex.xpm
+lib/X11/xfm/icons/xterm.xpm
+lib/X11/xfm/icons/xv.xpm
+lib/X11/xfm/icons/zip.xpm
+lib/X11/xfm/icons/zoo.xpm
+lib/X11/xfm/pixmaps/XfmLogo.xpm
+lib/X11/xfm/pixmaps/app.xpm
+lib/X11/xfm/pixmaps/app_compress.xpm
+lib/X11/xfm/pixmaps/app_find.xpm
+lib/X11/xfm/pixmaps/app_grep.xpm
+lib/X11/xfm/pixmaps/app_make.xpm
+lib/X11/xfm/pixmaps/app_tar.xpm
+lib/X11/xfm/pixmaps/app_taz.xpm
+lib/X11/xfm/pixmaps/app_uuencode.xpm
+lib/X11/xfm/pixmaps/app_zip.xpm
+lib/X11/xfm/pixmaps/apps.xpm
+lib/X11/xfm/pixmaps/bitmap.xpm
 lib/X11/xfm/pixmaps/calc.xpm
+lib/X11/xfm/pixmaps/calendar.xpm
+lib/X11/xfm/pixmaps/cdrom.xpm
+lib/X11/xfm/pixmaps/cdrom_library.xpm
+lib/X11/xfm/pixmaps/cdrom_look.xpm
+lib/X11/xfm/pixmaps/cdrom_view.xpm
+lib/X11/xfm/pixmaps/citadel.xpm
+lib/X11/xfm/pixmaps/citadelroot.xpm
+lib/X11/xfm/pixmaps/clipboard.xpm
+lib/X11/xfm/pixmaps/console.xpm
 lib/X11/xfm/pixmaps/disk.xpm
+lib/X11/xfm/pixmaps/drafting.xpm
+lib/X11/xfm/pixmaps/drawing.xpm
+lib/X11/xfm/pixmaps/edit.xpm
 lib/X11/xfm/pixmaps/editor.xpm
-lib/X11/xfm/pixmaps/xman.xpm
-lib/X11/xfm/pixmaps/xterm.xpm
+lib/X11/xfm/pixmaps/emacs.xpm
+lib/X11/xfm/pixmaps/flight_sim.xpm
+lib/X11/xfm/pixmaps/floppy.xpm
+lib/X11/xfm/pixmaps/frog.xpm
+lib/X11/xfm/pixmaps/ghost.xbm
+lib/X11/xfm/pixmaps/ghostview.xpm
+lib/X11/xfm/pixmaps/island.xpm
+lib/X11/xfm/pixmaps/lock.xpm
+lib/X11/xfm/pixmaps/log.xpm
+lib/X11/xfm/pixmaps/mailtool.xpm
 lib/X11/xfm/pixmaps/man.xpm
-lib/X11/xfm/pixmaps/printer.xpm
+lib/X11/xfm/pixmaps/man2.xpm
+lib/X11/xfm/pixmaps/mona_lisa.xpm
+lib/X11/xfm/pixmaps/news.xpm
 lib/X11/xfm/pixmaps/pixmap.xpm
-lib/X11/xfm/pixmaps/calendar.xpm
+lib/X11/xfm/pixmaps/printer.xpm
+lib/X11/xfm/pixmaps/recycle.xpm
+lib/X11/xfm/pixmaps/rlogin.xpm
+lib/X11/xfm/pixmaps/scroll.xpm
+lib/X11/xfm/pixmaps/terminal.xpm
+lib/X11/xfm/pixmaps/tex-view.xpm
+lib/X11/xfm/pixmaps/tools.xpm
+lib/X11/xfm/pixmaps/trash.xpm
+lib/X11/xfm/pixmaps/window.xpm
+lib/X11/xfm/pixmaps/wizard.xpm
+lib/X11/xfm/pixmaps/xcalc.xpm
+lib/X11/xfm/pixmaps/xcalc2.xpm
+lib/X11/xfm/pixmaps/xchess.xpm
+lib/X11/xfm/pixmaps/xdbx.xpm
+lib/X11/xfm/pixmaps/xfig.xpm
+lib/X11/xfm/pixmaps/xfm_a.xpm
+lib/X11/xfm/pixmaps/xfm_appmgr.xpm
+lib/X11/xfm/pixmaps/xfm_apps.xpm
+lib/X11/xfm/pixmaps/xfm_au.xpm
+lib/X11/xfm/pixmaps/xfm_blackhole.xpm
 lib/X11/xfm/pixmaps/xfm_c.xpm
-lib/X11/xfm/pixmaps/xfm_taz.xpm
+lib/X11/xfm/pixmaps/xfm_cc.xpm
 lib/X11/xfm/pixmaps/xfm_core.xpm
 lib/X11/xfm/pixmaps/xfm_data.xpm
-lib/X11/xfm/pixmaps/xfm_au.xpm
-lib/X11/xfm/pixmaps/xfm_h.xpm
-lib/X11/xfm/pixmaps/xfm_make.xpm
-lib/X11/xfm/pixmaps/xfm_o.xpm
-lib/X11/xfm/pixmaps/xfm_ps.xpm
-lib/X11/xfm/pixmaps/xfm_xbm.xpm
-lib/X11/xfm/pixmaps/xfm_tar.xpm
-lib/X11/xfm/pixmaps/xfm_tiff.xpm
-lib/X11/xfm/pixmaps/xfm_xpm.xpm
 lib/X11/xfm/pixmaps/xfm_dir.xpm
-lib/X11/xfm/pixmaps/xfm_gif.xpm
-lib/X11/xfm/pixmaps/xfm_a.xpm
-lib/X11/xfm/pixmaps/xfm_blackhole.xpm
 lib/X11/xfm/pixmaps/xfm_dirlnk.xpm
+lib/X11/xfm/pixmaps/xfm_draw.xpm
 lib/X11/xfm/pixmaps/xfm_exec.xpm
 lib/X11/xfm/pixmaps/xfm_execlnk.xpm
+lib/X11/xfm/pixmaps/xfm_fig.xpm
 lib/X11/xfm/pixmaps/xfm_file.xpm
+lib/X11/xfm/pixmaps/xfm_file_small.xpm
 lib/X11/xfm/pixmaps/xfm_files.xpm
+lib/X11/xfm/pixmaps/xfm_font.xpm
+lib/X11/xfm/pixmaps/xfm_gif.xpm
+lib/X11/xfm/pixmaps/xfm_h.xpm
 lib/X11/xfm/pixmaps/xfm_icon.xpm
-lib/X11/xfm/pixmaps/xfm_symlnk.xpm
-lib/X11/xfm/pixmaps/xfm_updir.xpm
-lib/X11/xfm/pixmaps/ghostview.xpm
-lib/X11/xfm/pixmaps/xfm_file_small.xpm
-lib/X11/xfm/pixmaps/clipboard.xpm
-lib/X11/xfm/pixmaps/xdbx.xpm
-lib/X11/xfm/pixmaps/lock.xpm
-lib/X11/xfm/pixmaps/xmag.xpm
-lib/X11/xfm/pixmaps/xfm_zip.xpm
-lib/X11/xfm/pixmaps/xpaint.xpm
-lib/X11/xfm/pixmaps/xfm_cc.xpm
-lib/X11/xfm/pixmaps/xfm_tex.xpm
-lib/X11/xfm/pixmaps/xv.xpm
-lib/X11/xfm/pixmaps/xfm_apps.xpm
-lib/X11/xfm/pixmaps/floppy.xpm
-lib/X11/xfm/pixmaps/xfm_appmgr.xpm
-lib/X11/xfm/pixmaps/cdrom.xpm
-lib/X11/xfm/pixmaps/trash.xpm
-lib/X11/xfm/pixmaps/xfm_z.xpm
-lib/X11/xfm/pixmaps/app_compress.xpm
-lib/X11/xfm/pixmaps/app_find.xpm
-lib/X11/xfm/pixmaps/app_grep.xpm
-lib/X11/xfm/pixmaps/app_make.xpm
-lib/X11/xfm/pixmaps/app_tar.xpm
 lib/X11/xfm/pixmaps/xfm_info.xpm
-lib/X11/xfm/pixmaps/xchess.xpm
-lib/X11/xfm/pixmaps/xfm_fig.xpm
-lib/X11/xfm/pixmaps/recycle.xpm
-lib/X11/xfm/pixmaps/xfm_sc.xpm
-lib/X11/xfm/pixmaps/apps.xpm
-lib/X11/xfm/pixmaps/window.xpm
-lib/X11/xfm/pixmaps/emacs.xpm
-lib/X11/xfm/pixmaps/news.xpm
-lib/X11/xfm/pixmaps/xcalc.xpm
-lib/X11/xfm/pixmaps/xcalc2.xpm
-lib/X11/xfm/pixmaps/xmosaic.xpm
-lib/X11/xfm/pixmaps/island.xpm
-lib/X11/xfm/pixmaps/cdrom_library.xpm
-lib/X11/xfm/pixmaps/cdrom_look.xpm
-lib/X11/xfm/pixmaps/cdrom_view.xpm
-lib/X11/xfm/pixmaps/drawing.xpm
-lib/X11/xfm/pixmaps/xfm_draw.xpm
+lib/X11/xfm/pixmaps/xfm_make.xpm
+lib/X11/xfm/pixmaps/xfm_o.xpm
 lib/X11/xfm/pixmaps/xfm_objects.xpm
-lib/X11/xfm/pixmaps/drafting.xpm
-lib/X11/xfm/pixmaps/xfm_font.xpm
-lib/X11/xfm/pixmaps/xfig.xpm
-lib/X11/xfm/pixmaps/mailtool.xpm
-lib/X11/xfm/pixmaps/man2.xpm
 lib/X11/xfm/pixmaps/xfm_par.xpm
 lib/X11/xfm/pixmaps/xfm_phone.xpm
+lib/X11/xfm/pixmaps/xfm_ps.xpm
 lib/X11/xfm/pixmaps/xfm_report.xpm
+lib/X11/xfm/pixmaps/xfm_sc.xpm
 lib/X11/xfm/pixmaps/xfm_stop.xpm
+lib/X11/xfm/pixmaps/xfm_symlnk.xpm
 lib/X11/xfm/pixmaps/xfm_sys.xpm
 lib/X11/xfm/pixmaps/xfm_tag.xpm
+lib/X11/xfm/pixmaps/xfm_tar.xpm
+lib/X11/xfm/pixmaps/xfm_taz.xpm
+lib/X11/xfm/pixmaps/xfm_tex.xpm
 lib/X11/xfm/pixmaps/xfm_text.xpm
-lib/X11/xfm/pixmaps/app_taz.xpm
+lib/X11/xfm/pixmaps/xfm_tiff.xpm
+lib/X11/xfm/pixmaps/xfm_updir.xpm
 lib/X11/xfm/pixmaps/xfm_uu.xpm
 lib/X11/xfm/pixmaps/xfm_word.xpm
+lib/X11/xfm/pixmaps/xfm_xbm.xpm
+lib/X11/xfm/pixmaps/xfm_xpm.xpm
+lib/X11/xfm/pixmaps/xfm_z.xpm
+lib/X11/xfm/pixmaps/xfm_zip.xpm
 lib/X11/xfm/pixmaps/xfm_zoo.xpm
-lib/X11/xfm/pixmaps/log.xpm
-lib/X11/xfm/pixmaps/flight_sim.xpm
-lib/X11/xfm/pixmaps/frog.xpm
-lib/X11/xfm/pixmaps/ghost.xbm
-lib/X11/xfm/pixmaps/citadel.xpm
-lib/X11/xfm/pixmaps/citadelroot.xpm
-lib/X11/xfm/pixmaps/rlogin.xpm
-lib/X11/xfm/pixmaps/tex-view.xpm
-lib/X11/xfm/pixmaps/tools.xpm
-lib/X11/xfm/pixmaps/wizard.xpm
-lib/X11/xfm/pixmaps/terminal.xpm
-lib/X11/xfm/pixmaps/scroll.xpm
-lib/X11/xfm/pixmaps/app_zip.xpm
-lib/X11/xfm/pixmaps/console.xpm
-lib/X11/xfm/pixmaps/app.xpm
-lib/X11/xfm/pixmaps/bitmap.xpm
-lib/X11/xfm/pixmaps/mona_lisa.xpm
-lib/X11/xfm/pixmaps/app_uuencode.xpm
+lib/X11/xfm/pixmaps/xmag.xpm
+lib/X11/xfm/pixmaps/xman.xpm
+lib/X11/xfm/pixmaps/xmosaic.xpm
+lib/X11/xfm/pixmaps/xpaint.xpm
+lib/X11/xfm/pixmaps/xterm.xpm
+lib/X11/xfm/pixmaps/xv.xpm
+@dirrm lib/X11/xfm/pixmaps
+@dirrm lib/X11/xfm/icons
 @dirrm lib/X11/xfm/dot.xfm
 @dirrm lib/X11/xfm/bitmaps
-@dirrm lib/X11/xfm/pixmaps
 @dirrm lib/X11/xfm