5 files changed, 315 insertions, 145 deletions

diff --git a/x11-wm/fvwm2-beta/pkg-plist b/x11-wm/fvwm2-beta/pkg-plist
index 8001e18a9bc0..71a0c570ff39 100644
--- a/x11-wm/fvwm2-beta/pkg-plist
+++ b/x11-wm/fvwm2-beta/pkg-plist
@@ -1,16 +1,14 @@
 bin/fvwm
 bin/xpmroot
-lib/X11/fvwm/system.fvwmrc
 lib/X11/fvwm/FvwmAudio
 lib/X11/fvwm/FvwmAuto
 lib/X11/fvwm/FvwmBacker
-lib/X11/fvwm/FvwmBanner
 lib/X11/fvwm/FvwmButtons
 lib/X11/fvwm/FvwmConfig
 lib/X11/fvwm/FvwmCpp
-lib/X11/fvwm/FvwmDebug
 lib/X11/fvwm/FvwmForm
 lib/X11/fvwm/FvwmIconBox
+lib/X11/fvwm/FvwmIconMan
 lib/X11/fvwm/FvwmIdent
 lib/X11/fvwm/FvwmM4
 lib/X11/fvwm/FvwmPager
@@ -19,28 +17,14 @@ lib/X11/fvwm/FvwmSaveDesk
 lib/X11/fvwm/FvwmScroll
 lib/X11/fvwm/FvwmTalk
 lib/X11/fvwm/FvwmWinList
+lib/X11/fvwm/FvwmBanner
 lib/X11/fvwm/fvwmrc_convert
 lib/X11/fvwm/quantize_pixmaps
-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/FvwmConfig.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/FvwmWinList.1.gz
-man/man1/fvwm.1.gz
-man/man1/xpmroot.1.gz
+lib/X11/fvwm/system.fvwmrc
+include/X11/pixmaps/Jlock.xpm
+include/X11/pixmaps/Jnews.xpm
+include/X11/pixmaps/Jrecycle.xpm
+include/X11/pixmaps/Jxlock.xpm
 include/X11/pixmaps/Mosaic.xpm
 include/X11/pixmaps/arrdown2.xpm
 include/X11/pixmaps/arrows2.xpm
@@ -51,7 +35,6 @@ include/X11/pixmaps/colormap.xpm
 include/X11/pixmaps/datebook.xpm
 include/X11/pixmaps/desk.xpm
 include/X11/pixmaps/dialog_box.xpm
-include/X11/pixmaps/doombig.xpm
 include/X11/pixmaps/doomface.xpm
 include/X11/pixmaps/editres.xpm
 include/X11/pixmaps/eps.xpm
@@ -65,31 +48,62 @@ include/X11/pixmaps/fvwm2_big.xpm
 include/X11/pixmaps/fvwm3.xpm
 include/X11/pixmaps/gnu-animal.xpm
 include/X11/pixmaps/graphs.xpm
-include/X11/pixmaps/jewelbig.xpm
-include/X11/pixmaps/k.xpm
-include/X11/pixmaps/k2.xpm
-include/X11/pixmaps/lemacs.xpm
+include/X11/pixmaps/jball.xpm
+include/X11/pixmaps/jbomb.xpm
+include/X11/pixmaps/jbook1.xpm
+include/X11/pixmaps/jbook2.xpm
+include/X11/pixmaps/jcalc.xpm
+include/X11/pixmaps/jclock.xpm
+include/X11/pixmaps/jf.xpm
+include/X11/pixmaps/jgraph.xpm
+include/X11/pixmaps/jline.xpm
+include/X11/pixmaps/jlower.xpm
+include/X11/pixmaps/jmag.xpm
+include/X11/pixmaps/jmail.xpm
+include/X11/pixmaps/jmove.xpm
+include/X11/pixmaps/jpaint.xpm
+include/X11/pixmaps/jraise.xpm
+include/X11/pixmaps/jresize.xpm
+include/X11/pixmaps/jterm.xpm
+include/X11/pixmaps/jwindow.xpm
+include/X11/pixmaps/jx.xpm
 include/X11/pixmaps/mag_glass.xpm
 include/X11/pixmaps/mail1.xpm
 include/X11/pixmaps/mail2.xpm
 include/X11/pixmaps/map.xpm
 include/X11/pixmaps/math4.xpm
 include/X11/pixmaps/mini.audiovol.xpm
+include/X11/pixmaps/mini.blah.xpm
+include/X11/pixmaps/mini.bomb.xpm
 include/X11/pixmaps/mini.checkmark.xpm
 include/X11/pixmaps/mini.cut.xpm
 include/X11/pixmaps/mini.destroy.xpm
 include/X11/pixmaps/mini.excl.xpm
 include/X11/pixmaps/mini.exit.xpm
+include/X11/pixmaps/mini.eye.xpm
 include/X11/pixmaps/mini.fvwm.xpm
+include/X11/pixmaps/mini.iconify.xpm
 include/X11/pixmaps/mini.letter.xpm
 include/X11/pixmaps/mini.lower.xpm
