3 files changed, 137 insertions, 342 deletions

diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index 7dfdaa6cc9c0..50d2680815ba 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -29,10 +29,10 @@ MAN1=	FvwmAnimate.1 FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \
 	FvwmConsoleC.pl.1
 
 post-install:
-	@${MKDIR} ${PREFIX}/icons
 	@${MKDIR} ${PREFIX}/etc
 	@${CP} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc ${PREFIX}/etc
-	${INSTALL_DATA} ${WRKDIR}/*.xpm ${PREFIX}/icons
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${PREFIX}/lib/X11/fvwm2/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/icons/*.xpm \
+		${PREFIX}/lib/X11/fvwm2/pixmaps
 
 .include <bsd.port.mk>
diff --git a/x11-wm/fvwm2/pkg-message b/x11-wm/fvwm2/pkg-message
deleted file mode 100644
index 4d4ca35e6d57..000000000000
--- a/x11-wm/fvwm2/pkg-message
+++ /dev/null
@@ -1,22 +0,0 @@
-Notes for XFree86 3.3/3.3.1 and LANG=ja_JP.EUC:
-
-There are some bug (?) in already released XFree86 based on X11R6.3, i.e.,
-XFree86 3.3 and XFree86 3.3.1, when X client runs under LANG=ja_JP.EUC.
-
-If you want to use this fvwm2 with LANG=ja_JP.EUC (which means "run fvwm2,
-with environment variable 'LANG' is set to 'ja_JP.EUC' to enable to display
-Japanese Kanji/Hiragana/Katakana characters"), apply following patch to
-/usr/X11R6/lib/X11/locale/ja/XLC_LOCALE (or equivalent).
-
-*** lib/X11/locale/ja/XLC_LOCALE.dist	Mon Aug  4 16:44:48 1997
---- lib/X11/locale/ja/XLC_LOCALE	Wed Oct  8 01:28:00 1997
-***************
-*** 35,40 ****
---- 35,41 ----
-  	}
-  	font	{
-  		primary		JISX0201.1976-0:GR
-+ 		substitute	JISX0201.1976-0:GR
-  		vertical_rotate	all
-  	}
-  }
diff --git a/x11-wm/fvwm2/pkg-plist b/x11-wm/fvwm2/pkg-plist
index e8d442e8ac4b..4d668ebfbf70 100644
--- a/x11-wm/fvwm2/pkg-plist
+++ b/x11-wm/fvwm2/pkg-plist
@@ -2,322 +2,138 @@ bin/FvwmCommand
 bin/fvwm2
 bin/xpmroot
 etc/system.fvwm2rc
-icons/Jlock.xpm
-icons/Jnews.xpm
-icons/Jrecycle.xpm
-icons/Jxlock.xpm
-icons/Monitor.xpm
-icons/Mosaic.xpm
-icons/Xfm.xpm
-icons/arrdown2.xpm
-icons/arrows2.xpm
-icons/arrup2.xpm
-icons/banner.fvwm_blue_cursive.xpm
-icons/banner.fvwm_bracket.xpm
-icons/banner.fvwm_cat_thing.xpm
-icons/banner.fvwm_red_3D.xpm
-icons/banner.fvwm_red_cursive.xpm
-icons/banner.fvwm_tiger.xpm
-icons/banner.fvwm_tiger_tail.xpm
-icons/bckgnd1.xpm
-icons/bckgnd3.xpm
-icons/bell.xpm
-icons/bomb.xpm
-icons/button-close.xpm
-icons/button-horiz.xpm
-icons/button-max.xpm
-icons/button-vert.xpm
-icons/button.xpm
-icons/clamp.xpm
-icons/date.xpm
-icons/datebook.xpm
-icons/default.xpm
-icons/desk.xpm
-icons/desktop.xpm
-icons/dialog_box.xpm
-icons/display.xpm
-icons/documents.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.xpm
-icons/fvwm2.xpm
-icons/fvwm2_big.xpm
-icons/fvwm3.xpm
-icons/gimp.xpm
-icons/gnu-animal.xpm
-icons/graphs.xpm
-icons/gv.xpm
-icons/help.xpm
-icons/jx.xpm
-icons/keyboard.xpm
-icons/lemacs.xpm
-icons/mag_glass.xpm
-icons/mail1.xpm
-icons/mail2.xpm
-icons/map.xpm
-icons/math4.xpm
-icons/menu.xpm
-icons/mini.arch.xpm
-icons/mini.audiovol.xpm
-icons/mini.audiovol2.xpm
-icons/mini.ball.xpm
-icons/mini.ball2.xpm
-icons/mini.bball.xpm
-icons/mini.blah.xpm
-icons/mini.bomb.xpm
-icons/mini.bomb2.xpm
-icons/mini.book1.xpm
-icons/mini.book2.xpm
-icons/mini.book3.xpm
-icons/mini.book4.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.calc2.xpm
-icons/mini.calendar.xpm
-icons/mini.camera.xpm
-icons/mini.cat.xpm
-icons/mini.cave.xpm
-icons/mini.cd.xpm
-icons/mini.cdlabel.xpm
-icons/mini.chart.xpm
-icons/mini.checkmark.xpm
-icons/mini.chinese.xpm
-icons/mini.clipboard.xpm
-icons/mini.clock.xpm
-icons/mini.clock2.xpm
-icons/mini.colors.xpm
-icons/mini.connect.xpm
-icons/mini.crosbone.xpm
-icons/mini.cross.xpm
-icons/mini.cut.xpm
-icons/mini.delete.xpm
-icons/mini.desktop.xpm
-icons/mini.destroy.xpm
-icons/mini.diff.xpm
-icons/mini.directory.xpm
-icons/mini.dirlink.xpm
-icons/mini.diskette.xpm
-icons/mini.display.xpm
-icons/mini.doc.xpm
-icons/mini.doc1.xpm
-icons/mini.dog.xpm
-icons/mini.ear.xpm
-icons/mini.edit.xpm
-icons/mini.espada.xpm
-icons/mini.excl.xpm
-icons/mini.exclam.xpm
-icons/mini.exit.xpm
-icons/mini.exp.xpm
-icons/mini.eye.xpm
-icons/mini.eye2.xpm
-icons/mini.eyes.xpm
-icons/mini.f1.xpm
-icons/mini.fax.xpm
-icons/mini.fdisk.xpm
-icons/mini.file.xpm
-icons/mini.filelink.xpm
-icons/mini.filemgr.xpm
-icons/mini.floppy.xpm
-icons/mini.folder.xpm
-icons/mini.font.xpm
-icons/mini.fractal.xpm
-icons/mini.frame.xpm
-icons/mini.ftp.xpm
-icons/mini.fvwm.xpm
-icons/mini.gball.xpm
-icons/mini.gimp.xpm
-icons/mini.gnome.xpm
-icons/mini.gnu.xpm
-icons/mini.go.xpm
-icons/mini.gopher.xpm
-icons/mini.graph.xpm
-icons/mini.graph2.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.ibm.xpm
-icons/mini.iconify.xpm
-icons/mini.iconify1.xpm
-icons/mini.icons.xpm
-icons/mini.kde.xpm
-icons/mini.keyboard.xpm
-icons/mini.keys.xpm
-icons/mini.letter.xpm
-icons/mini.line.xpm
-icons/mini.lock.xpm
-icons/mini.lower.xpm
-icons/mini.lower2.xpm
-icons/mini.lower3.xpm
-icons/mini.mag.xpm
-icons/mini.mail.xpm
-icons/mini.mail2.xpm
-icons/mini.manual.xpm
-icons/mini.max1.xpm
-icons/mini.maximize-horiz.xpm
-icons/mini.maximize-horiz1.xpm
-icons/mini.maximize-vert.xpm
-icons/mini.maximize-vert1.xpm
-icons/mini.maximize.xpm
-icons/mini.maximize1.xpm
-icons/mini.maximize2.xpm
-icons/mini.maze.xpm
-icons/mini.modules.xpm
-icons/mini.monitor.xpm
-icons/mini.mouse.xpm
-icons/mini.move.xpm
-icons/mini.move1.xpm
-icons/mini.move2.xpm
-icons/mini.move3.xpm
-icons/mini.mwm.xpm
-icons/mini.netscape.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.paint2.xpm
-icons/mini.palette.xpm
-icons/mini.paper.xpm
-icons/mini.pdf.xpm
-icons/mini.pencil.xpm
-icons/mini.penguin.xpm
-icons/mini.perf.xpm
-icons/mini.picture.xpm
-icons/mini.question.xpm
-icons/mini.rainbow.xpm
-icons/mini.raise.xpm
-icons/mini.raise2.xpm
-icons/mini.raise3.xpm
-icons/mini.ray.xpm
-icons/mini.rball.xpm
-icons/mini.refresh.xpm
-icons/mini.resize.xpm
-icons/mini.resize2.xpm
-icons/mini.resize3.xpm
-icons/mini.resize4.xpm
-icons/mini.roach.xpm
-icons/mini.run.xpm
-icons/mini.sh.xpm
-icons/mini.sh1.xpm
-icons/mini.shade1.xpm
-icons/mini.slon.xpm
-icons/mini.sound.xpm
-icons/mini.start.xpm
-icons/mini.stick.xpm
-icons/mini.stick1.xpm
-icons/mini.stick2.xpm
-icons/mini.stickpressed.xpm
-icons/mini.stop.xpm
-icons/mini.telnet.xpm
-icons/mini.term.xpm
-icons/mini.term2.xpm
-icons/mini.tetris.xpm
-icons/mini.trebol.xpm
-icons/mini.turn.xpm
-icons/mini.twm.xpm
-icons/mini.winXX-close.xpm
-icons/mini.winXX-maximize.xpm
-icons/mini.winXX-minimize.xpm
-icons/mini.winXX-normalize.xpm
-icons/mini.winXX-sysmenu.xpm
-icons/mini.window.xpm
-icons/mini.window2.xpm
-icons/mini.windows.xpm
-icons/mini.windowshade.xpm
-icons/mini.x.xpm
-icons/mini.x2.xpm
-icons/mini.xaniroc.xpm
-icons/mini.xarchie.xpm
-icons/mini.xbiff.xpm
-icons/mini.xboing.xpm
-icons/mini.xfig.xpm
-icons/mini.xjewel.xpm
-icons/mini.xkeycaps.xpm
-icons/mini.xlander.xpm
-icons/mini.xlock.xpm
-icons/mini.xmag.xpm
-icons/mini.xmahjongg.xpm
-icons/mini.xman.xpm
-icons/mini.xpaint.xpm
-icons/mini.xsnow.xpm
-icons/mini.xterm.xpm
-icons/mini.xv.xpm
-icons/mini.zircon.xpm
-icons/mini.zoom.xpm
-icons/modules.xpm
-icons/nscape.xpm
-icons/page.xpm
-icons/page2.xpm
-icons/pointer.xpm
-icons/programs.xpm
-icons/ps.xpm
-icons/question.xpm
-icons/rbomb.xpm
-icons/rbomb2.xpm
-icons/rcalc.xpm
-icons/rcalc2.xpm
-icons/resize.rainbow.xpm
-icons/rterm.xpm
-icons/rterm2.xpm
-icons/run.xpm
-icons/screen.xpm
-icons/settings.xpm
-icons/shells.xpm
-icons/shutdown.xpm
-icons/shutdown2.xpm
-icons/side.fvwm2.xpm
-icons/side.fvwm2_1.xpm
-icons/side.fvwm2_2.xpm
-icons/side.utilities.xpm
-icons/small.Paint2.xpm
-icons/small.Shell2.xpm
-icons/small.exit.xpm
-icons/small.lock.xpm
-icons/small.man.next.xpm
-icons/small.note.next.xpm
-icons/small.tools2_3d.xpm
-icons/term.xpm
-icons/textedit.xpm
-icons/tiff2.xpm
-icons/toolbox.xpm
-icons/unknown1.xpm
-icons/wierd_page3.xpm
-icons/window.xpm
-icons/word_processor.xpm
-icons/wterm.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-bsd.xpm
-icons/xterm-dec.xpm
-icons/xterm-linux.xpm
-icons/xterm-sgi.xpm
-icons/xterm-sol.xpm
-icons/xterm-sun.xpm
-icons/xterm.xpm
-icons/xv.xpm
-icons/xv2.xpm
-icons/xview.xpm
+lib/X11/fvwm2/pixmaps/Jlock.xpm
+lib/X11/fvwm2/pixmaps/Jnews.xpm
+lib/X11/fvwm2/pixmaps/Jrecycle.xpm
+lib/X11/fvwm2/pixmaps/Jxlock.xpm
+lib/X11/fvwm2/pixmaps/Monitor.xpm
+lib/X11/fvwm2/pixmaps/Mosaic.xpm
+lib/X11/fvwm2/pixmaps/arrdown2.xpm
+lib/X11/fvwm2/pixmaps/arrows2.xpm
+lib/X11/fvwm2/pixmaps/arrup2.xpm
+lib/X11/fvwm2/pixmaps/bomb.xpm
+lib/X11/fvwm2/pixmaps/button-close.xpm
+lib/X11/fvwm2/pixmaps/button-horiz.xpm
+lib/X11/fvwm2/pixmaps/button-max.xpm
+lib/X11/fvwm2/pixmaps/button-vert.xpm
+lib/X11/fvwm2/pixmaps/button.xpm
+lib/X11/fvwm2/pixmaps/clamp.xpm
+lib/X11/fvwm2/pixmaps/colormap.xpm
+lib/X11/fvwm2/pixmaps/datebook.xpm
+lib/X11/fvwm2/pixmaps/desk.xpm
+lib/X11/fvwm2/pixmaps/dialog_box.xpm
+lib/X11/fvwm2/pixmaps/doomface.xpm
+lib/X11/fvwm2/pixmaps/editres.xpm
+lib/X11/fvwm2/pixmaps/eps.xpm
+lib/X11/fvwm2/pixmaps/exit.xpm
+lib/X11/fvwm2/pixmaps/flow_chart.xpm
+lib/X11/fvwm2/pixmaps/folder2.xpm
+lib/X11/fvwm2/pixmaps/folders.xpm
+lib/X11/fvwm2/pixmaps/fvwm.xpm
+lib/X11/fvwm2/pixmaps/fvwm2.xpm
+lib/X11/fvwm2/pixmaps/fvwm2_big.xpm
+lib/X11/fvwm2/pixmaps/fvwm3.xpm
+lib/X11/fvwm2/pixmaps/gnu-animal.xpm
+lib/X11/fvwm2/pixmaps/graphs.xpm
+lib/X11/fvwm2/pixmaps/jball.xpm
+lib/X11/fvwm2/pixmaps/jbomb.xpm
+lib/X11/fvwm2/pixmaps/jbook1.xpm
+lib/X11/fvwm2/pixmaps/jbook2.xpm
+lib/X11/fvwm2/pixmaps/jcalc.xpm
+lib/X11/fvwm2/pixmaps/jclock.xpm
+lib/X11/fvwm2/pixmaps/jf.xpm
+lib/X11/fvwm2/pixmaps/jgraph.xpm
+lib/X11/fvwm2/pixmaps/jline.xpm
+lib/X11/fvwm2/pixmaps/jlower.xpm
+lib/X11/fvwm2/pixmaps/jmag.xpm
+lib/X11/fvwm2/pixmaps/jmail.xpm
+lib/X11/fvwm2/pixmaps/jmove.xpm
+lib/X11/fvwm2/pixmaps/jpaint.xpm
+lib/X11/fvwm2/pixmaps/jraise.xpm
+lib/X11/fvwm2/pixmaps/jresize.xpm
+lib/X11/fvwm2/pixmaps/jterm.xpm
+lib/X11/fvwm2/pixmaps/jwindow.xpm
+lib/X11/fvwm2/pixmaps/jx.xpm
+lib/X11/fvwm2/pixmaps/mag_glass.xpm
+lib/X11/fvwm2/pixmaps/mail1.xpm
+lib/X11/fvwm2/pixmaps/mail2.xpm
+lib/X11/fvwm2/pixmaps/map.xpm
+lib/X11/fvwm2/pixmaps/math4.xpm
+lib/X11/fvwm2/pixmaps/mini.audiovol.xpm
+lib/X11/fvwm2/pixmaps/mini.blah.xpm
+lib/X11/fvwm2/pixmaps/mini.bomb.xpm
+lib/X11/fvwm2/pixmaps/mini.checkmark.xpm
+lib/X11/fvwm2/pixmaps/mini.cut.xpm
+lib/X11/fvwm2/pixmaps/mini.destroy.xpm
+lib/X11/fvwm2/pixmaps/mini.directory.xpm
+lib/X11/fvwm2/pixmaps/mini.dirlink.xpm
+lib/X11/fvwm2/pixmaps/mini.excl.xpm
+lib/X11/fvwm2/pixmaps/mini.exit.xpm
+lib/X11/fvwm2/pixmaps/mini.eye.xpm
+lib/X11/fvwm2/pixmaps/mini.file.xpm
+lib/X11/fvwm2/pixmaps/mini.filelink.xpm
+lib/X11/fvwm2/pixmaps/mini.fvwm.xpm
+lib/X11/fvwm2/pixmaps/mini.iconify.xpm
+lib/X11/fvwm2/pixmaps/mini.letter.xpm
+lib/X11/fvwm2/pixmaps/mini.lower.xpm
+lib/X11/fvwm2/pixmaps/mini.maximize-horiz.xpm
+lib/X11/fvwm2/pixmaps/mini.maximize-vert.xpm
+lib/X11/fvwm2/pixmaps/mini.maximize.xpm
+lib/X11/fvwm2/pixmaps/mini.maximize2.xpm
+lib/X11/fvwm2/pixmaps/mini.move.xpm
+lib/X11/fvwm2/pixmaps/mini.netscape.xpm
+lib/X11/fvwm2/pixmaps/mini.rainbow.xpm
+lib/X11/fvwm2/pixmaps/mini.raise.xpm
+lib/X11/fvwm2/pixmaps/mini.refresh.xpm
+lib/X11/fvwm2/pixmaps/mini.resize.xpm
+lib/X11/fvwm2/pixmaps/mini.resize2.xpm
+lib/X11/fvwm2/pixmaps/mini.stick.xpm
+lib/X11/fvwm2/pixmaps/mini.stick2.xpm
+lib/X11/fvwm2/pixmaps/mini.stickpressed.xpm
+lib/X11/fvwm2/pixmaps/mini.winXX-close.xpm
+lib/X11/fvwm2/pixmaps/mini.winXX-maximize.xpm
+lib/X11/fvwm2/pixmaps/mini.winXX-minimize.xpm
+lib/X11/fvwm2/pixmaps/mini.xarchie.xpm
+lib/X11/fvwm2/pixmaps/mini.xbiff.xpm
+lib/X11/fvwm2/pixmaps/mini.xboing.xpm
+lib/X11/fvwm2/pixmaps/mini.xlock.xpm
+lib/X11/fvwm2/pixmaps/mini.xmag.xpm
+lib/X11/fvwm2/pixmaps/mini.xman.xpm
+lib/X11/fvwm2/pixmaps/mini.xpaint.xpm
+lib/X11/fvwm2/pixmaps/mini.xpm
+lib/X11/fvwm2/pixmaps/mini.xterm.xpm
+lib/X11/fvwm2/pixmaps/mini.zircon.xpm
+lib/X11/fvwm2/pixmaps/page.xpm
+lib/X11/fvwm2/pixmaps/page2.xpm
+lib/X11/fvwm2/pixmaps/ps.xpm
+lib/X11/fvwm2/pixmaps/question.xpm
+lib/X11/fvwm2/pixmaps/rbomb.xpm
+lib/X11/fvwm2/pixmaps/rcalc.xpm
+lib/X11/fvwm2/pixmaps/rterm.xpm
+lib/X11/fvwm2/pixmaps/side.fvwm2.xpm
+lib/X11/fvwm2/pixmaps/term.xpm
+lib/X11/fvwm2/pixmaps/tiff2.xpm
+lib/X11/fvwm2/pixmaps/toolbox.xpm
+lib/X11/fvwm2/pixmaps/unknown1.xpm
+lib/X11/fvwm2/pixmaps/wierd_page3.xpm
+lib/X11/fvwm2/pixmaps/word_processor.xpm
+lib/X11/fvwm2/pixmaps/world.xpm
+lib/X11/fvwm2/pixmaps/xcalc.xpm
+lib/X11/fvwm2/pixmaps/xemacs.xpm
+lib/X11/fvwm2/pixmaps/xlock.xpm
+lib/X11/fvwm2/pixmaps/xman.xpm
+lib/X11/fvwm2/pixmaps/xpaint.xpm
+lib/X11/fvwm2/pixmaps/xterm-axp.xpm
+lib/X11/fvwm2/pixmaps/xterm-blank.xpm
+lib/X11/fvwm2/pixmaps/xterm-bsd.xpm
+lib/X11/fvwm2/pixmaps/xterm-dec.xpm
+lib/X11/fvwm2/pixmaps/xterm-linux.xpm
+lib/X11/fvwm2/pixmaps/xterm-sgi.xpm
+lib/X11/fvwm2/pixmaps/xterm-sol.xpm
+lib/X11/fvwm2/pixmaps/xterm-sun.xpm
+lib/X11/fvwm2/pixmaps/xterm.xpm
+lib/X11/fvwm2/pixmaps/xv.xpm
+lib/X11/fvwm2/pixmaps/xv2.xpm
 libexec/fvwm/2.2.5/FvwmAnimate
 libexec/fvwm/2.2.5/FvwmAudio
 libexec/fvwm/2.2.5/FvwmAuto
@@ -353,4 +169,5 @@ libexec/fvwm/2.2.5/FvwmWharf
 libexec/fvwm/2.2.5/FvwmWinList
 @dirrm libexec/fvwm/2.2.5
 @dirrm libexec/fvwm
-@unexec rmdir %D/icons 2>/dev/null || true
+@dirrm lib/X11/fvwm2/pixmaps
+@dirrm lib/X11/fvwm2