1 files changed, 250 insertions, 117 deletions

diff --git a/x11-fm/xfm/pkg-plist b/x11-fm/xfm/pkg-plist
index 3e9d60642480..1f0c0291922c 100644
--- a/x11-fm/xfm/pkg-plist
+++ b/x11-fm/xfm/pkg-plist
@@ -2,123 +2,256 @@
 @mode 755
 bin/xfm
 bin/xfm.install
+bin/xfmtype
 @mode 444
 man/man1/xfm.1.gz
+man/man1/xfmtype.1.gz
 lib/X11/app-defaults/Xfm
-lib/xfm/dot.xfm/xfm-apps
-lib/xfm/dot.xfm/xfm-tools
-lib/xfm/dot.xfm/xfmdev
-lib/xfm/dot.xfm/xfmrc
-lib/xfm/bitmaps/binedit.xbm
-lib/xfm/bitmaps/bitmap.xbm
-lib/xfm/bitmaps/calendar.xbm
-lib/xfm/bitmaps/clipboard.xbm
-lib/xfm/bitmaps/debug.xbm
-lib/xfm/bitmaps/emacs.xbm
-lib/xfm/bitmaps/hexdump.xbm
-lib/xfm/bitmaps/letters.xbm
-lib/xfm/bitmaps/lock.xbm
-lib/xfm/bitmaps/printer.xbm
-lib/xfm/bitmaps/sc.xbm
-lib/xfm/bitmaps/trash.xbm
-lib/xfm/bitmaps/xchess.xbm
-lib/xfm/bitmaps/xdbx.xbm
-lib/xfm/bitmaps/xfm_a.xbm
-lib/xfm/bitmaps/xfm_appmgr.xbm
-lib/xfm/bitmaps/xfm_blackhole.xbm
-lib/xfm/bitmaps/xfm_c.xbm
-lib/xfm/bitmaps/xfm_cc.xbm
-lib/xfm/bitmaps/xfm_cline.xbm
-lib/xfm/bitmaps/xfm_dir.xbm
-lib/xfm/bitmaps/xfm_dirlnk.xbm
-lib/xfm/bitmaps/xfm_dirmsk.xbm
-lib/xfm/bitmaps/xfm_excl.xbm
-lib/xfm/bitmaps/xfm_exec.xbm
-lib/xfm/bitmaps/xfm_execlnk.xbm
-lib/xfm/bitmaps/xfm_execmsk.xbm
-lib/xfm/bitmaps/xfm_file.xbm
-lib/xfm/bitmaps/xfm_filemsk.xbm
-lib/xfm/bitmaps/xfm_files.xbm
-lib/xfm/bitmaps/xfm_filesmsk.xbm
-lib/xfm/bitmaps/xfm_fline.xbm
-lib/xfm/bitmaps/xfm_h.xbm
-lib/xfm/bitmaps/xfm_icon.xbm
-lib/xfm/bitmaps/xfm_larrow.xbm
-lib/xfm/bitmaps/xfm_lines.xbm
-lib/xfm/bitmaps/xfm_lline.xbm
-lib/xfm/bitmaps/xfm_noentry.xbm
-lib/xfm/bitmaps/xfm_noentrymsk.xbm
-lib/xfm/bitmaps/xfm_notick.xbm
-lib/xfm/bitmaps/xfm_o.xbm
-lib/xfm/bitmaps/xfm_rarrow.xbm
-lib/xfm/bitmaps/xfm_symlnk.xbm
-lib/xfm/bitmaps/xfm_tick.xbm
-lib/xfm/bitmaps/xfm_tline.xbm
-lib/xfm/bitmaps/xfm_watch.xbm
-lib/xfm/bitmaps/xfm_watchmsk.xbm
-lib/xfm/bitmaps/xfm_wavy.xbm
-lib/xfm/bitmaps/xfm_wavy1.xbm
-lib/xfm/bitmaps/xfm_wavy_arrow.xbm
-lib/xfm/bitmaps/xman.xbm
-lib/xfm/pixmaps/calc.xpm
-lib/xfm/pixmaps/calendar.xpm
-lib/xfm/pixmaps/cdrom.xpm
-lib/xfm/pixmaps/clipboard.xpm
-lib/xfm/pixmaps/compress.xpm
-lib/xfm/pixmaps/disk.xpm
-lib/xfm/pixmaps/edit.xpm
-lib/xfm/pixmaps/editor.xpm
-lib/xfm/pixmaps/find.xpm
-lib/xfm/pixmaps/ghostview.xpm
-lib/xfm/pixmaps/grep.xpm
-lib/xfm/pixmaps/lock.xpm
-lib/xfm/pixmaps/mail.xpm
-lib/xfm/pixmaps/make.xpm
-lib/xfm/pixmaps/pixmap.xpm
-lib/xfm/pixmaps/printer.xpm
-lib/xfm/pixmaps/tar.xpm
-lib/xfm/pixmaps/taz.xpm
-lib/xfm/pixmaps/tex.xpm
-lib/xfm/pixmaps/trash.xpm
-lib/xfm/pixmaps/trash2.xpm
-lib/xfm/pixmaps/xchess.xpm
-lib/xfm/pixmaps/xdbx.xpm
-lib/xfm/pixmaps/xdbx48.xpm
-lib/xfm/pixmaps/xfm_a.xpm
-lib/xfm/pixmaps/xfm_appmgr.xpm
-lib/xfm/pixmaps/xfm_apps.xpm
-lib/xfm/pixmaps/xfm_au.xpm
-lib/xfm/pixmaps/xfm_blackhole.xpm
-lib/xfm/pixmaps/xfm_c.xpm
-lib/xfm/pixmaps/xfm_cc.xpm
-lib/xfm/pixmaps/xfm_core.xpm
-lib/xfm/pixmaps/xfm_data.xpm
-lib/xfm/pixmaps/xfm_dir.xpm
-lib/xfm/pixmaps/xfm_dirlnk.xpm
-lib/xfm/pixmaps/xfm_exec.xpm
-lib/xfm/pixmaps/xfm_execlnk.xpm
-lib/xfm/pixmaps/xfm_file.xpm
-lib/xfm/pixmaps/xfm_file_small.xpm
-lib/xfm/pixmaps/xfm_files.xpm
-lib/xfm/pixmaps/xfm_gif.xpm
-lib/xfm/pixmaps/xfm_h.xpm
-lib/xfm/pixmaps/xfm_icon.xpm
-lib/xfm/pixmaps/xfm_info.xpm
-lib/xfm/pixmaps/xfm_make.xpm
-lib/xfm/pixmaps/xfm_o.xpm
-lib/xfm/pixmaps/xfm_ps.xpm
-lib/xfm/pixmaps/xfm_symlnk.xpm
-lib/xfm/pixmaps/xfm_tar.xpm
-lib/xfm/pixmaps/xfm_taz.xpm
-lib/xfm/pixmaps/xfm_tex.xpm
-lib/xfm/pixmaps/xfm_tiff.xpm
-lib/xfm/pixmaps/xfm_updir.xpm
-lib/xfm/pixmaps/xfm_xbm.xpm
-lib/xfm/pixmaps/xfm_xpm.xpm
-lib/xfm/pixmaps/xfm_z.xpm
-lib/xfm/pixmaps/xfm_zip.xpm
-lib/xfm/pixmaps/xmag.xpm
-lib/xfm/pixmaps/xman.xpm
-lib/xfm/pixmaps/xpaint.xpm
-lib/xfm/pixmaps/xterm.xpm
-lib/xfm/pixmaps/zip.xpm
+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/calendar.xbm
+lib/X11/xfm/bitmaps/printer.xbm
+lib/X11/xfm/bitmaps/trash.xbm
+lib/X11/xfm/bitmaps/clipboard2.xbm
+lib/X11/xfm/bitmaps/drawing.xbm
+lib/X11/xfm/bitmaps/xfm_a.xbm
+lib/X11/xfm/bitmaps/xfm_appmgr.xbm
+lib/X11/xfm/bitmaps/xfm_cline.xbm
+lib/X11/xfm/bitmaps/xfm_dirlnk.xbm
+lib/X11/xfm/bitmaps/xfm_dirmsk.xbm
+lib/X11/xfm/bitmaps/xfm_excl.xbm
+lib/X11/xfm/bitmaps/xfm_exec.xbm
+lib/X11/xfm/bitmaps/xfm_execlnk.xbm
+lib/X11/xfm/bitmaps/xfm_execmsk.xbm
+lib/X11/xfm/bitmaps/xfm_filemsk.xbm
+lib/X11/xfm/bitmaps/xfm_noentrymsk.xbm
+lib/X11/xfm/bitmaps/xfm_filesmsk.xbm
+lib/X11/xfm/bitmaps/xfm_fline.xbm
+lib/X11/xfm/bitmaps/xfm_icon.xbm
+lib/X11/xfm/bitmaps/xfm_larrow.xbm
+lib/X11/xfm/bitmaps/xfm_lines.xbm
+lib/X11/xfm/bitmaps/xfm_noentry.xbm
+lib/X11/xfm/bitmaps/xfm_cc.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_report.xbm
+lib/X11/xfm/bitmaps/xfm_stop.xbm
+lib/X11/xfm/bitmaps/xfm_sys.xbm
+lib/X11/xfm/bitmaps/xfm_tag.xbm
+lib/X11/xfm/bitmaps/xfm_text.xbm
+lib/X11/xfm/bitmaps/xfm_uu.xbm
+lib/X11/xfm/bitmaps/xfm_word.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/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/pixmaps/calc.xpm
+lib/X11/xfm/pixmaps/disk.xpm
+lib/X11/xfm/pixmaps/editor.xpm
+lib/X11/xfm/pixmaps/xman.xpm
+lib/X11/xfm/pixmaps/xterm.xpm
+lib/X11/xfm/pixmaps/man.xpm
+lib/X11/xfm/pixmaps/printer.xpm
+lib/X11/xfm/pixmaps/pixmap.xpm
+lib/X11/xfm/pixmaps/calendar.xpm
+lib/X11/xfm/pixmaps/xfm_c.xpm
+lib/X11/xfm/pixmaps/xfm_taz.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_exec.xpm
+lib/X11/xfm/pixmaps/xfm_execlnk.xpm
+lib/X11/xfm/pixmaps/xfm_file.xpm
+lib/X11/xfm/pixmaps/xfm_files.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_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_report.xpm
+lib/X11/xfm/pixmaps/xfm_stop.xpm
+lib/X11/xfm/pixmaps/xfm_sys.xpm
+lib/X11/xfm/pixmaps/xfm_tag.xpm
+lib/X11/xfm/pixmaps/xfm_text.xpm
+lib/X11/xfm/pixmaps/app_taz.xpm
+lib/X11/xfm/pixmaps/xfm_uu.xpm
+lib/X11/xfm/pixmaps/xfm_word.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