+include/X11/pixmaps/mini.maximize-horiz.xpm
+include/X11/pixmaps/mini.maximize-vert.xpm
+include/X11/pixmaps/mini.maximize.xpm
+include/X11/pixmaps/mini.maximize2.xpm
 include/X11/pixmaps/mini.move.xpm
 include/X11/pixmaps/mini.netscape.xpm
+include/X11/pixmaps/mini.rainbow.xpm
 include/X11/pixmaps/mini.raise.xpm
+include/X11/pixmaps/mini.refresh.xpm
 include/X11/pixmaps/mini.resize.xpm
+include/X11/pixmaps/mini.stick.xpm
+include/X11/pixmaps/mini.stick2.xpm
 include/X11/pixmaps/mini.xarchie.xpm
+include/X11/pixmaps/mini.xbiff.xpm
 include/X11/pixmaps/mini.xboing.xpm
 include/X11/pixmaps/mini.xlock.xpm
+include/X11/pixmaps/mini.xmag.xpm
+include/X11/pixmaps/mini.xman.xpm
+include/X11/pixmaps/mini.xpaint.xpm
 include/X11/pixmaps/mini.xpm
 include/X11/pixmaps/mini.xterm.xpm
 include/X11/pixmaps/mini.zircon.xpm
@@ -107,7 +121,6 @@ include/X11/pixmaps/unknown1.xpm
 include/X11/pixmaps/wierd_page3.xpm
 include/X11/pixmaps/word_processor.xpm
 include/X11/pixmaps/world.xpm
-include/X11/pixmaps/xboingbig.xpm
 include/X11/pixmaps/xcalc.xpm
 include/X11/pixmaps/xemacs.xpm
 include/X11/pixmaps/xlock.xpm
@@ -121,3 +134,24 @@ include/X11/pixmaps/xterm-sol.xpm
 include/X11/pixmaps/xterm-sun.xpm
 include/X11/pixmaps/xterm.xpm
 include/X11/pixmaps/xv.xpm
+include/X11/pixmaps/xv2.xpm
+man/man1/fvwm.1.gz
+man/man1/xpmroot.1.gz
+man/man1/FvwmIdent.1.gz
+man/man1/FvwmPager.1.gz
+man/man1/FvwmAudio.1.gz
+man/man1/FvwmSave.1.gz
+man/man1/FvwmAuto.1.gz
+man/man1/FvwmTalk.1.gz
+man/man1/FvwmM4.1.gz
+man/man1/FvwmBacker.1.gz
+man/man1/FvwmScroll.1.gz
+man/man1/FvwmCpp.1.gz
+man/man1/FvwmBanner.1.gz
+man/man1/FvwmConfig.1.gz
+man/man1/FvwmButtons.1.gz
+man/man1/FvwmForm.1.gz
+man/man1/FvwmIconBox.1.gz
+man/man1/FvwmSaveDesk.1.gz
+man/man1/FvwmWinList.1.gz
+man/man1/FvwmIconMan.1.gz
diff --git a/x11-wm/fvwm2-devel/pkg-plist b/x11-wm/fvwm2-devel/pkg-plist
index 8001e18a9bc0..71a0c570ff39 100644
--- a/x11-wm/fvwm2-devel/pkg-plist
+++ b/x11-wm/fvwm2-devel/pkg-plist
@@ -1,16 +1,14 @@
 bin/fvwm
 bin/xpmroot
-lib/X11/fvwm/system.fvwmrc
 lib/X11/fvwm/FvwmAudio
 lib/X11/fvwm/FvwmAuto
 lib/X11/fvwm/FvwmBacker
-lib/X11/fvwm/FvwmBanner
 lib/X11/fvwm/FvwmButtons
 lib/X11/fvwm/FvwmConfig
 lib/X11/fvwm/FvwmCpp
-lib/X11/fvwm/FvwmDebug
 lib/X11/fvwm/FvwmForm
 lib/X11/fvwm/FvwmIconBox
+lib/X11/fvwm/FvwmIconMan
 lib/X11/fvwm/FvwmIdent
 lib/X11/fvwm/FvwmM4
 lib/X11/fvwm/FvwmPager
@@ -19,28 +17,14 @@ lib/X11/fvwm/FvwmSaveDesk
 lib/X11/fvwm/FvwmScroll
 lib/X11/fvwm/FvwmTalk
 lib/X11/fvwm/FvwmWinList
+lib/X11/fvwm/FvwmBanner
 lib/X11/fvwm/fvwmrc_convert
 lib/X11/fvwm/quantize_pixmaps
-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/FvwmConfig.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/FvwmWinList.1.gz
-man/man1/fvwm.1.gz
-man/man1/xpmroot.1.gz
+lib/X11/fvwm/system.fvwmrc
+include/X11/pixmaps/Jlock.xpm
+include/X11/pixmaps/Jnews.xpm
+include/X11/pixmaps/Jrecycle.xpm
+include/X11/pixmaps/Jxlock.xpm
 include/X11/pixmaps/Mosaic.xpm
 include/X11/pixmaps/arrdown2.xpm
 include/X11/pixmaps/arrows2.xpm
