1 files changed, 243 insertions, 178 deletions

diff --git a/x11-wm/fvwm95-i18n/pkg-plist b/x11-wm/fvwm95-i18n/pkg-plist
index 1294b77facfe..62d5db4b6209 100644
--- a/x11-wm/fvwm95-i18n/pkg-plist
+++ b/x11-wm/fvwm95-i18n/pkg-plist
@@ -1,179 +1,244 @@
-bin/fvwm95-2
+@cwd /usr/X11R6
+bin/fvwm95
+@cwd /usr/X11R6
 bin/xpmroot
-lib/X11/fvwm95-2/FvwmAudio
-lib/X11/fvwm95-2/FvwmAuto
-lib/X11/fvwm95-2/FvwmBacker
-lib/X11/fvwm95-2/FvwmBanner
-lib/X11/fvwm95-2/FvwmButtons
-lib/X11/fvwm95-2/FvwmCpp
-lib/X11/fvwm95-2/FvwmDebug
-lib/X11/fvwm95-2/FvwmForm
-lib/X11/fvwm95-2/FvwmIconBox
-lib/X11/fvwm95-2/FvwmIdent
-lib/X11/fvwm95-2/FvwmM4
-lib/X11/fvwm95-2/FvwmPager
-lib/X11/fvwm95-2/FvwmSave
-lib/X11/fvwm95-2/FvwmSaveDesk
-lib/X11/fvwm95-2/FvwmScroll
-lib/X11/fvwm95-2/FvwmTalk
-lib/X11/fvwm95-2/FvwmTaskBar
-lib/X11/fvwm95-2/FvwmWinList
-lib/X11/fvwm95-2/fvwmrc_convert 
-lib/X11/fvwm95-2/icons/Mosaic.xpm
-lib/X11/fvwm95-2/icons/arrdown2.xpm
-lib/X11/fvwm95-2/icons/arrows2.xpm
-lib/X11/fvwm95-2/icons/arrup2.xpm
-lib/X11/fvwm95-2/icons/bomb.xpm
-lib/X11/fvwm95-2/icons/clamp.xpm
-lib/X11/fvwm95-2/icons/colormap.xpm
-lib/X11/fvwm95-2/icons/datebook.xpm
-lib/X11/fvwm95-2/icons/default.xbm
-lib/X11/fvwm95-2/icons/desk.xpm
-lib/X11/fvwm95-2/icons/dialog_box.xpm
-lib/X11/fvwm95-2/icons/doombig.xpm
-lib/X11/fvwm95-2/icons/doomface.xpm
-lib/X11/fvwm95-2/icons/editres.xpm
-lib/X11/fvwm95-2/icons/eps.xpm
-lib/X11/fvwm95-2/icons/exit.xpm
-lib/X11/fvwm95-2/icons/flow_chart.xpm
-lib/X11/fvwm95-2/icons/folder2.xpm
-lib/X11/fvwm95-2/icons/folders.xpm
-lib/X11/fvwm95-2/icons/fvwm.xpm
-lib/X11/fvwm95-2/icons/fvwm2.xpm
-lib/X11/fvwm95-2/icons/fvwm2_big.xpm
-lib/X11/fvwm95-2/icons/fvwm3.xpm
-lib/X11/fvwm95-2/icons/gnu-animal.xpm
-lib/X11/fvwm95-2/icons/graphs.xpm
-lib/X11/fvwm95-2/icons/jewelbig.xpm
-lib/X11/fvwm95-2/icons/k.xpm
-lib/X11/fvwm95-2/icons/k2.xpm
-lib/X11/fvwm95-2/icons/lemacs.xpm
-lib/X11/fvwm95-2/icons/mag_glass.xpm
-lib/X11/fvwm95-2/icons/mail1.xpm
-lib/X11/fvwm95-2/icons/mail2.xpm
-lib/X11/fvwm95-2/icons/map.xpm
-lib/X11/fvwm95-2/icons/math4.xpm
-lib/X11/fvwm95-2/icons/mini.audiovol.xpm
-lib/X11/fvwm95-2/icons/mini.checkmark.xpm
-lib/X11/fvwm95-2/icons/mini.cut.xpm
-lib/X11/fvwm95-2/icons/mini.destroy.xpm
-lib/X11/fvwm95-2/icons/mini.excl.xpm
-lib/X11/fvwm95-2/icons/mini.exit.xpm
-lib/X11/fvwm95-2/icons/mini.fvwm.xpm
-lib/X11/fvwm95-2/icons/mini.letter.xpm
-lib/X11/fvwm95-2/icons/mini.lower.xpm
-lib/X11/fvwm95-2/icons/mini.move.xpm
-lib/X11/fvwm95-2/icons/mini.netscape.xpm
-lib/X11/fvwm95-2/icons/mini.raise.xpm
-lib/X11/fvwm95-2/icons/mini.resize.xpm
-lib/X11/fvwm95-2/icons/mini.xarchie.xpm
-lib/X11/fvwm95-2/icons/mini.xboing.xpm
-lib/X11/fvwm95-2/icons/mini.xlock.xpm
-lib/X11/fvwm95-2/icons/mini.xpm
-lib/X11/fvwm95-2/icons/mini.xterm.xpm
-lib/X11/fvwm95-2/icons/mini.zircon.xpm
-lib/X11/fvwm95-2/icons/netscape.xpm
-lib/X11/fvwm95-2/icons/page.xpm
-lib/X11/fvwm95-2/icons/page2.xpm
-lib/X11/fvwm95-2/icons/ps.xpm
-lib/X11/fvwm95-2/icons/question.xpm
-lib/X11/fvwm95-2/icons/rbomb.xpm
-lib/X11/fvwm95-2/icons/rcalc.xpm
-lib/X11/fvwm95-2/icons/rterm.xpm
-lib/X11/fvwm95-2/icons/term.xpm
-lib/X11/fvwm95-2/icons/tiff2.xpm
-lib/X11/fvwm95-2/icons/toolbox.xpm
-lib/X11/fvwm95-2/icons/unknown1.xpm
-lib/X11/fvwm95-2/icons/wierd_page3.xpm
-lib/X11/fvwm95-2/icons/word_processor.xpm
-lib/X11/fvwm95-2/icons/world.xpm
-lib/X11/fvwm95-2/icons/xboingbig.xpm
-lib/X11/fvwm95-2/icons/xcalc.xpm
-lib/X11/fvwm95-2/icons/xemacs.xpm
-lib/X11/fvwm95-2/icons/xlock.xpm
-lib/X11/fvwm95-2/icons/xman.xpm
-lib/X11/fvwm95-2/icons/xpaint.xpm
-lib/X11/fvwm95-2/icons/xterm-axp.xpm
-lib/X11/fvwm95-2/icons/xterm-blank.xpm
-lib/X11/fvwm95-2/icons/xterm-dec.xpm
-lib/X11/fvwm95-2/icons/xterm-sgi.xpm
-lib/X11/fvwm95-2/icons/xterm-sol.xpm
-lib/X11/fvwm95-2/icons/xterm-sun.xpm
-lib/X11/fvwm95-2/icons/xterm.xpm
-lib/X11/fvwm95-2/icons/xv.xpm
-lib/X11/fvwm95-2/mini-icons/mini-ball.xpm
-lib/X11/fvwm95-2/mini-icons/mini-bball.xpm
-lib/X11/fvwm95-2/mini-icons/mini-book1.xpm
-lib/X11/fvwm95-2/mini-icons/mini-book2.xpm
-lib/X11/fvwm95-2/mini-icons/mini-bug1.xpm
-lib/X11/fvwm95-2/mini-icons/mini-bug2.xpm
-lib/X11/fvwm95-2/mini-icons/mini-bx2.xpm
-lib/X11/fvwm95-2/mini-icons/mini-calc.xpm
-lib/X11/fvwm95-2/mini-icons/mini-camera.xpm
-lib/X11/fvwm95-2/mini-icons/mini-cdlabel.xpm
-lib/X11/fvwm95-2/mini-icons/mini-clock.xpm
-lib/X11/fvwm95-2/mini-icons/mini-colors.xpm
-lib/X11/fvwm95-2/mini-icons/mini-connect.xpm
-lib/X11/fvwm95-2/mini-icons/mini-cross.xpm
-lib/X11/fvwm95-2/mini-icons/mini-display.xpm
-lib/X11/fvwm95-2/mini-icons/mini-doc.xpm
-lib/X11/fvwm95-2/mini-icons/mini-edit.xpm
-lib/X11/fvwm95-2/mini-icons/mini-exclam.xpm
-lib/X11/fvwm95-2/mini-icons/mini-exp.xpm
-lib/X11/fvwm95-2/mini-icons/mini-eyes.xpm
-lib/X11/fvwm95-2/mini-icons/mini-filemgr.xpm
-lib/X11/fvwm95-2/mini-icons/mini-fractal.xpm
-lib/X11/fvwm95-2/mini-icons/mini-gball.xpm
-lib/X11/fvwm95-2/mini-icons/mini-gv.xpm
-lib/X11/fvwm95-2/mini-icons/mini-hammer.xpm
-lib/X11/fvwm95-2/mini-icons/mini-happy.xpm
-lib/X11/fvwm95-2/mini-icons/mini-lock.xpm
-lib/X11/fvwm95-2/mini-icons/mini-mail.xpm
-lib/X11/fvwm95-2/mini-icons/mini-manual.xpm
-lib/X11/fvwm95-2/mini-icons/mini-maze.xpm
-lib/X11/fvwm95-2/mini-icons/mini-modules.xpm
-lib/X11/fvwm95-2/mini-icons/mini-nscape.xpm
-lib/X11/fvwm95-2/mini-icons/mini-olwm.xpm
-lib/X11/fvwm95-2/mini-icons/mini-paint.xpm
-lib/X11/fvwm95-2/mini-icons/mini-pencil.xpm
-lib/X11/fvwm95-2/mini-icons/mini-question.xpm
-lib/X11/fvwm95-2/mini-icons/mini-ray.xpm
-lib/X11/fvwm95-2/mini-icons/mini-rball.xpm
-lib/X11/fvwm95-2/mini-icons/mini-run.xpm
-lib/X11/fvwm95-2/mini-icons/mini-sh.xpm
-lib/X11/fvwm95-2/mini-icons/mini-sh1.xpm
-lib/X11/fvwm95-2/mini-icons/mini-slon.xpm
-lib/X11/fvwm95-2/mini-icons/mini-stop.xpm
-lib/X11/fvwm95-2/mini-icons/mini-term.xpm
-lib/X11/fvwm95-2/mini-icons/mini-tetris.xpm
-lib/X11/fvwm95-2/mini-icons/mini-turn.xpm
-lib/X11/fvwm95-2/mini-icons/mini-windows.xpm
-lib/X11/fvwm95-2/mini-icons/mini-x.xpm
-lib/X11/fvwm95-2/mini-icons/mini-x2.xpm
-lib/X11/fvwm95-2/mini-icons/mini-xv.xpm
-lib/X11/fvwm95-2/mini-icons/mini-zoom.xpm
-lib/X11/fvwm95-2/quantize_pixmaps
-lib/X11/fvwm95-2/system.fvwmrc
-man/man1/FvwmAudio.1.gz
-man/man1/FvwmAuto.1.gz
-man/man1/FvwmBacker.1.gz
-man/man1/FvwmBanner.1.gz
-man/man1/FvwmButtons.1.gz
-man/man1/FvwmCpp.1.gz
-man/man1/FvwmDebug.1.gz
-man/man1/FvwmForm.1.gz
-man/man1/FvwmIconBox.1.gz
-man/man1/FvwmIdent.1.gz
-man/man1/FvwmM4.1.gz
-man/man1/FvwmPager.1.gz
-man/man1/FvwmSave.1.gz
-man/man1/FvwmSaveDesk.1.gz
-man/man1/FvwmScroll.1.gz
-man/man1/FvwmTalk.1.gz
-man/man1/FvwmTaskBar.1.gz
-man/man1/FvwmWinList.1.gz
-man/man1/fvwm95-2.1.gz
-man/man1/xpmroot.1.gz
-lib/X11/fvwm95-2/icons/mailtool.xpm
-lib/X11/fvwm95-2/icons/xfm_icon.xpm
-lib/X11/fvwm95-2/icons/xrn.goodnews.xpm
+lib/libfvwm95.a
+lib/X11/fvwm95/FvwmAudio
+lib/X11/fvwm95/FvwmAuto
+lib/X11/fvwm95/FvwmBacker
+lib/X11/fvwm95/FvwmBanner
+lib/X11/fvwm95/FvwmButtons
+lib/X11/fvwm95/FvwmConsole
+lib/X11/fvwm95/FvwmCpp
+lib/X11/fvwm95/FvwmDebug
+lib/X11/fvwm95/FvwmForm
+lib/X11/fvwm95/FvwmIconBox
+lib/X11/fvwm95/FvwmIconMan
+lib/X11/fvwm95/FvwmIdent
+lib/X11/fvwm95/FvwmM4
+lib/X11/fvwm95/FvwmPager
+lib/X11/fvwm95/FvwmSave
+lib/X11/fvwm95/FvwmSaveDesk
+lib/X11/fvwm95/FvwmScroll
+lib/X11/fvwm95/FvwmTalk
+lib/X11/fvwm95/FvwmTaskBar
+lib/X11/fvwm95/FvwmWinList
+lib/X11/fvwm95/fvwmrc_convert
+lib/X11/fvwm95/quantize_pixmaps
+lib/X11/fvwm95/system.fvwm95rc
+icons/Mosaic.xpm
+icons/Xfm.xpm
+icons/arrdown2.xpm
+icons/arrows2.xpm
+icons/arrup2.xpm
+icons/bckgnd1.xpm
+icons/bckgnd3.xpm
+icons/bomb.xpm
+icons/ccode.icon
+icons/clamp.xpm
+icons/colormap.xpm
+icons/datebook.xpm
+icons/default.xbm
+icons/desk.xpm
+icons/dialog_box.xpm
+icons/documents.xpm
+icons/doombig.xpm
+icons/doomface.xpm
+icons/editres.xpm
+icons/eps.xpm
+icons/exit.xpm
+icons/find1.xpm
+icons/flow_chart.xpm
+icons/folder.xpm
+icons/folder2.xpm
+icons/folders.xpm
+icons/fvwm-menu.xpm
+icons/fvwm.bitmap
+icons/fvwm.xpm
+icons/fvwm2.xpm
+icons/fvwm2_big.xpm
+icons/fvwm3.xpm
+icons/gnu-animal.xpm
+icons/graphs.xpm
+icons/gv.xpm
+icons/hcode.icon
+icons/help.xpm
+icons/jewelbig.xpm
+icons/k.xpm
+icons/k2.xpm
+icons/lemacs.xpm
+icons/linux-menu.xpm
+icons/mag_glass.xpm
+icons/mail1.xpm
+icons/mail2.xpm
+icons/map.xpm
+icons/math4.xpm
+icons/mini-arch.xpm
+icons/mini-ball.xpm
+icons/mini-bball.xpm
+icons/mini-bomb.xpm
+icons/mini-book1.xpm
+icons/mini-book2.xpm
+icons/mini-books.xpm
+icons/mini-briefcase.xpm
+icons/mini-bug1.xpm
+icons/mini-bug2.xpm
+icons/mini-bx2.xpm
+icons/mini-calc.xpm
+icons/mini-camera.xpm
+icons/mini-cat.xpm
+icons/mini-cave.xpm
+icons/mini-cd.xpm
+icons/mini-cdlabel.xpm
+icons/mini-chinese.xpm
+icons/mini-clipboard.xpm
+icons/mini-clock.xpm
+icons/mini-colors.xpm
+icons/mini-connect.xpm
+icons/mini-crosbone.xpm
+icons/mini-cross.xpm
+icons/mini-desktop.xpm
+icons/mini-diff.xpm
+icons/mini-diskette.xpm
+icons/mini-display.xpm
+icons/mini-doc.xpm
+icons/mini-doc1.xpm
+icons/mini-dog.xpm
+icons/mini-edit.xpm
+icons/mini-espada.xpm
+icons/mini-exclam.xpm
+icons/mini-exp.xpm
+icons/mini-eye.xpm
+icons/mini-eyes.xpm
+icons/mini-fax.xpm
+icons/mini-fdisk.xpm
+icons/mini-filemgr.xpm
+icons/mini-folder.xpm
+icons/mini-font.xpm
+icons/mini-fractal.xpm
+icons/mini-frame.xpm
+icons/mini-ftp.xpm
+icons/mini-gball.xpm
+icons/mini-go.xpm
+icons/mini-gopher.xpm
+icons/mini-graph.xpm
+icons/mini-gv.xpm
+icons/mini-hammer.xpm
+icons/mini-happy.xpm
+icons/mini-hdisk.xpm
+icons/mini-heart.xpm
+icons/mini-hex.xpm
+icons/mini-hextris.xpm
+icons/mini-icons.xpm
+icons/mini-keyboard.xpm
+icons/mini-lock.xpm
+icons/mini-lower.xpm
+icons/mini-mail.xpm
+icons/mini-manual.xpm
+icons/mini-max1.xpm
+icons/mini-maze.xpm
+icons/mini-modules.xpm
+icons/mini-monitor.xpm
+icons/mini-move.xpm
+icons/mini-move1.xpm
+icons/mini-mwm.xpm
+icons/mini-news.xpm
+icons/mini-nscape.xpm
+icons/mini-ofolder.xpm
+icons/mini-olwm.xpm
+icons/mini-pager.xpm
+icons/mini-paint.xpm
+icons/mini-palette.xpm
+icons/mini-pdf.xpm
+icons/mini-pencil.xpm
+icons/mini-penguin.xpm
+icons/mini-perf.xpm
+icons/mini-question.xpm
+icons/mini-raise.xpm
+icons/mini-ray.xpm
+icons/mini-rball.xpm
+icons/mini-resize.xpm
+icons/mini-roach.xpm
+icons/mini-run.xpm
+icons/mini-sh.xpm
+icons/mini-sh1.xpm
+icons/mini-slon.xpm
+icons/mini-sound.xpm
+icons/mini-start.xpm
+icons/mini-stop.xpm
+icons/mini-telnet.xpm
+icons/mini-term.xpm
+icons/mini-tetris.xpm
+icons/mini-trebol.xpm
+icons/mini-turn.xpm
+icons/mini-twm.xpm
+icons/mini-window.xpm
+icons/mini-windows.xpm
+icons/mini-x.xpm
+icons/mini-x2.xpm
+icons/mini-xfig.xpm
+icons/mini-xjewel.xpm
+icons/mini-xkeycaps.xpm
+icons/mini-xlander.xpm
+icons/mini-xmahjongg.xpm
+icons/mini-xsnow.xpm
+icons/mini-xv.xpm
+icons/mini-zoom.xpm
+icons/mini.audiovol.xpm
+icons/mini.checkmark.xpm
+icons/mini.cut.xpm
+icons/mini.destroy.xpm
+icons/mini.excl.xpm
+icons/mini.exit.xpm
+icons/mini.fvwm.xpm
+icons/mini.letter.xpm
+icons/mini.lower.xpm
+icons/mini.move.xpm
+icons/mini.netscape.xpm
+icons/mini.raise.xpm
+icons/mini.resize.xpm
+icons/mini.xarchie.xpm
+icons/mini.xboing.xpm
+icons/mini.xlock.xpm
+icons/mini.xpm
+icons/mini.xterm.xpm
+icons/mini.zircon.xpm
+icons/nscape.xpm
+icons/ocode.icon
+icons/page.xpm
+icons/page2.xpm
+icons/prog.icon
+icons/programs.xpm
+icons/ps.xpm
+icons/question.xpm
+icons/rbomb.xpm
+icons/rcalc.xpm
+icons/rterm.xpm
+icons/run.xpm
+icons/settings.xpm
+icons/shutdown.xpm
+icons/term.xpm
+icons/textedit.xpm
+icons/tiff2.xpm
+icons/toolbox.xpm
+icons/unknown1.xpm
+icons/utilities-menu.xpm
+icons/wierd_page3.xpm
+icons/word_processor.xpm
+icons/world.xpm
+icons/wterm.xpm
+icons/xboingbig.xpm
+icons/xcalc.xpm
+icons/xemacs.xpm
+icons/xlock.xpm
+icons/xman.xpm
+icons/xpaint.xpm
+icons/xterm-axp.xpm
+icons/xterm-blank.xpm
+icons/xterm-dec.xpm
+icons/xterm-sgi.xpm
+icons/xterm-sol.xpm
+icons/xterm-sun.xpm
+icons/xterm.xpm
+icons/xv.xpm
+icons/xview.xpm