@@ -51,7 +35,6 @@ include/X11/pixmaps/colormap.xpm
 include/X11/pixmaps/datebook.xpm
 include/X11/pixmaps/desk.xpm
 include/X11/pixmaps/dialog_box.xpm
-include/X11/pixmaps/doombig.xpm
 include/X11/pixmaps/doomface.xpm
 include/X11/pixmaps/editres.xpm
 include/X11/pixmaps/eps.xpm
@@ -65,31 +48,62 @@ include/X11/pixmaps/fvwm2_big.xpm
 include/X11/pixmaps/fvwm3.xpm
 include/X11/pixmaps/gnu-animal.xpm
 include/X11/pixmaps/graphs.xpm
-include/X11/pixmaps/jewelbig.xpm
-include/X11/pixmaps/k.xpm
-include/X11/pixmaps/k2.xpm
-include/X11/pixmaps/lemacs.xpm
+include/X11/pixmaps/jball.xpm
+include/X11/pixmaps/jbomb.xpm
+include/X11/pixmaps/jbook1.xpm
+include/X11/pixmaps/jbook2.xpm
+include/X11/pixmaps/jcalc.xpm
+include/X11/pixmaps/jclock.xpm
+include/X11/pixmaps/jf.xpm
+include/X11/pixmaps/jgraph.xpm
+include/X11/pixmaps/jline.xpm
+include/X11/pixmaps/jlower.xpm
+include/X11/pixmaps/jmag.xpm
+include/X11/pixmaps/jmail.xpm
+include/X11/pixmaps/jmove.xpm
+include/X11/pixmaps/jpaint.xpm
+include/X11/pixmaps/jraise.xpm
+include/X11/pixmaps/jresize.xpm
+include/X11/pixmaps/jterm.xpm
+include/X11/pixmaps/jwindow.xpm
+include/X11/pixmaps/jx.xpm
 include/X11/pixmaps/mag_glass.xpm
 include/X11/pixmaps/mail1.xpm
 include/X11/pixmaps/mail2.xpm
 include/X11/pixmaps/map.xpm
 include/X11/pixmaps/math4.xpm
 include/X11/pixmaps/mini.audiovol.xpm
+include/X11/pixmaps/mini.blah.xpm
+include/X11/pixmaps/mini.bomb.xpm
 include/X11/pixmaps/mini.checkmark.xpm
 include/X11/pixmaps/mini.cut.xpm
 include/X11/pixmaps/mini.destroy.xpm
 include/X11/pixmaps/mini.excl.xpm
 include/X11/pixmaps/mini.exit.xpm
+include/X11/pixmaps/mini.eye.xpm
 include/X11/pixmaps/mini.fvwm.xpm
+include/X11/pixmaps/mini.iconify.xpm
 include/X11/pixmaps/mini.letter.xpm
 include/X11/pixmaps/mini.lower.xpm
+include/X11/pixmaps/mini.maximize-horiz.xpm
+include/X11/pixmaps/mini.maximize-vert.xpm
+include/X11/pixmaps/mini.maximize.xpm
+include/X11/pixmaps/mini.maximize2.xpm
 include/X11/pixmaps/mini.move.xpm
 include/X11/pixmaps/mini.netscape.xpm
+include/X11/pixmaps/mini.rainbow.xpm
 include/X11/pixmaps/mini.raise.xpm
+include/X11/pixmaps/mini.refresh.xpm
 include/X11/pixmaps/mini.resize.xpm
+include/X11/pixmaps/mini.stick.xpm
+include/X11/pixmaps/mini.stick2.xpm
 include/X11/pixmaps/mini.xarchie.xpm
+include/X11/pixmaps/mini.xbiff.xpm
 include/X11/pixmaps/mini.xboing.xpm
 include/X11/pixmaps/mini.xlock.xpm
+include/X11/pixmaps/mini.xmag.xpm
+include/X11/pixmaps/mini.xman.xpm
+include/X11/pixmaps/mini.xpaint.xpm
 include/X11/pixmaps/mini.xpm
 include/X11/pixmaps/mini.xterm.xpm
 include/X11/pixmaps/mini.zircon.xpm
@@ -107,7 +121,6 @@ include/X11/pixmaps/unknown1.xpm
 include/X11/pixmaps/wierd_page3.xpm
 include/X11/pixmaps/word_processor.xpm
 include/X11/pixmaps/world.xpm
-include/X11/pixmaps/xboingbig.xpm
 include/X11/pixmaps/xcalc.xpm
 include/X11/pixmaps/xemacs.xpm
 include/X11/pixmaps/xlock.xpm
@@ -121,3 +134,24 @@ include/X11/pixmaps/xterm-sol.xpm
 include/X11/pixmaps/xterm-sun.xpm
 include/X11/pixmaps/xterm.xpm
 include/X11/pixmaps/xv.xpm
+include/X11/pixmaps/xv2.xpm
+man/man1/fvwm.1.gz
+man/man1/xpmroot.1.gz
+man/man1/FvwmIdent.1.gz
+man/man1/FvwmPager.1.gz
+man/man1/FvwmAudio.1.gz
+man/man1/FvwmSave.1.gz
+man/man1/FvwmAuto.1.gz
+man/man1/FvwmTalk.1.gz
+man/man1/FvwmM4.1.gz
+man/man1/FvwmBacker.1.gz
+man/man1/FvwmScroll.1.gz
+man/man1/FvwmCpp.1.gz
+man/man1/FvwmBanner.1.gz
+man/man1/FvwmConfig.1.gz
+man/man1/FvwmButtons.1.gz
+man/man1/FvwmForm.1.gz
+man/man1/FvwmIconBox.1.gz
+man/man1/FvwmSaveDesk.1.gz
+man/man1/FvwmWinList.1.gz
+man/man1/FvwmIconMan.1.gz
diff --git a/x11-wm/fvwm2-i18n/pkg-plist b/x11-wm/fvwm2-i18n/pkg-plist
index 8001e18a9bc0..71a0c570ff39 100644
--- a/x11-wm/fvwm2-i18n/pkg-plist
+++ b/x11-wm/fvwm2-i18n/pkg-plist
@@ -1,16 +1,14 @@
 bin/fvwm
 bin/xpmroot
-lib/X11/fvwm/system.fvwmrc
 lib/X11/fvwm/FvwmAudio
 lib/X11/fvwm/FvwmAuto
 lib/X11/fvwm/FvwmBacker
-lib/X11/fvwm/FvwmBanner
 lib/X11/fvwm/FvwmButtons
 lib/X11/fvwm/FvwmConfig
 lib/X11/fvwm/FvwmCpp
-lib/X11/fvwm/FvwmDebug
 lib/X11/fvwm/FvwmForm
 lib/X11/fvwm/FvwmIconBox
+lib/X11/fvwm/FvwmIconMan
 lib/X11/fvwm/FvwmIdent
 lib/X11/fvwm/FvwmM4
 lib/X11/fvwm/FvwmPager
@@ -19,28 +17,14 @@ lib/X11/fvwm/FvwmSaveDesk
 lib/X11/fvwm/FvwmScroll
 lib/X11/fvwm/FvwmTalk
 lib/X11/fvwm/FvwmWinList
+lib/X11/fvwm/FvwmBanner
 lib/X11/fvwm/fvwmrc_convert
 lib/X11/fvwm/quantize_pixmaps
-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/FvwmConfig.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/FvwmWinList.1.gz
-man/man1/fvwm.1.gz
-man/man1/xpmroot.1.gz
+lib/X11/fvwm/system.fvwmrc
+include/X11/pixmaps/Jlock.xpm
+include/X11/pixmaps/Jnews.xpm
+include/X11/pixmaps/Jrecycle.xpm
+include/X11/pixmaps/Jxlock.xpm
 include/X11/pixmaps/Mosaic.xpm
 include/X11/pixmaps/arrdown2.xpm
 include/X11/pixmaps/arrows2.xpm
@@ -51,7 +35,6 @@ include/X11/pixmaps/colormap.xpm
 include/X11/pixmaps/datebook.xpm
 include/X11/pixmaps/desk.xpm
 include/X11/pixmaps/dialog_box.xpm
-include/X11/pixmaps/doombig.xpm
 include/X11/pixmaps/doomface.xpm
 include/X11/pixmaps/editres.xpm
 include/X11/pixmaps/eps.xpm
@@ -65,31 +48,62 @@ include/X11/pixmaps/fvwm2_big.xpm
 include/X11/pixmaps/fvwm3.xpm
 include/X11/pixmaps/gnu-animal.xpm
 include/X11/pixmaps/graphs.xpm
-include/X11/pixmaps/jewelbig.xpm
-include/X11/pixmaps/k.xpm
-include/X11/pixmaps/k2.xpm
-include/X11/pixmaps/lemacs.xpm
+include/X11/pixmaps/jball.xpm
+include/X11/pixmaps/jbomb.xpm
+include/X11/pixmaps/jbook1.xpm
+include/X11/pixmaps/jbook2.xpm
+include/X11/pixmaps/jcalc.xpm
+include/X11/pixmaps/jclock.xpm
+include/X11/pixmaps/jf.xpm
+include/X11/pixmaps/jgraph.xpm
+include/X11/pixmaps/jline.xpm
+include/X11/pixmaps/jlower.xpm
+include/X11/pixmaps/jmag.xpm
+include/X11/pixmaps/jmail.xpm
+include/X11/pixmaps/jmove.xpm
+include/X11/pixmaps/jpaint.xpm
+include/X11/pixmaps/jraise.xpm
+include/X11/pixmaps/jresize.xpm
+include/X11/pixmaps/jterm.xpm
+include/X11/pixmaps/jwindow.xpm
+include/X11/pixmaps/jx.xpm
 include/X11/pixmaps/mag_glass.xpm
 include/X11/pixmaps/mail1.xpm
 include/X11/pixmaps/mail2.xpm
 include/X11/pixmaps/map.xpm
 include/X11/pixmaps/math4.xpm
 include/X11/pixmaps/mini.audiovol.xpm
+include/X11/pixmaps/mini.blah.xpm
+include/X11/pixmaps/mini.bomb.xpm
 include/X11/pixmaps/mini.checkmark.xpm
 include/X11/pixmaps/mini.cut.xpm
 include/X11/pixmaps/mini.destroy.xpm
 include/X11/pixmaps/mini.excl.xpm
 include/X11/pixmaps/mini.exit.xpm
+include/X11/pixmaps/mini.eye.xpm
 include/X11/pixmaps/mini.fvwm.xpm
+include/X11/pixmaps/mini.iconify.xpm
 include/X11/pixmaps/mini.letter.xpm
 include/X11/pixmaps/mini.lower.xpm
+include/X11/pixmaps/mini.maximize-horiz.xpm
+include/X11/pixmaps/mini.maximize-vert.xpm
+include/X11/pixmaps/mini.maximize.xpm
+include/X11/pixmaps/mini.maximize2.xpm
 include/X11/pixmaps/mini.move.xpm
 include/X11/pixmaps/mini.netscape.xpm
+include/X11/pixmaps/mini.rainbow.xpm
 include/X11/pixmaps/mini.raise.xpm
+include/X11/pixmaps/mini.refresh.xpm
 include/X11/pixmaps/mini.resize.xpm
+include/X11/pixmaps/mini.stick.xpm
+include/X11/pixmaps/mini.stick2.xpm
 include/X11/pixmaps/mini.xarchie.xpm
+include/X11/pixmaps/mini.xbiff.xpm
 include/X11/pixmaps/mini.xboing.xpm
 include/X11/pixmaps/mini.xlock.xpm
+include/X11/pixmaps/mini.xmag.xpm
+include/X11/pixmaps/mini.xman.xpm
+include/X11/pixmaps/mini.xpaint.xpm
 include/X11/pixmaps/mini.xpm
 include/X11/pixmaps/mini.xterm.xpm
 include/X11/pixmaps/mini.zircon.xpm
@@ -107,7 +121,6 @@ include/X11/pixmaps/unknown1.xpm
 include/X11/pixmaps/wierd_page3.xpm
 include/X11/pixmaps/word_processor.xpm
 include/X11/pixmaps/world.xpm
-include/X11/pixmaps/xboingbig.xpm
 include/X11/pixmaps/xcalc.xpm
 include/X11/pixmaps/xemacs.xpm
 include/X11/pixmaps/xlock.xpm
@@ -121,3 +134,24 @@ include/X11/pixmaps/xterm-sol.xpm
 include/X11/pixmaps/xterm-sun.xpm
 include/X11/pixmaps/xterm.xpm
 include/X11/pixmaps/xv.xpm
+include/X11/pixmaps/xv2.xpm
+man/man1/fvwm.1.gz
+man/man1/xpmroot.1.gz
+man/man1/FvwmIdent.1.gz
+man/man1/FvwmPager.1.gz
+man/man1/FvwmAudio.1.gz
+man/man1/FvwmSave.1.gz
+man/man1/FvwmAuto.1.gz
+man/man1/FvwmTalk.1.gz
+man/man1/FvwmM4.1.gz
+man/man1/FvwmBacker.1.gz
+man/man1/FvwmScroll.1.gz
+man/man1/FvwmCpp.1.gz
+man/man1/FvwmBanner.1.gz
+man/man1/FvwmConfig.1.gz
+man/man1/FvwmButtons.1.gz
+man/man1/FvwmForm.1.gz
+man/man1/FvwmIconBox.1.gz
+man/man1/FvwmSaveDesk.1.gz
+man/man1/FvwmWinList.1.gz
+man/man1/FvwmIconMan.1.gz
diff --git a/x11-wm/fvwm2/pkg-plist b/x11-wm/fvwm2/pkg-plist
index 8001e18a9bc0..71a0c570ff39 100644
--- a/x11-wm/fvwm2/pkg-plist
+++ b/x11-wm/fvwm2/pkg-plist
@@ -1,16 +1,14 @@
 bin/fvwm
 bin/xpmroot
-lib/X11/fvwm/system.fvwmrc
 lib/X11/fvwm/FvwmAudio
 lib/X11/fvwm/FvwmAuto
 lib/X11/fvwm/FvwmBacker
-lib/X11/fvwm/FvwmBanner
 lib/X11/fvwm/FvwmButtons
 lib/X11/fvwm/FvwmConfig
 lib/X11/fvwm/FvwmCpp
-lib/X11/fvwm/FvwmDebug
 lib/X11/fvwm/FvwmForm
 lib/X11/fvwm/FvwmIconBox
+lib/X11/fvwm/FvwmIconMan
 lib/X11/fvwm/FvwmIdent
 lib/X11/fvwm/FvwmM4
 lib/X11/fvwm/FvwmPager
@@ -19,28 +17,14 @@ lib/X11/fvwm/FvwmSaveDesk
 lib/X11/fvwm/FvwmScroll
 lib/X11/fvwm/FvwmTalk
 lib/X11/fvwm/FvwmWinList
+lib/X11/fvwm/FvwmBanner
 lib/X11/fvwm/fvwmrc_convert
 lib/X11/fvwm/quantize_pixmaps
-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/FvwmConfig.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/FvwmWinList.1.gz
-man/man1/fvwm.1.gz
-man/man1/xpmroot.1.gz
+lib/X11/fvwm/system.fvwmrc
+include/X11/pixmaps/Jlock.xpm
+include/X11/pixmaps/Jnews.xpm
+include/X11/pixmaps/Jrecycle.xpm
+include/X11/pixmaps/Jxlock.xpm
 include/X11/pixmaps/Mosaic.xpm
 include/X11/pixmaps/arrdown2.xpm
 include/X11/pixmaps/arrows2.xpm
@@ -51,7 +35,6 @@ include/X11/pixmaps/colormap.xpm
 include/X11/pixmaps/datebook.xpm
 include/X11/pixmaps/desk.xpm
 include/X11/pixmaps/dialog_box.xpm
-include/X11/pixmaps/doombig.xpm
 include/X11/pixmaps/doomface.xpm
 include/X11/pixmaps/editres.xpm
 include/X11/pixmaps/eps.xpm
@@ -65,31 +48,62 @@ include/X11/pixmaps/fvwm2_big.xpm
 include/X11/pixmaps/fvwm3.xpm
 include/X11/pixmaps/gnu-animal.xpm
 include/X11/pixmaps/graphs.xpm
-include/X11/pixmaps/jewelbig.xpm
-include/X11/pixmaps/k.xpm
-include/X11/pixmaps/k2.xpm
-include/X11/pixmaps/lemacs.xpm
+include/X11/pixmaps/jball.xpm
+include/X11/pixmaps/jbomb.xpm
+include/X11/pixmaps/jbook1.xpm
+include/X11/pixmaps/jbook2.xpm
+include/X11/pixmaps/jcalc.xpm
+include/X11/pixmaps/jclock.xpm
+include/X11/pixmaps/jf.xpm
+include/X11/pixmaps/jgraph.xpm
+include/X11/pixmaps/jline.xpm
+include/X11/pixmaps/jlower.xpm
+include/X11/pixmaps/jmag.xpm
+include/X11/pixmaps/jmail.xpm
+include/X11/pixmaps/jmove.xpm
+include/X11/pixmaps/jpaint.xpm
+include/X11/pixmaps/jraise.xpm
+include/X11/pixmaps/jresize.xpm
+include/X11/pixmaps/jterm.xpm
+include/X11/pixmaps/jwindow.xpm
+include/X11/pixmaps/jx.xpm
 include/X11/pixmaps/mag_glass.xpm
 include/X11/pixmaps/mail1.xpm
 include/X11/pixmaps/mail2.xpm
 include/X11/pixmaps/map.xpm
 include/X11/pixmaps/math4.xpm
 include/X11/pixmaps/mini.audiovol.xpm
+include/X11/pixmaps/mini.blah.xpm
+include/X11/pixmaps/mini.bomb.xpm
 include/X11/pixmaps/mini.checkmark.xpm
 include/X11/pixmaps/mini.cut.xpm
 include/X11/pixmaps/mini.destroy.xpm
 include/X11/pixmaps/mini.excl.xpm
 include/X11/pixmaps/mini.exit.xpm
+include/X11/pixmaps/mini.eye.xpm
 include/X11/pixmaps/mini.fvwm.xpm
+include/X11/pixmaps/mini.iconify.xpm
 include/X11/pixmaps/mini.letter.xpm
 include/X11/pixmaps/mini.lower.xpm
+include/X11/pixmaps/mini.maximize-horiz.xpm
+include/X11/pixmaps/mini.maximize-vert.xpm
+include/X11/pixmaps/mini.maximize.xpm
+include/X11/pixmaps/mini.maximize2.xpm
 include/X11/pixmaps/mini.move.xpm
 include/X11/pixmaps/mini.netscape.xpm
+include/X11/pixmaps/mini.rainbow.xpm
 include/X11/pixmaps/mini.raise.xpm
+include/X11/pixmaps/mini.refresh.xpm
 include/X11/pixmaps/mini.resize.xpm
+include/X11/pixmaps/mini.stick.xpm
+include/X11/pixmaps/mini.stick2.xpm
 include/X11/pixmaps/mini.xarchie.xpm
+include/X11/pixmaps/mini.xbiff.xpm
 include/X11/pixmaps/mini.xboing.xpm
 include/X11/pixmaps/mini.xlock.xpm
+include/X11/pixmaps/mini.xmag.xpm
+include/X11/pixmaps/mini.xman.xpm
+include/X11/pixmaps/mini.xpaint.xpm
 include/X11/pixmaps/mini.xpm
 include/X11/pixmaps/mini.xterm.xpm
 include/X11/pixmaps/mini.zircon.xpm
@@ -107,7 +121,6 @@ include/X11/pixmaps/unknown1.xpm
 include/X11/pixmaps/wierd_page3.xpm
 include/X11/pixmaps/word_processor.xpm
 include/X11/pixmaps/world.xpm
-include/X11/pixmaps/xboingbig.xpm
 include/X11/pixmaps/xcalc.xpm
 include/X11/pixmaps/xemacs.xpm
 include/X11/pixmaps/xlock.xpm
@@ -121,3 +134,24 @@ include/X11/pixmaps/xterm-sol.xpm
 include/X11/pixmaps/xterm-sun.xpm
 include/X11/pixmaps/xterm.xpm
 include/X11/pixmaps/xv.xpm
+include/X11/pixmaps/xv2.xpm
+man/man1/fvwm.1.gz
+man/man1/xpmroot.1.gz
+man/man1/FvwmIdent.1.gz
+man/man1/FvwmPager.1.gz
+man/man1/FvwmAudio.1.gz
+man/man1/FvwmSave.1.gz
+man/man1/FvwmAuto.1.gz
+man/man1/FvwmTalk.1.gz
+man/man1/FvwmM4.1.gz
+man/man1/FvwmBacker.1.gz
+man/man1/FvwmScroll.1.gz
+man/man1/FvwmCpp.1.gz
+man/man1/FvwmBanner.1.gz
+man/man1/FvwmConfig.1.gz
+man/man1/FvwmButtons.1.gz
+man/man1/FvwmForm.1.gz
+man/man1/FvwmIconBox.1.gz
+man/man1/FvwmSaveDesk.1.gz
+man/man1/FvwmWinList.1.gz
+man/man1/FvwmIconMan.1.gz
diff --git a/x11-wm/fvwm24/pkg-plist b/x11-wm/fvwm24/pkg-plist
index 8001e18a9bc0..71a0c570ff39 100644
--- a/x11-wm/fvwm24/pkg-plist
+++ b/x11-wm/fvwm24/pkg-plist
@@ -1,16 +1,14 @@
 bin/fvwm
 bin/xpmroot
-lib/X11/fvwm/system.fvwmrc
 lib/X11/fvwm/FvwmAudio
 lib/X11/fvwm/FvwmAuto
 lib/X11/fvwm/FvwmBacker
-lib/X11/fvwm/FvwmBanner
 lib/X11/fvwm/FvwmButtons
 lib/X11/fvwm/FvwmConfig
 lib/X11/fvwm/FvwmCpp
-lib/X11/fvwm/FvwmDebug
 lib/X11/fvwm/FvwmForm
 lib/X11/fvwm/FvwmIconBox
+lib/X11/fvwm/FvwmIconMan
 lib/X11/fvwm/FvwmIdent
 lib/X11/fvwm/FvwmM4
 lib/X11/fvwm/FvwmPager
@@ -19,28 +17,14 @@ lib/X11/fvwm/FvwmSaveDesk
 lib/X11/fvwm/FvwmScroll
 lib/X11/fvwm/FvwmTalk
 lib/X11/fvwm/FvwmWinList
+lib/X11/fvwm/FvwmBanner
 lib/X11/fvwm/fvwmrc_convert
 lib/X11/fvwm/quantize_pixmaps
-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/FvwmConfig.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/FvwmWinList.1.gz
-man/man1/fvwm.1.gz
-man/man1/xpmroot.1.gz
+lib/X11/fvwm/system.fvwmrc
+include/X11/pixmaps/Jlock.xpm
+include/X11/pixmaps/Jnews.xpm
+include/X11/pixmaps/Jrecycle.xpm
+include/X11/pixmaps/Jxlock.xpm
 include/X11/pixmaps/Mosaic.xpm
 include/X11/pixmaps/arrdown2.xpm
 include/X11/pixmaps/arrows2.xpm
@@ -51,7 +35,6 @@ include/X11/pixmaps/colormap.xpm
 include/X11/pixmaps/datebook.xpm
 include/X11/pixmaps/desk.xpm
 include/X11/pixmaps/dialog_box.xpm
-include/X11/pixmaps/doombig.xpm
 include/X11/pixmaps/doomface.xpm
 include/X11/pixmaps/editres.xpm
 include/X11/pixmaps/eps.xpm
@@ -65,31 +48,62 @@ include/X11/pixmaps/fvwm2_big.xpm
 include/X11/pixmaps/fvwm3.xpm
 include/X11/pixmaps/gnu-animal.xpm
 include/X11/pixmaps/graphs.xpm
-include/X11/pixmaps/jewelbig.xpm
-include/X11/pixmaps/k.xpm
-include/X11/pixmaps/k2.xpm
-include/X11/pixmaps/lemacs.xpm
+include/X11/pixmaps/jball.xpm
+include/X11/pixmaps/jbomb.xpm
+include/X11/pixmaps/jbook1.xpm
+include/X11/pixmaps/jbook2.xpm
+include/X11/pixmaps/jcalc.xpm
+include/X11/pixmaps/jclock.xpm
+include/X11/pixmaps/jf.xpm
+include/X11/pixmaps/jgraph.xpm
+include/X11/pixmaps/jline.xpm
+include/X11/pixmaps/jlower.xpm
+include/X11/pixmaps/jmag.xpm
+include/X11/pixmaps/jmail.xpm
+include/X11/pixmaps/jmove.xpm
+include/X11/pixmaps/jpaint.xpm
+include/X11/pixmaps/jraise.xpm
+include/X11/pixmaps/jresize.xpm
+include/X11/pixmaps/jterm.xpm
+include/X11/pixmaps/jwindow.xpm
+include/X11/pixmaps/jx.xpm
 include/X11/pixmaps/mag_glass.xpm
 include/X11/pixmaps/mail1.xpm
 include/X11/pixmaps/mail2.xpm
 include/X11/pixmaps/map.xpm
 include/X11/pixmaps/math4.xpm
 include/X11/pixmaps/mini.audiovol.xpm
+include/X11/pixmaps/mini.blah.xpm
+include/X11/pixmaps/mini.bomb.xpm
 include/X11/pixmaps/mini.checkmark.xpm
 include/X11/pixmaps/mini.cut.xpm
 include/X11/pixmaps/mini.destroy.xpm
 include/X11/pixmaps/mini.excl.xpm
 include/X11/pixmaps/mini.exit.xpm
+include/X11/pixmaps/mini.eye.xpm
 include/X11/pixmaps/mini.fvwm.xpm
+include/X11/pixmaps/mini.iconify.xpm
 include/X11/pixmaps/mini.letter.xpm
 include/X11/pixmaps/mini.lower.xpm
+include/X11/pixmaps/mini.maximize-horiz.xpm
+include/X11/pixmaps/mini.maximize-vert.xpm
+include/X11/pixmaps/mini.maximize.xpm
+include/X11/pixmaps/mini.maximize2.xpm
 include/X11/pixmaps/mini.move.xpm
 include/X11/pixmaps/mini.netscape.xpm
+include/X11/pixmaps/mini.rainbow.xpm
 include/X11/pixmaps/mini.raise.xpm
+include/X11/pixmaps/mini.refresh.xpm
 include/X11/pixmaps/mini.resize.xpm
+include/X11/pixmaps/mini.stick.xpm
+include/X11/pixmaps/mini.stick2.xpm
 include/X11/pixmaps/mini.xarchie.xpm
+include/X11/pixmaps/mini.xbiff.xpm
 include/X11/pixmaps/mini.xboing.xpm
 include/X11/pixmaps/mini.xlock.xpm
+include/X11/pixmaps/mini.xmag.xpm
+include/X11/pixmaps/mini.xman.xpm
+include/X11/pixmaps/mini.xpaint.xpm
 include/X11/pixmaps/mini.xpm
 include/X11/pixmaps/mini.xterm.xpm
 include/X11/pixmaps/mini.zircon.xpm
@@ -107,7 +121,6 @@ include/X11/pixmaps/unknown1.xpm
 include/X11/pixmaps/wierd_page3.xpm
 include/X11/pixmaps/word_processor.xpm
 include/X11/pixmaps/world.xpm
-include/X11/pixmaps/xboingbig.xpm
 include/X11/pixmaps/xcalc.xpm
 include/X11/pixmaps/xemacs.xpm
 include/X11/pixmaps/xlock.xpm
@@ -121,3 +134,24 @@ include/X11/pixmaps/xterm-sol.xpm
 include/X11/pixmaps/xterm-sun.xpm
 include/X11/pixmaps/xterm.xpm
 include/X11/pixmaps/xv.xpm
+include/X11/pixmaps/xv2.xpm
+man/man1/fvwm.1.gz
+man/man1/xpmroot.1.gz
+man/man1/FvwmIdent.1.gz
+man/man1/FvwmPager.1.gz
+man/man1/FvwmAudio.1.gz
+man/man1/FvwmSave.1.gz
+man/man1/FvwmAuto.1.gz
+man/man1/FvwmTalk.1.gz
+man/man1/FvwmM4.1.gz
+man/man1/FvwmBacker.1.gz
+man/man1/FvwmScroll.1.gz
+man/man1/FvwmCpp.1.gz
+man/man1/FvwmBanner.1.gz
+man/man1/FvwmConfig.1.gz
+man/man1/FvwmButtons.1.gz
+man/man1/FvwmForm.1.gz
+man/man1/FvwmIconBox.1.gz
+man/man1/FvwmSaveDesk.1.gz
+man/man1/FvwmWinList.1.gz
+man/man1/FvwmIconMan.1.gz